From 6c994a54f0d0c7d9b26679c1cd28e57d4691bf2a Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 22 Oct 2024 23:41:19 +0300
Subject: [PATCH 001/753] autodeploy PRs (#218)

---
 .github/workflows/preview.yml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 526705e9..564fc189 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -6,22 +6,38 @@ env:
 on:
   issue_comment:
     types: [created]
+  pull_request:
 jobs:
   deploy:
     runs-on: ubuntu-latest
     # todo skip already created deploys on that commit
     if: >-
-      github.event.issue.pull_request != '' &&
       (
-        contains(github.event.comment.body, '/deploy')
+        github.event.issue.pull_request != '' &&
+        (
+          contains(github.event.comment.body, '/deploy')
+        )
+      ) ||
+      (
+        github.event_name == 'pull_request' && (
+          env.AUTO_DEPLOY_PRS contains $'\n' + toString(github.event.pull_request.number) + $'\n' ||
+          startsWith(env.AUTO_DEPLOY_PRS, toString(github.event.pull_request.number) + $'\n') ||
+          endsWith(env.AUTO_DEPLOY_PRS, $'\n' + toString(github.event.pull_request.number)) ||
+          env.AUTO_DEPLOY_PRS == toString(github.event.pull_request.number)
+        )
       )
     permissions:
       pull-requests: write
     steps:
-      - name: Checkout
+      - name: Checkout PR (comment)
         uses: actions/checkout@v2
+        if: github.event_name == 'issue_comment'
         with:
           ref: refs/pull/${{ github.event.issue.number }}/head
+      - name: Checkout PR (pull_request)
+        uses: actions/checkout@v2
+        if: github.event_name == 'pull_request'
+
       - run: npm i -g pnpm@9.0.4
       - uses: actions/setup-node@v4
         with:
@@ -59,7 +75,7 @@ jobs:
         id: alias
         env:
           ALIASES: ${{ env.ALIASES }}
-          PULL_URL: ${{ github.event.issue.pull_request.url }}
+          PULL_URL: ${{ github.event.issue.pull_request.url || github.event.pull_request.url }}
       - name: Set deployment alias
         if: ${{ steps.alias.outputs.alias != '' && steps.alias.outputs.alias != 'mcraft.fun' && steps.alias.outputs.alias != 's.mcraft.fun' }}
         run: vercel alias set ${{ steps.deploy.outputs.stdout }} ${{ steps.alias.outputs.alias }} --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro

From 95c185fc0b50b318620aa1a791f6f36fb5fad776 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 23 Oct 2024 00:35:33 +0300
Subject: [PATCH 002/753] fix: correct syntax for checking PR numbers in
 AUTO_DEPLOY_PRS in preview.yml

---
 .github/workflows/preview.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 564fc189..2e7f933f 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -20,7 +20,7 @@ jobs:
       ) ||
       (
         github.event_name == 'pull_request' && (
-          env.AUTO_DEPLOY_PRS contains $'\n' + toString(github.event.pull_request.number) + $'\n' ||
+          contains(env.AUTO_DEPLOY_PRS, $'\n' + toString(github.event.pull_request.number)) + $'\n' ||
           startsWith(env.AUTO_DEPLOY_PRS, toString(github.event.pull_request.number) + $'\n') ||
           endsWith(env.AUTO_DEPLOY_PRS, $'\n' + toString(github.event.pull_request.number)) ||
           env.AUTO_DEPLOY_PRS == toString(github.event.pull_request.number)

From 6354ba6bb8e68398531e37bf6222a8b32be3514e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 23 Oct 2024 00:36:58 +0300
Subject: [PATCH 003/753] ci: update variable name from env to vars in
 AUTO_DEPLOY_PRS check in preview.yml

---
 .github/workflows/preview.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 2e7f933f..c5bb47dc 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -20,10 +20,10 @@ jobs:
       ) ||
       (
         github.event_name == 'pull_request' && (
-          contains(env.AUTO_DEPLOY_PRS, $'\n' + toString(github.event.pull_request.number)) + $'\n' ||
-          startsWith(env.AUTO_DEPLOY_PRS, toString(github.event.pull_request.number) + $'\n') ||
-          endsWith(env.AUTO_DEPLOY_PRS, $'\n' + toString(github.event.pull_request.number)) ||
-          env.AUTO_DEPLOY_PRS == toString(github.event.pull_request.number)
+          contains(vars.AUTO_DEPLOY_PRS, $'\n' + toString(github.event.pull_request.number)) + $'\n' ||
+          startsWith(vars.AUTO_DEPLOY_PRS, toString(github.event.pull_request.number) + $'\n') ||
+          endsWith(vars.AUTO_DEPLOY_PRS, $'\n' + toString(github.event.pull_request.number)) ||
+          vars.AUTO_DEPLOY_PRS == toString(github.event.pull_request.number)
         )
       )
     permissions:

From f900d6933c11d3dd31b45ecaabfbe192694f1e51 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 23 Oct 2024 00:42:04 +0300
Subject: [PATCH 004/753] ci: simplify PR number check logic using fromJSON in
 AUTO_DEPLOY_PRS in preview.yml

---
 .github/workflows/preview.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index c5bb47dc..ebbdefeb 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -19,12 +19,7 @@ jobs:
         )
       ) ||
       (
-        github.event_name == 'pull_request' && (
-          contains(vars.AUTO_DEPLOY_PRS, $'\n' + toString(github.event.pull_request.number)) + $'\n' ||
-          startsWith(vars.AUTO_DEPLOY_PRS, toString(github.event.pull_request.number) + $'\n') ||
-          endsWith(vars.AUTO_DEPLOY_PRS, $'\n' + toString(github.event.pull_request.number)) ||
-          vars.AUTO_DEPLOY_PRS == toString(github.event.pull_request.number)
-        )
+        github.event_name == 'pull_request' && fromJSON(env.AUTO_DEPLOY_PRS).includes(github.event.pull_request.number)
       )
     permissions:
       pull-requests: write

From e35873e1061464e5e9e1943ac3a9aef2aa5f78c6 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 23 Oct 2024 00:43:43 +0300
Subject: [PATCH 005/753] ci: refactor variable usage from env to vars for PR
 check in preview.yml

---
 .github/workflows/preview.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index ebbdefeb..1c8e3057 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -19,7 +19,7 @@ jobs:
         )
       ) ||
       (
-        github.event_name == 'pull_request' && fromJSON(env.AUTO_DEPLOY_PRS).includes(github.event.pull_request.number)
+        github.event_name == 'pull_request' && fromJSON(vars.AUTO_DEPLOY_PRS).includes(github.event.pull_request.number)
       )
     permissions:
       pull-requests: write

From 9a7a13c2dd66dc972fc6b088a4bf2a39bd2923ae Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 23 Oct 2024 01:00:34 +0300
Subject: [PATCH 006/753] ci: enhance trigger conditions for deployment in
 preview.yml using variables for issue comments and pull requests

---
 .github/workflows/preview.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 1c8e3057..e7a7dcfd 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -3,6 +3,8 @@ env:
   VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
   VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
   ALIASES: ${{ vars.ALIASES }}
+  COMMENT_TRIGGER_OK: github.event_name == 'issue_comment' && contains(github.event.comment.body, '/deploy') && github.event.issue.pull_request != null
+  PULL_TRIGGER_OK: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
 on:
   issue_comment:
     types: [created]
@@ -11,16 +13,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     # todo skip already created deploys on that commit
-    if: >-
-      (
-        github.event.issue.pull_request != '' &&
-        (
-          contains(github.event.comment.body, '/deploy')
-        )
-      ) ||
-      (
-        github.event_name == 'pull_request' && fromJSON(vars.AUTO_DEPLOY_PRS).includes(github.event.pull_request.number)
-      )
+    if: vars.COMMENT_TRIGGER_OK || vars.PULL_TRIGGER_OK
     permissions:
       pull-requests: write
     steps:

From 42cc0bd818bd8b908373ba7ec5f6e5ff8bb8c78b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 23 Oct 2024 01:38:55 +0300
Subject: [PATCH 007/753] ci: add push event trigger and refine deployment
 conditions in preview.yml for improved deployment handling

---
 .github/workflows/preview.yml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index e7a7dcfd..b0b27522 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -3,17 +3,26 @@ env:
   VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
   VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
   ALIASES: ${{ vars.ALIASES }}
-  COMMENT_TRIGGER_OK: github.event_name == 'issue_comment' && contains(github.event.comment.body, '/deploy') && github.event.issue.pull_request != null
-  PULL_TRIGGER_OK: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
 on:
   issue_comment:
     types: [created]
   pull_request:
+  push:
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    # todo skip already created deploys on that commit
-    if: vars.COMMENT_TRIGGER_OK || vars.PULL_TRIGGER_OK
+    if: >-
+      (
+        (
+          github.event_name == 'issue_comment' &&
+          contains(github.event.comment.body, '/deploy') &&
+          github.event.issue.pull_request != null
+        ) ||
+        (
+          github.event_name == 'pull_request' &&
+          contains(fromJSON(vars.AUTO_DEPLOY_PRS), github.event.pull_request.number)
+        )
+      )
     permissions:
       pull-requests: write
     steps:

From 427ec21213161f97fa498df23782de493c54d1a2 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 23 Oct 2024 02:03:05 +0300
Subject: [PATCH 008/753] check that!

---
 .github/workflows/preview.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index b0b27522..2e7773fa 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -6,8 +6,7 @@ env:
 on:
   issue_comment:
     types: [created]
-  pull_request:
-  push:
+  pull_request_target:
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -34,6 +33,8 @@ jobs:
       - name: Checkout PR (pull_request)
         uses: actions/checkout@v2
         if: github.event_name == 'pull_request'
+        with:
+          ref: refs/pull/${{ github.event.pull_request.number }}/head
 
       - run: npm i -g pnpm@9.0.4
       - uses: actions/setup-node@v4

From 8955075d75d99a2d90d7cb5c669ba4187cb5d1be Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 23 Oct 2024 02:11:11 +0300
Subject: [PATCH 009/753] ci: trying to fix auto preview workflow! (#221)

---
 .github/workflows/preview.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 2e7773fa..738f834e 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -8,6 +8,13 @@ on:
     types: [created]
   pull_request_target:
 jobs:
+  check-trigger:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo ${{ vars.AUTO_DEPLOY_PRS }}
+      - run: echo ${{ fromJson(vars.AUTO_DEPLOY_PRS) }}
+      - run: echo ${{ toJson(contains(fromJson(vars.AUTO_DEPLOY_PRS), github.event.pull_request.number)) }}
+      - run: echo ${{ toJson(contains(fromJson(vars.AUTO_DEPLOY_PRS), 120)) }}
   deploy:
     runs-on: ubuntu-latest
     if: >-
@@ -19,7 +26,7 @@ jobs:
         ) ||
         (
           github.event_name == 'pull_request' &&
-          contains(fromJSON(vars.AUTO_DEPLOY_PRS), github.event.pull_request.number)
+          contains(fromJson(vars.AUTO_DEPLOY_PRS), github.event.pull_request.number)
         )
       )
     permissions:

From ece59e174435ad2a889c5bab1438478d3c54b1d1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 23 Oct 2024 02:20:44 +0300
Subject: [PATCH 010/753] ci: update event trigger from pull_request to
 pull_request_target in preview.yml (fix)

---
 .github/workflows/preview.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 738f834e..fd424620 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -25,7 +25,7 @@ jobs:
           github.event.issue.pull_request != null
         ) ||
         (
-          github.event_name == 'pull_request' &&
+          github.event_name == 'pull_request_target' &&
           contains(fromJson(vars.AUTO_DEPLOY_PRS), github.event.pull_request.number)
         )
       )
@@ -39,7 +39,7 @@ jobs:
           ref: refs/pull/${{ github.event.issue.number }}/head
       - name: Checkout PR (pull_request)
         uses: actions/checkout@v2
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request_target'
         with:
           ref: refs/pull/${{ github.event.pull_request.number }}/head
 

From ebb5056540a1796c2936ec9decb33f8be686cc70 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 23 Oct 2024 02:31:04 +0300
Subject: [PATCH 011/753] ci: refactor deployment workflow in preview.yml by
 removing unused checks and adding alias retrieval step

---
 .github/workflows/preview.yml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index fd424620..ddb386b7 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -8,13 +8,6 @@ on:
     types: [created]
   pull_request_target:
 jobs:
-  check-trigger:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo ${{ vars.AUTO_DEPLOY_PRS }}
-      - run: echo ${{ fromJson(vars.AUTO_DEPLOY_PRS) }}
-      - run: echo ${{ toJson(contains(fromJson(vars.AUTO_DEPLOY_PRS), github.event.pull_request.number)) }}
-      - run: echo ${{ toJson(contains(fromJson(vars.AUTO_DEPLOY_PRS), 120)) }}
   deploy:
     runs-on: ubuntu-latest
     if: >-
@@ -32,6 +25,16 @@ jobs:
     permissions:
       pull-requests: write
     steps:
+      - name: Checkout Base To Temp
+        uses: actions/checkout@v2
+        with:
+          path: temp-base-repo
+      - name: Get deployment alias
+        run: node temp-base-repo/scripts/githubActions.mjs getAlias
+        id: alias
+        env:
+          ALIASES: ${{ env.ALIASES }}
+          PULL_URL: ${{ github.event.issue.pull_request.url || github.event.pull_request.url }}
       - name: Checkout PR (comment)
         uses: actions/checkout@v2
         if: github.event_name == 'issue_comment'
@@ -68,6 +71,7 @@ jobs:
           run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
         id: deploy
       - uses: mshick/add-pr-comment@v2
+        # if: github.event_name == 'issue_comment'
         with:
           allow-repeats: true
           message: |
@@ -75,12 +79,6 @@ jobs:
             [Playground](${{ steps.deploy.outputs.stdout }}/playground/)
             [Storybook](${{ steps.deploy.outputs.stdout }}/storybook/)
       # - run: git checkout next scripts/githubActions.mjs
-      - name: Get deployment alias
-        run: node scripts/githubActions.mjs getAlias
-        id: alias
-        env:
-          ALIASES: ${{ env.ALIASES }}
-          PULL_URL: ${{ github.event.issue.pull_request.url || github.event.pull_request.url }}
       - name: Set deployment alias
         if: ${{ steps.alias.outputs.alias != '' && steps.alias.outputs.alias != 'mcraft.fun' && steps.alias.outputs.alias != 's.mcraft.fun' }}
         run: vercel alias set ${{ steps.deploy.outputs.stdout }} ${{ steps.alias.outputs.alias }} --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro

From 5fa019e7b374259759792d1fa2faf682cfca4b75 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 24 Oct 2024 14:36:44 +0300
Subject: [PATCH 012/753] =?UTF-8?q?fix:=20don=E2=80=99t=20display=20advanc?=
 =?UTF-8?q?ed=20stats=20on=20prod=20deploy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/optionsStorage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index b6ecb7dd..01610cf2 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -76,7 +76,7 @@ const defaultOptions = {
   autoJump: 'auto' as 'auto' | 'always' | 'never',
   autoParkour: false,
   vrSupport: true, // doesn't directly affect the VR mode, should only disable the button which is annoying to android users
-  renderDebug: (isDev ? 'basic' : 'advanced') as 'none' | 'advanced' | 'basic',
+  renderDebug: (isDev ? 'advanced' : 'basic') as 'none' | 'advanced' | 'basic',
 
   // advanced bot options
   autoRespawn: false,

From 6b23eb6badf1dbd0cd01b865300d558f4ad8883f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 28 Oct 2024 05:07:52 +0300
Subject: [PATCH 013/753] fix: never get stuck in unloaded chunks! @sa2urami
 feat: fully supported spectator mode & basic creative fly fixes

---
 package.json    |  1 +
 pnpm-lock.yaml  | 30 ++++++++++++++++--------------
 src/controls.ts |  2 ++
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 6f5924ba..af800edc 100644
--- a/package.json
+++ b/package.json
@@ -174,6 +174,7 @@
       "prismarine-world": "github:zardoy/prismarine-world#next-era",
       "minecraft-data": "3.76.0",
       "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything",
+      "prismarine-physics": "github:zardoy/prismarine-physics",
       "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
       "react": "^18.2.0",
       "prismarine-chunk": "github:zardoy/prismarine-chunk",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 76203c73..97d8e889 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,6 +13,7 @@ overrides:
   prismarine-world: github:zardoy/prismarine-world#next-era
   minecraft-data: 3.76.0
   prismarine-provider-anvil: github:zardoy/prismarine-provider-anvil#everything
+  prismarine-physics: github:zardoy/prismarine-physics
   minecraft-protocol: github:PrismarineJS/node-minecraft-protocol#master
   react: ^18.2.0
   prismarine-chunk: github:zardoy/prismarine-chunk
@@ -7545,8 +7546,9 @@ packages:
   prismarine-nbt@2.5.0:
     resolution: {integrity: sha512-F0/8UAa9SDDnAGrBYqZc4nG8h2zj5cE2eAJU5xlDR/IsQQ3moVxkOjE3h3nMv6SbvZrvAcgX7waA/nd9LLHYdA==}
 
-  prismarine-physics@1.8.0:
-    resolution: {integrity: sha512-gbM+S+bmVtOKVv+Z0WGaHMeEeBHISIDsRDRlv8sr0dex3ZJRhuq8djA02CBreguXtI18ZKh6q3TSj2qDr45NHA==}
+  prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b}
+    version: 1.9.0
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3f462dc81ded5b46e88e3442f99aadf35f7f699:
     resolution: {tarball: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3f462dc81ded5b46e88e3442f99aadf35f7f699}
@@ -9851,7 +9853,7 @@ snapshots:
       '@babel/core': 7.22.11
       '@babel/helper-compilation-targets': 7.22.10
       '@babel/helper-plugin-utils': 7.22.5
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       lodash.debounce: 4.0.8
       resolve: 1.22.4
     transitivePeerDependencies:
@@ -13150,7 +13152,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.1.0
       '@typescript-eslint/visitor-keys': 6.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.0
@@ -13178,7 +13180,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 8.0.0
       '@typescript-eslint/visitor-keys': 8.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -13522,7 +13524,7 @@ snapshots:
 
   agent-base@7.1.0:
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -14903,7 +14905,7 @@ snapshots:
   detect-port@1.5.1:
     dependencies:
       address: 1.2.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -16558,7 +16560,7 @@ snapshots:
   https-proxy-agent@4.0.0:
     dependencies:
       agent-base: 5.1.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -16573,7 +16575,7 @@ snapshots:
   https-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -17647,7 +17649,7 @@ snapshots:
   micromark@4.0.0:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.0
@@ -17792,7 +17794,7 @@ snapshots:
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.2.1
-      prismarine-physics: 1.8.0
+      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.8
 
   mineflayer@4.22.0(encoding@0.1.13):
@@ -17806,7 +17808,7 @@ snapshots:
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
-      prismarine-physics: 1.8.0
+      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       prismarine-recipe: 1.3.1(prismarine-registry@1.9.0)
       prismarine-registry: 1.9.0
       prismarine-windows: 2.9.0
@@ -17829,7 +17831,7 @@ snapshots:
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
-      prismarine-physics: 1.8.0
+      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       prismarine-recipe: 1.3.1(prismarine-registry@1.9.0)
       prismarine-registry: 1.9.0
       prismarine-windows: 2.9.0
@@ -18705,7 +18707,7 @@ snapshots:
     dependencies:
       protodef: 1.17.0
 
-  prismarine-physics@1.8.0:
+  prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     dependencies:
       minecraft-data: 3.76.0
       prismarine-nbt: 2.5.0
diff --git a/src/controls.ts b/src/controls.ts
index 6effdcd4..d29d141f 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -603,6 +603,7 @@ const patchedSetControlState = (action, state) => {
 }
 
 const startFlying = (sendAbilities = true) => {
+  bot.entity['creativeFly'] = true
   if (sendAbilities) {
     bot._client.write('abilities', {
       flags: 2,
@@ -616,6 +617,7 @@ const startFlying = (sendAbilities = true) => {
 }
 
 const endFlying = (sendAbilities = true) => {
+  bot.entity['creativeFly'] = false
   if (bot.physics.gravity !== 0) return
   if (sendAbilities) {
     bot._client.write('abilities', {

From d497299235952543d990e44c2ec9049055323a39 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 28 Oct 2024 05:48:51 +0300
Subject: [PATCH 014/753] feat: 1.21.1 support

---
 package.json   |   8 +-
 pnpm-lock.yaml | 274 +++++++++++++++++++++++--------------------------
 2 files changed, 130 insertions(+), 152 deletions(-)

diff --git a/package.json b/package.json
index af800edc..c458474b 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
-    "minecraft-data": "3.76.0",
+    "minecraft-data": "3.78.0",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
@@ -172,12 +172,12 @@
       "diamond-square": "github:zardoy/diamond-square",
       "prismarine-block": "github:zardoy/prismarine-block#next-era",
       "prismarine-world": "github:zardoy/prismarine-world#next-era",
-      "minecraft-data": "3.76.0",
+      "minecraft-data": "3.78.0",
       "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything",
       "prismarine-physics": "github:zardoy/prismarine-physics",
       "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
       "react": "^18.2.0",
-      "prismarine-chunk": "github:zardoy/prismarine-chunk",
+      "prismarine-chunk": "github:zardoy/prismarine-chunk#master",
       "prismarine-item": "latest"
     },
     "updateConfig": {
@@ -187,7 +187,7 @@
       "three@0.154.0": "patches/three@0.154.0.patch",
       "pixelarticons@1.8.1": "patches/pixelarticons@1.8.1.patch",
       "mineflayer-item-map-downloader@1.2.0": "patches/mineflayer-item-map-downloader@1.2.0.patch",
-      "minecraft-protocol@1.49.0": "patches/minecraft-protocol@1.49.0.patch"
+      "minecraft-protocol@1.50.0": "patches/minecraft-protocol@1.49.0.patch"
     }
   },
   "packageManager": "pnpm@9.0.4"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 97d8e889..6eff7655 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,16 +11,16 @@ overrides:
   diamond-square: github:zardoy/diamond-square
   prismarine-block: github:zardoy/prismarine-block#next-era
   prismarine-world: github:zardoy/prismarine-world#next-era
-  minecraft-data: 3.76.0
+  minecraft-data: 3.78.0
   prismarine-provider-anvil: github:zardoy/prismarine-provider-anvil#everything
   prismarine-physics: github:zardoy/prismarine-physics
   minecraft-protocol: github:PrismarineJS/node-minecraft-protocol#master
   react: ^18.2.0
-  prismarine-chunk: github:zardoy/prismarine-chunk
+  prismarine-chunk: github:zardoy/prismarine-chunk#master
   prismarine-item: latest
 
 patchedDependencies:
-  minecraft-protocol@1.49.0:
+  minecraft-protocol@1.50.0:
     hash: 7sh5krubuk2vjuogjioaktvwzi
     path: patches/minecraft-protocol@1.49.0.patch
   mineflayer-item-map-downloader@1.2.0:
@@ -134,11 +134,11 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       minecraft-data:
-        specifier: 3.76.0
-        version: 3.76.0
+        specifier: 3.78.0
+        version: 3.78.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/11e8594bb43dff4fe89f84462ed37d593ee17380(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/642fd4f7023a98a96da4caf8f993f8e19361a1e7(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13)
@@ -162,7 +162,7 @@ importers:
         version: 6.1.1
       prismarine-provider-anvil:
         specifier: github:zardoy/prismarine-provider-anvil#everything
-        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3f462dc81ded5b46e88e3442f99aadf35f7f699(minecraft-data@3.76.0)
+        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.78.0)
       prosemirror-example-setup:
         specifier: ^1.2.2
         version: 1.2.2
@@ -350,7 +350,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
       mineflayer:
         specifier: github:zardoy/mineflayer
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/f5fb0bcdfebe79fc74adfd7325ac80f2b2bce425(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/519acba455d3387414b81fcaa12e550dcdc4f88e(encoding@0.1.13)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -425,10 +425,10 @@ importers:
         version: 1.3.6
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/a69b66ab1e4be6b67f25a5a6db15e0ad39e11819
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-chunk:
-        specifier: github:zardoy/prismarine-chunk
-        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cea0b6c792d7dcbb69dfd20fa48be5fd60ce83ef(minecraft-data@3.76.0)
+        specifier: github:zardoy/prismarine-chunk#master
+        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0)
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
@@ -472,7 +472,7 @@ importers:
     dependencies:
       vite:
         specifier: ^4.4.9
-        version: 4.4.10(@types/node@20.12.8)(terser@5.31.3)
+        version: 4.4.10(@types/node@22.8.1)(terser@5.31.3)
 
 packages:
 
@@ -3053,6 +3053,9 @@ packages:
   '@types/node@20.8.0':
     resolution: {integrity: sha512-LzcWltT83s1bthcvjBmiBvGJiiUe84NWRHkw+ZV6Fr41z2FbIzvc815dk2nQ3RAKMuN2fkenM/z3Xv2QzEpYxQ==}
 
+  '@types/node@22.8.1':
+    resolution: {integrity: sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==}
+
   '@types/normalize-package-data@2.4.2':
     resolution: {integrity: sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A==}
 
@@ -6763,8 +6766,8 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  minecraft-data@3.76.0:
-    resolution: {integrity: sha512-aqWonoe5h7to5iEfjUmG5r5F0K3FwrnF9c1YzxbALyOyRUujm2a/G5GJ4TfuoEslVp9dJ7OYVHLJfOS9aD/Twg==}
+  minecraft-data@3.78.0:
+    resolution: {integrity: sha512-Ssks8QD31lsoxqa7LySTqeP9romsfAbfsSGiUHiGMeqfxRi/PtOxGLyKD1BXB8V/tXLztFcbQYqzIhprDkPguw==}
 
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
@@ -6773,9 +6776,9 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/11e8594bb43dff4fe89f84462ed37d593ee17380:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/11e8594bb43dff4fe89f84462ed37d593ee17380}
-    version: 1.49.0
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159}
+    version: 1.50.0
     engines: {node: '>=14'}
 
   minecraft-wrap@1.5.1:
@@ -6792,13 +6795,13 @@ packages:
   mineflayer-pathfinder@2.4.4:
     resolution: {integrity: sha512-HAXakZrJRb1UC+5dv8EaDrqjW3ZnBnBk3nkb6x/YWyhHCUKn/E7VU0FO+UN9whuqPlkSaVumEdXJdydE6lSYxQ==}
 
-  mineflayer@4.22.0:
-    resolution: {integrity: sha512-fjIcFtmyDOyeZp64S5Af1tlVAgEfu4E8O4TyqnbVPq0RZXZe8MinhR3yE1eML3iAhcswElnSQjijgx3Y8C8h3A==}
+  mineflayer@4.23.0:
+    resolution: {integrity: sha512-wSchhS59hK+oPs8tFg847H82YEvxU7zYKdDKj4e5FVo3CxJ74eXJVT+JcFwEvoqFO7kXiQlhJITxEvO13GOSKA==}
     engines: {node: '>=18'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/f5fb0bcdfebe79fc74adfd7325ac80f2b2bce425:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/f5fb0bcdfebe79fc74adfd7325ac80f2b2bce425}
-    version: 4.22.0
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/519acba455d3387414b81fcaa12e550dcdc4f88e:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/519acba455d3387414b81fcaa12e550dcdc4f88e}
+    version: 4.23.0
     engines: {node: '>=18'}
 
   minimalistic-assert@1.0.1:
@@ -7509,29 +7512,19 @@ packages:
   prismarine-biome@1.3.0:
     resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==}
     peerDependencies:
-      minecraft-data: 3.76.0
+      minecraft-data: 3.78.0
       prismarine-registry: ^1.1.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/a69b66ab1e4be6b67f25a5a6db15e0ad39e11819:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-block/tar.gz/a69b66ab1e4be6b67f25a5a6db15e0ad39e11819}
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05}
     version: 1.17.1
 
   prismarine-chat@1.10.1:
     resolution: {integrity: sha512-XukYcuueuhDxzEXG7r8BZyt6jOObrPPB4JESCgb+/XenB9nExoSHF8eTQWWj8faKPLqm1dRQaYwFJlNBlJZJUw==}
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/28305fcc2c180b8d82211d0651d4a5eaed489ae4:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/28305fcc2c180b8d82211d0651d4a5eaed489ae4}
-    version: 1.35.0
-    engines: {node: '>=14'}
-
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/5cae250670175a6cc1be92184d3cb5ca6d235a30:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/5cae250670175a6cc1be92184d3cb5ca6d235a30}
-    version: 1.35.0
-    engines: {node: '>=14'}
-
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cea0b6c792d7dcbb69dfd20fa48be5fd60ce83ef:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cea0b6c792d7dcbb69dfd20fa48be5fd60ce83ef}
-    version: 1.35.0
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb}
+    version: 1.36.0
     engines: {node: '>=14'}
 
   prismarine-entity@2.3.1:
@@ -7550,8 +7543,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b}
     version: 1.9.0
 
-  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3f462dc81ded5b46e88e3442f99aadf35f7f699:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3f462dc81ded5b46e88e3442f99aadf35f7f699}
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a}
     version: 2.8.0
 
   prismarine-realms@1.3.2:
@@ -7562,12 +7555,12 @@ packages:
     peerDependencies:
       prismarine-registry: ^1.4.0
 
+  prismarine-registry@1.10.0:
+    resolution: {integrity: sha512-6TYQiZHtsJ87HsB2E0yamCFp77ZyyLT16OmW5iXB5V30yCPflhHvR5TR2IqISmmiRc2093BkHfiIhsOZaMatmQ==}
+
   prismarine-registry@1.7.0:
     resolution: {integrity: sha512-yyva0FpWI078nNeMhx8ekVza5uUTYhEv+C+ADu3wUQXiG8qhXkvrf0uzsnhTgZL8BLdsi2axgCEiKw9qSKIuxQ==}
 
-  prismarine-registry@1.9.0:
-    resolution: {integrity: sha512-RZ5PvedMGA/uEwZOsnmC9MYq1CupH2CHwm9UT4Ara87Vf7QMfxxPTZZ4GXq7EJmmxe5qodhDYoq6Z8mz11oXlQ==}
-
   prismarine-schematic@1.2.3:
     resolution: {integrity: sha512-Mwpn43vEHhm3aw3cPhJjWqztkW+nX+QLajDHlTask8lEOTGl1WmpvFja4iwiws4GIvaC8x0Foptf4uvDsnjrAg==}
 
@@ -9053,6 +9046,9 @@ packages:
   undici-types@5.26.5:
     resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
 
+  undici-types@6.19.8:
+    resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
+
   undici@5.25.4:
     resolution: {integrity: sha512-450yJxT29qKMf3aoudzFpIciqpx6Pji3hEWaXqXmanbXF58LTAGCKxcJjxMXWu3iG+Mudgo3ZUfDB6YDFd/dAw==}
     engines: {node: '>=14.0'}
@@ -9853,7 +9849,7 @@ snapshots:
       '@babel/core': 7.22.11
       '@babel/helper-compilation-targets': 7.22.10
       '@babel/helper-plugin-utils': 7.22.5
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.4
     transitivePeerDependencies:
@@ -12968,6 +12964,11 @@ snapshots:
 
   '@types/node@20.8.0': {}
 
+  '@types/node@22.8.1':
+    dependencies:
+      undici-types: 6.19.8
+    optional: true
+
   '@types/normalize-package-data@2.4.2': {}
 
   '@types/offscreencanvas@2019.7.2': {}
@@ -13152,7 +13153,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.1.0
       '@typescript-eslint/visitor-keys': 6.1.0
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.0
@@ -13180,7 +13181,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 8.0.0
       '@typescript-eslint/visitor-keys': 8.0.0
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -13424,16 +13425,16 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.2.3
-      minecraft-data: 3.76.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/11e8594bb43dff4fe89f84462ed37d593ee17380(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+      minecraft-data: 3.78.0
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/5cae250670175a6cc1be92184d3cb5ca6d235a30(minecraft-data@3.76.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0)
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3f462dc81ded5b46e88e3442f99aadf35f7f699(minecraft-data@3.76.0)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.78.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       rambda: 9.2.0
@@ -13524,7 +13525,7 @@ snapshots:
 
   agent-base@7.1.0:
     dependencies:
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -14905,7 +14906,7 @@ snapshots:
   detect-port@1.5.1:
     dependencies:
       address: 1.2.2
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -14915,9 +14916,9 @@ snapshots:
 
   diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71:
     dependencies:
-      minecraft-data: 3.76.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/28305fcc2c180b8d82211d0651d4a5eaed489ae4(minecraft-data@3.76.0)
-      prismarine-registry: 1.9.0
+      minecraft-data: 3.78.0
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0)
+      prismarine-registry: 1.10.0
       random-seed: 0.3.0
       vec3: 0.1.8
 
@@ -16560,7 +16561,7 @@ snapshots:
   https-proxy-agent@4.0.0:
     dependencies:
       agent-base: 5.1.1
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -16575,7 +16576,7 @@ snapshots:
   https-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -17649,7 +17650,7 @@ snapshots:
   micromark@4.0.0:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.0
@@ -17720,7 +17721,7 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  minecraft-data@3.76.0: {}
+  minecraft-data@3.78.0: {}
 
   minecraft-folder-path@1.2.0: {}
 
@@ -17731,7 +17732,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/11e8594bb43dff4fe89f84462ed37d593ee17380(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13):
     dependencies:
       '@types/readable-stream': 4.0.12
       aes-js: 3.1.2
@@ -17740,7 +17741,7 @@ snapshots:
       endian-toggle: 0.0.0
       lodash.get: 4.4.2
       lodash.merge: 4.6.2
-      minecraft-data: 3.76.0
+      minecraft-data: 3.78.0
       minecraft-folder-path: 1.2.0
       node-fetch: 2.7.0(encoding@0.1.13)
       node-rsa: 0.4.2
@@ -17781,7 +17782,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/642fd4f7023a98a96da4caf8f993f8e19361a1e7(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13):
     dependencies:
-      mineflayer: 4.22.0(encoding@0.1.13)
+      mineflayer: 4.23.0(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17789,28 +17790,28 @@ snapshots:
 
   mineflayer-pathfinder@2.4.4:
     dependencies:
-      minecraft-data: 3.76.0
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/a69b66ab1e4be6b67f25a5a6db15e0ad39e11819
+      minecraft-data: 3.78.0
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.2.1
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.8
 
-  mineflayer@4.22.0(encoding@0.1.13):
+  mineflayer@4.23.0(encoding@0.1.13):
     dependencies:
-      minecraft-data: 3.76.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/11e8594bb43dff4fe89f84462ed37d593ee17380(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.76.0)(prismarine-registry@1.9.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/a69b66ab1e4be6b67f25a5a6db15e0ad39e11819
+      minecraft-data: 3.78.0
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+      prismarine-biome: 1.3.0(minecraft-data@3.78.0)(prismarine-registry@1.10.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-chat: 1.10.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/5cae250670175a6cc1be92184d3cb5ca6d235a30(minecraft-data@3.76.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0)
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
-      prismarine-recipe: 1.3.1(prismarine-registry@1.9.0)
-      prismarine-registry: 1.9.0
+      prismarine-recipe: 1.3.1(prismarine-registry@1.10.0)
+      prismarine-registry: 1.10.0
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       protodef: 1.17.0
@@ -17820,20 +17821,20 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/f5fb0bcdfebe79fc74adfd7325ac80f2b2bce425(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/519acba455d3387414b81fcaa12e550dcdc4f88e(encoding@0.1.13):
     dependencies:
-      minecraft-data: 3.76.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/11e8594bb43dff4fe89f84462ed37d593ee17380(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.76.0)(prismarine-registry@1.9.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/a69b66ab1e4be6b67f25a5a6db15e0ad39e11819
+      minecraft-data: 3.78.0
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+      prismarine-biome: 1.3.0(minecraft-data@3.78.0)(prismarine-registry@1.10.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-chat: 1.10.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/5cae250670175a6cc1be92184d3cb5ca6d235a30(minecraft-data@3.76.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0)
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
-      prismarine-recipe: 1.3.1(prismarine-registry@1.9.0)
-      prismarine-registry: 1.9.0
+      prismarine-recipe: 1.3.1(prismarine-registry@1.10.0)
+      prismarine-registry: 1.10.0
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       protodef: 1.17.0
@@ -18623,20 +18624,20 @@ snapshots:
       - encoding
       - supports-color
 
-  prismarine-biome@1.3.0(minecraft-data@3.76.0)(prismarine-registry@1.7.0):
+  prismarine-biome@1.3.0(minecraft-data@3.78.0)(prismarine-registry@1.10.0):
     dependencies:
-      minecraft-data: 3.76.0
+      minecraft-data: 3.78.0
+      prismarine-registry: 1.10.0
+
+  prismarine-biome@1.3.0(minecraft-data@3.78.0)(prismarine-registry@1.7.0):
+    dependencies:
+      minecraft-data: 3.78.0
       prismarine-registry: 1.7.0
 
-  prismarine-biome@1.3.0(minecraft-data@3.76.0)(prismarine-registry@1.9.0):
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05:
     dependencies:
-      minecraft-data: 3.76.0
-      prismarine-registry: 1.9.0
-
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/a69b66ab1e4be6b67f25a5a6db15e0ad39e11819:
-    dependencies:
-      minecraft-data: 3.76.0
-      prismarine-biome: 1.3.0(minecraft-data@3.76.0)(prismarine-registry@1.7.0)
+      minecraft-data: 3.78.0
+      prismarine-biome: 1.3.0(minecraft-data@3.78.0)(prismarine-registry@1.7.0)
       prismarine-chat: 1.10.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
@@ -18646,40 +18647,14 @@ snapshots:
     dependencies:
       mojangson: 2.0.4
       prismarine-nbt: 2.5.0
-      prismarine-registry: 1.9.0
+      prismarine-registry: 1.10.0
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/28305fcc2c180b8d82211d0651d4a5eaed489ae4(minecraft-data@3.76.0):
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0):
     dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.76.0)(prismarine-registry@1.9.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/a69b66ab1e4be6b67f25a5a6db15e0ad39e11819
+      prismarine-biome: 1.3.0(minecraft-data@3.78.0)(prismarine-registry@1.10.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-nbt: 2.5.0
-      prismarine-registry: 1.9.0
-      smart-buffer: 4.2.0
-      uint4: 0.1.2
-      vec3: 0.1.8
-      xxhash-wasm: 0.4.2
-    transitivePeerDependencies:
-      - minecraft-data
-
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/5cae250670175a6cc1be92184d3cb5ca6d235a30(minecraft-data@3.76.0):
-    dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.76.0)(prismarine-registry@1.9.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/a69b66ab1e4be6b67f25a5a6db15e0ad39e11819
-      prismarine-nbt: 2.5.0
-      prismarine-registry: 1.9.0
-      smart-buffer: 4.2.0
-      uint4: 0.1.2
-      vec3: 0.1.8
-      xxhash-wasm: 0.4.2
-    transitivePeerDependencies:
-      - minecraft-data
-
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cea0b6c792d7dcbb69dfd20fa48be5fd60ce83ef(minecraft-data@3.76.0):
-    dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.76.0)(prismarine-registry@1.7.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/a69b66ab1e4be6b67f25a5a6db15e0ad39e11819
-      prismarine-nbt: 2.5.0
-      prismarine-registry: 1.7.0
+      prismarine-registry: 1.10.0
       smart-buffer: 4.2.0
       uint4: 0.1.2
       vec3: 0.1.8
@@ -18691,13 +18666,13 @@ snapshots:
     dependencies:
       prismarine-chat: 1.10.1
       prismarine-item: 1.15.0
-      prismarine-registry: 1.9.0
+      prismarine-registry: 1.10.0
       vec3: 0.1.8
 
   prismarine-item@1.15.0:
     dependencies:
       prismarine-nbt: 2.5.0
-      prismarine-registry: 1.9.0
+      prismarine-registry: 1.10.0
 
   prismarine-nbt@2.2.1:
     dependencies:
@@ -18709,14 +18684,14 @@ snapshots:
 
   prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     dependencies:
-      minecraft-data: 3.76.0
+      minecraft-data: 3.78.0
       prismarine-nbt: 2.5.0
       vec3: 0.1.8
 
-  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3f462dc81ded5b46e88e3442f99aadf35f7f699(minecraft-data@3.76.0):
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.78.0):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/a69b66ab1e4be6b67f25a5a6db15e0ad39e11819
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cea0b6c792d7dcbb69dfd20fa48be5fd60ce83ef(minecraft-data@3.76.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0)
       prismarine-nbt: 2.5.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       uint4: 0.1.2
@@ -18732,24 +18707,24 @@ snapshots:
       - encoding
       - supports-color
 
-  prismarine-recipe@1.3.1(prismarine-registry@1.9.0):
+  prismarine-recipe@1.3.1(prismarine-registry@1.10.0):
     dependencies:
-      prismarine-registry: 1.9.0
+      prismarine-registry: 1.10.0
+
+  prismarine-registry@1.10.0:
+    dependencies:
+      minecraft-data: 3.78.0
+      prismarine-nbt: 2.5.0
 
   prismarine-registry@1.7.0:
     dependencies:
-      minecraft-data: 3.76.0
-      prismarine-nbt: 2.5.0
-
-  prismarine-registry@1.9.0:
-    dependencies:
-      minecraft-data: 3.76.0
+      minecraft-data: 3.78.0
       prismarine-nbt: 2.5.0
 
   prismarine-schematic@1.2.3:
     dependencies:
-      minecraft-data: 3.76.0
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/a69b66ab1e4be6b67f25a5a6db15e0ad39e11819
+      minecraft-data: 3.78.0
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-nbt: 2.2.1
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       vec3: 0.1.8
@@ -18757,7 +18732,7 @@ snapshots:
   prismarine-windows@2.9.0:
     dependencies:
       prismarine-item: 1.15.0
-      prismarine-registry: 1.9.0
+      prismarine-registry: 1.10.0
       typed-emitter: 2.1.0
 
   prismarine-world@https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be:
@@ -20596,6 +20571,9 @@ snapshots:
 
   undici-types@5.26.5: {}
 
+  undici-types@6.19.8:
+    optional: true
+
   undici@5.25.4:
     dependencies:
       '@fastify/busboy': 2.0.0
@@ -20884,16 +20862,6 @@ snapshots:
       - supports-color
       - terser
 
-  vite@4.4.10(@types/node@20.12.8)(terser@5.31.3):
-    dependencies:
-      esbuild: 0.18.20
-      postcss: 8.4.31
-      rollup: 3.29.4
-    optionalDependencies:
-      '@types/node': 20.12.8
-      fsevents: 2.3.3
-      terser: 5.31.3
-
   vite@4.4.10(@types/node@20.8.0)(terser@5.31.3):
     dependencies:
       esbuild: 0.18.20
@@ -20904,6 +20872,16 @@ snapshots:
       fsevents: 2.3.3
       terser: 5.31.3
 
+  vite@4.4.10(@types/node@22.8.1)(terser@5.31.3):
+    dependencies:
+      esbuild: 0.18.20
+      postcss: 8.4.31
+      rollup: 3.29.4
+    optionalDependencies:
+      '@types/node': 22.8.1
+      fsevents: 2.3.3
+      terser: 5.31.3
+
   vite@4.5.3(@types/node@20.8.0)(terser@5.31.3):
     dependencies:
       esbuild: 0.18.20

From 153101fa6f3a5503a81f5ffbdd2aa360780a43fa Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 28 Oct 2024 05:49:27 +0300
Subject: [PATCH 015/753] ci: fix lint

---
 prismarine-viewer/examples/baseScene.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prismarine-viewer/examples/baseScene.ts b/prismarine-viewer/examples/baseScene.ts
index ec2db6e8..52b9e781 100644
--- a/prismarine-viewer/examples/baseScene.ts
+++ b/prismarine-viewer/examples/baseScene.ts
@@ -117,7 +117,7 @@ export class BasePlaygroundScene {
     const block =
       properties ?
         this.Block.fromProperties(loadedData.blocksByName[blockName].id, properties ?? {}, 0) :
-        this.Block.fromStateId(loadedData.blocksByName[blockName].defaultState!, 0)
+        this.Block.fromStateId(loadedData.blocksByName[blockName].defaultState, 0)
     this.world.setBlock(this.targetPos.offset(xOffset, yOffset, zOffset), block)
   }
 

From dbd4058912c9ce47cc4de68e0bcb96b2b633acc9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 28 Oct 2024 17:57:40 +0300
Subject: [PATCH 016/753] should fix publishing to npm

---
 .github/workflows/publish.yml | 4 ++++
 scripts/buildNpmReact.ts      | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index fa1f0281..c1c6af29 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -47,6 +47,10 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: .vercel/output/static
           force_orphan: true
+      - name: Set publishing config
+        run: pnpm config set '//registry.npmjs.org/:_authToken' "${NODE_AUTH_TOKEN}"
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       - run: pnpm tsx scripts/buildNpmReact.ts ${{ steps.release.outputs.tag }}
         if: steps.release.outputs.tag
         env:
diff --git a/scripts/buildNpmReact.ts b/scripts/buildNpmReact.ts
index f23a37cc..9d0b3484 100644
--- a/scripts/buildNpmReact.ts
+++ b/scripts/buildNpmReact.ts
@@ -148,6 +148,13 @@ fs.promises.readdir(path.resolve(__dirname, '../src/react')).then(async (files)
     fs.copyFileSync(path.resolve(__dirname, '../README.NPM.MD'), path.resolve(__dirname, '../dist-npm/README.md'))
 
     if (version !== '0.0.0-dev') {
-        execSync('npm publish', { cwd: path.resolve(__dirname, '../dist-npm') })
+        execSync('npm publish', {
+            cwd: path.resolve(__dirname, '../dist-npm'),
+            env: {
+                ...process.env,
+                NPM_TOKEN: process.env.NPM_TOKEN,
+                NODE_AUTH_TOKEN: process.env.NPM_TOKEN
+            }
+        })
     }
 })

From 900bcb0b56196ef3ac5105d665f286614582367f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 30 Oct 2024 07:02:33 +0300
Subject: [PATCH 017/753] fix: don't crash and conflict with g663 spyware
 installed

---
 index.html     |  9 +++++++++
 package.json   |  2 +-
 pnpm-lock.yaml | 20 +++++++++++++-------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/index.html b/index.html
index 304ee0a6..d662cbb6 100644
--- a/index.html
+++ b/index.html
@@ -4,6 +4,15 @@
     <meta name="darkreader-lock">
     <script>
       window.startLoad = Date.now()
+      // g663 fix: forbid change of string prototype
+      Object.defineProperty(String.prototype, 'format', {
+        writable: false,
+        configurable: false
+      });
+      Object.defineProperty(String.prototype, 'replaceAll', {
+        writable: false,
+        configurable: false
+      });
     </script>
     <!-- // #region initial loader -->
     <script async>
diff --git a/package.json b/package.json
index c458474b..1772da27 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "express": "^4.18.2",
     "filesize": "^10.0.12",
-    "flying-squid": "npm:@zardoy/flying-squid@^0.0.44",
+    "flying-squid": "npm:@zardoy/flying-squid@^0.0.45",
     "fs-extra": "^11.1.1",
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6eff7655..8f268d5a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -119,8 +119,8 @@ importers:
         specifier: ^10.0.12
         version: 10.0.12
       flying-squid:
-        specifier: npm:@zardoy/flying-squid@^0.0.44
-        version: '@zardoy/flying-squid@0.0.44(encoding@0.1.13)'
+        specifier: npm:@zardoy/flying-squid@^0.0.45
+        version: '@zardoy/flying-squid@0.0.45(encoding@0.1.13)'
       fs-extra:
         specifier: ^11.1.1
         version: 11.1.1
@@ -3395,8 +3395,8 @@ packages:
     resolution: {integrity: sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==}
     engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'}
 
-  '@zardoy/flying-squid@0.0.44':
-    resolution: {integrity: sha512-Co1fmBU1FkDD3WxiMzIZ4z2pYKFVeLGfdWJT2qQg0eQ9kP064NteOlI5sNNBjMqedNsZSlQdHzT+jkgcFnaGsQ==}
+  '@zardoy/flying-squid@0.0.45':
+    resolution: {integrity: sha512-cXCcc1t/6pIevBHRRSwTHhL/dldjGPTYmPwyxsANcrf5PWVDG8hlcIbsz0S0Qf4P0OZjJiQi2I9PahGaWtxPgg==}
     engines: {node: '>=8'}
     hasBin: true
 
@@ -4052,6 +4052,10 @@ packages:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
 
+  chalk@5.3.0:
+    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
+    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+
   change-case@4.1.2:
     resolution: {integrity: sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==}
 
@@ -7517,7 +7521,7 @@ packages:
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05:
     resolution: {tarball: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05}
-    version: 1.17.1
+    version: 1.19.0
 
   prismarine-chat@1.10.1:
     resolution: {integrity: sha512-XukYcuueuhDxzEXG7r8BZyt6jOObrPPB4JESCgb+/XenB9nExoSHF8eTQWWj8faKPLqm1dRQaYwFJlNBlJZJUw==}
@@ -13415,11 +13419,11 @@ snapshots:
       '@types/emscripten': 1.39.8
       tslib: 1.14.1
 
-  '@zardoy/flying-squid@0.0.44(encoding@0.1.13)':
+  '@zardoy/flying-squid@0.0.45(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
+      chalk: 5.3.0
       change-case: 4.1.2
-      colors: 1.4.0
       diamond-square: https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71
       emit-then: 2.0.0
       exit-hook: 2.2.1
@@ -14268,6 +14272,8 @@ snapshots:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
+  chalk@5.3.0: {}
+
   change-case@4.1.2:
     dependencies:
       camel-case: 4.1.2

From 547525d615b7ca2dfef01087f60cee871e0ea4ee Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 30 Oct 2024 08:40:44 +0300
Subject: [PATCH 018/753] fix: fix some blocks were rendered as transparent in
 old versions. Speed up Greenfield renderer by 18% in tunnels.

---
 scripts/makeOptimizedMcData.mjs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/scripts/makeOptimizedMcData.mjs b/scripts/makeOptimizedMcData.mjs
index 9794aeed..d0d2088d 100644
--- a/scripts/makeOptimizedMcData.mjs
+++ b/scripts/makeOptimizedMcData.mjs
@@ -42,8 +42,8 @@ const versionToNumber = (ver) => {
   return +`${x.padStart(2, '0')}${y.padStart(2, '0')}${z.padStart(2, '0')}`
 }
 
-// if not included here (even as {}) will not be bundled & accessible!
 const compressedOutput = false
+// if not included here (even as {}) will not be bundled & accessible!
 // const dataTypeBundling = {
 //   protocol: {
 //     // ignoreRemoved: true,
@@ -57,6 +57,18 @@ const dataTypeBundling = {
   },
   blocks: {
     arrKey: 'name',
+    processData (current, prev) {
+      for (const block of current) {
+        if (block.transparent) {
+          const forceOpaque = block.name.includes('shulker_box') || block.name.match(/^double_.+_slab\d?$/)
+
+          const prevBlock = prev?.find(x => x.name === block.name);
+          if (forceOpaque || (prevBlock && !prevBlock.transparent)) {
+            block.transparent = false
+          }
+        }
+      }
+    }
     // ignoreRemoved: true,
     // genChanges (source, diff) {
     //   const diffs = {}
@@ -164,6 +176,7 @@ for (const [i, [version, dataSet]] of versionsArr.reverse().entries()) {
         diffSources[dataType] = new JsonOptimizer(config.arrKey, config.ignoreChanges, config.ignoreRemoved)
       }
       try {
+        config.processData?.(dataRaw, previousData[dataType])
         diffSources[dataType].recordDiff(version, dataRaw)
         injectCode = `restoreDiff(sources, ${JSON.stringify(dataType)}, ${JSON.stringify(version)})`
       } catch (err) {

From 7d699f24bbfeeed03271dbb5b6ffc43680d9daa5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 30 Oct 2024 08:42:27 +0300
Subject: [PATCH 019/753] fix: some areas in old world were competely white

---
 prismarine-viewer/viewer/lib/mesher/mesher.ts | 1 +
 prismarine-viewer/viewer/lib/mesher/world.ts  | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/mesher/mesher.ts b/prismarine-viewer/viewer/lib/mesher/mesher.ts
index 4813cfc9..35a6171b 100644
--- a/prismarine-viewer/viewer/lib/mesher/mesher.ts
+++ b/prismarine-viewer/viewer/lib/mesher/mesher.ts
@@ -65,6 +65,7 @@ function setSectionDirty (pos, value = true) {
 const softCleanup = () => {
   // clean block cache and loaded chunks
   world = new World(world.config.version)
+  globalThis.world = world
 }
 
 const handleMessage = data => {
diff --git a/prismarine-viewer/viewer/lib/mesher/world.ts b/prismarine-viewer/viewer/lib/mesher/world.ts
index ae65118c..2cdee1d5 100644
--- a/prismarine-viewer/viewer/lib/mesher/world.ts
+++ b/prismarine-viewer/viewer/lib/mesher/world.ts
@@ -47,6 +47,8 @@ export class World {
   }
 
   getLight (pos: Vec3, isNeighbor = false, skipMoreChecks = false, curBlockName = '') {
+    // for easier testing
+    if (!(pos instanceof Vec3)) pos = new Vec3(...pos as [number, number, number])
     const { enableLighting, skyLight } = this.config
     if (!enableLighting) return 15
     // const key = `${pos.x},${pos.y},${pos.z}`
@@ -70,8 +72,10 @@ export class World {
         this.getLight(pos.offset(1, 0, 0), undefined, true),
         this.getLight(pos.offset(-1, 0, 0), undefined, true)
       ].filter(x => x !== 2)
-      const min = Math.min(...lights)
-      result = min
+      if (lights.length) {
+        const min = Math.min(...lights)
+        result = min
+      }
     }
     if (isNeighbor && result === 2) result = 15 // TODO
     return result

From 2fbfc18d2e1645a45c8fbe704af261c8d80af43e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 30 Oct 2024 11:33:26 +0300
Subject: [PATCH 020/753] feat: optimize slabs render performance by rendering
 less not visible tiles Improve performance in Greenfield by 6%

---
 prismarine-viewer/examples/baseScene.ts       | 11 ++-
 prismarine-viewer/examples/playground.ts      |  2 +-
 prismarine-viewer/examples/scenes/index.ts    |  1 +
 .../examples/scenes/slabsOptimization.ts      | 15 ++++
 prismarine-viewer/viewer/lib/mesher/models.ts | 88 ++++++++++---------
 .../viewer/lib/mesher/test/playground.ts      |  9 +-
 prismarine-viewer/viewer/lib/mesher/world.ts  | 42 +++++++--
 scripts/makeOptimizedMcData.mjs               |  2 +-
 8 files changed, 117 insertions(+), 53 deletions(-)
 create mode 100644 prismarine-viewer/examples/scenes/slabsOptimization.ts

diff --git a/prismarine-viewer/examples/baseScene.ts b/prismarine-viewer/examples/baseScene.ts
index 52b9e781..b192baa8 100644
--- a/prismarine-viewer/examples/baseScene.ts
+++ b/prismarine-viewer/examples/baseScene.ts
@@ -281,9 +281,14 @@ export class BasePlaygroundScene {
 
   addKeyboardShortcuts () {
     document.addEventListener('keydown', (e) => {
-      if (e.code === 'KeyR' && !e.shiftKey && !e.ctrlKey && !e.altKey && !e.metaKey) {
-        this.controls?.reset()
-        this.resetCamera()
+      if (!e.shiftKey && !e.ctrlKey && !e.altKey && !e.metaKey) {
+        if (e.code === 'KeyR') {
+          this.controls?.reset()
+          this.resetCamera()
+        }
+        if (e.code === 'KeyE') {
+          worldView?.setBlockStateId(this.targetPos, this.world.getBlockStateId(this.targetPos))
+        }
       }
     })
     document.addEventListener('visibilitychange', () => {
diff --git a/prismarine-viewer/examples/playground.ts b/prismarine-viewer/examples/playground.ts
index c6d216e6..cd0fa219 100644
--- a/prismarine-viewer/examples/playground.ts
+++ b/prismarine-viewer/examples/playground.ts
@@ -4,7 +4,7 @@ import * as scenes from './scenes'
 
 const qsScene = new URLSearchParams(window.location.search).get('scene')
 const Scene: typeof BasePlaygroundScene = qsScene ? scenes[qsScene] : scenes.main
-playgroundGlobalUiState.scenes = ['main', 'railsCobweb', 'floorRandom', 'lightingStarfield', 'transparencyIssue', 'entities', 'frequentUpdates']
+playgroundGlobalUiState.scenes = ['main', 'railsCobweb', 'floorRandom', 'lightingStarfield', 'transparencyIssue', 'entities', 'frequentUpdates', 'slabsOptimization']
 playgroundGlobalUiState.selected = qsScene ?? 'main'
 
 const scene = new Scene()
diff --git a/prismarine-viewer/examples/scenes/index.ts b/prismarine-viewer/examples/scenes/index.ts
index a526686e..81657a71 100644
--- a/prismarine-viewer/examples/scenes/index.ts
+++ b/prismarine-viewer/examples/scenes/index.ts
@@ -7,3 +7,4 @@ export { default as transparencyIssue } from './transparencyIssue'
 export { default as rotationIssue } from './rotationIssue'
 export { default as entities } from './entities'
 export { default as frequentUpdates } from './frequentUpdates'
+export { default as slabsOptimization } from './slabsOptimization'
diff --git a/prismarine-viewer/examples/scenes/slabsOptimization.ts b/prismarine-viewer/examples/scenes/slabsOptimization.ts
new file mode 100644
index 00000000..9035a777
--- /dev/null
+++ b/prismarine-viewer/examples/scenes/slabsOptimization.ts
@@ -0,0 +1,15 @@
+import { BasePlaygroundScene } from '../baseScene'
+
+export default class extends BasePlaygroundScene {
+  expectedNumberOfFaces = 30
+
+  setupWorld () {
+    this.addWorldBlock(0, 1, 0, 'stone_slab')
+    this.addWorldBlock(0, 0, 0, 'stone')
+    this.addWorldBlock(0, -1, 0, 'stone_slab', { type: 'top', waterlogged: false })
+    this.addWorldBlock(0, -1, -1, 'stone_slab', { type: 'top', waterlogged: false })
+    this.addWorldBlock(0, -1, 1, 'stone_slab', { type: 'top', waterlogged: false })
+    this.addWorldBlock(-1, -1, 0, 'stone_slab', { type: 'top', waterlogged: false })
+    this.addWorldBlock(1, -1, 0, 'stone_slab', { type: 'top', waterlogged: false })
+  }
+}
diff --git a/prismarine-viewer/viewer/lib/mesher/models.ts b/prismarine-viewer/viewer/lib/mesher/models.ts
index 92f4b0b5..9518ff2e 100644
--- a/prismarine-viewer/viewer/lib/mesher/models.ts
+++ b/prismarine-viewer/viewer/lib/mesher/models.ts
@@ -196,13 +196,53 @@ function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, typ
   }
 }
 
-let needRecompute = false
+const identicalCull = (currentElement: BlockElement, neighbor: Block, direction: Vec3) => {
+  const dirStr = `${direction.x},${direction.y},${direction.z}`
+  const lookForOppositeSide = {
+    '0,1,0': 'down',
+    '0,-1,0': 'up',
+    '1,0,0': 'east',
+    '-1,0,0': 'west',
+    '0,0,1': 'south',
+    '0,0,-1': 'north',
+  }[dirStr]!
+  const elemCompareForm = {
+    '0,1,0': (e: BlockElement) => `${e.from[0]},${e.from[2]}:${e.to[0]},${e.to[2]}`,
+    '0,-1,0': (e: BlockElement) => `${e.to[0]},${e.to[2]}:${e.from[0]},${e.from[2]}`,
+    '1,0,0': (e: BlockElement) => `${e.from[2]},${e.from[1]}:${e.to[2]},${e.to[1]}`,
+    '-1,0,0': (e: BlockElement) => `${e.to[2]},${e.to[1]}:${e.from[2]},${e.from[1]}`,
+    '0,0,1': (e: BlockElement) => `${e.from[1]},${e.from[2]}:${e.to[1]},${e.to[2]}`,
+    '0,0,-1': (e: BlockElement) => `${e.to[1]},${e.to[2]}:${e.from[1]},${e.from[2]}`,
+  }[dirStr]!
+  const elementEdgeValidator = {
+    '0,1,0': (e: BlockElement) => currentElement.from[1] === 0 && e.to[2] === 16,
+    '0,-1,0': (e: BlockElement) => currentElement.from[1] === 0 && e.to[2] === 16,
+    '1,0,0': (e: BlockElement) => currentElement.from[0] === 0 && e.to[1] === 16,
+    '-1,0,0': (e: BlockElement) => currentElement.from[0] === 0 && e.to[1] === 16,
+    '0,0,1': (e: BlockElement) => currentElement.from[2] === 0 && e.to[0] === 16,
+    '0,0,-1': (e: BlockElement) => currentElement.from[2] === 0 && e.to[0] === 16,
+  }[dirStr]!
+  const useVar = 0
+  const models = neighbor.models?.map(m => m[useVar] ?? m[0]) ?? []
+  // TODO we should support it! rewrite with optimizing general pipeline
+  if (models.some(m => m.x || m.y || m.z)) return
+  for (const model of models) {
+    for (const element of model.elements ?? []) {
+      // todo check alfa on texture
+      if (element.faces[lookForOppositeSide]?.cullface && elemCompareForm(currentElement) === elemCompareForm(element) && elementEdgeValidator(element)) {
+        return true
+      }
+    }
+  }
+}
+
+let needSectionRecomputeOnChange = false
 
 function renderElement (world: World, cursor: Vec3, element: BlockElement, doAO: boolean, attr: MesherGeometryOutput, globalMatrix: any, globalShift: any, block: Block, biome: string) {
   const position = cursor
   // const key = `${position.x},${position.y},${position.z}`
   // if (!globalThis.allowedBlocks.includes(key)) return
-  const cullIfIdentical = block.name.includes('glass')
+  const cullIfIdentical = block.name.includes('glass') || block.name.includes('ice')
 
   // eslint-disable-next-line guard-for-in
   for (const face in element.faces) {
@@ -211,12 +251,12 @@ function renderElement (world: World, cursor: Vec3, element: BlockElement, doAO:
     const dir = matmul3(globalMatrix, elemFaces[face].dir)
 
     if (eFace.cullface) {
-      const neighbor = world.getBlock(cursor.plus(new Vec3(...dir)))
+      const neighbor = world.getBlock(cursor.plus(new Vec3(...dir)), blockProvider, {})
       if (neighbor) {
-        if (cullIfIdentical && neighbor.type === block.type) continue
-        if (!neighbor.transparent && isCube(neighbor)) continue
+        if (cullIfIdentical && neighbor.stateId === block.stateId) continue
+        if (!neighbor.transparent && (isCube(neighbor) || identicalCull(element, neighbor, new Vec3(...dir)))) continue
       } else {
-        needRecompute = true
+        needSectionRecomputeOnChange = true
         continue
       }
     }
@@ -391,7 +431,6 @@ const invisibleBlocks = new Set(['air', 'cave_air', 'void_air', 'barrier'])
 const isBlockWaterlogged = (block: Block) => block.getProperties().waterlogged === true || block.getProperties().waterlogged === 'true'
 
 let unknownBlockModel: BlockModelPartsResolved
-let erroredBlockModel: BlockModelPartsResolved
 export function getSectionGeometry (sx, sy, sz, world: World) {
   let delayedRender = [] as Array<() => void>
 
@@ -421,7 +460,7 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
   for (cursor.y = sy; cursor.y < sy + 16; cursor.y++) {
     for (cursor.z = sz; cursor.z < sz + 16; cursor.z++) {
       for (cursor.x = sx; cursor.x < sx + 16; cursor.x++) {
-        const block = world.getBlock(cursor)!
+        let block = world.getBlock(cursor, blockProvider, attr)!
         if (!invisibleBlocks.has(block.name)) {
           const highest = attr.highestBlocks[`${cursor.x},${cursor.z}`]
           if (!highest || highest.y < cursor.y) {
@@ -459,6 +498,7 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
             if (block.models && JSON.stringify(block._originalProperties) !== JSON.stringify(block._properties)) {
               // recompute models
               block.models = undefined
+              block = world.getBlock(cursor, blockProvider, attr)!
             }
           } else {
             block._properties = block._originalProperties ?? block._properties
@@ -481,37 +521,6 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
         if (block.name !== 'water' && block.name !== 'lava' && !invisibleBlocks.has(block.name)) {
           // cache
           let { models } = block
-          if (block.models === undefined) {
-            const props = block.getProperties()
-            try {
-              // fixme
-              if (world.preflat) {
-                if (block.name === 'cobblestone_wall') {
-                  props.up = 'true'
-                  for (const key of ['north', 'south', 'east', 'west']) {
-                    const val = props[key]
-                    if (val === 'false' || val === 'true') {
-                      props[key] = val === 'true' ? 'low' : 'none'
-                    }
-                  }
-                }
-              }
-
-              models = blockProvider.getAllResolvedModels0_1({
-                name: block.name,
-                properties: props,
-              }, world.preflat)! // fixme! this is a hack (also need a setting for all versions)
-              if (!models.length) {
-                console.debug('[mesher] block to render not found', block.name, props)
-                models = null
-              }
-            } catch (err) {
-              models ??= erroredBlockModel
-              console.error(`Critical assets error. Unable to get block model for ${block.name}[${JSON.stringify(props)}]: ` + err.message, err.stack)
-              attr.hadErrors = true
-            }
-          }
-          block.models = models ?? null
 
           models ??= unknownBlockModel
 
@@ -607,7 +616,6 @@ export const setBlockStatesData = (blockstatesModels, blocksAtlas: any, _needTil
   globalThis.blockProvider = blockProvider
   if (useUnknownBlockModel) {
     unknownBlockModel = blockProvider.getAllResolvedModels0_1({ name: 'unknown', properties: {} })
-    erroredBlockModel = blockProvider.getAllResolvedModels0_1({ name: 'errored', properties: {} })
   }
 
   needTiles = _needTiles
diff --git a/prismarine-viewer/viewer/lib/mesher/test/playground.ts b/prismarine-viewer/viewer/lib/mesher/test/playground.ts
index 2a0ce774..0441dd60 100644
--- a/prismarine-viewer/viewer/lib/mesher/test/playground.ts
+++ b/prismarine-viewer/viewer/lib/mesher/test/playground.ts
@@ -1,3 +1,4 @@
+import { BlockNames } from '../../../../../src/mcDataTypes'
 import { setup } from './mesherTester'
 
 const addPositions = [
@@ -10,8 +11,10 @@ const addPositions = [
   [[0, 0, -1], 'stone'],
 ] as const
 
-const { mesherWorld, getGeometry, pos, mcData } = setup('1.18.1', addPositions as any)
+const { mesherWorld, getGeometry, pos, mcData } = setup('1.21.1', addPositions as any)
 
-// mesherWorld.setBlockStateId(pos, mcData.blocksByName.soul_sand.defaultState)
+// mesherWorld.setBlockStateId(pos, 712)
+// mesherWorld.setBlockStateId(pos, mcData.blocksByName.stone_slab.defaultState)
+mesherWorld.setBlockStateId(pos, 11_225)
 
-// console.log(getGeometry().centerTileNeighbors)
+console.log(getGeometry().centerTileNeighbors)
diff --git a/prismarine-viewer/viewer/lib/mesher/world.ts b/prismarine-viewer/viewer/lib/mesher/world.ts
index 2cdee1d5..491b5650 100644
--- a/prismarine-viewer/viewer/lib/mesher/world.ts
+++ b/prismarine-viewer/viewer/lib/mesher/world.ts
@@ -38,6 +38,7 @@ export class World {
   blockCache = {}
   biomeCache: { [id: number]: mcData.Biome }
   preflat: boolean
+  erroredBlockModel: BlockModelPartsResolved
 
   constructor (version) {
     this.Chunk = Chunks(version) as any
@@ -112,7 +113,7 @@ export class World {
     return this.getColumn(Math.floor(pos.x / 16) * 16, Math.floor(pos.z / 16) * 16)
   }
 
-  getBlock (pos: Vec3): WorldBlock | null {
+  getBlock (pos: Vec3, blockProvider?, attr?): WorldBlock | null {
     // for easier testing
     if (!(pos instanceof Vec3)) pos = new Vec3(...pos as [number, number, number])
     const key = columnKey(Math.floor(pos.x / 16) * 16, Math.floor(pos.z / 16) * 16)
@@ -126,8 +127,7 @@ export class World {
     const stateId = column.getBlockStateId(locInChunk)
 
     if (!this.blockCache[stateId]) {
-      const b = column.getBlock(locInChunk)
-      //@ts-expect-error
+      const b = column.getBlock(locInChunk) as unknown as WorldBlock
       b.isCube = isCube(b.shapes)
       this.blockCache[stateId] = b
       Object.defineProperty(b, 'position', {
@@ -136,7 +136,6 @@ export class World {
         }
       })
       if (this.preflat) {
-        //@ts-expect-error
         b._properties = {}
 
         const namePropsStr = legacyJson.blocks[b.type + ':' + b.metadata] || findClosestLegacyBlockFallback(b.type, b.metadata, pos)
@@ -149,7 +148,6 @@ export class World {
               if (!isNaN(val)) val = parseInt(val, 10)
               return [key, val]
             }))
-            //@ts-expect-error
             b._properties = newProperties
           }
         }
@@ -157,6 +155,40 @@ export class World {
     }
 
     const block = this.blockCache[stateId]
+
+    if (block.models === undefined && blockProvider) {
+      if (!attr) throw new Error('attr is required')
+      const props = block.getProperties()
+      try {
+        // fixme
+        if (this.preflat) {
+          if (block.name === 'cobblestone_wall') {
+            props.up = 'true'
+            for (const key of ['north', 'south', 'east', 'west']) {
+              const val = props[key]
+              if (val === 'false' || val === 'true') {
+                props[key] = val === 'true' ? 'low' : 'none'
+              }
+            }
+          }
+        }
+
+        block.models = blockProvider.getAllResolvedModels0_1({
+          name: block.name,
+          properties: props,
+        }, this.preflat)! // fixme! this is a hack (also need a setting for all versions)
+        if (!block.models!.length) {
+          console.debug('[mesher] block to render not found', block.name, props)
+          block.models = null
+        }
+      } catch (err) {
+        this.erroredBlockModel ??= blockProvider.getAllResolvedModels0_1({ name: 'errored', properties: {} })
+        block.models ??= this.erroredBlockModel
+        console.error(`Critical assets error. Unable to get block model for ${block.name}[${JSON.stringify(props)}]: ` + err.message, err.stack)
+        attr.hadErrors = true
+      }
+    }
+
     if (block.name === 'flowing_water') block.name = 'water'
     if (block.name === 'flowing_lava') block.name = 'lava'
     // block.position = loc // it overrides position of all currently loaded blocks
diff --git a/scripts/makeOptimizedMcData.mjs b/scripts/makeOptimizedMcData.mjs
index d0d2088d..74477d7f 100644
--- a/scripts/makeOptimizedMcData.mjs
+++ b/scripts/makeOptimizedMcData.mjs
@@ -60,7 +60,7 @@ const dataTypeBundling = {
     processData (current, prev) {
       for (const block of current) {
         if (block.transparent) {
-          const forceOpaque = block.name.includes('shulker_box') || block.name.match(/^double_.+_slab\d?$/)
+          const forceOpaque = block.name.includes('shulker_box') || block.name.match(/^double_.+_slab\d?$/) || ['melon_block', 'lit_pumpkin', 'lit_redstone_ore', 'lit_furnace'].includes(block.name)
 
           const prevBlock = prev?.find(x => x.name === block.name);
           if (forceOpaque || (prevBlock && !prevBlock.transparent)) {

From f13c4e458127c9978dcc96091967eaece042c1ea Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 30 Oct 2024 14:23:45 +0300
Subject: [PATCH 021/753] feat: turn back smooth lighting on old maps

---
 prismarine-viewer/examples/baseScene.ts       |  3 ++
 prismarine-viewer/viewer/lib/mesher/models.ts | 29 ++++++++++++++-----
 .../viewer/lib/mesher/standaloneRenderer.ts   | 22 --------------
 src/customCommands.ts                         |  2 +-
 src/optionsGuiScheme.tsx                      |  2 +-
 src/watchOptions.ts                           |  3 +-
 6 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/prismarine-viewer/examples/baseScene.ts b/prismarine-viewer/examples/baseScene.ts
index b192baa8..1db68eb8 100644
--- a/prismarine-viewer/examples/baseScene.ts
+++ b/prismarine-viewer/examples/baseScene.ts
@@ -302,6 +302,9 @@ export class BasePlaygroundScene {
     })
 
     const updateKeys = () => {
+      if (pressedKeys.has('ControlLeft') || pressedKeys.has('MetaLeft')) {
+        return
+      }
       // if (typeof viewer === 'undefined') return
       // Create a vector that points in the direction the camera is looking
       const direction = new THREE.Vector3(0, 0, 0)
diff --git a/prismarine-viewer/viewer/lib/mesher/models.ts b/prismarine-viewer/viewer/lib/mesher/models.ts
index 9518ff2e..555efd80 100644
--- a/prismarine-viewer/viewer/lib/mesher/models.ts
+++ b/prismarine-viewer/viewer/lib/mesher/models.ts
@@ -350,6 +350,8 @@ function renderElement (world: World, cursor: Vec3, element: BlockElement, doAO:
       }
 
       let light = 1
+      const { smoothLighting } = world.config
+      // const smoothLighting = true
       if (doAO) {
         const dx = pos[0] * 2 - 1
         const dy = pos[1] * 2 - 1
@@ -361,14 +363,25 @@ function renderElement (world: World, cursor: Vec3, element: BlockElement, doAO:
         const side2 = world.getBlock(cursor.offset(...side2Dir))
         const corner = world.getBlock(cursor.offset(...cornerDir))
 
-        let cornerLightResult = 15
-        // eslint-disable-next-line no-constant-condition, sonarjs/no-gratuitous-expressions
-        if (/* world.config.smoothLighting */false) { // todo fix
-          const side1Light = world.getLight(cursor.plus(new Vec3(...side1Dir)), true)
-          const side2Light = world.getLight(cursor.plus(new Vec3(...side2Dir)), true)
-          const cornerLight = world.getLight(cursor.plus(new Vec3(...cornerDir)), true)
+        let cornerLightResult = baseLight * 15
+
+        if (smoothLighting) {
+          const dirVec = new Vec3(...dir)
+          const getVec = (v: Vec3) => {
+            for (const coord of ['x', 'y', 'z']) {
+              if (Math.abs(dirVec[coord]) > 0) v[coord] = 0
+            }
+            return v.plus(dirVec)
+          }
+          const side1LightDir = getVec(new Vec3(...side1Dir))
+          const side1Light = world.getLight(cursor.plus(side1LightDir))
+          const side2DirLight = getVec(new Vec3(...side2Dir))
+          const side2Light = world.getLight(cursor.plus(side2DirLight))
+          const cornerLightDir = getVec(new Vec3(...cornerDir))
+          const cornerLight = world.getLight(cursor.plus(cornerLightDir))
           // interpolate
-          cornerLightResult = (side1Light + side2Light + cornerLight) / 3
+          const lights = [side1Light, side2Light, cornerLight, baseLight * 15]
+          cornerLightResult = lights.reduce((acc, cur) => acc + cur, 0) / lights.length
         }
 
         const side1Block = world.shouldMakeAo(side1) ? 1 : 0
@@ -384,7 +397,7 @@ function renderElement (world: World, cursor: Vec3, element: BlockElement, doAO:
       }
 
       if (!needTiles) {
-        attr.colors.push(baseLight * tint[0] * light, baseLight * tint[1] * light, baseLight * tint[2] * light)
+        attr.colors.push(tint[0] * light, tint[1] * light, tint[2] * light)
       }
     }
 
diff --git a/prismarine-viewer/viewer/lib/mesher/standaloneRenderer.ts b/prismarine-viewer/viewer/lib/mesher/standaloneRenderer.ts
index 43369cc2..e01dd669 100644
--- a/prismarine-viewer/viewer/lib/mesher/standaloneRenderer.ts
+++ b/prismarine-viewer/viewer/lib/mesher/standaloneRenderer.ts
@@ -119,34 +119,12 @@ function renderElement (element: BlockElement, doAO: boolean, attr, globalMatrix
 
       let light = 1
       if (doAO) {
-        const dx = pos[0] * 2 - 1
-        const dy = pos[1] * 2 - 1
-        const dz = pos[2] * 2 - 1
-        const cornerDir = matmul3(globalMatrix, [dx, dy, dz])
-        const side1Dir = matmul3(globalMatrix, [dx * mask1[0], dy * mask1[1], dz * mask1[2]])
-        const side2Dir = matmul3(globalMatrix, [dx * mask2[0], dy * mask2[1], dz * mask2[2]])
-        // const side1 = world.getBlock(cursor.offset(...side1Dir))
-        // const side2 = world.getBlock(cursor.offset(...side2Dir))
-        // const corner = world.getBlock(cursor.offset(...cornerDir))
-
         const cornerLightResult = 15
-        // if (/* world.config.smoothLighting */false) { // todo fix
-        //   const side1Light = world.getLight(cursor.plus(new Vec3(...side1Dir)), true)
-        //   const side2Light = world.getLight(cursor.plus(new Vec3(...side2Dir)), true)
-        //   const cornerLight = world.getLight(cursor.plus(new Vec3(...cornerDir)), true)
-        //   // interpolate
-        //   cornerLightResult = (side1Light + side2Light + cornerLight) / 3
-        // }
 
-        // const side1Block = world.shouldMakeAo(side1) ? 1 : 0
-        // const side2Block = world.shouldMakeAo(side2) ? 1 : 0
-        // const cornerBlock = world.shouldMakeAo(corner) ? 1 : 0
         const side1Block = 0
         const side2Block = 0
         const cornerBlock = 0
 
-        // TODO: correctly interpolate ao light based on pos (evaluate once for each corner of the block)
-
         const ao = (side1Block && side2Block) ? 0 : (3 - (side1Block + side2Block + cornerBlock))
         // todo light should go upper on lower blocks
         light = (ao + 1) / 4 * (cornerLightResult / 15)
diff --git a/src/customCommands.ts b/src/customCommands.ts
index eddfc89e..75c13f68 100644
--- a/src/customCommands.ts
+++ b/src/customCommands.ts
@@ -59,7 +59,7 @@ export const customCommandsConfig = {
       }
     ],
     handler ([setting, action, value]) {
-      if (action === 'toggle') {
+      if (action === 'toggle' || action === undefined) {
         const value = options[setting]
         const config = tryFindOptionConfig(setting)
         if (config && 'values' in config && config.values) {
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index da934614..18d76511 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -72,7 +72,7 @@ export const guiOptionsScheme: {
       dayCycleAndLighting: {
         text: 'Day Cycle',
       },
-      // smoothLighting: {},
+      smoothLighting: {},
       newVersionsLighting: {
         text: 'Lighting in newer versions',
       },
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 95c725a0..3ea17063 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -59,8 +59,7 @@ export const watchOptionsAfterViewerInit = () => {
     viewer.world.displayStats = o.renderDebug === 'advanced'
   })
 
-  // viewer.world.mesherConfig.smoothLighting = options.smoothLighting
-  viewer.world.mesherConfig.smoothLighting = false // todo not supported for now
+  viewer.world.mesherConfig.smoothLighting = options.smoothLighting
   subscribeKey(options, 'smoothLighting', () => {
     viewer.world.mesherConfig.smoothLighting = options.smoothLighting;
     (viewer.world as WorldRendererThree).rerenderAllChunks()

From 03c6a3f72477d3134cafb546ddb471bfc7a8cb75 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 30 Oct 2024 14:40:18 +0300
Subject: [PATCH 022/753] feat: server resource packs (#215)

Co-authored-by: Mqx <62719703+Mqxx@users.noreply.github.com>
---
 prismarine-viewer/rsbuildSharedConfig.ts |  2 +-
 prismarine-viewer/viewer/lib/entities.ts |  1 -
 src/browserfs.ts                         |  1 +
 src/controls.ts                          |  2 +-
 src/optionsGuiScheme.tsx                 |  2 +-
 src/resourcePack.ts                      | 83 ++++++++++++++++--------
 6 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/prismarine-viewer/rsbuildSharedConfig.ts b/prismarine-viewer/rsbuildSharedConfig.ts
index 0c248f6c..24a29a26 100644
--- a/prismarine-viewer/rsbuildSharedConfig.ts
+++ b/prismarine-viewer/rsbuildSharedConfig.ts
@@ -46,7 +46,7 @@ export const appAndRendererSharedConfig = () => defineConfig({
     },
     server: {
         htmlFallback: false,
-        publicDir: false,
+        // publicDir: false,
         headers: {
             // enable shared array buffer
             'Cross-Origin-Opener-Policy': 'same-origin',
diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index 29bdc97f..58b6673b 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -340,7 +340,6 @@ export class Entities extends EventEmitter {
   }
 
   update (entity: import('prismarine-entity').Entity & { delete?; pos }, overrides) {
-    console.log('entity', entity)
     const isPlayerModel = entity.name === 'player'
     if (entity.name === 'zombie' || entity.name === 'zombie_villager' || entity.name === 'husk') {
       overrides.texture = `textures/1.16.4/entity/${entity.name === 'zombie_villager' ? 'zombie_villager/zombie_villager.png' : `zombie/${entity.name}.png`}`
diff --git a/src/browserfs.ts b/src/browserfs.ts
index 82d24058..e3675b4c 100644
--- a/src/browserfs.ts
+++ b/src/browserfs.ts
@@ -16,6 +16,7 @@ browserfs.install(window)
 const defaultMountablePoints = {
   '/world': { fs: 'LocalStorage' }, // will be removed in future
   '/data': { fs: 'IndexedDB' },
+  '/resourcepack': { fs: 'InMemory' }, // temporary storage for currently loaded resource pack
 }
 browserfs.configure({
   fs: 'MountableFileSystem',
diff --git a/src/controls.ts b/src/controls.ts
index d29d141f..12dfacb5 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -475,7 +475,7 @@ export const f3Keybinds = [
       // TODO!
       if (resourcePackState.resourcePackInstalled || loadedGameState.usingServerResourcePack) {
         showNotification('Reloading textures...')
-        await completeTexturePackInstall('default', 'default')
+        await completeTexturePackInstall('default', 'default', loadedGameState.usingServerResourcePack)
       }
     },
     mobileTitle: 'Reload Textures'
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 18d76511..87ad3882 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -164,7 +164,7 @@ export const guiOptionsScheme: {
               }
               if (choice === 'Enable') {
                 options.enabledResourcepack = name
-                await completeTexturePackInstall(name, name)
+                await completeTexturePackInstall(name, name, false)
                 return
               }
               if (choice === 'Uninstall') {
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index aac1c5bc..530a5bcd 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -9,6 +9,7 @@ import { options } from './optionsStorage'
 import { showOptionsModal } from './react/SelectOption'
 import { appStatusState } from './react/AppStatusProvider'
 import { appReplacableResources, resourcesContentOriginal } from './generated/resources'
+import { loadedGameState } from './globalState'
 
 export const resourcePackState = proxy({
   resourcePackInstalled: false,
@@ -24,9 +25,14 @@ const getLoadedImage = async (url: string) => {
   return img
 }
 
-const texturePackBasePath2 = '/data/resourcePacks/'
+const texturePackBasePath = '/data/resourcePacks/'
 export const uninstallTexturePack = async (name = 'default') => {
-  const basePath = texturePackBasePath2 + name
+  if (await existsAsync('/resourcepack/pack.mcmeta')) {
+    await removeFileRecursiveAsync('/resourcepack')
+    loadedGameState.usingServerResourcePack = false
+  }
+  const basePath = texturePackBasePath + name
+  if (!(await existsAsync(basePath))) return
   await removeFileRecursiveAsync(basePath)
   options.enabledResourcepack = null
   await updateTexturePackInstalledState()
@@ -35,7 +41,7 @@ export const uninstallTexturePack = async (name = 'default') => {
 export const getResourcePackNames = async () => {
   // TODO
   try {
-    return { [await fs.promises.readFile(join(texturePackBasePath2, 'default', 'name.txt'), 'utf8')]: true }
+    return { [await fs.promises.readFile(join(texturePackBasePath, 'default', 'name.txt'), 'utf8')]: true }
   } catch (err) {
     return {}
   }
@@ -47,7 +53,7 @@ export const fromTexturePackPath = (path) => {
 
 export const updateTexturePackInstalledState = async () => {
   try {
-    resourcePackState.resourcePackInstalled = await existsAsync(texturePackBasePath2 + 'default')
+    resourcePackState.resourcePackInstalled = await existsAsync(texturePackBasePath + 'default')
   } catch {
   }
 }
@@ -58,31 +64,36 @@ export const installTexturePackFromHandle = async () => {
   // await completeTexturePackInstall()
 }
 
-export const installTexturePack = async (file: File | ArrayBuffer, displayName = file['name'], name = 'default') => {
+export const installTexturePack = async (file: File | ArrayBuffer, displayName = file['name'], name = 'default', isServer = false) => {
+  const installPath = isServer ? '/resourcepack/' : texturePackBasePath + name
   try {
     await uninstallTexturePack(name)
   } catch (err) {
   }
+  const showLoader = !isServer
   const status = 'Installing resource pack: copying all files'
-  setLoadingScreenStatus(status)
+
+  if (showLoader) {
+    setLoadingScreenStatus(status)
+  }
   // extract the zip and write to fs every file in it
   const zip = new JSZip()
   const zipFile = await zip.loadAsync(file)
   if (!zipFile.file('pack.mcmeta')) throw new Error('Not a resource pack: missing /pack.mcmeta')
-  const basePath = texturePackBasePath2 + name
-  await mkdirRecursive(basePath)
+  await mkdirRecursive(installPath)
 
   const allFilesArr = Object.entries(zipFile.files)
+    .filter(([path]) => !path.startsWith('.') && !path.startsWith('_') && !path.startsWith('/')) // ignore dot files and __MACOSX
   let done = 0
   const upStatus = () => {
-    setLoadingScreenStatus(`${status} ${Math.round(done / allFilesArr.length * 100)}%`)
+    if (showLoader) {
+      setLoadingScreenStatus(`${status} ${Math.round(done / allFilesArr.length * 100)}%`)
+    }
   }
   const createdDirs = new Set<string>()
   const copyTasks = [] as Array<Promise<void>>
   await Promise.all(allFilesArr.map(async ([path, file]) => {
-    // ignore dot files and __MACOSX
-    if (path.startsWith('.') || path.startsWith('_') || path.startsWith('/')) return
-    const writePath = join(basePath, path)
+    const writePath = join(installPath, path)
     if (path.endsWith('/')) return
     const dir = dirname(writePath)
     if (!createdDirs.has(dir)) {
@@ -93,26 +104,32 @@ export const installTexturePack = async (file: File | ArrayBuffer, displayName =
       await Promise.all(copyTasks)
       copyTasks.length = 0
     }
-    const promise = fs.promises.writeFile(writePath, Buffer.from(await file.async('arraybuffer')))
+    const promise = fs.promises.writeFile(writePath, Buffer.from(await file.async('arraybuffer')) as any)
     copyTasks.push(promise)
     await promise
     done++
     upStatus()
   }))
   console.log('done')
-  await completeTexturePackInstall(displayName, name)
+  await completeTexturePackInstall(displayName, name, isServer)
 }
 
 // or enablement
-export const completeTexturePackInstall = async (displayName: string, name: string) => {
-  const basePath = texturePackBasePath2 + name
-  await fs.promises.writeFile(join(basePath, 'name.txt'), displayName, 'utf8')
+export const completeTexturePackInstall = async (displayName: string | undefined, name: string, isServer: boolean) => {
+  const basePath = isServer ? '/resourcepack/' : texturePackBasePath + name
+  if (displayName) {
+    await fs.promises.writeFile(join(basePath, 'name.txt'), displayName, 'utf8')
+  }
 
   await updateTextures()
   setLoadingScreenStatus(undefined)
   showNotification('Texturepack installed & enabled')
   await updateTexturePackInstalledState()
-  options.enabledResourcepack = name
+  if (isServer) {
+    loadedGameState.usingServerResourcePack = true
+  } else {
+    options.enabledResourcepack = name
+  }
 }
 
 const existsAsync = async (path) => {
@@ -138,8 +155,8 @@ const getSizeFromImage = async (filePath: string) => {
 }
 
 export const getActiveTexturepackBasePath = async () => {
-  if (await existsAsync('/data/resourcePacks/server/pack.mcmeta')) {
-    return '/data/resourcePacks/server'
+  if (await existsAsync('/resourcepack/pack.mcmeta')) {
+    return '/resourcepack'
   }
   const { enabledResourcepack } = options
   // const enabledResourcepack = 'default'
@@ -262,16 +279,23 @@ const prepareBlockstatesAndModels = async () => {
   }
 }
 
-const downloadAndUseResourcePack = async (url) => {
-  console.log('downloadAndUseResourcePack', url)
+const downloadAndUseResourcePack = async (url: string): Promise<void> => {
+  console.log('Downloading server resource pack', url)
+  const response = await fetch(url)
+  const resourcePackData = await response.arrayBuffer()
+  showNotification('Installing resource pack...')
+  installTexturePack(resourcePackData, undefined, undefined, true).catch((err) => {
+    console.error(err)
+    showNotification('Failed to install resource pack: ' + err.message)
+  })
 }
 
 export const onAppLoad = () => {
-  customEvents.on('gameLoaded', () => {
+  customEvents.on('mineflayerBotCreated', () => {
     // todo also handle resourcePack
-    bot._client.on('resource_pack_send', async (packet) => {
+    const handleResourcePackRequest = async (packet) => {
       if (options.serverResourcePacks === 'never') return
-      const promptMessage = 'promptMessage' in packet ? JSON.stringify(packet.promptMessage) : 'Do you want to use server resource pack?'
+      const promptMessage = ('promptMessage' in packet && packet.promptMessage) ? JSON.stringify(packet.promptMessage) : 'Do you want to use server resource pack?'
       // TODO!
       const hash = 'hash' in packet ? packet.hash : '-'
       const forced = 'forced' in packet ? packet.forced : false
@@ -281,9 +305,14 @@ export const onAppLoad = () => {
           cancel: !forced
         })
       if (!choice) return
-      await downloadAndUseResourcePack(packet.url)
       bot.acceptResourcePack()
-    })
+      await downloadAndUseResourcePack(packet.url).catch((err) => {
+        console.error(err)
+        showNotification('Failed to download resource pack: ' + err.message)
+      })
+    }
+    bot._client.on('resource_pack_send', handleResourcePackRequest)
+    bot._client.on('add_resource_pack' as any, handleResourcePackRequest)
   })
 
   subscribe(resourcePackState, () => {

From 84b3f8913d1120a218f56c8a13c06f4bda093061 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 30 Oct 2024 23:53:45 +0300
Subject: [PATCH 023/753] fix: don't make text move in loading screens

---
 src/react/AppStatus.tsx | 42 ++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/react/AppStatus.tsx b/src/react/AppStatus.tsx
index 31f08641..19b4abbf 100644
--- a/src/react/AppStatus.tsx
+++ b/src/react/AppStatus.tsx
@@ -14,27 +14,26 @@ export default ({
   actionsSlot = null as React.ReactNode | null,
   children
 }) => {
-  const [loadingDots, setLoadingDots] = useState('')
+  const [loadingDotIndex, setLoadingDotIndex] = useState(0)
 
   useEffect(() => {
+    const statusRunner = async () => {
+      const timer = async (ms) => new Promise((resolve) => { setTimeout(resolve, ms) })
+
+      const load = async () => {
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+          setLoadingDotIndex(i => (i + 1) % 4)
+          await timer(500) // eslint-disable-line no-await-in-loop
+        }
+      }
+
+      void load()
+    }
+
     void statusRunner()
   }, [])
 
-  const statusRunner = async () => {
-    const array = ['.', '..', '...', '']
-
-    const timer = async (ms) => new Promise((resolve) => { setTimeout(resolve, ms) })
-
-    const load = async () => {
-      // eslint-disable-next-line no-constant-condition
-      for (let i = 0; true; i = (i + 1) % array.length) {
-        setLoadingDots(array[i])
-        await timer(500) // eslint-disable-line no-await-in-loop
-      }
-    }
-
-    void load()
-  }
 
   return (
     <Screen
@@ -48,7 +47,16 @@ export default ({
           >
             {status}
           </span>
-          {isError || hideDots ? '' : loadingDots}
+          <div style={{ display: 'inline-flex', gap: '1px', }} hidden={hideDots || isError}>
+            {
+              [...'...'].map((dot, i) => {
+                return <span
+                  key={i} style={{
+                    visibility: loadingDotIndex <= i ? 'hidden' : 'visible',
+                  }}>{dot}</span>
+              })
+            }
+          </div>
           <p className={styles['potential-problem']}>{description}</p>
           <p className={styles['last-status']}>{lastStatus ? `Last status: ${lastStatus}` : lastStatus}</p>
         </>

From 5791626cc5dfb5755f4e568815e4375b0432dca4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 31 Oct 2024 00:28:54 +0300
Subject: [PATCH 024/753] fix: (latest) or (offline) status text was not
 displayed sometimes after the page load

---
 src/react/MainMenu.tsx          | 25 ++++++++++++++++---------
 src/react/MainMenuRenderApp.tsx | 10 ++++++++--
 src/utils.ts                    |  4 ++--
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 45bc4296..45196f4c 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -19,8 +19,10 @@ interface Props {
   mapsProvider?: string
   versionStatus?: string
   versionTitle?: string
-  onVersionClick?: () => void
+  onVersionStatusClick?: () => void
   bottomRightLinks?: string
+  versionText?: string
+  onVersionTextClick?: () => void
 }
 
 const httpsRegex = /^https?:\/\//
@@ -33,9 +35,11 @@ export default ({
   githubAction,
   linksButton,
   openFileAction,
+  versionText,
+  onVersionTextClick,
   versionStatus,
   versionTitle,
-  onVersionClick,
+  onVersionStatusClick,
   bottomRightLinks
 }: Props) => {
   if (!bottomRightLinks?.trim()) bottomRightLinks = undefined
@@ -109,13 +113,16 @@ export default ({
       </div>
 
       <div className={styles['bottom-info']}>
-        <span
-          title={`${versionTitle} (click to reload)`}
-          onClick={onVersionClick}
-          className={styles['product-info']}
-        >
-          Prismarine Web Client {versionStatus}
-        </span>
+        <div style={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
+          <span style={{ fontSize: 10, color: 'gray' }} onClick={onVersionTextClick}>{versionText}</span>
+          <span
+            title={`${versionTitle} (click to reload)`}
+            onClick={onVersionStatusClick}
+            className={styles['product-info']}
+          >
+            Prismarine Web Client {versionStatus}
+          </span>
+        </div>
         <span className={styles['product-description']}>
           <div className={styles['product-link']}>
             {linksParsed?.map(([name, link], i, arr) => {
diff --git a/src/react/MainMenuRenderApp.tsx b/src/react/MainMenuRenderApp.tsx
index 37c7966b..4fed18d6 100644
--- a/src/react/MainMenuRenderApp.tsx
+++ b/src/react/MainMenuRenderApp.tsx
@@ -65,8 +65,11 @@ export default () => {
           setVersionStatus(`(${isLatest ? 'latest' : 'new version available'}${mainMenuState.serviceWorkerLoaded ? ' - Available Offline' : ''})`)
         }
         subscribe(mainMenuState, upStatus)
+        upStatus()
         setVersionTitle(`Loaded: ${process.env.BUILD_VERSION}. Remote: ${contents}`)
-      }, () => { })
+      }, () => {
+        setVersionStatus('(offline)')
+      })
     }
   }, [])
 
@@ -113,10 +116,13 @@ export default () => {
         mapsProvider={mapsProviderUrl}
         versionStatus={versionStatus}
         versionTitle={versionTitle}
-        onVersionClick={async () => {
+        onVersionStatusClick={async () => {
           setVersionStatus('(reloading)')
           await refreshApp()
         }}
+        onVersionTextClick={async () => {
+          openGithub('/releases')
+        }}
       />
     </div>}
   </Transition>
diff --git a/src/utils.ts b/src/utils.ts
index f6a6176f..0d0875e9 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -185,8 +185,8 @@ export const reloadChunks = async () => {
   await worldView.updatePosition(bot.entity.position, true)
 }
 
-export const openGithub = () => {
-  window.open(process.env.GITHUB_URL, '_blank')
+export const openGithub = (addUrl = '') => {
+  window.open(`${process.env.GITHUB_URL}${addUrl}`, '_blank')
 }
 
 export const resolveTimeout = async (promise, timeout = 10_000) => {

From 7d0c3643d36c33611d78a12ae4a7d18ada498532 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 31 Oct 2024 01:34:21 +0300
Subject: [PATCH 025/753] fix: don't reset the world in mesher after resourece
 pack textures update

---
 prismarine-viewer/viewer/lib/mesher/mesher.ts |  6 ++++--
 prismarine-viewer/viewer/lib/mesher/world.ts  |  2 +-
 prismarine-viewer/viewer/lib/viewer.ts        |  2 +-
 src/resourcePack.ts                           | 12 +++++++-----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/mesher/mesher.ts b/prismarine-viewer/viewer/lib/mesher/mesher.ts
index 35a6171b..b38f0427 100644
--- a/prismarine-viewer/viewer/lib/mesher/mesher.ts
+++ b/prismarine-viewer/viewer/lib/mesher/mesher.ts
@@ -76,8 +76,10 @@ const handleMessage = data => {
   }
 
   if (data.config) {
-    if (data.type === 'mesherData' && allDataReady) {
-      world = undefined as any // reset models
+    if (data.type === 'mesherData' && world) {
+      // reset models
+      world.blockCache = {}
+      world.erroredBlockModel = undefined
     }
 
     world ??= new World(data.config.version)
diff --git a/prismarine-viewer/viewer/lib/mesher/world.ts b/prismarine-viewer/viewer/lib/mesher/world.ts
index 491b5650..c69da751 100644
--- a/prismarine-viewer/viewer/lib/mesher/world.ts
+++ b/prismarine-viewer/viewer/lib/mesher/world.ts
@@ -38,7 +38,7 @@ export class World {
   blockCache = {}
   biomeCache: { [id: number]: mcData.Biome }
   preflat: boolean
-  erroredBlockModel: BlockModelPartsResolved
+  erroredBlockModel?: BlockModelPartsResolved
 
   constructor (version) {
     this.Chunk = Chunks(version) as any
diff --git a/prismarine-viewer/viewer/lib/viewer.ts b/prismarine-viewer/viewer/lib/viewer.ts
index 9223c6a9..2a396222 100644
--- a/prismarine-viewer/viewer/lib/viewer.ts
+++ b/prismarine-viewer/viewer/lib/viewer.ts
@@ -98,7 +98,7 @@ export class Viewer {
   }
 
   setBlockStateId (pos: Vec3, stateId: number) {
-    if (!this.world.loadedChunks[`${Math.floor(pos.x / 16)},${Math.floor(pos.z / 16)}`]) {
+    if (!this.world.loadedChunks[`${Math.floor(pos.x / 16) * 16},${Math.floor(pos.z / 16) * 16}`]) {
       console.warn('[should be unreachable] setBlockStateId called for unloaded chunk', pos)
     }
     this.world.setBlockStateId(pos, stateId)
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 530a5bcd..a5c84ef8 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -301,15 +301,17 @@ export const onAppLoad = () => {
       const forced = 'forced' in packet ? packet.forced : false
       const choice = options.serverResourcePacks === 'always'
         ? true
-        : await showOptionsModal(promptMessage, ['Download & Install'], {
+        : await showOptionsModal(promptMessage, ['Download & Install (recommended)', 'Pretend Installed (not recommended)'], {
           cancel: !forced
         })
       if (!choice) return
       bot.acceptResourcePack()
-      await downloadAndUseResourcePack(packet.url).catch((err) => {
-        console.error(err)
-        showNotification('Failed to download resource pack: ' + err.message)
-      })
+      if (choice === 'Download & Install (recommended)') {
+        await downloadAndUseResourcePack(packet.url).catch((err) => {
+          console.error(err)
+          showNotification('Failed to download resource pack: ' + err.message)
+        })
+      }
     }
     bot._client.on('resource_pack_send', handleResourcePackRequest)
     bot._client.on('add_resource_pack' as any, handleResourcePackRequest)

From 26d25b77f59b1c5c3fa3acabc055c5262f50900b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 1 Nov 2024 02:55:19 +0300
Subject: [PATCH 026/753] feat: format disconnect messages from minecraft
 servers (display correctly)

fixes #26
---
 src/index.ts                        | 13 +++++++++++--
 src/react/AppStatus.tsx             |  4 ++--
 src/react/AppStatusProvider.tsx     | 13 ++++++++++---
 src/react/appStatus.module.css      |  3 ++-
 src/react/appStatus.module.css.d.ts |  3 +--
 src/utils.ts                        |  3 ++-
 6 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index cf894bd7..4507bcc4 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -10,6 +10,7 @@ import { onGameLoad } from './inventoryWindows'
 import { supportedVersions } from 'minecraft-protocol'
 import protocolMicrosoftAuth from 'minecraft-protocol/src/client/microsoftAuth'
 import microsoftAuthflow from './microsoftAuthflow'
+import nbt from 'prismarine-nbt'
 
 import 'core-js/features/array/at'
 import 'core-js/features/promise/with-resolvers'
@@ -634,8 +635,16 @@ async function connect (connectOptions: ConnectOptions) {
   bot.on('error', handleError)
 
   bot.on('kicked', (kickReason) => {
-    console.log('User was kicked!', kickReason)
-    setLoadingScreenStatus(`The Minecraft server kicked you. Kick reason: ${typeof kickReason === 'object' ? JSON.stringify(kickReason) : kickReason}`, true)
+    console.log('You were kicked!', kickReason)
+    let kickReasonString = typeof kickReason === 'string' ? kickReason : JSON.stringify(kickReason)
+    let kickReasonFormatted = undefined as undefined | Record<string, any>
+    if (typeof kickReason === 'object') {
+      try {
+        kickReasonFormatted = nbt.simplify(kickReason)
+        kickReasonString = ''
+      } catch {}
+    }
+    setLoadingScreenStatus(`The Minecraft server kicked you. Kick reason: ${kickReasonString}`, true, undefined, undefined, kickReasonFormatted)
     destroyAll()
   })
 
diff --git a/src/react/AppStatus.tsx b/src/react/AppStatus.tsx
index 19b4abbf..f9e5217e 100644
--- a/src/react/AppStatus.tsx
+++ b/src/react/AppStatus.tsx
@@ -10,7 +10,7 @@ export default ({
   hideDots = false,
   lastStatus = '',
   backAction = undefined as undefined | (() => void),
-  description = '',
+  description = '' as string | JSX.Element,
   actionsSlot = null as React.ReactNode | null,
   children
 }) => {
@@ -57,7 +57,7 @@ export default ({
               })
             }
           </div>
-          <p className={styles['potential-problem']}>{description}</p>
+          <p className={styles.description}>{description}</p>
           <p className={styles['last-status']}>{lastStatus ? `Last status: ${lastStatus}` : lastStatus}</p>
         </>
       }
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index d853c262..8aaa5d70 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -15,6 +15,8 @@ import Button from './Button'
 import { AuthenticatedAccount, updateAuthenticatedAccountData, updateLoadedServerData } from './ServersListProvider'
 import { showOptionsModal } from './SelectOption'
 import LoadingChunks from './LoadingChunks'
+import MessageFormatted from './MessageFormatted'
+import MessageFormattedString from './MessageFormattedString'
 
 const initialState = {
   status: '',
@@ -25,7 +27,8 @@ const initialState = {
   hideDots: false,
   loadingChunksData: null as null | Record<string, string>,
   loadingChunksDataPlayerChunk: null as null | { x: number, z: number },
-  isDisplaying: false
+  isDisplaying: false,
+  minecraftJsonMessage: null as null | Record<string, any>
 }
 export const appStatusState = proxy(initialState)
 export const resetAppStatusState = () => {
@@ -37,7 +40,7 @@ export const lastConnectOptions = {
 }
 
 export default () => {
-  const { isError, lastStatus, maybeRecoverable, status, hideDots, descriptionHint, loadingChunksData, loadingChunksDataPlayerChunk } = useSnapshot(appStatusState)
+  const { isError, lastStatus, maybeRecoverable, status, hideDots, descriptionHint, loadingChunksData, loadingChunksDataPlayerChunk, minecraftJsonMessage } = useSnapshot(appStatusState)
   const { active: replayActive } = useSnapshot(packetsReplaceSessionState)
 
   const isOpen = useIsModalActive('app-status')
@@ -95,7 +98,11 @@ export default () => {
       isError={isError || appStatusState.status === ''} // display back button if status is empty as probably our app is errored
       hideDots={hideDots}
       lastStatus={lastStatus}
-      description={displayAuthButton ? '' : (isError ? guessProblem(status) : '') || descriptionHint}
+      description={<>{
+        displayAuthButton ? '' : (isError ? guessProblem(status) : '') || descriptionHint
+      }{
+        minecraftJsonMessage && <MessageFormattedString message={minecraftJsonMessage} />
+      }</>}
       backAction={maybeRecoverable ? () => {
         resetAppStatusState()
         miscUiState.gameLoaded = false
diff --git a/src/react/appStatus.module.css b/src/react/appStatus.module.css
index b993f779..c40c80c8 100644
--- a/src/react/appStatus.module.css
+++ b/src/react/appStatus.module.css
@@ -1,7 +1,8 @@
-.potential-problem {
+.description {
   color: #808080;
   word-break: break-all;
   padding: 0 10px;
+  margin-top: 3px;
 }
 
 .last-status {
diff --git a/src/react/appStatus.module.css.d.ts b/src/react/appStatus.module.css.d.ts
index 2f78b153..0a84e8e1 100644
--- a/src/react/appStatus.module.css.d.ts
+++ b/src/react/appStatus.module.css.d.ts
@@ -1,10 +1,9 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
+  description: string;
   'last-status': string;
   lastStatus: string;
-  'potential-problem': string;
-  potentialProblem: string;
 }
 declare const cssExports: CssExports;
 export default cssExports;
diff --git a/src/utils.ts b/src/utils.ts
index 0d0875e9..f0d04b55 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -123,7 +123,7 @@ export const isMajorVersionGreater = (ver1: string, ver2: string) => {
 }
 
 let ourLastStatus: string | undefined = ''
-export const setLoadingScreenStatus = function (status: string | undefined | null, isError = false, hideDots = false, fromFlyingSquid = false) {
+export const setLoadingScreenStatus = function (status: string | undefined | null, isError = false, hideDots = false, fromFlyingSquid = false, minecraftJsonMessage?: Record<string, any>) {
   // null can come from flying squid, should restore our last status
   if (status === null) {
     status = ourLastStatus
@@ -152,6 +152,7 @@ export const setLoadingScreenStatus = function (status: string | undefined | nul
   appStatusState.isError = isError
   appStatusState.lastStatus = isError ? appStatusState.status : ''
   appStatusState.status = status
+  appStatusState.minecraftJsonMessage = minecraftJsonMessage ?? null
 }
 
 // doesn't support snapshots

From 667eff49af634b9e845057fcd22879ddc0eefc01 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 1 Nov 2024 06:40:37 +0300
Subject: [PATCH 027/753] feat: write published version name on prod website!

---
 .github/workflows/next-deploy.yml |  3 +++
 .github/workflows/publish.yml     |  7 +++++++
 rsbuild.config.ts                 | 16 +++++++++++++++-
 src/react/MainMenuRenderApp.tsx   |  1 +
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml
index a01e0bb8..d829fc1f 100644
--- a/.github/workflows/next-deploy.yml
+++ b/.github/workflows/next-deploy.yml
@@ -20,6 +20,9 @@ jobs:
         run: npm install --global vercel pnpm@9.0.4
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
+      - name: Write Release Info
+        run: |
+          echo "{\"latestTag\": \"$(git rev-parse --short $GITHUB_SHA)\"}" > assets/release.json
       - name: Build Project Artifacts
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
       - run: pnpm build-storybook
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c1c6af29..f8c074d3 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -20,6 +20,13 @@ jobs:
       - run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
       - run: node scripts/replaceFavicon.mjs ${{ secrets.FAVICON_MAIN }}
       # will install + build to .vercel/output/static
+      - name: Get Release Info
+        run: pnpx zardoy-release empty --skip-github
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        id: releaseInfo
+      - name: Write Release Info
+        run: echo '${{ toJson(steps.releaseInfo.outputs) }}' > assets/release.json
       - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod
       - run: pnpm build-storybook
       - name: Copy playground files
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 32cb2728..b9594242 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -21,6 +21,15 @@ const buildingVersion = new Date().toISOString().split(':')[0]
 
 const dev = process.env.NODE_ENV === 'development'
 
+let releaseTag
+let releaseChangelog
+
+if (fs.existsSync('./assets/release.json')) {
+    const releaseJson = JSON.parse(fs.readFileSync('./assets/release.json', 'utf8'))
+    releaseTag = releaseJson.latestTag
+    releaseChangelog = releaseJson.changelog?.replace(/<!-- bump-type:[\w]+ -->/, '')
+}
+
 // base options are in ./prismarine-viewer/rsbuildSharedConfig.ts
 const appConfig = defineConfig({
     html: {
@@ -47,7 +56,9 @@ const appConfig = defineConfig({
             'process.env.MAIN_MENU_LINKS': JSON.stringify(process.env.MAIN_MENU_LINKS),
             'process.env.GITHUB_URL':
                 JSON.stringify(`https://github.com/${process.env.GITHUB_REPOSITORY || `${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}`}`),
-            'process.env.DEPS_VERSIONS': JSON.stringify({})
+            'process.env.DEPS_VERSIONS': JSON.stringify({}),
+            'process.env.RELEASE_TAG': JSON.stringify(releaseTag),
+            'process.env.RELEASE_CHANGELOG': JSON.stringify(releaseChangelog),
         },
     },
     server: {
@@ -80,6 +91,9 @@ const appConfig = defineConfig({
                     fs.copyFileSync('./assets/playground.html', './dist/playground.html')
                     fs.copyFileSync('./assets/manifest.json', './dist/manifest.json')
                     fs.copyFileSync('./assets/loading-bg.jpg', './dist/loading-bg.jpg')
+                    if (fs.existsSync('./assets/release.json')) {
+                        fs.copyFileSync('./assets/release.json', './dist/release.json')
+                    }
                     const configJson = JSON.parse(fs.readFileSync('./config.json', 'utf8'))
                     if (dev) {
                         configJson.defaultProxy = ':8080'
diff --git a/src/react/MainMenuRenderApp.tsx b/src/react/MainMenuRenderApp.tsx
index 4fed18d6..7c6385dc 100644
--- a/src/react/MainMenuRenderApp.tsx
+++ b/src/react/MainMenuRenderApp.tsx
@@ -123,6 +123,7 @@ export default () => {
         onVersionTextClick={async () => {
           openGithub('/releases')
         }}
+        versionText={process.env.RELEASE_TAG}
       />
     </div>}
   </Transition>

From 5405987de314d7334ceab3e96446dc72e0ebf4d7 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 2 Nov 2024 12:45:11 +0300
Subject: [PATCH 028/753] fix: fix entities display on old versions like 1.8

---
 prismarine-viewer/viewer/lib/entities.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index 58b6673b..6afd1c34 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -10,6 +10,7 @@ import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/st
 import { NameTagObject } from 'skinview3d/libs/nametag'
 import { flat, fromFormattedString } from '@xmcl/text-component'
 import mojangson from 'mojangson'
+import { snakeCase } from 'change-case'
 import * as Entity from './entity/EntityMesh'
 import { WalkingGeneralSwing } from './entity/animations'
 import externalTexturesJson from './entity/externalTextures.json'
@@ -63,11 +64,13 @@ const addNametag = (entity, options, mesh) => {
 // todo cleanup
 const nametags = {}
 
+const isFirstUpperCase = (str) => str.charAt(0) === str.charAt(0).toUpperCase()
+
 function getEntityMesh (entity, scene, options, overrides) {
   if (entity.name) {
     try {
       // https://github.com/PrismarineJS/prismarine-viewer/pull/410
-      const entityName = entity.name.toLowerCase()
+      const entityName = (isFirstUpperCase(entity.name) ? snakeCase(entity.name) : entity.name).toLowerCase()
       const e = new Entity.EntityMesh('1.16.4', entityName, scene, overrides)
 
       if (e.mesh) {

From ad9f5be48603ba30d14dc53a6d970d37d72e54fe Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 2 Nov 2024 12:45:27 +0300
Subject: [PATCH 029/753] spectator gamemode fixes

---
 pnpm-lock.yaml  |  8 ++++----
 src/controls.ts | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8f268d5a..1cd7db47 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -350,7 +350,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
       mineflayer:
         specifier: github:zardoy/mineflayer
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/519acba455d3387414b81fcaa12e550dcdc4f88e(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/ece6755d94931116924874d9f55bc024998cc1ae(encoding@0.1.13)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -6803,8 +6803,8 @@ packages:
     resolution: {integrity: sha512-wSchhS59hK+oPs8tFg847H82YEvxU7zYKdDKj4e5FVo3CxJ74eXJVT+JcFwEvoqFO7kXiQlhJITxEvO13GOSKA==}
     engines: {node: '>=18'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/519acba455d3387414b81fcaa12e550dcdc4f88e:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/519acba455d3387414b81fcaa12e550dcdc4f88e}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/ece6755d94931116924874d9f55bc024998cc1ae:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/ece6755d94931116924874d9f55bc024998cc1ae}
     version: 4.23.0
     engines: {node: '>=18'}
 
@@ -17827,7 +17827,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/519acba455d3387414b81fcaa12e550dcdc4f88e(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/ece6755d94931116924874d9f55bc024998cc1ae(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.78.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
diff --git a/src/controls.ts b/src/controls.ts
index 12dfacb5..6523a418 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -156,6 +156,7 @@ let lastCommandTrigger = null as { command: string, time: number } | null
 const secondActionActivationTimeout = 300
 const secondActionCommands = {
   'general.jump' () {
+    // if (bot.game.gameMode === 'spectator') return
     toggleFly()
   },
   'general.forward' () {
@@ -645,6 +646,17 @@ export const onBotCreate = () => {
     }
     allowFlying = !!(flags & 4)
   })
+  const gamemodeCheck = () => {
+    if (bot.game.gameMode === 'spectator') {
+      toggleFly(true, false)
+    }
+  }
+  bot.on('game', () => {
+    gamemodeCheck()
+  })
+  bot.on('login', () => {
+    gamemodeCheck()
+  })
 }
 
 const standardAirborneAcceleration = 0.02

From 2c441c34345f47520dc9c1f271c32f86eba82726 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 2 Nov 2024 12:45:47 +0300
Subject: [PATCH 030/753] fix: fix display names in inventories on 1.8

---
 src/botUtils.ts         |  2 +-
 src/inventoryWindows.ts | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/botUtils.ts b/src/botUtils.ts
index f474d532..b84223b2 100644
--- a/src/botUtils.ts
+++ b/src/botUtils.ts
@@ -12,7 +12,7 @@ export const displayClientChat = (text: string) => {
     })
     return
   }
-  bot._client.write('chat', {
+  bot._client.emit('chat', {
     message: JSON.stringify(message),
     position: 0,
     sender: 'minecraft:chat'
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 4a4166d5..c1101cbb 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -54,9 +54,22 @@ export const onGameLoad = (onLoad) => {
 
   PrismarineItem = PItem(version)
 
+  const mapWindowType = (type: string, inventoryStart: number) => {
+    if (type === 'minecraft:container') {
+      if (inventoryStart === 45 - 9 * 4) return 'minecraft:generic_9x1'
+      if (inventoryStart === 45 - 9 * 3) return 'minecraft:generic_9x2'
+      if (inventoryStart === 45 - 9 * 2) return 'minecraft:generic_9x3'
+      if (inventoryStart === 45 - 9) return 'minecraft:generic_9x4'
+      if (inventoryStart === 45) return 'minecraft:generic_9x5'
+      if (inventoryStart === 45 + 9) return 'minecraft:generic_9x6'
+    }
+    return type
+  }
+
   bot.on('windowOpen', (win) => {
-    if (implementedContainersGuiMap[win.type]) {
-      openWindow(implementedContainersGuiMap[win.type])
+    const implementedWindow = implementedContainersGuiMap[mapWindowType(win.type as string, win.inventoryStart)]
+    if (implementedWindow) {
+      openWindow(implementedWindow)
     } else if (options.unimplementedContainers) {
       openWindow('ChestWin')
     } else {
@@ -205,7 +218,7 @@ export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'>
   const customName = itemNbt.display?.Name
   if (!customName) return
   try {
-    const parsed = mojangson.simplify(mojangson.parse(customName))
+    const parsed = customName.startsWith('{') && customName.endsWith('}') ? mojangson.simplify(mojangson.parse(customName)) : fromFormattedString(customName)
     if (parsed.extra) {
       return parsed as Record<string, any>
     } else {

From b3a089323fa495f1819a67300812f45ede7905e4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 4 Nov 2024 02:23:15 +0300
Subject: [PATCH 031/753] fix auth err message

---
 src/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 4507bcc4..00dc4c6e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -388,9 +388,9 @@ async function connect (connectOptions: ConnectOptions) {
     Object.assign(serverOptions, connectOptions.serverOverridesFlat ?? {})
     window._LOAD_MC_DATA() // start loading data (if not loaded yet)
     const downloadMcData = async (version: string) => {
-      if (connectOptions.authenticatedAccount && versionToNumber(version) < versionToNumber('1.19.4')) {
+      if (connectOptions.authenticatedAccount && (versionToNumber(version) < versionToNumber('1.19.4') || versionToNumber(version) >= versionToNumber('1.21'))) {
         // todo support it (just need to fix .export crash)
-        throw new Error('Microsoft authentication is only supported in 1.19.4 and above (at least for now)')
+        throw new Error('Microsoft authentication is only supported on 1.19.4 - 1.20.6 (at least for now)')
       }
 
       // todo expose cache

From b267cb77be7a1b6267b41037662121048502573f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 4 Nov 2024 02:32:26 +0300
Subject: [PATCH 032/753] send connecting version to auth endpoint

---
 src/index.ts             | 1 +
 src/microsoftAuthflow.ts | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/index.ts b/src/index.ts
index 00dc4c6e..637e0655 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -505,6 +505,7 @@ async function connect (connectOptions: ConnectOptions) {
       sessionServer: authData?.sessionEndpoint?.toString(),
       auth: connectOptions.authenticatedAccount ? async (client, options) => {
         authData!.setOnMsaCodeCallback(options.onMsaCode)
+        authData?.setConnectingVersion(client.version)
         //@ts-expect-error
         client.authflow = authData!.authFlow
         try {
diff --git a/src/microsoftAuthflow.ts b/src/microsoftAuthflow.ts
index 2e7c3a00..0b895317 100644
--- a/src/microsoftAuthflow.ts
+++ b/src/microsoftAuthflow.ts
@@ -12,6 +12,7 @@ export const getProxyDetails = async (proxyBaseUrl: string) => {
 
 export default async ({ tokenCaches, proxyBaseUrl, setProgressText = (text) => { }, setCacheResult, connectingServer }) => {
   let onMsaCodeCallback
+  let connectingVersion = ''
   // const authEndpoint = 'http://localhost:3000/'
   // const sessionEndpoint = 'http://localhost:3000/session'
   let authEndpoint: URL | undefined
@@ -39,7 +40,8 @@ export default async ({ tokenCaches, proxyBaseUrl, setProgressText = (text) => {
         body: JSON.stringify({
           ...tokenCaches,
           // important to set this param and not fake it as auth server might reject the request otherwise
-          connectingServer
+          connectingServer,
+          connectingServerVersion: connectingVersion
         }),
       }).then(async response => {
         if (!response.ok) {
@@ -89,6 +91,9 @@ export default async ({ tokenCaches, proxyBaseUrl, setProgressText = (text) => {
     sessionEndpoint,
     setOnMsaCodeCallback (callback) {
       onMsaCodeCallback = callback
+    },
+    setConnectingVersion (version) {
+      connectingVersion = version
     }
   }
 }

From c279b4bbe62774deb74f7586e8d8f362f082e1bd Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 4 Nov 2024 02:49:23 +0300
Subject: [PATCH 033/753] do a restoredData validation

---
 src/microsoftAuthflow.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/microsoftAuthflow.ts b/src/microsoftAuthflow.ts
index 0b895317..66f8d360 100644
--- a/src/microsoftAuthflow.ts
+++ b/src/microsoftAuthflow.ts
@@ -82,6 +82,9 @@ export default async ({ tokenCaches, proxyBaseUrl, setProgressText = (text) => {
       })
       if (!window.crypto && !isPageSecure()) throw new Error('Crypto API is available only in secure contexts. Be sure to use https!')
       const restoredData = await restoreData(result)
+      if (!restoredData?.certificates?.profileKeys?.private) {
+        throw new Error(`Failed to restore profile keys in ${JSON.stringify(result)}: ${JSON.stringify(restoredData)}`)
+      }
       restoredData.certificates.profileKeys.private = restoredData.certificates.profileKeys.privatePEM
       return restoredData
     }

From dcc0960d7fe1a9d51bc7873b4608ae36b6e6a85c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 4 Nov 2024 02:51:37 +0300
Subject: [PATCH 034/753] fix the auth check

---
 src/microsoftAuthflow.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/microsoftAuthflow.ts b/src/microsoftAuthflow.ts
index 66f8d360..8df86a9a 100644
--- a/src/microsoftAuthflow.ts
+++ b/src/microsoftAuthflow.ts
@@ -82,7 +82,7 @@ export default async ({ tokenCaches, proxyBaseUrl, setProgressText = (text) => {
       })
       if (!window.crypto && !isPageSecure()) throw new Error('Crypto API is available only in secure contexts. Be sure to use https!')
       const restoredData = await restoreData(result)
-      if (!restoredData?.certificates?.profileKeys?.private) {
+      if (!restoredData?.certificates?.profileKeys?.privatePEM) {
         throw new Error(`Failed to restore profile keys in ${JSON.stringify(result)}: ${JSON.stringify(restoredData)}`)
       }
       restoredData.certificates.profileKeys.private = restoredData.certificates.profileKeys.privatePEM

From 0f2bc5c1d49548cdd421c6bfd997c21df0b93886 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 5 Nov 2024 07:07:04 +0300
Subject: [PATCH 035/753] fox issues with chat on 1.8

---
 package.json             |  2 +-
 pnpm-lock.yaml           | 12 ++++++------
 src/microsoftAuthflow.ts |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 1772da27..53b4b70d 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "express": "^4.18.2",
     "filesize": "^10.0.12",
-    "flying-squid": "npm:@zardoy/flying-squid@^0.0.45",
+    "flying-squid": "npm:@zardoy/flying-squid@^0.0.47",
     "fs-extra": "^11.1.1",
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1cd7db47..dfb34dca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -119,8 +119,8 @@ importers:
         specifier: ^10.0.12
         version: 10.0.12
       flying-squid:
-        specifier: npm:@zardoy/flying-squid@^0.0.45
-        version: '@zardoy/flying-squid@0.0.45(encoding@0.1.13)'
+        specifier: npm:@zardoy/flying-squid@^0.0.47
+        version: '@zardoy/flying-squid@0.0.47(encoding@0.1.13)'
       fs-extra:
         specifier: ^11.1.1
         version: 11.1.1
@@ -3395,8 +3395,8 @@ packages:
     resolution: {integrity: sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==}
     engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'}
 
-  '@zardoy/flying-squid@0.0.45':
-    resolution: {integrity: sha512-cXCcc1t/6pIevBHRRSwTHhL/dldjGPTYmPwyxsANcrf5PWVDG8hlcIbsz0S0Qf4P0OZjJiQi2I9PahGaWtxPgg==}
+  '@zardoy/flying-squid@0.0.47':
+    resolution: {integrity: sha512-VUtOqPGZ/20tQEjRLFpbz0taoTMi0GgoUM7002wn8RjuVmowg0pMUjdy0YwcFPGla8z1sOwjsF9cOtU4hQ8pUg==}
     engines: {node: '>=8'}
     hasBin: true
 
@@ -13419,7 +13419,7 @@ snapshots:
       '@types/emscripten': 1.39.8
       tslib: 1.14.1
 
-  '@zardoy/flying-squid@0.0.45(encoding@0.1.13)':
+  '@zardoy/flying-squid@0.0.47(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
       chalk: 5.3.0
@@ -13529,7 +13529,7 @@ snapshots:
 
   agent-base@7.1.0:
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
diff --git a/src/microsoftAuthflow.ts b/src/microsoftAuthflow.ts
index 8df86a9a..cdfcfc77 100644
--- a/src/microsoftAuthflow.ts
+++ b/src/microsoftAuthflow.ts
@@ -83,7 +83,7 @@ export default async ({ tokenCaches, proxyBaseUrl, setProgressText = (text) => {
       if (!window.crypto && !isPageSecure()) throw new Error('Crypto API is available only in secure contexts. Be sure to use https!')
       const restoredData = await restoreData(result)
       if (!restoredData?.certificates?.profileKeys?.privatePEM) {
-        throw new Error(`Failed to restore profile keys in ${JSON.stringify(result)}: ${JSON.stringify(restoredData)}`)
+        throw new Error(`Authentication server issue: it didn't return auth data. Most probably because the auth request was rejected by the end authority and retrying won't help until the issue is resolved.`)
       }
       restoredData.certificates.profileKeys.private = restoredData.certificates.profileKeys.privatePEM
       return restoredData

From ab3174a45fc6f6c5fea11a6d122623b3f8f75446 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 5 Nov 2024 07:10:57 +0300
Subject: [PATCH 036/753] hotfix: disable fly after going out of spectator mode

---
 src/controls.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/controls.ts b/src/controls.ts
index 6523a418..6ec4ee9b 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -638,6 +638,7 @@ const endFlying = (sendAbilities = true) => {
 let allowFlying = false
 
 export const onBotCreate = () => {
+  let wasSpectatorFlying = false
   bot._client.on('abilities', ({ flags }) => {
     if (flags & 2) { // flying
       toggleFly(true, false)
@@ -649,6 +650,10 @@ export const onBotCreate = () => {
   const gamemodeCheck = () => {
     if (bot.game.gameMode === 'spectator') {
       toggleFly(true, false)
+      wasSpectatorFlying = true
+    } else if (wasSpectatorFlying) {
+      toggleFly(false, false)
+      wasSpectatorFlying = false
     }
   }
   bot.on('game', () => {

From 270da682da784a30f4b4a305af1cc7df80468a91 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 5 Nov 2024 13:12:15 +0300
Subject: [PATCH 037/753] ci: fix release info writing

---
 .github/workflows/publish.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f8c074d3..7f14a1d1 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -21,12 +21,9 @@ jobs:
       - run: node scripts/replaceFavicon.mjs ${{ secrets.FAVICON_MAIN }}
       # will install + build to .vercel/output/static
       - name: Get Release Info
-        run: pnpx zardoy-release empty --skip-github
+        run: pnpx zardoy-release empty --skip-github --output-file assets/release.json
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        id: releaseInfo
-      - name: Write Release Info
-        run: echo '${{ toJson(steps.releaseInfo.outputs) }}' > assets/release.json
       - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod
       - run: pnpm build-storybook
       - name: Copy playground files

From 7284d88ae96caaf9ae36a8bb58f389d4026d3d16 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 5 Nov 2024 13:37:30 +0300
Subject: [PATCH 038/753] update npm banner to a working one

---
 README.NPM.MD               |   2 +-
 docs-assets/npm-banner.jpeg | Bin 0 -> 98022 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 docs-assets/npm-banner.jpeg

diff --git a/README.NPM.MD b/README.NPM.MD
index 9c4bf17f..dc2c7c72 100644
--- a/README.NPM.MD
+++ b/README.NPM.MD
@@ -6,7 +6,7 @@ Minecraft UI components for React extracted from [mcraft.fun](https://mcraft.fun
 pnpm i minecraft-react
 ```
 
-![demo](https://github-production-user-asset-6210df.s3.amazonaws.com/46503702/346295584-80f3ed4a-cab6-45d2-8896-5e20233cc9b1.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAVCODYLSA53PQK4ZA%2F20240706%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20240706T195400Z&X-Amz-Expires=300&X-Amz-Signature=5b063823a57057c4042c15edd1db3edd107e00940fd0e66a2ba1df4e564a2809&X-Amz-SignedHeaders=host&actor_id=46503702&key_id=0&repo_id=432411890)
+![demo](./docs-assets/npm-banner.jpeg)
 
 ## Usage
 
diff --git a/docs-assets/npm-banner.jpeg b/docs-assets/npm-banner.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..95de07b8f77567dae537de44326190b48b63f8ea
GIT binary patch
literal 98022
zcmeFZc|4Tu+dqCWma-(-LYcCJBo(q7C3})&FH_k`Ze<xYW)xAjNs=PQPDzrjvP@Yk
zSt4Y~n33$vAO^GiPTk#~&wbzDXZ!yCcz(a<d3`QTuIrj}IhOZvoacEQ=ZW=&H3Drl
zH#Red*w`S*6#PIe669cn^7eorOG{`k1VNi1cD8L04BWASA1K-z;`n(FL3_Y&2!ds@
z{qx&Q_CLPmgfd}&+_Q&l6lA@D1UIpVa6&LPX^35r4JOFOYJ}jRT~4;2*G8d@i;W$|
z!O6wFX)_NmC{VE#5CDU*bHF$`IY8HJVc>g+Ly&XZ?t@3TgsjhVO9u!ax}KP|N#<zj
zTai<rD6*;-F5lS9BPzCCTtaS-yn^ChHTA<9np)b1$Bc|kOwG(~PTShqJ2*PIy19FJ
zdU^X?2@DDjL4{t8h`bpUed~72-K2ZT_fsA`OwG>8&C4$+eEj4^S$Rce)yr3}>l+%I
znp@tz|IpR_xu>`9OaB0gJo;_y`}oA<6m?;7>BsU4ZFOyfFCdlQ*#iInn|uiZzSuc9
zU>w{Ve6ax`0mcM5ICmf9+IGa6`+R_q^r7pUgpVd>mA>69qk4)Wa^dnP9#L5}k{oq|
zwV#~**BHC;|BADJF!oQr1|dU;{pST^XNPgZU@%TDPH=H;;@Y@2@of5e@%*~@eqLKP
zE`fhsEYJuWXoG`;gB$$Y%Db6&>;Lt|`U=2xk~IMF!Po$pV1f_=qPKL@14b%5x>feo
z9Kk*@!f85GRNecCeJ!rhTZY2d@8_o54DW@<m#`qgvmG<;zTP3!Xcy;q+kzbWD_;%~
zLZ*=+L{zKQjnLf^>Pf2??e)#$Mk$#BZB{hX8W|RJbR~wM<Ij}F{q>PxLLg~$v!IF1
zo-7DsPgiVdu7o|iz42f}SAZ>EVQ%x^gzc;)m$dh>pj$bAeJttnr&+48pfz?!7DP;D
zK|DuBE!et^%HYdQ*!pn9VHQMEq~I95bxQPEEG-7{mnViS3yLIn)0UhKS<pp$x&nBd
zwqik<a(Kona)b5~npw^6U$i4PXa|qP2Iem@AoJu~4xdB6R)4^PD);)7Qpf77=w>r4
zXuiIa`#TGw%jxsXXQ7H%kle4ntr$>^EepC!pc`TCVC((;Sdc*)Vx3Y>prkseC};PN
zGhdd_PI7-=q07~60+fiw5Eh(&=bOlZ?c{Ajt}3&jM*B%kYH>JxfwPPS5tNw1p!yeV
zr)US0UJPL_vY>kV5!@Qv&z=bzTq{vbe)UWQJtyLJ^s^wYSP#T(OeZ?vg7(CH?8+Eo
zLtcL?3a2E~WSHSDds)zXpgV#oP}cL`1+->G$pi8lZeWH7V^=0OYHR$hwiyfBjJ!dZ
zfRRh+KsRKirE5%~bj0r!u=N|&{|#{u0{J3-!pwv&JG_+zWnF7Rrf<LwnLFORhWa*9
z38=-^r!a+_1=iRBC&Xl+Dm=|x_b;mY%Ok-QAVF&bXS~1T?5D0R5h2E9h~J^2K_Km+
zL}LYLMT-@H*1ZVOo>=!fZxcXP70^Aw6#EyT?#0q9FCu<#&Mq9G4%!Fx{RL=+%)>yv
za7q%&ka=@n1QYyI*+3`$1uUp@8_-b+%^FCi4iA)XfmmN4kPP5y#J`mPTkS*um4bv+
z<)5(3VG6~{tStGe0?dj6p<_4tW$+H~{e|#9KQR=g)JqYI92+oE{0S3B>@N}k$Ov>f
zsXxot<ZsW&+{?6q)*W8Kp)BYbsGf+b|Gc<A-V?V*&i~o5!e2TDPgns|A!dVp%w4#I
z_ZyO$?;-5;4I8WY*>Dzg#|Y1$IYIP6p!b}&XO~n&u-|}Mg*Lk7nf=2~QW;YEnq~3=
zIgXWx$(WeSv_7j2diaJ>b+MqE5au@^No&%UVJWIL-S4Ma{h11eyp-DW!RDXP2E~s6
zIp@`3zX<}GN6Oh&3E<fz5;5UIwIBBdcC?{~KR??~Zl$J2BWIkCudM>J!q)q3SZM5q
zg|e+SqOD0gu8>#|&?%m7WUs%MV$Xokw)piR02tq;Td3hLkFah4FT~`>(Q!))TAzR^
z&VTqx_J&c~j4XEl3EXn}e-=J67Z`EBKy{8IZv6s*WJ2H5>pC~l>&pBBOd3#8Z$T1R
z6QkR%4q&N(us=PCtZf)tdR3S-z?L$c^3YM>RZc%{{oFmaRRHD9R)1so&(HRg8uUHO
z#HCFe2;l{t{^K5C5<$5~`zMCse|f^(1tj?iuD@1)2%O(9S$!(M2Jj5JtpeSufNqgM
z&fdS|{O4!;Nfr8@;IsB7Wm1HfP6*PW?sc!qUnpZ+eFbW3{33dz_Gu*L-an1$62UAw
zzF75oPXB24JM$!_kR_t-pW_9RxefoP@nXZrq}0QgRDfBR|8zmXZ7AzrVf?D0NT56#
zkm5?*a0<Yf4r57wLep2k@?ZM3Y3?NeQSD+u-5j||&G!xGCYAw=E(&doRQ}9uxPSH>
z{|PYhCulWKF9A|5{MR@(@No|q@jvc?^CJAkd1?I35G6~xa5PJ0!i3-knWq2;Ix?*j
zy`Ic3@*87C)nCn45{!|5CZuoDiY_l2!93Ud)5(L{*KAnO0biggJn%fJ1WNMnOk#<4
zz;a<tE?ec9Mt?Z2WVnPQmMh*v06Qd4JB6+H2K*ZQ((-d%OA<S9Ltvl+W4jeo8bINv
z+Fhtfra23uimW-Iz0YBm<2|smG1!|1XkYIPHBg!I3z>hG&%}mT*w7T}rvn}hS_32T
z=Hdbd+lKAepTbED!dD~uf$$=Mz_9;^!1VdySOe;*pUxL^4_K}*eiin!_|vaeEuuuv
zRKXm_g=qY4peh#h)~T<dL!8!PNpbrP71KO@D#X?|x?)qc;3ND??TaM<Hl!n{5N3on
zj<JNNU#JU>8u^Opt`k9xBn*z@_lEDqFNNxO5DXT)U~dQ{JX(hZ9Vs?h#Ic}w;8Xb4
zNyIgNAH*Xp-KTbCPh2WQQK5Mf1+bl-*7WXwl$l@Sn?j^wsZUluD8Sx;F7aqR&`!F^
zq7_r!gswUtO_)$EWC9atE+Q&q3cy%UR2XH2!4(8=L(qEQl#V(nFc`Pztb&n6q6D2C
zt}DP4UuhsNiGRj|S<&ceY=b`S+6EWj@qm(r7>I)S7ajkS$G`CLFMIjl?mt+aw2<X}
zV6D|ehOd1C?l{aE%Yxu5i22l2*X6z9v?j93+BdLt+*I;J9Wr7xW9z)wBg3ZbSB<^x
za($r3-{IzWwi%lUGa|HF)CQo7xA#TxpbG88*;b!~vS~I!f<!earrJl$j^o^jZHxlD
zW&_{c<IUEcF}HI^p`gMZvv#e_&FRZsGWRu`6%QZ?CuDaG)q1hNIo?%+f<{Fg-O^w4
zUAGDSh+#oKP~0vTOX(+7K54;L=10rfxKrlM=PUE*-U$y|)Yx213fO})^!C=9z$IT5
zacO?iP~uvXy2th~F7;%@z|*Y)y*Yx9$l+U!uT0t~v<OpbYy#R9ARU8m<Oh;k%Z2$z
zO{J4h^r*3^i<~*$I4YuDiRFQ6g$?3L*>AHOYke;g557<r$#_tsl8LGs<$9P!%V^g-
z+U%gRz2VTDF|UyJHoZdF_zSjOYc{cd+ozFcsGQ|Enj@)0$cMQT3`w?q>LOk9`~5_}
zOUfTSQQ1|4x#(uNBIz-+$nd>MOUy-G_2-!&iUsCH*H;c7dO0W%wI3T2ny(~3l&X)q
zT;1{R;41~#yVCXmOLtk<JTIj8>x?AL%AS3mrS}T`QUuGb%2x*HJr4p~*Q*tONGd6g
zmzQ^>A38QGjGTY9Ue4Cx`lzQIq9{!x`o~G_51)Dwx2h9_Xg-!Fc$N8|m4DCpG#Hq*
zhXvt0#fQG_4L_OGRi{o#q^jJWf#LXl?6mXyWwp`0U9p*o<I3M=77qt7K0t%#tE7IM
zEjZG^Xa5Ob$sPR^y?GQ5^OoYLxcAg1JkAO2vk$)iBJA$)g%J#+Uf4tzpO(4QhT4*z
z<ug!J?qrO=Qdn;8*toT3@F0Vcj&OqVWw~;Tl?@wQWIxT`{9cfE)?skm`!0FF;f_ZB
zq!7M6zniW_=65-aH|f4qLNct#7#=X&DmeK<H5Gar%wtk(TKv-EwWF>W`E&gD*PZGL
zqqi-}YVUmz;iiVQW0E@_j9RZ(zRTn~9hiHrdxGsyn8Kn}o{mh{ox&!_He|>|#N9;v
z$y~LSh`XdP6#n{=iuutiHmczVV<Pz$4cG(vQWG4-=BmUW8#E~%JAYr8&0+sFs?FoK
z`6FAng>RZo1Q-ZC5^S;=jEHD*fW_R-9zv1BcP5%PCN3nVS}E3gEf5AWH}$y7kL%h#
zKbZRLai8?l>%HMJGQ#%?isc}gx`R!;hw!zA`2lSQOt!DL#X!m5cABVV8@sPQfeKHE
zl%3iuIB&q?SQf4*Qbx0B=5~q?xO=1x(ms-SBIa02Ta$JsilM-6oG45#B!*LkW@BDl
z_@U1K<)i#SxW4g=7P>ljq-u9q3p1$}6VW$b`%GX~m83ec0$;O|!$h8BGZOwE@!@8D
zqT!YmH$0Qo8cCjcLuo4gxIonqw$679`z42IA$A)v9f{v?SV2}a7W9e*g%z?#ecZ9u
zz1;Q92KhacE8(7-t)Yxka<g~*t3r0h{@(LVr*0EbhFwoTv_BXKFyMotw5BbSDvrNu
z(M`4Ej)9&$dj75`M%ubVyf7`{#v{o`ov?@JFCL2P4v!OfaC-3G79;!ps$JnbUq&qa
zrXY24{fBtK9X)RWO*OXN3Yb~r6W;3qgCaYjUEHtQ9IofMrihDh3bSRiAh%tv#i!kQ
zS5RCzFfM#t3>3%Ly-c#WYNIV-vkS%*F4ktZT}1pMMqSoNyZaGa4D{@D#!?2d*0M6b
zoK5(*qyhZ%0<K*Cs=O`znVZbVuCJ67B3#c&j((4AVeegMK}LG$2A7p}RaB7y#lBft
zzR^XY?ySy<D9Li~M_RU_GHypAIXbyBd<c~tv&m1;N2!Epy3o@}rSqiPOU!z;moMTD
zHSjmS-y%tS@kHy*<XL13UI684O*5ff8$~vo%B8hrs8Ts!6WcCy$qEEWEgem4Nw($P
z7L3S4KBtV&h-J}=nqGgy@0{Ztzg1xoJ6-6+Rw+J~{4EH_5WBhhu4U9kW!;Q^p-W%J
zt8N?3kaCqwY)XYUq&rEjU+a;z2;k}<C}I`4oa~RQta!nC5q|Tc)1{a%z9i0ML>aQ7
zGDR|&K3H~Oy`Pyp;lkEa66pVBezdN*;84pIPw(%|AFH3YZk<hZblHPjM$_Js#~IoB
z+VrC-Z!&hp3;`}LWfk++xX0OCFm?ZJ;nGF^B_bSc&$vsMTvw&r(n2WH<a-#I9=d)0
z>p?@^i_f|u1zRLMgyY8JMCt3D+)psgENCZY4=rV+;1;1mMfsbQ2&J^PJG{zv;d}g^
ze!??qq+tRl8cs=DPG{txEk^tGb$r&IrRlXbr|ZR9ESuipj8kk$W<hMr(?pSe=0~j1
zTn+Dt5rqXMvUS%u<{Rb{Eftf(YOCi>?j!b%UzUBkI$Qb55?N2&j1faUMa$C8ldGsk
z#g7yNmLGn8`qBN=93nXJF%LJKaTQu?W%6)RS4K6Wb<IWykr=M(@>nZsbNHo_Q{=BZ
zb02+x8tw+;Qt~%Fo!^Q+)`M_IUMKMBx{^$svEuX-WeGa{d|2<Q`^%c!OnU_1o7$uC
z^%eE#bG>zvXunU{v~H?Oqf7%vp2Au9ylZJN$n(a+w#mizowAn)ABKOKz*ys*2%>ou
z-0~fYeZ-P~EE7yJB6SRDSA;{HEXQsw%GRwOARA2X;*z_K?fLO_DRayCGKxxQ!4CM6
zdC{tj9REOuNqy;;wnAAu!Mvx$i&b}pZ#QHT%ay7MkmrxnY^Vj+6q6ZWY6=-q|31F5
zh!pSDbaC;`3+c-B(;Ut8!-CX=uUALKmkB$u?$~e*&lUo=zHH0rPK@ngOV?mI)865*
z7rNuEQTjqYOD)6G(~J1)x|Xh_k}t?n{0+M8Z(wD(6&354u-x2wqx;x`BYLtlw7vJ;
zk`pwC*~$D2!Z}ur3~c={oO+@(_YBIvDJ0m={*#Hfusy%)wY{=a3Ach@-Nw1-O(AiI
zGq`DC)O9DC5y^CJ*V#k81Egbd3xy^(#CP~#7GOW2cg4k*BD&CFj3<3BEga(Y)e&DR
zx;^H)@Wf<qHDT(+-j<em;Rz{K#!FpSGMpE=KQI4`cd+jc>im}`KV{c*8rMI))Xe1F
zCo>+mW@|iccvw62cETn#Hn$z8FZSmbMO?QoFRZnM%#73>owM4s!)5ao^7yQLPMMfP
zPJ3VZ6;In_eVsMfTzS*y#f4oSkKZ-x-w5BM++?%ZlOUFQ_pr)a;U6(-!9nn=;cW6N
zQG1);9iE%Fo^@Hu6AnXk)Iut)$5r6R3jA>JYj|^<7k7fH0WWY+m-6^ypxdACD)M=a
zj(^81or5^-&LkP|v<iEQ?@CSfkeOS0%xC&WOuUd@Vh&w%TOt?r#5`G?y#t<VZki0M
zy&9J;D&lG>-skq40{hYaCn1ryBw-cK-XdH0k6e-UyF~jI?gbld-NAwyj?+%U=Q~(X
z?t=Y<A12fRM|<DFi&)9PGUV?P485T27=`}{9~i5Pmb46l?qE8;F}O`-*FEitQkRUw
zqWYQ$FA8o+1K-e8vh@UgH4)+ppzAKHFAZmr%dbs-J6`EPQGn&{`gX-E<KUU!s8-fv
zgfZJZ>TcadgPm^-PE4IT%GMN6N_#AbLAAOLr=pSm8m-^7PjY+S<Tyai2$(+eNPl0I
z(c4@2Vts$n0fK2bh}PxDv1MGbDcxbewQlcO;=XgZJV$+{N=>fat0%c_UP>tro2}Qs
zIzo<hsdJz|E@&1Ee4DxDiHF-8;hu}*arQFuvAcKN@p(uMG@$T9ArE0mrgAnbTIwx>
zv{ap_{^xiXA2Zz}d?tJOp`iWUuKaJZ^{>pHDWJ=3CGh2T;kL=5bOiLv*}lvQ&qjB>
z?4_c%H@Yt5o00F`aplC^W9zRJwt-zAewj=?Wo)2SbM13MQ@~+FumY^C9aTurK5^yD
zT~xkck7~>VS{>((qy3p%syK~~qU)~)t~_&QZkupe6tY2(ly4)VwPrKCV5KnOik5=d
z5!VPwfvfju`CRb87-(ur<4m6th_Kndpq6*H#Q1ekQlTlfCWPjW;AdtvwwDl*pF!C5
z$b=W$etkGfdMb3kd*`f^W7-u}lSfr0)=m<LC^~|)I+kYKeeU^v+kp<An-}UHelHXd
zb{@|vups+hj3^%$W~(Uj8o2bzdwHi*|Ni1uF1LVW&8INR=$nfmG#80^=gEAC{V`=l
zGnawI^#oJnyfBl91VmQmmgYXI($dP9_IA#wO~QMn!=F6S;j@*=@nS&(EoVfn`H!TW
ze>u4R_0d>JP>XsJJhu3u#`bnhg=3Ag&n&Yr4qJhrG}tMXmD}%QSK=PT)8Vf&Y{oU_
zUzl%{pI3aRJE!W1htLN>PPX8y=j`@jR4Q<=_Z}-;dHQ?fn`d7xw?S_BX#FjEYLYS_
zy!#qc(c6*V?<1;`KXw1pkkfIV8aa$H{DiLnbK6aMc90dk$M++1Oa5?gZ*wm%ufl!a
zYeAbORE(@UZ8^Kjb9>;9&YDK_DOca{h_-{z^eu;e3=op96f{1+YsQC_NJd+79XS2y
zB)4mw%ngt$uunbC$9ATZDp$%BYC3Es=$sIY?+VuzX_ZKv?LD@errxS@d*lqs(s)?;
zNOQNrPB-g&(>8rl8H%@GN1W1#Ie(-+6`JlNhzQ#0S;5W6#G0ruoHDNSbVQS&RAwi)
z!ReL9wi&8#rq6&J<Kf9(U53xo48_Ptxqcv)?6W83lB%`H{!sB}x~NA&E0POENJ=8T
zx>94zVCMnj6FDV$`mbQ*JZ?^BoYU=^)5R;UuCy3vCgJkIQ%_H3c&NXrioI}D<kR&v
z0I8F4ksDvm$(mkSe;t2)CV*zYqi%1U6sYpKnB0m%1Y1HuQZCmzWjV;N49Q=xH#a>Q
zZQAOuT>2_=%h%@yZHM$#&xBHSW%-Iu$C91>=hUI#wC8)P&EJqv&m3q^hNxqyk*MsU
z9k&M6*!mR`*S28Ii<K)+I9ygrLy9zV9ZnUvopru_3YwHL*4+8zUFF4V_R@87x3-2p
z#*+5MZU-h^oM}&*s%U#HSCeK!N&PMmE7LLL-<6xxwAD;#x8Wk6N4UOw1&k@-TYnCV
z`RQ_xDlHCo;|8wOTTXy5@}w$m5}73oSsVS2_^`3M>F2uXp+z+ArnUQdxsdz4dpgzV
za9HPBpNYyWH@WXJS+n`tg}Qh~Vhx;x6GI=Po}%SgSsE$l?2BPRfoKB5XI=CxY^3qf
z_P+Y9d?76?$SEA5L?C79I^~STXuC2yF$ert-9csxVZJV~9Q8?m2afk^YbFh&B!23^
z$La7eLNVHp)CM<y**Wt)bw`=JEIC{P>m{%qzUnEqN>_lFbH{Ph%VOzF5s*dN^gW4w
z0JeGxw`Jlh37!YJ2@G&I!<dduOe_zQ<^>mHK^>Ze4w4h`i?#-x!o85sg3fsr6hFZd
zW$0e8U6@Y&1LG?JSbTjFQ*1m|Kt&iCUW}uel%MF0(ZAPCnw6<|naS74$fVm#8N?ty
zq_H4=PIAZUIDE_*)-Yg2r^1s}=rX_GK<?OvBd9WFXv^xUjk~IiJG&0>^$Emh+=nOF
zdY#+|{H~LnHtV2RK?;2ABuJ7msprPsuq$m|@w{e}%K<SD(OOwQ))hLyc7|dDaX6(D
zvu{Ue029ROkN)1a-OJ9v>nv#hs1*L&sSS3*Fz;Tiv7jG?Fd3!<tO-AaTgdt2rucfM
z*D45ZxV5ZToI_nZs+8#Ut8BXe0B_Sncr|XJKmgo<Jqq^lF{c-(Yo_vW&y#vL6)1Bt
z(BMS^PK&__xr3>O;YRl+s~~^D&ksZ}21?_<NGPmV-qNF5Fs|nayt-Jl1jsnaWzOu(
z*ayVQwB<!(sNPJF0Gdx7l!AAKGTzajh*El!9<54;AHtHbsH*i+=4lp0Lo)X<zX2)u
z;shpTm<|FT@|bVB2;==A90vgq-2}P0jyaQ68!SMQBMZ_Ur5By?(l%v5DQ+yN&Kp}=
z{>XLa@#?R>Sx^R$*gVb4N)+3n$%6Lw=u3UdU0;5J<*}#KMQS@MfH7W-DIwH^Uu;Kw
z!2PpeKPbpee~nw*$iZ(~zIAn=1b_~v^pCO;>p%_gDbT+OQ?N~p8I}Tg=JBV?yjG#F
zt8A22WI<j6qC)A3Oj~JYr_?_9TL2ad((G0N+7IL+?erm3$T1d#2O>q>gxnFptQuI*
zzEOH1azNmBdMc6{oD?Q6)?7P9h$=sIWc^Sl7lN)PABz}&giQvB$N)<Uz@TlpE+SiC
zH3&5N69@RkDZ)4<lkZRLApR*XE2ba=kjn|+x&|g%DMo5+ARWcO`FAv%{G<I#*mGWl
z#i{aNzy9q)KEJ*d5SReQ)X8N}R}=f4Jd;0J2n(VlOrQYz+}ptGO>;4bu^z7tkn;XR
z?kc|&GysPCpJK7iVG4c~Vusm;AHb3_Ykt>tA-o(O%hmxb#u*8k1dNsgW6H*MfUf=N
zYWA_h=P$%D@tvJ4sN5=s$aFMD@bxBAzTe?O-=s&=?B&SC@*wgkdw09ArWXHX47Bp~
z0Q1w;-Zby0-WZ8>%j5;wPSY0#u%c&U0V&)ZS7Yj4hs>%I>tA4r(^#e!(ha@qq`naC
zK*E|Hj(OW@$tY8x13oi9;9GUm4Y527b}S@VGt$;i;A%-`+>EM9kXuV$6E}h|AuPy)
z*^OA*`<?}1iviBZ;QfU14hGL3Eoa|5$vuu;_MZhCM2<cstgI11Tc>uaE@xa4s=utk
zr~*z7v?U4J3QiYV&IYMhd60_l1-pmN$}elo>K2SsawC|7fCTCXhER4mLN_XH-I5JQ
zGXjP|SO(=Tr>tu%r-FSlc2*!V;?IIwl$H*~K=egs8zY}EVVlHcK|iY_%CO!gYa;)s
zM=%6Q#SX*_aln^((-ASx0NW#W<op*K;{sG9ZBQ}JO#7WUK0q7-%|;m?J%-<o)*=(P
zqXK4TW-=};gqCV&Z%^0y@@-sCbDW~S#`!;ExZD`l*;t=xt;_P7wAfK07IY$$slyp2
z7MS+T&EHPuM@bst!bjlZo2a)YnXxSBh3lIArxo3^=GXy5d$=y|XgP{<KNCBdj?N*y
zt!h{csZl~Y&_i~i^jQ$&!>UPxtG-k>Vft<-SEt_N^~;*m7FFyIlO_%LzP$OCps?^|
zNkmSVO;T}GO>y}#H04t*+AbO{Kg_vj)H+gaX8k0`_1B#;Q&(-cW`0vNw4?_@^)CyG
zwJv*$d$Db9+Ksk(ec^_xf#9q8qpgV%$V_~hSS0-*NrlG|?b^9iq!OpERx75BCJLl(
zy0l+8Q&ok2T!4<&|178of60RG6EL-4>jl2t^A=hr=L{;Pkyy$fm7ME%e!TisS%QKf
z@5R<??+4beQc~adnhLbszgVFgSkjH}cV%uR#%g=cT8<Vwzgcs?!)#2m?w-lLp_p_$
zH0SdflZ*2^oR9h;(_K%*c8jdu^i~=0>qWbU_#`{cy)ord9C7og%Va!7n>_Vp>V1;$
z)faA|Bsi$uyM1vR8_$q@y2hH_TTa5-+XYWXM#VTUg?H4I=E@X0MmhXqU{kpm(cf7-
zzU0eCOvnKGYrbB!e%QCs9RW_p_OSOyn)C@rnDQw5dI>AKkT1zI?rFKs_8;rSZB~41
zalxg$kF&Q;A!XW1)04g#AikQf!s-#6b;@+3E~E>EJ3<{RIN900+!1izdmnY*rzh{;
z*J=_=`(Qm!Ty3=+1T-ECYS;&i;%*YQVZ`5i!W$91J}x_$om>16<$lA&j)maWG~Te;
zv_Aau&C}HsctUvxj{|BB47+`us4I4loE@jEV8wYK35fR`(VJ#(5fd=eOzrFMUW}HA
zh>g0`lCj}LN%ZEd4l;5(P1500V3CJW>fCa>L$=kyWn&i;!{+a{;xl2-!?;KKW>);D
zz9V2gtrC->y*`Pg6kojm!_RK8&Ejc;+Thu$mMVsw{`AN}y6v0QL}%gp{(_v`LRnn0
z-d_2zLg%grur2qBkOel_dfxR-C}e#fMw)Udg?bem^Ey!Cqs5cKrb`2^hQf|j;btP=
z=MQvTU(ufp(e}SdAib>Ft=CU8@uyfF>r{5{Emoh^e=lcwPFi=*ryYhK>`(|}dA+9K
zYR6y;{{9HY<g~fg_p}|8`^?miKYPJ<qd@)8qaLC~c*2)Ag<t00mQ-TBES*W)n5|g$
zB_g+3wk3Ij9MmWJZcuLR{kLzirDF4&7rAv7+k)WSx?&^{<m0$VxL6`Mx$L5KgFH2Q
z6pT2&);AC@idy$Ky;RkF<R53a!Xds|2b|o8)G6*a7TvvhBUG!`pW$|d+8SSM>C^7_
z(#HBz&GQ5wj8>EVpr!eU8nriuXPbAh&}sGx>AATp<|YA0J7I;{4<y3j)}hpK@$Y$s
z^aoc*Q=zlpmI_ugdbS@NzvN9ilF8|j<rL*4d=eIW;ohN)=v3clQ(l&}g=~&RI4bbf
zjWJiw`bq_yDTym(L?G1I)~-+@m}Vvsh#3JeZ^*W*-R#?e*@}IyK=EW;pCK%n_hl(V
z+A#{5?EgzX0<0cd$1>Q<dN+1dU~LJpwz(u{4lznbuHY6+9w9CeR~70Gu%Hq{u)!sD
zO`jr?>apZXpMZ_yaUg0Td~=0yMSXz~B?%lT3!0AU>mf=x08b1LOYGHNRc+t}WtQ<Q
z=!{*sw(=-FRUc^{!QFc&YPJosG%|^ZaVX31Vn<G&9QAIqTzPyzB7CdsPQ|yJhIb{m
zKdu=*7z3Sr6I>v!`uX(flN|lfZ+j2vbnV!()b<&gQp`*mNH>srNa-MZHew?sNYsvo
zvq$|zna;r#>pliaicuz~Cf8}-;=+2s#1*Sjitxk_aF3?Uickw0keqcIv|_r|h?Ver
zUG0oCxr*AF5NV}Q`S{~^40pudcD4Ut_DIEP1hbj$N3ps^=XGD#Vt%qO&Zi&fif=CB
z7zo@3CZEr8#zPZ}UT+Q%n0K4Ne_dth?Okj^J}11DM}RTP(|_Bv6TT5CQ1USM?UTVF
zMvSAo)bSe*ZBNCeEZ*aW_c(jn#JSq$6~VqR*(N36kw4}KUEkKhE1daNj&;u$D`#;&
zybz=LgX84c6^(9uM=?foGP5`mJAZ&4A9j|~u$)Fsh!~xhn%0+hRtQAKg_w!O$R&vL
z=G|;e3d@@5Zj*D{+997(9oqhZKqa1FMALOf9=I_wbd5@UFbW#abD#SJe0<JGw619x
zS}wGRUZ5`Gx?UyKyn4;HwsYMWrCN^^M2uu&Iq7VpX(BzkdPOKFq<+uCM7M<`>$`|_
zsl%&oMoZI33DnARE-jq`=1=;yloOViNv0qQ>4Z0Y+36ZJw3;DR_0rd~%q;hoC9X`y
zu%=xWL~_E`h>U!!@4UbizJj}<BLT@iH~Kk`(h^-)Z~3GA{k9IJvnJBIeq%ZpwBC*O
zRr(tF6GqbORB=pE?k2n#DxsrAN)bLF@lEu=*|1b)^U;+RGl4bPg7-qIx84WWZ`J6^
z{q}YE%~jlN#51%8Rbz&mGHOq=B(2sQBx%uYn9&7i(A@@`Kii#SK{ZL7-}zV&nlbOQ
zmPQtv8KuU)(T>zc%tVZSl_Z%&?%!>Z7Jq1wA#GM6AMAKZW2oV`Zx-9?Blerj(ah;<
zjK}(#%#RY$GZiG2a3b`h&CnjX#rHkBsBmDYMdj{v;9Q5!n_DgIFS!$X0OulDcjAE0
zAX8L+Hmzt%LM8s<m3${d(zN&8{_>Zl`wr=!fB7-r+oPo&V~JO`@N2hZ`;ii_52JO>
zkKh^!BA7m=>ZdvdU#Xp)&*o|l26%vJZ<uyq)x&X}-3ecvKL$n5M<c4o#h)1-qxQWO
z-~t=$^e_U`_?_t8LFBf*Va5welD@{9D9Es!lYuFWAi{?yPwNJYzFCRWESQ^9d`B3U
z$KMPqQjLhWm7f;)9a4I*$037~6AJd7PXvsi-_%?ZxlXki4QcS-hN%b3F(%K1#-bG&
z%kO*Y4AHq<Xs;0;E(}l9-jv3;dS&3Ili3$uuo^0_2_=JEhm$w9{Ci2*C?Tp$Q6lR0
z4$(Uux}W49UJPlx-*GRk^|D3bs&7LU$hyw*5Xl-*OhL;lnJD?@6b-Y`3(s5jU1%D1
zi_vm97Gkx3kK%&9Hd9L9exR<8k<Qda>(Kny_32kA@-g!ngO1c^_bUfZTlmYyD!;9I
z6<4NhYz=vzMz<^!PcAym2;7=^dxK5j44=ncn_F`83y)3*zbI?u4VpjkuvKP{Hr1)%
zH^dbd<PE=ZSW1ne@)i+4yg#*T{4J5cMwP#}EZ1}{B{jKh@U3j3(>>nB^O~($ZRap8
zSonU7EUJ}EY$)MYZcm{Q8ipnA`wMu59DGAK?;_aOZYUeSn6f_iHSE=@Jy?f|VjvI`
z+1WJ<tijT0-Zbrv=x>uuDGC0XPpg%ATR-;6yRG9_0>;72M10W37b%JLDCsAd<4-f<
ze#EwUHcIU==?-$E^4GQ+Nu}?*I74C14XxfdOCZYYX?xx;_j_W1x$M;%e^`V$(d>KH
zCklUYxiYc7wF<JWoIV?PiTsSa3t84Nv+|gJ>GO}Tr#8<tCyyv(^;BqHO0~UKr1^Eg
z;le_*p=shF^jJW(*671JZS>`6^4?ZT(TICG*leONg4@F+9!b^wI$E=u;aycQu!k`X
z)?+^g^#aa*kEXVg#^3lyEF&n{^Z9kumW05^Y9(Sv9yh4nU;a>fkOdi{_g-3*^<VY*
zhHDT<JV!PmIq3Yf4*ya3trgt)y!^ClUa|?I>2WV=bhy5-?U>b5+WWjFe3i{)(ncr-
zf9f;2SAEv=WMl+?(~pm(2hL{Qb#&~Os*$QV$*$ddFZd;N$;aqQxA1lEk;3V>#o^|v
zF{ch%$_qm`tKjB`ySUo+%$(%7_n?D2RrQYdbq9EAIJeP>8|eht_JTW_`F@$ujvrYk
zws`Yo^a#49Le+#g!LGYSTa0ut+A)y5*6bNv+!5y6jMt2B%g>yfqa`?oPI6CH)eEf3
zNdZ^#TrXu~?J8HIM+5ubWpm!*m$_fCpifFJk>${oLUuUM|B?@a)eF{S$}&t*jX3Ny
zNLWtnsk`_3x0QqkQ*HF=5%_g|)#nt?1hnD)tgDsYzeOD|ZJ)^+ExzVTx1lVWBG<jO
zW~<fM@~BjZ5;lhzf5=Q;Fo}XQ6&bqNZjll%TGA+k+mVt!c2E1By^v=8GiE5cMxfz!
z-9xTu*By(IL2-)PK~}fxfq?oQ-6J_50{MX%1gFb79heLxq(gxjF7|th#&_6R(Pgii
zk)GYVK5xMwY!s_!2C|iaU0J2=gq%^PzWrih^er_sekl*kYqG!Odg^}Wa8*wPIhidW
zaD%W|{q)b<POdD?g8NMu1h!5zf(3pTCXfZqwn>VwJApO}&D6GRQcnh*;8sJC?J3M{
z{E|$J&0;41mv=2PKk`-Ww5VLTmbFvNAPHKuF^ElV^yrJ3JDBS6*{WJ1Zly&%1=Lod
z*DBJz#~YoL_;_!^<1Gq)Q|Fd}*b*Wt6cP@PjoSI2vD4~XI?sYsELJ;pjdEaMKb=xX
ztyS6C@E$K|V(m%AAHtF-H%YgX4V}GS)GZ0vu`#SRl4cr+U0p-A-;KHtvzqC|jUYcH
zU4YkQjt;!Ql6C_o$0xDch9zF3OqcsN&338lzQn#n>^4afSm7RX<ZjeHfS@kn(|1w#
z$63+QCF4hPlWN1iPVC*hIg!V;*fSn$f>>B0q=Nv|<}Ki~)B+*>O!}M8Q9=^oK6VDC
zPxGi!aX;y>qy7?W_j8Fs)THglgX0V*O4wf9GIK-RysKT<`Xf15prs()@QYXCBs}lU
zV60PHz%nA%xLyA<K3x|T0eS(#o4Whr1<WyX^1HIGtE82c`FkmuPw#dOm5f_g-BSC>
zYitnAd)tA_VyVXDQn5w}1f8KWZaysYi7*Z%;>}iJu=_+nYBOj$`u7$m3mUZ#BSt3?
z+R)IV$=4?FuOK}m>vVXY1_W1t6!iK6qHM`PYYuT2?mS|1v?TLO$}r@x+P<h*<53Nz
z)lROe2Vn~Dm!9HgXScJU)(_0UZnB;*A0rPmIrv`fVcU5D!HLGvS#yL$dJtp#!u}M1
zkLQQ@kJ_hx)Zg_f3eg2#pdvQVvC+?YlVVAONryHvKb(n4S<IDSCR}0O1Mt4IzgMQ>
zij+3wwe9-69kyx-Jw9u(+RGiQo_=`T=>Dc>wvU#?rw!nRARvhNb`Pb>e6x&Plk@Go
zU$aQ!rr*VJVZTVVvY=zdS0y%9QgIPo|BD<`-zt(c|Ar9BRG@eymQ1g4goLaVx_CQX
ziyT^iBqhj9?t}N^M?w(`N&r{aHL&!n)dCT&aQ;B}8d$Ke3EAgtxyME#P(BiXaZT6*
zV6tBVQALIdT~+0+z?ukfBX6qlOw*E}9QJTs6{dK~2$sPEY-q$51Qw-o!3gP2+YLgE
z<ye{+m`%JFnJYhclKUne^crnNGuo(MRKi49<NK3FqWyXQprV!x&IaIU9*7(8rF{UB
zKS}%hbL}uFgr#|4Zy=VGHVWAz>6jFzIDQ1j;3)+(ob3P}p(JF3G&oZ{XC(ShuXFzX
zq67ubD=0C=3;rm!!2ui;D;Np+#S%!7NR<TrUhF5MRM3g#MzP-+h5yc|NDy#|(_afS
z1vdKwK7R@1Cox%A58QP+2!$xanVdr)hPt+LhUb6+tUhhoi}vU0kAKR15KgsdM$CSn
z2i9g^V{<=TSB5E`w$b9xo&h}@1pf8K9|ZpO?Y~<Lzro!<THD~m<EO%2U`H&0HsB?}
z8{(7y)e8tKU$;keU9|#IzfSyzYB04#cA$$Anuq^&7PRy`n1C{X#{T-Ew)bDf{vx6O
z8-d{ekmd%~LlA!w?;kH}2ifCzAWFpgA-Vu!QE3A@(*QbM0{tl?;VkH(3xdw`8Z1zI
z=7oU~VjDm)5U2m+?b6?0{Fp2MSxgnZQOxOA<t03D2OQW5I~?!^bJ$hs+5ymM`=_Pq
zodV`BJ_UY0FyKu!;ZS_3c{={EaYX3Ktdp9x0q1Yb!@WUz;<I9wY3~;e=XI>B{01kx
zi$g@lrSxuCq!mlIe+{t+?BFRWGM#uxFN7t6(WtL6CvOo)<HOP|;gnQV3KNTGu7ZPI
zbx*pO!psgN&r%;q!T9JQPg7Q6Kd+LBR(q!4rHEGEl&TwUc5+A=jBgUPi8vz<q6*$M
zoaExG8;Ad#Up<fdzL}nnkB=FjDWymLkZgib0`xr@a$v9-2T>B6pC_D!tUz$1V-cM2
z0vWbOdpQs4SA(j9k8+kC*AT8klLXQsstPb=0)qlhUxH(f8{`q0G(g@fCk5COKz?f@
zVG$%dR_cEqk#r{`L1q-YPD0RP#=J7O6fuQVHhKU_65{3!y1<Mf<u-Pl0kW5o8)pNP
zv%|GZXvb?Tz;pn30JJ<fa}16|x@?fS0>~5sWInS4duRR=Qozs`+3|~%MkL)x=WiX`
zD<Lt=HY5jFL=)rc;8k5gVfJ?V>J^nQt3NBB$L`-mvbb?;QufZhb=-CitxSPfa6t0k
zW4-Pc#UCKeQy>OeZXZ=APFL;up=VhCIz7JOtL4FK*YaN8Q2gF6sjC>ddUBxvt{04v
z1{xg6&=>6sLh$>7U9KXPdAVmTy@Mo-bPid<UTDuJyjyag@q&Fr08t#jibOCLfur0I
z1ZK}KeYtK(s~fWiy|=1s-z-KJt(M?Sh+<0DSezAIBX!RTy|b=qqoNZE+7qk@5<67X
zo6*KJ_fbS7bGH>QZLUj6&uq49@|5D;zy-GuBc1MqV0Fk9TmNT;S<#Nu%{4VP)BudF
z(O&xiN@Nnxr!R~uAwR3Sl85qWyF@74?OfD7o@=ZVHn#K5`xRQ|7U#c-`v1`Jv}BqU
zO<pfI<M^;TbyHY%>6pbTwj~+8N{v}u4vaqCrHq03Y9|!=>t2zp`Yau!bm;YrV%_%F
zfc36$E%<+i4$sz=oYs}hEouK59S;}v3c){E{(lJD?;%|&GKHC2z@g3m7`p$(=FlBJ
zx*b0Mu`S_M2jW*pcY6INq!p1OJLReRN!+m#rfOO$yPa2e>*QI4O^=&CLbR3X6)mYC
zY4Yo$G*?naG8Jo0h2N5)G*|t$T$z*=66%T6Q5<8We6)Um6o+YoB;@?x1Z%46Nj`&H
z+ORsA4X{o5U&r$hJXz2-I(uK82Kro2kfnZuVNXW0<Gw+K7(3#*P3J<sn^9?9R#}(^
zedS7jKC}|mxcUjI!44^7Qu%OCjQG48yUyvv;a;_4p*#y`HNS`J`*hXVk|k@8_O@T^
zMdc^kUO$ak=$@Q+`Mkxqr2@(6%Yp>zcHy{DPrhFK;dglIt9-n>qu}xCorq8=nf18*
z+KAq8$^Q=y7jUyW7qJneVAd$`bJi$npOcXM{pWl;bpr9@EtnA;E-~Gyz~+@511bDB
zew5nucfB$T>@}?DtXA5RBj?*S-ClFK_jXv$`>Rn7f?xA+>r)A7oonMU&=Qdo)3bS`
zgC`x)Jk0i-mi%P1i|uFi+wo1r<o$<@>QI+<Jdqmf7@lkjT&vL+XB05EqX^_B7r|26
zWpKcD<W8)P5^7k_1byM`3|Z$gNcDvpH_u<XstJ4{kr&gMi#|eA4#=l*HxwL3_P;J7
z3`ktNZ1KTdC;i#eNB*+2v!`p$^TA(q0AcN*@9mo-QTOLirJHU1g7RLW{Fomz%v5ii
z-oZTxd&AJ1faTJTP<mHL*!o!*h$!AfZ`W7COAg#}w(vdeHRBprw)%LNS?m1ZbM);;
zeXial!ggkt28@J{!Ej^iGrGT8PWEM$8M|M*%zosfC`ea?z(*%4TIkzoH>q%P$Xono
zI-Dj?cB60+Mh4x|tUs%B#23%+3P}`I;Odvu`RYKA9Zb6Jl8O;$4$=_RL~Sv~BA6gZ
zcXB^swo7r-0?5egaM3`bgio;c8EuckWxo<D4i&i@(()a3$NjiN3>e$v)~G7$hUi0-
zGH3d>t{SmSRMGJ&uO%CDap%()M!Osmvbpc9F0}fue?t?nFWYGD7uP&zJl75TeM35j
zkR64sbw>U_o}r89ir&ivU-hWl{mE}v?1`$E#~SaJd>no`3090tuFF?wL6mND#*<4m
z+__V0SX`i2pxGYB+!)1OcaI-6dB6U7=%Ma<-}pKa>+P%E{N=uI)bg0EeFjb*ea+r_
zgeZ<mA+_8B=b%+6##wuko|Y^7FW<Va;V-v5Z#8TpjUKdr6tgzf0Rq4<I&vF5xU)t_
zDtUysStEtaFB<xY=#z4Jw^X3xqn2{r$35M1wUExJXXKK2od~mSKragKmp?>n%6jpt
zy6UE#v2Sk0*@cVnTK@-C?bzgNQdxPlmSxl}v>K)5O%tv7e1WR=^b05H+LnO;)vS+V
z^52xp<W>i}yTK|=gnp@p>feapqW9`m^ji$9_d?C5rT$aW%asAG!WpM@UBCO4a<=MF
zr-@6_^EQlZCc<1_9xX~M@Ex(*JSA)7pXXz-z53?t?Wj|$Q73lxJV1{ZLnwR`E;<$8
zh`s5w(&8^dQ(}s6jz>fuzMU28?l6DXY`65}*Hc3!9jd$KBpHrt_Jy>nw*)RfeJ=Da
zS~6ML#*FfH4wo}H)!A<$QVyrwvEUHxW~7>Qv{m~QQ1Qbd^J93p{tjkOB3icZJ9WG{
z9^N=CC3s}HR$u*yawEovqyL5QTRy`_TQM#_8kxP9ovbLZ<xAa}89D_KX6|>4-<HN+
z+Xt2{Q<+<$RAQ052=DiJ(p+uk1b$QC;1Ndd>m_{)@q)-m(U(e>4DNjBXaF$?L>^jS
z_Qp|Qk;(2xm#b3-a;mCs^orcz9LVe%bQtV!zEE}ci9;pW2`v`}rp+8nNLsbNOb3Iv
z558vYkL12s@)_~PpXApPwHvWroj>HnS&c>~+qSz-YER3W$&(mwjWMkQm0=ITUU{%a
zmLG^_WTDlSvi+M2?hh`)m&~r>nHASeaM+9foD&&(RL>{?tz)QbPI!|Ze?O1vWY@+0
zQaVv_A6Cm;>rQ698@iHFAvQBlxw^QFWfY<1NtPjv5}2neheJ{@VQ~@fZ0`<`58U-1
z2*D}oaqp|3mNahe@{c13$=&WfhTS@4Aad^NS<Aki3NS;me3Sn+x(#(lRdzFyXX3z+
zVTfP$Tb)WgEPLNI>Bv>n4A1@M1#)<q{E#{X8rg%<qB~Sji`x?!IAJHZV19|Aa!S>m
zMSU`9tI(orxNk=wt!8@KVLSb<rNncv7KvHYS#F?oG|WS2w+c#hL)xaNYJFYB&knyK
zI~?y&8*HE4xxP2S2tvQhW!iRw6C79PBTGg<2kMzmH5(6(Gwzc{gtGM)C2y|3zoXr!
zSJpW??b1N;JVQg~&~D5L+^*Z1)_6E&nLOO)8g^rN>?;;M`q8jz(m?8KA#-4O>&=dS
zpwoH&A(I;#ez&kX+AUP#%vh!)`XntNx8aG27g5v!8LH%Sn~}a8ZNHFh*>W}Wfx;MO
zeykt=MWE>^1m-*|4d(>b{5NLUXOK-QIHve3+BhZRWW<SA$@)UolPg&gs>@YXZntW<
zLx%LN+ZnaB6R?TuSLhJRsoj*(BMiJNE#8wfzvT6!f8QsGRoxe4I~HV|biMlg>Y$|W
z+d4fO*SZ7ESz}g^?9U4l!!K$r3e`$zCi?A(M@w%E?*Eu(Gml$FL>HFiKD)pu#2gxe
z-^TLkt9aLKqomxz4XDlTr%JCI<+?b;<-7nM=kS=yopH(9>F>mWh&PDxrs(>~eA;8`
zHFIjzt^Ff5o<6r^7u#p!Z;@~}=_Vi&k%Q5rT^YeQOw!?0o0D~)o>o|L8(Ta;tL{78
zxu>coa;PQ!%l^w8mr$d5Xwnn(G1~cca|fS0Q)@1Xl$*M8e#*1OO(pk6?GrzRSFPWt
zEiCWH&{khQfmac}RKUg2it%z5k+=q*1i`BF5h_lrn+0WV@3xLS5(BMsH;OWMmNTvg
z`b#=b-tYG5Lfy{t%{BcvraM_@h43H~R18xW=lic%c7w19E@MkqP^@Xm#ku{S0(=v9
zjcHX6o4;YU9K<z0rYqC%q<I1FgLFOGtNbBU38|Qn9<U{Llab=pId_Ys{WSayq!yN3
zf}~nj-Nd@bZv!Xhrm$NpjxdTyv-TEASG_CeM08UULb=8r8Xv4~Cl$h+>yg|~nX;Hp
z!uB+an|>E)SDx^$TOQsnlc@5cO)0PBzJaY7pN_yg7Idwkq{xNtNW=T>e}{0>ykt`*
zmpOo4Ft77rq||8<X}(RvdUZVoFJDqsn$COrdl$~$HmX>{?eo@a4oHswZnwJidh}9T
zn2WwRbLdG9qTDzVJF*qKpbUj3L{nrMh?@z%xahjgJ(oySVf|f|uLyT}s{@TBv#O<4
z1rN<F&`XeSJf6}msMxpu{RJ%<dulqB%i*^*>f}D}N6(5{`}2BP!47Vf-ZY2k6+b+Z
z9VhS8)~TyPwQ4|ArZh;-$GPa2Qj<r@UfoqHM3+09TUYPe=P>YaHC8_WpIWCx>)0Vi
zC|7A5e08`@0u{r!QzRwXaZv(V7KpXSZ$bNw#QG=L*{@-vYK}Z}kt=SAn01m_-sIQo
zpi4|@)yZ8*W<fm#Ywcma<GZfRS`Q66BO9e(S~h5jc(%3}8VFvWMEcVGS<t;}XpllJ
zjX^TRAKSmj2vL^ml&E%zB;U}x1C~xxytel*?KV#D(Rj~nX`4kB5(Nn!e$Gw!GWiG$
zw-b$Utm-pe<B8r<->DP8;O}Z^V5Q+d(r_6sSCHn=BKCTn<|n2Ivk{|84bCA|BZT@L
ze5agGRNHQ~98cTM3@CluPe9efs|RW%T^KLa(mfkqC!}Se`9GB_8_)HVD+%SOu4`K9
zkj1UD$`^vX-V(*_ou-zi+w>448OW{0AE~R|w5YE+aj&`Ew|S3hwxKQD0?zyBoyUPc
zk|NAjls)XLJsvwkRk@|I-`~H)Bl@GpiN%8oQxW?CdgewSEtTYn)&+LjYuDapK?M)M
zCe1ZvFSc@PBS`qa`GaMBT0}-77A(~S)>g0#{-Um;Hq2HKomJ~ZOn?13T{r*l-`P_`
zAY0KJ2(wkp_byp3NU99;JaHLp<#fvwkR_ByoUHWqz2hiRrcBq!ceWB~Jkrp7dCN@i
z4`H?)&ztrh(wy$>-Acj4iFw(<DSIb;njp899LFY~-o&}nmtG<?#_dO{EKu8q4-K9?
z=k~oIJ6!49Y5M~vL6?@h1d`W!rWDw-4Zj@`d5yonyWG}-q1|UwwXRO~Kl_%jw>LXn
zi-VGp$N=%yI>K5{@%|()5Gx_2%n+||!;xc7)k<A-Zi+7%**L9JYw|`yc%Y*AUbc8{
z{2k6a`3!>2VoM$r+9Wd9hc6RoX*<+4dXhl#8xpNdtm!uG*u<0AQu_r2l3bMPy`ZPF
zCKlyAGN#YEFK4|I$vG<@i-wc^*{1>~GWI<W(>aMcHU1u3vpY!#PJNpxpj}Q`#=B~!
zstuVK5U)^+?%%gteqp&!De7U>!5_^5t8Tp|+zB})q~n_tj%1Y{(l5GxdhkT0Mj|m;
z-)H}j=QqU7Ad`mI<xYJ13U`N|rCdSuyQaT1euQ4XLL=X8G3c#G<7GITmt9L!mOJJA
zSPZW$`B;X&^vu8H(^zf0|16JgP2a-m1GQ5bR>H|$=|8ls;|o#P6FrwWR`w27-dsJQ
zZQHtY5C37r{-L|kWjn~vdT_nh9}Fbmyo-)KAKpJ^$M2X(Gco19L&sLIpx$S_AL{2%
zS4W)a&i0;rmS^f3Z}PF7HWH?4@x(hd>Skd_?$mSj+OK6IiQ5;R>YQ%Q{yye`aEM08
zeN@dIFjG^lGc>5S=ib3nJGS0ss^~g@`l6ZRqId8M7o)3(UK|}v@h3Rdg>El2PwcCO
z%$|D=JTK8z&374+d}td{b+$mH)7oIWXx+}Pr=E_ZcCvw-Wp=xs-{|trj}D&vqPi_i
z6*um*)O+?b8^5r%fv8djzQM`;+ibw0^p3ur)U*6XyCw~`6Tbut4(dJNFMY4Y&AnLc
zb$)@AAdHap5yA58ZGw=W5Z{!~vmoS2?1b%-C3-d+`_8F>S(gd^4qwqk>VNCf_>W~c
ztLy)tp1|ba@dPUW#sO3ICU5VIJyehD{>lZ>>eXK*w7%42fB5cuxg8s;FuLQaou4q<
zkE+=!GI6IjaeH|iw*~cZj=MV|I&cL=dYvro8RR!MYRp*`j!7OxaxM8sroacbqR-X!
zE<4NmUtH5wRMp4!Zq{u~T7UoJS?h9h-;#h3J@At{e9KhuK>7<Bre5rR@9BrOqmI1U
zueZSho38fFFvwpuj#End^(9ehrnDfk`>j1CShCgyU+0CL^m|o~+eHq}uC9H<giBeD
z`bX(=yr#qvw=wyKrb48)b<LeGC-_|q74r^NqGz0vHWo)$9!IGEFqu`SRM*4E$zbzy
z+|}ZqlpB|pbS$;s2R@ee{r=h2{!VnvY3$G~>vk&cQJytzakSQBe%Xtv5={@F>eMq2
zQH9siBP(-`q^c#&OiKH+ZL^#sDz3hH>OUYb(s5m1i+<!eH7}(ZvDvG)%lmLJ!5x1(
zww=hXMU1?|u8(zsR-MWChHC=6UnYjtDaj3AY4T0Oz7uzcG}e5Z{L4bqWfJtFL*XTP
zp*yct%?ga_Z9#5E!A9yLf<zx{H1vDK_!;*)jFnYuNS>+L^2l#399s~f0MpdUZS2TO
zV~TvkmSx}rs7j}L)MnMDOG=mCbq<N^R<61olHXhv09}<htKmqqx<auh#}n%rHm3+m
zdCgVI*Z2Z9y=bdy)wy=QE_sZ&t%6?*xMn{Ylc?qYhr0I;YpQGeMB%X@f<%#`w1_m3
zrgR}BDheV3R*)JIkP?bWNq~^pX#xTQ0z#CkB1B54fk;;nkkD%gkxn3?1`^`g&-=Y|
z&iBrIXXaejnQLagKawjUVehQ9*IsMg_pjW1q=@E|?iFjduazu06BUv4^_dEy95UAv
z$g|fgk8}k1_~<OBiac!Xid=)ve!C0~!&lmIKIg-4T<*`Ov{e4&*o!6&J`M7$WcvI<
zMxZ4pae^$vOMTF@3kJzW6NT=g8?~OFq~?BIi76R+^9_4PDsCfbiX<?X;Ast5y7>I8
zgdVT2(tX_-{Fg&rpJ%-z^SOi4xjpF{D+f6@nDA)gQECuFBSu?;??TS}z(CT4;vWan
zr*22_rbx{`It&v!caGLwuja&>wJl?CoFIT@1msTk=)%`dwUmgHrh(2;ysua2Gm6tY
zI|C@eL9mqZCN7xtTNSVSQ!d)lv!LIQ{#&;Ny65g(P2hw^zs{o1)tSS+0``|s*PcnX
zPn#G-Kj)|oE)#EoBFb|F1PWz8U0jiMxT{r}(si&H>^1uUcEo8=Jep`y<AdXzz`z(?
zPjX5zGi^6hjt2Shw|>v}2IHhjO<AU`;G^YMLTEH&`KzA~VI!k)#aXo`u%{gBojhh(
z`7;=QZDam2gd$d0b@@!wZ1r>ho6r4x!eSYz5m0H=vo?ckSOJ24N2ak!_0vtRnw49P
z8jytEzAtytHfF61*IF%Y+R)UDmEg*=o;BNOHc?{*uD^0JD%)Rm>s;f39R9T#<9RzU
z2y@h90yMDR8E~ByLCv6)QA`8x_~ne3>QT!5Fyoq9g9Sx+px;Y-F{jXXf1&lh*xNaw
zp4~8yQL|gVlHLeXe!G%r8IcrUd-qQ3l&HIbrjPxnmeZ{2!DI(RpV6YF2bC}C#Zk>;
z9=L-m8}{_j9@nZAwX0|M3i$cpAgQ;zHrCs`dV1=Q&Zkm@0%4J4#||HaT>H)k_dBER
zM_*t5yrhu3*nMoOHjH$b<D{#17}jF7=X>cT_BYoD_YVJ-!k_D=!nIiQMJ~IU7%5f&
z{j2#$yG5Hv4qvoXAXk@1(almCd=Tp)sbJ0A91F9Rnc!*GQuw8u<3^k=O0$9Zla=xq
zI+8k(=O5z!0b=&4B3CZjHJ#db(fQJiTB9l&443hmr_<#^&Zud=Zfd=;fU;yI8rXCY
z;^%F=scbc3@RQ+0QC_4Jpe~cx)#5b?q<MDDE~Ev^6dfa2+sK#*DJz?GDj*#;k^tJ)
z+s1!K`#uzYlzVXiys^Q@eF48T*fpZWdGQ6dxB%KcSReJjej5q=GSHvi|D>y0;p_Rq
z$^!~7joL#c3g9^~-ar!19K39Q9n%V6P}{Vn$0dI;s<AibOABOtSL?kmT^#%&8CT%f
z`WOa<mFj40Z(-Y$*h)76V9cFUxDr_}&(UZ8o}aAs8y*2jut<pk@B4%5-orlY1GwMp
z+uhTbR~tG2z>&(SsNaJ=#kkJurp5EJ-p+G%o?Rr{dE{NTiOqba?sybkmp6>N_KR=U
zZ__gG4-d3^`^Ik4Cv5kAPN7Rv`a0(1S2p^3Ie*nhLH1faI(=!qXiu}jh`D-9zT<-V
zeq%yW`QSePK}-uxX1IkXgtQ67`kYm5-0;W~sY{67AS)0GcPaM4Kw#Loj#RQWu_Ark
zJf7O|z72jAFO>S(?A}h}&{(F<u^h*3wcq@Fj1@Kx*iy&L*=RcEEw-Zj9N+ii%&Jm!
zqpz%`ubbO@t}M$D%3mz2EBJg8G_M|xce~W;xuq+<DUKW7vMw_YB&it7`z97{IX;^K
zq6_GuC)|w>e8a%r{(;{?f!M5|THXE;sGn6=T@P^|txJm<dmB3%+XiHZ(q|{j`g}D^
zGJV{&w=73*9_z`n#x5_-ocGw%p@u%ADxEblG+i@YDFh{i2X-t69Kqi%V^E@2ikDTr
z%VS0}V&EGkramg>GO+r{xA3mAl|Z`bwJL<;O)>&VfAv_#OX4|yS-#<&-oi*HT`y-F
z^^@LaY`N&q-|EPAbg=J0_#g4ebNo_In0OuT@#9Nf^wRx#rRrIw#`*{Ew5!!BM|}>q
z3-Mm2)9=Or+(P3g`5-nxt!*V)V_iv)x%^DOVGd%dV^`1V<%|H3+Ahh5YoexKx?W0N
z{Wj@sbnEFio7ornWr$)Uww*np#?HY)XyDv-a@@m*r*lk<uGbe?Zk4nxV8ox<T#C6_
zu626Wqw8!IDQn-2a)w1*rh&uIU5F-r{C+pUaIyIuEONW%NF7-sJJq;@ps{z@YYXhv
zrz)68AFTz9i_G#_7uAG~71O+W$|le9VQ#y}O%N8e+r~nr0C{w3Nt9*!L|dW*O5j>e
zb;^Q|er<b8+-y>OXRK{R!}ZaT%P#v8;tsg2B_rKIi||mi2+QsL!hk<3wOMO;fid1-
zQ2g!>kM>vMqqm&a=8W^a{<zJEK2Chj0&}4ve@cG@a`t8seWeA(av;CBO3p6#*d7xL
zi71NvbXBss(a~T%C|;y{X_2%HUSkdRx3)D<_}8Tk?U^abpcpJwslvWc|8`{h-l!Yn
zkG9ojLO!46cIufxrC4L~zlaKx^AM228!PnS+C>TF0okvkIoT!;kt?kMt6T>iRB`gT
zk2(bbKR>muf4Fm@Y0MW0D<7i^b~8f;JLb)IaUr|yE84Y^MUPycnLah&&RA~o#jEIX
zc+ctJ!>DkPp>g~9tr4B+qJGNGTepg2x76Kc6l1(_e*Vr)8`IHSA9L|X+yC&Ctr#rj
zvJX+V5cPE>#NOhp?&}p{=5M<sj^F5cvts}g#pk0C%_IFEYkSM>7l)9dYidPqX?j8p
zv}@LRSvH#j-OGWWb43-bZZzPXYZ>rZZI){lk+GS#_pti5VtV`SOBXng3=0<1S5-dL
zguo^gA1nXUb$}QDuW`-x=q12xn-H-ZegR;S*z{=s@31ETbd&!{mjrwd<pu6AKou_7
z6k%fHiQ)$K2!jW;5&-c&_hWtF!1W(*Fre>r_`5qB=_p{1AHaTXd&QM@@+xVWGBUS$
zIy2IZNKHH%;AQ+Ozbm0~vYhu>A$I^rK)yn2glBuzOeCvk6phpozpG~3c=%qI6T0nk
zn!7<KeN~V2AtI;fF1Nq+6)@Hpb;p)~{A^^6&@kW@f_Bf9@*Kc!(D~+`)-?ejRLi(M
zRj4kca9;O}6Trx^BfOeGrm?FW`^S^qna=uMrUV{z6Qi$yBe%!7dnE(5)o3$8DswBK
z^M~c2KGg5=GVsY*e&TDv9c*qdnoe&2egLK?pS}i?LLJ?_%W|A7to7qXTh<KflqVjS
zElWR~@0#2%HKTtR9aUW|eSZE2-liAr!@$$v&x(97XHa=u=_YE22%$XuRE^GW%cy!=
zt5ii9m@-z}xsxZH?*m5(a43@<Uf9GDI$Kje&q?@{Ie8Z5w%<$E$bl25bY5vLxr4bi
z+b&$;RxC@&CQ_&KNHdVY<QL(!9n`1z`|AI;$wkXC!Ar4>i;K;6tuL6R>}GL^fi$Dn
zm3_q7*hk2h7O#~BLC4qe??^6`LumJ}WFJoWB%B{7;`!Agz}GqJO3SC@WMpA(yo@7%
zYd|ND8C%;@iPgc_34U{B)oJvsk-^7r_*}HcWT)0t8$E-WdXafjJL<i>c)GtJ!@Gu`
z-!#~y>C_({{mxML2<}--U%Gho7mfOpXlXL!>|}>$rI%d|#CtQ?qdGCX#7gcrZ?F4>
ziFzo3wJ81qxJ2DC(31?;*IwyX(Xn+g<5%3yzc!OPOJpuJi5u5KK(*(=_ZDhk9FeHy
z+w&4zF9r_B)S`^n*4{lh>hPd$63@qx-!0?{dx#x26aB*zC5Gsjln=Rqhg2hL_QOu^
za<l6DsYo0j*2PHE-yO@ofMEQLuD-dlGVhH@XS@TKwKa8*7*l7XIMU3EYb~KZU&t0g
zK^Rx8>}Kh6SoJmEF`;v9Ydjm>ag=h>(|TdF71J`4VQF3nl7z!M{P5=Cyjfjlv_0Qf
z(XGcjNDP;C{2|s8rhSu)I_p7}7Ar%33nn^K9Vbv*ct^!`(_`uW6`JXh?Tp}6VdCPH
z7(R!E-+aPKn39(9ARN;D!*e}lYQpVCc`+b_f_&3@C6pO(`=H6tM09hYyt@d`r?r!M
zTdCUg@?W`u$7GT}Wsl5n)eK~Me)&026S#Gx$zOAo*&xSR$vSsg^}>5lG0gd%X>08l
zDQt5(03@2)56-SUdt`4n3uB(a?bs~vHFgVg+pvET-Si@t>XqyI*X-&llY{m?KKXr)
zO+tDLVXoa9?0~8=x|g0&!3PlOm5;fn#}OmziBa?~Gf{V3-Ge5GcCFA!cX?zd4{BW0
zNg#6hzI{wENZ?hW(1!c|$KcEAhn#v(^cHW}OIq9yCX}S32Bv}*MNVEb<Q_P!q+;^>
zc5-re;BH10vp7#_EAR(t-Sy6@-m`P$Yq*IdAm?hwc4-Km{bu#DhTi(YkA^LG==9p`
z7Ga*dV<vr9UzvaQciTy#u?-oshvnWR?nA{(TNHX7U~22G7O0c2l#mnw()VK*Jdo^K
z6NKLX@b*U))aEw^_PCR(+Lc=%mc2f-Ns59Ct#CZwbIvlAqZE4}TK6gqJ_?H_Ej647
z*{jd~DW*t^9${T(o^G;d2G=pRn$&wxVdmrsg#PrkYgIwQ$EAdq^{%!OKl_+AkVH8;
z`6HZ*OhN8Zz}EE>;{HIaqB=E2M;Ow2DS%B<vvT^vebWIJ<D6n?d5y$3;g6V36|(1Y
z%K$uNXy4OYq|R+&SVrjc?;BhAlf{4e-~4dH$)<+xGFy1>^yR(}H@r6DU5q#X@?#Ox
zLA#Ft%`VvnAJ9{O5*0B8c*?V4X&uk2`?!1y;ziWTIGD1}fMSN?oeNP>XJohQQ~)l_
z5WCqxsmUtZ07{^R5qeeCXtf}%2si7*@z;MHKDt$EVDl1AX`9lJK%4t$GJ7ot2w|Hb
z0fR5EI|8(Fy!Ye}!0Qh{eh)6D1xk6eXl<#+#k`a`=onwb)$F7iSxpuI`1XiObH}5J
z6U^54C0>tOuh@#pC7*enGW7O}>DUUcZ4L&yz{Iedj#{zBobGx$9noC!*!X7gjWp3X
zUGMg0-$9pe=T_igv?tT*$uic>?-}5$;iK~gccX{k?R6yCUxBEuZUX3<+_X|}WIY?G
zvv0;6+>KeH+c#B`q=J03&)6PpJdSblkFB6|)mmNY1kz94qe%_v_ZWbCAJRCbyCt~n
zl6Cupp5lo+V0B@&oY@64d_?6{3X?IM!L`GZChGA_P_xDh*a3)i5gN);o2p=?0W)s1
zYU<I2Pg-NP9l{|VDcz-z?ToiHKFRZ2_#}Bx9AZrU$8nPlDQfMny@CIPQ4n*uRWSgU
z20S_ej770N_+Rs`|I6W)zu_J1pZ@=(`;SQm;#VLzLgoxJC2ccS@(QU>bx(-*2|@}g
z{SsH2`JS&RWCK&o?Xbp*_>o-ef<e!02GadvgsT4VxMl4c+n<gv-5zZ)gH5L_p$pP^
zIIL7Eytz})GG%q;Qorh#r74Bnl*Xx3Q<uP$kzfrd3Flp;(TGtTD3&MmOx5%~h(gwk
zG_TdP?QV^7U|l4$jYE8!lnQe3O8r?>LDNpbV>&H)W7Pgsk8iPd5ounTZ$}ktc$s)g
zQ?{EqD9Jv}ilKIH0ij#uj#ZPreWA1r2t<4>@FC*L*66b2)(?(15Idh+L7zLsj`EFe
zZ@4O^690N*8GE{FL_Tpe#-s-1d#hu0lX`H+Me!p_&xSNmZcXevM(k8k)^GJMAMAx6
z!2HEpq&Y|=w>`IO-$%C7pJ6-T#Wj~t-Ew{8dbmKFca4`}{SLb1AD@lgSnMIn(lnyD
zJY?|;480hQb;omVA+dy9yp&<?IrrgSCF#Ops0z2+3ChyS9a@B*O>8v}zxdm(W%Jy`
z&F+$Spe%q<R!et?B{gD2tr(58sgb&p9yQ<k*2NjUk-fG32SzKG(L?NY-q=FUZB~Er
ze5Hgno;Gf|+Dg~85bUisG3KaO@2a%t^q`|g7AAtsqoC~1oKDtk^t#^xl+#wLlVUGK
zIk&WErqE!t(aq3hY@6NLW#DfobDCiZh<l~1CJ*^g9j^{dtJx;RoR_eu6~{CTKBS+Q
zxs0SD5cBmt=$p0&lgFC;xyeqHMzPJrF9Y=sk2H9b&os>iw1fj}XF)Y)CB!NhJ9(P~
zl(KMTR6f;#i?Jp~zuCE5tcmUH7%9B6T*6NqCyGHoz(shc{aG0EurzgAm9qS7;H#V&
zmu2k1ionHhC?dA2K8;bZG)*HNM|Cu3?I)|NV#_(FdWz=KZN<b?XJzaoyOw;6204($
zDOl5Z7}YOk8FF+g%E$gjWwdg}QrC*i@U774aXB9Lbv^*Yey|{oms~42q;bO=o3A%(
zAJQ5yLeLJ#ZTT`!MtonLFBvmdAh&Eyj3QT(VI#vekI$%Kgiw{un?Jq`&FPKQm8V^*
zs{EP~h}D=@3RM*HPj4Bh7jt9<Ppc9-Py3v9cU(xdj`gJ<=bkB*nySY!{pik9q<stY
zNsZxx>ppv$f)6Cwk9t`rTxpkgT#a4jA9`RtRr@UbGunDLgA>3c(cVOTMin-0nK`=z
zdA&S9?lP^EguGczh}-@>-2jN3#75@>Mw=@b6GwzU-4W=yu=xoH1U1edtM#gM4%oMm
zYcnvsn(qkMuh_H!yr2W~$Ui)5>y*q>U+b?2kLy}F49qQdi-wsdS;XA^nq+U2WNDUA
zoTBddUI@9gv3>e<t)iP#aE!YSxT*Uv;%xB;&w_Es-0Iy`yC0`@jo>hH*$Po0C~qvp
zuC8qKoMVGqB`V{dl3GM-*h84XCZK%gAel-LE5#5E#?vLwbfd>=g2)Qy)%N0yvE`(n
zF6<dEN?jHZN|5#eXkaw<h`dBxU7k~e^WI+?iTmnV8SW|dcHoVoZ7%lcZspBb>_o3M
zbU);Rb*#JUWu5OU6^nfg6&OFF=8LK-gk5z*SF=I#XLQ>*ihf4}D!q^nIT>zcmEHsT
zE`e~50ysFx04CgmmD5thc-Fubz){;XBuSE<J>%oY6V#97U-@w0+jrMdZZ&t3K2odk
zazwnD6m1vkg*%Q{+khYZfl%wpJcQqYECwfrIR8GA8!nEO1U#@E`cXyal&jhj>eQ-d
z`e-`c67OOX=wqzGB|T$Yg&7wsk>{D6p(Xp&2e0KDJi3)JcpQI~Wkyvqr<v5bP;m!{
zXDO66)r6RWp%=~;^tD!S<$Js}Gk%G}-1BWhjZyhb=aaV`&`E0$T@z);Y&FTxoFx}Y
z%ucWoVwusOb5pr_*Z7d*o%{lsf}g3OQk4raNLW@$#k3%FQE1mIZ}7!beNq=uK)ayu
z%nzM~EPY1Sr%8~wmy_T?8gSUFu5o^+mSfZ-Y0fKK)p&ar9FUTjvTCUxrn>n$3W^>l
z)7OxOt)sLqY9uY`gV$K!wgKqC=*ag}G2kYb70k2YlcOk>F7ukD@pq{#cOS>JQACLX
zRL5H_Bb{Au2J9?q$F7w)T<yBC-?C*jM2FEiyR(g@X!BbBGok!{VlsK)Kk3Siul}Nt
z2rzk-;$@Uv{a9D-@xGpnU(b-)V01gFj4wmaC=@J}OldqZ%T1ddAe{0OW4a%I)nY_^
zvR77UWdqp2--T`hau2~$M&g1&P<ihHvVeZ1^=Cb@-TXuMF*^JM?CXOJzg$#hi}h=_
zr>xLf)p7e>MRg0bX|DM}kIj8Ua%#lm*7{sta&5c-igK5M$@b$I7Ix=%oQ%xZ?cG*q
z_z5v#sjt-e{&sDIBvGl|5xnbFe!IK~x`q%yBn{6+`7W$%MlyvyOiG47>VH6XEk#l2
zx)V+^*W{6g7k!P_=rBF#m|jc#hzeEg12qh{p9P*A$fOo_eAwIZah`tgZ3XG=!bQ8b
z=IA_q>=b7c0%DtZ$bcDj6pk94-<T;ab^u#OC#bwhT}o(u3^^kI>-!D3%3yv^!xHa$
z_fpg3%5dSu0f<WoBdo0^K9+E&$6egICcPx?0HkTHn2iXi`Z_$AFb~&5fgJmwnwZu>
z%6_7P#DWa0FX%~#P^y@mdqqWxIC8Dv>_zBhmspN<egfMct;#?fyvf?b;`gC;)Lk7e
za?9%SC`wCMYZ57yOoFUAR4!#Qy06tT?lO@awG532gYmllmeMBegodEsFXGjYFS~@7
zhJ&v1Y~Y`e%KTaZ3kuE^hEv&;hCp3%Rua-r?dQwo{!LZ0HFU|(yEG_n7i-Qk6w35x
zdtrWk`pjJ(_s((0=$(wDjx9cGxY2pfG@DgO1r|V#DnPgyd59wSUVIJLeXJuWu>Q(r
zX)<Q`p}Y|`m|_KgrH(nfXb?f)L&HXe9(A14t(Q&be^B{y>XPlfSH|`H3h^Cd`0`z(
z(5XEm8~A;gMhQ+98Yiu@p?0vX`lfH_8X%#RTg6-VanEw}m=wA@!^VPTRcKs1pE5wU
z8+QoNyfm-v-~K6+S<qQYnRl`&#Pos7@)JS_Dkx>XQNd5{5WmM}^}gE~#@emL_>Cx0
z2RZ8T`_UH}?u~|42Sz+Bx!$^dA_zm#N0Om-ts=2)kO0nO1Kdb2ZLk?61Edi^jiWv%
z$pamY26-)|j`rFK4jqCepZ6!HZJu2KU0nm(AB9ott>+s-OOn0S2m%O4V>-eJ=;8|9
zEl)^g_(BHM8?gG~o?yZ`in!yD0GhG4>WM*(^cijUL*<4%;wU!737U+hp8@J2U{~;5
z0?$FS>kjB<bbns{(1h3EW{t(ukV=~}`NR4C)wx(TaW1>XH9VgJX@ADuXYX{JDOwOg
zG|NN$ygBJ9o-+91IHyduGTC*MR5=b<h%Tt8-D<*>=110_?pL&8*>=RJ(8X`W)5U@}
z1HPiBDZW*dic<^-mp(wWnSw_`AsBM{owjD9utu>On-}Xr=8}t<=g9gwvYg**vWcFK
zZ;6E*DPPWR60k+C=x)Rw_SzE1D6zy{rovKBODs&G)TOA<i^rGV#l9Unw-m0@#XX4`
zo{(n38?BCT)EP>R-K>kZoK|g%y_b)=T9!6WzfwjVyMI&dakv4JhY=&`_O;|`tFG$T
zQ`fC-?t|Mk^%UE%PktZ2wl`Z8G^5u|sz==MEyB(cv0ME-wuNGLK?6ldKWEo^x0atV
zg625l^7ds;$mjhFeS+Hn-J5c!kXjeq+qAQsR%~{%t0w5Do|Du1^%(%=rQ!2c1aHqS
zQBL+vw|%P7ND3I7>R;D*Vt|%tSv29EMT%9{I1W*yj##kQ6C@z$Q87&@c4`x^#U!jW
z|KW+*@#ZQIt{>B;fNVe8S?J_u$eBi8kPk6+52xlipx=tl$tdi8fPxoBh^e8KjjW(F
zb2-&sE2+|R2Y~d^m*+IdItLNUY-<~bH9PI;Lkm!?_5(a$J+T~l;gDaJ8AqrI4u=w&
zz!ZTpx%ml_>YKBcg)=#YW1L_=iG@l7^<8+vGVCyo74)731C$yN=Pz|xMbu7BfmoS7
z6FZe3WR;M=t^~t=)ZM;U6Q2>?!8%S0cbVdACLKkjo;CJ!4$1v7t-7xt*~&E0&8Y{C
zw}hC!fS#HQwgUn75fWgj@VEo}ULkwsbUv%1f-W-KZIB&Z*q5JC&u9aw>S@yPfV3D;
z>^M-nGyGjNRg;XTE0^o9xX3us@oig(W50vmXYP}htn0eVpoeOr+`&PMnEHqhm~T9|
zS0h3uFeDbRgnwCq7H8@;a*y=DywnVv4JtZqZua4`$sgXD%Ne!~UJ;dsE+bFy9Ai2;
zGWJY~Wis?yYmhN{&k_9hD-Svg=k6o2u7Yq|kMGew&g#%g77|b~Ely_!{Z80>=+s#*
zY&a)0eK1dR3xED(?MQ7kr*Ole{#n80%j+=rc2E85H$2#qQ?oHEOE4GEQ|Rec*~Hbg
zJ1!?)8x(5p=43$wwy<{d#0yj4Cvd598z#0bUdj;#ve8s1wDagteR#knVA>EfgUzz&
zd<TU(sm$P`0dt!5l_P*qB8-vJ)U@y#rFYXjKmFWR?i_^v@x<urY!|q7nCnEHf{iRr
zsuA%8u%)d$uZQ%D$Bs#ZoG30_!T>Vs1`YNYdx$_+Tx$XIK%9$Ez}Vd@Tv6-qfBK@&
zT{JVl?d9;$_iA=Rz3vVZe(o(NejU9$9Ooas1&+j(>t@naj!^xcPw@La-?9FT7s`>z
z&`8}kTCZ!ac|q{Ns2pf(RcJXPoq6%8+;1(vM2%!z8E;R?C@hx8=AT5VJ@9`;Uv$<g
z0Q#vc0<^OOq<Ajkv;Vhv_V4*K_@8xC^@S_I?SP(T^-RtH5{}~aIko#WiTx=HAueu-
zIyS%MH6NO*tNd=?)nJ{?=jip5?&Cy;&~^j9L>M(hhqhTbdbWmoAncaVH(A_@SqYT7
z>#?UBV#O9>u^XY1{b-wy6Z69M9-F03KfjJS61z$iw}v2Dxd)l?FW`HFtYStgKIEXh
z0EoMMRH+_I=r~<GG=ANCD3LSld)9F`Gh#`NF|!N;v-qa037=88rdpjt>g1i{^_>AB
zzO_>?y@#67m2Q&VZ?l$FhOw^rC?{D~HFI<d9Is<<=s_pILB!~R&kM2g7JlMm$OKZv
zAD+SU;C(<wc*y<j+QtLez`MXgG4N>`cx6zTF?fjj6+2%REXT60|H!(Pi~g%GaM%4N
zYjDbZ1+<&lQ)H1%to@afcD&+(KaTqS_<Im8F3J5#vUIpSKr?wWw-bz+bs1k==rpI2
z8sZ}>NDp@3LX1D5I_`emKYOF1X8(Zx7hUi~l+x27*iTWuu3c8KXT2orCU`gnP_e(*
zp!Z1>6@O0oOTm?``@=2zjIK9@G)tR(56Xg-YEMCLt2|i%xRtkHrC+pux&l@c@32}<
zsSJEm4Kf}bMkNWrEl%1l>b-7U;U7I^wjX1`2@f3%|HP3_z0Mk)0$?|x0l=oRVfBK-
zqLsX|wwO=Z&s22Q%`#4#q{p6F0@)io3uGwkfm)V&<S);#g|Mw&z|!H)=7XGE?l%dG
z1_FtdS!8-Le>Z!=x>0CbBFG;DW{G}^k8u)ZfZ|T1w_RmkidV>e-Fehp;jQ}ond5I%
zI3F!ptoNYw{Ym$*(+R-ADI8C1sVZzXl?wry41efFDO+g*#LcRM8MKrlEVY}z{OvFN
zd)KV6568!-<Wow@t3KSln=`~)Q{bjLG0HWtFh;l&N?=UPTq0EV7268i`U?F{gQN*7
zp9{inyPua4-Aw>UsSpx#7PuyH7AL>SfmKSlN&pckl(1jO=#bZ3dil<NLILaPfdR9?
zj*sdmZP>B$e)UFwc$S2Tzxb-rXLsWueoWKG;4D4H?m*h1<fbbnF=;cVYErS14_{x=
zSLxQ7#fsJMSp@IjDAW*Qm73dUWQ^VjB;Bt{zdTx<BlSH2i<GXp1u;V~-8V~F_^^F(
z2?x#n{~9~6zMa^AE%^Ia@Wz^O@G=d$t1_bT1+>)7Rzm^$$N01*h%<iN^yB<Mncm3r
zfoXa#HiPf`^JDO7q*ZNOD9^T($H+aHe;t(b=7)By9yg=}kSm#SMb(qS)Hc%)$Wy$z
zQFrOIBKUm^K=JMBnUibEWhdrI7{#B@b(t`>OVcUH^%C}!sEflNROxWmw0yFCagNQ!
zUJt!r_Nmjo-Q6zW2D%`OsxeG!#^^A1@saCksx5@Uv~qL#k4^2!_)=_1G!5;?=wg49
zC^yh8cTV)2G;4Tidip-nt*uM0HF!21Q{qg6$IEE;`4*LLtQ}Nn9ksc#8JTkz7W)nM
zMB0e89CSAoKv=)|9Y%p|!R}1y-F5NcUq9I27>1*!#2UAAs}A8zxBvtrcj!({@giZv
zbY|$wmgvjobN$JKz6BbS8qaD{oBb-V_kQ?+h9pE%yV7qE^2Z+s%h&13WO`BJ>iN6?
zWpUuB&n?Hqfh)cRVvD~!&ic&gzV<)a5?_sLtii@U@(L{g3Q(Z1*IsGY%aX}rcl!#7
z<Q9YkFRKJ^$vVPVY=VI{EX?e$*T|fSzm}rHKA!0scVMe9N3QkBfwq(b6MzPSuL8a8
z?`R7{h-c4*i0Tgt&lI*ysErJa&Y**K6AIj+Hh+(C&Yg3CnGi9k4g7Dz%xJvzZW=_?
znTcx)MLs8*K?bamC1YuJJqe2Af(pN8E+rj<R^tQvp+abdexk)m&e_2r>3}Au!!=bA
ztu{$}qaF3zlo%=v;LO;>@aBwV_S%lFMCqq}@|e2kEvLWUife0y4@+P|UNO0SZ;JA4
zg(9t{HdaW&(4%84FNB{k>WW49WNh&Cy&i%<)ZvccQ3C^Kd3dJ%O7{8=jjRe4Lklou
zk`*fHXQwQT8=*?VD+t7m*_KUD=-s=-!wx0_K7O>$KuNGvtYY(O&n$N@ZD&xP=Gra3
zWvK;!z#4%MMOZM33j-!8k)g$T_%`oOm%Rh4U#!l6Po857hJYCctj-DLyb!9-_ob`v
zTu%Jj=k-t5G@W&;ZGpSk!9MVgX!udMp~t^~9{*zxBjrTh@6*^zF55Og!Hi5)S$#I(
zRM8Fsw9q@z(c1ysqkdw*+-U)rQM>`FL;pW--h)2Q;ZtE$U8djeUJ7^n>c4x*vlI6}
z?_U9$+4IpB(z-BUJG*D$w91T%pBSra6-8GIQqHoq?00B|eZYSuQD4KnLEF<HE}z|X
zKAp?x-KmU~NX!AI`X{P1W;f{udDg@I?yzF4RPaPdF_wEYUJU!|@*kd4b9)vfRHi8`
zONc$7-x25J{Cz%JOC14t3AE7zpGu<YGu?Oh!dK(sfp6LV+qeGfk7_9qHSiXE)K+M6
z{BsS#HBakD6bIFKsW6}W`oV_GXr9fhD$~E2q!`Kkyc2+1NRSd>G@=H$$mZe_uk-bm
z+x&zB&L)-Ir->Ldz|-RY^G8apS!#P=Babj<Rs?3mEA?f$ikO>8fyEz53)>G`VVOMP
zdY1v0Y!xi9j}<`MBPZjJI}wUMd3+?dNVc6kdeZN_3<S#qlvU|%0R%rHZ?F^+^F65G
zAI;WfM(plW_`~xZO9Ot=1Q5u+&n0bx{*FF@E?Z$)5P=2bf*E!d%<2IUy2@9uIb{v5
zF|d5_?7WQL4g-eEG3>9Ka83kQ8>oB@80sE02Pi-Q5A8AZLw3E>-xszOye^UoY(#<T
z(?H!eR1?qve|UbwfZy<MUH||78vwU~|0Bgq|3k?FzM5VSkV!!C_JdA9hMOD<tv^;w
zUYt^Tg{9u6aAd!dJl2ga2G*pHPd)#XCM^Zs&2s0I!r3#AwaQ}!OvBZ?+)JMmUz?b%
z4zfvC*#Vnc14K1oWdMv|rCn}TkWW<gxJHAax1Y$^J}@rPO8~mpom7XmaQ<RHJY;Wg
zP^SH`wZKom@nBWG>`Ps<Y#SRBL7}0)uZj)_#weVMf65WtiI0IO6nYH!|J>7!bW=T0
z?|eIcEB^Q%jaR!W^zMTm6Vfc_N!mwLK!Ywt#*Mk}i=Oy(`;oi`vMc}J=2#`Zt=j@e
zTASFUDt-KGj3Sqe17qYpOIdImrh&s;s`4Il0o#%M*{GP-QSuQb%0Yh;!SEXnDDH>W
zCTlEVq!%A~irb|ZUTvKixxAKr{s;*ZKNtYGN+Q2miIF0GId{APM1zf%U0wHdWj`9;
z&7g;y4sY!yj_P-D{1yldjc@Ts<|$$@_pRM@w0&V4HO9#PX41`Y%);#i*}H;z{KsAz
z%Lvf<e~$UCP||94i(v@!QCrnw;v>kXoJ8IIjcqfw`*{JP)78;k9LJHZ$<p|S8zLPe
zDttoJtc<!R`>JM=HOhXJ<eZ20_@(e6fl3MC?u?{KcmqWc$U<TAa?rlNIL4nm2On-5
zpw$qwV`kzV1X1<Ot)mTwAg^cC_-M{Ks>Y~2jXoQxu6EzP@UHN&V#O=mo)cHTS6)!m
zGyKEj4;VZGJoXs2Br9~nPZZ$gik0QC27dhr$b)yPTua$PKTk_o$+I>Jc<v8ZbU>9k
z^w%paP=q1I;hUMatW(Z4H@KJz=a0w9#s60NEe-4^>(rsj4huYvPMBu8N=>Qyu3oTK
z>}S}N&35{1?^HxHE*earG<2*S;Xr}XCHC`}KovxwYxCUA`wk(mn^s#IC74Ejo8Nao
z=GK{M<0Rk8x?MEBYb#aKWu==>+@aC7+A<MsHGIt=VOCy{^sNhm6}<|C8i=xN_|T=7
z`lBmY8IL{LyV;xzG{0k*Ul=3CMBY^FMGK`1{dsJicV!)FHL^|KSH_8iYjHfH9bT#2
zlYNjAkV6HFdUnCFQd4twE%GnN;qNMwtJIgRj&Tqv8IJvg?qjT^)(JTr-6oyG4KpVk
z$=u$4YI5~nsB)W5&Th5uxgkn2k7xGl&(C*%?GN|24^>F6FDjm|aqMrmH4gVbL`>@7
z79W@nGD)uSmqFS{@7B5Z9@@V3lJp>S&w2253R)GYIO!+u*ul6T4sWjDKbUK`{9^AX
z!6}RUyJUo|f^o?co9#b55zzi$6gx)`SZQ~>J*~H+5VbyjapyiO6*fX~79RbpqIIP+
z&6zS2-cY#`IPWB$&FuwCpbt?a(F%;kX7?*)FHIA*5$3iD*W$?M#^r^YREPH9$i!M8
z<#+@TE7%Ma5x_BalY=);T`sxv^w_b+;x3T`H(@k@$>vDTw=YsBFX*T2OVM$bV3vp8
z#}69$e7bAfAYJrDD8b~z?H~XGtN<p7EGwW`O+Uh8^ZJ4TU@IH&DCMhTR|%0EK9my-
zGt7d{ZWP1VzM$>je|VBXMGZhefLs0eu{izGoo9*Drd19ojn)aV!R1@u$|zpeVOJIN
z@^Z74d#91g@{(OQxK3b}S8I9c9Gn+zrq_Ibryxd*D@Ks0l!z+xEMj~O0UWH7aazj(
zTP04O;;p1eDEJq>T;t%PT7Cn6cr?TQ$Lr;;$&kohTT-{Lq!Y946~zCGX&9|z?bG{+
zABOkiP6}(1Ph#jtSs5Sk&swMNe%_Fi$TYzBab`8!{qIJ%i{9*gK)SW$CyJ_51a$7d
z8OUdCuLzgPcf^*P!?S6Zs*hZ}d7<LCjFKj{ddo0)7IVO!g}=)5tp<E{A31q27IqvM
zpZcFQ;!g#g%9w7QIsJY^bjs-%t6&PdcgSg&1!b;p)$v!oz5nK@3_WKHSW_pA5bp-L
zr_i^VnaRbOQ{mp@BNtA*RT}<a^^WhdVa_WlPJfe(1pcaJN*rhfqR;SEe4Z)4{eGO&
z{hoC1k})&2iBmaV2LxF-Q!u$YQ;8<R{VRSmo}rNPW-tlWeY@|2{fCEghzFXEC&DwJ
zXx}dAwVj<1(i7;31>B*aFd!Jv^wb_V8Tx)dJWAR4^b$6K)4~QS|2aHJ`$$o*#v^K)
zab6jA#KieD6MDBwdECm9IR+eydGVx)ZE#g-VcU(*<dw5p&jzm5z7sRJDa8`G-2BT+
ztx&Uq+;g=HI#~83YZ!0e1Gz<80io=|{Gz}-IvUZT&530Kb=G9hSr6FsyL0L7)XhuC
zpf0^Y{7bYyQ>oQSn}K}E5m3zU2C@{3bZcF5i}2gA{cS697WAzy^H)1a{OtjfH+Cd(
z_BtgSH8(PfwCP<k_vLDA2Z;_KW%8JOP4#@NC~CM(>x2p`%$Xsx)yVihP-D?ju1iK_
zv`#XYUv|c)mOVgMg7sz@Z0{&y)s?e62cPuv<pp63SOrYv)W&#ncMJHidi9~`(&WR&
zevz(z6Y9<{Lg`N7H8v-19^>BKKhz*=njQD_vGD&C+;P7nwym79(Fxo;Xdk%i_`iF1
zp8tvYlgr0Nc<$YJ0+gBgZ=QMQV1gKVfTZFcWg5lNb+-NK<9E9AprxSZ<e5tkO=wTx
z<}rVGhQVzkd88-kL)oZG3#Msgns?x0MyAOH&wbMk$^zHq(yda1&#iVD70!@e%A92Q
zy(C%z^;l6s5R3dyfu>DQ1=Jk{|L3Xb5H^vaHTZF5J?_~ge3(MbClzo^$Qa$B#jS~B
zX*!bOx`s+mRun5_$$MlU9sM~Xauz5gXxs=c+rR<Re;WP>+P=oez6mC%P9+S=mL|9K
zkB;$Okr^;O689iz4e8wu?(kZ?w3||Y+89Z-dOA=!ahSR9bKUGH+7uZh7CmS<#n+i6
z`~x@s^o++Zs6NYYO7|1fzJaUa%1DW4Vs-?65Ui1Dfk`fD&)tsjW`v#2$6Q#utwxO>
z&Y&8-%2JGI-Gqt5+u0}Q8jq_=ndzB7rFG625sM8sw0V;!K@mV<U1`RO8LO7r*uG-N
z0Mhz)VLqA^v&^Zwr(x$L&Sm+fYY(pm0}MwzI2H)q@NHNj0wo&Dqs`tGFlE>^3E}sb
z82<2w43a+^Z~9GK$#5~;5>JXVS{QtWHe=AHwi>#HIN|^j5p|yxf|v{`_Iuyw>k>vF
zg$+B7@4XSZ`L;3`6Y4^qeFZSKJE(dM6j8J+D`ct`9$CobvF|kEoZ8H>LY(XAL8l6*
zQr4ulW45qoK(4G$3<02YvI5?g7183Sw)LDKDT$)>tnZ!&jM3G`evs&DQi*NcxQmsB
ztWGpgs*NMT7>p&_P|fN=3&EQ^R?R9eE6D5YdCs`86<hPP-ez2rVvpSZz;Ax38+mLe
zR0lAnAK|Kd?ogfw=@ViO1e&Yd(l*?Tx*^0|dqO7@@zm6qwkCWeMuxdH)b)O3A9<|k
zYihe@GFQ6oRk+8VrETtUZa4SPTb5rdTmT(VxESibqeCA^S3nqMysbA=jL|fG>*_0~
z|J&aYyEM%Ruwyv`zCM3=gmfG)4s`}mC8MmJNk5_u$7}U!-@_E4Sj*ueGp>f&R7N%W
z8j0{1>w=E+W<n0u4M<Oy5r0-D%p|RCqtyYXGL<WVzQnMOWuHeCSTko^*l@ACi!#FD
z>S~Y7-77CAn%&yEC~qWZ*zGX&7(%(g@?jjwC9wAPi~-3%5j;?l+JGKQ$@pL%qOn50
z-IQ`B+s7f2yINI@Xn^l6m*$7qFhNrTL9qQS(Cu*Wbwcm7$BKK^qmo9(nblO^Er*pP
z9vOc}y{AM4wjmlcu*6kG`AzMnz6yd1o~?~Bi*7f!)vygUC2nT~EIu_tfEp;`fY+P2
zDJz1J+OicjIW9LPR<pB+xYlW48@YKkg?m$Jh1lx&qN!kFA@utGy0#}!UNoSA%7kqq
z$poW4cNv|pc8b<V`c}<FQp6Th<3MV^cQ@%(ONJYGZPuY&j{3m<uTTY+VY8Fk`L8;q
zb22XF$JX?=8>GU4GHV^(TZqBHOg~`BUmDFpJ+onmHw(Zcx9XL9-Fxi1CX`CUT&pi|
zlj<$l74&b$eFU3b97c|1W5H0BktP#8#T&w1EF+6HKgx#n;`QARtbjYFLwH_+Hn%r<
zI)G7ntFafQR<DNE_@$%4kFqhZd1hHxGT8hHt39asQMg&Edi7!{;I(8)cdBIuOv0CD
z83JuKdKiPF3lqot<esWXt622ud8JfJ>itmb+Ikgo(|?-1Rfs(fRY&R0ZUzrR#6NM|
zDp_fO4<2CM@q+Wji)r7ceL3mg`hjj1d$5C40eS^+#x*vd_i=7bj+>~#ucniK+(cE<
z-LLe^vnOTh-|!NU46SQSTr=q4JXnB`A<~PH{W54^LFjBwbeQik1*iR{L~=Tlc-xp8
zbaI_g?>Ago+pD1O&|_#L^X`MJ*(+7C#T(L(wjLyF4CUXhzO+k=UDewm7C<u>XGqUs
zhjW0U*jndVkpreTxh*NCZ0PEfre@}AxC?HIcC!94Oc3kt=+}IdHG7k_STNt~RS6#v
zzH9XSr&^Y&mKlFI4V&VixC~r+J^IL6{77o^RmsynfvXpQNy$xT6|*mVA5g)X(g-^O
z^KeA8WbN;x_OE9Y+UuA{BI)kYqNZ#LxgKNW@s}##9Gv}F@c(}9@_4@o@P9p(_wXNo
zdkg+Q)#l@W7%Aud$jyGt+jjNuRM$<j#ZI8?*hyq(Fou`05`n%mmEj}Ml64}Yam2Cl
z3K`y2o1zx^m$K!|HE*yTO>V`~ZTvjgw}X8eEk|IyX7&MTiS><NPK!$_q25gX+F?@r
z_{{E9?j}9~;#q*gHccq^1!@Q)Ho2#Imnyvb)Lyn^{I;UD9b@Aha9&$05*LIq->jYN
z=-sidnCgz*EK5W)2IMKOiN4BMWrdlP_WO;{#U$<f#yt&_8ZEd#R?bTqh0?bg2TECT
z1sp`i?HhhUUn<^szYQn5AlLSYExypd2s79P_%$!iG9{<Ndl(VT;0UM)0~wKTljvyQ
zL~(aCQL>sisYqv;zK-Ptum+!axKoqyOF=&2w8iSl(jJJ5zs{?N-;&y(9}tq;VuSqU
zGsmGmyISYL`}b6Z-cL_6+OZi*LZmCv!HnKEr!%-F3HWnRQ^wH{uRzJ53j5hAc&0kW
zB*{C>05l7iZaLj8(Rt*juV%r(W20MCt0sM};=)c`n)=6@tDXZ^p=$<y7o;qoY=wqX
z9Ya_MhMDC6YcN~+4^J_W$ZAt@-*h3e_t#C0=D#$29??`;T7K)$uZkZ>Hm|^Dao)lB
zw?s##G)B3lpoU}ct6aax?y}bWjqo?^4}hrT8SJdXJ&>`}vP|Z&o?Gc-ocQB$KM@bs
zKJXLv`4q8IR=`&ruda5O_8q<TlI$Mq9_g%LG28L_5r%vD&Rl@gC}Z>zBfcsA#ZE!1
zOa7=+C*q@e>ZarnXH?1T2D~fq507ottPE?>UIH9-k2RgmN(U0r4I}Q)VbsIqWgUcV
zU?f?W=#k|5urnzW*V54WsA<p7;;e$&Td$0szjGJ3W!br%#Ur#|87Z+fkG@R(!}Cn$
zF9tr6UakTXx1b^X%AfbsIsH*I{Z*=5GCU(kDzIVE7IUhuj2YiJ%+>L-J5=zZ_=}Fd
zc4}|=@7pD)r`t0&uP|#UwaRncJH*xLyotJt5YLceJLI!q%UyKOcLYWt-k61;u0#%|
zzdo|KMYc8d?pfkZLaso5a<)h3DV3PR%p|xq`aY}h@NRnfAt%@Yk7dZ^@Q{KStlZ(@
zDif$1FaZlr#P8VLnY4<)$N{^c$J*c{EO=w6UUV_!vZr)Ec`^2wZsJl~^3hpIsQ3Dk
zie1_z>1y~SdP1_<pvp@V^>KWn1Fkit7~Yy?5;iyh7J&$aAgFY$Dbu)hA6S#YmztuA
zbU>(dKTMAhye3#Ir>`dWSHbpLBgd2Vgh85YYp%2IZmJQ>ELzwq6dv=ed66C-*WGdX
z%<h}d0dmVwck1HZ?$f_*su!rl3wP2Bu4euo#I&`W-w;)*3xYzJ;?IJljj#2WqjGyU
zjC^&|cY5xh8MU7f5)A&pzinDIQ=Q!;#dNxS)l1W3S3tdm?PW%|FJ!7c5+*g1b_?MV
zY*lrm?|09?IxGGEl?CX+S(`X+HE9(e>r~&K$~7tgZU8?{A<gDJ@15TX_hXS-fuali
z3>Zxthis7e@rS4KIAHZm4Fqi;D<|#j08pxl8m5K&3wpM99UnC~fP|H2QksJAs#$Gn
z+u2XZ^EBrgUNyDFY|+kx<A0&7TEq?5sGF24wc(y_C`_}gU%A*TYD8-6nEz;<i-X<R
z$d%2lhs2|ebdisXgp^CvU$Zs8Lv7~78~vnMel1u6{xMw}resr1p6QdVW1bYZCCrL-
zVFpzVO%uPZl_`DVKxLWhrKD!OgsJR!nM2=KOr-`_gtz?$+ziD>#Q}1^Vw7duT_&Yv
zh$vS$CcaiaL!QR{XaZ{p#p#7a>aEX?))xS+dJsnUqlrgA!DgQcfJud&dVbGF!@)Ck
z<xj-|tIfl|y$>h(kLr8>;_J}1UJr!?u&Oy{MgH&vvzMHLDLaU=pQ~%{WUAU|@QbXN
zO}DyVTrE@*wWa>^R=o@(dU$Lx^w$&dC2QoFFYymIYrBBjwJF;oxLWdKs6%#rZQU-8
zdzkfdKe=8IeG?8wwZmD=9+$5O#TxE8Z1}@zaaRRg0!PQZ0b4pyN5ej^pd1Y>tVBlG
zWLWeS-4r?5)kWD29{?oqu+-ho$60_2?=8D%b3}+eI^m_?&2#vC%n3Azk&KI2hL|(p
zt#C$(ci^QpLP7Me;aCHHs7G%2vbo<jcakfEnE4iPUhvfCzdrH^o!RF=WTfO249)LM
z6y%NBjVyG?**QQ2WpV9nu03t0ja)!p`LaH4-L-PP)X`*sKhf4_xI%s|4%rHpll<0J
zSr=ZyhNB{`4ss821P03wNoasP2N?@1VwrokOGXPayfcn4ztfBW$7ZUA!e2{!qKkce
zF0|)^itK<LfyP8z_u>_kP;$@t!;&bsa|w4y69o!+rQt(;;ioTZS=sS?^!6T_&e_|?
z7QYvHYNT$za^LlRex(hy$du}x+iY>?Yl2{}AQ9eMOS%zB!nnpSk=c|PAIbR8AQ7J2
znYTYAUm2)`n|StJ-|OEbc+F1xj?%CDUv38}@R<J7ewc?(f7$DIP0+g7S+AoP8_B_=
zg3ahx0G71XM*b89sj!xly(_Uri8Lt26>`)VyUQ5`K&khwGJ0j~)@M!;0HgP*q?C`@
znG&9TyI3p}r12S|PA1RnOslC<6Q?}2Uc@5Lwh=tMWTct<lMYw)2ad+*gJfKLO5a0&
z59YFjRKj3;QTXNoe^rT!xAzf-&#9AZykkd);#7J$3W#D<I=^?l{6cq#;fMutf0{wm
zk(}Fx>c?qD+ufqw8>yWxqu&^-g=X>_UR={3<3a{Kmqq6;jDy9x{{y?E`or<8igdo+
zFcSA=|NKA2%_jd+Q5J~)|J#b}d$QjA2Y>yqzG)KhuXEVnQlkIpAvz6MQDbMM|M2*b
zHm`0RoF<x4hjrF`Dya9w*gM5^fYq1+RGB!1w*ViaNG+)R;lcdjVV{Ok9rSkhrgDMd
zzj>Q?=C(~fKv}Eu+u_&PWdrfUM_`Nckg_feXKw*1i0gc5H=F>z!@*f29c_S_0Q<-P
z>rWFzzzh(#{V}8~dcB)v1K$87W;CGqYz|j+aQ9L#m-Y9N_WYc~TLOoBgq@Se{Vm6F
zHv^6|VZ0S20%Hhbm-_xbdjYnQPz7Yf)`6pAch>*)-9ey<Vw~$e%Yd$E(dt=`?YQ(!
zN;97|BJ<Oxv-q32TZY6=ir&`Q>zvbn>&6c3>s(I$_{|rhGo?R3xf?BNj8ynUb1VBH
zkGTb8L{XccDU2dt*z7KB1;?$s2*jyMz?pwx=>X{LcELh>sXK?WkICLNW0}%KnDH;s
z8Z?msHQ7u#^O(23vLkah+ENr%zDpN&LH02#C!cWylBf|a6cECWP!5%?8ITJ<I~A)p
z=H4OsJFxqEclSx+C|8uY4W57YZ=GF0ZRTL}<NvK=<p=;D&FXo&-ZKJx52o7=n)jh$
zij6GqAG|97%j5@FuU0^wJhJTyS%e$Szc%x96a7L7RTx3^M>M5X(C9h;IOLtfEPq|A
z9l)86gxyWnrhgRU9%HdB7$RA6NjF}GkO=FD+GEWM`v+5fk8`@W-P`0b$yDgU#<?Q}
zxrx|0le%iIRQJR>fCF;d0Vw!I01N?ud;b_FBgL}qy6!??wSuc(3KhOof~oLho`+dZ
zYt)taqJln%LdY3ny1=0X#~(<UK2xnL+oLc3@EA?^WAr)lfNfBCHb;^i<fFc2Pw;_q
z7R;pP2E0G$%Em^SjN>xEk-#XUIsiB`?BCjPo5Uzq1TMutPi`=hV&HEkqbT?M>xN30
zZTL8J3M7PTYOsrVR&FFti_7@rrA$56?%9zGIeUyc{jOcQbt$nR?%mD+Uo$*fMuZ7_
z?#8lbRCKLaG3fM0xVcPjq`JhaR#Tes?++F^?tXT2qtu^(4rT|oLIE!QHK6JKP}Bd?
zj|OSaM@qEyO+l7;0vu^o6^SZsyUFsM;9(MoJIOC!B{|HW{BA1p+Ufh<G&kf!*BiCV
zTSeipDfcG4ILhW)8LQUwGsV{9$brC$o-9N6IGH$dl;n(GawypDBTnc6kd(0iZ><0s
z4`A$9zrl7)f;R#4jM6;8R*x@!2b{eWi|R>Q(aeZwtb2$mozf7Bi~`u|h|!SDl|12Q
z*{I5^Peh++Y+YF|K-)22CNPy~!T708^$`zM4f+X>?5f*B+45Jqg3*sTZx>X`U_#S0
z@s5?Zf8YC(RH_5EV3s?K-Mn+BjGy2F;p3+=dS6WuoC=cPP6b;B3SOT!TL4w&St*7i
z$S|s7W%y<6-+km%0Q3=xvVQpA=7qtmQTGA44i7wV4gcMAaRa!&siZl1(%;Q1&DZ+*
z@xS|p_aM#eIz6sv6ZV(cKhEN2%29a<AkP3S{P&Q23~7&Er?6}e0mw4|P5(W{!Hi-_
z?o$9+{>LEYSv#%Li~aW#8ZeOTE3yl?!~dAwn&w=wi2uTu5Owl#nFL_J$r`=(iQAt?
z(Is6*i{!`_9tFVMZ{L6CAy@-ogPx?tj6Xc5StIp7{^jjsoxk^bfux;nU{_>pw{vTA
zIZ?8EB;GO5HCdv~vcY65S0JbxV$<I2e<vE7`-L@E>#=7H<_?!exl^rL{SKiPn`^1$
z@@gfmw{n^#wm##~NtoUQN2P>S$cD1I8y|VWkL%2q#y8f>_1BZ*{Q?um!*Ms#3arM~
z*4{YdiqPZ(&bRZ*;#^Wxp%EgyJG4m)t=7fK4w2m~q81hYf3f%8QB8f_x-i(VAtKUC
zR1g%TgD5R30s;a80#YN=2}Ps@2#F1lt{@;?L5d;-fzU~mj`R*e2no^&B-B8P-}ZOj
z^Pcy7-#za+_l`5ZamO9^4+c9V?Cd?)+-uGC%x6B6lX_N)5wX%jR2mWU>RSlz920r$
zbaP5=Op#_v*Q4|`VMXAal*W{dg6e3cEC~~<)m2O=U%?yEcx~;Q^{(BM@+3$~Ij&t@
zMC-9eNcxI8D>2LmzzsdseP-&bzK$yOsdT*lTqm0uo3L>Q1Cg&d<#v$7e()wEHm4;e
zePkzpR(Vv`=V4vI)d$tQTz8yaJ9g0OH*<{J8rx{Zl&BdjZiNWs({5B_N9kS;A0N0;
zY}=eFvdOqlw`*TJ@SNtqz680j45{WNX(LaLR=^_gtGjm=mv&A#)`~Ikc9}td!grdF
z2e02<&5dN-HIuEgtTeNSfXG#8+GE*D)B*Ul%G#K<u9L+FWy1JD;1akMk>m7A2xL{u
z^Zf9~A!Vr?VSDKoi=pIh&o5$kCAvG~e_FOAj%!Jh=D<_LWY64aQGru63ym!9lT#j7
zEqGPKvW5q=VBr@Z{0gwT7lxNV738=d*mLthrEj=n4JyP|h&B7g+3oin##A$MQfm(1
zc5%tUrXwTXo+Y?B%*f-{;!T88{8Wi~4XJf}EV#VA1<6krrrw;f;|aTr2D51+s)+{M
zajdn;BJzS1?0MrkNQ$(Ox7_UYFH1@>LFeoI(pi?3Nj&S#>C<_H6(ZJcaLu_Y$pJ4y
zwG~}O64#@DOy2)c8P8GE!Z5V6X7Tzbj{UDrFE}ko?#(Cm7|>+(-Ao+>?^wH^bmNxK
zEL$4IM2`Yp4^lP>RSATei<K%nL8eA43kBcGeRmm{<c&t|X6vLU^{#_X<J&rK^CZ<f
z_g2G>kylJ=$#0qG$(JK=v-Wjq4$ovXLsejY^K3}(pB5=u1yJxQw4GKPLOF%Evhg`o
z`RX9!!^oN@F}e5nNg)bEX~0V7n1&ISv?u9)N#p9q@yqhP?$Ckg{ym<xHRSK1e3}wn
ziBj0&6A@xUcF6+D49h1UL8f!P@KUQZ68$EJ{#qrNm0H|lFP`)rr=6PhMQ5n^hSlju
z92l+6mmNYg>ANVZxZ!qwLbDnk-FFsLQ$9JbD!!h*aIM|eqVT&~ml&fEZScw4@lMS0
z_#;3tF#{|=n*dM?b6PbyDZI}EKG8LZ#l~NkPfKD`YeBn43XzwAkVpR~S+|)(5Uvxy
z0XgE1#T|QS?sDP55LA<tw}9}g+}c9<Qr8^|V5vK=D+kvKO<apKGY(bUUNm=n{27q<
zCXA2e!7$4{6X`ag94{qtpP_A5vWDMP3<W0{t&9n~yamsN$-$@UCxCWmv);ZyyfYgH
zUqLcuD$vM@72;ZWfgRMkApDn=mChy*cey<!-R5^`qfDYh@O0(KHp-ATFh#L^1bUgQ
zyrY0gx)gAWfJ`1C?$O|nDIWsN`2d@qiCDs$$k*{mk+-bBL{3m$XMJ9oOc~BFl$PbK
z6vW08&*BEd`Y=<B;+PtAs7>0J(jyZj`#ZlNYYkz=TY@{ng8n`{3H!m7K+8`b$Z=}H
ziI@bw6_d%9O?gb+o=Ff;$vGL#G9Ph=Z8W++_0Gr#tt+FvoNbL(c>yN-=BI0ydRRi8
zQ9vK!+?}Iqqz1M5o2p`Os&QUSXZXWeq_77bXhGKo05S@bAexUCP!Tycg+Hr~Btjy=
zNBw0_!>p%dWEI^{wMWe#w&szTOUNOh-hm0lOl5%8#=}8B0L<Vq0MQm`Y`xhA=8$<`
zL5axpbg4C^d`eOI@m$AGP-MIHU^;EHN!2ToblDO73M2pGBg8FUnq+b0sz-k(U(lnZ
zgZ1-^p_WY{B_9K=t3EjL+_JGX6j-Ryo!vakdIM<HUN4gR+4g<9pkQR|mQ&P(p?;lA
zsUHxj(@-?>Fl&bPS?a)??@9T}a*^nm+Bg=4de9LVTPyx_z%hUP(Fcq=;?$w?(qDF8
z*C*;_+s#%UIBJh<fQfcM*)Bo=Q^|-H1am6SsJRy=7;l9G_mW2qC4N$W2xk?}4wzNc
z-9akD9%fLm$mCtviV3ywo2CresDdN1!Mu<W&0Mm$pU|WGL+z}Q$=5FFu$zwR7C>CA
zG4$g{bb4${g%ImI4Ub5YL$H@GC9k=BQa|Z(W%*v-!)B(Y%Njcij5n5fmbyt`<O58m
zn98cJ)pc*R1eIRVG7ISNSi|5c#47|&H9v0bC0$9{+aY<(1eq+R<4B8KMI`Ux|F*<Z
ziRrGKHf=-o{tw!$OXEbX4tWoGr>-0X;s}-i`(sp}S=m?R_BRP9II0aE77e1(qtKAY
z#+d17Hg2GL1Q_x<Z0tqyshmg7W9MA0&MRE_T<JJ}csCf}Od!7=JqV!yt%MU?0nsS~
zdu0^0-i{1v$8u6Ln&qT>^Mx79VqStB*oHl!)r2vimw+y?^c<n)d`mAIP&aqqks1>C
zVHTokvKem{KhkX(MiFhB7Ndp}BgPucyi=;1xWg@!66NRG9-unt@#yABYrARJ)xg2N
zio*?+fw)5T%>F}47DWTfj=x!CR3w<=Xwk*=Za1ee&0m++=agBT2WLiVuE@%4c#`sK
zCU&btG5FH%VLj;M%{}?1!8_n*=3PMCqkiwu*;A*Wca{V`e|SA%^tsXCb~E?8qZ*eE
z4x-nAL<C))@R1T&ozJI~){tV=u$TdMYwJt7I+f7WfWzMX!_e+TE#cSP0oKswRe%y&
z0_YXl)g~C#I&W`SKUFL$UeEXV`XR;OMEK3!wA=vm&!HTTk&-OV+}>fD`$toPy<FnO
zul-zH#AccG@wd6Lx)leesHAq-|G>HLgsn^SS1~*aH{P>QMq{HJdD4oyb01t;NaoOa
zkTuLqmfbNb)uqFJG7i@Rr1-O}Y1+0mWf-)v!u+UPDs50_5v+dv<0;^re;NXHd=ia!
z&(!kay1S5D)Fsf*Y#o#D32$dmk<1HE6&8z=mUc(SRV>Pz3aMGbY#ZE`2Z2^c`Ze<<
zT7}EJm*=gm4OIcUx{@om1CaX4T-pWg0y6_OnxzL<n9VN8R=8y8JfwW-Y>%I-lAG$+
zr~z&B_eZaC7!Srh&(S{M>iizANpX$xG|GQJ&iFi0ty|x7yV*Bem=<b*qF-Krwep)q
z4oQCp%$PAK2dXhrJe6E+F+3wUUkP3MaO-i&m3w=yIP8fS-2tpSP(E1<sh}Y;2vc%R
z4~nEcmVX9GZoGg%j3qxD_b{vX0`+k>-0YQdlp1(Xd@GFB5VfTG&Ke#x470Hu!t{B8
zQfnKAJ%isdXGO9Z&`6v{@kerXjHVjhXEcxMOS#o1&CzW6p&(_~(7`7_&?Z6t_?>le
z&4-Gaqd_gKGkt9ETakp)NTl>gHxK9CyFK$A<I@i+N^gF%jYt1-lskT$Jo#aVez7fJ
zWq7|pc{+5;%e&1d1@k;XTGwIEY>*$I|Cn<bFlT!7cBHypR{<m$FKcg_FY#G-QF+r-
z>Ee(1B&mm{Gp4VXeZ_pZkO2|wDi`uwSA&{9I=#)^I&eg?HMyjRG1nNEyPh5R;7!<r
zfgPKs$0<WxzgcW2=~C~>PmHpq2M_(Y7gJQm=LHVUmMT0J`J^aM48G=?Js2;LZ>`vn
zn=_+L1RbX)H2vwY_40Y&D%NvTJtqwm*te?~OBoxjWuV6p<NH;4g>WsZtFz-1vdxsn
zVv3UIm3Qe}sk515=RnFB*YNwFmEunwB_2<UKfo6~S=N~+o*2EEP|hnJo34L}L;i`|
zpDfeHzr1AqmsfvUQgZ=0H0w*OS82!PF1x)yG`V`|TR!ktpR&9IDbXy3n5KXCHt^nm
z-qgwyOCf<7e#kk9Kx0_4EIrg1Fb96mvJG`Zz*<&yG!s)Thg^h0YCt^F2sw96mD;aV
zUw1OGPwT-$dF_%M$*rqRHr=<)HhkJs6Flfz{Z>b63l=`rMOML1NiBgUe;h@DJ?uin
ze`QFkfT*V`SxF-7)nxWvQs|5gms>eC(V%#nB6Kg;Fc-a8?X$;*lIT2_)1V-yu|hzB
z?t%%9)Fz<Acf{la%$)%p?)yelz)s3(%CebxlFA@xAR(9p!y&JNw1V2K7PsiCjrTI7
z_L?OtEGMALb$gI*NdyT%RSz?B2qjRvx04=zEi3L~Dyh<9XYyv}<7U-rR!HeAs~8ZX
zYg&$)K#&6QxiQ7abK&USv?^gOQ#o7N6cVV1Pfvc=ci6vFMTg2Uo8?NZ1hbVGeqK@G
z>N})zMm@&ydX;VvEPo<3_Hf%45Ygm}32-#!M1-(KdR6+7UCpU&F%77wN}DK)ADe8T
z`i)-;E?0#Bk%#CNrV3qm2yqm)GQ%53f?p2EU)nc{ffwf*Tr#NlhgFFg4f;Dt1Knv5
zF5($a_Q~Y=Uo=NM#%nlUhB4`vi7ZALjshxID>tYp*(Sk}XK0&XuiWhAt3l<}D)L`m
zZQeP%YMja5i;WBIeMZxu%MGjB@J5SLrwAVtX(k49XldHF4a0>!-Q7$TH4Y)xSj*v5
zgcvz6iUxF#9)#NnETf3*y!w@u1EUa`mHWtwh1Haw&wB}V9P6i=l~@6i2iOV!3UQn~
zg@5&H)L$67nhn_(Ne;U>_bb~GsN_ByIp0QF&^S%8)r=xbwIj}x#ZxI<cjI{hDuI>%
z(^zMPoAR`Eg|})B32gJzh|IBR`@@=oR48#0$PyUuSW~>>tDUi(nFd!fZoi^nyUvd*
z#5d=|Ht2>F)HCEGn=HqsRN1_rE7=MoR|<7*2l5PwuEo8WWs4tX-CS?wnAmN@9+$p?
zW;dl7j7fXHh)mU~g|=2rR4=^S^WD?*{>?JAa~+|fu3876HnXkMyyP`3!I;D2gqH*H
zokQfka1$%nJ1XUYYA~OfQV-5^vB8njH$+h6JPWGNduWjLddqE05>1s=GrdYbKGIZI
zH%jJB2crWF<6MH=hw;uL<1v~mA(qX3uS7Tom9U4Y={MPTN*oIGoceEbW~y7pJH;WK
z?&IHdC~vN>QpitcXTdSDUgsq#ZdbMLrw<obOy{bmR^56hxdBSjzzXa?Uug#Ri{O^H
z+i-qzVZ^o%FzKIER`8mw8oqMq>jRsYvgrA7yG?~m`hs9x;5pDC>Vom0lCdx>=Ei^o
zwAfH`pE%9yGHuOQ=oGj6^q?~|s|3si^9GdA3$4hlJsq_<di5zIzhX&xB2zm)Knj(W
z9=4)*{r%C!|9l#8I~CbPB2<nH8gmEF_i#tYgk^L$Gax`lGbJp<veX^Isjfu~tq&8}
zyz@2EV8q$RY9V46m3s2MXwAFV(Q+{OuR!kkX;xr2rbs!yB-j1*aQOVWO{|Mtqb{5B
z%8)hvPVH-|adVwEKC(e2n3fXZ)-V!(9iitG)IP=E7L1bRHLslj1-y1B{;c<rG&eTf
zIoP0>2Xpb^g(ck4dNO@BTe+OeGf_qFi0-@Ksd)NHAoQueRXw69xtQuj%z&QIP?&H@
zR7T%CylEi7t9uZYsN&o41$7YTt|<f&pz>ORCV7vzowvE9XXTx)NqK6_=M#dAkcI0x
z6Jrv%VDrZ+Cl3vIdr3RjLZlDCr|&zIKMC3Sa{lVX`cUqtA;Zd{DSzD_038q6+5un6
zUj3u^`C_0A7{3P12T#t!k@$9$zEtd^hM}2VdXg*$a*P+)3Zyq)HqvJChPmpdwg@mY
z-Zx)p+Ry5?_%OMKN~c|C2JEcG`SPxYo*fNYg^+;~h9-+?e;?1=_Er^pcOLCc<tTB+
zI;K-)a62o;jR0I_m{zh@GOj07^muue`V3WyIYGZimMMmQ!nRM{fSR>A@JN5UwVQu`
zeKXKO(8XwIQazxZMWhVu)pshPkx*Rmo5hDSVaYyVHYd^&EU*=3yz{gSYbV)c<Lc|E
z8YKo)?B06EzKaNJl(#Q~2hc>2eGvfI{e0n1Q_6OXm^+qJ{iaVb>;*w+u$erxI(X;x
zWOqv0q1&yaUVzFy6KJ*io<oNbnZdlMDGT1B0PAb+bdlZ+a1NI^B%uEM#jdm(TGTL_
zJ2-XMyEs@PtG@enPHkCecHUqqv$>mBhvKfW=7rp{vFt!{0@?=}NQ)6AJ3re7?9h8`
zS_;lR?L9<XH(p($i1<{qrk+vg?-O%%5U%vKe@$tRey`BbAj(<yfnmqx+J4rRR(J{J
z#SAl#oM1XsIb~oHa}PRht?f1oYkD{7M(X4Hf_i}mT9+N&?fnE?=!cRp37Yqr>C5C^
z@WKxt1|Lurgyo?dR8kGe^|vV++b`>4pIpqxrk;>2ljVFk;oa;7bET_rM21rBSAaW5
z0R%W}WaS31Z+J>xV1&81|7N-P3)NG{LaR6L=OBeCP&4lMP;~$}S_D#FsiH4)q7vIM
z^|IYF3_6br#~<}(UZl30k;4iKxnt{`O!bHK1na)Wn@6&^qI%-dJ8Y{)x^z(lpvZ|D
zM{Zf6t}&8;ik2EGirFXwl-QICu#lA26L3M_V)!sz9@gr(#`cJ@)jq$IUt1D|*!DR0
z7Mr7MkX}gkUiceA1{yzAn2^xS{gXP>imwpQAeQJ1wewVQl<KVPBq=A|ZT%5nQns*J
z>ciw(A75a?xBBS3;NL8Q?>SO2a`eL^7#<j6tYs|yizQ{5*M;+}TpelCq~O~uBWDO5
z2w`WQo~DAE>r_Z=n)$-55oyPUty>)(q;j8!A9|U1^P0pthDL}i4higunsZ)dpB${j
z9``UPvYYgf@9uDfQBG({K1|~p8UAHibTfzQC^3ip#UX*BZz-_?NxrJlXYw`yWc2is
z(Ets|+7P8`slsF~bE+jV6xjU!T<*s=f12boKO-vm!QDbDldO9Ldu1q^R==bBhxu(e
zYiHlpVm&gQ2R)Kicdalv%cNy7BO-LBpRFec)CG#2mOez;83LeT>0pi&HZhmR7qc6)
zvnnx0e#~^_)?t*GkpKImaxqP%mxIiT-XC}!8*4gn1LO#33OWaqi*Esm1vlvAFU(hT
zl}*IgxT_sq{sqGIeO)=zvq0|0vOtgKxG1n(6|1i7CkWy4EOj+K`{S0ksN3unDQGKb
z!v%ntc20f;P>li0`R+3sl`+0tN>6mYC%@ft7<>x0&}5~v4KvyCE4(2QD4qi4OT;)H
zrORI*T?y`^jclTtfk`5^X$0uHxo!%aL)H$v8Z!&#p;lN?&WZr4ciVSJq>}85HE%mU
z)xJCZev4S+6L}IzDBFhT?1c_vw+#B(lxY^@ouA<TRfEJm>z&cTbNH#BYv7Y(AKj|T
zneF9zpJ2}-U*%CW#~<<FYvdRiSAtSIesxkU(-32WdTecAO<t)hs$m%)*!a|@OXvW}
zonWZ%^$47h{%Q36?N<)~^R$g&%(9q)ecR!%V>d(qCIfptVSS%RCV|l)0X#)kstcqv
z!W2ZWanQ2a@-cer%w%!pK(dHO^44x?5&S0OH3!&n2uTJ6rRdr)5P;38fH=3IC}BG9
z!267*)02d3kj%ize%W>3lNq3mt=;z=1`NP1{^|~FkUciPEt(-@6wc~P15^7fsOz7m
z#Y<e3yJuJBIb=*_#g6BwCCcTO!M45tvYJTEpjcKuQJVVcP|lt7dBg?yWyVLk!{-%?
zRCd3xJmX-c*VdgyI_Hno%grk+ysl)O>Z4h@<(zg%`j!&H-t&=p-t1vwL(y`aFRh{O
zk~(~3W4$fmd0oPH{A%*>_BFKF@Mu`>wP}qU*U8vf)O2ZcGl&Iq8K&4G0Etn*nOA~&
zll${~Q1In!o()2E*jkekGSjoqKDmNs3cpKsZHZD>nC2YT{8@DZR#DoX;FI<Xkcw{%
zte(3eLZjV4c9#9??)=&|YKQ}OkZBkR#I`~DOm|4yLQ*sfi$tOFK3hI>0s|WI4;4H@
z9vO~vKYpv#^)AotiS{mh2|R2D8J?{|eVv*}RcI%zJnX1&xgQC=rl#9Bc3y9Rdxw!4
zgLT$WXd7*|su(ieAH6o46ZWFYB@SLKSatgGPv0B-D#*&V1d8btMqt7%NC3{1Fe|*+
zl9=~JXZF|6MV6T@R0>l8E`+6OgcewP2t<28a3+S53Q`55;UlMXjGl;KrpbMANaqzi
z=TZuWzj7$aGBJQBjwgG01xzLy%g%{6`0UJ>0d;~L;dg+zU9FFC%<bSH!0QF#gJ$p|
zAMm#lmESDd$_V#xy402gkvD2fHXeDZvJY^HlipbL_KI=2ZP$_Z7oKwB?O}sQ$L0b}
zV#oSG<Swk>SYhNdfM`?f!@Pb2q=RVgslG|Eyx!A;V#avvA-{o6cr&G`n|A$I0*+Sh
zd08+2QvW2n#-JF5AVarN0CeSy0+cO*Hj&im$u^!_y*6D%_NRqGPc9(8E@f};^}`JT
zNhMg}eGDLcu9@b)Y0PEdImiFHc27^Z=pZRZHo@9>709{sHVK;<WLVUbm-mbVxZ02F
zJ8OEIfU*+?QL>~)!ayJW!fsA1C4rGrrU{~JF>+)Y&KFF<jiH8Gt?_X?w3rNuY@*I4
zU%}o<h{_M$F<iY0WqlPvHLn~B5{Y4?(}8tFl4WmqHiyKOPq!zJq&#!TGcIf_>8RPf
zn9P5QGwC3U5Frj;dPHhi-H#m8Zhxp!U?IwX4n4G1;P&1@^14If(uO$rWr$_ki$p^f
zh4==OJ0ZS3EI|<V220*&bgw*W6>*}JFf=bSAo@1&uz(z|$j5oi&)+N&vt&Hu_%3pn
z0Z^Itx(GQ<q#*s;0p?{`yTNnFp<CLmEgK5@SXb~lajr<h9xZvBkFvY!lYONUMdzvh
zvmTw&eL&I1k^)~-!MC0@s9lY~<Jgruxuj70CGYM!sxb`VUpboUYZ1~aO}>cYC)LK#
zout#_fhX55DO^Vl8i!AxrwW#M?3U55R8>4@UaP)4IvO$6P(q#CIi)hTVA;lQW;TGh
zN=-E%So`?3v1<6DTS55qx@=X>8z4h>dxc6yqBNEOf%aFwav2_9hN_=DcV7?rM07$t
z_{bFsV|f%@HUBgO=JE?U*^Q(d2Cp}PqCm&i8&v#!DL)9xS$-tX^Qk7)p`8|!kG$-t
zPj~~@lfWkSrSMSNIh7;LK+f~K-(UFF9QZ8OBTRxQ@l4tH2+mFAYLdsD&lT!l%VpZF
z6u&L3(JWh^RoL%QR0u{5gHSM6!}WsO*+<jpG%J$<v(;YO>5uBF2+<Y$1AoKB_Pb_C
zbZc<4w3cb|$ry)=Q{T<!a-7tv7)Q<0$w$FHjp9UkjmT%pp*4`a*2iB8K|8&T^@LI+
zL64e{v*-F5xg-rgNEVwVOugSufdIW&`ati7oBInp$C-|V($h^Y6WQ{QxCV_Kms%Jf
zwta9%+sTE^ngX@t#+{GqBiLc=;Q9O2hdZ3&xCHkd_r{WX$coJnc7&MqQYTynt`&C1
zK=HC<&Qhd;s?L)Mp#We(8>^<Dg;0UEI7`6Bd!H4hNUfHjyD*c12UM;Y!r&V@gP4x>
z=nKt$?sKWf<6#k8KAbckIyIfgwmRYL_i5#BK+wqO?dO6)rxhEsZG8H&T6b9<YhsuH
zxX-=-0Bg5*ZGgmYF;K9&vM37_gHSIL4iCs`D#XAmlk^HJcM|-~^DYU$&D9)ylGa|G
zA8biif~<z;P?^AD{oNK%f7IyXvP4pPL*|3S<th7Zq9-mJu8nptc$Ls~DMTnL_Ow#S
zk#OOLuALJdX{F6p=ck)&S8?<Z#5Euza|(VKD5Tb$o?kH-CRD{wy!OU9vtvI99%}<o
zR)(EKG}r??(F;DXf@6!=9#6C>(WIP@kdk`Wtp2+C3v7i1EURT&Ueq9e@KQObS4Vll
znB$gt;}~LLm;gg5d`K~$HxwI_-j`|XivdG5K!kw`at|tE9lhkg4K;}RvT!%gX6`65
zxoTZ%W4n`E_L)CW+d%iBXcxA<yqxQHrtXSrK=+kh56`L7^&MAH-Q3uHDk`2SLZ4Ql
zzWL4KFqtrF1zj}cu%!6!V<VLeC0bO{?J`61i`C`TBUE0=<9WUz6C|)R(DZockY(-w
z-P$y=M}*B4dpn6^dRNy=#_pRl&=Hy!>6iAWk&ENS2kJN`EkWc8#90oVhCT)(x^{na
zlO)d$awG`ZbT0h_`pc2~MsEE>o1g>#4afhi&gx7{kKi#!HM^sd_$kpw`?2l5)6{B6
zQp>dDh)h73{)4=z!n&YD*E@ZwBKG<&NkV?hRab{fsrfZgc47C+dJq-xJ5=`>4pvwj
z@+8c0$FY%;AKq}UY<P8j>cX2}_g3F&^alW`+>ZAnI4BUsBE(@C+L6s6_?Q4ShB%LD
zRjP_<pSL=8JCqae@pcuul5iX@LG}8K7(^T+Gg{H*6R-lC31!(6*8@{;!AMrK=&WXX
zH|shBA3_~!Gr>K8Ewt=wzr1k55PZL}Dx9^$+#uz){R=9x?+I&d9^8T2NXU|8=V+Q%
z9;x)w{8@WPTGlyQ8Nd1ZjLJl8roU$6@=go|+6r_l(V-w)0bqgPEFLlR<*N0ja!<Y3
z*VXH1g0nD=-}lCpq0JChraZOpb`?eTWyAR*51je@x;SzAO4B6&n;k#K%tWbuJ7G5t
z&A|_Do|NX9N1o9Yz3s`Z__*YFaN@bUKy`-_DQDpZ=++c-1arEUOS<}7&QV-1XNpu&
z$s4D*S9|<N6Xx8=YRn6mM@g;IiX(6*c-SYXWjS>DM;BtVVp>WZFWs=lr*OC(fi~Rg
zx#<(1_DilFfOs!PjBQr0PQ<63lnY@<<qZRJIe0xvG#rfSU(2Nk^}a57AtS>-r|o|$
zjVafK-@C_VCP8AQ-8du2<gviEA?MG7kyKD)aL@WHy3J?ULzu4V=vt`~7LD#lD}X0}
z8tZdC6>93;NFL<zEgvrWF>2pT<C%pPj5OIhFW=oFRDC7mRaH~A;}<>ba_?s_mu*(+
zGq_`sTS~S><-h_^9aJw6*7yUpHrJ>j-H(I;+D*wFK*5};B_NR>j^|_w#OP1}27~t&
z_pre2YUtZ>myN*nqrpqH!Mmk=BARbm2dOq~nsQ|A)%1iH0bM=E=bhv`rQh})iZ7&U
zedxvOFZZ>haG>rp98uHfuJwU%ya1(d#vdOpB20FDg{Gy^eNni@6afwF<ZYE3jwWs&
zZ%Lc<{R{?UCkHWa{?xl+T_N$fsmLZU8(h-(=!%Ghb2WNYd&RCKW>tZW(?MkxDnUO{
z<$D8k%0PL0WN!Myr=QAm^B=^LjD62vSr;pmS;J3@XPydM32m)A0fV%L;KNf0-Z{FB
zH5I`u<F=Fa=bxmh`Bi@?4Rd21{twuQ|G-cb2so%~FoKpASRkd_{Txl=ma5~yO&XhI
z3M|?X+2T8Vs70u~Lr4^2JA)9Wa%UvKxoR|k&%ek-ETcDLO(ivFDq9!NOkPS+1yqmD
z*tULn0Mqtz8Mc$ot+AS-r@r%y_mR!|xsWZD*my@Ka?sgd(mW<s0=gP3yVF~yY*LcH
z)rmOuo263fjY=AW!GIO-r$(zAm)w#L$a=K4k5`NJyW0!ory4sMQvLpY2i@zGccak4
z&Jl&~gzJg?C2u`xcak!_J11j9a>$F7q!Z2fGnErW@<Mn<^O8^6sgLE2-D+<R?%6S!
zt6TI_Qb+GUciAdGsnuXRnd-PucPY2=DCxsSiPiWY`S%yUSvKy%f#t#$vWE`2HI_jK
z{bosY1a?-yHoK>IkmsqY@e%hxfxZ}jFVKCpE9<3%h`^}|PBr>McYD|OHs}@~q6b+~
z#Lt`tvWmW!+BcQ=Q2RqC?}?OsqF*|=Rn6pY-T~Hy_dxFJdnRPoo`WJwjQBvFrJ2oC
zKXXFYl0Sc+)0H}?{v}m@9j;&4MO$spho{Z~h^M;Q#wXqaHWvT0th+g@&ZUbXMoGjX
zw4pw(=T{Bdnae;ZSWu9*0L~9e#aE22(mp}#Jb3NTxuh)Xru|s<O~}@rZl@^k<y~lN
zp6CDEbm=<d$0q3pD0jcTN%lFOL#Y@g1k-(BwVic91yf<=lb0+K`q(KU#EIuuASzz-
zBHWas+iFlRg+E(TXW%R-rZW{t5Mpazuy;BC>fz^S#*!@WIR-#DW19gV#Gyr=t08d>
zn_u=3i-Z2IeAP+dOB%(SZSUjx?){Qg)?f((*lmJPYndbh>I}P?X;nqAH^JG;`Obzq
z7TCJy!wU&Mul9khhpY$`K+6|iZ%!$<)<>Czth!gv7A<o_JF~C#s+=T-f8zrfRJ?#K
zfo;f9gp6Ail9PGPV~OpR^5SS{5wS7)kj25S_7wW3z2K5{stanO9ksKGocW<jAC$_j
z3=U)v%&7O+MzJ6a7eH|ag|8|j4|wS8Y}jl?I75p{4>UOj9~;j?I2obS$YaEv+R{lk
z>|wa>j+?p!oIS4P-K1o*L?5#n+0`Dh_f!no^we=M>sjnWKn&wCBLg7Ndi$2<(D~Z!
zfLlRE<{V+3U9Prnj|f=o-hI7yO1v>@%w-O7MCa7~pe4wgrc1%y`iR_*4?eV?E&_aI
zl&Ly}n}$OuhOL>O)SuX`aR~Yt*I-+&(Tjh$U!}xPzpZ2y{u^5eWJy<`7Ji~`(j;aI
zWAo8y^4qdk&aYjj?;G6Te7%Qy3syy0?-u@bO|G-dGi-qOy@e1U8FpVs-*0?aKc3U{
z6l{+WfPn~XO<nag{PC5qyu)X%<<qoRpHO&+HNS!!)AzIpYkB!L%u!tFhl|5<ICO9B
z?aBU@Cy7YDCJIFGDB<3XDBbJ5mv68*3WXeJ*)QBlsT+iAQJQ+BQI6Szp$3<--Guq?
z`-I`IUE5l+rz2hP6XOA6@4^BuMQ)&a9)FEZwhf^Td!1zC4+k>b3^`y}eHdBbMNK5x
zl^cdn&=j?Ub0y9af|}Jb4DhE6y=~y#-cD1GYhDMx8lT4~Z+svfcU>|q!d(OWIuy|?
z3Z;HmB?%zGkjgQMSq@wUF*}Bs<)~9>!*QW$gLt&-Mr(A-YG#h&*q&u3osBx_MfRgP
z*}Ervk|~h>c1%*M>?W3fW<jk{s#V?ab3r|k-Pk5x@%S>Y!p}p!fl(mjX0O}9X*3pB
zOpL$+yp!rq$DL5B({sZzIj_WmW_sA>{#ehAM?gk$f0r=UQjCoa;(;8~6t}gWgt@5Q
zyZe=h(}pUE+}jkIK{QGYz|F~QGe?pLVXkHa+j-KY{EtJou{imvh1=5&VcG~phhlW3
z7fZ-Ob51N%j%s%514lTstJ+k)G8-O>9r2#P=Oi~4ufEefKtD9*CB5BfX)9+3k?d0_
z%@Zh0rv`lklh6ns77lCEuhrAG{cKCSk<7zzR&o{Ekti%>Zx&E!l*$<uaMVua!|XW*
zv=!{x2)R3g#-Cunx-U3l1AX0d=#$K#9jxgLl-TozBzc6jsNtin7oQUADwus683kew
zXeRocT(p!8xWd7@`K2IW1Mit8B;-^C4E8kA-54hfo@Y6QT;>m8a*w+K7-V)*p?g)j
z8@Z$f?-YJPrdlfE(g$OD#q3y#N6zF6J>$K%f6y%1zYx>gR1oDw3qopW+Z`hjmT@~B
z=VW6dshsmJ+-Q?VR1t1|(F(UCr+&9TN?C8o@-wEiE=*iG6vU;|6j1%B$@}r@4L)Kq
zJP_deQqq63=ru+fCK)li_4>b*Ce(Kad_UyKH`&KM^Fv2Io~?uhk%DZ#hUf)iNO=Im
zd~xZsDD4`v_i^#vx+NJ^5b0Wk)TUwX%k3y*%;kaRGeV!A-4L0gNX-VtX^JgD2~(cd
z83t-OR~66N@CApyM)ECXjzv9-4!-9$d4oMS8i2&X5m;_zB-g|e_^`TxG#VQ&GfNX9
zF-uK2_S-c5YELX>TJ}5ccr!A~!9)a}Dj$zkk>jwAStWBN0%CqE$YvBPT##z^$<8C2
zZ!DL~zWG<@0{-?&B_M%u9rX&pyr_O{;L3=+0%(v&oiejfE(JCpXX$P)N7V=>L9QvC
z_Wl`@Py&9~#vuy8p?W|dnt^l$?Vm!<>4V65O#bQ}Utoz^XWswtN40u*V+NQY;HJTH
zj)IpCF7-tLB!A^8QKM1jvBd%$^2E4Y`Ewl+r;?N23H+Nu^eLTFs+K*1?$0=NM)=NF
z{wbhf-9kOx7FIN*N)RtLV9`~9F($Z*9--h(X{K$e5Q2XRas+-7Nv+=LWK86PsM{eN
zuiz^Auwwl%F6-DHcTrI}HYh!z@d&d)0BG`i{Ugjk-w>o7ms_RdV(u~(H&u6hOa9%M
z1*h=`iWTp%FIaBt24_SNvH@62UR1RD%uY(A-;PqREg!tv3Oc`|JPYRAj)71;p<ZUX
zwbhtAN*RIdg6)z#3BHo>ig<>f_4{98QZEL89<P?S#%x;B;b)}j&zcqQ=nK#0qzbu;
zp#3SmO36yD(KF-2-9X?{`eh`2L-Sd}-6}?2gWh#&rx*{;GW?8GmUPLyfpc2vJ3-Vn
zOpwG{D&JCHNf4Nv2X;a2(E)gkEYk<56ri%aSG~|D)G`EH@$B8wCuBck6oEM&7?oRe
zc>sCi2R?Wn$ZFLuExeA__t?=iP$rLlS-JjjrAB+pMs(FKbY@|-Gv94L{^PE-C(0dq
zWgyoMr^p+3;(%y-Ppo4hKT3!iMzH`+!Q{jYBhF0PTyC_0nYsmv8j6r=?-po!t6Ii^
zzd<6b4ol1MChV=XH45G$&u0)yBsE0uSQxmaO=(@7-)mE)WLnBdsF<cFUz)64|Mip8
zlH(Q(?!?Fq+Xv}V6=%kpqy>$AI9G7^iS2~5Uqa%RHS><2t4%wU82s?f##&%&kZRBi
z%~S3{k3Am4;`@7CCGTdt<a<>=S*QY-K~%q1@F}|Vtd(>D<q(GyPD=7@*gMPKn==bS
zmH?uCoQsfm9`q<D8^FFpRtwXI^qD;%`B-u@zu1!Q**z-~wo0TT9{_C-yapead8!u^
z{AzH$6{{ABoT-z$zU%kf^*7n2W)_}ShUrh5m7%k*m*guR+=;yY<YwQJeO^^VCPH!2
zIFoVWMGcasc(iP+F#;$lY6^S!|1Aspe-!}zyE>x({Jky|btmIrY7~oCGu~tb-&l(U
z>+h*CIj3M0Mh1XXAu{Nf4oGt`wbFeU@Fp;28&v@Sn8+yn*#;Gw?n($-cmw3KTb-vx
zAW(lRGZ)Q$X7aq>+{erXk*t+jDjZBybI+}fF|K7l870YFsw<GE7w1vm6w?i<g|qH-
z<g64=hDmM2QQ?`&)1~8Fj~vXv&Fz3rJ$6EXW-<!)$T_+aGXFv5L$IHp-<2ez$+S#d
z*QQ#P5wr;obqEcnShntrl26M7tSk~;_RP}_3MTrlt?!vDk=I}4?&Vh0MbQ-6el%|$
zXsl?52p}|IwC@&J4)vQ}T#G3fossx&ligTX!#6~yuE!dS2l4(TTus<xO4k6?)tHJV
zV%cCxMh|zby<gggUW(0WxE23q&oxA$S`!U)G^YeL^}U4fX&$6&s|?z@jai#-w~iJo
zV`NeAj$2~8QbM6Pm#Il%sW~JYq90$0YDTeJ!2r$EGE9zheV0v~vbT_T*r1C$OCat+
z(3c)dVkEGV!hqmR6-yG%{kb9{(w|qC&@n*L&hN0g_jZGhsd-~oaOvQ%KWe;hmb4zn
z5lyP>VjJ>Cix%B(zgIo&l?_o<tYG`RIf{8-H%Px6Ml)dc*A>RhT@BpV49~aK4m)&d
zH;{eDC!07`X6JG|Z;f>b4Q~~1q+NWVFujQ9Xb9zIVAs8-O2yqqotoQvbKLe)VQfH%
zw_s;R<Y@B>BDT|I!fx?n31Vj^duptnolq{96sIz0C4S^S)f^#L1N4p@tud0aF*n?j
z;uEVh9<*0yfp(Q{4e#r4G*-QQq1o$UEEs2A>UxV>$ng~X2v5DE)N=-Cv-F#V&*N%U
z?wY!wqAI3yMu?QI_(O>7XL~ZIN|ppftTH?MKAyi>TGG@wA)3pY7pS#g=<1*oKAs2M
zVm@Okzv@E2GI6x(8c&Y5YZBf^`$AZ1dD~@$mJw$tY>{*~-I!D81NkMRpV$3-3(h7j
zgsMEg+K?lg##~&nH$I`*BIZz;Jp$x=kK$jkO%Hkd;dc$0++ez>{W)Oi@#<sj`;gzW
zV-L_3C_yc?XtxH5lZsU_&KDUSDNd1|rx_b6pbY*wU5NgE<P2L&07bg*CFbBHRo7_1
z1?z&=6t9fw8hv=sfBK2xi%m)ec*<kXMyrxi7>R~z_~@3^8D#J$`ghAL+Fw_1k;z=U
z8xNxwPt%=gddy)FW%As5IQl^evLfL2#+;kdaD?f5wjZibIDqolK25bD%iGjQ;*=t3
z(BsU_Pj)xP%&smuao$~O#M3syz{!3mtRGX2TYM{eWYPjKE<ce^fQcNKdkK7$1F=8~
ze+qcO??Qn1{!}!8-M{o{0d29@0hlRJ){AUXA#&^=nL^@If%%T5Iky^25Tvj%4titP
zy8yy1h#W_K!F*N?*#$DTO;6<(OZuof^qap~ZcL(R8^Blm$!-5-zA?rglKlRps+1p-
z6MGuje|3dP$5KuHvNm{85I}+v|GQrTV4T0qaQ9&IwBQKcEKEEnPp7=+tgNEcRs0+I
znk`^P5IIV@4q5Fx(wB#0tIO#$AmuDQzS67dk6hQyNh(~j6|&}tlFqc%F0^AaitI#^
zQ3e>G0VUMDtfs7{;)38?x6G1w;pBb#NS8%MsK}1lJJUi06yNm;?-pVo=j=)W=~6^K
zJn<}9yAWaXI_T$hP<x_Zj_0UPbKhB84~%TX*P-_Y(lWv_1kng^B0uiRp|t*-?Q$Jm
z<yo8(LWw+I2uL!I_v~bt)gG!^yAQH3QY7^Rh+F_XdY#)HIe}|U5)4QK?Ow&$tno9&
zesNgO?|(#vf^OI3p31ZzgoN&8Yiau+o8$qnV6z46Q3$vN7;q%OB}$R&Kxi5sa?emo
zaYpP<nFY`S=RZd;g#T9j%bGdxKe=rEH!Xw5ziXd0t7(e9^iiy&3^?aW0EG_Xeh$2r
z143h#|L!04=Nt&&8(99kfBtCW|4&%^U#<Rsf8S&MFWP|ZkB033HSvGdT>mSdWBVgM
z^a8(ex8V=qnezwm+(M~P0g94XS2KnzPoG!;0MEZq8UMwB`(L?||5N{m?e`!B6rL?l
zuF4?q-YUb6c+J#A9N@Pr)9sxeS$xs1c|w$_6^Px%1KqVSy#3f;oKWUW$(;|0M4}oj
z!rB4{7QiK6HZ00tmsjyJMk5K=$(D>GB;<OXG1UkTa3gPaL1^oM)Epo&I|<XhS(U&%
zv$9m;!~eYO27h4Awj(Eyisi_+%odiq|5bJO<*!7V!P7m{>&K%jKn=%hjQ18Bp{u?>
zkHzE}tQ`AvvCi0h*+J;OAi56){<p9CheK+9yS@vKS{yp6QoGYfm(V;81Zz_$#;)!^
z97FiWAJ{GPo`5=oGNk-%iB)Ur5-8mFi^DthkD`JUeeA*3+vHji8MKOZviMBhc!CGY
zaRmh24>xc>^$^+`Am#n{W6TxdOC7?{?)#ILUu`>RT1+m~VPyZ4F(wVjW&;7uv9aga
z#p?i413=2##l$+v>!900xN(}<fA+!4ZL#TfxBT?}3m?7oE7f5$j|7;!;m;-h&E&u>
z+yA-!IpFqxvy7sm7eASJ;hO8veP|#Q`ws_-M<i~mMEKMX4Fiknvb1;FQgPpndwoG3
z>s<;z#y_uc7>4$Y_vYVE?gM1guahARHfiKKmWc+DGpVx77b$=96-i9};E>&jQkH7q
zyK(&iIq##wWg4HNpGe9FhgmD<-$VtU;;Q>6Lv;3Dh~=4>#*$C&1z{zC75kq5X8F4r
zi-5Rv;X86m2)GdpKoc0*@QLuZ3G-$eKqH;ZwS7`CQw<1o+r)B;K)KSsKgLtPRm+i|
zu4vyYbrEI2Zp<ZJi2N2Ez?BrWD?yh){N*EsfBDGYk0ECV>=j;Schu@h_o1-_wZGgN
zyj}<Xw?k?{G(3K%?4P_{JD7+b3HKxUP>tw+`Ht~lzVr8E%;ntt!E{TvKbXlVa8K*s
zAzOk#ts`dfA788x(<PH7pySsEcB=p5t2ODAUOnaR{g<)ufXk@>WQVW;z;b_oG1jVN
z-V{4u`uci)?LRw{!GzI{iD05l4iwoGG=th_$070l|8^KaG33skd>-`guXqVd&Z0^%
zUjTE(6x^pU|6}Uci}X15+TMBl+=}p>RNt^L$Nam4F?zyxoC1D<ywOWTT?>+$qpGNu
zSHni|FEoIIiUl4V?;$1)Xch3Uhp4C+r&IEJ_I`yIDdLU#3zlDZ#{NSa3>GR#I+l37
zZ2nQAZKU?K+S!i;{x{42nT3Ey;_oB;=aEQgusV|Q0ZMUu{G-h(caz(uW)CR&${8)B
zTv3HY<_&o5s`h<qt~H6EW4roSLDQ(bmdD<b>0f~Djm#=O=R+p+=A_-9x#)lBA9+H*
zGKXK}!^>X)e*9@C=O4cOA1?%OHFMLqd6Wx|VpDJa*}z!6{ima=+)s7Xdtp7o(?&?U
z{~Rw1FsDiz;l-DWV_S4N3_V6)_U7u7asWQ%|8P{v3^XHurMD^pySky|wQ5mf$s=)0
z)zrhI&7?H#pIp_TNOCVh%G15KN^|TVy>?lG`eMcnI|{AJV*=TnQPkVYunR*bLuiAp
zP64H|mxdd=Ek1pO>TQ&K_I@vOTCMoHddJ7!(Kf~CZOWdA=&@T_A@#-%I=QaXx_}Z!
z|6}+~5AaODkh^tTQt4zyqrjS4$3bp9|4)_U^a)g@<^iD9Km>SY&4-cF;HZWB?~bSc
z|2p6AAv)=A%WP@ht@fQ>fKCjNN7xjn_9K6BL79uCN!lHwp5T>oU_Sh@3v-{8%f<UU
z+Yp@bg4B&MV~PeoVxF9-IyCwD>zimb%;M<XLpUmJe0}h<NBRJks#oG6;GKvOKvv#}
zJE`S83kWSR*VGq+*fMFBDn!tpRQebrv=w0V6G~%RGT~w)jBF4C#E#gNku0&~jcGE(
zW#x}=x(^H}rVZNbDRo`Xf7DCPlh<5|9<=_D2aLgmc4mz(u<BSmy^dNqrYulBCER0u
zRl{Cb@OBxQ(SpUjZmzl;*6<P{D~Py7>(j(!G}cnUXK>xsf=WPxZSifHw2aP(bw3&T
z?+idDB*fB~*bRDVUCn@h2k86lwla}~#$(c}0SBRVJ~G#<eS9}J`>Yw&(bU9nb>X7}
z(MBeg)y6IJJKm(c!OF!ia4v#@w5w%W0B-|cpk1XaLT&Oj(_z7<#Js=3Og16lC|p@K
z0{Qg}$ttd2uxeF}68C07Lv?r`li*7^*o=cjZjBjOZH=m28Do1??wqFv$27>VP%X_}
z^AnERiPwe(oFwbMbq=q-CL?!Bez5VbWWagjiI3zSnJ^5(<*|`!<NjN9uxqZ}I4oMQ
zzUyI%(bus2*ieVI^=U3TxWq5WUU|UZF8yjkK5k`0$`ks^N}*F$uRQ8JD5#X(FPrO)
z7}>I=EAeqscQ-bEm1+KhAb0}mC5hWOEOmu)_}xN8_tUL*?gffSKxEhBao7woqYBkA
zn)Pd~&#C{4{~frm$V(qH^KO}OTwJCjRUW@`|BG^?RLdC;+-f>p)n8K}>kU!FMtaD1
zQ(m54n4oo!$_vz!v{~SaZ!$B4WMagTkwPaQHRR~mj);|0A|qE_9uS6Q=FUhxF7%Jf
z%xOY*ZLUfSRb~D(HLTCCbLy2b7pPrPjkWd=7H!d)SA%VLzA?Qb`JvC;$TGNdr+wB&
zprj|FWHylM2Xz!q`Y7cuYkt41P1E?w+O@s9R6s&_y|v2p0o9SvnAcsd(fDKSd*Af&
zpZn&hv&$h7X_UJ8P=0td?daWE@VADsfk%=va(p4^Ge**FE2X%K>w44emcimlU)*_d
z+j%#g(skD^njbaC*Ei%e@9t?%(OjuPCRYc3+E2KP+Tlga@A){4&4WZ8g9@t=Kie|$
z>=*IJ)ID6^*pL)bZ8?V|6{%y8nX9#p<hW#1xR{;dJ(^@#u6xArn;-0H{IC5FS-ude
zW;f&3<<`+BK@2CAb_RXjlJ3?I(_I7i4R>FDB(J(CBP-wjQgS@6+X=FpW=J9rtf;yV
zBP$%9tJShM7iI~H*0D$O{|X@Wc}$V*B3q=`y<8|3Sg){0l=8jDpGBR&qBqMm-!1h~
zsX0yci(B;*C~*s?=%sfgkvC)gl*88ifwCv!Elj<8Fl~VBx}vK+<=Tk4k3{5F<FWH;
zfPC!Kt;ZW|uXU`NB>47f#m2(E7zPp4930#Uk(6U`HCdJqAI{W3Y9%horOg(ipSU)U
zSxdZHpd`1v>GUf3iEfcE_D(bTh~K0owu9mV(lf!F+q8-=FazuA!L5mJoHtd)w<k8h
z7eOF}YI>zoxz%7vG|JR+r+UfDag*C(P|wrpXT$#JvtZ(sv4N&AjVsvxb}_oZ{6v%r
z$tVNJseJQr83t4e+<DT!lr?`sLYtf;u3wenxO~L?*qO*P-Wo^-93Q2wOtGJB9<#7s
zi1PIId~l)bv}ykL*E^>ZeG{y!{RlBwKKE(fvLUf}9`dkch0<zAd3kQE`1e@EQf=!K
z$Fc`7;<CDuY3U%E<g#D(a(dmdU!C(}X*rT`(ce&&NZ_|IR<ArPR6y3WWlT+Mv`?e5
z>8!t5&gq2}B7rW#OCWYCV)kZZ$`16Ev+>1Y5+berD=Hn%nv|>80ZdR+;Gfoe$kSnY
zKZ<l3u8U{XF^pn)%9H8w3qc;M$~m0w%+q8<>K8kAxn<el#}Au>p>vG&Ow9@T-LQR{
zrN9wMNR%T}x-hbzqc$voA#4wd<V*KQR9yc!m|*7d!}xy4p*rXM?1F5TP0qD-Uee{q
zKe9vGz%LwZH%>pk(+1_ZIV9~fH(cs9&s&n)g(kf6K9i7hZbLo`L+vpkuUeNDQw)qL
z7wN?pY$nyusdPLBVrP3zk2bPQUXbf&>ZJZ4pntQwixRHv+2x#=8(-B>7}>3bKZ&(0
zZ#5Jv9jsbveA8?*Dd8Py5JsHxII*PEg^WzR``qxk1J`E|a{EZ)`t2c4xCtmi2K~S>
zC>H!~@`z%6T>Tym)40SI$y6>n$UKw51?Yq%05vOPGSlpoIDCR*YKt`*y*+^b9srTP
z<*<>r>zkDHGkWV9N;*&A{+ud&)6jZ{R>yg~chuFl1oq<ofXIn3@OSplx@Dgd`Px8T
zQ=7k8KKWp`N%qK6*cy|0#}nUV>h3Ib<V{7xk=6Dtk>n+T>^Bru<BR@CPHUTwP;{!N
z<F&Ty8whj<tnh*1g%g4rUUBo-i{B!a=S3WX)vk%uNPW|vBNp{MoIR3`sR|q$Y#qvY
zQafR9ARFo5SSKE#eoxeawrIKT!{h+qa6e&<l^4U9bIU!B7Xbwn4qWG&qo7mLFQ-2H
zGKN%RYIC;c*RNMGLStTD;_e4iXn0vlrl&A$-FCG2>ZkW^sa}-h6y=P~(^t!JS*={f
zz8kK-qP0Nxo6H{l>o$hhmMYK~JA-gNzXzWPhNg2~1&ykT9$ZT28zOG>ruET;T=y;J
zGXg%taC`oS22G~0U``e3u@oCM)dGF(#0fwXH<GVdQvjnnAH_x0j*EZqz<y;+bl!z2
z6suQ_1tN;7zHp`WS2*wLvlwa0;SxrSlvn(@=<hY-d&fXVumyVH4E%F!8N~9_7we7c
zy|fY2C-b`UA8r=JoWOHwbSpOJc3V8KbHq*8XS#Z;_^u>$DZ%f=FIc`XLX+W&TI!tw
zMql)~-}Le^7h+utg11XmzNHplEUoystnaN<pV3CUZSW0o#}>?>;OeC~_~|M`%7Pj^
z(x-M*B49J|T2FyOir%2j=^Cm>v~5|F-c5<m(7@}%fjaS@yqrJ74eQAPUv3Rvl1_Aa
zqZ4#kn<=8|y<KcQ78M{ZIp<JG7E6Dw5HbB`E*PM2=zLvA*L$(eBJx80^ItD57W&i`
z%~#^Js6%33`eEgxV(OnsaTv4yg-&5a^45csng<k%is;@(JLnw8>py}F->Tm{6cUh~
z^~K`^Bj@VZ6sYAMJW@^bhMHr5;|Q1!=GSi4SI|j}d(^w<kXh;W0(zJ=XzPBj5eEXB
zIh&7E_nqfSR&VmnE%_A!v#QluU4l!U4AMMT`P|8hvwH4<x7mh@i6MFV!^hSl*v10w
z0+3aBR2df+MeE6SXbYs*POguBp{g-;LS<<HhLDS^EnyGrqd4M8;9erun7sBN;90mO
zMMAcN*an6b`%tU}-@WXIU3SvyM}cWNRqEOWlWqcEto0hKTvB9}q-5H0L5_2s%=MDT
z*{6YaTHIJV2Oue{5r92=1Zb2eV4Gbf1q5$B5OBKV(tL23$N0;)??(U?Ic4QQEt?RL
zLazebiYZ*l@DrKAQpIWps;TU0tGdu>=%$QF`;Q1o?%dTOHOV%L+fOQrNRw8yH{=0v
zluT{y6s-j2te6C0JG8{<ahZ&;+5w7lc4RQe%Le0;<-mP-dcf!Is-TN3nVwd{r#4ib
zw#_m}RigdV)D4K-6h_QvE8O>;t5G$t_3LXy84wC0`3=RJZ*7gvE!2EjOyLuV%m>|<
z;LT}OcR4>%kUJI{r2fhz$V4?u%3_EfP-MGgk^aOzWhZK(1P7;dV;^7I6Ww=|PzyE3
z9=Fo=E6Cv*4<9+h<}Y{n2i8{j*G$;jELw}q92_%NsjBjQHEUpbUKjlYc``uSewIMT
z2$36qj4uz`Rg|>+h&XibY!%FRX;gKyT;f@qPK4rFl1br;zqv<w+)R8rh;#Y>;qAS{
z+5G?i(e~Y;tyR=sEk$eA-qKc4wQ6tLsx8zGLaMFW6h-aUtd&rkpmyyN#3qS76Eh_8
zKKJK)#`XQ<T-W)X>-wJaNB)rI&iz`?@fhdz`7$?E=mpcgf`q<$eQ12ngp9l$=f513
z8eS>}&#PE)8T6^q@tAwgD-!x5H!lMoQOg_u&5KyJ6SfJ^vVlClw|vz6>D18@5Cla=
zNxW)n$qv5{(1;lX6hSRf7gBX=kh~8CqB73TqoE7+JK*pvpNUy`;`3kiF$1UFtjP}}
zwXd7Sr>`Wjjvd^nxV2d8wF{!#=An;bZkj?3M9*Cq@dUv<A&B8d9=0F{G5eZ^(l+_L
z^aZKJ?z-k?7PCdB7@eT$yN$F5H&)J`wQmK-tz@GeG2X?SVRE5T=$D_*u;C*n`N}@6
zjl+(c0M<&3Rp*0p`JgM~jQk50EmG<HVV_lGXCTiVfXI4pd}p-|R=wvOa7F{s_eJ_6
z&{Crn#=S<lj%*96Vg=Rx4>US{?!BJgQe!3ta$lr=O<NRhLgs3xn&kgd<Wxb19rCoc
zN}3&iZHO7vAuxBBzws}k5wiiiWC=Y`mQ%*DZQ5C4LZ}7X+u9D=L%{*PETap3`t#@_
z@{0qM2A&~9rCa`))H=Iv@m|mgf|WI@YwczC--_{<4HD@-<K7KPO)Pam1sh4Sc@cC?
zcYQKU&*s?HIe9V{!)o&Fh$Tkjd0n7aXS(zUwSRm`!zANkV0;=7Vk+uCH^Y(CKl=);
z&we~JhA+pc5l8xc51p&wu<nyK;cB8KR+ivYdcD$@uXk&TcxIv$|LsNwKi6^JA<0AB
zREsIKSr&fgQ1Gka&*-dLNRE6&U8R!2tu3aG*H@z*T-Taj7KuAN`1cZQb-iTU?uvXA
zmcXA?Zu`)${FPQZ7i?=Jc;}3%_&Q)dyUaPA-s!CA?<H?utz+>`+|+gqwRX~F&K`uB
zYriFG#e6h2DkCtHDV=)unGAbD9*wDKdgGI=!qhI9II+=%g6{r`2>pR)r96`ajtXDc
zP95Q$BBD0zzoppica=w7{-=9k|37`-m47FI92@q(m$DsDo0dwf<PT!7dFHW=DcEdt
zQQEiB)yf^hV{7)lOp=oGcz*G{4&M`{Dhn;ET9>{c7oWebW`DO(TbnH-8K%Lxa=Sp&
zv!QgRr*uZ!!8a!vCrZcW@E1KkTeh7?54=_-gSf=YLTw4c;h!Apt%n^Zv*_-Oj1p;m
zDEufVG*S$PyKs2M!;qzy1pb`+QuDsvMzIlwe{*dIAQF>R-TNaM>STjJ$O{QxjIEVI
zpjp=1SF^Gyz=xOc^PaT}UqfQRpRdB76-z~mYVe6Mb<{4NyD}lAubNDfg`O{@ChP9L
zdZ(&n3Rdq@q9kz`lx?C}lKyls7d^dG<Hx;?DvB*KGBZ-6Yp27Nj-S*$sBL8**s_9h
z6lKlYu-up?mCzDR{yzB3wrtSE7-8R85jZRl_P==D=+kP5ofiD(`OsT`xG3?;)4Sxu
z(4~C|AiQ*H<<}dl1G{NOKL3?@jI$l8g0J0D#__?o>{tjqDIQ)DM>D(2#-Cjs-f|sn
zDgG?@HXwcCos+bwb+6mxV_9jNDf&mh&THnL$P;Kprc|z>sLzXFCL`B+N!KYui_W3`
z+rQ@ljKUV;8PPZ2ev2ZCvJ+uxsgA+0tk&;o80T^(4O<Zw(_vtO(95`u-I9%8Hoxmp
zpXO+m?!$x~9%iQ<Z`*}>YzilQ%{kB0PREM{e`CWjjSb9&3FS=*<`mAkI>BmKKrTMJ
zjq7WQ2nS;2RY0G{;KqiP)xJBMfJuF#XV}T%YA=1m6C2HvA6w_5Nj>E=!*37ZtClGa
z%*VZMc*wD#rRu1%3MN~hrS|KOy%P61^{*2$A+{#JJ*nyMHNa7cS@o`(i5{}P75gb8
z512gnQxb?h{=s&!<=aw7C5^9W1jqjCTl=pH+N6!$!ng=Lu^wLjIpWxnOYiKS&uGGK
zi~NGSEiA7D9r@_07wt~Ud!GDVm)OBgcsNym`&BqtyQ={78z#K1w5}y@0%hP*hBGad
zYJ;cl0o>BYO;uTD^|hHgA|7WbVRC5$X@2Uf8Y4k<GTH5&tGt)f0N2pn&~SQ!Gta_9
zbs6tpMl8IM1X*#M-UgyUeSrSG-_yv`6rkO&4WMt(PYO4tW}g|*mP=}L2C%I&BQ*R+
zAC())d8zll)A8ju9;>X=st@`6`o#S3&cj{{<GN7cIjaV1>->%@o@e^f36m49v*L*I
zv%DEOU%Mbq=+eVLkCEWR-5xawTH*(=cI{hK2?;9vHUuU{UX8Cl-01@^NY5RtmSidz
zU?+Kg^?TE0yM@RP99!|&L9hJyc?Ejmdzy~oU4W;Pl;%i}HnY5`(pOgAb=>m!En8qK
z(C`sz9^}QmTAbuBBmKb7F*<|YKz$ruA1Ea5YGAA)Xl>7U_5kI%khBu{TZvknDr>YE
zMvxufn3b)M_5g!*?uc5iDfYViP<l^wnnSo>EbMwZkjDPBSo)$8+_iM^C#@CThnpP!
zJu44-bb2^{?Qu7oVx^-e;>)zB(e$ZU0mJbKxg`g_U$UVbD9Z$eJs*|g`9j{2mhwC*
zB79`lda#mX@4;)My<zHIQ||sAN7r*ZMERdFR~BPCq?=_L^L&RE)Z6Bc_um*}{XfEQ
zzx^?Z=lD9CvI*8*TX~@R86@0aHC9>MFYf%lMs-j`(jhnU3h(I{;wey_W$gnUT|)jB
zn1?x>JA#ZZ(9^M`9sAO?3O+kcn3nxpW3s$+v;mI$Bk3o=W>$;}(_)5UxJ8VSA#-Ud
z!zugB4@cC>TxFJSPP@uS2ZBY5(BGW~D6(6TzZa$Sn+1T(qh5l-Jov?citO&PF8ywG
z-J_2?X{rmfh;pB_zzX77BE^OpbPqEG-*oTUQv~adyyz`leEMaxp4(~6QY$KlrEc^u
zBiMBA_;%&n_S2NHbH4_|OB%5?$EwuUe=#~a&IXwS583!?%S@!Rm+1#$GUm$nl;Xw_
zbZ>rKGxM`Ds7#<X!&iQ8@M$nd+<W&U?6d@9S^;G)oSyIVznVf79Zn_GK)&88p^IOS
z@^|;D+st(AnNW_2jFER#IG?bBM^<cf^6qBctg!Q+FP8$pX>061F8d5KM7&)aDoMsN
zgTTUG>8-Vr_ie|JL8L8nwG6m4<+dtAI_Ek&0D=S&Gj|(&pVK|;<Fw+`yI7~1ObPH%
z0fm+kIkj6G@ZT+08dFC2w$}!ooj|L(zUX$$f)EjiWi`^~r>C!`zNoU327*2@lDPve
zB;MT;U8^cM*hyck=j~N1s*|V8cGkJ08tNn5i06&#BX>y9UsQSF5$@Np;_~!5(;?R4
z=!ui<cXszoJR{^~(oR%bbjBT7yR0Wn3tHbY{3>|;G$9~CSkJ!m+zGfrfv-QlXI)ho
z5vgjcYD0P2jlOIMaV;<!`XxTac2f5H4HCBdB0*n!57L;;wW(c}RHKjuyW%p1mYnap
zzeSM4918t=iOKd0TS=L=XwuwVFG^4P>NCSMC)J1$vldKfz~J&pT4rFRK=ah_GGkd+
z*2f!%I$oSAosBo`?3}Y@jl^pvkJSny8};Finw3`i1Ggw`TCus;-SZ-!{Q9(YU21tt
z;V{fo`C@EN5#d?Q!oqt+#kf+(nWiBv{XyAK6t`(%ec#Aq%4vxkR+KD>bzcyteJzt!
zRG)jT(OgokGeUknKvBOhCQc2^QpBw6X6M{79phIz`6*~GWemLKs|5ZOY#SHAveWzE
zFuqT)tiQNNypp9_Gy&CJ@!j(*XklcD$hv8LX|36KIgvBqFTDM~5KaD*Jp)-SA-QtY
zg57V#H-ViZb;QN5s3`3rxELaSyN{2%qNJ>m!lZ3fR_c~0J~j4LmR4%cq|V*CvV*fZ
zr;^CyE(g9oWhrX+bZ8cKj>t-w7Q5Ja(~y;$I$rXD{94p|lqEI*KlCGMigk7%Btdxn
zn=tH7rZV2rA8LSq*szgc`fE%EwpiAznR7h_*pUYBh+24h;M7vbR3k=me)hS-XwnY*
z_&%FIE#%mvh|Tp2^*mP*_`d08=g!>ttnR5&&>ZFYInL{~&16lfu^a8iv1%sQJ-d3w
zV!oS)f~l48Hm&!1%V0X|=snvK31t?cV1S!0TTrke7kvMhw#(k4+wQB~merFZ_^8R>
zx}00jVlApO`-@%<)I5Cp<fITK1GcwH#f*y<w?fb%q9U!Sq26|>Hdz0MzWRaDICY`Q
z-Bf0(k#lSN#!)-p7ZCQ!K_GyF6lm9lEa+%A)<v+Dx*C3gMR-9K#=Pphm^K3+zCoKk
znt#~n6o-6>=5gl#2N~12fhyTGp5#fO|Ln~yIf3_$)jQ)6@n7EM+1j!$<pCd5I~>AJ
zm>Y^WzqrbkJG)p9FnV21Fu;bOLkaY{QyygBO606eX4qG>Xno3!0d+a0ol&@^NHVv`
z#E&eKN<9;wruB726}(0C>n+c?VG)h`aff8(0H;Ii5EjKjo}=c36!6b}ut2}pk(2lj
zeKohK{37$5xwZL2W|^T@d#(DZ%7{wTBaK%}4|~0Brtv({7o<cI(2mU9wa$I`{Y|qg
zZd+5OOb<GAk!>t8W7X&AN}H__)7|pKYtw?GsKU^;6-%Q!A`kl=W@xLhX%W2mPtURJ
zpLL-Er>YP0y;dZhWeIYW1Ep;ZFja8JP9kdC{#$fjSTOTH)UUei_TPAz|F^CY|I@F-
z{+;~4qI39C$Fx1mMr+?(W&4p&CRT>WFV=ADLo<TTuA|t!IiMh@@rjr3opGu79y9rV
z1+oZ@Pb*8(?pwB01Kt-#;|~kq#8Lt;)-<vE!n{k39i7=ZGW;5Xnc*xe?_pBp{0eMe
zC&!iCfVc!pE1->DeAuHDc~Xg<<Fl9-zH6bf?c1=Lh@hQ7r$gqfQU3dJ9BVa&18?hc
z*(?L$Q)hh9K$&9O)~o=lCyZL|ZNg+Y@*5#@Z<+?w59dGs9Joxs?72|BChXYo<7Uym
zOW5cK>{^ZJGvUcvjsUcVZ$2>s2V*0uceK-f$ESUt4Yu1HD-3stKb24Qe91kQ8y;P5
zPb16A3?W&!qQdyMu2`ZfcI{m9-)hWB`acomH(AykQsC!o2gwqnv3jg_V__VYo4&Ou
z*ZNYft$x0;=cVAd@c8Kmoh^W!r@$EUVTIj-yK$|yYJp~pVV<aMDAk?KWzK?zHWk>N
zC+m{M+d>+Mw7$g6*+Q%A>sxmmpAKCQS)Tf$2zTh{2e|6C?ME|-7ss{cMyz;5Y0Rk+
z=vJSG@UT$PsO^-$2{8~q3YehbPqtMJtTJ}ja^CG3pTe)(>}-^yWz+HNri7(<6?<1q
zJJ(j9#h53fd8VL=nNvLV5Aj$|`n<f}(&;TA$kj}7z!*ds_d6GC@{dGRnv&P@;=C>?
z&eUb)xm7JOwB07E#KV4DMGQ~X-EfQ+fAvkPx^FbQ0@gJOBb;U1UN6KwSU3gw{&v`C
zpwUq3H!?JjH0vX)67((-yV;M#Sj=mx(#=RRW0$`9#V;_Sxh09G6`<(c2ZZ7#g0T_4
zHZyHlUK<&WiNI+-iLkl!kJr8pD8j1_EYzLO^AH^G>kaWL00nXS#otwi^y=^&&p^se
z@Q<5n2u0n8uug;Wg}W1cU0MDIktPNbs>}xGef%Y|{_nuUdgU8ILH10jb7WQ3&(soF
zS|<NEMHaH(*+xUi%P8Kg>B4^7eIvP4YX0nlUe_zFFP@#AyuQql1$J&>g2Yf9FAEV1
z+jSpimoCZqq4I4-Z}mxBPk6S&dEheT0WngGAm4j!;z*mr+Nt`3>QJ)Kki2s^n)&Z0
zMR3e-G{R1LOhUjBIl(t19J6PA^I|8b>D<@QfLdY9SjTv*o1iLc=4`|k6FVcbJCj?3
zfzfT%KtX@~moC{`Zzxsn)_WE;d9VlMlvAqu$HI?$bTEi(#FIlKi?)ZvvaW8Wn^gW4
zo-c30!ax5(DXbU75CCOHp4)`P4}jl1)}uzF*rn>q8;`M}QGSLs_Ul~EF8lkIeOeb^
zKeW%v#ykJ)+sh*WRW9ZZVOe7&;*{6@!?4eJEkY-4YGz<AP^%QGL|_Sb$G7)crBylz
ztfe{zJo^%!?x%cd4rl>1Wgb2OSa%$|_!|6bPj3olF6g%G*H{*gzX})qP(TDJkl<@7
zL(f3edO=jj#ZwtHW~{ZP-v6WmKD<l)VMsb|_Xw_~$xC=x!+SKuJJPCq-EK?%;YJv^
zC)@0YIz0_%T}o@apkJ;a8mU|gfxD=Plnj>4oIM{%J~Aqk2Y7$$Kaa~^tygN)=PC||
zGAmd;<o&XyfB?&@t=EtrG&Q53ia0&ZUVCBes6J!oZyyBXFrUKuPu13PehO2lxgJrc
z7;2R3LlJ0iPM*@~nNF@{sGWZK?O^o0aNUdTv`mejARdibqJi|H&2#cYb@Y=T1Qf`v
zG3ZL75|JXEwK-CAM))1MK<j!cr!##eW%H5A4wF=KfgdDs&RCbRLHvZ(+E~d7DbIM@
zjvF6Z0yOriiH}`7D*SacGhcB$j_Vt7XkXt5K<i=Ysi77LXO&P+>>w?_ZbZiGhOfmN
z`M9@G^}A<xoDs0WUdlb_lj?Nr{%63$PRlxRha@3d@ux%n<AdHI?}JDCIu)CFHLJUW
z?rqW&$0DH)CPCujQ+FwrO)2YH&U;~dYbt>Vxi*%%lq^!6+S0Xb$C%0&G62MDKg<NR
z;}2r0Fz(F#2UVBIJa4^iCzyHiz;o}rC(ongPiK!Z&X|pr6>f?A{1s_Cb@aKBs9vst
z5xMcLd~W{RN{|q5n8#NiSb*sxPz$;aI*A=Ln4xg1NiQ#`8|9vr#6of`?tWZb3^F}A
z27IHncIH;)a>}+czZ~9?yvdav3iGx0X?K`7Sa8vi{Q6^{pk#JwSc;d2K0a9WOYMY;
zGhM;8BV&;Y$se<^4FQKM-lv~KMPQh(f#&CTth7Gw^`>IKF=U=l%r1uT8C8suhwsDQ
zQc31D!{|Y3lEhGqm>OW?K~xV>og*gkEbiDpC8e*-+*V&L34qx+)vJIcI?F-S7PiEb
zgM%fLFU><$BDL;^ReJdftD}PrCD5s{;)}>umUnL?tAmPDO)DoUx?3t*#pE#jUW#BD
zG{`ZuO7LETY2cd!54P*KA1S5S*<v_h%nQU+!A#Qdq*IHg<*Z7DZ_B#_D3bg;kh#GT
zPNv7xj6oVOdnKXXl~#;=3422BKEM7+M4oxCcsK!T@#{VnamnKIzn4rR?X6vo5}9;4
z_MWFmpV7C!Q}3PMyAZCLSl?Ow(chy`Aww`J5S~h`L@x%fu73_wF@W^aN3q;=v3wr+
zZmG%{#-r6(hR)@}dw@9o_OHORtEcrG)}_+lh1U<0!#odj+CCurOi&;vkx+0^)0C|2
zH>ot!=uSfJ$3NJg#CGFqz=Sz}-2U<(&nd8qrV3^yj6efFTY9em02*&C|F~H{pHnb9
zrPd|W^D38v>4R~m+rXarv-5^-L`(xm9VH6`HVajo(`m|_z8ArM>)9&*^iw*ypYR53
zKskIKdLPd`RpU3lXy?Z1$?M@Z?r2{syCE-48JBxBH|^4Fmmw-wT5UQ*x6uABaVaG8
z08kl_Xq`}z#Ow-nXYmuv(!&JWKFfAXRzKyR?b^Q#5L^cJCHG&Vvd2FeHM}m-xfxL^
zs;BMKB2#q6KZi72-e=$37R<u;+0^1!KiqL_$Vy!F1w8e%-=C?q$9p%oN7hw>ez);W
zsR?bJEb>kG5utNJ;U8q1<9nY;e#5aX%+<Zi+}-cY<4gzCS=?J%Lajx>v262C@9FOR
zzJY`EZ@5QH`R&hS_=S{=$?BQzcgiOxmsfb4DJ+l@yk~0*G%MT$_fOd!e6wkx0@|p$
z%wWZ^9GVv8h~~PO)hC9+pF4JQXG&+wTsvnx?zw9^y^qthI5r%Iqo)V<vOpO>XQuRa
zeK!(WZHK9P0qT2zBzIMoaq2PF!~83x4{P4@gh1b&$rFo}tF1*LIM@m#pP4#PHU>y$
zOR-3QOzddf68-VCC)f0*8AT5j^{rWc1fZs=RB?+8$Yzni_E__nI%~e(*{$8R_>8A}
z_EK&35*=Y@4=cw=`^*FxmRkllO>JMC2UKt63gl`KK~#xQllED)yP2e&QEwjROvW8%
zxv*WjNmH)7WRc+{@}D$a2Y<gd1%h0>L<gq<?agm)X6Ijhet|<<sIo@(`-(*}uX^ad
zlZ&IT3_i1cDDLUGzLxE77ZEg8uCYikKjsFDrlB7#b_R@kY>VnDl?$oc0m{Eo6sd8w
zTbmS-s)?0Ivn(SQJB;a-T8EL&yf1xZKBQF31<3R-RO?6AvKQ}jJS2FMOq`vBjjJql
z)AW;;Qr0}UTQ}Dr_AV)ICvwXk6a{CiuRxmHJ6J~^$@?A1VV8lo?_pI_i`vR`TlkU5
zripe0`f~?_MA3IMo;Qx*{9QmShE&ITF}Q}Y{q?$!A`7P*&Qi0RNw;-sK3t{ZRXkHO
zIL<!C6`AnJ;OFzML5(rQlEBtB<m0l}4o!ib^rK74q1Q#ObTsD_C!CAdg;`iz_Jh6U
zdIG(<tZg$G=q$YLz$(=G1;=VQ8EhTv$C8`kCdshM(KmoHOr)R4Qey5syjej>hhTb%
zMP(22#W<JVFB&cYUFlk0JPDO1%wkQ!ynO+;h1A|Oq=kh^e_TmiwR8Ug*&DSaE+HU!
zUF`1et!fG%Z66aF_Qq$pJiOaK+u`a=&`>6ltP88*tb1^M4cAahXITrmr2Ww;LYd)d
zS^Vmm&3Q$+!oc39(J$Bfi)~x^?@%98yb(kbQdpaIej%hZyg856E|B!f2;kz)$O&g4
znMZ3&bT1e(nc>quW#)#zGqGA=ooQDTBefEa{Joa9>WT=A=;b&ilWM4HsE#2rlk*eb
ztIg_xMA3-b@E!8ZdRz$F9IxK}2G<$v{9&(4LomAr`K8A3cbe1PGYea!!Z~`<(Qmde
z1w@Byt}RJS$xl9--e{xCqb1^c<f_`w{li@+BZo3vu;N-?CBf@;qcH%b@#w<Kx_S(u
z*7JQs-q(7s{`rfJtNMTP!OP0u#+2Y8=Rjj^|Arpmyv;KW8SJc4cX;hi6Xi$zF?T0f
z=~vJ<?XVL|W&f8U1k^Ub*}HP2%&p0L$4!1yK9*sn*+k2?wF%t9f0w4A1Qg-pbjNX5
z;=!WOIKKFy$!}pctAQMg`s09R=d|ryv57h_DoBVOhYb2W=Xmy_z%o5Hq?_gse>DHA
zjp1rdcGkV@6U1BM5-yLLDBYtSNSCe>CR$$~`DY>(<q>euf}!#3R5K2^J|b=B561mH
zkpt0F7<<+?X77}%7~5VFaEX*?)Lspb4B!u6ghTbc=pkJ=|7_#VhAG<OVlx+t86>XN
z@VAQR$+peQ-->22hNlKW&V+*Z2(}5EU4*T?%f^u)0T!diMQrG4zvHo*29`pPj<2Nt
zp!@PCS#9M&DcfUYPw8zYMvVpNka8S{kSfhPb-<VlDGPP2kdQR#pZ=Z6xvyyKFB07U
zLe+7J)DU;fVgp7@|8VCtGc~rW<ahZgx%S|sz<HHzu9wz<e4o%4Nmj?WKpC(?x1SWw
zA_oQ9hb5(yor4{Ut(RJjixis1b@Tw}e8LNbY!*I<hweJ5yKZXstY!i#wwxC=n^s4g
z-ko>H(*0Z}W^ShdTr}_C5FgEU?U5pIfq46fTrpxaRre`=Ez;{2F<8%{D|97}_UBG)
z`%pirRqg}5$`L%hLur3!VHtK?9jnS}IuVAt<k+3045)stD?B>q3X{bJ3w3v3lo7Yx
zf@!=Lw&c@|Y%N4Tdf#pNMqoYf14;Iw7MrSMganj~X9_ln<?>xGOF#D*C+n$t?3WB}
zwTTl8uymEU3ttT>gU~`3`Gk(!&+->}v7S`lg4Vf0-IG#!!npNh+;0X~I=wxJ-Sv(<
z>YY8}mIlmi{5jvE#rKP0%#iQG?sCJNH_|L`o|%Fo-i4kY|4hf&rSe8u5oK#OH2KO4
zzuj!GjJh(yKCq7?r5>?^sq~Yhi3oPIY4vzT4t7*L7ZyDW!0>z2cw=?`KH}a>9aM<B
z=pFJBBB@-3%dKP0s(Gq3a=tRUKIyDjAEJ4)vjjcTCD`o~%DbH;s23r6>7gS9F0r>n
zxUmYWy1h|qXJ=ZT(r4tz@AKL+&bo~e`N<2W>^84FdCDFu@=moRrm6u;?-Qb{v{<WB
zJ23X9z`?UD&i!Bq-YMis7uFyuY>xG0A-)y<&6-{+lJjM@co^)EOl+vi^R7D#bnS>0
zD}a@m?@XT*y6D%HKf#!&8QVKB;sO@(6wg4hdjQ;KnLBQYNw#MqL#zU9|03l5Gm?E!
z1AWdCjFeMjdpz~Sp<-svZZqZPawzfj5>3ckEK-Vo9#B8x@opihe$vz*&V~n^Y;U>O
z;d78*Gy>gzIZawz{gjxh<2=--%613{<)g!6j_9wGod|j10(F1EGUeJx`IDmLlk-<=
z7Ozs#!>{XzHws`k|Gk7>zSL1}#+r7DmOtmJ%BkXGr3*7pzy+9lDv{f2FQ1yO_vA%p
z!Xm_w{(+U6nb&qcbA}+qjefnLrY-u%i>sH|SF(DDh=95Ba@RL_wln%E>rr=g!DhX1
zhnCojIgiodyJuN$?;`ij6U9HOjMwM*2Y8Yd%B+^OlMH5-vzLRSnk3UZ97aLX#-6n(
z+!FH)Ss=l*I@FU%c%fmRMdH59keqk+*;`lzMbu&9$~6B)p~^cI(>1x+H*Jh0JG!Fi
zz<Bwvt0eir$o0Nd6iCSTNN>Lf5t*iTr<O1=+bN#-v$p;u@VerQeo677TXz`!&DKF(
z`+XhfqJ*qn_uuH3qWzdsPJ`4xXW|@Ec&eG+`A?+Qh7ezczsKw=U^&X!9$EF~l6w&#
z-=p=x0VuXJs+>8qd+F|-tX!E!J|t;FR*y+8YWFt+)OheXD(Qu;wVG#h+Pc?+!pPy~
zdt6Rg?xg3CU8EjE<KK!(vd~Fo-%CE*?N|2ytlaZBXjjv9MkSQ=JC65t+p}6j`4aq5
ztCN_+wB7U(6G^YomPd5->2c}Hl4TsS6VmhUJan1NxvID9t6mJBIx|QYA7q2?OMr&{
zQY~hd^t4Bw8$^hb-M!1dkITL!Sn7`rm5Xj!fT;$>CF`PP4@Uw1p(`&(yqg5k@?14B
z5(=s#Z~sAJw@7UHm+WlzJiV*X@h~U5q0TO&Hur^F^qGTtz$oqJ)#N)5j!=h%&6jVC
z5_o(5lKDTIR)L?=*HPEo%bE|w&le9l^GZ;`*uK+`$Lf%DNY)|SLX2~^-6@^8g2Jf#
znmF{`<MMllmP*&Z&GJN)Y{Wlmlw+x~%6Pgfv65eWpt!PoT=`h?G4=l{C(kA_4(k3L
z!Z)D2>vJr|gM*soKTDd@o}ruU4pl3zBzARs6SX>n`(m8J;l|qaAs-oYvQBU-;+KW#
zLT(-Ke$EB>H4%uP9fT|0r(&Un?r?--p>3iXt<o!!yynPNhdt2zvwqp_Rd%hZx9dWC
zeIYz{t{G2b66N-vc?)5^cGakO{z1|I$8O+2BlPC-DCb753<^1{wCUJZZ4z_NtYyH5
zb7FtA%=DRd6tIQ@F^17tkmbjOCJG4}^*@4`)MEt_2O8f7k~)}&vK@Y?A9GXK2+m!b
zNJ-Za0$_gulxgJvhl2X8VAJL(+@vLML9=Aym%h(hWcTUH^jBLQND)_f{63LKgJzWJ
zg;{qYYNni0nS+i~anFZ{cj%Y+RoiXdB1}K)=g*3b&=qFlC0Pfbqeo!)Um!P{w-9RG
zb1x7%$u1sW(@{x~woB~e5ouS7NQ`p+Y%6cjY+u_~tn%yfK}~qqtI%#6TwUlSL4J9j
zmtF=1^T)b_jR<c|-Axk*nr0Vxolam~pm=cPK-IUmX-Z-ZGqatQ+1RrFzRON&rv~d2
zXU-jqa`^oOQI5kWNb3R@Mv)@JyEot6_O#EYAvq9=A#;67ppT*j91#Oz7w3aKIn))A
zqdCSaQ9-YclhP3gZjo?c6Duad9DE6}oy{q(nXI3g#U+lc-yZNytfih%1sbFT2)vZ<
zB}=?W!5Dnt!~$MZfV{bV{SQ|xXOsX+)YE+TVPW0iQFQj(<%r%MgJvajInGGdS|7aw
zF|QdvxzgMoV>4oI8c-qnJaOnqOd%QY<X%Am*3m$34R?HG{t4=Z+2@$n4#AKnkt`#x
zvpjqrXq(DQQ3xR6^GK|D$Dn;=rq}FJkJ)SyRyXQIgg4da=ULaz;&_0HGXW8);=HUK
z#<_{MXGIFZPH36BI5|$AL~9^}KaKz4Kjg*<TnRh7E~mC6Ue27hOkjW+rx@9C{(Fh<
z9Xnh&=UH{NzJycCg|#w_lX$9+H_g1C(#3-a<=QTOyeV{UioH9-6a<A;_^*qcHlxGy
zq5uUSij)d%F>DF=3H`F0c{js&2XX&ix;+bN=s6Fc_)burXLL<#cz6<CNF7ZbwprMB
z`ZYdFx*^-!-i@qF1i9k(^{rD0V(^lX^$NiO1#;=6E&J*2AvbX@4?J1xQz6dt&>?@W
zLCZb(oB43H=?bNA65;H3d{md1L4JsX(Gcehk^vPG`EA%8x~hS}J5emY9Bo5N&IP9Q
z+z^sJ-YM(E_uWV9iGm!z7H3P)xEJ43mPZbk;BOrbmPrfcqe$=Nj4-xo8?q}tb>kQQ
z^z+p>hmSu6F}N|#D>NMD{M}t3O{x?S*oMJS4x%q80jcMJMX<RE0hRl}v~(*Q`75Kg
zY>V3MgW);<URurFAU^$eGeIORl5VjeCFPyfQvZ(s)F^Ie;!W#mQA^Dr2;&%rdgchd
zQY?Q_4<e`7YY~lm!&nKuIfCUF+b3ST`CsQ+MD??rZorx7-XA-z$DFHU13Ni+BU!u$
z+63z+#qBWnlKV}~95pq4_Ib{DJ(+`#7VN2s=uUIkO+TH)xJA}hl2D|~rRYG++^bg!
zCs+(JMI|Bf)$6rldSI=KP6XgQJg-ohi9>XX(@JMHL|GhTN(5+ZD<~}RHmmxOW9CSV
zttW_y=>CF0;~knuGMl1q7j6H>G^!C=M7r3T+tVt71|8-9e<Xr%`QIr#{bxYUNTi%d
z^=wjBL^Ew`ZN4^6ASqDpbho)B1z+Al1=<k%(?^Et0A3f^lw~5I3kswr=gUjyT&Wul
zMdH@wlKnHeK4G^ZSDUg(5~r2qFyB4$>H1M2?+x-TeZeYMrsn?`WvCu+LhiiGsin>Z
z14Wxi4DdzfMZ0|q7l(l2$B8QlV?^YoK<)p%^pC)QoFvDq9{kWej{;V$*0N0en^?Vr
z$>3`lXh5rQ_%2ar+3V~81~6+S{=LL%mm02diyz!NsswEPI?JyCP9E@dI3v)lG&QH(
z+3$)VHS5zOz8!BKnRyDIM~uqFVtB);7Eo27?TU7?-Gg)t>-z+G*OvC(au~sXQ|6Uv
zL+I6@YN9&+qEH&<NIClV5_?80C8U(T6Lh(8PCTd8z;OMAG;v>cQ{hhSd@$X52K}e7
ze{S$`1pZNy$O8U3vo`P(eKFOfS<O%wWO8%D@Il0=H17>H?n3Y#rPuM+RY{GdOc>C6
zhj<4)dA2R+CV)}y+a7;VHvYiCcm&8TOd(9b%>bN6fTn2AIIOb_FL7~Y^nwCRss!`=
zvFC<bIsbW5C{zW&-)zE&03p?ccsWQ<28aY~ZT`I^kI*Rm{T&__br_D1{mrN}DwwTX
zo-LmVY!}Wy+8Bt}y^fo`q0XE|PJI-RU3$3YwaWo@Dvf|+Y)CesWDmf%!W)R0yg>fh
z1&jvj3L%cw6QDy2Kb3ybbrPTZDvv6ROJaVU*#Le508sVQF;rcraRsg+HQUnJVVv9J
za%1(eH|y(Ex}n^}fEKNj7lb?<%%D=g{U-8O!D(=iJqi3@W0#_DC0h9kTr&j2=tJd`
zK8_YtATHLDMvqH(+n6A%1})Ze)Yt1W)V8}+{x+V=cow(br7@Zkj|oZTs8nTN-^I^$
zB@FF*m&xrc!`v3)oVR72V4c}`rWdGTu(#iST*lts{Y?t#)-j*7j`=M^YyMwtudNJM
zzh)h)v{RVr-_s9@f3sCCO$F$lWq`A8J8g437d^=ZF!MndFB@8MF|=$2HADIFSA!0Y
z#xssG4au2Bpj$}Ve=n)gfOe7XWZPiwJ3&l=zQcez>19^N{$i0w`)iHBF~14J7(%Gh
zY?U2&k<W%lO9<u#%ZA}Edg{m4X@Maz;M5SzSrhT6mCn1!%mSuM*6*c5?9wU4o+92V
z^iRy2RL#jm`Tv^HUS|X^V6FpyumX$lR?2^SBTtM`>hD7b{71}8d_IT6Rj8-EY&};9
z?05tCq}KAiPS>6GlSMCzaI0X<HzVtW^&!}0@-<AT*GU&4{bQYoQ_Az2zujY<f~oHS
z9-+;OoWY`JTirRoFG-fn-u7BxDRRpB3TLjXWg@PvT}ACaRE1z32{jEO7-RIZGe@Ik
zKhkEO_&zW9;%-m=2!+WQQ7znYR&yrEzc@TX!`zKg9W3^zXRtHj=B5ch>ef-i3j|;$
zbLBUTDU8OI=MG9U16;W!RWx4EbjU1N8}~5{h+`v+E^;W`5CiKAc-TG2n}fgo#WNd&
zGA_S<fqkZI_7~c7hEcNN7=y^X+iiCt$z9#;>@tVn^)NcIK}X%S$$~oROKZ;shf=cX
z#l^FzhG4W_QSG#3b4(($9n^qm=pfjD<#tV*-5ST5un^|HrJP1}K3}0>zx}bDnEAsL
z{fusXQ}H6Njpa7g$y+20H31lp*oFmDrt@f#{1}PY_8T%{|IF%ys5)&y;9rMD_U)Ax
zU~z=5h8G9bm0?p_l($(DBuXAR-B#jb8!u!VOBLk@)O(<Bs=<ugoq!c(QPI~ZhsMF^
z`-hs_$%>|I*QkcvR*g=i^+z_AF0ueIKWm$d(l&mgfpNW*tCiC?#8naL{DPpgRyhz!
z3+{fTW<P_*FwGaOpGXG{{0O|rw<W{sTF%YaS-T}7!$k0i7>PC^vIuI<3SD<%A+hW1
zZw;yJ>`PZ~lV55R7#+QLmOyWVUz!8eW%=QmfvBQ>8we--Fv_eC>x1)lgYbPFVeCW{
zKJeMNC{2J>?Re~0SK9`x#pBhigpv}(coyjqSr#8qN74oCs1{4!j!(OuNFpD=HyfnX
zdmXmX?M1%1H;I8b7!M@UfPm<kyZ%=eL~Wxbn8BS=p#I2aP$=tg-p}72r+=YrLqNY*
zaa`WN<HpOV#yr#30*AztE1y!AGJuyqy5($sjz3^G!SC;9`?4a>c4QVeE~t5Hv^rjS
z0}4?qq3x?R=Rl(Sf+%rPLNr|Vq9TV8wSN$O^{tg@EdgEJ$>_yS4`(5@lDeQ*Xqem1
zI^}i<FX@79f8S4}4ln;6>5GHi-dt2BHk9O0nc{~C^;z86QFz@*af-{5_n#D(eqiMO
z3Gndr38@J=u_jtBOR!M>!dPXzZf|}#KxtVlPQDH3)*2BR^gr6(wExkL9|hLuTyZjv
z_vr9H%hf(JSCI(Ad0m5iG$QnMT3<)Yf|%!@`zyc;O+H)&DFxZfumKjhf$cAF>9!Z}
zGk|&l@MizL1OTc8CW^o`t0Fw<Bt57s-aZmo82b^k*Hd5hzb>`-b6Bps-x`Nz?@pE{
zss7ov=U#*aKDUp}RjGc&M4Pjd&wSQ9uk7%h`8YDXjT?gMSrkN3_{o;PLYZvvJ1sIq
zu@z%48D)z-C^AlJFSz-g<i1TwkJpDq;W4B}5Y9egifJ3Yc&{-RtSJ)BXR$mV_#^S#
z;g{iF8<Ss&JoYp$m7`z(y>tpRY<qtJzOk*0INbWj+UUv#YrBd?pFOWUAH6Mo5q~5-
zNe>vQJ2w23Ip7%Sm)*&uYNK&Ka1Y44t#;qiAm2Sxbd<ZYLV|OypZe+blQrGA7U$Ei
z@6QS-48!~smWD(R7Dln1<C|CAsG((o&?BnZ=24=?(L4Q#Bp=^{7KsCdCGiK|x+hbu
z-5;A6al*Kr-gdt^H&k0FlR1X>Tk{Ql;(?kIRr;#?0I<E*Ht-Uj%>m~n5q1VR!6Ie9
zyJjMK+v$jEq~R2;_76eg_ZXY^l3u5_odo)sZkzbIyHvE@gPiKr&x`q8Xe>wQc#3dI
z>y~|Aes>vBs76QTn3}VxCB_nNEga>*v@&pYb<voRfCh**4O#opGb3?{E8(I_O%TdX
zaQcXtcL$oTM`zF{zF6z5@^T{FDcWqI;VkOj8BReUs}$C<_+9}*0yMjp&J+>1VCbSg
zN=#F+#7B^;VKS7LigHyQxPztuko+ozb~_qjMb;rkUu`yz@+)=vusFpUU%A?l%$Mun
z!AM?eOZkA?TYInOI|f=QfNBBQ^C3VT!%#L*;SbRBvhT3xfOvJwtKB8)mGr|wQG4Rz
zb<9m^0?+M-4w(kdumbeoaO|Gul|hYotzGF_UZOg<egDXwobs4ejh#EM_B0Z-Jpj94
zQuX2CQXrfrj@oRYU>lp|n_eGaRL9%)x2=I>Bl2pqL6qNV+AODnW5lw1VC*0bMn0!+
z*b7Tx_zhRbYIV@FL+q_n%!%5s1(E0E23D)|+4~V!nKI<dH08Sk;)gp#)$9NjSy4?l
zMCW%HrnuG<w#Msy{zTRpkS<^#>A?Obc>!Sx1CXlgg^YH<J~mI~Rdf;L`~K<_5i^JM
zJjD2uSsL73Z)<Uqvqo@D&Fy&Lo|NS$AkPUJ|0jm&^4k9caOodsRsv@idQk)~*oqmJ
zDO+$eLtJ&7bGr_85Javo2S(rh`vH1i<Q{?QBRUlIX~AQ7jh*TB)oRlA>Et6{yJI^q
zf&``~GO?B<n1;p9hVqypWB)wJ_4pb2M$r!>VFyH8_U;dcS|g>rk#=zhHM&LUm~`2~
zI;}clO%FgYj6Y68leLu$AcVqaW%nT_BWlly-0pwEB#9+@e^n%X@oxx@lm%jv#~YNu
zGr<`fCAg4Ro1)5&R!`7x;x6e83lL`Ano}QHUTBX59g%GFx)LwXLR4kNEZ5S&2Hi$Q
zyR$=o`n{By_zUeUM*i+hlNOYY;Y5c=L`Z}7Lfd(0U!E4VJ(Cg0Dn=XZ9Fo2Ndx@n7
zQ1A})sDXJw1RQjlm~VHi1ARdLZs5pU2+TibK1z&LF|B|MT4r?z?{+TOk3_|7CH3CA
zH*mZ3_oyt^o>7gb1IOmKYh!TVe33JCAN(e&?Ec}y#nK1ROGT+#8eF-ly?F`k^_=>i
zZ;9Ud(w=l-??Cj#3)y;p$u8`fbBw3NuSw|#tHd~&A}(Qlv86ghi!vhq{5U=`0^W96
zKbe;aay~1BTAS6#ukb17Rizx{0rXt+O`G-KORScg<2`uF(11VCHVL{tpBm3|Sp}T)
zx1Au4Hy9~@@9vK2>jF#vmNPFFiH$9ffAcy-VwRn^KU0Hq>>r6+^tz}pKC)^(;XTSf
z#4K4=r^{INBHNp7(z)>|yn1+zhIuhY;fB;i)x4H~VXw}-+tk7F@hzk(yRlJXZ_fTY
z+CY5)YKpaW@3ra%MmNfn#eFlCImeXYd3=C4v%(+l?QV)9@k1wwW<G3GI?{j%f}K^4
zW&g)%KmnKCpOO7#dx-Xwf$#~=(54(Vb1wnt#c@ah1nRzjFA1W3@hHsHf1DfiTI+u`
zHzBhO^LCBu2Je4X<Yx5|?^f~d^|qMk#o+Otu`RIhibsuQD0?e29aFH^mIIWA(34Hi
z`k}Tq)qm+9l}C#@d|E4^#S>o_sB>Si^KbJZ+)kGmAt_b_&pP=iq?XdW{k*V9bN=1e
z93D2p?;eSCweds#S?W$Kg5(eBTvTEdIZk>P`C@5KwX4S!NAHWsyr3V-3u-!A(dv_!
zW2IOEuufLWEE8b3m5MTc)P-YA6KHI41$#Qu(DBm?RuS}-TQ<Emb6|ZJ0h35j5J|E0
zAr`^j<rV12f5~Ht4gM@~eZb&bWvnGAy!}(iq*u6_>aSR@&$S38)sWv}SLJ=Ael(CY
zn&z5CSDN>toBZ@A%kh1fv}pYPvlf)hT+?3K`R1OEt(3G#v+yUq>WiiHyO{_A>+eU9
zq}owt*G^+N<k?_oiB<PYjle*b8AkSCG8|t@8oO9q4$KDKUeu=ziMLvOK3@NLLH7Q|
z(LPMReKEv73aL{8X|QM{P(?Xe?(fC0-#2}>u!=}iGr{Gb1EF)+<jy`+Hi#tqBn8{f
z{N&nhMIn84;UgRNrO_`be2qGm3ez*3m*B<}*1p|%z@}(h13>BLUCh{ycG-W<l<!jI
z3*~*D>Hc%i({8zSOzWF+{$0I|(umHt1e?ifzXz!F$<=_PiSaaQ20J&4oIAFYbuEWV
zu<IM>FfM$+N6g@fSrf`b>{Yr0iylGq=NycA*e}a<!h9%CQ|o`VMEn2peN=!1p~1)h
z*i|5v0rfUs00xuX`oIq%`+w-SwI6o?j+Tld<B>0X0{&jhj}caU51>}R|HnT2f9!z>
z^uP9%abaQL%M(w;ebkFNW>e{=g{si9o_9;Y6kN%Kv`{)YA}J}Yto1)#ZD(?yU@shc
z?OA25N3W3OthaS+r5!h>YMXLj`!gguJX48pe-QLY&G$oIdTulnR=gnvl?b&qY)>~!
z^)$D0&(NI;vla&v1|1}`$=ivK@FAOFqdbaJND++kL$b8DK<oU;c$XlbIZd9c*n1m>
z5pPst@XjCAU=l+r$ckK}g00ZtfK!K>pGlLty1XtOWQYBe>bA8xQxY(@&sv|8AkhKr
z9dT-`ZXjns_%jGQ$nCksR@Bnc<e#XUAm5!L2V{$<9={@0zF$oDhWLj)n1s3#B8}Sc
zUR_BrN9Q7`1$bTI&_V2<51)Wk_Z=UnI>>hSRLLLi-isz!5kcmz45x$6!7(kNd>+~B
z_4_YiJ7>7vkj}O{wdq~*j8?Wbvq)ow=(n`D8$BK@-q;K3W1ft}su)b9T4gPwFAT28
z;+=(Tj73?lmHXHyHMlQMwILkDJSlglHyFuMDOMAn#S;Ro+E@nfN14;YAH+uJ9(UU>
z0g$6e!W7;<M#U80OrfS{++uALMje;pv=I{G_brb8+$J9|VxO8l#<ZQ&Jb>q{B!e1#
z_Y{qfRJXqpdgfn3bWDSi`Z64S=MwI~;)5~*S#UzppX}PF*5|!T#<uVMUNzl@N}0PZ
zdGQwz>`HJ3aY{u%njFRrFK}=yc+|qtn<VllJ;`Hso0KPU%d+Lq+1!~owLjq>)Z=ta
zirZ}b;Nm=W2bQ@pYvetG=ZRg5wp|hB&}{#=K@`V+go=>MB71X)ws@sujM+izM7Q9V
z-D^?D7s2Mb1(&?7*2vb;KP-Dd+f6;cc`iFz>|7O|j7c6_kPj>_J!)|HhL?{~(Ze^N
zi-~lfM=V9}$d)>=azq>t#bmw}*7aP6WxkLE&(M8L$R^Za<F)$Q*^b?TtXAGuUB7zl
zzVyGBJY1z!N`qK_=N)uw-jb$!5=1q440piN?wGaFPVqsO{HA;_$sKnco;lU3T_&D(
ztFhw!Ywehu+?8X?wX`ks&5U_7*Dp0x1}k{p@4hgYH3<d7CeCzW9~GZs&BHrn2m8Y`
z7Z4#<+qQ9ckc8Ft$iyy#U0cnykZ27efpK2nDeepX4B@m&?l5v|K_nk9AC1(;cb)+H
zFX@3{_kmGN+2u&x?J9GPW*0fkP#I045P06cX$TB*k8_?jXC_=f7xB8X?PL;)X7RaZ
z)RwH3lIMX=P4jjVEaqc?p)*d%{zqYd9<j>?k7|q5o}6)O#dxaSBfptI94-ALSWvLJ
z$dR-{L7@a)jm}x`8B)|4BkozIuX}kO_txzvnggt-h}S%bpIWlW4~G;+ew9U!@b@VL
z?Dsx=`0YHj)v5@uS#C%?Zl@*6iXv701xij*zrGymlzscI_^G)#CuyNdwOmi$oAJQ(
zu?b*HQfcSaLyR%CVTimO%JU0qcPllRu$B-nv#>B#dZbD99{Cz;5XteChl>DSSZpnJ
z+vWPTb$TjZz4<4vMYva;@9P<B^2X&?bP(A!UbZl4NNg|190b-8c&f%*KL#%`nUEp%
zx%gitMQu3T2zXD$IS*Z&KjCGO;QNT7)NmH;H`Z}#E}eV4Kiy57YP0#<PwB0i2dx6l
zZ7Wh3d*4*|>xps^>9g`aaoWKHo29KY-&3pB7PY<~He_4E1m$KVX4cM)!A%YoTY#vX
z=nXV(KeeE`3td>*q7A0+@QSzUi#S$*a^u`Lk3(#&jFo}8kBh2skPPiz<jTwNPU5@R
zB0QiFDkNCBAZ}#Xul92e^xwQ_o_#_HjyDSGT+yEodAhgWRo^Vo{U?1&-t*0b!<Stx
zb+*Kt5ev!tgXa7aJqX?fqUIcC-h4Kqt+Zswlhe++RJW$Us~e>IqWu6x4BE5{!5rpr
z^d+7JCZ3t~Tnb6=fW>p9N60=<Va3JvA6rPQ2jy8#z!zTC+CMmR!9Ec(f2!aIQuS?T
zQIjI3^l@~#w$UM*@eA-s-*?eLj()pz`N;~;a^!9dz**l7HlDR^caec=G2g;E`3hi$
z%`6xR$h}z8pJVd|-mCJQV$q5Iyi}HCRR96`vTjmlJKS3k=~;B>iBmqL(+s|8T=DH<
zAy}(JBA%7P)gIZwquP@4GS;v$ceQSC`&X%FK5z0v`SoN19fItS`IwM8MEv9YB-^2Q
zX-eZey)Utn0P9{<nVKE#<cL`M4E9rmV@P_bbG5-Sdz~+!)x3iTM`uK@pYULy{yLf<
z>qP~?Tj<3Qb<~^}JerxdVDX|u#O=KyuQ+c~53qB_pDG~K#_0S)c!BFbzftM`ogPBu
zCzNeJnYfD=N{|p}jak!%bK0~cA5;mY9%w{Mhqpc^U05}a#@MrxEpZobJ239s?bKEq
zhc;d7RyHj~2We*l0#_~V)Az_rA?>i+gwh#Id0t>5aH}fg?|Bzl!q9BM$<6SXd##87
z>kA(JRJ(MkEA;2)`R7EDLGgNVM<%-;OP_o@ctaEy0StCR-4^T$MP`1Jb&7J0Fgc%|
zWTS$TYx-%MYVmm~nZNz+#bOIl6mon<M)1oH5&yz^6jdBrfWY?0ORAmwQW`SewjFmf
z7cnf)7dU;S)B=<MP%n<lAMWsb0ED@U-@o`+0bEXwd$FCR`PBP|ZdM67g_b&{Zs_RO
zu9w8_qqMmU%YYWz=<iZdFR;JzgF0?Clg7Gi&jgEaQojP;dUudT{vf%*p(HK)&^9y(
zkEkW36uT>#4g|@wN`DrQOT3gc37P~TJg-W*iK}F8tb02RREt=>T>ADk#y)ai*mbJx
z=fM*&SQPh0nRfpGu74`K`f~WE0fVTFyj4wa=X$Lhw&bIApIKtaWZeQ&*GcE0?L=km
z+?x)X2C2daTqpBH-bx48HV~e!CX^?qfS95`At6ZmGPlrkKR%(wkXMNJ1^&Xpcnqn7
zxlG8ycIuQvg(ixv!JrqBZ<adBG%MPCKSA2me|bW&YL1=W2g?xs?UNuv&jG~!1cs*+
ze1|^Hh}{fM1zIoa^>5EsT)lnOeE(@)?)>+Xv>#k)UW09L;iI>8t7uC$GqLz~R-N2(
zL$IZF$Wp_P<CCS%^7&Eb3ZGHsig&+%Y4cZimT5|9Z`--!Nxf)}qLZd&J(t$LC@33Y
zW~)KN5WI#QER1J(dVOK6!Q`<r8jQ7-v-Rx?E{?r&wQ)ks^KMkb{F0~yTmNpCdAq*N
zm>#d*tr%~kgdyTKF0r?z)h7r_y{wY~#zbS9DDzb<Qle4(0+@?GE9nkoSl529eMe&4
zY<q;PHH?Zleqd{bHqBTIb$E$PVjO<TRettCUtYr54!ItK&)TQ9BP*g;i6QXkHEw1}
z6`w5vFY?}g42JHnHfT~-MW_DSS!=udv=n@O9bu@oHM^x`GHZUa!df->di7@5ctSC+
zC>e9=Ia7u6+zG+e0rmwgIL{LJ;^1=Lr3Gzgu-AQg5xB)-P`OeNNX1@Ax8?2YGZECd
z#QWU)1Xu!89=HEF*-o@R*fUd9=1<`>lgQx&7p9Qjtm(IR2lo)U`((vZs2X~m=wJC9
z0ekgh;rrP#OxnG7V9&IX#`oYQRXdc0h%SYg8-45uQ)tOE{XhxKIL^`BouW29NKEI9
zzH<DQKT`b=J%7avrJr?CFL9SLd^_~}{8{Nr)QOk#LQbyT67F=<{%bmm9C~WhJ)mWb
zkk{FIxa?Ge1v1cF2I5Ej-odeR9m;R|2*_nj;_qtdM17IY&tRi1KW(6J|E7=U<*4Ij
zSR7r3U0!I*qm9Gcz`)asED3%G6iCV-e_?VqhB$-z-`e}~XsF+}e<^80Lb6U-D_dnN
z+f+g&q)muPeJs%s!pN9Og|bFjB1<G>8L~_mGclHsWSuM-hAdfT7|bwBzq{|+=lgum
z^E<!ad7kr}^BjLU$Kih8%XMA%bzj%(bzPl5dH9U9-P6VK;UBnqxL{MM)rl(ZAiic$
zdW-z(4KGbYM*~3e(agn!SdFqWcsy*Nf_`B!!RBYAUdIdLHxK8_!CeoM7dyAE9#omp
z4>tW)RGj3aYkeG2(4K!Q+d`5w2$pszIMX38e>}O>i>~Y1_VpqZIt>#<-e$JFWoB{5
z>SZ_Aq?%WDyVyRn?Jgc7-c7f3RM;YN)TQ~z;nvHTkTq-+N)e$<fe>p_8`899M7y;b
z@1E}BL(K29ph`+eZLrDrs>dVYyXYU*8p*^o>v#vN(-MJl`bFeV+h!`#jK>&nHA~R<
z`M+drGSdEGC%`u1U-&kTU140Xx-&5G%KzrooyLo&K=8K`_kFEY+Esf6yORDwHi3g<
zJS|Rl(%c^ACmiS$5SUu_eb#W}4vxxV*hJSbcdJ@)64DFw@5thAodI2>^J#+=aU#d~
zd~{!ZpNxhDJwZNZQ=F2C4TAK^tNOi!PvBV3M(7x{Db2NEEv@;HfpDNvoLA0}YUhtN
z_)xUKK%ndR$p=T?yL6~GBuGcp(x77w^Wlbs`)pqW?41q;I^Zai9cG2|&%K5cro+xn
zqNS?6J32I{x|tew8Kc}+axHmNV}Ep+(d`qxhMgU_XbKl312<KdR1&a39y!CY%=7#|
z#@C9UdA-r8FdRQT-LfZnsO8{mb8!Y^((S~c7+oW>B31@@qnC<QqYb(1!NVQ_FO~bX
z>vf`YZIt?F1B}KN+jl-xhR@;8h>nML*eI?lTWx{y07LBxC<_zNwb&(R8n^GtDN_U~
z5Egg*Gd0HzbU}?QX3O<qxY9Xo#JuUa?e=A&XS8byDrwe3UUdSTUIX8`@k#9;-8t>2
zS(e-CzAt+V&CGY&D+g%?jGDz7n2iw1m>$iML4i4^yRYd!UY1ZeEj%72ijAA(JG?0P
z4lQnZY|RI5b+)|Q-nP0nOvX@7M7yn8K}F)T6k0g>v*6KUJNjuFG*(M^6n@dtBV$L$
zL4(A?Mb!saV~qLDhP^YWq|Y!R49<4p;s=6=fgtHIZQ!idH;vDy!j8(dDY#K3=Y7OP
z(QT$jr#lS#b>OO(p+SCC?G62x_C5A|P%aBv_WEgnUF-1^Q2yX*-Ko_fRMuMkCRO2?
zB72vxr0%>9-$g7WIMj-k+gwc!H6UzdAJ>KF<fS+-C>3bM)yWg6yU56qW<s&1@@2Ua
zlnDELFJ8(W3)&tlR5_=fjgc{8eGHX7VDstVsKPTrKuXy-Zg7V$SQwp+5O22I#q_o9
zR;;2`y|*<ft7)1*l+nY@=t9F@V^l{ta-~ArO7YZ?Rp}=m)wh9n_k{-(km=`UsD5ht
z=73SxgV|S65`t_|clJAd8H$6vVyk=yEw~)nrp!8Y-t_P$y^QcBsz8f=WzL&+AgDW`
z!ljG60*?+jv6>-=_bfNjKw32#rG->jAU*QZxRJ7;9-5H!GJn_W^Y5y&1HBo8Q5i5#
z7pCz7^b#{D-yJ5{-Zog7@qK#jeyCi$#1&lx`DPpIlMgXEc?EM*r}1*Gd3qfErBI@C
zH%2!$A->;;;N6K-V}@W5&T=$NO#8=fIWxZnrF_*mqH1ioIh@WL@=+Dq=XViyX86ZF
z&u32R`EMPKZ#i$H##3CQoh~mAb9}G)=VmdtH*;mfi76Aw-ApHC5tG}CxZCk2osmsk
zSN+uJZ!;4=c{U6oz&%#yCCNnn<gtzk8oQ@j<mi05b6;%hov7=^P2$Dm%)-TUO^67u
z0nb?Ilf{qL4Z6l7K~jzfdcd;=R?{;|Gj>mx?MAB7OMA5XofFkeb-ybL34Ra}rZzDk
zIzfF{aBV-nM+nP$SdW65KkqIY3%uBn@*E>7E~5Ej_qX&hhErvkvPLIVRS1M%M7`J|
zzWMB<Dc?!6yoP$5UHivloFovCmUyeQ?9cP5!3Dz=?b|=d8hx2#Ln#7Awzy+E>Jjj?
z^ds-yjFW4nOZRGC_mZDjnf#caMtb$+djaGw%b;U#TTW7Uj6|;Wk70tZzB$L{Y}e96
zueQ`jxat>PmltC(iu`XJm|}~~Pv*G_NLW>m{RhGTUa|{!u)CzDdpz;<^8VNIw`;N&
zzwEop;Bjbfr(Tui#VwGV(IJip0D0x)0WY$3%)nOH%MtrWLNhaN1|H5p%2Z%zk(5Tp
zgZT<rxR7RjCCc$dzUdRur=R3BHiia51F`zmw`T@wab%GzX|nh1)A=`z91>G$8FTiy
zowlqe6iV3XM-ZqJf5cTV^M>aRG|Cex4j23*^jlsBPxIo&T&QX<(0zxb3}>c)(2D|&
z(}Wsiw#f)J+(RZALBg!ciJo0J3+a}sjpAk+ovG2yR1_+JrHz<uG%}(YWfw5tGUiBE
z)}s14u?f;wLvMtxpyou1SMpm*fAZMo22>9%FeBB%#Dx!7Gi94QwX6rbB33$5{>wsL
z{}MKXg7y?vk0AeyzMYJ(RmXLY^0S|52!iA(KY%*C#+YaF{ui{={&!;tCF50*@_o*I
z>ZrYlZ3A%oYrRUK1g`D(Q23QikD45ghzPJi6ecm8sykLUfHb9jBZtmwPkX-FU2-Ik
z(-W#owe+8xtH$?ZgnEoNBm8HY?a)sO2c*;l2bAoih1Ep+9nONB-n}WIM5!I`8_*vr
z=&Kn*Um9A@dR*%G`d+9>x<fwaLZ~=GJNMaqAesoEfCI6y6;o_q3hR~@OJ#dOu$ggu
z-=*#T#a!=O3GAk(-dOjvmzpT43^BZjhk1bm`#4SJb#*1Cz+Bp9h2Fl+zLB@Ft@)Eh
zyxg@>vVLkGKDDy6q8$66uT}AZ)SZaZQ#x{4JLIyY$2JZZoz|5m<u7k@Z0lFdy*c9C
z_<k~$+qn`u5MZQ;WyX!p#0pta_^U&T)KYm?eYP+P-fX#mcU`!`AZCQ65TYw)tRRTi
zVFw)nbqe`>XZpa^R)>=v6Z|hU<)dyupTnWLa<xjV5u31ioUaE(A1y~Z5jNPGWNdzk
zCB5i$KY?WAI9hejtoKBF(B;~4ou?+Qa7m&UZ{hi7$x$&;o;=)33hpH){0{Thu@j!b
zlMqDXi^=D=I^WKTR?uBPLB#N)KUO3wNDUBPJA8h=JN;45zLcvM_FO-`fEQI#{`fVQ
zTKchA2l{we%4^3pL=0tqgQvpRL-Duw>OpGC&{7<axg4H+Q;7@5#3)$kM%<BMz3>Lw
zb~mj(MYyCdiJby3-@VhNI&9z5CeUiu(i_agb?nW468}6g4<(Cedoh00J=xCkhxI#x
z*$`bL94eq4D>l=YZn)4`nBux((O{Eua<EMzEGS^JMOX13C?m_wpKA+@DVX~9o0fgW
z$e<DZD?Q6HS4@LVRbGslyWKe5B&ld*?~Sb?jKMA#dkGX;+YL6Ao{D?>_HF1Tlh2|;
zXYb~{+ZS=7T6rXY-cY40Q81}&<w|$yD#u8rsT*Xt+)T4q(mEpKn9-xzqti$;wV~~s
zG?ROARokvtQftaSanSYEgfQq1KQA$l%8Z@3;9KfxN=e=_eesoxjpIXuN68asGjOO-
z@92!sdz-+`i_=t&8Cx*$xSg`){;7eT<yNIHP9a-G0urTi_vvx*B<VXu(L?s9N=!Ci
z7CV0F5|=7X!4(#SPdVirP^@AM1&wWX%IL~HS>rBjw~C)^0Y)A#?v9u2^TY*@q}pm<
z=>-g*OXe?b2%q4+KT5Is_I|2=bnT8u5@Z+7K<h9?CGw-d`<Gc6>K4gEQuDLqHPS%W
zsWPHs`Hy$RgU|h(s%*D3eL*a1Q@jCH^vl8^BK}fk5>OzQLjqe1yJv45Js0@ugmB^}
z9!<!CYlT5uc**j3j^bOD5TtAS5moJTYC1!9T^xyeqz2QW$i2Efx4}xbza_`r?rwon
zsu&I^4XxUfd@%NKi~h&a?u}glH3d>0o3v##F5`X`jaR}4TY99nUpH61B~ZS9kWrse
zgF4ilHZ}vh-TWw8?!==gzVmuKM|o3yN*qjANc+o7<dVNh1jx(#UC<|0oqXgZ8V^-(
z*EBHI6jn8rv%n6qBa<AvUUgr*1VSl3<2?RQbUnV5xsRrMp`uTXyBB#Jn`+f}m-X^0
zaYv^iF0spuNJyI45&ucER)2D^y9l)bVX5&r33bG+$hk{h4VTcF-X!m_11x3y+Nu*C
zwmLaPs*SpSFzVoao~4bMMOFq(k1?-02Q!mi4P@|$d7vlhLOk#dY+0vDZ$D7j$EbfK
zzwqMdYKizmnARE0bX>nl-V1c+1pMtFBoPp9ICpEX?`pA$^()%x2eJ{)W>Rt4Po3hb
zWITv)6c5vqL=l^e{BC|`DKdG-VYhZ?iHeZ={q&u#p46v{H@QlgLfTAun*OD-UN|mz
zfw#*;z}GS@v8(SG#Z4(Bdy8#@i&gS!QAR50htP_2XDa70QEQAQ?q+Pt%J5py;M|>d
zg_HUS3TK}A<q<02v@hL9TxMoIJBDXu!+pd2q`nf^U>n>|vVGHNmz%T0$5tj;DtEM<
z2W65LaOOdypK|hJMg7Z_$A+3`UfPg=v>R=9zvof}Ul5{fI&zDv(4CW_g4mZR4l?v|
zi^M9cLrI+3ht$b!6;nDe9s_yjh3%IXLI-SzrWlDWJM@mdi=FK&Hoy$OF|zo{qvCUe
ztFw$jZW9kV4gr~Xreg4@%3!PvQ~dzuHZ`4UP5PrMac||vYtVTShR@ww=-T*#2YNOg
zM`qTp`CGg5UL)$mqh`IUYK`Vl*kOD7;lVREgLe%LSQbftX|2hQlX_d7o{gDwl*nQ8
z(Q3mRWLz6bhX)*QNj^FtgO65>2u|s<8saV=PHscy^55W0%p8}7e)!4rKr%7zEubDy
z1PTWNo~SCMZ`m7jHKjKb5rw)rOBbZb#2AAZo*{yciGuKHL-=6V5FK?-Ezr3z?Z%aN
zq$BlwW#U4~pnE94Z!CpX8;n|&S02c$DX%0{1W7UDDZ`f!C|oF>8aM8B2#Vlg#|OJK
z!r>S(hME81jlIxML*5L;4D32vkSU&z2s&T6K#o<L=we&BFAf&HHQ$lgG<@kRCi&AN
z>?d+#RBRje3wI+EX1=geO6l+F0?qz<oM7*!t!{)3w}0-klNOQqZh8C^ME4%UZ;Y0?
z^?tKxs&~8IdtmMNlaTvHm--C!NBeQs{^~a#_n*Mwo5^%`T+2(oCF*fmI9juj<;XsA
zdQjH+CE-;D+oR(fnlg*(hB9_>1N?@V{G((dWIOUiCtkrF1k_Y3YTAz`MQl%fe|2x1
zJyOZ6Ccq-}@iEJ)LdX-sR)7V}ZE)0CAcY%g+1d^x;;5dVQ=NUcw*+Xt8jm3{0&J7o
zeZO-)vB`HP#c0pVBFr^?y^~a;@#3}QxYY{5y_s}d^LS+O0o_&x;gwDZZL$$22FmLS
zZAC!qDj(1<X4nS360s0Hcv+!3`bl7#s88E)wMGbfr;!X(pAry;+JcnCNs_~sZ!oGu
z+h={%zTsa<`??&>_+x9?AGbOZhsuym?=v28l@@Ljw#^#xGt+|r$*gbfk1m+<lVXJ+
zs3D_9Em>pbPUxps1QNQ<U@i{_p|yQLZ(7b_7L8z}zk+z2eJ38FwcU0v>q=(#!|kf@
zO(cN{)8eiLsXMuEd>vhsw~QA!l}gfey3Pzb6n998hdhf$DygeqTlC!ad0;M}v<G=~
z8106Rxq1ymm0=u}_n6lYZx$f{d^cmW!yq%M5hA+0Yem-)dbh`=Yv4$9Zuw_A&VG=u
zUc&!+)=hYj>|t2;^~}+;hh_^=rS~(ZzeLGSYkZ_*9uow$AQ7@MFhN9^eX?r9w2x$e
zr_yk0&BxfM0Rc-Ol2eBskdWyj6L+53b@=i(Z?6wB(C@XV^tm_hNGEzw7ZBzY{wUOT
z56Pu_d`0CcHDzW6#{Pvfo+~V-mD<=WEc^W!7F}AdrVbgfADNF09&7SApj4CYqUSB_
zJQr2+iZhw|t3g6a?rZ@(pKXj=z~L2~;OM-xlR=Poo;Jn@;wb*~K*zJe#8@j>{!+WL
zMW-sss<UvUdv2%G^~z}ZCuXe2R`g7vc3UGsRA;2TF@M<J{b~Fe{Gd!*Wp4+VA0!Gd
zI6Sk$m8__!?#W43Dv}wfd8}OdZLw+h=`~IBk3*INoNJgkD%x4Q2e06O_<`Q_qNsRT
z1KW0EC1})-Zcw)!nno|S>|VTc<nWITU#13RFmoET0Fxf1PrI`ML-QQ@dIQ?9rhNx`
z#-QVwE5y;`dm>YpWvZ@&a0KuruiXG*dXHdUo~B{ZrJB`Uo_hK=98|H}BP{>q#448p
zsV}!lciXraUPs=EbE3IVHdr$qyZR{0<ClB0YpytBQ@&!soBr^Fc8!hx{tK`_Y!Ut%
z17;%=Aw`I<EzSnrR(G<R87dP^i}g?FtB>-}MftV+da+c1#oAen^a`RFdwT@s>tw5^
z_o1s_NP6kF`cBGxL`{Ah0nF!KNtdMDsXpuJfy;$DI!~j__^K7G_X3Ex2r#`V2WYM<
zk0)h!gUksp9AK!IuQN3%=qUV-HVkpp!`wdgg$rb$z+Wax#J+5YsqomCFL)y{wAboj
z@`K#g5|goMoU88R6c76}6U;<OkgADZ8^~QBJom|b-?x(QhHe|P!ikj`<pFgBP^kEj
ze_4%x%IcL5ugxbK=qDs^z;wUMpx)rmKO5<o6HZ5}32`@pr@+Dw&XMl&cIfHSNQ-VY
zxzdXJ@Y7Dwa-sa!<dp6lq(q@aH>_HWbVPtCn_l&|*hh0kp0bn?o!40R`Ri4cL#a0p
zx9r)w8+C`6JGOGlNV<ZP36SU>*A~p%HowmDm`ZGn*Y-$e$eAKLwC3vb0J`e?61D&A
zFsT_crqUst^ZhlpJy1I;@oLPacq`2o?@5^!5Nzv!a<P4hlEH}yuDjFT*f+Ym@-&=3
znHQI7m~ip_0j=~g!o`tx=t)lAEbj^ahqJt40<4y-7I_Tx7S*wuD_cv0h4>L3L*FF>
z(}FeoGS@fR?DON3yyTTP;*(+h3M}dPH>X}Ir!jmWFCqDtoF3k@X-A1M1t`!h%!swc
zj%IB8XuJDzafP9<e7uz53Eis2Vw=zXN7&8OrXhc^1Ou&o0eoJ@S#NX-6H*m=4djKI
zp`pVP3#OIr@PbAUrEJf{sM3=pAB~UE6Z}Sw-z7H85O3dw4#YGa&5W(rQH>z0Pmg+%
zmzQCIc6N5tm2tQFb{18ny&n|79c+!mFfM38(ym$Ib6L4sZ%0R=Pm~T`Z7uBw)u*OX
zVu>B$cBBSszs}(?jg3<+qQe@5z8BWzbGH4~qhaDKsp_3=j9pIMlgop>I9Y-WN}LG*
zpJiHh-)o=!(CM^Ih>%eKX4&wx1(%>&(Aj)1XC&i3YA?+t+u$&BevMjBV#NC8yXniS
zY-h)&&K;I$J;&b`y-=wGS|P`jR#cQ!#<VtxR#x2S3)^DjZu&6vlH~{V%PUXcR2@6x
zi)2sMRi-G<S>KM7cHH@HQ1*@_MV`bRevi4*qZMrikYdp{DX`h3JqxkK;61O?m3u1U
zAFoK_VoGaqhmV%~Tf_=(ljl%$NxkkK6B--X8%a2kV8bX!140cgG24e^7aRUUMr&sB
zz@k(hj_x^OP;8zZ+}RyvqN*xicsVjruW;#^ng@4_RWw@AKyysMI?ce?;}6ElQ@d*8
zO-VitF^`Ac{J%<wN3%hrT%6vZ2`5igjqkPWu98#6O*4<pxZiAsEB*ab{0jZ`?g|eK
ze9$58I4CR(t&TXvvvxTm<^8>j%!KA0aJwMGjzmAW5@XbrXy`?;nT;v}sew>Q&0MyE
zWbr$Sex%`zGy6h{x_EEDL9|+ISiSC@h|XZ83@g!&Guvsbdahort^9(_n-o8l{c4Y6
zwtA_{+X_QIZ4{=Sl73I6(<5?6ApHyn+Np<Tsm(SiNso#rgCc=16sTV9HydJ>*lqvf
zb;z*tC3G6(`T1av=}2>XbCo?yGg~eU4DekY3)@$5^U|KLPreEjd9=PfX8YV_b+w;%
zxiXw}-rl~^6TiFESvs0@=nvN+hi%Ki&8=ZN&`1{n-%qXq=|l@Kdm(PqryaJ{+oRBO
z;e=v!y~WGVIf~e(uhJXj!OneK%iMtyqw5l>_w4|n^d`3s037BEMp*fFKj_3c>Bu+3
z7IJSDp4mV79+IMSl^m4IE`wQW=7xttL+rj^ZfJcI`)VF9*r#D&GO8xhU{iNx>|$xf
z`vmztrvl|{A+D8n)pkX<Ts@rNVrkD+HtozZ5j`CJ_HFXE$5l(R6)xCA|9!Ea&L5zW
zc4&%FBV<#fE9Qr|q#r&mr=l}a;N`>>K^R(Qt8&D$3G8cJHPShi3$}ux?edeS&H#`C
zLW2sQk+{M&v0XNpID!+%ve`GIAzEI7h_<uXKCS*j4FwO6=j5%3EGdY~y~&sUnL=ea
z%-1Atq$-&)21;_}EfQ|P)>O;T<XG+mrnN)Hu77%1Z^1OpX$!WpytiVDQ?wD~?X_~Z
zCvzn?svOEUur`#fD1zPwZ5kZl5Y4;mpc)8Ew$1?m2H~{BV#`4mcz4HNK0x^E2l`on
z<JIY$#ATxy+9;#W<B$@2=&x_S0~l}c(QMaQz?U&egs~QW@(lGdStdNFy4##5=&5&Y
zKwqG&l<1674bE;`G!<l-eQn0(L^rVb)+e#P6aPOlk;;vf{;TBY1IZ=-Cb>Q5^)pKJ
zp*OsKmrU@A{ikGdOn9N!{eS;2^FNCrJ2)$3h!fJ!5<&l6;MITEg@T2Zh)t*uvz#Y{
ze+YNdzY+gG{{;|#-QSkF48(t9*^1Jib?`r5NzQ*z!q~5BziXBCe^|(U==I9qRonDm
z7sA7N@TXCwephNt^T7U%E8G9Hww^yJH38z5DfB-u2{`A8nev#zUuEFef$(qyl2$;d
z>48IsR+1+2xc{v^rK|G<W<=>N7AOT%cc{Fe#-1hgSWTv}tXb=v<6Ox?<+4}R4;6YY
zZ(>5|&1Lh(bbii#WMEctG$kVflV{t|a>(?|vmGIyPsAuR1yuMrN;APrc2gg%vJ6fU
z5@4GIS)6T5%X(o^H_(+Sv486PsC{=W3T|x@hN=sMmfC>B2ITh^C<|`(j3tKdyqN?t
zRe-Z3|I79%UIz!mZG<je{bh4OULY=SkR=K%tP`-X5UwfM`2!&=KJ3Z?ARt6wq@nC+
zQ}WkbZsZOE1LTGm|89fPH!{{#0VtjP5cC1;fpa3zQzgF)uF&5;1dQzZAnSW#zb+^1
zy7NC|3X=bBl<v;~8`aC?0N1c>%8q|FloISoB--&e22!=vF5JadhRChHP9WcSJF)W!
zY-1iqm02({V-=om)Qg1N)WTj_*{t@?qU6}FQ<%?0ZZFc1rHgL)z}EiBQyP2bCr{UF
z%$J`$0|8ufOoUNo#+tbR5Bg`<N(NK8s+l+k<2Dv#a3q)M;cSsquI0^>fT-u04UB7O
zFkne+V*KQZ4=(u0^R>e7Cr`E`9x${Y_@Y}rxxrQhdeBSfGlddRa+OB%h%zowGHE(c
z+voU1H37Kpi`F<`=AEK}^J}hDY~i+{-1;AUx4-k=)_?wA_9RGS77!AYH_}MlCPS5<
zJZIwxAb5X^u&R#Vzt;bgXIl00>L^PWa5DdP+-LuB++Ke@ZuFYD7&z|kl~|@S0U}g!
z2R&t11+G&J>?pYWj{(-ngcg*w`3GcezfCuUW;rOK4dMTxbLdE6lB^6O$@{|)UC#&g
z+D47mwj#nQ<nBVGkeX!q7KFmJ<{Z2DL!1M1Qn$+8M!rt8%$1)x4ta^*1s%^~0%_1o
z;wD;L%OXuR6#+RK=4AV&IWlbUy*PcviC0?KBc-@1sW%DzU=?Ge8fgkZ#S+V)ZkHj8
zyJ*vZkJXmJJ(Vf+c}-=>m@AXYGDd$fClZ)azCcsT(Zn*eo7dV_L;%R>c%oN#--qf?
zVLFAF{$6tepy&KAOu+~oxD;{#4Jg>oc}18~93`^_z{1Dvc-Yh|!YSxzKcQTgv*{Nd
zC<F^-N1CzqbyvbbySb!rG)-p`I38{r>G%lFPC#yR;eH`6?V?e+n}>j4t3hb9<N+z}
z14kLac^k~&0wneNJlFSgT|U?KXx%QY+t2m;X#L(?_e0kGrFH-Ff195y#8d)`ow54c
z!^7wj2VmF6M^KXBjoh4rp1xo+6+U-Vh^+w=4ZaPifbo(OC;+dhGeR9hh*M%8;oybj
zsUx;-l0|8=En?q@A3N<@-{~g4=|AC%je4r`nv=U7RF+v<IMxwlL|&Tt^;Ykp6CQq^
z20e`$uNK1xUo9ofbPZ6h9HUFoF^8DoJ*dz@%=k<F0%eS;<MRzSKPPeT=}wxZX|R{P
zKEKMkuS5sf=Je>*&PnhXH<Y61xn*v}O`|8XQFj9Y<f_Az{X=p;ua_Qdb&8xOdzV1(
zB<O`j@T9Jfv%Wv;^0TfN>vrS+#U2KoC8sGTOHDj2j~*(`%gYq{*-Q5VNvOqhY!GX@
zCIy)5_m<+iaHPLfv2`5<A*GJZfd7&X>e2kS5n%ouDdvCM?}UE#t@?f-NFqf>A^g*_
zvc23stWMl>FZI1MPv_FjN%nw#C`BXnvAArFUu6*mW*{>FU=#vsj#}7iTZ?>U&2S}k
zM=?bV4inTrjb*x#!|+%#V-ys&W$up1J~|(~{O2Le*jiphm_3z610`6I+f6pyq+)*m
zFX(7CN^*^iCWrniCOl%de>)@?O*Ca|FXKUS6WsHSAU^r0Iq`NLzxtm~gSVLsqjeGl
zg1rb-z`a|z`{w~kAIi_~Hd+G&qiCkbOfX1zii29o*}pFg&zE(-ltKD^?vUR{^rNYX
z^2Oo_zfXSZUk1d4xMixYZ^z&FcYQnlByQ{5vA!MuG<@r}W8IYg^{!gKS=KMwb-&|p
M{^eiXu%G?^2kKcO)Bpeg

literal 0
HcmV?d00001


From c303a0e0d581ced6481046754f5e8aad29a5dcb2 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 7 Nov 2024 19:09:17 +0300
Subject: [PATCH 039/753] feat: allow singleplayer mode to be triggered by
 'sp=1' query parameter along with `singleplayer=1`

---
 README.MD    | 2 +-
 src/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.MD b/README.MD
index 9b07bdb5..6756d350 100644
--- a/README.MD
+++ b/README.MD
@@ -139,7 +139,7 @@ Server specific:
 Single player specific:
 
 - `?loadSave=<save_name>` - Load the save on load with the specified folder name (not title)
-- `?singleplayer=1` - Create empty world on load. Nothing will be saved
+- `?singleplayer=1` or `?sp=1` - Create empty world on load. Nothing will be saved
 - `?version=<version>` - Set the version for the singleplayer world (when used with `?singleplayer=1`)
 - `?noSave=true` - Disable auto save on unload / disconnect / export whenever a world is loaded. Only manual save with `/save` command will work.
 - `?serverSetting=<key>:<value>` - Set local server [options](https://github.com/zardoy/space-squid/tree/everything/src/modules.ts#L51). For example `?serverSetting=noInitialChunksSend:true` will disable initial chunks loading on the loading screen.
diff --git a/src/index.ts b/src/index.ts
index 637e0655..437dca3c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -932,7 +932,7 @@ watchValue(miscUiState, async s => {
     const qs = new URLSearchParams(window.location.search)
     const moreServerOptions = {} as Record<string, any>
     if (qs.has('version')) moreServerOptions.version = qs.get('version')
-    if (qs.get('singleplayer') === '1') {
+    if (qs.get('singleplayer') === '1' || qs.get('sp') === '1') {
       loadSingleplayer({}, {
         worldFolder: undefined,
         ...moreServerOptions

From 574cdfc5319a3bd9213aaa3d4577f65e836f354a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 9 Nov 2024 11:19:40 +0300
Subject: [PATCH 040/753] docs: add deploy to Koyeb button

---
 Dockerfile                | 2 +-
 README.MD                 | 6 ++++--
 scripts/dockerPrepare.mjs | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2e43ad8a..a5f6ac06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN pnpm i
 # ENTRYPOINT ["pnpm", "run", "run-all"]
 
 # only for prod
-RUN pnpm run build
+RUN GITHUB_REPOSITORY=zardoy/minecraft-web-client pnpm run build
 
 # ---- Run Stage ----
 FROM node:18-alpine
diff --git a/README.MD b/README.MD
index 6756d350..77f68032 100644
--- a/README.MD
+++ b/README.MD
@@ -38,11 +38,13 @@ Whatever offline mode you used (zip, folder, just single player), you can always
 
 ![docs-assets/singleplayer-future-city-1-10-2.jpg](./docs-assets/singleplayer-future-city-1-10-2.jpg)
 
-### Servers
+### Servers & Proxy
 
 You can play almost on any Java server, vanilla servers are fully supported.
 See the [Mineflayer](https://github.com/PrismarineJS/mineflayer) repo for the list of supported versions (should support majority of versions).
-There is a builtin proxy, but you can also host your one! Just clone the repo, run `pnpm i` (following CONTRIBUTING.MD) and run `pnpm prod-start`, then you can specify `http://localhost:8080` in the proxy field.
+There is a builtin proxy, but you can also host your one! Just clone the repo, run `pnpm i` (following CONTRIBUTING.MD) and run `pnpm prod-start`, then you can specify `http://localhost:8080` in the proxy field. Or you can deploy it to the cloud service:
+
+[![Deploy to Koyeb](https://www.koyeb.com/static/images/deploy/button.svg)](https://app.koyeb.com/deploy?name=minecraft-web-client&type=git&repository=zardoy%2Fminecraft-web-client&branch=next&builder=dockerfile&env%5B%5D=&ports=8080%3Bhttp%3B%2F)
 
 Proxy servers are used to connect to Minecraft servers which use TCP protocol. When you connect connect to a server with a proxy, websocket connection is created between you (browser client) and the proxy server located in Europe, then the proxy connects to the Minecraft server and sends the data to the client (you) without any packet deserialization to avoid any additional delays. That said all the Minecraft protocol packets are processed by the client, right in your browser.
 
diff --git a/scripts/dockerPrepare.mjs b/scripts/dockerPrepare.mjs
index fd3680b4..ff009168 100644
--- a/scripts/dockerPrepare.mjs
+++ b/scripts/dockerPrepare.mjs
@@ -2,6 +2,11 @@
 import fs from 'fs'
 import path from 'path'
 import { fileURLToPath } from 'url'
+import { execSync } from 'child_process'
+
+// write release tag
+const commitShort = execSync('git rev-parse --short HEAD').toString().trim()
+fs.writeFileSync('./assets/release.json', JSON.stringify({ latestTag: `${commitShort} (docker)` }), 'utf8')
 
 const packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'))
 delete packageJson.optionalDependencies

From 32931efef0b541998f77895ca5bc5b2e77b8db85 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 9 Nov 2024 13:01:37 +0300
Subject: [PATCH 041/753] feat: implement experimental clipWorldBelowY setting
 for testing

---
 prismarine-viewer/viewer/lib/mesher/shared.ts       | 3 ++-
 prismarine-viewer/viewer/lib/worldrendererCommon.ts | 6 +++++-
 src/optionsStorage.ts                               | 7 ++++---
 src/watchOptions.ts                                 | 6 ++++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/mesher/shared.ts b/prismarine-viewer/viewer/lib/mesher/shared.ts
index 07b66747..11988db2 100644
--- a/prismarine-viewer/viewer/lib/mesher/shared.ts
+++ b/prismarine-viewer/viewer/lib/mesher/shared.ts
@@ -7,7 +7,8 @@ export const defaultMesherConfig = {
   smoothLighting: true,
   outputFormat: 'threeJs' as 'threeJs' | 'webgpu',
   textureSize: 1024, // for testing
-  debugModelVariant: undefined as undefined | number[]
+  debugModelVariant: undefined as undefined | number[],
+  clipWorldBelowY: undefined as undefined | number
 }
 
 export type MesherConfig = typeof defaultMesherConfig
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
index ea90da37..65546de4 100644
--- a/prismarine-viewer/viewer/lib/worldrendererCommon.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -321,6 +321,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     console.log('texture loaded')
   }
 
+  get worldMinYRender () {
+    return Math.floor(Math.max(this.worldConfig.minY, this.mesherConfig.clipWorldBelowY ?? -Infinity) / 16) * 16
+  }
+
   addColumn (x: number, z: number, chunk: any, isLightUpdate: boolean) {
     if (!this.active) return
     if (this.workers.length === 0) throw new Error('workers not initialized yet')
@@ -330,7 +334,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       // todo optimize
       worker.postMessage({ type: 'chunk', x, z, chunk })
     }
-    for (let y = this.worldConfig.minY; y < this.worldConfig.worldHeight; y += 16) {
+    for (let y = this.worldMinYRender; y < this.worldConfig.worldHeight; y += 16) {
       const loc = new Vec3(x, y, z)
       this.setSectionDirty(loc)
       if (this.neighborChunkUpdates && (!isLightUpdate || this.mesherConfig.smoothLighting)) {
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 01610cf2..c97dadc1 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -52,6 +52,7 @@ const defaultOptions = {
 
   // antiAliasing: false,
 
+  clipWorldBelowY: undefined as undefined | number, // will be removed
   showChunkBorders: false, // todo rename option
   frameLimit: false as number | false,
   alwaysBackupWorldBeforeLoading: undefined as boolean | undefined | null,
@@ -157,7 +158,7 @@ subscribe(options, () => {
   localStorage.options = JSON.stringify(saveOptions)
 })
 
-type WatchValue = <T extends Record<string, any>>(proxy: T, callback: (p: T) => void) => void
+type WatchValue = <T extends Record<string, any>>(proxy: T, callback: (p: T, isChanged: boolean) => void) => void
 
 export const watchValue: WatchValue = (proxy, callback) => {
   const watchedProps = new Set<string>()
@@ -166,10 +167,10 @@ export const watchValue: WatchValue = (proxy, callback) => {
       watchedProps.add(p.toString())
       return Reflect.get(target, p, receiver)
     },
-  }))
+  }), false)
   for (const prop of watchedProps) {
     subscribeKey(proxy, prop, () => {
-      callback(proxy)
+      callback(proxy, true)
     })
   }
 }
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 3ea17063..2996a2e1 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -58,6 +58,12 @@ export const watchOptionsAfterViewerInit = () => {
   watchValue(options, o => {
     viewer.world.displayStats = o.renderDebug === 'advanced'
   })
+  watchValue(options, (o, isChanged) => {
+    viewer.world.mesherConfig.clipWorldBelowY = o.clipWorldBelowY
+    if (isChanged) {
+      (viewer.world as WorldRendererThree).rerenderAllChunks()
+    }
+  })
 
   viewer.world.mesherConfig.smoothLighting = options.smoothLighting
   subscribeKey(options, 'smoothLighting', () => {

From d32f5107448ed3cd4536f2d2b463a314c949e80f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 10 Nov 2024 11:44:29 +0300
Subject: [PATCH 042/753] fix: Error messages were not displayed after
 unsuccessful Microsoft auth. Fixed all error messages.

---
 src/index.ts                      |  2 +-
 src/microsoftAuthflow.ts          | 62 ++++++++++++++++---------------
 src/react/ServersListProvider.tsx |  2 +-
 3 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 437dca3c..184db177 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -457,7 +457,7 @@ async function connect (connectOptions: ConnectOptions) {
       flyingSquidEvents()
     }
 
-    if (connectOptions.authenticatedAccount) username = 'not-used'
+    if (connectOptions.authenticatedAccount) username = 'you'
     let initialLoadingText: string
     if (singleplayer) {
       initialLoadingText = 'Local server is still starting'
diff --git a/src/microsoftAuthflow.ts b/src/microsoftAuthflow.ts
index cdfcfc77..00f4e675 100644
--- a/src/microsoftAuthflow.ts
+++ b/src/microsoftAuthflow.ts
@@ -31,6 +31,7 @@ export default async ({ tokenCaches, proxyBaseUrl, setProgressText = (text) => {
   const authFlow = {
     async getMinecraftJavaToken () {
       setProgressText('Authenticating with Microsoft account')
+      if (!window.crypto && !isPageSecure()) throw new Error('Crypto API is available only in secure contexts. Be sure to use https!')
       let result = null
       await fetch(authEndpoint, {
         method: 'POST',
@@ -43,22 +44,29 @@ export default async ({ tokenCaches, proxyBaseUrl, setProgressText = (text) => {
           connectingServer,
           connectingServerVersion: connectingVersion
         }),
-      }).then(async response => {
-        if (!response.ok) {
-          throw new Error(`Auth server error (${response.status}): ${await response.text()}`)
-        }
-
-        const reader = response.body!.getReader()
-        const decoder = new TextDecoder('utf8')
-
-        const processText = ({ done, value = undefined as Uint8Array | undefined }) => {
-          if (done) {
-            return
+      })
+        .catch(e => {
+          throw new Error(`Failed to connect to auth server (network error): ${e.message}`)
+        })
+        .then(async response => {
+          if (!response.ok) {
+            throw new Error(`Auth server error (${response.status}): ${await response.text()}`)
           }
 
-          const processChunk = (chunkStr) => {
-            try {
-              const json = JSON.parse(chunkStr)
+          const reader = response.body!.getReader()
+          const decoder = new TextDecoder('utf8')
+
+          const processText = ({ done, value = undefined as Uint8Array | undefined }) => {
+            if (done) {
+              return
+            }
+
+            const processChunk = (chunkStr) => {
+              let json: any
+              try {
+                json = JSON.parse(chunkStr)
+              } catch (err) {}
+              if (!json) return
               if (json.user_code) {
                 onMsaCodeCallback(json)
                 // this.codeCallback(json)
@@ -66,26 +74,22 @@ export default async ({ tokenCaches, proxyBaseUrl, setProgressText = (text) => {
               if (json.error) throw new Error(json.error)
               if (json.token) result = json
               if (json.newCache) setCacheResult(json.newCache)
-            } catch (err) {
             }
+
+            const strings = decoder.decode(value)
+
+            for (const chunk of strings.split('\n\n')) {
+              processChunk(chunk)
+            }
+
+            return reader.read().then(processText)
           }
-
-          const strings = decoder.decode(value)
-
-          for (const chunk of strings.split('\n\n')) {
-            processChunk(chunk)
-          }
-
           return reader.read().then(processText)
-        }
-        return reader.read().then(processText)
-      })
-      if (!window.crypto && !isPageSecure()) throw new Error('Crypto API is available only in secure contexts. Be sure to use https!')
+        })
       const restoredData = await restoreData(result)
-      if (!restoredData?.certificates?.profileKeys?.privatePEM) {
-        throw new Error(`Authentication server issue: it didn't return auth data. Most probably because the auth request was rejected by the end authority and retrying won't help until the issue is resolved.`)
+      if (restoredData?.certificates?.profileKeys?.privatePEM) {
+        restoredData.certificates.profileKeys.private = restoredData.certificates.profileKeys.privatePEM
       }
-      restoredData.certificates.profileKeys.private = restoredData.certificates.profileKeys.privatePEM
       return restoredData
     }
   }
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 250a819a..4260dcf4 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -195,7 +195,7 @@ const Inner = () => {
         })
       }
     }
-    void update()
+    void update().catch((err) => {})
   }, [serversListSorted])
 
   const isEditScreenModal = useIsModalActive('editServer')

From c8c4e3267d6126f59ce6335edb8c02bb01aa930d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 11 Nov 2024 17:49:33 +0300
Subject: [PATCH 043/753] feat: auto save worlds in singleplayer every 2
 seconds since crashes might happen. still possible to cancel this behavior
 via new setting or ?noSave=true feat: add setting for debugging to disable
 signs text rendering

---
 prismarine-viewer/viewer/lib/mesher/models.ts |  2 +-
 prismarine-viewer/viewer/lib/mesher/shared.ts |  3 ++-
 src/flyingSquidEvents.ts                      | 14 ++++++++++++++
 src/optionsStorage.ts                         |  2 ++
 src/watchOptions.ts                           |  1 +
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/mesher/models.ts b/prismarine-viewer/viewer/lib/mesher/models.ts
index 555efd80..91c0cf40 100644
--- a/prismarine-viewer/viewer/lib/mesher/models.ts
+++ b/prismarine-viewer/viewer/lib/mesher/models.ts
@@ -484,7 +484,7 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
           }
         }
         if (invisibleBlocks.has(block.name)) continue
-        if (block.name.includes('_sign') || block.name === 'sign') {
+        if ((block.name.includes('_sign') || block.name === 'sign') && !world.config.disableSignsMapsSupport) {
           const key = `${cursor.x},${cursor.y},${cursor.z}`
           const props: any = block.getProperties()
           const facingRotationMap = {
diff --git a/prismarine-viewer/viewer/lib/mesher/shared.ts b/prismarine-viewer/viewer/lib/mesher/shared.ts
index 11988db2..b08a2bd7 100644
--- a/prismarine-viewer/viewer/lib/mesher/shared.ts
+++ b/prismarine-viewer/viewer/lib/mesher/shared.ts
@@ -8,7 +8,8 @@ export const defaultMesherConfig = {
   outputFormat: 'threeJs' as 'threeJs' | 'webgpu',
   textureSize: 1024, // for testing
   debugModelVariant: undefined as undefined | number[],
-  clipWorldBelowY: undefined as undefined | number
+  clipWorldBelowY: undefined as undefined | number,
+  disableSignsMapsSupport: false
 }
 
 export type MesherConfig = typeof defaultMesherConfig
diff --git a/src/flyingSquidEvents.ts b/src/flyingSquidEvents.ts
index fb5b00e3..7231dd27 100644
--- a/src/flyingSquidEvents.ts
+++ b/src/flyingSquidEvents.ts
@@ -1,4 +1,7 @@
+import { saveServer } from './flyingSquidUtils'
+import { watchUnloadForCleanup } from './gameUnload'
 import { showModal } from './globalState'
+import { options } from './optionsStorage'
 import { chatInputValueGlobal } from './react/Chat'
 import { showNotification } from './react/NotificationProvider'
 
@@ -10,4 +13,15 @@ export default () => {
       showModal({ reactType: 'chat' })
     })
   })
+
+  if (options.singleplayerAutoSave) {
+    const autoSaveInterval = setInterval(() => {
+      if (options.singleplayerAutoSave) {
+        void saveServer(true)
+      }
+    }, 2000)
+    watchUnloadForCleanup(() => {
+      clearInterval(autoSaveInterval)
+    })
+  }
 }
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index c97dadc1..53deb927 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -53,6 +53,8 @@ const defaultOptions = {
   // antiAliasing: false,
 
   clipWorldBelowY: undefined as undefined | number, // will be removed
+  disableSignsMapsSupport: false,
+  singleplayerAutoSave: false,
   showChunkBorders: false, // todo rename option
   frameLimit: false as number | false,
   alwaysBackupWorldBeforeLoading: undefined as boolean | undefined | null,
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 2996a2e1..4b69726c 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -60,6 +60,7 @@ export const watchOptionsAfterViewerInit = () => {
   })
   watchValue(options, (o, isChanged) => {
     viewer.world.mesherConfig.clipWorldBelowY = o.clipWorldBelowY
+    viewer.world.mesherConfig.disableSignsMapsSupport = o.disableSignsMapsSupport
     if (isChanged) {
       (viewer.world as WorldRendererThree).rerenderAllChunks()
     }

From e28608f86e4e529671fca99eb05cef7af9dbef9f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 11 Nov 2024 18:04:54 +0300
Subject: [PATCH 044/753] also cache manifest.json into offline

---
 scripts/build.js | 1 +
 src/index.ts     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/build.js b/scripts/build.js
index 9b8a85a5..d3703eea 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -52,6 +52,7 @@ exports.getSwAdditionalEntries = () => {
         '*.png',
         '*.woff',
         'mesher.js',
+        'manifest.json',
         'worldSaveWorker.js',
         `textures/entity/squid/squid.png`,
         // everything but not .map
diff --git a/src/index.ts b/src/index.ts
index 184db177..5bd29e14 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -402,7 +402,9 @@ async function connect (connectOptions: ConnectOptions) {
       setLoadingScreenStatus(`Loading data for ${version}`)
       if (!document.fonts.check('1em mojangles')) {
         // todo instead re-render signs on load
-        await document.fonts.load('1em mojangles').catch(() => { })
+        await document.fonts.load('1em mojangles').catch(() => {
+          console.error('Failed to load font, signs wont be rendered correctly')
+        })
       }
       await window._MC_DATA_RESOLVER.promise // ensure data is loaded
       await downloadSoundsIfNeeded()

From a0a2c628b40644111d4bb2d88e69881ae7865060 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 14 Nov 2024 13:41:28 +0300
Subject: [PATCH 045/753] fix: preserve server selection after going back to
 the servers list (eg from edit modal) fix: was not possible to remove saved
 MS account by clicking on the profile picture fix: highlight active zone for
 interaction to avoid UI confusion fix: save the proxy to memory immedieately
 after editing it in the servers list screen

---
 src/react/AddServerOrConnect.tsx  |   8 +-
 src/react/SelectOption.tsx        |  17 +++-
 src/react/ServersList.tsx         |  37 ++++++++-
 src/react/ServersListProvider.tsx | 133 ++++++++++++++++--------------
 src/react/Singleplayer.tsx        |  38 +++++++--
 5 files changed, 152 insertions(+), 81 deletions(-)

diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index 06f4fcd7..d98a74b8 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -22,7 +22,7 @@ interface Props {
   initialData?: BaseServerInfo
   parseQs?: boolean
   onQsConnect?: (server: BaseServerInfo) => void
-  defaults?: Pick<BaseServerInfo, 'proxyOverride' | 'usernameOverride'>
+  placeholders?: Pick<BaseServerInfo, 'proxyOverride' | 'usernameOverride'>
   accounts?: string[]
   authenticatedAccounts?: number
   versions?: string[]
@@ -30,7 +30,7 @@ interface Props {
 
 const ELEMENTS_WIDTH = 190
 
-export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, defaults, accounts, versions, authenticatedAccounts }: Props) => {
+export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions, authenticatedAccounts }: Props) => {
   const qsParams = parseQs ? new URLSearchParams(window.location.search) : undefined
   const qsParamName = qsParams?.get('name')
   const qsParamIp = qsParams?.get('ip')
@@ -111,8 +111,8 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
           />
         </div>
 
-        <InputWithLabel label="Proxy Override" value={proxyOverride} disabled={lockConnect && qsParamProxy !== null} onChange={({ target: { value } }) => setProxyOverride(value)} placeholder={defaults?.proxyOverride} />
-        <InputWithLabel label="Username Override" value={usernameOverride} disabled={!noAccountSelected || lockConnect && qsParamUsername !== null} onChange={({ target: { value } }) => setUsernameOverride(value)} placeholder={defaults?.usernameOverride} />
+        <InputWithLabel label="Proxy Override" value={proxyOverride} disabled={lockConnect && qsParamProxy !== null} onChange={({ target: { value } }) => setProxyOverride(value)} placeholder={placeholders?.proxyOverride} />
+        <InputWithLabel label="Username Override" value={usernameOverride} disabled={!noAccountSelected || lockConnect && qsParamUsername !== null} onChange={({ target: { value } }) => setUsernameOverride(value)} placeholder={placeholders?.usernameOverride} />
         <label style={{
           display: 'flex',
           flexDirection: 'column',
diff --git a/src/react/SelectOption.tsx b/src/react/SelectOption.tsx
index ed54fdbe..ebb51344 100644
--- a/src/react/SelectOption.tsx
+++ b/src/react/SelectOption.tsx
@@ -8,6 +8,7 @@ const state = proxy({
   title: '',
   options: [] as string[],
   showCancel: true,
+  behavior: 'resolve-close' as 'resolve-close' | 'close-resolve',
 })
 
 let resolve
@@ -32,18 +33,26 @@ export default () => {
   const isModalActive = useIsModalActive('general-select')
   if (!isModalActive) return
 
+  const resolveClose = (value: string | undefined) => {
+    if (state.behavior === 'resolve-close') {
+      resolve(value)
+      hideCurrentModal()
+    } else {
+      hideCurrentModal()
+      resolve(value)
+    }
+  }
+
   return <Screen title={title} backdrop>
     {options.map(option => <Button
       key={option} onClick={() => {
-        hideCurrentModal()
-        resolve(option)
+        resolveClose(option)
       }}
     >{option}
     </Button>)}
     {showCancel && <Button
       style={{ marginTop: 30 }} onClick={() => {
-        hideCurrentModal()
-        resolve(undefined)
+        resolveClose(undefined)
       }}
     >Cancel
     </Button>}
diff --git a/src/react/ServersList.tsx b/src/react/ServersList.tsx
index 6b2694f4..57316d22 100644
--- a/src/react/ServersList.tsx
+++ b/src/react/ServersList.tsx
@@ -16,6 +16,7 @@ interface Props extends React.ComponentProps<typeof Singleplayer> {
   username: string
   setUsername: (username: string) => void
   onProfileClick?: () => void
+  setQuickConnectIp?: (ip: string) => void
 }
 
 export interface SavedProxiesLocalStorage {
@@ -29,7 +30,7 @@ type ProxyStatusResult = {
   status: 'success' | 'error' | 'unknown'
 }
 
-export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer, username, setUsername, onProfileClick, ...props }: Props) => {
+export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer, username, setUsername, onProfileClick, setQuickConnectIp, ...props }: Props) => {
   const [proxies, setProxies] = React.useState(initialProxies)
 
   const updateProxies = (newData: SavedProxiesLocalStorage) => {
@@ -39,6 +40,17 @@ export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer,
 
   const [serverIp, setServerIp] = React.useState('')
   const [save, setSave] = React.useState(true)
+  const [activeHighlight, setActiveHighlight] = React.useState(undefined as 'quick-connect' | 'server-list' | undefined)
+
+  const getActiveHighlightStyles = (type: typeof activeHighlight) => {
+    const styles: React.CSSProperties = {
+      transition: 'filter 0.2s',
+    }
+    if (activeHighlight && activeHighlight !== type) {
+      styles.filter = 'brightness(0.7)'
+    }
+    return styles
+  }
 
   return <Singleplayer
     {...props}
@@ -66,9 +78,22 @@ export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer,
         })
       }}
     >
-      <div style={{ display: 'flex', gap: 5, alignItems: 'center' }}>
+      <div
+        style={{ display: 'flex', gap: 5, alignItems: 'center', ...getActiveHighlightStyles('quick-connect') }}
+        className='quick-connect-row'
+        onMouseEnter={() => setActiveHighlight('quick-connect')}
+        onMouseLeave={() => setActiveHighlight(undefined)}
+      >
         {/* todo history */}
-        <Input required placeholder='Quick Connect IP (:version)' value={serverIp} onChange={({ target: { value } }) => setServerIp(value)} />
+        <Input
+          required
+          placeholder='Quick Connect IP (:version)'
+          value={serverIp}
+          onChange={({ target: { value } }) => {
+            setQuickConnectIp?.(value)
+            setServerIp(value)
+          }}
+        />
         <label style={{ fontSize: 10, display: 'flex', alignItems: 'center', gap: 5, height: '100%', marginTop: '-1px' }}>
           <input
             type='checkbox' checked={save}
@@ -108,6 +133,10 @@ export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer,
       }
       props.onWorldAction?.(action, serverName)
     }}
+    setListHovered={(hovered) => {
+      setActiveHighlight(hovered ? 'server-list' : undefined)
+    }}
+    listStyle={getActiveHighlightStyles('server-list')}
+    secondRowStyles={getActiveHighlightStyles('server-list')}
   />
 }
-
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 4260dcf4..f42fb11b 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -1,7 +1,8 @@
 import { useEffect, useMemo, useState } from 'react'
 import { useUtilsEffect } from '@zardoy/react-util'
+import { useSnapshot } from 'valtio'
 import { ConnectOptions } from '../connect'
-import { hideCurrentModal, miscUiState, showModal } from '../globalState'
+import { activeModalStack, hideCurrentModal, miscUiState, showModal } from '../globalState'
 import supportedVersions from '../supportedVersions.mjs'
 import ServersList from './ServersList'
 import AddServerOrConnect, { BaseServerInfo } from './AddServerOrConnect'
@@ -132,29 +133,31 @@ export const updateAuthenticatedAccountData = (callback: (data: AuthenticatedAcc
 // todo move to base
 const normalizeIp = (ip: string) => ip.replace(/https?:\/\//, '').replace(/\/(:|$)/, '')
 
-const Inner = () => {
+const Inner = ({ hidden }: { hidden?: boolean }) => {
   const [proxies, setProxies] = useState<readonly string[]>(localStorage['proxies'] ? JSON.parse(localStorage['proxies']) : getInitialProxies())
   const [selectedProxy, setSelectedProxy] = useState(localStorage.getItem('selectedProxy') ?? proxies?.[0] ?? '')
   const [serverEditScreen, setServerEditScreen] = useState<StoreServerItem | true | null>(null) // true for add
-  const [defaultUsername, setDefaultUsername] = useState(localStorage['username'] ?? (`mcrafter${Math.floor(Math.random() * 1000)}`))
-  const [authenticatedAccounts, setAuthenticatedAccounts] = useState<AuthenticatedAccount[]>(JSON.parse(localStorage['authenticatedAccounts'] || '[]'))
+  const [defaultUsername, _setDefaultUsername] = useState(localStorage['username'] ?? (`mcrafter${Math.floor(Math.random() * 1000)}`))
+  const [authenticatedAccounts, _setAuthenticatedAccounts] = useState<AuthenticatedAccount[]>(JSON.parse(localStorage['authenticatedAccounts'] || '[]'))
+  const [quickConnectIp, setQuickConnectIp] = useState('')
+
+  const setAuthenticatedAccounts = (newState: typeof authenticatedAccounts) => {
+    _setAuthenticatedAccounts(newState)
+    localStorage.setItem('authenticatedAccounts', JSON.stringify(newState))
+  }
+
+  const setDefaultUsername = (newState: typeof defaultUsername) => {
+    _setDefaultUsername(newState)
+    localStorage.setItem('username', newState)
+  }
 
   useEffect(() => {
-    localStorage.setItem('authenticatedAccounts', JSON.stringify(authenticatedAccounts))
-  }, [authenticatedAccounts])
-
-  useEffect(() => {
-    localStorage.setItem('username', defaultUsername)
-  }, [defaultUsername])
-
-  useEffect(() => {
-    // TODO! do not unmount on connecting screen
-    // if (proxies.length) {
-    //   localStorage.setItem('proxies', JSON.stringify(proxies))
-    // }
-    // if (selectedProxy) {
-    //   localStorage.setItem('selectedProxy', selectedProxy)
-    // }
+    if (proxies.length) {
+      localStorage.setItem('proxies', JSON.stringify(proxies))
+    }
+    if (selectedProxy) {
+      localStorage.setItem('selectedProxy', selectedProxy)
+    }
   }, [proxies])
 
   const [serversList, setServersList] = useState<StoreServerItem[]>(() => getInitialServersList())
@@ -215,46 +218,46 @@ const Inner = () => {
     }
   }, [isEditScreenModal])
 
-  if (isEditScreenModal) {
-    return <AddServerOrConnect
-      defaults={{
-        proxyOverride: selectedProxy,
-        usernameOverride: defaultUsername,
-      }}
-      parseQs={!serverEditScreen}
-      onBack={() => {
-        hideCurrentModal()
-      }}
-      onConfirm={(info) => {
-        if (!serverEditScreen) return
-        if (serverEditScreen === true) {
-          const server: StoreServerItem = { ...info, lastJoined: Date.now() } // so it appears first
-          setServersList(old => [...old, server])
-        } else {
-          const index = serversList.indexOf(serverEditScreen)
-          const { lastJoined } = serversList[index]
-          serversList[index] = { ...info, lastJoined }
-          setServersList([...serversList])
-        }
-        setServerEditScreen(null)
-      }}
-      accounts={authenticatedAccounts.map(a => a.username)}
-      initialData={!serverEditScreen || serverEditScreen === true ? undefined : serverEditScreen}
-      onQsConnect={(info) => {
-        const connectOptions: ConnectOptions = {
-          username: info.usernameOverride || defaultUsername,
-          server: normalizeIp(info.ip),
-          proxy: info.proxyOverride || selectedProxy,
-          botVersion: info.versionOverride,
-          ignoreQs: true,
-        }
-        dispatchEvent(new CustomEvent('connect', { detail: connectOptions }))
-      }}
-      versions={supportedVersions}
-    />
-  }
+  const editModalJsx = isEditScreenModal ? <AddServerOrConnect
+    placeholders={{
+      proxyOverride: selectedProxy,
+      usernameOverride: defaultUsername,
+    }}
+    parseQs={!serverEditScreen}
+    onBack={() => {
+      hideCurrentModal()
+    }}
+    onConfirm={(info) => {
+      if (!serverEditScreen) return
+      if (serverEditScreen === true) {
+        const server: StoreServerItem = { ...info, lastJoined: Date.now() } // so it appears first
+        setServersList(old => [...old, server])
+      } else {
+        const index = serversList.indexOf(serverEditScreen)
+        const { lastJoined } = serversList[index]
+        serversList[index] = { ...info, lastJoined }
+        setServersList([...serversList])
+      }
+      setServerEditScreen(null)
+    }}
+    accounts={authenticatedAccounts.map(a => a.username)}
+    initialData={!serverEditScreen || serverEditScreen === true ? {
+      ip: quickConnectIp
+    } : serverEditScreen}
+    onQsConnect={(info) => {
+      const connectOptions: ConnectOptions = {
+        username: info.usernameOverride || defaultUsername,
+        server: normalizeIp(info.ip),
+        proxy: info.proxyOverride || selectedProxy,
+        botVersion: info.versionOverride,
+        ignoreQs: true,
+      }
+      dispatchEvent(new CustomEvent('connect', { detail: connectOptions }))
+    }}
+    versions={supportedVersions}
+  /> : null
 
-  return <ServersList
+  const serversListJsx = <ServersList
     joinServer={(overrides, { shouldSave }) => {
       const indexOrIp = overrides.ip
       let ip = indexOrIp
@@ -327,10 +330,11 @@ const Inner = () => {
     }}
     username={defaultUsername}
     setUsername={setDefaultUsername}
+    setQuickConnectIp={setQuickConnectIp}
     onProfileClick={async () => {
       const username = await showOptionsModal('Select authenticated account to remove', authenticatedAccounts.map(a => a.username))
       if (!username) return
-      setAuthenticatedAccounts(old => old.filter(a => a.username !== username))
+      setAuthenticatedAccounts(authenticatedAccounts.filter(a => a.username !== username))
     }}
     onWorldAction={(action, index) => {
       const server = serversList[index]
@@ -372,12 +376,21 @@ const Inner = () => {
       setProxies(proxies)
       setSelectedProxy(selected)
     }}
+    hidden={hidden}
   />
+  return <>
+    {serversListJsx}
+    {editModalJsx}
+  </>
 }
 
 export default () => {
+  const modalStack = useSnapshot(activeModalStack)
+  const hasServersListModal = modalStack.some(x => x.reactType === 'serversList')
   const editServerModalActive = useIsModalActive('editServer')
   const isServersListModalActive = useIsModalActive('serversList')
+
   const eitherModal = isServersListModalActive || editServerModalActive
-  return eitherModal ? <Inner /> : null
+  const render = eitherModal || hasServersListModal
+  return render ? <Inner hidden={!isServersListModalActive} /> : null
 }
diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index aeb7eac4..893385fa 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -85,9 +85,15 @@ interface Props {
   warning?: string
   warningAction?: () => void
   warningActionLabel?: string
+  hidden?: boolean
 
   onWorldAction (action: 'load' | 'export' | 'delete' | 'edit', worldName: string): void
   onGeneralAction (action: 'cancel' | 'create'): void
+  onRowSelect? (name: string, index: number): void
+  defaultSelectedRow?: number
+  listStyle?: React.CSSProperties
+  setListHovered?: (hovered: boolean) => void
+  secondRowStyles?: React.CSSProperties
 }
 
 export default ({
@@ -104,7 +110,13 @@ export default ({
   disabledProviders,
   error,
   isReadonly,
-  warning, warningAction, warningActionLabel
+  warning, warningAction, warningActionLabel,
+  hidden,
+  onRowSelect,
+  defaultSelectedRow,
+  listStyle,
+  setListHovered,
+  secondRowStyles
 }: Props) => {
   const containerRef = useRef<any>()
   const firstButton = useRef<HTMLButtonElement>(null)
@@ -122,13 +134,17 @@ export default ({
   })
 
   const [search, setSearch] = useState('')
-  const [focusedWorld, setFocusedWorld] = useState('')
+  const [focusedWorld, setFocusedWorld] = useState(defaultSelectedRow ? worldData?.[defaultSelectedRow]?.name ?? '' : '')
 
   useEffect(() => {
     setFocusedWorld('')
   }, [activeProvider])
 
-  return <div ref={containerRef}>
+  const onRowSelectHandler = (name: string, index: number) => {
+    onRowSelect?.(name, index)
+    setFocusedWorld(name)
+  }
+  return <div ref={containerRef} hidden={hidden}>
     <div className="dirt-bg" />
     <div className={classNames('fullscreen', styles.root)}>
       <span className={classNames('screen-title', styles.title)}>{serversLayout ? 'Join Java Servers' : 'Select Saved World'}</span>
@@ -141,9 +157,13 @@ export default ({
             setActiveProvider?.(tab as any)
           }} fullSize
         />
-        <div style={{
-          marginTop: 3,
-        }}
+        <div
+          style={{
+            marginTop: 3,
+            ...listStyle
+          }}
+          onMouseEnter={() => setListHovered?.(true)}
+          onMouseLeave={() => setListHovered?.(false)}
         >
           {
             providerActions && <div style={{
@@ -159,9 +179,9 @@ export default ({
           }
           {
             worldData
-              ? worldData.filter(data => data.title.toLowerCase().includes(search.toLowerCase())).map(({ name, size, detail, ...rest }) => (
+              ? worldData.filter(data => data.title.toLowerCase().includes(search.toLowerCase())).map(({ name, size, detail, ...rest }, index) => (
                 <World
-                  {...rest} size={size} name={name} onFocus={setFocusedWorld} isFocused={focusedWorld === name} key={name} onInteraction={(interaction) => {
+                  {...rest} size={size} name={name} onFocus={row => onRowSelectHandler(row, index)} isFocused={focusedWorld === name} key={name} onInteraction={(interaction) => {
                     if (interaction === 'enter') onWorldAction('load', name)
                     else if (interaction === 'space') firstButton.current?.focus()
                   }}
@@ -192,7 +212,7 @@ export default ({
           <Button rootRef={firstButton} disabled={!focusedWorld} onClick={() => onWorldAction('load', focusedWorld)}>Load World</Button>
           <Button onClick={() => onGeneralAction('create')} disabled={isReadonly}>Create New World</Button>
         </div>}
-        <div>
+        <div style={{ ...secondRowStyles }}>
           {serversLayout ? <Button style={{ width: 100 }} disabled={!focusedWorld} onClick={() => onWorldAction('edit', focusedWorld)}>Edit</Button> : <Button style={{ width: 100 }} disabled={!focusedWorld} onClick={() => onWorldAction('export', focusedWorld)}>Export</Button>}
           <Button style={{ width: 100 }} disabled={!focusedWorld} onClick={() => onWorldAction('delete', focusedWorld)}>Delete</Button>
           {serversLayout ?

From 0506d9de4711c8a23adead6bdf1c007375d96828 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 14 Nov 2024 15:40:33 +0300
Subject: [PATCH 046/753] fix(ui): better support formatted minecraft messages
 (handle packets in general way)

---
 prismarine-viewer/viewer/lib/viewer.ts |  2 +-
 src/botUtils.ts                        | 20 ++++++++++++++++++++
 src/index.ts                           | 10 ++--------
 src/optionsGuiScheme.tsx               | 15 ++++++++++++++-
 src/react/SelectOption.tsx             | 19 +++++++++++++++++--
 src/resourcePack.ts                    |  8 +++++---
 6 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/viewer.ts b/prismarine-viewer/viewer/lib/viewer.ts
index 2a396222..d16dbe81 100644
--- a/prismarine-viewer/viewer/lib/viewer.ts
+++ b/prismarine-viewer/viewer/lib/viewer.ts
@@ -99,7 +99,7 @@ export class Viewer {
 
   setBlockStateId (pos: Vec3, stateId: number) {
     if (!this.world.loadedChunks[`${Math.floor(pos.x / 16) * 16},${Math.floor(pos.z / 16) * 16}`]) {
-      console.warn('[should be unreachable] setBlockStateId called for unloaded chunk', pos)
+      console.debug('[should be unreachable] setBlockStateId called for unloaded chunk', pos)
     }
     this.world.setBlockStateId(pos, stateId)
   }
diff --git a/src/botUtils.ts b/src/botUtils.ts
index b84223b2..4dadb529 100644
--- a/src/botUtils.ts
+++ b/src/botUtils.ts
@@ -1,4 +1,5 @@
 import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+import * as nbt from 'prismarine-nbt'
 
 export const displayClientChat = (text: string) => {
   const message = {
@@ -18,3 +19,22 @@ export const displayClientChat = (text: string) => {
     sender: 'minecraft:chat'
   })
 }
+
+export const parseFormattedMessagePacket = (arg) => {
+  if (typeof arg === 'object') {
+    try {
+      return {
+        formatted: nbt.simplify(arg),
+        plain: ''
+      }
+    } catch (err) {
+      console.warn('Failed to parse formatted message', arg, err)
+      return {
+        plain: JSON.stringify(arg)
+      }
+    }
+  }
+  return {
+    plain: String(arg)
+  }
+}
diff --git a/src/index.ts b/src/index.ts
index 5bd29e14..1b65bb00 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -102,6 +102,7 @@ import packetsPatcher from './packetsPatcher'
 import { mainMenuState } from './react/MainMenuRenderApp'
 import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import './mobileShim'
+import { parseFormattedMessagePacket } from './botUtils'
 
 window.debug = debug
 window.THREE = THREE
@@ -639,14 +640,7 @@ async function connect (connectOptions: ConnectOptions) {
 
   bot.on('kicked', (kickReason) => {
     console.log('You were kicked!', kickReason)
-    let kickReasonString = typeof kickReason === 'string' ? kickReason : JSON.stringify(kickReason)
-    let kickReasonFormatted = undefined as undefined | Record<string, any>
-    if (typeof kickReason === 'object') {
-      try {
-        kickReasonFormatted = nbt.simplify(kickReason)
-        kickReasonString = ''
-      } catch {}
-    }
+    const { formatted: kickReasonFormatted, plain: kickReasonString } = parseFormattedMessagePacket(kickReason)
     setLoadingScreenStatus(`The Minecraft server kicked you. Kick reason: ${kickReasonString}`, true, undefined, undefined, kickReasonFormatted)
     destroyAll()
   })
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 87ad3882..434ad484 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -74,7 +74,7 @@ export const guiOptionsScheme: {
       },
       smoothLighting: {},
       newVersionsLighting: {
-        text: 'Lighting in newer versions',
+        text: 'Lighting in Newer Versions',
       },
       lowMemoryMode: {
         text: 'Low Memory Mode',
@@ -98,6 +98,19 @@ export const guiOptionsScheme: {
         ],
       },
     },
+    {
+      custom () {
+        return <Category>Resource Packs</Category>
+      },
+      serverResourcePacks: {
+        text: 'Download From Server',
+        values: [
+          'prompt',
+          'always',
+          'never'
+        ],
+      }
+    }
   ],
   main: [
     {
diff --git a/src/react/SelectOption.tsx b/src/react/SelectOption.tsx
index ebb51344..9db20c86 100644
--- a/src/react/SelectOption.tsx
+++ b/src/react/SelectOption.tsx
@@ -1,13 +1,16 @@
 import { proxy, useSnapshot } from 'valtio'
 import { hideCurrentModal, showModal } from '../globalState'
+import { parseFormattedMessagePacket } from '../botUtils'
 import Screen from './Screen'
 import { useIsModalActive } from './utilsApp'
 import Button from './Button'
+import MessageFormattedString from './MessageFormattedString'
 
 const state = proxy({
   title: '',
   options: [] as string[],
   showCancel: true,
+  minecraftJsonMessage: null as null | Record<string, any>,
   behavior: 'resolve-close' as 'resolve-close' | 'close-resolve',
 })
 
@@ -15,21 +18,30 @@ let resolve
 export const showOptionsModal = async <T extends string> (
   title: string,
   options: T[],
-  { cancel = true }: { cancel?: boolean } = {}
+  { cancel = true, minecraftJsonMessage }: { cancel?: boolean, minecraftJsonMessage? } = {}
 ): Promise<T | undefined> => {
   showModal({ reactType: 'general-select' })
+  let minecraftJsonMessageParsed
+  if (minecraftJsonMessage) {
+    const parseResult = parseFormattedMessagePacket(minecraftJsonMessage)
+    minecraftJsonMessageParsed = parseResult.formatted
+    if (parseResult.plain) {
+      title += ` (${parseResult.plain})`
+    }
+  }
   return new Promise((_resolve) => {
     resolve = _resolve
     Object.assign(state, {
       title,
       options,
       showCancel: cancel,
+      minecraftJsonMessage: minecraftJsonMessageParsed
     })
   })
 }
 
 export default () => {
-  const { title, options, showCancel } = useSnapshot(state)
+  const { title, options, showCancel, minecraftJsonMessage } = useSnapshot(state)
   const isModalActive = useIsModalActive('general-select')
   if (!isModalActive) return
 
@@ -44,6 +56,9 @@ export default () => {
   }
 
   return <Screen title={title} backdrop>
+    {minecraftJsonMessage && <div style={{ textAlign: 'center', }}>
+      <MessageFormattedString message={minecraftJsonMessage} />
+    </div>}
     {options.map(option => <Button
       key={option} onClick={() => {
         resolveClose(option)
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index a5c84ef8..0ab9ec49 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -295,14 +295,16 @@ export const onAppLoad = () => {
     // todo also handle resourcePack
     const handleResourcePackRequest = async (packet) => {
       if (options.serverResourcePacks === 'never') return
-      const promptMessage = ('promptMessage' in packet && packet.promptMessage) ? JSON.stringify(packet.promptMessage) : 'Do you want to use server resource pack?'
+      const promptMessagePacket = ('promptMessage' in packet && packet.promptMessage) ? packet.promptMessage : undefined
+      const promptMessageText = promptMessagePacket ? '' : 'Do you want to use server resource pack?'
       // TODO!
       const hash = 'hash' in packet ? packet.hash : '-'
       const forced = 'forced' in packet ? packet.forced : false
       const choice = options.serverResourcePacks === 'always'
         ? true
-        : await showOptionsModal(promptMessage, ['Download & Install (recommended)', 'Pretend Installed (not recommended)'], {
-          cancel: !forced
+        : await showOptionsModal(promptMessageText, ['Download & Install (recommended)', 'Pretend Installed (not recommended)'], {
+          cancel: !forced,
+          minecraftJsonMessage: promptMessagePacket,
         })
       if (!choice) return
       bot.acceptResourcePack()

From 85ece5b4ebaa60ffb4721e3ee2189e7bec15e15c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 18 Nov 2024 18:53:31 +0300
Subject: [PATCH 047/753] fix: some keybinding names were incorrectly parsed
 feat: make fullscreen button (F11) configurable in the keybinding panel

---
 src/controls.ts              |  9 +++++----
 src/react/Keybinding.tsx     | 10 +++++-----
 src/react/keybinding.test.ts | 14 ++++++++++++++
 vitest.config.ts             |  1 +
 4 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 src/react/keybinding.test.ts

diff --git a/src/controls.ts b/src/controls.ts
index 6ec4ee9b..602ea81d 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -52,6 +52,7 @@ export const contro = new ControMax({
       selectItem: ['KeyH'] // default will be removed
     },
     ui: {
+      toggleFullscreen: ['F11'],
       back: [null/* 'Escape' */, 'B'],
       leftClick: [null, 'A'],
       rightClick: [null, 'Y'],
@@ -419,6 +420,10 @@ contro.on('trigger', ({ command }) => {
   if (command === 'ui.pauseMenu') {
     showModal({ reactType: 'pause-screen' })
   }
+
+  if (command === 'ui.toggleFullscreen') {
+    void goFullscreen(true)
+  }
 })
 
 contro.on('release', ({ command }) => {
@@ -742,10 +747,6 @@ window.addEventListener('keydown', (e) => {
 
 // #region experimental debug things
 window.addEventListener('keydown', (e) => {
-  if (e.code === 'F11') {
-    e.preventDefault()
-    void goFullscreen(true)
-  }
   if (e.code === 'KeyL' && e.altKey) {
     console.clear()
   }
diff --git a/src/react/Keybinding.tsx b/src/react/Keybinding.tsx
index a34e1476..7c6c1bc8 100644
--- a/src/react/Keybinding.tsx
+++ b/src/react/Keybinding.tsx
@@ -30,19 +30,19 @@ export default ({ type, val, isPS }: Props) => {
   </>
 }
 
-async function parseBindingName (binding: string) {
+export async function parseBindingName (binding: string) {
   if (!binding) return ''
 
   const { keyboard } = navigator
-  const layoutMap = await keyboard?.getLayoutMap?.() ?? new Map()
+  const layoutMap = await keyboard?.getLayoutMap?.() ?? new Map<string, string>()
 
-  const mapKey = key => layoutMap.get(key) || key
+  const mapKey = (key: string) => layoutMap.get(key) || key
 
-  const cut = binding.replaceAll(/(Numpad|Digit|Key)/g, '')
+  const cut = binding.replaceAll(/(Digit|Key)/g, '')
   const parts = cut.includes('+') ? cut.split('+') : [cut]
 
   for (let i = 0; i < parts.length; i++) {
-    parts[i] = mapKey(parts[i]).split(/(?=[A-Z\d])/).reverse().join(' ')
+    parts[i] = mapKey(parts[i]).split(/(?<=[a-z])(?=\d)/).join(' ').split(/(?=[A-Z])/).reverse().join(' ')
   }
 
   return parts.join(' + ')
diff --git a/src/react/keybinding.test.ts b/src/react/keybinding.test.ts
new file mode 100644
index 00000000..6c59bc56
--- /dev/null
+++ b/src/react/keybinding.test.ts
@@ -0,0 +1,14 @@
+import { test, expect } from 'vitest'
+import { parseBindingName } from './Keybinding'
+
+test('display keybinding correctly', async () => {
+  expect(await parseBindingName('unknown')).toMatchInlineSnapshot('"unknown"')
+  expect(await parseBindingName('KeyT')).toMatchInlineSnapshot('"T"')
+  expect(await parseBindingName('Digit1')).toMatchInlineSnapshot('"1"')
+  expect(await parseBindingName('Numpad1')).toMatchInlineSnapshot('"Numpad 1"')
+  expect(await parseBindingName('MetaLeft')).toMatchInlineSnapshot('"Left Meta"')
+  expect(await parseBindingName('Space')).toMatchInlineSnapshot('"Space"')
+  expect(await parseBindingName('Escape')).toMatchInlineSnapshot('"Escape"')
+  expect(await parseBindingName('F11')).toMatchInlineSnapshot('"F11"')
+  expect(await parseBindingName('Mouse 55')).toMatchInlineSnapshot('"Mouse 55"')
+})
diff --git a/vitest.config.ts b/vitest.config.ts
index f6d2416c..fcda26c8 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -6,6 +6,7 @@ export default defineConfig({
     include: [
       '../../src/botUtils.test.ts',
       '../../src/markdownToFormattedText.test.ts',
+      '../../src/react/keybinding.test.ts',
       'lib/mesher/test/tests.test.ts',
       'sign-renderer/tests.test.ts'
     ],

From c441792d3fe0e00e17e30d7dacd9eadff092106a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 19 Nov 2024 23:00:32 +0300
Subject: [PATCH 048/753] fix failing test ci

---
 .eslintrc.json                                |  3 ++-
 src/react/Keybinding.tsx                      | 19 +------------------
 ...ng.test.ts => parseKeybindingName.test.ts} |  2 +-
 src/react/parseKeybindingName.ts              | 17 +++++++++++++++++
 vitest.config.ts                              |  2 +-
 5 files changed, 22 insertions(+), 21 deletions(-)
 rename src/react/{keybinding.test.ts => parseKeybindingName.test.ts} (93%)
 create mode 100644 src/react/parseKeybindingName.ts

diff --git a/.eslintrc.json b/.eslintrc.json
index f454100a..8b2225b5 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -197,7 +197,8 @@
         "no-async-promise-executor": "off",
         "no-bitwise": "off",
         "unicorn/filename-case": "off",
-        "max-depth": "off"
+        "max-depth": "off",
+        "unicorn/no-typeof-undefined": "off"
     },
     "overrides": [
         {
diff --git a/src/react/Keybinding.tsx b/src/react/Keybinding.tsx
index 7c6c1bc8..8edc94a5 100644
--- a/src/react/Keybinding.tsx
+++ b/src/react/Keybinding.tsx
@@ -4,6 +4,7 @@ import triangle from './ps_icons/playstation_triangle_console_controller_gamepad
 import square from './ps_icons/playstation_square_console_controller_gamepad_icon.svg'
 import circle from './ps_icons/circle_playstation_console_controller_gamepad_icon.svg'
 import cross from './ps_icons/cross_playstation_console_controller_gamepad_icon.svg'
+import { parseBindingName } from './parseKeybindingName'
 
 
 type Props = {
@@ -30,24 +31,6 @@ export default ({ type, val, isPS }: Props) => {
   </>
 }
 
-export async function parseBindingName (binding: string) {
-  if (!binding) return ''
-
-  const { keyboard } = navigator
-  const layoutMap = await keyboard?.getLayoutMap?.() ?? new Map<string, string>()
-
-  const mapKey = (key: string) => layoutMap.get(key) || key
-
-  const cut = binding.replaceAll(/(Digit|Key)/g, '')
-  const parts = cut.includes('+') ? cut.split('+') : [cut]
-
-  for (let i = 0; i < parts.length; i++) {
-    parts[i] = mapKey(parts[i]).split(/(?<=[a-z])(?=\d)/).join(' ').split(/(?=[A-Z])/).reverse().join(' ')
-  }
-
-  return parts.join(' + ')
-}
-
 const buttonsMap = {
   'A': cross,
   'B': circle,
diff --git a/src/react/keybinding.test.ts b/src/react/parseKeybindingName.test.ts
similarity index 93%
rename from src/react/keybinding.test.ts
rename to src/react/parseKeybindingName.test.ts
index 6c59bc56..2c639691 100644
--- a/src/react/keybinding.test.ts
+++ b/src/react/parseKeybindingName.test.ts
@@ -1,5 +1,5 @@
 import { test, expect } from 'vitest'
-import { parseBindingName } from './Keybinding'
+import { parseBindingName } from './parseKeybindingName'
 
 test('display keybinding correctly', async () => {
   expect(await parseBindingName('unknown')).toMatchInlineSnapshot('"unknown"')
diff --git a/src/react/parseKeybindingName.ts b/src/react/parseKeybindingName.ts
new file mode 100644
index 00000000..2c41d3f8
--- /dev/null
+++ b/src/react/parseKeybindingName.ts
@@ -0,0 +1,17 @@
+export async function parseBindingName (binding: string) {
+  if (!binding) return ''
+
+  const { keyboard } = navigator
+  const layoutMap = (typeof keyboard === 'undefined' ? undefined : await keyboard?.getLayoutMap?.()) ?? new Map<string, string>()
+
+  const mapKey = (key: string) => layoutMap.get(key) || key
+
+  const cut = binding.replaceAll(/(Digit|Key)/g, '')
+  const parts = cut.includes('+') ? cut.split('+') : [cut]
+
+  for (let i = 0; i < parts.length; i++) {
+    parts[i] = mapKey(parts[i]).split(/(?<=[a-z])(?=\d)/).join(' ').split(/(?=[A-Z])/).reverse().join(' ')
+  }
+
+  return parts.join(' + ')
+}
diff --git a/vitest.config.ts b/vitest.config.ts
index fcda26c8..c27621d5 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -6,7 +6,7 @@ export default defineConfig({
     include: [
       '../../src/botUtils.test.ts',
       '../../src/markdownToFormattedText.test.ts',
-      '../../src/react/keybinding.test.ts',
+      '../../src/react/parseKeybindingName.test.ts',
       'lib/mesher/test/tests.test.ts',
       'sign-renderer/tests.test.ts'
     ],

From f2552e70e1d6d8caac0abfb758074c12f125b34a Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 20 Nov 2024 09:03:10 +0100
Subject: [PATCH 049/753] fix ci (#231)

---
 src/react/parseKeybindingName.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/react/parseKeybindingName.ts b/src/react/parseKeybindingName.ts
index 2c41d3f8..46bcf259 100644
--- a/src/react/parseKeybindingName.ts
+++ b/src/react/parseKeybindingName.ts
@@ -1,8 +1,8 @@
 export async function parseBindingName (binding: string) {
   if (!binding) return ''
 
-  const { keyboard } = navigator
-  const layoutMap = (typeof keyboard === 'undefined' ? undefined : await keyboard?.getLayoutMap?.()) ?? new Map<string, string>()
+  const { keyboard } = (typeof navigator === 'undefined' ? undefined : navigator) ?? {}
+  const layoutMap = await keyboard?.getLayoutMap?.() ?? new Map<string, string>()
 
   const mapKey = (key: string) => layoutMap.get(key) || key
 

From 4dac577dfc78ce6fedca20f47e796d5ccc852939 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 20 Nov 2024 09:04:59 +0100
Subject: [PATCH 050/753] feat: basic support for text_display entity (#230)

---
 prismarine-viewer/viewer/lib/entities.ts        | 17 ++++++++++++++---
 .../viewer/lib/entity/EntityMesh.js             |  4 ++--
 .../viewer/lib/entity/entities.json             |  4 ++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index 6afd1c34..ef73faf7 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -29,17 +29,27 @@ function getUsernameTexture (username: string, { fontFamily = 'sans-serif' }: an
   const padding = 5
   ctx.font = `${fontSize}px ${fontFamily}`
 
-  const textWidth = ctx.measureText(username).width + padding * 2
+  const lines = String(username).split('\n')
+
+  let textWidth = 0
+  for (const line of lines) {
+    const width = ctx.measureText(line).width + padding * 2
+    if (width > textWidth) textWidth = width
+  }
 
   canvas.width = textWidth
-  canvas.height = fontSize + padding * 2
+  canvas.height = (fontSize + padding * 2) * lines.length
 
   ctx.fillStyle = 'rgba(0, 0, 0, 0.3)'
   ctx.fillRect(0, 0, canvas.width, canvas.height)
 
   ctx.font = `${fontSize}px ${fontFamily}`
   ctx.fillStyle = 'white'
-  ctx.fillText(username, padding, fontSize)
+  let i = 0
+  for (const line of lines) {
+    i++
+    ctx.fillText(line, padding + (textWidth - ctx.measureText(line).width) / 2, fontSize * i)
+  }
 
   return canvas
 }
@@ -454,6 +464,7 @@ export class Entities extends EventEmitter {
     // ---
     // not player
     const displayText = entity.metadata?.[3] && this.parseEntityLabel(entity.metadata[2])
+      || entity.metadata?.[23] && this.parseEntityLabel(entity.metadata[23]) // text displays
     if (entity.name !== 'player' && displayText) {
       addNametag({ ...entity, username: displayText }, this.entitiesOptions, this.entities[entity.id].children.find(c => c.name === 'mesh'))
     }
diff --git a/prismarine-viewer/viewer/lib/entity/EntityMesh.js b/prismarine-viewer/viewer/lib/entity/EntityMesh.js
index a518171f..1350dcf0 100644
--- a/prismarine-viewer/viewer/lib/entity/EntityMesh.js
+++ b/prismarine-viewer/viewer/lib/entity/EntityMesh.js
@@ -224,8 +224,8 @@ export const knownNotHandled = [
   'item_display', 'item_frame',
   'lightning_bolt', 'marker',
   'painting', 'spawner_minecart',
-  'spectral_arrow', 'text_display',
-  'tnt', 'trader_llama', 'zombie_horse'
+  'spectral_arrow', 'tnt',
+  'trader_llama', 'zombie_horse'
 ]
 
 export const temporaryMap = {
diff --git a/prismarine-viewer/viewer/lib/entity/entities.json b/prismarine-viewer/viewer/lib/entity/entities.json
index f005f5d1..e084a5cd 100644
--- a/prismarine-viewer/viewer/lib/entity/entities.json
+++ b/prismarine-viewer/viewer/lib/entity/entities.json
@@ -16390,6 +16390,10 @@
     },
     "render_controllers": ["controller.render.strider"]
   },
+  "text_display": {
+    "identifier": "minecraft:text_display",
+    "geometry": {}
+  },
   "trident": {
     "identifier": "minecraft:thrown_trident",
     "textures": {

From c44ad90acf8eb8f83d23303c6fe629bb78788111 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 21 Nov 2024 14:56:39 +0300
Subject: [PATCH 051/753] add finally a way to get entities metadata by key

---
 prismarine-viewer/viewer/lib/entities.ts |   26 +-
 scripts/genMcDataTypes.ts                |   38 +
 src/mcDataTypes.ts                       | 4322 +++++++++++++++++++++-
 3 files changed, 4378 insertions(+), 8 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index ef73faf7..ae05a133 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -1,5 +1,6 @@
 //@ts-check
 import EventEmitter from 'events'
+import { UnionToIntersection } from 'type-fest'
 import nbt from 'prismarine-nbt'
 import * as TWEEN from '@tweenjs/tween.js'
 import * as THREE from 'three'
@@ -11,6 +12,7 @@ import { NameTagObject } from 'skinview3d/libs/nametag'
 import { flat, fromFormattedString } from '@xmcl/text-component'
 import mojangson from 'mojangson'
 import { snakeCase } from 'change-case'
+import { EntityMetadataVersions } from '../../../src/mcDataTypes'
 import * as Entity from './entity/EntityMesh'
 import { WalkingGeneralSwing } from './entity/animations'
 import externalTexturesJson from './entity/externalTextures.json'
@@ -352,7 +354,7 @@ export class Entities extends EventEmitter {
     }
   }
 
-  update (entity: import('prismarine-entity').Entity & { delete?; pos }, overrides) {
+  update (entity: import('prismarine-entity').Entity & { delete?; pos, name }, overrides) {
     const isPlayerModel = entity.name === 'player'
     if (entity.name === 'zombie' || entity.name === 'zombie_villager' || entity.name === 'husk') {
       overrides.texture = `textures/1.16.4/entity/${entity.name === 'zombie_villager' ? 'zombie_villager/zombie_villager.png' : `zombie/${entity.name}.png`}`
@@ -453,6 +455,8 @@ export class Entities extends EventEmitter {
       this.setRendering(this.rendering, group)
     }
 
+    const meta = getGeneralEntitiesMetadata(entity)
+
     //@ts-expect-error
     // set visibility
     const isInvisible = entity.metadata?.[0] & 0x20
@@ -463,8 +467,8 @@ export class Entities extends EventEmitter {
     }
     // ---
     // not player
-    const displayText = entity.metadata?.[3] && this.parseEntityLabel(entity.metadata[2])
-      || entity.metadata?.[23] && this.parseEntityLabel(entity.metadata[23]) // text displays
+    const displayTextRaw = meta.custom_name_visible || getSpecificEntityMetadata('text_display', entity)?.text
+    const displayText = displayTextRaw && this.parseEntityLabel(displayTextRaw)
     if (entity.name !== 'player' && displayText) {
       addNametag({ ...entity, username: displayText }, this.entitiesOptions, this.entities[entity.id].children.find(c => c.name === 'mesh'))
     }
@@ -547,3 +551,19 @@ export class Entities extends EventEmitter {
     }
   }
 }
+
+function getGeneralEntitiesMetadata (entity: { name; metadata }): Partial<UnionToIntersection<EntityMetadataVersions[keyof EntityMetadataVersions]>> {
+  const entityData = loadedData.entitiesByName[entity.name]
+  return new Proxy({}, {
+    get (target, p, receiver) {
+      if (typeof p !== 'string') return
+      const index = entityData.metadataKeys?.indexOf(p)
+      return entity.metadata[index ?? -1]
+    },
+  })
+}
+
+function getSpecificEntityMetadata<T extends keyof EntityMetadataVersions> (name: T, entity): EntityMetadataVersions[T] | undefined {
+  if (entity.name !== name) return
+  return getGeneralEntitiesMetadata(entity) as any
+}
diff --git a/scripts/genMcDataTypes.ts b/scripts/genMcDataTypes.ts
index f5b15069..82b5b878 100644
--- a/scripts/genMcDataTypes.ts
+++ b/scripts/genMcDataTypes.ts
@@ -1,5 +1,6 @@
 import minecraftData from 'minecraft-data'
 import fs from 'fs'
+import supportedVersions from '../src/supportedVersions.mjs'
 
 const data = minecraftData('1.20.1')
 
@@ -10,4 +11,41 @@ types += `\nexport type EntityNames = ${Object.keys(data.entitiesByName).map(blo
 types += `\nexport type BiomesNames = ${Object.keys(data.biomesByName).map(blockName => `'${blockName}'`).join(' | ')};`
 types += `\nexport type EnchantmentNames = ${Object.keys(data.enchantmentsByName).map(blockName => `'${blockName}'`).join(' | ')};`
 
+type Version = string
+const allVersionsEntitiesMetadata = {} as Record<string, Record<string, {
+    version: Version,
+    firstKey: number
+}>>
+for (const version of supportedVersions) {
+    const data = minecraftData(version)
+    for (const { name, metadataKeys } of data.entitiesArray) {
+        allVersionsEntitiesMetadata[name] ??= {}
+        if (!metadataKeys) {
+            // console.warn('Entity has no metadata', name, version)
+        }
+        for (const [i, key] of (metadataKeys ?? []).entries()) {
+            allVersionsEntitiesMetadata[name][key] ??= {
+                version: version,
+                firstKey: i,
+            }
+        }
+    }
+}
+
+types += '\n\nexport type EntityMetadataVersions = {\n'
+for (const [name, versions] of Object.entries(allVersionsEntitiesMetadata)) {
+    types += `'${name}': {`
+    for (const [key, v] of Object.entries(versions)) {
+        types += `\n/** ${v.version}+ (${v.firstKey}) */\n`
+        types += `'${key}': string;`
+    }
+    types += '},'
+}
+types += '\n}'
+
+const minify = false
+if (minify) {
+    types = types.replaceAll(/[\t]/g, '')
+}
+
 fs.writeFileSync('./src/mcDataTypes.ts', types, 'utf8')
diff --git a/src/mcDataTypes.ts b/src/mcDataTypes.ts
index 7c70e0f0..3375cf28 100644
--- a/src/mcDataTypes.ts
+++ b/src/mcDataTypes.ts
@@ -1,6 +1,4318 @@
 
-export type BlockNames = 'air' | 'stone' | 'granite' | 'polished_granite' | 'diorite' | 'polished_diorite' | 'andesite' | 'polished_andesite' | 'grass_block' | 'dirt' | 'coarse_dirt' | 'podzol' | 'cobblestone' | 'oak_planks' | 'spruce_planks' | 'birch_planks' | 'jungle_planks' | 'acacia_planks' | 'cherry_planks' | 'dark_oak_planks' | 'mangrove_planks' | 'bamboo_planks' | 'bamboo_mosaic' | 'oak_sapling' | 'spruce_sapling' | 'birch_sapling' | 'jungle_sapling' | 'acacia_sapling' | 'cherry_sapling' | 'dark_oak_sapling' | 'mangrove_propagule' | 'bedrock' | 'water' | 'lava' | 'sand' | 'suspicious_sand' | 'red_sand' | 'gravel' | 'suspicious_gravel' | 'gold_ore' | 'deepslate_gold_ore' | 'iron_ore' | 'deepslate_iron_ore' | 'coal_ore' | 'deepslate_coal_ore' | 'nether_gold_ore' | 'oak_log' | 'spruce_log' | 'birch_log' | 'jungle_log' | 'acacia_log' | 'cherry_log' | 'dark_oak_log' | 'mangrove_log' | 'mangrove_roots' | 'muddy_mangrove_roots' | 'bamboo_block' | 'stripped_spruce_log' | 'stripped_birch_log' | 'stripped_jungle_log' | 'stripped_acacia_log' | 'stripped_cherry_log' | 'stripped_dark_oak_log' | 'stripped_oak_log' | 'stripped_mangrove_log' | 'stripped_bamboo_block' | 'oak_wood' | 'spruce_wood' | 'birch_wood' | 'jungle_wood' | 'acacia_wood' | 'cherry_wood' | 'dark_oak_wood' | 'mangrove_wood' | 'stripped_oak_wood' | 'stripped_spruce_wood' | 'stripped_birch_wood' | 'stripped_jungle_wood' | 'stripped_acacia_wood' | 'stripped_cherry_wood' | 'stripped_dark_oak_wood' | 'stripped_mangrove_wood' | 'oak_leaves' | 'spruce_leaves' | 'birch_leaves' | 'jungle_leaves' | 'acacia_leaves' | 'cherry_leaves' | 'dark_oak_leaves' | 'mangrove_leaves' | 'azalea_leaves' | 'flowering_azalea_leaves' | 'sponge' | 'wet_sponge' | 'glass' | 'lapis_ore' | 'deepslate_lapis_ore' | 'lapis_block' | 'dispenser' | 'sandstone' | 'chiseled_sandstone' | 'cut_sandstone' | 'note_block' | 'white_bed' | 'orange_bed' | 'magenta_bed' | 'light_blue_bed' | 'yellow_bed' | 'lime_bed' | 'pink_bed' | 'gray_bed' | 'light_gray_bed' | 'cyan_bed' | 'purple_bed' | 'blue_bed' | 'brown_bed' | 'green_bed' | 'red_bed' | 'black_bed' | 'powered_rail' | 'detector_rail' | 'sticky_piston' | 'cobweb' | 'grass' | 'fern' | 'dead_bush' | 'seagrass' | 'tall_seagrass' | 'piston' | 'piston_head' | 'white_wool' | 'orange_wool' | 'magenta_wool' | 'light_blue_wool' | 'yellow_wool' | 'lime_wool' | 'pink_wool' | 'gray_wool' | 'light_gray_wool' | 'cyan_wool' | 'purple_wool' | 'blue_wool' | 'brown_wool' | 'green_wool' | 'red_wool' | 'black_wool' | 'moving_piston' | 'dandelion' | 'torchflower' | 'poppy' | 'blue_orchid' | 'allium' | 'azure_bluet' | 'red_tulip' | 'orange_tulip' | 'white_tulip' | 'pink_tulip' | 'oxeye_daisy' | 'cornflower' | 'wither_rose' | 'lily_of_the_valley' | 'brown_mushroom' | 'red_mushroom' | 'gold_block' | 'iron_block' | 'bricks' | 'tnt' | 'bookshelf' | 'chiseled_bookshelf' | 'mossy_cobblestone' | 'obsidian' | 'torch' | 'wall_torch' | 'fire' | 'soul_fire' | 'spawner' | 'oak_stairs' | 'chest' | 'redstone_wire' | 'diamond_ore' | 'deepslate_diamond_ore' | 'diamond_block' | 'crafting_table' | 'wheat' | 'farmland' | 'furnace' | 'oak_sign' | 'spruce_sign' | 'birch_sign' | 'acacia_sign' | 'cherry_sign' | 'jungle_sign' | 'dark_oak_sign' | 'mangrove_sign' | 'bamboo_sign' | 'oak_door' | 'ladder' | 'rail' | 'cobblestone_stairs' | 'oak_wall_sign' | 'spruce_wall_sign' | 'birch_wall_sign' | 'acacia_wall_sign' | 'cherry_wall_sign' | 'jungle_wall_sign' | 'dark_oak_wall_sign' | 'mangrove_wall_sign' | 'bamboo_wall_sign' | 'oak_hanging_sign' | 'spruce_hanging_sign' | 'birch_hanging_sign' | 'acacia_hanging_sign' | 'cherry_hanging_sign' | 'jungle_hanging_sign' | 'dark_oak_hanging_sign' | 'crimson_hanging_sign' | 'warped_hanging_sign' | 'mangrove_hanging_sign' | 'bamboo_hanging_sign' | 'oak_wall_hanging_sign' | 'spruce_wall_hanging_sign' | 'birch_wall_hanging_sign' | 'acacia_wall_hanging_sign' | 'cherry_wall_hanging_sign' | 'jungle_wall_hanging_sign' | 'dark_oak_wall_hanging_sign' | 'mangrove_wall_hanging_sign' | 'crimson_wall_hanging_sign' | 'warped_wall_hanging_sign' | 'bamboo_wall_hanging_sign' | 'lever' | 'stone_pressure_plate' | 'iron_door' | 'oak_pressure_plate' | 'spruce_pressure_plate' | 'birch_pressure_plate' | 'jungle_pressure_plate' | 'acacia_pressure_plate' | 'cherry_pressure_plate' | 'dark_oak_pressure_plate' | 'mangrove_pressure_plate' | 'bamboo_pressure_plate' | 'redstone_ore' | 'deepslate_redstone_ore' | 'redstone_torch' | 'redstone_wall_torch' | 'stone_button' | 'snow' | 'ice' | 'snow_block' | 'cactus' | 'clay' | 'sugar_cane' | 'jukebox' | 'oak_fence' | 'pumpkin' | 'netherrack' | 'soul_sand' | 'soul_soil' | 'basalt' | 'polished_basalt' | 'soul_torch' | 'soul_wall_torch' | 'glowstone' | 'nether_portal' | 'carved_pumpkin' | 'jack_o_lantern' | 'cake' | 'repeater' | 'white_stained_glass' | 'orange_stained_glass' | 'magenta_stained_glass' | 'light_blue_stained_glass' | 'yellow_stained_glass' | 'lime_stained_glass' | 'pink_stained_glass' | 'gray_stained_glass' | 'light_gray_stained_glass' | 'cyan_stained_glass' | 'purple_stained_glass' | 'blue_stained_glass' | 'brown_stained_glass' | 'green_stained_glass' | 'red_stained_glass' | 'black_stained_glass' | 'oak_trapdoor' | 'spruce_trapdoor' | 'birch_trapdoor' | 'jungle_trapdoor' | 'acacia_trapdoor' | 'cherry_trapdoor' | 'dark_oak_trapdoor' | 'mangrove_trapdoor' | 'bamboo_trapdoor' | 'stone_bricks' | 'mossy_stone_bricks' | 'cracked_stone_bricks' | 'chiseled_stone_bricks' | 'packed_mud' | 'mud_bricks' | 'infested_stone' | 'infested_cobblestone' | 'infested_stone_bricks' | 'infested_mossy_stone_bricks' | 'infested_cracked_stone_bricks' | 'infested_chiseled_stone_bricks' | 'brown_mushroom_block' | 'red_mushroom_block' | 'mushroom_stem' | 'iron_bars' | 'chain' | 'glass_pane' | 'melon' | 'attached_pumpkin_stem' | 'attached_melon_stem' | 'pumpkin_stem' | 'melon_stem' | 'vine' | 'glow_lichen' | 'oak_fence_gate' | 'brick_stairs' | 'stone_brick_stairs' | 'mud_brick_stairs' | 'mycelium' | 'lily_pad' | 'nether_bricks' | 'nether_brick_fence' | 'nether_brick_stairs' | 'nether_wart' | 'enchanting_table' | 'brewing_stand' | 'cauldron' | 'water_cauldron' | 'lava_cauldron' | 'powder_snow_cauldron' | 'end_portal' | 'end_portal_frame' | 'end_stone' | 'dragon_egg' | 'redstone_lamp' | 'cocoa' | 'sandstone_stairs' | 'emerald_ore' | 'deepslate_emerald_ore' | 'ender_chest' | 'tripwire_hook' | 'tripwire' | 'emerald_block' | 'spruce_stairs' | 'birch_stairs' | 'jungle_stairs' | 'command_block' | 'beacon' | 'cobblestone_wall' | 'mossy_cobblestone_wall' | 'flower_pot' | 'potted_torchflower' | 'potted_oak_sapling' | 'potted_spruce_sapling' | 'potted_birch_sapling' | 'potted_jungle_sapling' | 'potted_acacia_sapling' | 'potted_cherry_sapling' | 'potted_dark_oak_sapling' | 'potted_mangrove_propagule' | 'potted_fern' | 'potted_dandelion' | 'potted_poppy' | 'potted_blue_orchid' | 'potted_allium' | 'potted_azure_bluet' | 'potted_red_tulip' | 'potted_orange_tulip' | 'potted_white_tulip' | 'potted_pink_tulip' | 'potted_oxeye_daisy' | 'potted_cornflower' | 'potted_lily_of_the_valley' | 'potted_wither_rose' | 'potted_red_mushroom' | 'potted_brown_mushroom' | 'potted_dead_bush' | 'potted_cactus' | 'carrots' | 'potatoes' | 'oak_button' | 'spruce_button' | 'birch_button' | 'jungle_button' | 'acacia_button' | 'cherry_button' | 'dark_oak_button' | 'mangrove_button' | 'bamboo_button' | 'skeleton_skull' | 'skeleton_wall_skull' | 'wither_skeleton_skull' | 'wither_skeleton_wall_skull' | 'zombie_head' | 'zombie_wall_head' | 'player_head' | 'player_wall_head' | 'creeper_head' | 'creeper_wall_head' | 'dragon_head' | 'dragon_wall_head' | 'piglin_head' | 'piglin_wall_head' | 'anvil' | 'chipped_anvil' | 'damaged_anvil' | 'trapped_chest' | 'light_weighted_pressure_plate' | 'heavy_weighted_pressure_plate' | 'comparator' | 'daylight_detector' | 'redstone_block' | 'nether_quartz_ore' | 'hopper' | 'quartz_block' | 'chiseled_quartz_block' | 'quartz_pillar' | 'quartz_stairs' | 'activator_rail' | 'dropper' | 'white_terracotta' | 'orange_terracotta' | 'magenta_terracotta' | 'light_blue_terracotta' | 'yellow_terracotta' | 'lime_terracotta' | 'pink_terracotta' | 'gray_terracotta' | 'light_gray_terracotta' | 'cyan_terracotta' | 'purple_terracotta' | 'blue_terracotta' | 'brown_terracotta' | 'green_terracotta' | 'red_terracotta' | 'black_terracotta' | 'white_stained_glass_pane' | 'orange_stained_glass_pane' | 'magenta_stained_glass_pane' | 'light_blue_stained_glass_pane' | 'yellow_stained_glass_pane' | 'lime_stained_glass_pane' | 'pink_stained_glass_pane' | 'gray_stained_glass_pane' | 'light_gray_stained_glass_pane' | 'cyan_stained_glass_pane' | 'purple_stained_glass_pane' | 'blue_stained_glass_pane' | 'brown_stained_glass_pane' | 'green_stained_glass_pane' | 'red_stained_glass_pane' | 'black_stained_glass_pane' | 'acacia_stairs' | 'cherry_stairs' | 'dark_oak_stairs' | 'mangrove_stairs' | 'bamboo_stairs' | 'bamboo_mosaic_stairs' | 'slime_block' | 'barrier' | 'light' | 'iron_trapdoor' | 'prismarine' | 'prismarine_bricks' | 'dark_prismarine' | 'prismarine_stairs' | 'prismarine_brick_stairs' | 'dark_prismarine_stairs' | 'prismarine_slab' | 'prismarine_brick_slab' | 'dark_prismarine_slab' | 'sea_lantern' | 'hay_block' | 'white_carpet' | 'orange_carpet' | 'magenta_carpet' | 'light_blue_carpet' | 'yellow_carpet' | 'lime_carpet' | 'pink_carpet' | 'gray_carpet' | 'light_gray_carpet' | 'cyan_carpet' | 'purple_carpet' | 'blue_carpet' | 'brown_carpet' | 'green_carpet' | 'red_carpet' | 'black_carpet' | 'terracotta' | 'coal_block' | 'packed_ice' | 'sunflower' | 'lilac' | 'rose_bush' | 'peony' | 'tall_grass' | 'large_fern' | 'white_banner' | 'orange_banner' | 'magenta_banner' | 'light_blue_banner' | 'yellow_banner' | 'lime_banner' | 'pink_banner' | 'gray_banner' | 'light_gray_banner' | 'cyan_banner' | 'purple_banner' | 'blue_banner' | 'brown_banner' | 'green_banner' | 'red_banner' | 'black_banner' | 'white_wall_banner' | 'orange_wall_banner' | 'magenta_wall_banner' | 'light_blue_wall_banner' | 'yellow_wall_banner' | 'lime_wall_banner' | 'pink_wall_banner' | 'gray_wall_banner' | 'light_gray_wall_banner' | 'cyan_wall_banner' | 'purple_wall_banner' | 'blue_wall_banner' | 'brown_wall_banner' | 'green_wall_banner' | 'red_wall_banner' | 'black_wall_banner' | 'red_sandstone' | 'chiseled_red_sandstone' | 'cut_red_sandstone' | 'red_sandstone_stairs' | 'oak_slab' | 'spruce_slab' | 'birch_slab' | 'jungle_slab' | 'acacia_slab' | 'cherry_slab' | 'dark_oak_slab' | 'mangrove_slab' | 'bamboo_slab' | 'bamboo_mosaic_slab' | 'stone_slab' | 'smooth_stone_slab' | 'sandstone_slab' | 'cut_sandstone_slab' | 'petrified_oak_slab' | 'cobblestone_slab' | 'brick_slab' | 'stone_brick_slab' | 'mud_brick_slab' | 'nether_brick_slab' | 'quartz_slab' | 'red_sandstone_slab' | 'cut_red_sandstone_slab' | 'purpur_slab' | 'smooth_stone' | 'smooth_sandstone' | 'smooth_quartz' | 'smooth_red_sandstone' | 'spruce_fence_gate' | 'birch_fence_gate' | 'jungle_fence_gate' | 'acacia_fence_gate' | 'cherry_fence_gate' | 'dark_oak_fence_gate' | 'mangrove_fence_gate' | 'bamboo_fence_gate' | 'spruce_fence' | 'birch_fence' | 'jungle_fence' | 'acacia_fence' | 'cherry_fence' | 'dark_oak_fence' | 'mangrove_fence' | 'bamboo_fence' | 'spruce_door' | 'birch_door' | 'jungle_door' | 'acacia_door' | 'cherry_door' | 'dark_oak_door' | 'mangrove_door' | 'bamboo_door' | 'end_rod' | 'chorus_plant' | 'chorus_flower' | 'purpur_block' | 'purpur_pillar' | 'purpur_stairs' | 'end_stone_bricks' | 'torchflower_crop' | 'pitcher_crop' | 'pitcher_plant' | 'beetroots' | 'dirt_path' | 'end_gateway' | 'repeating_command_block' | 'chain_command_block' | 'frosted_ice' | 'magma_block' | 'nether_wart_block' | 'red_nether_bricks' | 'bone_block' | 'structure_void' | 'observer' | 'shulker_box' | 'white_shulker_box' | 'orange_shulker_box' | 'magenta_shulker_box' | 'light_blue_shulker_box' | 'yellow_shulker_box' | 'lime_shulker_box' | 'pink_shulker_box' | 'gray_shulker_box' | 'light_gray_shulker_box' | 'cyan_shulker_box' | 'purple_shulker_box' | 'blue_shulker_box' | 'brown_shulker_box' | 'green_shulker_box' | 'red_shulker_box' | 'black_shulker_box' | 'white_glazed_terracotta' | 'orange_glazed_terracotta' | 'magenta_glazed_terracotta' | 'light_blue_glazed_terracotta' | 'yellow_glazed_terracotta' | 'lime_glazed_terracotta' | 'pink_glazed_terracotta' | 'gray_glazed_terracotta' | 'light_gray_glazed_terracotta' | 'cyan_glazed_terracotta' | 'purple_glazed_terracotta' | 'blue_glazed_terracotta' | 'brown_glazed_terracotta' | 'green_glazed_terracotta' | 'red_glazed_terracotta' | 'black_glazed_terracotta' | 'white_concrete' | 'orange_concrete' | 'magenta_concrete' | 'light_blue_concrete' | 'yellow_concrete' | 'lime_concrete' | 'pink_concrete' | 'gray_concrete' | 'light_gray_concrete' | 'cyan_concrete' | 'purple_concrete' | 'blue_concrete' | 'brown_concrete' | 'green_concrete' | 'red_concrete' | 'black_concrete' | 'white_concrete_powder' | 'orange_concrete_powder' | 'magenta_concrete_powder' | 'light_blue_concrete_powder' | 'yellow_concrete_powder' | 'lime_concrete_powder' | 'pink_concrete_powder' | 'gray_concrete_powder' | 'light_gray_concrete_powder' | 'cyan_concrete_powder' | 'purple_concrete_powder' | 'blue_concrete_powder' | 'brown_concrete_powder' | 'green_concrete_powder' | 'red_concrete_powder' | 'black_concrete_powder' | 'kelp' | 'kelp_plant' | 'dried_kelp_block' | 'turtle_egg' | 'sniffer_egg' | 'dead_tube_coral_block' | 'dead_brain_coral_block' | 'dead_bubble_coral_block' | 'dead_fire_coral_block' | 'dead_horn_coral_block' | 'tube_coral_block' | 'brain_coral_block' | 'bubble_coral_block' | 'fire_coral_block' | 'horn_coral_block' | 'dead_tube_coral' | 'dead_brain_coral' | 'dead_bubble_coral' | 'dead_fire_coral' | 'dead_horn_coral' | 'tube_coral' | 'brain_coral' | 'bubble_coral' | 'fire_coral' | 'horn_coral' | 'dead_tube_coral_fan' | 'dead_brain_coral_fan' | 'dead_bubble_coral_fan' | 'dead_fire_coral_fan' | 'dead_horn_coral_fan' | 'tube_coral_fan' | 'brain_coral_fan' | 'bubble_coral_fan' | 'fire_coral_fan' | 'horn_coral_fan' | 'dead_tube_coral_wall_fan' | 'dead_brain_coral_wall_fan' | 'dead_bubble_coral_wall_fan' | 'dead_fire_coral_wall_fan' | 'dead_horn_coral_wall_fan' | 'tube_coral_wall_fan' | 'brain_coral_wall_fan' | 'bubble_coral_wall_fan' | 'fire_coral_wall_fan' | 'horn_coral_wall_fan' | 'sea_pickle' | 'blue_ice' | 'conduit' | 'bamboo_sapling' | 'bamboo' | 'potted_bamboo' | 'void_air' | 'cave_air' | 'bubble_column' | 'polished_granite_stairs' | 'smooth_red_sandstone_stairs' | 'mossy_stone_brick_stairs' | 'polished_diorite_stairs' | 'mossy_cobblestone_stairs' | 'end_stone_brick_stairs' | 'stone_stairs' | 'smooth_sandstone_stairs' | 'smooth_quartz_stairs' | 'granite_stairs' | 'andesite_stairs' | 'red_nether_brick_stairs' | 'polished_andesite_stairs' | 'diorite_stairs' | 'polished_granite_slab' | 'smooth_red_sandstone_slab' | 'mossy_stone_brick_slab' | 'polished_diorite_slab' | 'mossy_cobblestone_slab' | 'end_stone_brick_slab' | 'smooth_sandstone_slab' | 'smooth_quartz_slab' | 'granite_slab' | 'andesite_slab' | 'red_nether_brick_slab' | 'polished_andesite_slab' | 'diorite_slab' | 'brick_wall' | 'prismarine_wall' | 'red_sandstone_wall' | 'mossy_stone_brick_wall' | 'granite_wall' | 'stone_brick_wall' | 'mud_brick_wall' | 'nether_brick_wall' | 'andesite_wall' | 'red_nether_brick_wall' | 'sandstone_wall' | 'end_stone_brick_wall' | 'diorite_wall' | 'scaffolding' | 'loom' | 'barrel' | 'smoker' | 'blast_furnace' | 'cartography_table' | 'fletching_table' | 'grindstone' | 'lectern' | 'smithing_table' | 'stonecutter' | 'bell' | 'lantern' | 'soul_lantern' | 'campfire' | 'soul_campfire' | 'sweet_berry_bush' | 'warped_stem' | 'stripped_warped_stem' | 'warped_hyphae' | 'stripped_warped_hyphae' | 'warped_nylium' | 'warped_fungus' | 'warped_wart_block' | 'warped_roots' | 'nether_sprouts' | 'crimson_stem' | 'stripped_crimson_stem' | 'crimson_hyphae' | 'stripped_crimson_hyphae' | 'crimson_nylium' | 'crimson_fungus' | 'shroomlight' | 'weeping_vines' | 'weeping_vines_plant' | 'twisting_vines' | 'twisting_vines_plant' | 'crimson_roots' | 'crimson_planks' | 'warped_planks' | 'crimson_slab' | 'warped_slab' | 'crimson_pressure_plate' | 'warped_pressure_plate' | 'crimson_fence' | 'warped_fence' | 'crimson_trapdoor' | 'warped_trapdoor' | 'crimson_fence_gate' | 'warped_fence_gate' | 'crimson_stairs' | 'warped_stairs' | 'crimson_button' | 'warped_button' | 'crimson_door' | 'warped_door' | 'crimson_sign' | 'warped_sign' | 'crimson_wall_sign' | 'warped_wall_sign' | 'structure_block' | 'jigsaw' | 'composter' | 'target' | 'bee_nest' | 'beehive' | 'honey_block' | 'honeycomb_block' | 'netherite_block' | 'ancient_debris' | 'crying_obsidian' | 'respawn_anchor' | 'potted_crimson_fungus' | 'potted_warped_fungus' | 'potted_crimson_roots' | 'potted_warped_roots' | 'lodestone' | 'blackstone' | 'blackstone_stairs' | 'blackstone_wall' | 'blackstone_slab' | 'polished_blackstone' | 'polished_blackstone_bricks' | 'cracked_polished_blackstone_bricks' | 'chiseled_polished_blackstone' | 'polished_blackstone_brick_slab' | 'polished_blackstone_brick_stairs' | 'polished_blackstone_brick_wall' | 'gilded_blackstone' | 'polished_blackstone_stairs' | 'polished_blackstone_slab' | 'polished_blackstone_pressure_plate' | 'polished_blackstone_button' | 'polished_blackstone_wall' | 'chiseled_nether_bricks' | 'cracked_nether_bricks' | 'quartz_bricks' | 'candle' | 'white_candle' | 'orange_candle' | 'magenta_candle' | 'light_blue_candle' | 'yellow_candle' | 'lime_candle' | 'pink_candle' | 'gray_candle' | 'light_gray_candle' | 'cyan_candle' | 'purple_candle' | 'blue_candle' | 'brown_candle' | 'green_candle' | 'red_candle' | 'black_candle' | 'candle_cake' | 'white_candle_cake' | 'orange_candle_cake' | 'magenta_candle_cake' | 'light_blue_candle_cake' | 'yellow_candle_cake' | 'lime_candle_cake' | 'pink_candle_cake' | 'gray_candle_cake' | 'light_gray_candle_cake' | 'cyan_candle_cake' | 'purple_candle_cake' | 'blue_candle_cake' | 'brown_candle_cake' | 'green_candle_cake' | 'red_candle_cake' | 'black_candle_cake' | 'amethyst_block' | 'budding_amethyst' | 'amethyst_cluster' | 'large_amethyst_bud' | 'medium_amethyst_bud' | 'small_amethyst_bud' | 'tuff' | 'calcite' | 'tinted_glass' | 'powder_snow' | 'sculk_sensor' | 'calibrated_sculk_sensor' | 'sculk' | 'sculk_vein' | 'sculk_catalyst' | 'sculk_shrieker' | 'oxidized_copper' | 'weathered_copper' | 'exposed_copper' | 'copper_block' | 'copper_ore' | 'deepslate_copper_ore' | 'oxidized_cut_copper' | 'weathered_cut_copper' | 'exposed_cut_copper' | 'cut_copper' | 'oxidized_cut_copper_stairs' | 'weathered_cut_copper_stairs' | 'exposed_cut_copper_stairs' | 'cut_copper_stairs' | 'oxidized_cut_copper_slab' | 'weathered_cut_copper_slab' | 'exposed_cut_copper_slab' | 'cut_copper_slab' | 'waxed_copper_block' | 'waxed_weathered_copper' | 'waxed_exposed_copper' | 'waxed_oxidized_copper' | 'waxed_oxidized_cut_copper' | 'waxed_weathered_cut_copper' | 'waxed_exposed_cut_copper' | 'waxed_cut_copper' | 'waxed_oxidized_cut_copper_stairs' | 'waxed_weathered_cut_copper_stairs' | 'waxed_exposed_cut_copper_stairs' | 'waxed_cut_copper_stairs' | 'waxed_oxidized_cut_copper_slab' | 'waxed_weathered_cut_copper_slab' | 'waxed_exposed_cut_copper_slab' | 'waxed_cut_copper_slab' | 'lightning_rod' | 'pointed_dripstone' | 'dripstone_block' | 'cave_vines' | 'cave_vines_plant' | 'spore_blossom' | 'azalea' | 'flowering_azalea' | 'moss_carpet' | 'pink_petals' | 'moss_block' | 'big_dripleaf' | 'big_dripleaf_stem' | 'small_dripleaf' | 'hanging_roots' | 'rooted_dirt' | 'mud' | 'deepslate' | 'cobbled_deepslate' | 'cobbled_deepslate_stairs' | 'cobbled_deepslate_slab' | 'cobbled_deepslate_wall' | 'polished_deepslate' | 'polished_deepslate_stairs' | 'polished_deepslate_slab' | 'polished_deepslate_wall' | 'deepslate_tiles' | 'deepslate_tile_stairs' | 'deepslate_tile_slab' | 'deepslate_tile_wall' | 'deepslate_bricks' | 'deepslate_brick_stairs' | 'deepslate_brick_slab' | 'deepslate_brick_wall' | 'chiseled_deepslate' | 'cracked_deepslate_bricks' | 'cracked_deepslate_tiles' | 'infested_deepslate' | 'smooth_basalt' | 'raw_iron_block' | 'raw_copper_block' | 'raw_gold_block' | 'potted_azalea_bush' | 'potted_flowering_azalea_bush' | 'ochre_froglight' | 'verdant_froglight' | 'pearlescent_froglight' | 'frogspawn' | 'reinforced_deepslate' | 'decorated_pot'
-export type ItemNames = 'air' | 'stone' | 'granite' | 'polished_granite' | 'diorite' | 'polished_diorite' | 'andesite' | 'polished_andesite' | 'deepslate' | 'cobbled_deepslate' | 'polished_deepslate' | 'calcite' | 'tuff' | 'dripstone_block' | 'grass_block' | 'dirt' | 'coarse_dirt' | 'podzol' | 'rooted_dirt' | 'mud' | 'crimson_nylium' | 'warped_nylium' | 'cobblestone' | 'oak_planks' | 'spruce_planks' | 'birch_planks' | 'jungle_planks' | 'acacia_planks' | 'cherry_planks' | 'dark_oak_planks' | 'mangrove_planks' | 'bamboo_planks' | 'crimson_planks' | 'warped_planks' | 'bamboo_mosaic' | 'oak_sapling' | 'spruce_sapling' | 'birch_sapling' | 'jungle_sapling' | 'acacia_sapling' | 'cherry_sapling' | 'dark_oak_sapling' | 'mangrove_propagule' | 'bedrock' | 'sand' | 'suspicious_sand' | 'suspicious_gravel' | 'red_sand' | 'gravel' | 'coal_ore' | 'deepslate_coal_ore' | 'iron_ore' | 'deepslate_iron_ore' | 'copper_ore' | 'deepslate_copper_ore' | 'gold_ore' | 'deepslate_gold_ore' | 'redstone_ore' | 'deepslate_redstone_ore' | 'emerald_ore' | 'deepslate_emerald_ore' | 'lapis_ore' | 'deepslate_lapis_ore' | 'diamond_ore' | 'deepslate_diamond_ore' | 'nether_gold_ore' | 'nether_quartz_ore' | 'ancient_debris' | 'coal_block' | 'raw_iron_block' | 'raw_copper_block' | 'raw_gold_block' | 'amethyst_block' | 'budding_amethyst' | 'iron_block' | 'copper_block' | 'gold_block' | 'diamond_block' | 'netherite_block' | 'exposed_copper' | 'weathered_copper' | 'oxidized_copper' | 'cut_copper' | 'exposed_cut_copper' | 'weathered_cut_copper' | 'oxidized_cut_copper' | 'cut_copper_stairs' | 'exposed_cut_copper_stairs' | 'weathered_cut_copper_stairs' | 'oxidized_cut_copper_stairs' | 'cut_copper_slab' | 'exposed_cut_copper_slab' | 'weathered_cut_copper_slab' | 'oxidized_cut_copper_slab' | 'waxed_copper_block' | 'waxed_exposed_copper' | 'waxed_weathered_copper' | 'waxed_oxidized_copper' | 'waxed_cut_copper' | 'waxed_exposed_cut_copper' | 'waxed_weathered_cut_copper' | 'waxed_oxidized_cut_copper' | 'waxed_cut_copper_stairs' | 'waxed_exposed_cut_copper_stairs' | 'waxed_weathered_cut_copper_stairs' | 'waxed_oxidized_cut_copper_stairs' | 'waxed_cut_copper_slab' | 'waxed_exposed_cut_copper_slab' | 'waxed_weathered_cut_copper_slab' | 'waxed_oxidized_cut_copper_slab' | 'oak_log' | 'spruce_log' | 'birch_log' | 'jungle_log' | 'acacia_log' | 'cherry_log' | 'dark_oak_log' | 'mangrove_log' | 'mangrove_roots' | 'muddy_mangrove_roots' | 'crimson_stem' | 'warped_stem' | 'bamboo_block' | 'stripped_oak_log' | 'stripped_spruce_log' | 'stripped_birch_log' | 'stripped_jungle_log' | 'stripped_acacia_log' | 'stripped_cherry_log' | 'stripped_dark_oak_log' | 'stripped_mangrove_log' | 'stripped_crimson_stem' | 'stripped_warped_stem' | 'stripped_oak_wood' | 'stripped_spruce_wood' | 'stripped_birch_wood' | 'stripped_jungle_wood' | 'stripped_acacia_wood' | 'stripped_cherry_wood' | 'stripped_dark_oak_wood' | 'stripped_mangrove_wood' | 'stripped_crimson_hyphae' | 'stripped_warped_hyphae' | 'stripped_bamboo_block' | 'oak_wood' | 'spruce_wood' | 'birch_wood' | 'jungle_wood' | 'acacia_wood' | 'cherry_wood' | 'dark_oak_wood' | 'mangrove_wood' | 'crimson_hyphae' | 'warped_hyphae' | 'oak_leaves' | 'spruce_leaves' | 'birch_leaves' | 'jungle_leaves' | 'acacia_leaves' | 'cherry_leaves' | 'dark_oak_leaves' | 'mangrove_leaves' | 'azalea_leaves' | 'flowering_azalea_leaves' | 'sponge' | 'wet_sponge' | 'glass' | 'tinted_glass' | 'lapis_block' | 'sandstone' | 'chiseled_sandstone' | 'cut_sandstone' | 'cobweb' | 'grass' | 'fern' | 'azalea' | 'flowering_azalea' | 'dead_bush' | 'seagrass' | 'sea_pickle' | 'white_wool' | 'orange_wool' | 'magenta_wool' | 'light_blue_wool' | 'yellow_wool' | 'lime_wool' | 'pink_wool' | 'gray_wool' | 'light_gray_wool' | 'cyan_wool' | 'purple_wool' | 'blue_wool' | 'brown_wool' | 'green_wool' | 'red_wool' | 'black_wool' | 'dandelion' | 'poppy' | 'blue_orchid' | 'allium' | 'azure_bluet' | 'red_tulip' | 'orange_tulip' | 'white_tulip' | 'pink_tulip' | 'oxeye_daisy' | 'cornflower' | 'lily_of_the_valley' | 'wither_rose' | 'torchflower' | 'pitcher_plant' | 'spore_blossom' | 'brown_mushroom' | 'red_mushroom' | 'crimson_fungus' | 'warped_fungus' | 'crimson_roots' | 'warped_roots' | 'nether_sprouts' | 'weeping_vines' | 'twisting_vines' | 'sugar_cane' | 'kelp' | 'moss_carpet' | 'pink_petals' | 'moss_block' | 'hanging_roots' | 'big_dripleaf' | 'small_dripleaf' | 'bamboo' | 'oak_slab' | 'spruce_slab' | 'birch_slab' | 'jungle_slab' | 'acacia_slab' | 'cherry_slab' | 'dark_oak_slab' | 'mangrove_slab' | 'bamboo_slab' | 'bamboo_mosaic_slab' | 'crimson_slab' | 'warped_slab' | 'stone_slab' | 'smooth_stone_slab' | 'sandstone_slab' | 'cut_sandstone_slab' | 'petrified_oak_slab' | 'cobblestone_slab' | 'brick_slab' | 'stone_brick_slab' | 'mud_brick_slab' | 'nether_brick_slab' | 'quartz_slab' | 'red_sandstone_slab' | 'cut_red_sandstone_slab' | 'purpur_slab' | 'prismarine_slab' | 'prismarine_brick_slab' | 'dark_prismarine_slab' | 'smooth_quartz' | 'smooth_red_sandstone' | 'smooth_sandstone' | 'smooth_stone' | 'bricks' | 'bookshelf' | 'chiseled_bookshelf' | 'decorated_pot' | 'mossy_cobblestone' | 'obsidian' | 'torch' | 'end_rod' | 'chorus_plant' | 'chorus_flower' | 'purpur_block' | 'purpur_pillar' | 'purpur_stairs' | 'spawner' | 'chest' | 'crafting_table' | 'farmland' | 'furnace' | 'ladder' | 'cobblestone_stairs' | 'snow' | 'ice' | 'snow_block' | 'cactus' | 'clay' | 'jukebox' | 'oak_fence' | 'spruce_fence' | 'birch_fence' | 'jungle_fence' | 'acacia_fence' | 'cherry_fence' | 'dark_oak_fence' | 'mangrove_fence' | 'bamboo_fence' | 'crimson_fence' | 'warped_fence' | 'pumpkin' | 'carved_pumpkin' | 'jack_o_lantern' | 'netherrack' | 'soul_sand' | 'soul_soil' | 'basalt' | 'polished_basalt' | 'smooth_basalt' | 'soul_torch' | 'glowstone' | 'infested_stone' | 'infested_cobblestone' | 'infested_stone_bricks' | 'infested_mossy_stone_bricks' | 'infested_cracked_stone_bricks' | 'infested_chiseled_stone_bricks' | 'infested_deepslate' | 'stone_bricks' | 'mossy_stone_bricks' | 'cracked_stone_bricks' | 'chiseled_stone_bricks' | 'packed_mud' | 'mud_bricks' | 'deepslate_bricks' | 'cracked_deepslate_bricks' | 'deepslate_tiles' | 'cracked_deepslate_tiles' | 'chiseled_deepslate' | 'reinforced_deepslate' | 'brown_mushroom_block' | 'red_mushroom_block' | 'mushroom_stem' | 'iron_bars' | 'chain' | 'glass_pane' | 'melon' | 'vine' | 'glow_lichen' | 'brick_stairs' | 'stone_brick_stairs' | 'mud_brick_stairs' | 'mycelium' | 'lily_pad' | 'nether_bricks' | 'cracked_nether_bricks' | 'chiseled_nether_bricks' | 'nether_brick_fence' | 'nether_brick_stairs' | 'sculk' | 'sculk_vein' | 'sculk_catalyst' | 'sculk_shrieker' | 'enchanting_table' | 'end_portal_frame' | 'end_stone' | 'end_stone_bricks' | 'dragon_egg' | 'sandstone_stairs' | 'ender_chest' | 'emerald_block' | 'oak_stairs' | 'spruce_stairs' | 'birch_stairs' | 'jungle_stairs' | 'acacia_stairs' | 'cherry_stairs' | 'dark_oak_stairs' | 'mangrove_stairs' | 'bamboo_stairs' | 'bamboo_mosaic_stairs' | 'crimson_stairs' | 'warped_stairs' | 'command_block' | 'beacon' | 'cobblestone_wall' | 'mossy_cobblestone_wall' | 'brick_wall' | 'prismarine_wall' | 'red_sandstone_wall' | 'mossy_stone_brick_wall' | 'granite_wall' | 'stone_brick_wall' | 'mud_brick_wall' | 'nether_brick_wall' | 'andesite_wall' | 'red_nether_brick_wall' | 'sandstone_wall' | 'end_stone_brick_wall' | 'diorite_wall' | 'blackstone_wall' | 'polished_blackstone_wall' | 'polished_blackstone_brick_wall' | 'cobbled_deepslate_wall' | 'polished_deepslate_wall' | 'deepslate_brick_wall' | 'deepslate_tile_wall' | 'anvil' | 'chipped_anvil' | 'damaged_anvil' | 'chiseled_quartz_block' | 'quartz_block' | 'quartz_bricks' | 'quartz_pillar' | 'quartz_stairs' | 'white_terracotta' | 'orange_terracotta' | 'magenta_terracotta' | 'light_blue_terracotta' | 'yellow_terracotta' | 'lime_terracotta' | 'pink_terracotta' | 'gray_terracotta' | 'light_gray_terracotta' | 'cyan_terracotta' | 'purple_terracotta' | 'blue_terracotta' | 'brown_terracotta' | 'green_terracotta' | 'red_terracotta' | 'black_terracotta' | 'barrier' | 'light' | 'hay_block' | 'white_carpet' | 'orange_carpet' | 'magenta_carpet' | 'light_blue_carpet' | 'yellow_carpet' | 'lime_carpet' | 'pink_carpet' | 'gray_carpet' | 'light_gray_carpet' | 'cyan_carpet' | 'purple_carpet' | 'blue_carpet' | 'brown_carpet' | 'green_carpet' | 'red_carpet' | 'black_carpet' | 'terracotta' | 'packed_ice' | 'dirt_path' | 'sunflower' | 'lilac' | 'rose_bush' | 'peony' | 'tall_grass' | 'large_fern' | 'white_stained_glass' | 'orange_stained_glass' | 'magenta_stained_glass' | 'light_blue_stained_glass' | 'yellow_stained_glass' | 'lime_stained_glass' | 'pink_stained_glass' | 'gray_stained_glass' | 'light_gray_stained_glass' | 'cyan_stained_glass' | 'purple_stained_glass' | 'blue_stained_glass' | 'brown_stained_glass' | 'green_stained_glass' | 'red_stained_glass' | 'black_stained_glass' | 'white_stained_glass_pane' | 'orange_stained_glass_pane' | 'magenta_stained_glass_pane' | 'light_blue_stained_glass_pane' | 'yellow_stained_glass_pane' | 'lime_stained_glass_pane' | 'pink_stained_glass_pane' | 'gray_stained_glass_pane' | 'light_gray_stained_glass_pane' | 'cyan_stained_glass_pane' | 'purple_stained_glass_pane' | 'blue_stained_glass_pane' | 'brown_stained_glass_pane' | 'green_stained_glass_pane' | 'red_stained_glass_pane' | 'black_stained_glass_pane' | 'prismarine' | 'prismarine_bricks' | 'dark_prismarine' | 'prismarine_stairs' | 'prismarine_brick_stairs' | 'dark_prismarine_stairs' | 'sea_lantern' | 'red_sandstone' | 'chiseled_red_sandstone' | 'cut_red_sandstone' | 'red_sandstone_stairs' | 'repeating_command_block' | 'chain_command_block' | 'magma_block' | 'nether_wart_block' | 'warped_wart_block' | 'red_nether_bricks' | 'bone_block' | 'structure_void' | 'shulker_box' | 'white_shulker_box' | 'orange_shulker_box' | 'magenta_shulker_box' | 'light_blue_shulker_box' | 'yellow_shulker_box' | 'lime_shulker_box' | 'pink_shulker_box' | 'gray_shulker_box' | 'light_gray_shulker_box' | 'cyan_shulker_box' | 'purple_shulker_box' | 'blue_shulker_box' | 'brown_shulker_box' | 'green_shulker_box' | 'red_shulker_box' | 'black_shulker_box' | 'white_glazed_terracotta' | 'orange_glazed_terracotta' | 'magenta_glazed_terracotta' | 'light_blue_glazed_terracotta' | 'yellow_glazed_terracotta' | 'lime_glazed_terracotta' | 'pink_glazed_terracotta' | 'gray_glazed_terracotta' | 'light_gray_glazed_terracotta' | 'cyan_glazed_terracotta' | 'purple_glazed_terracotta' | 'blue_glazed_terracotta' | 'brown_glazed_terracotta' | 'green_glazed_terracotta' | 'red_glazed_terracotta' | 'black_glazed_terracotta' | 'white_concrete' | 'orange_concrete' | 'magenta_concrete' | 'light_blue_concrete' | 'yellow_concrete' | 'lime_concrete' | 'pink_concrete' | 'gray_concrete' | 'light_gray_concrete' | 'cyan_concrete' | 'purple_concrete' | 'blue_concrete' | 'brown_concrete' | 'green_concrete' | 'red_concrete' | 'black_concrete' | 'white_concrete_powder' | 'orange_concrete_powder' | 'magenta_concrete_powder' | 'light_blue_concrete_powder' | 'yellow_concrete_powder' | 'lime_concrete_powder' | 'pink_concrete_powder' | 'gray_concrete_powder' | 'light_gray_concrete_powder' | 'cyan_concrete_powder' | 'purple_concrete_powder' | 'blue_concrete_powder' | 'brown_concrete_powder' | 'green_concrete_powder' | 'red_concrete_powder' | 'black_concrete_powder' | 'turtle_egg' | 'sniffer_egg' | 'dead_tube_coral_block' | 'dead_brain_coral_block' | 'dead_bubble_coral_block' | 'dead_fire_coral_block' | 'dead_horn_coral_block' | 'tube_coral_block' | 'brain_coral_block' | 'bubble_coral_block' | 'fire_coral_block' | 'horn_coral_block' | 'tube_coral' | 'brain_coral' | 'bubble_coral' | 'fire_coral' | 'horn_coral' | 'dead_brain_coral' | 'dead_bubble_coral' | 'dead_fire_coral' | 'dead_horn_coral' | 'dead_tube_coral' | 'tube_coral_fan' | 'brain_coral_fan' | 'bubble_coral_fan' | 'fire_coral_fan' | 'horn_coral_fan' | 'dead_tube_coral_fan' | 'dead_brain_coral_fan' | 'dead_bubble_coral_fan' | 'dead_fire_coral_fan' | 'dead_horn_coral_fan' | 'blue_ice' | 'conduit' | 'polished_granite_stairs' | 'smooth_red_sandstone_stairs' | 'mossy_stone_brick_stairs' | 'polished_diorite_stairs' | 'mossy_cobblestone_stairs' | 'end_stone_brick_stairs' | 'stone_stairs' | 'smooth_sandstone_stairs' | 'smooth_quartz_stairs' | 'granite_stairs' | 'andesite_stairs' | 'red_nether_brick_stairs' | 'polished_andesite_stairs' | 'diorite_stairs' | 'cobbled_deepslate_stairs' | 'polished_deepslate_stairs' | 'deepslate_brick_stairs' | 'deepslate_tile_stairs' | 'polished_granite_slab' | 'smooth_red_sandstone_slab' | 'mossy_stone_brick_slab' | 'polished_diorite_slab' | 'mossy_cobblestone_slab' | 'end_stone_brick_slab' | 'smooth_sandstone_slab' | 'smooth_quartz_slab' | 'granite_slab' | 'andesite_slab' | 'red_nether_brick_slab' | 'polished_andesite_slab' | 'diorite_slab' | 'cobbled_deepslate_slab' | 'polished_deepslate_slab' | 'deepslate_brick_slab' | 'deepslate_tile_slab' | 'scaffolding' | 'redstone' | 'redstone_torch' | 'redstone_block' | 'repeater' | 'comparator' | 'piston' | 'sticky_piston' | 'slime_block' | 'honey_block' | 'observer' | 'hopper' | 'dispenser' | 'dropper' | 'lectern' | 'target' | 'lever' | 'lightning_rod' | 'daylight_detector' | 'sculk_sensor' | 'calibrated_sculk_sensor' | 'tripwire_hook' | 'trapped_chest' | 'tnt' | 'redstone_lamp' | 'note_block' | 'stone_button' | 'polished_blackstone_button' | 'oak_button' | 'spruce_button' | 'birch_button' | 'jungle_button' | 'acacia_button' | 'cherry_button' | 'dark_oak_button' | 'mangrove_button' | 'bamboo_button' | 'crimson_button' | 'warped_button' | 'stone_pressure_plate' | 'polished_blackstone_pressure_plate' | 'light_weighted_pressure_plate' | 'heavy_weighted_pressure_plate' | 'oak_pressure_plate' | 'spruce_pressure_plate' | 'birch_pressure_plate' | 'jungle_pressure_plate' | 'acacia_pressure_plate' | 'cherry_pressure_plate' | 'dark_oak_pressure_plate' | 'mangrove_pressure_plate' | 'bamboo_pressure_plate' | 'crimson_pressure_plate' | 'warped_pressure_plate' | 'iron_door' | 'oak_door' | 'spruce_door' | 'birch_door' | 'jungle_door' | 'acacia_door' | 'cherry_door' | 'dark_oak_door' | 'mangrove_door' | 'bamboo_door' | 'crimson_door' | 'warped_door' | 'iron_trapdoor' | 'oak_trapdoor' | 'spruce_trapdoor' | 'birch_trapdoor' | 'jungle_trapdoor' | 'acacia_trapdoor' | 'cherry_trapdoor' | 'dark_oak_trapdoor' | 'mangrove_trapdoor' | 'bamboo_trapdoor' | 'crimson_trapdoor' | 'warped_trapdoor' | 'oak_fence_gate' | 'spruce_fence_gate' | 'birch_fence_gate' | 'jungle_fence_gate' | 'acacia_fence_gate' | 'cherry_fence_gate' | 'dark_oak_fence_gate' | 'mangrove_fence_gate' | 'bamboo_fence_gate' | 'crimson_fence_gate' | 'warped_fence_gate' | 'powered_rail' | 'detector_rail' | 'rail' | 'activator_rail' | 'saddle' | 'minecart' | 'chest_minecart' | 'furnace_minecart' | 'tnt_minecart' | 'hopper_minecart' | 'carrot_on_a_stick' | 'warped_fungus_on_a_stick' | 'elytra' | 'oak_boat' | 'oak_chest_boat' | 'spruce_boat' | 'spruce_chest_boat' | 'birch_boat' | 'birch_chest_boat' | 'jungle_boat' | 'jungle_chest_boat' | 'acacia_boat' | 'acacia_chest_boat' | 'cherry_boat' | 'cherry_chest_boat' | 'dark_oak_boat' | 'dark_oak_chest_boat' | 'mangrove_boat' | 'mangrove_chest_boat' | 'bamboo_raft' | 'bamboo_chest_raft' | 'structure_block' | 'jigsaw' | 'turtle_helmet' | 'scute' | 'flint_and_steel' | 'apple' | 'bow' | 'arrow' | 'coal' | 'charcoal' | 'diamond' | 'emerald' | 'lapis_lazuli' | 'quartz' | 'amethyst_shard' | 'raw_iron' | 'iron_ingot' | 'raw_copper' | 'copper_ingot' | 'raw_gold' | 'gold_ingot' | 'netherite_ingot' | 'netherite_scrap' | 'wooden_sword' | 'wooden_shovel' | 'wooden_pickaxe' | 'wooden_axe' | 'wooden_hoe' | 'stone_sword' | 'stone_shovel' | 'stone_pickaxe' | 'stone_axe' | 'stone_hoe' | 'golden_sword' | 'golden_shovel' | 'golden_pickaxe' | 'golden_axe' | 'golden_hoe' | 'iron_sword' | 'iron_shovel' | 'iron_pickaxe' | 'iron_axe' | 'iron_hoe' | 'diamond_sword' | 'diamond_shovel' | 'diamond_pickaxe' | 'diamond_axe' | 'diamond_hoe' | 'netherite_sword' | 'netherite_shovel' | 'netherite_pickaxe' | 'netherite_axe' | 'netherite_hoe' | 'stick' | 'bowl' | 'mushroom_stew' | 'string' | 'feather' | 'gunpowder' | 'wheat_seeds' | 'wheat' | 'bread' | 'leather_helmet' | 'leather_chestplate' | 'leather_leggings' | 'leather_boots' | 'chainmail_helmet' | 'chainmail_chestplate' | 'chainmail_leggings' | 'chainmail_boots' | 'iron_helmet' | 'iron_chestplate' | 'iron_leggings' | 'iron_boots' | 'diamond_helmet' | 'diamond_chestplate' | 'diamond_leggings' | 'diamond_boots' | 'golden_helmet' | 'golden_chestplate' | 'golden_leggings' | 'golden_boots' | 'netherite_helmet' | 'netherite_chestplate' | 'netherite_leggings' | 'netherite_boots' | 'flint' | 'porkchop' | 'cooked_porkchop' | 'painting' | 'golden_apple' | 'enchanted_golden_apple' | 'oak_sign' | 'spruce_sign' | 'birch_sign' | 'jungle_sign' | 'acacia_sign' | 'cherry_sign' | 'dark_oak_sign' | 'mangrove_sign' | 'bamboo_sign' | 'crimson_sign' | 'warped_sign' | 'oak_hanging_sign' | 'spruce_hanging_sign' | 'birch_hanging_sign' | 'jungle_hanging_sign' | 'acacia_hanging_sign' | 'cherry_hanging_sign' | 'dark_oak_hanging_sign' | 'mangrove_hanging_sign' | 'bamboo_hanging_sign' | 'crimson_hanging_sign' | 'warped_hanging_sign' | 'bucket' | 'water_bucket' | 'lava_bucket' | 'powder_snow_bucket' | 'snowball' | 'leather' | 'milk_bucket' | 'pufferfish_bucket' | 'salmon_bucket' | 'cod_bucket' | 'tropical_fish_bucket' | 'axolotl_bucket' | 'tadpole_bucket' | 'brick' | 'clay_ball' | 'dried_kelp_block' | 'paper' | 'book' | 'slime_ball' | 'egg' | 'compass' | 'recovery_compass' | 'bundle' | 'fishing_rod' | 'clock' | 'spyglass' | 'glowstone_dust' | 'cod' | 'salmon' | 'tropical_fish' | 'pufferfish' | 'cooked_cod' | 'cooked_salmon' | 'ink_sac' | 'glow_ink_sac' | 'cocoa_beans' | 'white_dye' | 'orange_dye' | 'magenta_dye' | 'light_blue_dye' | 'yellow_dye' | 'lime_dye' | 'pink_dye' | 'gray_dye' | 'light_gray_dye' | 'cyan_dye' | 'purple_dye' | 'blue_dye' | 'brown_dye' | 'green_dye' | 'red_dye' | 'black_dye' | 'bone_meal' | 'bone' | 'sugar' | 'cake' | 'white_bed' | 'orange_bed' | 'magenta_bed' | 'light_blue_bed' | 'yellow_bed' | 'lime_bed' | 'pink_bed' | 'gray_bed' | 'light_gray_bed' | 'cyan_bed' | 'purple_bed' | 'blue_bed' | 'brown_bed' | 'green_bed' | 'red_bed' | 'black_bed' | 'cookie' | 'filled_map' | 'shears' | 'melon_slice' | 'dried_kelp' | 'pumpkin_seeds' | 'melon_seeds' | 'beef' | 'cooked_beef' | 'chicken' | 'cooked_chicken' | 'rotten_flesh' | 'ender_pearl' | 'blaze_rod' | 'ghast_tear' | 'gold_nugget' | 'nether_wart' | 'potion' | 'glass_bottle' | 'spider_eye' | 'fermented_spider_eye' | 'blaze_powder' | 'magma_cream' | 'brewing_stand' | 'cauldron' | 'ender_eye' | 'glistering_melon_slice' | 'allay_spawn_egg' | 'axolotl_spawn_egg' | 'bat_spawn_egg' | 'bee_spawn_egg' | 'blaze_spawn_egg' | 'cat_spawn_egg' | 'camel_spawn_egg' | 'cave_spider_spawn_egg' | 'chicken_spawn_egg' | 'cod_spawn_egg' | 'cow_spawn_egg' | 'creeper_spawn_egg' | 'dolphin_spawn_egg' | 'donkey_spawn_egg' | 'drowned_spawn_egg' | 'elder_guardian_spawn_egg' | 'ender_dragon_spawn_egg' | 'enderman_spawn_egg' | 'endermite_spawn_egg' | 'evoker_spawn_egg' | 'fox_spawn_egg' | 'frog_spawn_egg' | 'ghast_spawn_egg' | 'glow_squid_spawn_egg' | 'goat_spawn_egg' | 'guardian_spawn_egg' | 'hoglin_spawn_egg' | 'horse_spawn_egg' | 'husk_spawn_egg' | 'iron_golem_spawn_egg' | 'llama_spawn_egg' | 'magma_cube_spawn_egg' | 'mooshroom_spawn_egg' | 'mule_spawn_egg' | 'ocelot_spawn_egg' | 'panda_spawn_egg' | 'parrot_spawn_egg' | 'phantom_spawn_egg' | 'pig_spawn_egg' | 'piglin_spawn_egg' | 'piglin_brute_spawn_egg' | 'pillager_spawn_egg' | 'polar_bear_spawn_egg' | 'pufferfish_spawn_egg' | 'rabbit_spawn_egg' | 'ravager_spawn_egg' | 'salmon_spawn_egg' | 'sheep_spawn_egg' | 'shulker_spawn_egg' | 'silverfish_spawn_egg' | 'skeleton_spawn_egg' | 'skeleton_horse_spawn_egg' | 'slime_spawn_egg' | 'sniffer_spawn_egg' | 'snow_golem_spawn_egg' | 'spider_spawn_egg' | 'squid_spawn_egg' | 'stray_spawn_egg' | 'strider_spawn_egg' | 'tadpole_spawn_egg' | 'trader_llama_spawn_egg' | 'tropical_fish_spawn_egg' | 'turtle_spawn_egg' | 'vex_spawn_egg' | 'villager_spawn_egg' | 'vindicator_spawn_egg' | 'wandering_trader_spawn_egg' | 'warden_spawn_egg' | 'witch_spawn_egg' | 'wither_spawn_egg' | 'wither_skeleton_spawn_egg' | 'wolf_spawn_egg' | 'zoglin_spawn_egg' | 'zombie_spawn_egg' | 'zombie_horse_spawn_egg' | 'zombie_villager_spawn_egg' | 'zombified_piglin_spawn_egg' | 'experience_bottle' | 'fire_charge' | 'writable_book' | 'written_book' | 'item_frame' | 'glow_item_frame' | 'flower_pot' | 'carrot' | 'potato' | 'baked_potato' | 'poisonous_potato' | 'map' | 'golden_carrot' | 'skeleton_skull' | 'wither_skeleton_skull' | 'player_head' | 'zombie_head' | 'creeper_head' | 'dragon_head' | 'piglin_head' | 'nether_star' | 'pumpkin_pie' | 'firework_rocket' | 'firework_star' | 'enchanted_book' | 'nether_brick' | 'prismarine_shard' | 'prismarine_crystals' | 'rabbit' | 'cooked_rabbit' | 'rabbit_stew' | 'rabbit_foot' | 'rabbit_hide' | 'armor_stand' | 'iron_horse_armor' | 'golden_horse_armor' | 'diamond_horse_armor' | 'leather_horse_armor' | 'lead' | 'name_tag' | 'command_block_minecart' | 'mutton' | 'cooked_mutton' | 'white_banner' | 'orange_banner' | 'magenta_banner' | 'light_blue_banner' | 'yellow_banner' | 'lime_banner' | 'pink_banner' | 'gray_banner' | 'light_gray_banner' | 'cyan_banner' | 'purple_banner' | 'blue_banner' | 'brown_banner' | 'green_banner' | 'red_banner' | 'black_banner' | 'end_crystal' | 'chorus_fruit' | 'popped_chorus_fruit' | 'torchflower_seeds' | 'pitcher_pod' | 'beetroot' | 'beetroot_seeds' | 'beetroot_soup' | 'dragon_breath' | 'splash_potion' | 'spectral_arrow' | 'tipped_arrow' | 'lingering_potion' | 'shield' | 'totem_of_undying' | 'shulker_shell' | 'iron_nugget' | 'knowledge_book' | 'debug_stick' | 'music_disc_13' | 'music_disc_cat' | 'music_disc_blocks' | 'music_disc_chirp' | 'music_disc_far' | 'music_disc_mall' | 'music_disc_mellohi' | 'music_disc_stal' | 'music_disc_strad' | 'music_disc_ward' | 'music_disc_11' | 'music_disc_wait' | 'music_disc_otherside' | 'music_disc_relic' | 'music_disc_5' | 'music_disc_pigstep' | 'disc_fragment_5' | 'trident' | 'phantom_membrane' | 'nautilus_shell' | 'heart_of_the_sea' | 'crossbow' | 'suspicious_stew' | 'loom' | 'flower_banner_pattern' | 'creeper_banner_pattern' | 'skull_banner_pattern' | 'mojang_banner_pattern' | 'globe_banner_pattern' | 'piglin_banner_pattern' | 'goat_horn' | 'composter' | 'barrel' | 'smoker' | 'blast_furnace' | 'cartography_table' | 'fletching_table' | 'grindstone' | 'smithing_table' | 'stonecutter' | 'bell' | 'lantern' | 'soul_lantern' | 'sweet_berries' | 'glow_berries' | 'campfire' | 'soul_campfire' | 'shroomlight' | 'honeycomb' | 'bee_nest' | 'beehive' | 'honey_bottle' | 'honeycomb_block' | 'lodestone' | 'crying_obsidian' | 'blackstone' | 'blackstone_slab' | 'blackstone_stairs' | 'gilded_blackstone' | 'polished_blackstone' | 'polished_blackstone_slab' | 'polished_blackstone_stairs' | 'chiseled_polished_blackstone' | 'polished_blackstone_bricks' | 'polished_blackstone_brick_slab' | 'polished_blackstone_brick_stairs' | 'cracked_polished_blackstone_bricks' | 'respawn_anchor' | 'candle' | 'white_candle' | 'orange_candle' | 'magenta_candle' | 'light_blue_candle' | 'yellow_candle' | 'lime_candle' | 'pink_candle' | 'gray_candle' | 'light_gray_candle' | 'cyan_candle' | 'purple_candle' | 'blue_candle' | 'brown_candle' | 'green_candle' | 'red_candle' | 'black_candle' | 'small_amethyst_bud' | 'medium_amethyst_bud' | 'large_amethyst_bud' | 'amethyst_cluster' | 'pointed_dripstone' | 'ochre_froglight' | 'verdant_froglight' | 'pearlescent_froglight' | 'frogspawn' | 'echo_shard' | 'brush' | 'netherite_upgrade_smithing_template' | 'sentry_armor_trim_smithing_template' | 'dune_armor_trim_smithing_template' | 'coast_armor_trim_smithing_template' | 'wild_armor_trim_smithing_template' | 'ward_armor_trim_smithing_template' | 'eye_armor_trim_smithing_template' | 'vex_armor_trim_smithing_template' | 'tide_armor_trim_smithing_template' | 'snout_armor_trim_smithing_template' | 'rib_armor_trim_smithing_template' | 'spire_armor_trim_smithing_template' | 'wayfinder_armor_trim_smithing_template' | 'shaper_armor_trim_smithing_template' | 'silence_armor_trim_smithing_template' | 'raiser_armor_trim_smithing_template' | 'host_armor_trim_smithing_template' | 'angler_pottery_sherd' | 'archer_pottery_sherd' | 'arms_up_pottery_sherd' | 'blade_pottery_sherd' | 'brewer_pottery_sherd' | 'burn_pottery_sherd' | 'danger_pottery_sherd' | 'explorer_pottery_sherd' | 'friend_pottery_sherd' | 'heart_pottery_sherd' | 'heartbreak_pottery_sherd' | 'howl_pottery_sherd' | 'miner_pottery_sherd' | 'mourner_pottery_sherd' | 'plenty_pottery_sherd' | 'prize_pottery_sherd' | 'sheaf_pottery_sherd' | 'shelter_pottery_sherd' | 'skull_pottery_sherd' | 'snort_pottery_sherd'
-export type EntityNames = 'allay' | 'area_effect_cloud' | 'armor_stand' | 'arrow' | 'axolotl' | 'bat' | 'bee' | 'blaze' | 'block_display' | 'boat' | 'camel' | 'cat' | 'cave_spider' | 'chest_boat' | 'chest_minecart' | 'chicken' | 'cod' | 'command_block_minecart' | 'cow' | 'creeper' | 'dolphin' | 'donkey' | 'dragon_fireball' | 'drowned' | 'egg' | 'elder_guardian' | 'end_crystal' | 'ender_dragon' | 'ender_pearl' | 'enderman' | 'endermite' | 'evoker' | 'evoker_fangs' | 'experience_bottle' | 'experience_orb' | 'eye_of_ender' | 'falling_block' | 'firework_rocket' | 'fox' | 'frog' | 'furnace_minecart' | 'ghast' | 'giant' | 'glow_item_frame' | 'glow_squid' | 'goat' | 'guardian' | 'hoglin' | 'hopper_minecart' | 'horse' | 'husk' | 'illusioner' | 'interaction' | 'iron_golem' | 'item' | 'item_display' | 'item_frame' | 'fireball' | 'leash_knot' | 'lightning_bolt' | 'llama' | 'llama_spit' | 'magma_cube' | 'marker' | 'minecart' | 'mooshroom' | 'mule' | 'ocelot' | 'painting' | 'panda' | 'parrot' | 'phantom' | 'pig' | 'piglin' | 'piglin_brute' | 'pillager' | 'polar_bear' | 'potion' | 'pufferfish' | 'rabbit' | 'ravager' | 'salmon' | 'sheep' | 'shulker' | 'shulker_bullet' | 'silverfish' | 'skeleton' | 'skeleton_horse' | 'slime' | 'small_fireball' | 'sniffer' | 'snow_golem' | 'snowball' | 'spawner_minecart' | 'spectral_arrow' | 'spider' | 'squid' | 'stray' | 'strider' | 'tadpole' | 'text_display' | 'tnt' | 'tnt_minecart' | 'trader_llama' | 'trident' | 'tropical_fish' | 'turtle' | 'vex' | 'villager' | 'vindicator' | 'wandering_trader' | 'warden' | 'witch' | 'wither' | 'wither_skeleton' | 'wither_skull' | 'wolf' | 'zoglin' | 'zombie' | 'zombie_horse' | 'zombie_villager' | 'zombified_piglin' | 'player' | 'fishing_bobber'
-export type BiomesNames = 'badlands' | 'bamboo_jungle' | 'basalt_deltas' | 'beach' | 'birch_forest' | 'cherry_grove' | 'cold_ocean' | 'crimson_forest' | 'dark_forest' | 'deep_cold_ocean' | 'deep_dark' | 'deep_frozen_ocean' | 'deep_lukewarm_ocean' | 'deep_ocean' | 'desert' | 'dripstone_caves' | 'end_barrens' | 'end_highlands' | 'end_midlands' | 'eroded_badlands' | 'flower_forest' | 'forest' | 'frozen_ocean' | 'frozen_peaks' | 'frozen_river' | 'grove' | 'ice_spikes' | 'jagged_peaks' | 'jungle' | 'lukewarm_ocean' | 'lush_caves' | 'mangrove_swamp' | 'meadow' | 'mushroom_fields' | 'nether_wastes' | 'ocean' | 'old_growth_birch_forest' | 'old_growth_pine_taiga' | 'old_growth_spruce_taiga' | 'plains' | 'river' | 'savanna' | 'savanna_plateau' | 'small_end_islands' | 'snowy_beach' | 'snowy_plains' | 'snowy_slopes' | 'snowy_taiga' | 'soul_sand_valley' | 'sparse_jungle' | 'stony_peaks' | 'stony_shore' | 'sunflower_plains' | 'swamp' | 'taiga' | 'the_end' | 'the_void' | 'warm_ocean' | 'warped_forest' | 'windswept_forest' | 'windswept_gravelly_hills' | 'windswept_hills' | 'windswept_savanna' | 'wooded_badlands'
-export type EnchantmentNames = 'protection' | 'fire_protection' | 'feather_falling' | 'blast_protection' | 'projectile_protection' | 'respiration' | 'aqua_affinity' | 'thorns' | 'depth_strider' | 'frost_walker' | 'binding_curse' | 'soul_speed' | 'swift_sneak' | 'sharpness' | 'smite' | 'bane_of_arthropods' | 'knockback' | 'fire_aspect' | 'looting' | 'sweeping' | 'efficiency' | 'silk_touch' | 'unbreaking' | 'fortune' | 'power' | 'punch' | 'flame' | 'infinity' | 'luck_of_the_sea' | 'lure' | 'loyalty' | 'impaling' | 'riptide' | 'channeling' | 'multishot' | 'quick_charge' | 'piercing' | 'mending' | 'vanishing_curse'
+export type BlockNames = 'air' | 'stone' | 'granite' | 'polished_granite' | 'diorite' | 'polished_diorite' | 'andesite' | 'polished_andesite' | 'grass_block' | 'dirt' | 'coarse_dirt' | 'podzol' | 'cobblestone' | 'oak_planks' | 'spruce_planks' | 'birch_planks' | 'jungle_planks' | 'acacia_planks' | 'cherry_planks' | 'dark_oak_planks' | 'mangrove_planks' | 'bamboo_planks' | 'bamboo_mosaic' | 'oak_sapling' | 'spruce_sapling' | 'birch_sapling' | 'jungle_sapling' | 'acacia_sapling' | 'cherry_sapling' | 'dark_oak_sapling' | 'mangrove_propagule' | 'bedrock' | 'water' | 'lava' | 'sand' | 'suspicious_sand' | 'red_sand' | 'gravel' | 'suspicious_gravel' | 'gold_ore' | 'deepslate_gold_ore' | 'iron_ore' | 'deepslate_iron_ore' | 'coal_ore' | 'deepslate_coal_ore' | 'nether_gold_ore' | 'oak_log' | 'spruce_log' | 'birch_log' | 'jungle_log' | 'acacia_log' | 'cherry_log' | 'dark_oak_log' | 'mangrove_log' | 'mangrove_roots' | 'muddy_mangrove_roots' | 'bamboo_block' | 'stripped_spruce_log' | 'stripped_birch_log' | 'stripped_jungle_log' | 'stripped_acacia_log' | 'stripped_cherry_log' | 'stripped_dark_oak_log' | 'stripped_oak_log' | 'stripped_mangrove_log' | 'stripped_bamboo_block' | 'oak_wood' | 'spruce_wood' | 'birch_wood' | 'jungle_wood' | 'acacia_wood' | 'cherry_wood' | 'dark_oak_wood' | 'mangrove_wood' | 'stripped_oak_wood' | 'stripped_spruce_wood' | 'stripped_birch_wood' | 'stripped_jungle_wood' | 'stripped_acacia_wood' | 'stripped_cherry_wood' | 'stripped_dark_oak_wood' | 'stripped_mangrove_wood' | 'oak_leaves' | 'spruce_leaves' | 'birch_leaves' | 'jungle_leaves' | 'acacia_leaves' | 'cherry_leaves' | 'dark_oak_leaves' | 'mangrove_leaves' | 'azalea_leaves' | 'flowering_azalea_leaves' | 'sponge' | 'wet_sponge' | 'glass' | 'lapis_ore' | 'deepslate_lapis_ore' | 'lapis_block' | 'dispenser' | 'sandstone' | 'chiseled_sandstone' | 'cut_sandstone' | 'note_block' | 'white_bed' | 'orange_bed' | 'magenta_bed' | 'light_blue_bed' | 'yellow_bed' | 'lime_bed' | 'pink_bed' | 'gray_bed' | 'light_gray_bed' | 'cyan_bed' | 'purple_bed' | 'blue_bed' | 'brown_bed' | 'green_bed' | 'red_bed' | 'black_bed' | 'powered_rail' | 'detector_rail' | 'sticky_piston' | 'cobweb' | 'grass' | 'fern' | 'dead_bush' | 'seagrass' | 'tall_seagrass' | 'piston' | 'piston_head' | 'white_wool' | 'orange_wool' | 'magenta_wool' | 'light_blue_wool' | 'yellow_wool' | 'lime_wool' | 'pink_wool' | 'gray_wool' | 'light_gray_wool' | 'cyan_wool' | 'purple_wool' | 'blue_wool' | 'brown_wool' | 'green_wool' | 'red_wool' | 'black_wool' | 'moving_piston' | 'dandelion' | 'torchflower' | 'poppy' | 'blue_orchid' | 'allium' | 'azure_bluet' | 'red_tulip' | 'orange_tulip' | 'white_tulip' | 'pink_tulip' | 'oxeye_daisy' | 'cornflower' | 'wither_rose' | 'lily_of_the_valley' | 'brown_mushroom' | 'red_mushroom' | 'gold_block' | 'iron_block' | 'bricks' | 'tnt' | 'bookshelf' | 'chiseled_bookshelf' | 'mossy_cobblestone' | 'obsidian' | 'torch' | 'wall_torch' | 'fire' | 'soul_fire' | 'spawner' | 'oak_stairs' | 'chest' | 'redstone_wire' | 'diamond_ore' | 'deepslate_diamond_ore' | 'diamond_block' | 'crafting_table' | 'wheat' | 'farmland' | 'furnace' | 'oak_sign' | 'spruce_sign' | 'birch_sign' | 'acacia_sign' | 'cherry_sign' | 'jungle_sign' | 'dark_oak_sign' | 'mangrove_sign' | 'bamboo_sign' | 'oak_door' | 'ladder' | 'rail' | 'cobblestone_stairs' | 'oak_wall_sign' | 'spruce_wall_sign' | 'birch_wall_sign' | 'acacia_wall_sign' | 'cherry_wall_sign' | 'jungle_wall_sign' | 'dark_oak_wall_sign' | 'mangrove_wall_sign' | 'bamboo_wall_sign' | 'oak_hanging_sign' | 'spruce_hanging_sign' | 'birch_hanging_sign' | 'acacia_hanging_sign' | 'cherry_hanging_sign' | 'jungle_hanging_sign' | 'dark_oak_hanging_sign' | 'crimson_hanging_sign' | 'warped_hanging_sign' | 'mangrove_hanging_sign' | 'bamboo_hanging_sign' | 'oak_wall_hanging_sign' | 'spruce_wall_hanging_sign' | 'birch_wall_hanging_sign' | 'acacia_wall_hanging_sign' | 'cherry_wall_hanging_sign' | 'jungle_wall_hanging_sign' | 'dark_oak_wall_hanging_sign' | 'mangrove_wall_hanging_sign' | 'crimson_wall_hanging_sign' | 'warped_wall_hanging_sign' | 'bamboo_wall_hanging_sign' | 'lever' | 'stone_pressure_plate' | 'iron_door' | 'oak_pressure_plate' | 'spruce_pressure_plate' | 'birch_pressure_plate' | 'jungle_pressure_plate' | 'acacia_pressure_plate' | 'cherry_pressure_plate' | 'dark_oak_pressure_plate' | 'mangrove_pressure_plate' | 'bamboo_pressure_plate' | 'redstone_ore' | 'deepslate_redstone_ore' | 'redstone_torch' | 'redstone_wall_torch' | 'stone_button' | 'snow' | 'ice' | 'snow_block' | 'cactus' | 'clay' | 'sugar_cane' | 'jukebox' | 'oak_fence' | 'pumpkin' | 'netherrack' | 'soul_sand' | 'soul_soil' | 'basalt' | 'polished_basalt' | 'soul_torch' | 'soul_wall_torch' | 'glowstone' | 'nether_portal' | 'carved_pumpkin' | 'jack_o_lantern' | 'cake' | 'repeater' | 'white_stained_glass' | 'orange_stained_glass' | 'magenta_stained_glass' | 'light_blue_stained_glass' | 'yellow_stained_glass' | 'lime_stained_glass' | 'pink_stained_glass' | 'gray_stained_glass' | 'light_gray_stained_glass' | 'cyan_stained_glass' | 'purple_stained_glass' | 'blue_stained_glass' | 'brown_stained_glass' | 'green_stained_glass' | 'red_stained_glass' | 'black_stained_glass' | 'oak_trapdoor' | 'spruce_trapdoor' | 'birch_trapdoor' | 'jungle_trapdoor' | 'acacia_trapdoor' | 'cherry_trapdoor' | 'dark_oak_trapdoor' | 'mangrove_trapdoor' | 'bamboo_trapdoor' | 'stone_bricks' | 'mossy_stone_bricks' | 'cracked_stone_bricks' | 'chiseled_stone_bricks' | 'packed_mud' | 'mud_bricks' | 'infested_stone' | 'infested_cobblestone' | 'infested_stone_bricks' | 'infested_mossy_stone_bricks' | 'infested_cracked_stone_bricks' | 'infested_chiseled_stone_bricks' | 'brown_mushroom_block' | 'red_mushroom_block' | 'mushroom_stem' | 'iron_bars' | 'chain' | 'glass_pane' | 'melon' | 'attached_pumpkin_stem' | 'attached_melon_stem' | 'pumpkin_stem' | 'melon_stem' | 'vine' | 'glow_lichen' | 'oak_fence_gate' | 'brick_stairs' | 'stone_brick_stairs' | 'mud_brick_stairs' | 'mycelium' | 'lily_pad' | 'nether_bricks' | 'nether_brick_fence' | 'nether_brick_stairs' | 'nether_wart' | 'enchanting_table' | 'brewing_stand' | 'cauldron' | 'water_cauldron' | 'lava_cauldron' | 'powder_snow_cauldron' | 'end_portal' | 'end_portal_frame' | 'end_stone' | 'dragon_egg' | 'redstone_lamp' | 'cocoa' | 'sandstone_stairs' | 'emerald_ore' | 'deepslate_emerald_ore' | 'ender_chest' | 'tripwire_hook' | 'tripwire' | 'emerald_block' | 'spruce_stairs' | 'birch_stairs' | 'jungle_stairs' | 'command_block' | 'beacon' | 'cobblestone_wall' | 'mossy_cobblestone_wall' | 'flower_pot' | 'potted_torchflower' | 'potted_oak_sapling' | 'potted_spruce_sapling' | 'potted_birch_sapling' | 'potted_jungle_sapling' | 'potted_acacia_sapling' | 'potted_cherry_sapling' | 'potted_dark_oak_sapling' | 'potted_mangrove_propagule' | 'potted_fern' | 'potted_dandelion' | 'potted_poppy' | 'potted_blue_orchid' | 'potted_allium' | 'potted_azure_bluet' | 'potted_red_tulip' | 'potted_orange_tulip' | 'potted_white_tulip' | 'potted_pink_tulip' | 'potted_oxeye_daisy' | 'potted_cornflower' | 'potted_lily_of_the_valley' | 'potted_wither_rose' | 'potted_red_mushroom' | 'potted_brown_mushroom' | 'potted_dead_bush' | 'potted_cactus' | 'carrots' | 'potatoes' | 'oak_button' | 'spruce_button' | 'birch_button' | 'jungle_button' | 'acacia_button' | 'cherry_button' | 'dark_oak_button' | 'mangrove_button' | 'bamboo_button' | 'skeleton_skull' | 'skeleton_wall_skull' | 'wither_skeleton_skull' | 'wither_skeleton_wall_skull' | 'zombie_head' | 'zombie_wall_head' | 'player_head' | 'player_wall_head' | 'creeper_head' | 'creeper_wall_head' | 'dragon_head' | 'dragon_wall_head' | 'piglin_head' | 'piglin_wall_head' | 'anvil' | 'chipped_anvil' | 'damaged_anvil' | 'trapped_chest' | 'light_weighted_pressure_plate' | 'heavy_weighted_pressure_plate' | 'comparator' | 'daylight_detector' | 'redstone_block' | 'nether_quartz_ore' | 'hopper' | 'quartz_block' | 'chiseled_quartz_block' | 'quartz_pillar' | 'quartz_stairs' | 'activator_rail' | 'dropper' | 'white_terracotta' | 'orange_terracotta' | 'magenta_terracotta' | 'light_blue_terracotta' | 'yellow_terracotta' | 'lime_terracotta' | 'pink_terracotta' | 'gray_terracotta' | 'light_gray_terracotta' | 'cyan_terracotta' | 'purple_terracotta' | 'blue_terracotta' | 'brown_terracotta' | 'green_terracotta' | 'red_terracotta' | 'black_terracotta' | 'white_stained_glass_pane' | 'orange_stained_glass_pane' | 'magenta_stained_glass_pane' | 'light_blue_stained_glass_pane' | 'yellow_stained_glass_pane' | 'lime_stained_glass_pane' | 'pink_stained_glass_pane' | 'gray_stained_glass_pane' | 'light_gray_stained_glass_pane' | 'cyan_stained_glass_pane' | 'purple_stained_glass_pane' | 'blue_stained_glass_pane' | 'brown_stained_glass_pane' | 'green_stained_glass_pane' | 'red_stained_glass_pane' | 'black_stained_glass_pane' | 'acacia_stairs' | 'cherry_stairs' | 'dark_oak_stairs' | 'mangrove_stairs' | 'bamboo_stairs' | 'bamboo_mosaic_stairs' | 'slime_block' | 'barrier' | 'light' | 'iron_trapdoor' | 'prismarine' | 'prismarine_bricks' | 'dark_prismarine' | 'prismarine_stairs' | 'prismarine_brick_stairs' | 'dark_prismarine_stairs' | 'prismarine_slab' | 'prismarine_brick_slab' | 'dark_prismarine_slab' | 'sea_lantern' | 'hay_block' | 'white_carpet' | 'orange_carpet' | 'magenta_carpet' | 'light_blue_carpet' | 'yellow_carpet' | 'lime_carpet' | 'pink_carpet' | 'gray_carpet' | 'light_gray_carpet' | 'cyan_carpet' | 'purple_carpet' | 'blue_carpet' | 'brown_carpet' | 'green_carpet' | 'red_carpet' | 'black_carpet' | 'terracotta' | 'coal_block' | 'packed_ice' | 'sunflower' | 'lilac' | 'rose_bush' | 'peony' | 'tall_grass' | 'large_fern' | 'white_banner' | 'orange_banner' | 'magenta_banner' | 'light_blue_banner' | 'yellow_banner' | 'lime_banner' | 'pink_banner' | 'gray_banner' | 'light_gray_banner' | 'cyan_banner' | 'purple_banner' | 'blue_banner' | 'brown_banner' | 'green_banner' | 'red_banner' | 'black_banner' | 'white_wall_banner' | 'orange_wall_banner' | 'magenta_wall_banner' | 'light_blue_wall_banner' | 'yellow_wall_banner' | 'lime_wall_banner' | 'pink_wall_banner' | 'gray_wall_banner' | 'light_gray_wall_banner' | 'cyan_wall_banner' | 'purple_wall_banner' | 'blue_wall_banner' | 'brown_wall_banner' | 'green_wall_banner' | 'red_wall_banner' | 'black_wall_banner' | 'red_sandstone' | 'chiseled_red_sandstone' | 'cut_red_sandstone' | 'red_sandstone_stairs' | 'oak_slab' | 'spruce_slab' | 'birch_slab' | 'jungle_slab' | 'acacia_slab' | 'cherry_slab' | 'dark_oak_slab' | 'mangrove_slab' | 'bamboo_slab' | 'bamboo_mosaic_slab' | 'stone_slab' | 'smooth_stone_slab' | 'sandstone_slab' | 'cut_sandstone_slab' | 'petrified_oak_slab' | 'cobblestone_slab' | 'brick_slab' | 'stone_brick_slab' | 'mud_brick_slab' | 'nether_brick_slab' | 'quartz_slab' | 'red_sandstone_slab' | 'cut_red_sandstone_slab' | 'purpur_slab' | 'smooth_stone' | 'smooth_sandstone' | 'smooth_quartz' | 'smooth_red_sandstone' | 'spruce_fence_gate' | 'birch_fence_gate' | 'jungle_fence_gate' | 'acacia_fence_gate' | 'cherry_fence_gate' | 'dark_oak_fence_gate' | 'mangrove_fence_gate' | 'bamboo_fence_gate' | 'spruce_fence' | 'birch_fence' | 'jungle_fence' | 'acacia_fence' | 'cherry_fence' | 'dark_oak_fence' | 'mangrove_fence' | 'bamboo_fence' | 'spruce_door' | 'birch_door' | 'jungle_door' | 'acacia_door' | 'cherry_door' | 'dark_oak_door' | 'mangrove_door' | 'bamboo_door' | 'end_rod' | 'chorus_plant' | 'chorus_flower' | 'purpur_block' | 'purpur_pillar' | 'purpur_stairs' | 'end_stone_bricks' | 'torchflower_crop' | 'pitcher_crop' | 'pitcher_plant' | 'beetroots' | 'dirt_path' | 'end_gateway' | 'repeating_command_block' | 'chain_command_block' | 'frosted_ice' | 'magma_block' | 'nether_wart_block' | 'red_nether_bricks' | 'bone_block' | 'structure_void' | 'observer' | 'shulker_box' | 'white_shulker_box' | 'orange_shulker_box' | 'magenta_shulker_box' | 'light_blue_shulker_box' | 'yellow_shulker_box' | 'lime_shulker_box' | 'pink_shulker_box' | 'gray_shulker_box' | 'light_gray_shulker_box' | 'cyan_shulker_box' | 'purple_shulker_box' | 'blue_shulker_box' | 'brown_shulker_box' | 'green_shulker_box' | 'red_shulker_box' | 'black_shulker_box' | 'white_glazed_terracotta' | 'orange_glazed_terracotta' | 'magenta_glazed_terracotta' | 'light_blue_glazed_terracotta' | 'yellow_glazed_terracotta' | 'lime_glazed_terracotta' | 'pink_glazed_terracotta' | 'gray_glazed_terracotta' | 'light_gray_glazed_terracotta' | 'cyan_glazed_terracotta' | 'purple_glazed_terracotta' | 'blue_glazed_terracotta' | 'brown_glazed_terracotta' | 'green_glazed_terracotta' | 'red_glazed_terracotta' | 'black_glazed_terracotta' | 'white_concrete' | 'orange_concrete' | 'magenta_concrete' | 'light_blue_concrete' | 'yellow_concrete' | 'lime_concrete' | 'pink_concrete' | 'gray_concrete' | 'light_gray_concrete' | 'cyan_concrete' | 'purple_concrete' | 'blue_concrete' | 'brown_concrete' | 'green_concrete' | 'red_concrete' | 'black_concrete' | 'white_concrete_powder' | 'orange_concrete_powder' | 'magenta_concrete_powder' | 'light_blue_concrete_powder' | 'yellow_concrete_powder' | 'lime_concrete_powder' | 'pink_concrete_powder' | 'gray_concrete_powder' | 'light_gray_concrete_powder' | 'cyan_concrete_powder' | 'purple_concrete_powder' | 'blue_concrete_powder' | 'brown_concrete_powder' | 'green_concrete_powder' | 'red_concrete_powder' | 'black_concrete_powder' | 'kelp' | 'kelp_plant' | 'dried_kelp_block' | 'turtle_egg' | 'sniffer_egg' | 'dead_tube_coral_block' | 'dead_brain_coral_block' | 'dead_bubble_coral_block' | 'dead_fire_coral_block' | 'dead_horn_coral_block' | 'tube_coral_block' | 'brain_coral_block' | 'bubble_coral_block' | 'fire_coral_block' | 'horn_coral_block' | 'dead_tube_coral' | 'dead_brain_coral' | 'dead_bubble_coral' | 'dead_fire_coral' | 'dead_horn_coral' | 'tube_coral' | 'brain_coral' | 'bubble_coral' | 'fire_coral' | 'horn_coral' | 'dead_tube_coral_fan' | 'dead_brain_coral_fan' | 'dead_bubble_coral_fan' | 'dead_fire_coral_fan' | 'dead_horn_coral_fan' | 'tube_coral_fan' | 'brain_coral_fan' | 'bubble_coral_fan' | 'fire_coral_fan' | 'horn_coral_fan' | 'dead_tube_coral_wall_fan' | 'dead_brain_coral_wall_fan' | 'dead_bubble_coral_wall_fan' | 'dead_fire_coral_wall_fan' | 'dead_horn_coral_wall_fan' | 'tube_coral_wall_fan' | 'brain_coral_wall_fan' | 'bubble_coral_wall_fan' | 'fire_coral_wall_fan' | 'horn_coral_wall_fan' | 'sea_pickle' | 'blue_ice' | 'conduit' | 'bamboo_sapling' | 'bamboo' | 'potted_bamboo' | 'void_air' | 'cave_air' | 'bubble_column' | 'polished_granite_stairs' | 'smooth_red_sandstone_stairs' | 'mossy_stone_brick_stairs' | 'polished_diorite_stairs' | 'mossy_cobblestone_stairs' | 'end_stone_brick_stairs' | 'stone_stairs' | 'smooth_sandstone_stairs' | 'smooth_quartz_stairs' | 'granite_stairs' | 'andesite_stairs' | 'red_nether_brick_stairs' | 'polished_andesite_stairs' | 'diorite_stairs' | 'polished_granite_slab' | 'smooth_red_sandstone_slab' | 'mossy_stone_brick_slab' | 'polished_diorite_slab' | 'mossy_cobblestone_slab' | 'end_stone_brick_slab' | 'smooth_sandstone_slab' | 'smooth_quartz_slab' | 'granite_slab' | 'andesite_slab' | 'red_nether_brick_slab' | 'polished_andesite_slab' | 'diorite_slab' | 'brick_wall' | 'prismarine_wall' | 'red_sandstone_wall' | 'mossy_stone_brick_wall' | 'granite_wall' | 'stone_brick_wall' | 'mud_brick_wall' | 'nether_brick_wall' | 'andesite_wall' | 'red_nether_brick_wall' | 'sandstone_wall' | 'end_stone_brick_wall' | 'diorite_wall' | 'scaffolding' | 'loom' | 'barrel' | 'smoker' | 'blast_furnace' | 'cartography_table' | 'fletching_table' | 'grindstone' | 'lectern' | 'smithing_table' | 'stonecutter' | 'bell' | 'lantern' | 'soul_lantern' | 'campfire' | 'soul_campfire' | 'sweet_berry_bush' | 'warped_stem' | 'stripped_warped_stem' | 'warped_hyphae' | 'stripped_warped_hyphae' | 'warped_nylium' | 'warped_fungus' | 'warped_wart_block' | 'warped_roots' | 'nether_sprouts' | 'crimson_stem' | 'stripped_crimson_stem' | 'crimson_hyphae' | 'stripped_crimson_hyphae' | 'crimson_nylium' | 'crimson_fungus' | 'shroomlight' | 'weeping_vines' | 'weeping_vines_plant' | 'twisting_vines' | 'twisting_vines_plant' | 'crimson_roots' | 'crimson_planks' | 'warped_planks' | 'crimson_slab' | 'warped_slab' | 'crimson_pressure_plate' | 'warped_pressure_plate' | 'crimson_fence' | 'warped_fence' | 'crimson_trapdoor' | 'warped_trapdoor' | 'crimson_fence_gate' | 'warped_fence_gate' | 'crimson_stairs' | 'warped_stairs' | 'crimson_button' | 'warped_button' | 'crimson_door' | 'warped_door' | 'crimson_sign' | 'warped_sign' | 'crimson_wall_sign' | 'warped_wall_sign' | 'structure_block' | 'jigsaw' | 'composter' | 'target' | 'bee_nest' | 'beehive' | 'honey_block' | 'honeycomb_block' | 'netherite_block' | 'ancient_debris' | 'crying_obsidian' | 'respawn_anchor' | 'potted_crimson_fungus' | 'potted_warped_fungus' | 'potted_crimson_roots' | 'potted_warped_roots' | 'lodestone' | 'blackstone' | 'blackstone_stairs' | 'blackstone_wall' | 'blackstone_slab' | 'polished_blackstone' | 'polished_blackstone_bricks' | 'cracked_polished_blackstone_bricks' | 'chiseled_polished_blackstone' | 'polished_blackstone_brick_slab' | 'polished_blackstone_brick_stairs' | 'polished_blackstone_brick_wall' | 'gilded_blackstone' | 'polished_blackstone_stairs' | 'polished_blackstone_slab' | 'polished_blackstone_pressure_plate' | 'polished_blackstone_button' | 'polished_blackstone_wall' | 'chiseled_nether_bricks' | 'cracked_nether_bricks' | 'quartz_bricks' | 'candle' | 'white_candle' | 'orange_candle' | 'magenta_candle' | 'light_blue_candle' | 'yellow_candle' | 'lime_candle' | 'pink_candle' | 'gray_candle' | 'light_gray_candle' | 'cyan_candle' | 'purple_candle' | 'blue_candle' | 'brown_candle' | 'green_candle' | 'red_candle' | 'black_candle' | 'candle_cake' | 'white_candle_cake' | 'orange_candle_cake' | 'magenta_candle_cake' | 'light_blue_candle_cake' | 'yellow_candle_cake' | 'lime_candle_cake' | 'pink_candle_cake' | 'gray_candle_cake' | 'light_gray_candle_cake' | 'cyan_candle_cake' | 'purple_candle_cake' | 'blue_candle_cake' | 'brown_candle_cake' | 'green_candle_cake' | 'red_candle_cake' | 'black_candle_cake' | 'amethyst_block' | 'budding_amethyst' | 'amethyst_cluster' | 'large_amethyst_bud' | 'medium_amethyst_bud' | 'small_amethyst_bud' | 'tuff' | 'calcite' | 'tinted_glass' | 'powder_snow' | 'sculk_sensor' | 'calibrated_sculk_sensor' | 'sculk' | 'sculk_vein' | 'sculk_catalyst' | 'sculk_shrieker' | 'oxidized_copper' | 'weathered_copper' | 'exposed_copper' | 'copper_block' | 'copper_ore' | 'deepslate_copper_ore' | 'oxidized_cut_copper' | 'weathered_cut_copper' | 'exposed_cut_copper' | 'cut_copper' | 'oxidized_cut_copper_stairs' | 'weathered_cut_copper_stairs' | 'exposed_cut_copper_stairs' | 'cut_copper_stairs' | 'oxidized_cut_copper_slab' | 'weathered_cut_copper_slab' | 'exposed_cut_copper_slab' | 'cut_copper_slab' | 'waxed_copper_block' | 'waxed_weathered_copper' | 'waxed_exposed_copper' | 'waxed_oxidized_copper' | 'waxed_oxidized_cut_copper' | 'waxed_weathered_cut_copper' | 'waxed_exposed_cut_copper' | 'waxed_cut_copper' | 'waxed_oxidized_cut_copper_stairs' | 'waxed_weathered_cut_copper_stairs' | 'waxed_exposed_cut_copper_stairs' | 'waxed_cut_copper_stairs' | 'waxed_oxidized_cut_copper_slab' | 'waxed_weathered_cut_copper_slab' | 'waxed_exposed_cut_copper_slab' | 'waxed_cut_copper_slab' | 'lightning_rod' | 'pointed_dripstone' | 'dripstone_block' | 'cave_vines' | 'cave_vines_plant' | 'spore_blossom' | 'azalea' | 'flowering_azalea' | 'moss_carpet' | 'pink_petals' | 'moss_block' | 'big_dripleaf' | 'big_dripleaf_stem' | 'small_dripleaf' | 'hanging_roots' | 'rooted_dirt' | 'mud' | 'deepslate' | 'cobbled_deepslate' | 'cobbled_deepslate_stairs' | 'cobbled_deepslate_slab' | 'cobbled_deepslate_wall' | 'polished_deepslate' | 'polished_deepslate_stairs' | 'polished_deepslate_slab' | 'polished_deepslate_wall' | 'deepslate_tiles' | 'deepslate_tile_stairs' | 'deepslate_tile_slab' | 'deepslate_tile_wall' | 'deepslate_bricks' | 'deepslate_brick_stairs' | 'deepslate_brick_slab' | 'deepslate_brick_wall' | 'chiseled_deepslate' | 'cracked_deepslate_bricks' | 'cracked_deepslate_tiles' | 'infested_deepslate' | 'smooth_basalt' | 'raw_iron_block' | 'raw_copper_block' | 'raw_gold_block' | 'potted_azalea_bush' | 'potted_flowering_azalea_bush' | 'ochre_froglight' | 'verdant_froglight' | 'pearlescent_froglight' | 'frogspawn' | 'reinforced_deepslate' | 'decorated_pot';
+export type ItemNames = 'air' | 'stone' | 'granite' | 'polished_granite' | 'diorite' | 'polished_diorite' | 'andesite' | 'polished_andesite' | 'deepslate' | 'cobbled_deepslate' | 'polished_deepslate' | 'calcite' | 'tuff' | 'dripstone_block' | 'grass_block' | 'dirt' | 'coarse_dirt' | 'podzol' | 'rooted_dirt' | 'mud' | 'crimson_nylium' | 'warped_nylium' | 'cobblestone' | 'oak_planks' | 'spruce_planks' | 'birch_planks' | 'jungle_planks' | 'acacia_planks' | 'cherry_planks' | 'dark_oak_planks' | 'mangrove_planks' | 'bamboo_planks' | 'crimson_planks' | 'warped_planks' | 'bamboo_mosaic' | 'oak_sapling' | 'spruce_sapling' | 'birch_sapling' | 'jungle_sapling' | 'acacia_sapling' | 'cherry_sapling' | 'dark_oak_sapling' | 'mangrove_propagule' | 'bedrock' | 'sand' | 'suspicious_sand' | 'suspicious_gravel' | 'red_sand' | 'gravel' | 'coal_ore' | 'deepslate_coal_ore' | 'iron_ore' | 'deepslate_iron_ore' | 'copper_ore' | 'deepslate_copper_ore' | 'gold_ore' | 'deepslate_gold_ore' | 'redstone_ore' | 'deepslate_redstone_ore' | 'emerald_ore' | 'deepslate_emerald_ore' | 'lapis_ore' | 'deepslate_lapis_ore' | 'diamond_ore' | 'deepslate_diamond_ore' | 'nether_gold_ore' | 'nether_quartz_ore' | 'ancient_debris' | 'coal_block' | 'raw_iron_block' | 'raw_copper_block' | 'raw_gold_block' | 'amethyst_block' | 'budding_amethyst' | 'iron_block' | 'copper_block' | 'gold_block' | 'diamond_block' | 'netherite_block' | 'exposed_copper' | 'weathered_copper' | 'oxidized_copper' | 'cut_copper' | 'exposed_cut_copper' | 'weathered_cut_copper' | 'oxidized_cut_copper' | 'cut_copper_stairs' | 'exposed_cut_copper_stairs' | 'weathered_cut_copper_stairs' | 'oxidized_cut_copper_stairs' | 'cut_copper_slab' | 'exposed_cut_copper_slab' | 'weathered_cut_copper_slab' | 'oxidized_cut_copper_slab' | 'waxed_copper_block' | 'waxed_exposed_copper' | 'waxed_weathered_copper' | 'waxed_oxidized_copper' | 'waxed_cut_copper' | 'waxed_exposed_cut_copper' | 'waxed_weathered_cut_copper' | 'waxed_oxidized_cut_copper' | 'waxed_cut_copper_stairs' | 'waxed_exposed_cut_copper_stairs' | 'waxed_weathered_cut_copper_stairs' | 'waxed_oxidized_cut_copper_stairs' | 'waxed_cut_copper_slab' | 'waxed_exposed_cut_copper_slab' | 'waxed_weathered_cut_copper_slab' | 'waxed_oxidized_cut_copper_slab' | 'oak_log' | 'spruce_log' | 'birch_log' | 'jungle_log' | 'acacia_log' | 'cherry_log' | 'dark_oak_log' | 'mangrove_log' | 'mangrove_roots' | 'muddy_mangrove_roots' | 'crimson_stem' | 'warped_stem' | 'bamboo_block' | 'stripped_oak_log' | 'stripped_spruce_log' | 'stripped_birch_log' | 'stripped_jungle_log' | 'stripped_acacia_log' | 'stripped_cherry_log' | 'stripped_dark_oak_log' | 'stripped_mangrove_log' | 'stripped_crimson_stem' | 'stripped_warped_stem' | 'stripped_oak_wood' | 'stripped_spruce_wood' | 'stripped_birch_wood' | 'stripped_jungle_wood' | 'stripped_acacia_wood' | 'stripped_cherry_wood' | 'stripped_dark_oak_wood' | 'stripped_mangrove_wood' | 'stripped_crimson_hyphae' | 'stripped_warped_hyphae' | 'stripped_bamboo_block' | 'oak_wood' | 'spruce_wood' | 'birch_wood' | 'jungle_wood' | 'acacia_wood' | 'cherry_wood' | 'dark_oak_wood' | 'mangrove_wood' | 'crimson_hyphae' | 'warped_hyphae' | 'oak_leaves' | 'spruce_leaves' | 'birch_leaves' | 'jungle_leaves' | 'acacia_leaves' | 'cherry_leaves' | 'dark_oak_leaves' | 'mangrove_leaves' | 'azalea_leaves' | 'flowering_azalea_leaves' | 'sponge' | 'wet_sponge' | 'glass' | 'tinted_glass' | 'lapis_block' | 'sandstone' | 'chiseled_sandstone' | 'cut_sandstone' | 'cobweb' | 'grass' | 'fern' | 'azalea' | 'flowering_azalea' | 'dead_bush' | 'seagrass' | 'sea_pickle' | 'white_wool' | 'orange_wool' | 'magenta_wool' | 'light_blue_wool' | 'yellow_wool' | 'lime_wool' | 'pink_wool' | 'gray_wool' | 'light_gray_wool' | 'cyan_wool' | 'purple_wool' | 'blue_wool' | 'brown_wool' | 'green_wool' | 'red_wool' | 'black_wool' | 'dandelion' | 'poppy' | 'blue_orchid' | 'allium' | 'azure_bluet' | 'red_tulip' | 'orange_tulip' | 'white_tulip' | 'pink_tulip' | 'oxeye_daisy' | 'cornflower' | 'lily_of_the_valley' | 'wither_rose' | 'torchflower' | 'pitcher_plant' | 'spore_blossom' | 'brown_mushroom' | 'red_mushroom' | 'crimson_fungus' | 'warped_fungus' | 'crimson_roots' | 'warped_roots' | 'nether_sprouts' | 'weeping_vines' | 'twisting_vines' | 'sugar_cane' | 'kelp' | 'moss_carpet' | 'pink_petals' | 'moss_block' | 'hanging_roots' | 'big_dripleaf' | 'small_dripleaf' | 'bamboo' | 'oak_slab' | 'spruce_slab' | 'birch_slab' | 'jungle_slab' | 'acacia_slab' | 'cherry_slab' | 'dark_oak_slab' | 'mangrove_slab' | 'bamboo_slab' | 'bamboo_mosaic_slab' | 'crimson_slab' | 'warped_slab' | 'stone_slab' | 'smooth_stone_slab' | 'sandstone_slab' | 'cut_sandstone_slab' | 'petrified_oak_slab' | 'cobblestone_slab' | 'brick_slab' | 'stone_brick_slab' | 'mud_brick_slab' | 'nether_brick_slab' | 'quartz_slab' | 'red_sandstone_slab' | 'cut_red_sandstone_slab' | 'purpur_slab' | 'prismarine_slab' | 'prismarine_brick_slab' | 'dark_prismarine_slab' | 'smooth_quartz' | 'smooth_red_sandstone' | 'smooth_sandstone' | 'smooth_stone' | 'bricks' | 'bookshelf' | 'chiseled_bookshelf' | 'decorated_pot' | 'mossy_cobblestone' | 'obsidian' | 'torch' | 'end_rod' | 'chorus_plant' | 'chorus_flower' | 'purpur_block' | 'purpur_pillar' | 'purpur_stairs' | 'spawner' | 'chest' | 'crafting_table' | 'farmland' | 'furnace' | 'ladder' | 'cobblestone_stairs' | 'snow' | 'ice' | 'snow_block' | 'cactus' | 'clay' | 'jukebox' | 'oak_fence' | 'spruce_fence' | 'birch_fence' | 'jungle_fence' | 'acacia_fence' | 'cherry_fence' | 'dark_oak_fence' | 'mangrove_fence' | 'bamboo_fence' | 'crimson_fence' | 'warped_fence' | 'pumpkin' | 'carved_pumpkin' | 'jack_o_lantern' | 'netherrack' | 'soul_sand' | 'soul_soil' | 'basalt' | 'polished_basalt' | 'smooth_basalt' | 'soul_torch' | 'glowstone' | 'infested_stone' | 'infested_cobblestone' | 'infested_stone_bricks' | 'infested_mossy_stone_bricks' | 'infested_cracked_stone_bricks' | 'infested_chiseled_stone_bricks' | 'infested_deepslate' | 'stone_bricks' | 'mossy_stone_bricks' | 'cracked_stone_bricks' | 'chiseled_stone_bricks' | 'packed_mud' | 'mud_bricks' | 'deepslate_bricks' | 'cracked_deepslate_bricks' | 'deepslate_tiles' | 'cracked_deepslate_tiles' | 'chiseled_deepslate' | 'reinforced_deepslate' | 'brown_mushroom_block' | 'red_mushroom_block' | 'mushroom_stem' | 'iron_bars' | 'chain' | 'glass_pane' | 'melon' | 'vine' | 'glow_lichen' | 'brick_stairs' | 'stone_brick_stairs' | 'mud_brick_stairs' | 'mycelium' | 'lily_pad' | 'nether_bricks' | 'cracked_nether_bricks' | 'chiseled_nether_bricks' | 'nether_brick_fence' | 'nether_brick_stairs' | 'sculk' | 'sculk_vein' | 'sculk_catalyst' | 'sculk_shrieker' | 'enchanting_table' | 'end_portal_frame' | 'end_stone' | 'end_stone_bricks' | 'dragon_egg' | 'sandstone_stairs' | 'ender_chest' | 'emerald_block' | 'oak_stairs' | 'spruce_stairs' | 'birch_stairs' | 'jungle_stairs' | 'acacia_stairs' | 'cherry_stairs' | 'dark_oak_stairs' | 'mangrove_stairs' | 'bamboo_stairs' | 'bamboo_mosaic_stairs' | 'crimson_stairs' | 'warped_stairs' | 'command_block' | 'beacon' | 'cobblestone_wall' | 'mossy_cobblestone_wall' | 'brick_wall' | 'prismarine_wall' | 'red_sandstone_wall' | 'mossy_stone_brick_wall' | 'granite_wall' | 'stone_brick_wall' | 'mud_brick_wall' | 'nether_brick_wall' | 'andesite_wall' | 'red_nether_brick_wall' | 'sandstone_wall' | 'end_stone_brick_wall' | 'diorite_wall' | 'blackstone_wall' | 'polished_blackstone_wall' | 'polished_blackstone_brick_wall' | 'cobbled_deepslate_wall' | 'polished_deepslate_wall' | 'deepslate_brick_wall' | 'deepslate_tile_wall' | 'anvil' | 'chipped_anvil' | 'damaged_anvil' | 'chiseled_quartz_block' | 'quartz_block' | 'quartz_bricks' | 'quartz_pillar' | 'quartz_stairs' | 'white_terracotta' | 'orange_terracotta' | 'magenta_terracotta' | 'light_blue_terracotta' | 'yellow_terracotta' | 'lime_terracotta' | 'pink_terracotta' | 'gray_terracotta' | 'light_gray_terracotta' | 'cyan_terracotta' | 'purple_terracotta' | 'blue_terracotta' | 'brown_terracotta' | 'green_terracotta' | 'red_terracotta' | 'black_terracotta' | 'barrier' | 'light' | 'hay_block' | 'white_carpet' | 'orange_carpet' | 'magenta_carpet' | 'light_blue_carpet' | 'yellow_carpet' | 'lime_carpet' | 'pink_carpet' | 'gray_carpet' | 'light_gray_carpet' | 'cyan_carpet' | 'purple_carpet' | 'blue_carpet' | 'brown_carpet' | 'green_carpet' | 'red_carpet' | 'black_carpet' | 'terracotta' | 'packed_ice' | 'dirt_path' | 'sunflower' | 'lilac' | 'rose_bush' | 'peony' | 'tall_grass' | 'large_fern' | 'white_stained_glass' | 'orange_stained_glass' | 'magenta_stained_glass' | 'light_blue_stained_glass' | 'yellow_stained_glass' | 'lime_stained_glass' | 'pink_stained_glass' | 'gray_stained_glass' | 'light_gray_stained_glass' | 'cyan_stained_glass' | 'purple_stained_glass' | 'blue_stained_glass' | 'brown_stained_glass' | 'green_stained_glass' | 'red_stained_glass' | 'black_stained_glass' | 'white_stained_glass_pane' | 'orange_stained_glass_pane' | 'magenta_stained_glass_pane' | 'light_blue_stained_glass_pane' | 'yellow_stained_glass_pane' | 'lime_stained_glass_pane' | 'pink_stained_glass_pane' | 'gray_stained_glass_pane' | 'light_gray_stained_glass_pane' | 'cyan_stained_glass_pane' | 'purple_stained_glass_pane' | 'blue_stained_glass_pane' | 'brown_stained_glass_pane' | 'green_stained_glass_pane' | 'red_stained_glass_pane' | 'black_stained_glass_pane' | 'prismarine' | 'prismarine_bricks' | 'dark_prismarine' | 'prismarine_stairs' | 'prismarine_brick_stairs' | 'dark_prismarine_stairs' | 'sea_lantern' | 'red_sandstone' | 'chiseled_red_sandstone' | 'cut_red_sandstone' | 'red_sandstone_stairs' | 'repeating_command_block' | 'chain_command_block' | 'magma_block' | 'nether_wart_block' | 'warped_wart_block' | 'red_nether_bricks' | 'bone_block' | 'structure_void' | 'shulker_box' | 'white_shulker_box' | 'orange_shulker_box' | 'magenta_shulker_box' | 'light_blue_shulker_box' | 'yellow_shulker_box' | 'lime_shulker_box' | 'pink_shulker_box' | 'gray_shulker_box' | 'light_gray_shulker_box' | 'cyan_shulker_box' | 'purple_shulker_box' | 'blue_shulker_box' | 'brown_shulker_box' | 'green_shulker_box' | 'red_shulker_box' | 'black_shulker_box' | 'white_glazed_terracotta' | 'orange_glazed_terracotta' | 'magenta_glazed_terracotta' | 'light_blue_glazed_terracotta' | 'yellow_glazed_terracotta' | 'lime_glazed_terracotta' | 'pink_glazed_terracotta' | 'gray_glazed_terracotta' | 'light_gray_glazed_terracotta' | 'cyan_glazed_terracotta' | 'purple_glazed_terracotta' | 'blue_glazed_terracotta' | 'brown_glazed_terracotta' | 'green_glazed_terracotta' | 'red_glazed_terracotta' | 'black_glazed_terracotta' | 'white_concrete' | 'orange_concrete' | 'magenta_concrete' | 'light_blue_concrete' | 'yellow_concrete' | 'lime_concrete' | 'pink_concrete' | 'gray_concrete' | 'light_gray_concrete' | 'cyan_concrete' | 'purple_concrete' | 'blue_concrete' | 'brown_concrete' | 'green_concrete' | 'red_concrete' | 'black_concrete' | 'white_concrete_powder' | 'orange_concrete_powder' | 'magenta_concrete_powder' | 'light_blue_concrete_powder' | 'yellow_concrete_powder' | 'lime_concrete_powder' | 'pink_concrete_powder' | 'gray_concrete_powder' | 'light_gray_concrete_powder' | 'cyan_concrete_powder' | 'purple_concrete_powder' | 'blue_concrete_powder' | 'brown_concrete_powder' | 'green_concrete_powder' | 'red_concrete_powder' | 'black_concrete_powder' | 'turtle_egg' | 'sniffer_egg' | 'dead_tube_coral_block' | 'dead_brain_coral_block' | 'dead_bubble_coral_block' | 'dead_fire_coral_block' | 'dead_horn_coral_block' | 'tube_coral_block' | 'brain_coral_block' | 'bubble_coral_block' | 'fire_coral_block' | 'horn_coral_block' | 'tube_coral' | 'brain_coral' | 'bubble_coral' | 'fire_coral' | 'horn_coral' | 'dead_brain_coral' | 'dead_bubble_coral' | 'dead_fire_coral' | 'dead_horn_coral' | 'dead_tube_coral' | 'tube_coral_fan' | 'brain_coral_fan' | 'bubble_coral_fan' | 'fire_coral_fan' | 'horn_coral_fan' | 'dead_tube_coral_fan' | 'dead_brain_coral_fan' | 'dead_bubble_coral_fan' | 'dead_fire_coral_fan' | 'dead_horn_coral_fan' | 'blue_ice' | 'conduit' | 'polished_granite_stairs' | 'smooth_red_sandstone_stairs' | 'mossy_stone_brick_stairs' | 'polished_diorite_stairs' | 'mossy_cobblestone_stairs' | 'end_stone_brick_stairs' | 'stone_stairs' | 'smooth_sandstone_stairs' | 'smooth_quartz_stairs' | 'granite_stairs' | 'andesite_stairs' | 'red_nether_brick_stairs' | 'polished_andesite_stairs' | 'diorite_stairs' | 'cobbled_deepslate_stairs' | 'polished_deepslate_stairs' | 'deepslate_brick_stairs' | 'deepslate_tile_stairs' | 'polished_granite_slab' | 'smooth_red_sandstone_slab' | 'mossy_stone_brick_slab' | 'polished_diorite_slab' | 'mossy_cobblestone_slab' | 'end_stone_brick_slab' | 'smooth_sandstone_slab' | 'smooth_quartz_slab' | 'granite_slab' | 'andesite_slab' | 'red_nether_brick_slab' | 'polished_andesite_slab' | 'diorite_slab' | 'cobbled_deepslate_slab' | 'polished_deepslate_slab' | 'deepslate_brick_slab' | 'deepslate_tile_slab' | 'scaffolding' | 'redstone' | 'redstone_torch' | 'redstone_block' | 'repeater' | 'comparator' | 'piston' | 'sticky_piston' | 'slime_block' | 'honey_block' | 'observer' | 'hopper' | 'dispenser' | 'dropper' | 'lectern' | 'target' | 'lever' | 'lightning_rod' | 'daylight_detector' | 'sculk_sensor' | 'calibrated_sculk_sensor' | 'tripwire_hook' | 'trapped_chest' | 'tnt' | 'redstone_lamp' | 'note_block' | 'stone_button' | 'polished_blackstone_button' | 'oak_button' | 'spruce_button' | 'birch_button' | 'jungle_button' | 'acacia_button' | 'cherry_button' | 'dark_oak_button' | 'mangrove_button' | 'bamboo_button' | 'crimson_button' | 'warped_button' | 'stone_pressure_plate' | 'polished_blackstone_pressure_plate' | 'light_weighted_pressure_plate' | 'heavy_weighted_pressure_plate' | 'oak_pressure_plate' | 'spruce_pressure_plate' | 'birch_pressure_plate' | 'jungle_pressure_plate' | 'acacia_pressure_plate' | 'cherry_pressure_plate' | 'dark_oak_pressure_plate' | 'mangrove_pressure_plate' | 'bamboo_pressure_plate' | 'crimson_pressure_plate' | 'warped_pressure_plate' | 'iron_door' | 'oak_door' | 'spruce_door' | 'birch_door' | 'jungle_door' | 'acacia_door' | 'cherry_door' | 'dark_oak_door' | 'mangrove_door' | 'bamboo_door' | 'crimson_door' | 'warped_door' | 'iron_trapdoor' | 'oak_trapdoor' | 'spruce_trapdoor' | 'birch_trapdoor' | 'jungle_trapdoor' | 'acacia_trapdoor' | 'cherry_trapdoor' | 'dark_oak_trapdoor' | 'mangrove_trapdoor' | 'bamboo_trapdoor' | 'crimson_trapdoor' | 'warped_trapdoor' | 'oak_fence_gate' | 'spruce_fence_gate' | 'birch_fence_gate' | 'jungle_fence_gate' | 'acacia_fence_gate' | 'cherry_fence_gate' | 'dark_oak_fence_gate' | 'mangrove_fence_gate' | 'bamboo_fence_gate' | 'crimson_fence_gate' | 'warped_fence_gate' | 'powered_rail' | 'detector_rail' | 'rail' | 'activator_rail' | 'saddle' | 'minecart' | 'chest_minecart' | 'furnace_minecart' | 'tnt_minecart' | 'hopper_minecart' | 'carrot_on_a_stick' | 'warped_fungus_on_a_stick' | 'elytra' | 'oak_boat' | 'oak_chest_boat' | 'spruce_boat' | 'spruce_chest_boat' | 'birch_boat' | 'birch_chest_boat' | 'jungle_boat' | 'jungle_chest_boat' | 'acacia_boat' | 'acacia_chest_boat' | 'cherry_boat' | 'cherry_chest_boat' | 'dark_oak_boat' | 'dark_oak_chest_boat' | 'mangrove_boat' | 'mangrove_chest_boat' | 'bamboo_raft' | 'bamboo_chest_raft' | 'structure_block' | 'jigsaw' | 'turtle_helmet' | 'scute' | 'flint_and_steel' | 'apple' | 'bow' | 'arrow' | 'coal' | 'charcoal' | 'diamond' | 'emerald' | 'lapis_lazuli' | 'quartz' | 'amethyst_shard' | 'raw_iron' | 'iron_ingot' | 'raw_copper' | 'copper_ingot' | 'raw_gold' | 'gold_ingot' | 'netherite_ingot' | 'netherite_scrap' | 'wooden_sword' | 'wooden_shovel' | 'wooden_pickaxe' | 'wooden_axe' | 'wooden_hoe' | 'stone_sword' | 'stone_shovel' | 'stone_pickaxe' | 'stone_axe' | 'stone_hoe' | 'golden_sword' | 'golden_shovel' | 'golden_pickaxe' | 'golden_axe' | 'golden_hoe' | 'iron_sword' | 'iron_shovel' | 'iron_pickaxe' | 'iron_axe' | 'iron_hoe' | 'diamond_sword' | 'diamond_shovel' | 'diamond_pickaxe' | 'diamond_axe' | 'diamond_hoe' | 'netherite_sword' | 'netherite_shovel' | 'netherite_pickaxe' | 'netherite_axe' | 'netherite_hoe' | 'stick' | 'bowl' | 'mushroom_stew' | 'string' | 'feather' | 'gunpowder' | 'wheat_seeds' | 'wheat' | 'bread' | 'leather_helmet' | 'leather_chestplate' | 'leather_leggings' | 'leather_boots' | 'chainmail_helmet' | 'chainmail_chestplate' | 'chainmail_leggings' | 'chainmail_boots' | 'iron_helmet' | 'iron_chestplate' | 'iron_leggings' | 'iron_boots' | 'diamond_helmet' | 'diamond_chestplate' | 'diamond_leggings' | 'diamond_boots' | 'golden_helmet' | 'golden_chestplate' | 'golden_leggings' | 'golden_boots' | 'netherite_helmet' | 'netherite_chestplate' | 'netherite_leggings' | 'netherite_boots' | 'flint' | 'porkchop' | 'cooked_porkchop' | 'painting' | 'golden_apple' | 'enchanted_golden_apple' | 'oak_sign' | 'spruce_sign' | 'birch_sign' | 'jungle_sign' | 'acacia_sign' | 'cherry_sign' | 'dark_oak_sign' | 'mangrove_sign' | 'bamboo_sign' | 'crimson_sign' | 'warped_sign' | 'oak_hanging_sign' | 'spruce_hanging_sign' | 'birch_hanging_sign' | 'jungle_hanging_sign' | 'acacia_hanging_sign' | 'cherry_hanging_sign' | 'dark_oak_hanging_sign' | 'mangrove_hanging_sign' | 'bamboo_hanging_sign' | 'crimson_hanging_sign' | 'warped_hanging_sign' | 'bucket' | 'water_bucket' | 'lava_bucket' | 'powder_snow_bucket' | 'snowball' | 'leather' | 'milk_bucket' | 'pufferfish_bucket' | 'salmon_bucket' | 'cod_bucket' | 'tropical_fish_bucket' | 'axolotl_bucket' | 'tadpole_bucket' | 'brick' | 'clay_ball' | 'dried_kelp_block' | 'paper' | 'book' | 'slime_ball' | 'egg' | 'compass' | 'recovery_compass' | 'bundle' | 'fishing_rod' | 'clock' | 'spyglass' | 'glowstone_dust' | 'cod' | 'salmon' | 'tropical_fish' | 'pufferfish' | 'cooked_cod' | 'cooked_salmon' | 'ink_sac' | 'glow_ink_sac' | 'cocoa_beans' | 'white_dye' | 'orange_dye' | 'magenta_dye' | 'light_blue_dye' | 'yellow_dye' | 'lime_dye' | 'pink_dye' | 'gray_dye' | 'light_gray_dye' | 'cyan_dye' | 'purple_dye' | 'blue_dye' | 'brown_dye' | 'green_dye' | 'red_dye' | 'black_dye' | 'bone_meal' | 'bone' | 'sugar' | 'cake' | 'white_bed' | 'orange_bed' | 'magenta_bed' | 'light_blue_bed' | 'yellow_bed' | 'lime_bed' | 'pink_bed' | 'gray_bed' | 'light_gray_bed' | 'cyan_bed' | 'purple_bed' | 'blue_bed' | 'brown_bed' | 'green_bed' | 'red_bed' | 'black_bed' | 'cookie' | 'filled_map' | 'shears' | 'melon_slice' | 'dried_kelp' | 'pumpkin_seeds' | 'melon_seeds' | 'beef' | 'cooked_beef' | 'chicken' | 'cooked_chicken' | 'rotten_flesh' | 'ender_pearl' | 'blaze_rod' | 'ghast_tear' | 'gold_nugget' | 'nether_wart' | 'potion' | 'glass_bottle' | 'spider_eye' | 'fermented_spider_eye' | 'blaze_powder' | 'magma_cream' | 'brewing_stand' | 'cauldron' | 'ender_eye' | 'glistering_melon_slice' | 'allay_spawn_egg' | 'axolotl_spawn_egg' | 'bat_spawn_egg' | 'bee_spawn_egg' | 'blaze_spawn_egg' | 'cat_spawn_egg' | 'camel_spawn_egg' | 'cave_spider_spawn_egg' | 'chicken_spawn_egg' | 'cod_spawn_egg' | 'cow_spawn_egg' | 'creeper_spawn_egg' | 'dolphin_spawn_egg' | 'donkey_spawn_egg' | 'drowned_spawn_egg' | 'elder_guardian_spawn_egg' | 'ender_dragon_spawn_egg' | 'enderman_spawn_egg' | 'endermite_spawn_egg' | 'evoker_spawn_egg' | 'fox_spawn_egg' | 'frog_spawn_egg' | 'ghast_spawn_egg' | 'glow_squid_spawn_egg' | 'goat_spawn_egg' | 'guardian_spawn_egg' | 'hoglin_spawn_egg' | 'horse_spawn_egg' | 'husk_spawn_egg' | 'iron_golem_spawn_egg' | 'llama_spawn_egg' | 'magma_cube_spawn_egg' | 'mooshroom_spawn_egg' | 'mule_spawn_egg' | 'ocelot_spawn_egg' | 'panda_spawn_egg' | 'parrot_spawn_egg' | 'phantom_spawn_egg' | 'pig_spawn_egg' | 'piglin_spawn_egg' | 'piglin_brute_spawn_egg' | 'pillager_spawn_egg' | 'polar_bear_spawn_egg' | 'pufferfish_spawn_egg' | 'rabbit_spawn_egg' | 'ravager_spawn_egg' | 'salmon_spawn_egg' | 'sheep_spawn_egg' | 'shulker_spawn_egg' | 'silverfish_spawn_egg' | 'skeleton_spawn_egg' | 'skeleton_horse_spawn_egg' | 'slime_spawn_egg' | 'sniffer_spawn_egg' | 'snow_golem_spawn_egg' | 'spider_spawn_egg' | 'squid_spawn_egg' | 'stray_spawn_egg' | 'strider_spawn_egg' | 'tadpole_spawn_egg' | 'trader_llama_spawn_egg' | 'tropical_fish_spawn_egg' | 'turtle_spawn_egg' | 'vex_spawn_egg' | 'villager_spawn_egg' | 'vindicator_spawn_egg' | 'wandering_trader_spawn_egg' | 'warden_spawn_egg' | 'witch_spawn_egg' | 'wither_spawn_egg' | 'wither_skeleton_spawn_egg' | 'wolf_spawn_egg' | 'zoglin_spawn_egg' | 'zombie_spawn_egg' | 'zombie_horse_spawn_egg' | 'zombie_villager_spawn_egg' | 'zombified_piglin_spawn_egg' | 'experience_bottle' | 'fire_charge' | 'writable_book' | 'written_book' | 'item_frame' | 'glow_item_frame' | 'flower_pot' | 'carrot' | 'potato' | 'baked_potato' | 'poisonous_potato' | 'map' | 'golden_carrot' | 'skeleton_skull' | 'wither_skeleton_skull' | 'player_head' | 'zombie_head' | 'creeper_head' | 'dragon_head' | 'piglin_head' | 'nether_star' | 'pumpkin_pie' | 'firework_rocket' | 'firework_star' | 'enchanted_book' | 'nether_brick' | 'prismarine_shard' | 'prismarine_crystals' | 'rabbit' | 'cooked_rabbit' | 'rabbit_stew' | 'rabbit_foot' | 'rabbit_hide' | 'armor_stand' | 'iron_horse_armor' | 'golden_horse_armor' | 'diamond_horse_armor' | 'leather_horse_armor' | 'lead' | 'name_tag' | 'command_block_minecart' | 'mutton' | 'cooked_mutton' | 'white_banner' | 'orange_banner' | 'magenta_banner' | 'light_blue_banner' | 'yellow_banner' | 'lime_banner' | 'pink_banner' | 'gray_banner' | 'light_gray_banner' | 'cyan_banner' | 'purple_banner' | 'blue_banner' | 'brown_banner' | 'green_banner' | 'red_banner' | 'black_banner' | 'end_crystal' | 'chorus_fruit' | 'popped_chorus_fruit' | 'torchflower_seeds' | 'pitcher_pod' | 'beetroot' | 'beetroot_seeds' | 'beetroot_soup' | 'dragon_breath' | 'splash_potion' | 'spectral_arrow' | 'tipped_arrow' | 'lingering_potion' | 'shield' | 'totem_of_undying' | 'shulker_shell' | 'iron_nugget' | 'knowledge_book' | 'debug_stick' | 'music_disc_13' | 'music_disc_cat' | 'music_disc_blocks' | 'music_disc_chirp' | 'music_disc_far' | 'music_disc_mall' | 'music_disc_mellohi' | 'music_disc_stal' | 'music_disc_strad' | 'music_disc_ward' | 'music_disc_11' | 'music_disc_wait' | 'music_disc_otherside' | 'music_disc_relic' | 'music_disc_5' | 'music_disc_pigstep' | 'disc_fragment_5' | 'trident' | 'phantom_membrane' | 'nautilus_shell' | 'heart_of_the_sea' | 'crossbow' | 'suspicious_stew' | 'loom' | 'flower_banner_pattern' | 'creeper_banner_pattern' | 'skull_banner_pattern' | 'mojang_banner_pattern' | 'globe_banner_pattern' | 'piglin_banner_pattern' | 'goat_horn' | 'composter' | 'barrel' | 'smoker' | 'blast_furnace' | 'cartography_table' | 'fletching_table' | 'grindstone' | 'smithing_table' | 'stonecutter' | 'bell' | 'lantern' | 'soul_lantern' | 'sweet_berries' | 'glow_berries' | 'campfire' | 'soul_campfire' | 'shroomlight' | 'honeycomb' | 'bee_nest' | 'beehive' | 'honey_bottle' | 'honeycomb_block' | 'lodestone' | 'crying_obsidian' | 'blackstone' | 'blackstone_slab' | 'blackstone_stairs' | 'gilded_blackstone' | 'polished_blackstone' | 'polished_blackstone_slab' | 'polished_blackstone_stairs' | 'chiseled_polished_blackstone' | 'polished_blackstone_bricks' | 'polished_blackstone_brick_slab' | 'polished_blackstone_brick_stairs' | 'cracked_polished_blackstone_bricks' | 'respawn_anchor' | 'candle' | 'white_candle' | 'orange_candle' | 'magenta_candle' | 'light_blue_candle' | 'yellow_candle' | 'lime_candle' | 'pink_candle' | 'gray_candle' | 'light_gray_candle' | 'cyan_candle' | 'purple_candle' | 'blue_candle' | 'brown_candle' | 'green_candle' | 'red_candle' | 'black_candle' | 'small_amethyst_bud' | 'medium_amethyst_bud' | 'large_amethyst_bud' | 'amethyst_cluster' | 'pointed_dripstone' | 'ochre_froglight' | 'verdant_froglight' | 'pearlescent_froglight' | 'frogspawn' | 'echo_shard' | 'brush' | 'netherite_upgrade_smithing_template' | 'sentry_armor_trim_smithing_template' | 'dune_armor_trim_smithing_template' | 'coast_armor_trim_smithing_template' | 'wild_armor_trim_smithing_template' | 'ward_armor_trim_smithing_template' | 'eye_armor_trim_smithing_template' | 'vex_armor_trim_smithing_template' | 'tide_armor_trim_smithing_template' | 'snout_armor_trim_smithing_template' | 'rib_armor_trim_smithing_template' | 'spire_armor_trim_smithing_template' | 'wayfinder_armor_trim_smithing_template' | 'shaper_armor_trim_smithing_template' | 'silence_armor_trim_smithing_template' | 'raiser_armor_trim_smithing_template' | 'host_armor_trim_smithing_template' | 'angler_pottery_sherd' | 'archer_pottery_sherd' | 'arms_up_pottery_sherd' | 'blade_pottery_sherd' | 'brewer_pottery_sherd' | 'burn_pottery_sherd' | 'danger_pottery_sherd' | 'explorer_pottery_sherd' | 'friend_pottery_sherd' | 'heart_pottery_sherd' | 'heartbreak_pottery_sherd' | 'howl_pottery_sherd' | 'miner_pottery_sherd' | 'mourner_pottery_sherd' | 'plenty_pottery_sherd' | 'prize_pottery_sherd' | 'sheaf_pottery_sherd' | 'shelter_pottery_sherd' | 'skull_pottery_sherd' | 'snort_pottery_sherd';
+export type EntityNames = 'allay' | 'area_effect_cloud' | 'armor_stand' | 'arrow' | 'axolotl' | 'bat' | 'bee' | 'blaze' | 'block_display' | 'boat' | 'camel' | 'cat' | 'cave_spider' | 'chest_boat' | 'chest_minecart' | 'chicken' | 'cod' | 'command_block_minecart' | 'cow' | 'creeper' | 'dolphin' | 'donkey' | 'dragon_fireball' | 'drowned' | 'egg' | 'elder_guardian' | 'end_crystal' | 'ender_dragon' | 'ender_pearl' | 'enderman' | 'endermite' | 'evoker' | 'evoker_fangs' | 'experience_bottle' | 'experience_orb' | 'eye_of_ender' | 'falling_block' | 'firework_rocket' | 'fox' | 'frog' | 'furnace_minecart' | 'ghast' | 'giant' | 'glow_item_frame' | 'glow_squid' | 'goat' | 'guardian' | 'hoglin' | 'hopper_minecart' | 'horse' | 'husk' | 'illusioner' | 'interaction' | 'iron_golem' | 'item' | 'item_display' | 'item_frame' | 'fireball' | 'leash_knot' | 'lightning_bolt' | 'llama' | 'llama_spit' | 'magma_cube' | 'marker' | 'minecart' | 'mooshroom' | 'mule' | 'ocelot' | 'painting' | 'panda' | 'parrot' | 'phantom' | 'pig' | 'piglin' | 'piglin_brute' | 'pillager' | 'polar_bear' | 'potion' | 'pufferfish' | 'rabbit' | 'ravager' | 'salmon' | 'sheep' | 'shulker' | 'shulker_bullet' | 'silverfish' | 'skeleton' | 'skeleton_horse' | 'slime' | 'small_fireball' | 'sniffer' | 'snow_golem' | 'snowball' | 'spawner_minecart' | 'spectral_arrow' | 'spider' | 'squid' | 'stray' | 'strider' | 'tadpole' | 'text_display' | 'tnt' | 'tnt_minecart' | 'trader_llama' | 'trident' | 'tropical_fish' | 'turtle' | 'vex' | 'villager' | 'vindicator' | 'wandering_trader' | 'warden' | 'witch' | 'wither' | 'wither_skeleton' | 'wither_skull' | 'wolf' | 'zoglin' | 'zombie' | 'zombie_horse' | 'zombie_villager' | 'zombified_piglin' | 'player' | 'fishing_bobber';
+export type BiomesNames = 'badlands' | 'bamboo_jungle' | 'basalt_deltas' | 'beach' | 'birch_forest' | 'cherry_grove' | 'cold_ocean' | 'crimson_forest' | 'dark_forest' | 'deep_cold_ocean' | 'deep_dark' | 'deep_frozen_ocean' | 'deep_lukewarm_ocean' | 'deep_ocean' | 'desert' | 'dripstone_caves' | 'end_barrens' | 'end_highlands' | 'end_midlands' | 'eroded_badlands' | 'flower_forest' | 'forest' | 'frozen_ocean' | 'frozen_peaks' | 'frozen_river' | 'grove' | 'ice_spikes' | 'jagged_peaks' | 'jungle' | 'lukewarm_ocean' | 'lush_caves' | 'mangrove_swamp' | 'meadow' | 'mushroom_fields' | 'nether_wastes' | 'ocean' | 'old_growth_birch_forest' | 'old_growth_pine_taiga' | 'old_growth_spruce_taiga' | 'plains' | 'river' | 'savanna' | 'savanna_plateau' | 'small_end_islands' | 'snowy_beach' | 'snowy_plains' | 'snowy_slopes' | 'snowy_taiga' | 'soul_sand_valley' | 'sparse_jungle' | 'stony_peaks' | 'stony_shore' | 'sunflower_plains' | 'swamp' | 'taiga' | 'the_end' | 'the_void' | 'warm_ocean' | 'warped_forest' | 'windswept_forest' | 'windswept_gravelly_hills' | 'windswept_hills' | 'windswept_savanna' | 'wooded_badlands';
+export type EnchantmentNames = 'protection' | 'fire_protection' | 'feather_falling' | 'blast_protection' | 'projectile_protection' | 'respiration' | 'aqua_affinity' | 'thorns' | 'depth_strider' | 'frost_walker' | 'binding_curse' | 'soul_speed' | 'swift_sneak' | 'sharpness' | 'smite' | 'bane_of_arthropods' | 'knockback' | 'fire_aspect' | 'looting' | 'sweeping' | 'efficiency' | 'silk_touch' | 'unbreaking' | 'fortune' | 'power' | 'punch' | 'flame' | 'infinity' | 'luck_of_the_sea' | 'lure' | 'loyalty' | 'impaling' | 'riptide' | 'channeling' | 'multishot' | 'quick_charge' | 'piercing' | 'mending' | 'vanishing_curse';
+
+export type EntityMetadataVersions = {
+'Mob': {},'Monster': {},'Creeper': {},'Skeleton': {},'Spider': {},'Giant': {},'Zombie': {},'Slime': {},'Ghast': {},'PigZombie': {},'Enderman': {},'CaveSpider': {},'Silverfish': {},'Blaze': {},'LavaSlime': {},'EnderDragon': {},'WitherBoss': {},'Bat': {},'Witch': {},'Endermite': {},'Guardian': {},'Pig': {},'Sheep': {},'Cow': {},'Chicken': {},'Squid': {},'Wolf': {},'MushroomCow': {},'SnowMan': {},'Ozelot': {},'VillagerGolem': {},'EntityHorse': {},'Rabbit': {},'Villager': {},'Boat': {},'Item': {},'MinecartRideable': {},'PrimedTnt': {},'EnderCrystal': {},'Arrow': {},'Snowball': {},'ThrownEgg': {},'Fireball': {},'SmallFireball': {},'ThrownEnderpearl': {},'WitherSkull': {},'FallingSand': {},'ItemFrame': {},'EyeOfEnderSignal': {},'ThrownPotion': {},'ThrownExpBottle': {},'FireworksRocketEntity': {},'LeashKnot': {},'ArmorStand': {},'Fishing Float': {},'Shulker': {},'XPOrb': {},'Dragon Fireball': {},'item': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'item': string;},'xp_orb': {},'area_effect_cloud': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'radius': string;
+/** 1.19.4+ (9) */
+'color': string;
+/** 1.19.4+ (10) */
+'waiting': string;
+/** 1.19.4+ (11) */
+'particle': string;},'elder_guardian': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'moving': string;
+/** 1.19.4+ (17) */
+'attack_target': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'wither_skeleton': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'stray': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'egg': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'item_stack': string;},'leash_knot': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;},'painting': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'painting_variant': string;},'arrow': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'flags': string;
+/** 1.19.4+ (9) */
+'pierce_level': string;
+/** 1.19.4+ (10) */
+'effect_color': string;},'snowball': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'item_stack': string;},'fireball': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'item_stack': string;},'small_fireball': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'item_stack': string;},'ender_pearl': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'item_stack': string;},'eye_of_ender_signal': {},'potion': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'item_stack': string;},'xp_bottle': {},'item_frame': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'item': string;
+/** 1.19.4+ (9) */
+'rotation': string;},'wither_skull': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'dangerous': string;},'tnt': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'fuse': string;
+/** 1.20.3+ (9) */
+'block_state': string;},'falling_block': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'start_pos': string;},'fireworks_rocket': {},'husk': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'special_type': string;
+/** 1.19.4+ (18) */
+'drowned_conversion': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'spectral_arrow': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'flags': string;
+/** 1.19.4+ (9) */
+'pierce_level': string;},'shulker_bullet': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;},'dragon_fireball': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;},'zombie_villager': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'special_type': string;
+/** 1.19.4+ (18) */
+'drowned_conversion': string;
+/** 1.19.4+ (19) */
+'converting': string;
+/** 1.19.4+ (20) */
+'villager_data': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'skeleton_horse': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'zombie_horse': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'armor_stand': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'client_flags': string;
+/** 1.19.4+ (16) */
+'head_pose': string;
+/** 1.19.4+ (17) */
+'body_pose': string;
+/** 1.19.4+ (18) */
+'left_arm_pose': string;
+/** 1.19.4+ (19) */
+'right_arm_pose': string;
+/** 1.19.4+ (20) */
+'left_leg_pose': string;
+/** 1.19.4+ (21) */
+'right_leg_pose': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'donkey': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'flags': string;
+/** 1.19.4+ (18) */
+'chest': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'mule': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'flags': string;
+/** 1.19.4+ (18) */
+'chest': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'evocation_fangs': {},'evocation_illager': {},'vex': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'vindication_illager': {},'commandblock_minecart': {},'boat': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'hurt': string;
+/** 1.19.4+ (9) */
+'hurtdir': string;
+/** 1.19.4+ (10) */
+'damage': string;
+/** 1.19.4+ (11) */
+'type': string;
+/** 1.19.4+ (12) */
+'paddle_left': string;
+/** 1.19.4+ (13) */
+'paddle_right': string;
+/** 1.19.4+ (14) */
+'bubble_time': string;},'minecart': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'hurt': string;
+/** 1.19.4+ (9) */
+'hurtdir': string;
+/** 1.19.4+ (10) */
+'damage': string;
+/** 1.19.4+ (11) */
+'display_block': string;
+/** 1.19.4+ (12) */
+'display_offset': string;
+/** 1.19.4+ (13) */
+'custom_display': string;},'chest_minecart': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'hurt': string;
+/** 1.19.4+ (9) */
+'hurtdir': string;
+/** 1.19.4+ (10) */
+'damage': string;
+/** 1.19.4+ (11) */
+'display_block': string;
+/** 1.19.4+ (12) */
+'display_offset': string;
+/** 1.19.4+ (13) */
+'custom_display': string;},'furnace_minecart': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'hurt': string;
+/** 1.19.4+ (9) */
+'hurtdir': string;
+/** 1.19.4+ (10) */
+'damage': string;
+/** 1.19.4+ (11) */
+'display_block': string;
+/** 1.19.4+ (12) */
+'display_offset': string;
+/** 1.19.4+ (13) */
+'custom_display': string;
+/** 1.19.4+ (14) */
+'fuel': string;},'tnt_minecart': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'hurt': string;
+/** 1.19.4+ (9) */
+'hurtdir': string;
+/** 1.19.4+ (10) */
+'damage': string;
+/** 1.19.4+ (11) */
+'display_block': string;
+/** 1.19.4+ (12) */
+'display_offset': string;
+/** 1.19.4+ (13) */
+'custom_display': string;},'hopper_minecart': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'hurt': string;
+/** 1.19.4+ (9) */
+'hurtdir': string;
+/** 1.19.4+ (10) */
+'damage': string;
+/** 1.19.4+ (11) */
+'display_block': string;
+/** 1.19.4+ (12) */
+'display_offset': string;
+/** 1.19.4+ (13) */
+'custom_display': string;},'spawner_minecart': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'hurt': string;
+/** 1.19.4+ (9) */
+'hurtdir': string;
+/** 1.19.4+ (10) */
+'damage': string;
+/** 1.19.4+ (11) */
+'display_block': string;
+/** 1.19.4+ (12) */
+'display_offset': string;
+/** 1.19.4+ (13) */
+'custom_display': string;},'creeper': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'swell_dir': string;
+/** 1.19.4+ (17) */
+'is_powered': string;
+/** 1.19.4+ (18) */
+'is_ignited': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'skeleton': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'stray_conversion': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'spider': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'giant': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'zombie': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'special_type': string;
+/** 1.19.4+ (18) */
+'drowned_conversion': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'slime': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'size': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'ghast': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'is_charging': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'zombie_pigman': {},'enderman': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'carry_state': string;
+/** 1.19.4+ (17) */
+'creepy': string;
+/** 1.19.4+ (18) */
+'stared_at': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'cave_spider': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'silverfish': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'blaze': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'magma_cube': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'size': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'ender_dragon': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'phase': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'wither': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'target_a': string;
+/** 1.19.4+ (17) */
+'target_b': string;
+/** 1.19.4+ (18) */
+'target_c': string;
+/** 1.19.4+ (19) */
+'inv': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'bat': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'witch': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'is_celebrating': string;
+/** 1.19.4+ (17) */
+'using_item': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'endermite': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'guardian': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'moving': string;
+/** 1.19.4+ (17) */
+'attack_target': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'shulker': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'attach_face': string;
+/** 1.19.4+ (17) */
+'peek': string;
+/** 1.19.4+ (18) */
+'color': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'pig': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'saddle': string;
+/** 1.19.4+ (18) */
+'boost_time': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'sheep': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'wool': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'cow': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'chicken': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'squid': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'wolf': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'flags': string;
+/** 1.19.4+ (18) */
+'owneruuid': string;
+/** 1.19.4+ (19) */
+'interested': string;
+/** 1.19.4+ (20) */
+'collar_color': string;
+/** 1.19.4+ (21) */
+'remaining_anger_time': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;
+/** 1.20.5+ (22) */
+'variant': string;},'mooshroom': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'type': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'snowman': {},'ocelot': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'trusting': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'villager_golem': {},'horse': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'flags': string;
+/** 1.19.4+ (18) */
+'type_variant': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'rabbit': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'type': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'polar_bear': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'standing': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'llama': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'flags': string;
+/** 1.19.4+ (18) */
+'chest': string;
+/** 1.19.4+ (19) */
+'strength': string;
+/** 1.19.4+ (20) */
+'swag': string;
+/** 1.19.4+ (21) */
+'variant': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'llama_spit': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;},'villager': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'unhappy_counter': string;
+/** 1.19.4+ (18) */
+'villager_data': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'ender_crystal': {},'Fishing Hook': {},'illusion_illager': {},'parrot': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'flags': string;
+/** 1.19.4+ (18) */
+'owneruuid': string;
+/** 1.19.4+ (19) */
+'variant': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'cod': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'from_bucket': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'dolphin': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'treasure_pos': string;
+/** 1.19.4+ (17) */
+'got_fish': string;
+/** 1.19.4+ (18) */
+'moistness_level': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'drowned': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'special_type': string;
+/** 1.19.4+ (18) */
+'drowned_conversion': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'end_crystal': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'beam_target': string;
+/** 1.19.4+ (9) */
+'show_bottom': string;},'evoker_fangs': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;},'evoker': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'is_celebrating': string;
+/** 1.19.4+ (17) */
+'spell_casting': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'experience_orb': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;},'eye_of_ender': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'item_stack': string;},'illusioner': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'is_celebrating': string;
+/** 1.19.4+ (17) */
+'spell_casting': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'pufferfish': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'from_bucket': string;
+/** 1.19.4+ (17) */
+'puff_state': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'salmon': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'from_bucket': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'snow_golem': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'pumpkin': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'tropical_fish': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'from_bucket': string;
+/** 1.19.4+ (17) */
+'type_variant': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'turtle': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'home_pos': string;
+/** 1.19.4+ (18) */
+'has_egg': string;
+/** 1.19.4+ (19) */
+'laying_egg': string;
+/** 1.19.4+ (20) */
+'travel_pos': string;
+/** 1.19.4+ (21) */
+'going_home': string;
+/** 1.19.4+ (22) */
+'travelling': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'experience_bottle': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'item_stack': string;},'iron_golem}': {},'vindicator': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'is_celebrating': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'phantom': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'size': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'lightning_bolt': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;},'player': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'player_absorption': string;
+/** 1.19.4+ (16) */
+'score': string;
+/** 1.19.4+ (17) */
+'player_mode_customisation': string;
+/** 1.19.4+ (18) */
+'player_main_hand': string;
+/** 1.19.4+ (19) */
+'shoulder_left': string;
+/** 1.19.4+ (20) */
+'shoulder_right': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'fishing_bobber': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'hooked_entity': string;
+/** 1.19.4+ (9) */
+'biting': string;},'trident': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'flags': string;
+/** 1.19.4+ (9) */
+'pierce_level': string;
+/** 1.19.4+ (10) */
+'loyalty': string;
+/** 1.19.4+ (11) */
+'foil': string;},'item_stack': {},'area_effect cloud': {},'activated_tnt': {},'endercrystal': {},'tipped_arrow': {},'firecharge': {},'thrown_enderpearl': {},'falling_objects': {},'item_frames': {},'eye_of ender': {},'thrown_potion': {},'thrown_exp bottle': {},'firework_rocket': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'fireworks_item': string;
+/** 1.19.4+ (9) */
+'attached_to_target': string;
+/** 1.19.4+ (10) */
+'shot_at_angle': string;},'armorstand': {},'fishing_hook': {},'cat': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'flags': string;
+/** 1.19.4+ (18) */
+'owneruuid': string;
+/** 1.19.4+ (19) */
+'variant': string;
+/** 1.19.4+ (20) */
+'is_lying': string;
+/** 1.19.4+ (21) */
+'relax_state_one': string;
+/** 1.19.4+ (22) */
+'collar_color': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'fox': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'type': string;
+/** 1.19.4+ (18) */
+'flags': string;
+/** 1.19.4+ (19) */
+'trusted_0': string;
+/** 1.19.4+ (20) */
+'trusted_1': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'command_block_minecart': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'hurt': string;
+/** 1.19.4+ (9) */
+'hurtdir': string;
+/** 1.19.4+ (10) */
+'damage': string;
+/** 1.19.4+ (11) */
+'display_block': string;
+/** 1.19.4+ (12) */
+'display_offset': string;
+/** 1.19.4+ (13) */
+'custom_display': string;
+/** 1.19.4+ (14) */
+'command_name': string;
+/** 1.19.4+ (15) */
+'last_output': string;},'panda': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'unhappy_counter': string;
+/** 1.19.4+ (18) */
+'sneeze_counter': string;
+/** 1.19.4+ (19) */
+'eat_counter': string;
+/** 1.19.4+ (20) */
+'main_gene': string;
+/** 1.19.4+ (21) */
+'hidden_gene': string;
+/** 1.19.4+ (22) */
+'flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'trader_llama': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'flags': string;
+/** 1.19.4+ (18) */
+'chest': string;
+/** 1.19.4+ (19) */
+'strength': string;
+/** 1.19.4+ (20) */
+'swag': string;
+/** 1.19.4+ (21) */
+'variant': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'iron_golem': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'pillager': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'is_celebrating': string;
+/** 1.19.4+ (17) */
+'is_charging_crossbow': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'wandering_trader': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'unhappy_counter': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'ravager': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'is_celebrating': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'bee': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'flags': string;
+/** 1.19.4+ (18) */
+'remaining_anger_time': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'hoglin': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'immune_to_zombification': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'piglin': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'immune_to_zombification': string;
+/** 1.19.4+ (17) */
+'baby': string;
+/** 1.19.4+ (18) */
+'is_charging_crossbow': string;
+/** 1.19.4+ (19) */
+'is_dancing': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'strider': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'boost_time': string;
+/** 1.19.4+ (18) */
+'suffocating': string;
+/** 1.19.4+ (19) */
+'saddle': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'zoglin': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'zombified_piglin': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'special_type': string;
+/** 1.19.4+ (18) */
+'drowned_conversion': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'piglin_brute': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'immune_to_zombification': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'axolotl': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'variant': string;
+/** 1.19.4+ (18) */
+'playing_dead': string;
+/** 1.19.4+ (19) */
+'from_bucket': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'glow_item_frame': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'item': string;
+/** 1.19.4+ (9) */
+'rotation': string;},'glow_squid': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'dark_ticks_remaining': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'goat': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'is_screaming_goat': string;
+/** 1.19.4+ (18) */
+'has_left_horn': string;
+/** 1.19.4+ (19) */
+'has_right_horn': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'marker': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;},'allay': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'dancing': string;
+/** 1.19.4+ (17) */
+'can_duplicate': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'chest_boat': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'hurt': string;
+/** 1.19.4+ (9) */
+'hurtdir': string;
+/** 1.19.4+ (10) */
+'damage': string;
+/** 1.19.4+ (11) */
+'type': string;
+/** 1.19.4+ (12) */
+'paddle_left': string;
+/** 1.19.4+ (13) */
+'paddle_right': string;
+/** 1.19.4+ (14) */
+'bubble_time': string;},'frog': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'variant': string;
+/** 1.19.4+ (18) */
+'tongue_target': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'tadpole': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'from_bucket': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'warden': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'client_anger_level': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'camel': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'flags': string;
+/** 1.19.4+ (18) */
+'dash': string;
+/** 1.19.4+ (19) */
+'last_pose_change_tick': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'block_display': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'interpolation_start_delta_ticks': string;
+/** 1.19.4+ (9) */
+'interpolation_duration': string;
+/** 1.19.4+ (10) */
+'translation': string;
+/** 1.19.4+ (11) */
+'scale': string;
+/** 1.19.4+ (12) */
+'left_rotation': string;
+/** 1.19.4+ (13) */
+'right_rotation': string;
+/** 1.19.4+ (14) */
+'billboard_render_constraints': string;
+/** 1.19.4+ (15) */
+'brightness_override': string;
+/** 1.19.4+ (16) */
+'view_range': string;
+/** 1.19.4+ (17) */
+'shadow_radius': string;
+/** 1.19.4+ (18) */
+'shadow_strength': string;
+/** 1.19.4+ (19) */
+'width': string;
+/** 1.19.4+ (20) */
+'height': string;
+/** 1.19.4+ (21) */
+'glow_color_override': string;
+/** 1.19.4+ (22) */
+'block_state': string;
+/** 1.20.2+ (8) */
+'transformation_interpolation_start_delta_ticks': string;
+/** 1.20.2+ (9) */
+'transformation_interpolation_duration': string;
+/** 1.20.2+ (10) */
+'pos_rot_interpolation_duration': string;},'interaction': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'width': string;
+/** 1.19.4+ (9) */
+'height': string;
+/** 1.19.4+ (10) */
+'response': string;},'item_display': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'interpolation_start_delta_ticks': string;
+/** 1.19.4+ (9) */
+'interpolation_duration': string;
+/** 1.19.4+ (10) */
+'translation': string;
+/** 1.19.4+ (11) */
+'scale': string;
+/** 1.19.4+ (12) */
+'left_rotation': string;
+/** 1.19.4+ (13) */
+'right_rotation': string;
+/** 1.19.4+ (14) */
+'billboard_render_constraints': string;
+/** 1.19.4+ (15) */
+'brightness_override': string;
+/** 1.19.4+ (16) */
+'view_range': string;
+/** 1.19.4+ (17) */
+'shadow_radius': string;
+/** 1.19.4+ (18) */
+'shadow_strength': string;
+/** 1.19.4+ (19) */
+'width': string;
+/** 1.19.4+ (20) */
+'height': string;
+/** 1.19.4+ (21) */
+'glow_color_override': string;
+/** 1.19.4+ (22) */
+'item_stack': string;
+/** 1.19.4+ (23) */
+'item_display': string;
+/** 1.20.2+ (8) */
+'transformation_interpolation_start_delta_ticks': string;
+/** 1.20.2+ (9) */
+'transformation_interpolation_duration': string;
+/** 1.20.2+ (10) */
+'pos_rot_interpolation_duration': string;},'sniffer': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'living_entity_flags': string;
+/** 1.19.4+ (9) */
+'health': string;
+/** 1.19.4+ (10) */
+'effect_color': string;
+/** 1.19.4+ (11) */
+'effect_ambience': string;
+/** 1.19.4+ (12) */
+'arrow_count': string;
+/** 1.19.4+ (13) */
+'stinger_count': string;
+/** 1.19.4+ (14) */
+'sleeping_pos': string;
+/** 1.19.4+ (15) */
+'mob_flags': string;
+/** 1.19.4+ (16) */
+'baby': string;
+/** 1.19.4+ (17) */
+'state': string;
+/** 1.19.4+ (18) */
+'drop_seed_at_tick': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'text_display': {
+/** 1.19.4+ (0) */
+'shared_flags': string;
+/** 1.19.4+ (1) */
+'air_supply': string;
+/** 1.19.4+ (2) */
+'custom_name': string;
+/** 1.19.4+ (3) */
+'custom_name_visible': string;
+/** 1.19.4+ (4) */
+'silent': string;
+/** 1.19.4+ (5) */
+'no_gravity': string;
+/** 1.19.4+ (6) */
+'pose': string;
+/** 1.19.4+ (7) */
+'ticks_frozen': string;
+/** 1.19.4+ (8) */
+'interpolation_start_delta_ticks': string;
+/** 1.19.4+ (9) */
+'interpolation_duration': string;
+/** 1.19.4+ (10) */
+'translation': string;
+/** 1.19.4+ (11) */
+'scale': string;
+/** 1.19.4+ (12) */
+'left_rotation': string;
+/** 1.19.4+ (13) */
+'right_rotation': string;
+/** 1.19.4+ (14) */
+'billboard_render_constraints': string;
+/** 1.19.4+ (15) */
+'brightness_override': string;
+/** 1.19.4+ (16) */
+'view_range': string;
+/** 1.19.4+ (17) */
+'shadow_radius': string;
+/** 1.19.4+ (18) */
+'shadow_strength': string;
+/** 1.19.4+ (19) */
+'width': string;
+/** 1.19.4+ (20) */
+'height': string;
+/** 1.19.4+ (21) */
+'glow_color_override': string;
+/** 1.19.4+ (22) */
+'text': string;
+/** 1.19.4+ (23) */
+'line_width': string;
+/** 1.19.4+ (24) */
+'background_color': string;
+/** 1.19.4+ (25) */
+'text_opacity': string;
+/** 1.19.4+ (26) */
+'style_flags': string;
+/** 1.20.2+ (8) */
+'transformation_interpolation_start_delta_ticks': string;
+/** 1.20.2+ (9) */
+'transformation_interpolation_duration': string;
+/** 1.20.2+ (10) */
+'pos_rot_interpolation_duration': string;},'breeze': {
+/** 1.20.3+ (0) */
+'shared_flags': string;
+/** 1.20.3+ (1) */
+'air_supply': string;
+/** 1.20.3+ (2) */
+'custom_name': string;
+/** 1.20.3+ (3) */
+'custom_name_visible': string;
+/** 1.20.3+ (4) */
+'silent': string;
+/** 1.20.3+ (5) */
+'no_gravity': string;
+/** 1.20.3+ (6) */
+'pose': string;
+/** 1.20.3+ (7) */
+'ticks_frozen': string;
+/** 1.20.3+ (8) */
+'living_entity_flags': string;
+/** 1.20.3+ (9) */
+'health': string;
+/** 1.20.3+ (10) */
+'effect_color': string;
+/** 1.20.3+ (11) */
+'effect_ambience': string;
+/** 1.20.3+ (12) */
+'arrow_count': string;
+/** 1.20.3+ (13) */
+'stinger_count': string;
+/** 1.20.3+ (14) */
+'sleeping_pos': string;
+/** 1.20.3+ (15) */
+'mob_flags': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;},'wind_charge': {
+/** 1.20.3+ (0) */
+'shared_flags': string;
+/** 1.20.3+ (1) */
+'air_supply': string;
+/** 1.20.3+ (2) */
+'custom_name': string;
+/** 1.20.3+ (3) */
+'custom_name_visible': string;
+/** 1.20.3+ (4) */
+'silent': string;
+/** 1.20.3+ (5) */
+'no_gravity': string;
+/** 1.20.3+ (6) */
+'pose': string;
+/** 1.20.3+ (7) */
+'ticks_frozen': string;},'armadillo': {
+/** 1.20.5+ (0) */
+'shared_flags': string;
+/** 1.20.5+ (1) */
+'air_supply': string;
+/** 1.20.5+ (2) */
+'custom_name': string;
+/** 1.20.5+ (3) */
+'custom_name_visible': string;
+/** 1.20.5+ (4) */
+'silent': string;
+/** 1.20.5+ (5) */
+'no_gravity': string;
+/** 1.20.5+ (6) */
+'pose': string;
+/** 1.20.5+ (7) */
+'ticks_frozen': string;
+/** 1.20.5+ (8) */
+'living_entity_flags': string;
+/** 1.20.5+ (9) */
+'health': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;
+/** 1.20.5+ (11) */
+'effect_ambience': string;
+/** 1.20.5+ (12) */
+'arrow_count': string;
+/** 1.20.5+ (13) */
+'stinger_count': string;
+/** 1.20.5+ (14) */
+'sleeping_pos': string;
+/** 1.20.5+ (15) */
+'mob_flags': string;
+/** 1.20.5+ (16) */
+'baby': string;
+/** 1.20.5+ (17) */
+'armadillo_state': string;},'bogged': {
+/** 1.20.5+ (0) */
+'shared_flags': string;
+/** 1.20.5+ (1) */
+'air_supply': string;
+/** 1.20.5+ (2) */
+'custom_name': string;
+/** 1.20.5+ (3) */
+'custom_name_visible': string;
+/** 1.20.5+ (4) */
+'silent': string;
+/** 1.20.5+ (5) */
+'no_gravity': string;
+/** 1.20.5+ (6) */
+'pose': string;
+/** 1.20.5+ (7) */
+'ticks_frozen': string;
+/** 1.20.5+ (8) */
+'living_entity_flags': string;
+/** 1.20.5+ (9) */
+'health': string;
+/** 1.20.5+ (10) */
+'effect_particles': string;
+/** 1.20.5+ (11) */
+'effect_ambience': string;
+/** 1.20.5+ (12) */
+'arrow_count': string;
+/** 1.20.5+ (13) */
+'stinger_count': string;
+/** 1.20.5+ (14) */
+'sleeping_pos': string;
+/** 1.20.5+ (15) */
+'mob_flags': string;
+/** 1.20.5+ (16) */
+'sheared': string;},'breeze_wind_charge': {
+/** 1.20.5+ (0) */
+'shared_flags': string;
+/** 1.20.5+ (1) */
+'air_supply': string;
+/** 1.20.5+ (2) */
+'custom_name': string;
+/** 1.20.5+ (3) */
+'custom_name_visible': string;
+/** 1.20.5+ (4) */
+'silent': string;
+/** 1.20.5+ (5) */
+'no_gravity': string;
+/** 1.20.5+ (6) */
+'pose': string;
+/** 1.20.5+ (7) */
+'ticks_frozen': string;},'ominous_item_spawner': {
+/** 1.20.5+ (0) */
+'shared_flags': string;
+/** 1.20.5+ (1) */
+'air_supply': string;
+/** 1.20.5+ (2) */
+'custom_name': string;
+/** 1.20.5+ (3) */
+'custom_name_visible': string;
+/** 1.20.5+ (4) */
+'silent': string;
+/** 1.20.5+ (5) */
+'no_gravity': string;
+/** 1.20.5+ (6) */
+'pose': string;
+/** 1.20.5+ (7) */
+'ticks_frozen': string;
+/** 1.20.5+ (8) */
+'item': string;},
+}
\ No newline at end of file

From b881a6161072dda20f60f6c9e13313d436b86c7d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 22 Nov 2024 15:16:20 +0300
Subject: [PATCH 052/753] fix: improve output commands formatting, especially
 errored ones feat: add gamerules support: basic data parsing, now possible to
 control/change them via /gamerule only these gamerules effect implemented:
 doDaylightCycle fix: better messaging from output commands (now green)

---
 package.json   |  2 +-
 pnpm-lock.yaml | 48 +++++++++++++++++++++---------------------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 53b4b70d..ee2126ca 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "express": "^4.18.2",
     "filesize": "^10.0.12",
-    "flying-squid": "npm:@zardoy/flying-squid@^0.0.47",
+    "flying-squid": "npm:@zardoy/flying-squid@^0.0.49",
     "fs-extra": "^11.1.1",
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dfb34dca..9b0e4ae3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -119,8 +119,8 @@ importers:
         specifier: ^10.0.12
         version: 10.0.12
       flying-squid:
-        specifier: npm:@zardoy/flying-squid@^0.0.47
-        version: '@zardoy/flying-squid@0.0.47(encoding@0.1.13)'
+        specifier: npm:@zardoy/flying-squid@^0.0.49
+        version: '@zardoy/flying-squid@0.0.49(encoding@0.1.13)'
       fs-extra:
         specifier: ^11.1.1
         version: 11.1.1
@@ -147,7 +147,7 @@ importers:
         version: 2.0.4
       net-browserify:
         specifier: github:zardoy/prismarinejs-net-browserify
-        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/d3f7f77d8ac751bc171173bba639086c931a62f7
+        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/ab3721ca833308a0be099d14ea0053fbd8459ace
       node-gzip:
         specifier: ^1.1.2
         version: 1.1.2
@@ -3395,8 +3395,8 @@ packages:
     resolution: {integrity: sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==}
     engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'}
 
-  '@zardoy/flying-squid@0.0.47':
-    resolution: {integrity: sha512-VUtOqPGZ/20tQEjRLFpbz0taoTMi0GgoUM7002wn8RjuVmowg0pMUjdy0YwcFPGla8z1sOwjsF9cOtU4hQ8pUg==}
+  '@zardoy/flying-squid@0.0.49':
+    resolution: {integrity: sha512-Kt4wr5/R+44tcLU9gjuNG2an9weWeKEpIoKXfsgJN2GGQqdnbd5nBpxfGDdgZ9aMdFugsVW8BsyPZNhj9vbMXA==}
     engines: {node: '>=8'}
     hasBin: true
 
@@ -4870,10 +4870,6 @@ packages:
     engines: {node: '>=12'}
     hasBin: true
 
-  escalade@3.1.1:
-    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
-    engines: {node: '>=6'}
-
   escalade@3.1.2:
     resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}
     engines: {node: '>=6'}
@@ -6969,8 +6965,8 @@ packages:
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/d3f7f77d8ac751bc171173bba639086c931a62f7:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/d3f7f77d8ac751bc171173bba639086c931a62f7}
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/ab3721ca833308a0be099d14ea0053fbd8459ace:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/ab3721ca833308a0be099d14ea0053fbd8459ace}
     version: 0.2.4
 
   nice-try@1.0.5:
@@ -9853,7 +9849,7 @@ snapshots:
       '@babel/core': 7.22.11
       '@babel/helper-compilation-targets': 7.22.10
       '@babel/helper-plugin-utils': 7.22.5
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       lodash.debounce: 4.0.8
       resolve: 1.22.4
     transitivePeerDependencies:
@@ -10580,7 +10576,7 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.22.13
       '@babel/types': 7.23.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -13139,7 +13135,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.5.4)
       '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4)
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       eslint: 8.50.0
       ts-api-utils: 1.0.3(typescript@5.5.4)
     optionalDependencies:
@@ -13157,7 +13153,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.1.0
       '@typescript-eslint/visitor-keys': 6.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.0
@@ -13171,7 +13167,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.7.3
       '@typescript-eslint/visitor-keys': 6.7.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.0
@@ -13185,7 +13181,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 8.0.0
       '@typescript-eslint/visitor-keys': 8.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -13419,7 +13415,7 @@ snapshots:
       '@types/emscripten': 1.39.8
       tslib: 1.14.1
 
-  '@zardoy/flying-squid@0.0.47(encoding@0.1.13)':
+  '@zardoy/flying-squid@0.0.49(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
       chalk: 5.3.0
@@ -14912,7 +14908,7 @@ snapshots:
   detect-port@1.5.1:
     dependencies:
       address: 1.2.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -15418,8 +15414,6 @@ snapshots:
       '@esbuild/win32-ia32': 0.19.3
       '@esbuild/win32-x64': 0.19.3
 
-  escalade@3.1.1: {}
-
   escalade@3.1.2: {}
 
   escape-html@1.0.3: {}
@@ -16567,7 +16561,7 @@ snapshots:
   https-proxy-agent@4.0.0:
     dependencies:
       agent-base: 5.1.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -16582,7 +16576,7 @@ snapshots:
   https-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -17656,7 +17650,7 @@ snapshots:
   micromark@4.0.0:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.0
@@ -18028,7 +18022,7 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/d3f7f77d8ac751bc171173bba639086c931a62f7:
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/ab3721ca833308a0be099d14ea0053fbd8459ace:
     dependencies:
       body-parser: 1.20.2
       express: 4.18.2
@@ -20698,7 +20692,7 @@ snapshots:
   update-browserslist-db@1.0.11(browserslist@4.21.10):
     dependencies:
       browserslist: 4.21.10
-      escalade: 3.1.1
+      escalade: 3.1.2
       picocolors: 1.0.1
 
   update-browserslist-db@1.1.0(browserslist@4.23.2):
@@ -21310,7 +21304,7 @@ snapshots:
   yargs@16.2.0:
     dependencies:
       cliui: 7.0.4
-      escalade: 3.1.1
+      escalade: 3.1.2
       get-caller-file: 2.0.5
       require-directory: 2.1.1
       string-width: 4.2.3

From c97dbbde9a0a5120b212a291137d3f8d744ee576 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 22 Nov 2024 15:44:08 +0300
Subject: [PATCH 053/753] feat: add query parameter to specify your custom
 server lists to display in UI: ?serversList feat: custom proxy is applied in
 servers list ui when ?proxy is specified feat: add a way to quickly copy
 server list with ctrl+c in servers list ui

---
 README.MD                         |  1 +
 src/index.ts                      |  4 ++
 src/react/ServersListProvider.tsx | 75 ++++++++++++++++++++++++++-----
 src/react/Singleplayer.tsx        | 10 +++--
 src/react/simpleHooks.ts          | 21 +++++++++
 5 files changed, 96 insertions(+), 15 deletions(-)

diff --git a/README.MD b/README.MD
index 77f68032..b3ac75a0 100644
--- a/README.MD
+++ b/README.MD
@@ -137,6 +137,7 @@ Server specific:
 - `?username=<username>` - Set the username for the server
 - `?lockConnect=true` - Only works then `ip` parameter is set. Disables cancel/save buttons and all inputs in the connect screen already set as parameters. Useful for integrates iframes.
 - `?reconnect=true` - Reconnect to the server on page reloads. Available in **dev mode only** and very useful on server testing.
+- `?serversList=<list_or_url>` - `<list_or_url>` can be a list of servers in the format `ip:version,ip` or a url to a json file with the same format (array) or a txt file with line-delimited list of server IPs.
 
 Single player specific:
 
diff --git a/src/index.ts b/src/index.ts
index 1b65bb00..28d8eedd 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1046,6 +1046,10 @@ downloadAndOpenFile().then((downloadAction) => {
       })
     }
   })
+
+  if (qs.get('serversList')) {
+    showModal({ reactType: 'serversList' })
+  }
 }, (err) => {
   console.error(err)
   alert(`Failed to download file: ${err}`)
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index f42fb11b..c5cff9f2 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -9,6 +9,7 @@ import AddServerOrConnect, { BaseServerInfo } from './AddServerOrConnect'
 import { useDidUpdateEffect } from './utils'
 import { useIsModalActive } from './utilsApp'
 import { showOptionsModal } from './SelectOption'
+import { useCopyKeybinding } from './simpleHooks'
 
 interface StoreServerItem extends BaseServerInfo {
   lastJoined?: number
@@ -92,7 +93,11 @@ const getInitialServersList = () => {
   return servers
 }
 
-const setNewServersList = (serversList: StoreServerItem[]) => {
+const serversListQs = new URLSearchParams(window.location.search).get('serversList')
+const proxyQs = new URLSearchParams(window.location.search).get('proxy')
+
+const setNewServersList = (serversList: StoreServerItem[], force = false) => {
+  if (serversListQs && !force) return
   localStorage['serversList'] = JSON.stringify(serversList)
 
   // cleanup legacy
@@ -133,13 +138,14 @@ export const updateAuthenticatedAccountData = (callback: (data: AuthenticatedAcc
 // todo move to base
 const normalizeIp = (ip: string) => ip.replace(/https?:\/\//, '').replace(/\/(:|$)/, '')
 
-const Inner = ({ hidden }: { hidden?: boolean }) => {
+const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersList?: string[] }) => {
   const [proxies, setProxies] = useState<readonly string[]>(localStorage['proxies'] ? JSON.parse(localStorage['proxies']) : getInitialProxies())
-  const [selectedProxy, setSelectedProxy] = useState(localStorage.getItem('selectedProxy') ?? proxies?.[0] ?? '')
+  const [selectedProxy, setSelectedProxy] = useState(proxyQs ?? localStorage.getItem('selectedProxy') ?? proxies?.[0] ?? '')
   const [serverEditScreen, setServerEditScreen] = useState<StoreServerItem | true | null>(null) // true for add
   const [defaultUsername, _setDefaultUsername] = useState(localStorage['username'] ?? (`mcrafter${Math.floor(Math.random() * 1000)}`))
   const [authenticatedAccounts, _setAuthenticatedAccounts] = useState<AuthenticatedAccount[]>(JSON.parse(localStorage['authenticatedAccounts'] || '[]'))
   const [quickConnectIp, setQuickConnectIp] = useState('')
+  const [selectedIndex, setSelectedIndex] = useState(-1)
 
   const setAuthenticatedAccounts = (newState: typeof authenticatedAccounts) => {
     _setAuthenticatedAccounts(newState)
@@ -151,18 +157,35 @@ const Inner = ({ hidden }: { hidden?: boolean }) => {
     localStorage.setItem('username', newState)
   }
 
+  const saveNewProxy = () => {
+    if (!selectedProxy || proxyQs) return
+    localStorage.setItem('selectedProxy', selectedProxy)
+  }
+
   useEffect(() => {
     if (proxies.length) {
       localStorage.setItem('proxies', JSON.stringify(proxies))
     }
-    if (selectedProxy) {
-      localStorage.setItem('selectedProxy', selectedProxy)
-    }
+    saveNewProxy()
   }, [proxies])
 
-  const [serversList, setServersList] = useState<StoreServerItem[]>(() => getInitialServersList())
+  const [serversList, setServersList] = useState<StoreServerItem[]>(() => (customServersList ? [] : getInitialServersList()))
   const [additionalData, setAdditionalData] = useState<Record<string, AdditionalDisplayData>>({})
 
+  useEffect(() => {
+    if (customServersList) {
+      setServersList(customServersList.map(row => {
+        const [ip, name] = row.split(' ')
+        const [_ip, _port, version] = ip.split(':')
+        return {
+          ip,
+          versionOverride: version,
+          name,
+        }
+      }))
+    }
+  }, [customServersList])
+
   useDidUpdateEffect(() => {
     // save data only on user changes
     setNewServersList(serversList)
@@ -218,6 +241,16 @@ const Inner = ({ hidden }: { hidden?: boolean }) => {
     }
   }, [isEditScreenModal])
 
+  useCopyKeybinding(() => {
+    const item = serversList[selectedIndex]
+    if (!item) return
+    let str = `${item.ip}`
+    if (item.versionOverride) {
+      str += `:${item.versionOverride}`
+    }
+    return str
+  })
+
   const editModalJsx = isEditScreenModal ? <AddServerOrConnect
     placeholders={{
       proxyOverride: selectedProxy,
@@ -319,15 +352,14 @@ const Inner = ({ hidden }: { hidden?: boolean }) => {
             // setProxies([...proxies, selectedProxy])
             localStorage.setItem('proxies', JSON.stringify([...proxies, selectedProxy]))
           }
-          if (selectedProxy) {
-            localStorage.setItem('selectedProxy', selectedProxy)
-          }
+          saveNewProxy()
         },
         serverIndex: shouldSave ? serversList.length.toString() : indexOrIp // assume last
       } satisfies ConnectOptions
       dispatchEvent(new CustomEvent('connect', { detail: options }))
       // qsOptions
     }}
+    lockedEditing={!!customServersList}
     username={defaultUsername}
     setUsername={setDefaultUsername}
     setQuickConnectIp={setQuickConnectIp}
@@ -377,6 +409,9 @@ const Inner = ({ hidden }: { hidden?: boolean }) => {
       setSelectedProxy(selected)
     }}
     hidden={hidden}
+    onRowSelect={(_, i) => {
+      setSelectedIndex(i)
+    }}
   />
   return <>
     {serversListJsx}
@@ -385,6 +420,24 @@ const Inner = ({ hidden }: { hidden?: boolean }) => {
 }
 
 export default () => {
+  const [customServersList, setCustomServersList] = useState<string[] | undefined>(serversListQs ? [] : undefined)
+
+  useEffect(() => {
+    if (serversListQs) {
+      if (serversListQs.startsWith('http')) {
+        void fetch(serversListQs).then(async r => r.text()).then((text) => {
+          const isJson = serversListQs.endsWith('.json') ? true : serversListQs.endsWith('.txt') ? false : text.startsWith('[')
+          setCustomServersList(isJson ? JSON.parse(text) : text.split('\n').map(x => x.trim()).filter(x => x.trim().length > 0))
+        }).catch((err) => {
+          console.error(err)
+          alert(`Failed to get servers list file: ${err}`)
+        })
+      } else {
+        setCustomServersList(serversListQs.split(','))
+      }
+    }
+  }, [])
+
   const modalStack = useSnapshot(activeModalStack)
   const hasServersListModal = modalStack.some(x => x.reactType === 'serversList')
   const editServerModalActive = useIsModalActive('editServer')
@@ -392,5 +445,5 @@ export default () => {
 
   const eitherModal = isServersListModalActive || editServerModalActive
   const render = eitherModal || hasServersListModal
-  return render ? <Inner hidden={!isServersListModalActive} /> : null
+  return render ? <Inner hidden={!isServersListModalActive} customServersList={customServersList} /> : null
 }
diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index 893385fa..024f7764 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -94,6 +94,7 @@ interface Props {
   listStyle?: React.CSSProperties
   setListHovered?: (hovered: boolean) => void
   secondRowStyles?: React.CSSProperties
+  lockedEditing?: boolean
 }
 
 export default ({
@@ -116,7 +117,8 @@ export default ({
   defaultSelectedRow,
   listStyle,
   setListHovered,
-  secondRowStyles
+  secondRowStyles,
+  lockedEditing
 }: Props) => {
   const containerRef = useRef<any>()
   const firstButton = useRef<HTMLButtonElement>(null)
@@ -213,10 +215,10 @@ export default ({
           <Button onClick={() => onGeneralAction('create')} disabled={isReadonly}>Create New World</Button>
         </div>}
         <div style={{ ...secondRowStyles }}>
-          {serversLayout ? <Button style={{ width: 100 }} disabled={!focusedWorld} onClick={() => onWorldAction('edit', focusedWorld)}>Edit</Button> : <Button style={{ width: 100 }} disabled={!focusedWorld} onClick={() => onWorldAction('export', focusedWorld)}>Export</Button>}
-          <Button style={{ width: 100 }} disabled={!focusedWorld} onClick={() => onWorldAction('delete', focusedWorld)}>Delete</Button>
+          {serversLayout ? <Button style={{ width: 100 }} disabled={!focusedWorld || lockedEditing} onClick={() => onWorldAction('edit', focusedWorld)}>Edit</Button> : <Button style={{ width: 100 }} disabled={!focusedWorld} onClick={() => onWorldAction('export', focusedWorld)}>Export</Button>}
+          <Button style={{ width: 100 }} disabled={!focusedWorld || lockedEditing} onClick={() => onWorldAction('delete', focusedWorld)}>Delete</Button>
           {serversLayout ?
-            <Button style={{ width: 100 }} onClick={() => onGeneralAction('create')}>Add</Button> :
+            <Button style={{ width: 100 }} onClick={() => onGeneralAction('create')} disabled={lockedEditing}>Add</Button> :
             <Button style={{ width: 100 }} onClick={() => onWorldAction('edit', focusedWorld)} disabled>Edit</Button>}
           <Button style={{ width: 100 }} onClick={() => onGeneralAction('cancel')}>Cancel</Button>
         </div>
diff --git a/src/react/simpleHooks.ts b/src/react/simpleHooks.ts
index 9202bfa2..da8dd9e0 100644
--- a/src/react/simpleHooks.ts
+++ b/src/react/simpleHooks.ts
@@ -1,6 +1,27 @@
+import { useUtilsEffect } from '@zardoy/react-util'
 import { useMedia } from 'react-use'
 
 const SMALL_SCREEN_MEDIA = '@media (max-width: 440px)'
 export const useIsSmallWidth = () => {
   return useMedia(SMALL_SCREEN_MEDIA.replace('@media ', ''))
 }
+
+export const useCopyKeybinding = (getCopyText: () => string | undefined) => {
+  useUtilsEffect(({ signal }) => {
+    addEventListener('keydown', (e) => {
+      if (e.code === 'KeyC' && (e.ctrlKey || e.metaKey) && !e.shiftKey && !e.altKey) {
+        const { activeElement } = document
+        if (activeElement instanceof HTMLInputElement || activeElement instanceof HTMLTextAreaElement) {
+          return
+        }
+        if (window.getSelection()?.toString()) {
+          return
+        }
+        e.preventDefault()
+        const copyText = getCopyText()
+        if (!copyText) return
+        void navigator.clipboard.writeText(copyText)
+      }
+    }, { signal })
+  }, [getCopyText])
+}

From 50f35cf17669554c516dffdbd5e9ca4541bd4155 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Fri, 22 Nov 2024 21:24:45 +0100
Subject: [PATCH 054/753] Fix rendering of custom names and more text display
 options (#233)

Fix rendering of custom names of normal entities and add more text display options. Newly supported options for text displays:
- background color
- text opacity

Also exclude `mcDataTypes.ts` from linting and fix a possible exception due to no `entityData` being defined
---
 .eslintignore                            |  1 +
 prismarine-viewer/viewer/lib/entities.ts | 50 ++++++++++++++++++++----
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 4c431739..9aa16166 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -6,3 +6,4 @@ generated
 dist
 public
 **/*/rsbuildSharedConfig.ts
+src/mcDataTypes.ts
\ No newline at end of file
diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index ae05a133..8ee93c3b 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -22,7 +22,27 @@ export const TWEEN_DURATION = 120
 
 type PlayerObjectType = PlayerObject & { animation?: PlayerAnimation }
 
-function getUsernameTexture (username: string, { fontFamily = 'sans-serif' }: any) {
+function toRgba (color?: string) {
+  if (!color || parseInt(color, 10) === 0) {
+    return 'rgba(0, 0, 0, 0)'
+  }
+  const hex = parseInt(color, 10).toString(16)
+  const r = parseInt(hex.slice(1, 3), 16)
+  const g = parseInt(hex.slice(3, 5), 16)
+  const b = parseInt(hex.slice(5, 7), 16)
+  if (hex.length === 9) {
+    const a = parseInt(hex.slice(7, 9), 16) / 255
+    return `rgba(${r}, ${g}, ${b}, ${a})`
+  } else {
+    return `rgb(${r}, ${g}, ${b})`
+  }
+}
+
+function getUsernameTexture ({
+  username,
+  nameTagBackgroundColor = 'rgba(0, 0, 0, 0.3)',
+  nameTagTextOpacity = 255
+}: any, { fontFamily = 'sans-serif' }: any) {
   const canvas = document.createElement('canvas')
   const ctx = canvas.getContext('2d')
   if (!ctx) throw new Error('Could not get 2d context')
@@ -42,11 +62,11 @@ function getUsernameTexture (username: string, { fontFamily = 'sans-serif' }: an
   canvas.width = textWidth
   canvas.height = (fontSize + padding * 2) * lines.length
 
-  ctx.fillStyle = 'rgba(0, 0, 0, 0.3)'
+  ctx.fillStyle = nameTagBackgroundColor
   ctx.fillRect(0, 0, canvas.width, canvas.height)
 
   ctx.font = `${fontSize}px ${fontFamily}`
-  ctx.fillStyle = 'white'
+  ctx.fillStyle = `rgba(255, 255, 255, ${nameTagTextOpacity / 255})`
   let i = 0
   for (const line of lines) {
     i++
@@ -59,7 +79,7 @@ function getUsernameTexture (username: string, { fontFamily = 'sans-serif' }: an
 const addNametag = (entity, options, mesh) => {
   if (entity.username !== undefined) {
     if (mesh.children.some(c => c.name === 'nametag')) return // todo update
-    const canvas = getUsernameTexture(entity.username, options)
+    const canvas = getUsernameTexture(entity, options)
     const tex = new THREE.Texture(canvas)
     tex.needsUpdate = true
     const spriteMat = new THREE.SpriteMaterial({ map: tex })
@@ -304,6 +324,9 @@ export class Entities extends EventEmitter {
   parseEntityLabel (jsonLike) {
     if (!jsonLike) return
     try {
+      if (jsonLike.type === 'string') {
+        return jsonLike.value
+      }
       const parsed = typeof jsonLike === 'string' ? mojangson.simplify(mojangson.parse(jsonLike)) : nbt.simplify(jsonLike)
       const text = flat(parsed).map(x => x.text)
       return text.join('')
@@ -467,10 +490,21 @@ export class Entities extends EventEmitter {
     }
     // ---
     // not player
-    const displayTextRaw = meta.custom_name_visible || getSpecificEntityMetadata('text_display', entity)?.text
-    const displayText = displayTextRaw && this.parseEntityLabel(displayTextRaw)
+    const textDisplayMeta = getSpecificEntityMetadata('text_display', entity)
+    const displayTextRaw = textDisplayMeta?.text || meta.custom_name_visible && meta.custom_name
+    const displayText = this.parseEntityLabel(displayTextRaw)
     if (entity.name !== 'player' && displayText) {
-      addNametag({ ...entity, username: displayText }, this.entitiesOptions, this.entities[entity.id].children.find(c => c.name === 'mesh'))
+      const nameTagBackgroundColor = textDisplayMeta && toRgba(textDisplayMeta.background_color)
+      let nameTagTextOpacity: any
+      if (textDisplayMeta?.text_opacity) {
+        const rawOpacity = parseInt(textDisplayMeta?.text_opacity, 10)
+        nameTagTextOpacity = rawOpacity > 0 ? rawOpacity : 256 - rawOpacity
+      }
+      addNametag(
+        { ...entity, username: displayText, nameTagBackgroundColor, nameTagTextOpacity },
+        this.entitiesOptions,
+        this.entities[entity.id].children.find(c => c.name === 'mesh')
+      )
     }
 
     // todo handle map, map_chunks events
@@ -556,7 +590,7 @@ function getGeneralEntitiesMetadata (entity: { name; metadata }): Partial<UnionT
   const entityData = loadedData.entitiesByName[entity.name]
   return new Proxy({}, {
     get (target, p, receiver) {
-      if (typeof p !== 'string') return
+      if (typeof p !== 'string' || !entityData) return
       const index = entityData.metadataKeys?.indexOf(p)
       return entity.metadata[index ?? -1]
     },

From b89cf522a0e81f80f487425b97ac2d8a3720030b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 25 Nov 2024 16:26:30 +0300
Subject: [PATCH 055/753] docs: move general params to top

---
 README.MD | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.MD b/README.MD
index b3ac75a0..ceba1c6c 100644
--- a/README.MD
+++ b/README.MD
@@ -128,6 +128,10 @@ Press `Y` to set query parameters to url of your current game state.
 
 There are some parameters you can set in the url to archive some specific behaviors:
 
+General:
+
+- **`?setting=<setting_name>:<setting_value>`** - Set and lock the setting on load. You can set multiple settings by separating them with `&` e.g. `?setting=autoParkour:true&setting=renderDistance:4`
+
 Server specific:
 
 - `?ip=<server_address>` - Display connect screen to the server on load with predefined server ip. `:<port>` is optional and can be added to the ip.
@@ -172,10 +176,6 @@ In this case you must use `?mapDirBaseUrl` to specify the base URL to fetch the
 
 <!-- - `?mapDirGuess=<base_url>` - Load the map from the provided URL and paths will be guessed with a few additional fetch requests. -->
 
-General:
-
-- `?setting=<setting_name>:<setting_value>` - Set and lock the setting on load. You can set multiple settings by separating them with `&` e.g. `?setting=autoParkour:true&setting=renderDistance:4`
-
 ### Notable Things that Power this Project
 
 - [Mineflayer](https://github.com/PrismarineJS/mineflayer) - Handles all client-side communications with the server (including the builtin one) - forked

From af088d92e13b3597e202cb85a6ab52c6374efad6 Mon Sep 17 00:00:00 2001
From: gguio <109200692+gguio@users.noreply.github.com>
Date: Thu, 28 Nov 2024 00:07:28 +0400
Subject: [PATCH 056/753] feat: minimap and full screen map (disabled by
 default) (#147)

---
 package.json                                  |   1 +
 pnpm-lock.yaml                                |  35 +-
 prismarine-viewer/viewer/lib/mesher/models.ts |  21 +-
 prismarine-viewer/viewer/lib/mesher/shared.ts |   4 +-
 .../viewer/lib/mesher/test/tests.test.ts      |   3 +-
 .../viewer/lib/mesher/worldConstants.ts       |   1 +
 .../viewer/lib/worldrendererCommon.ts         |  16 +-
 src/controls.ts                               |  11 +-
 src/globalState.ts                            |   2 +
 src/optionsGuiScheme.tsx                      |  13 +
 src/optionsStorage.ts                         |   2 +
 src/react/Fullmap.css                         |  13 +
 src/react/Fullmap.tsx                         | 512 +++++++++++++++
 src/react/Input.tsx                           |   4 +-
 src/react/Minimap.stories.tsx                 |  74 +++
 src/react/Minimap.tsx                         | 175 +++++
 src/react/MinimapDrawer.ts                    | 324 ++++++++++
 src/react/MinimapProvider.tsx                 | 610 ++++++++++++++++++
 src/react/utilsApp.ts                         |   4 +-
 src/reactUi.tsx                               |  11 +-
 tsconfig.json                                 |   2 +-
 21 files changed, 1799 insertions(+), 39 deletions(-)
 create mode 100644 prismarine-viewer/viewer/lib/mesher/worldConstants.ts
 create mode 100644 src/react/Fullmap.css
 create mode 100644 src/react/Fullmap.tsx
 create mode 100644 src/react/Minimap.stories.tsx
 create mode 100644 src/react/Minimap.tsx
 create mode 100644 src/react/MinimapDrawer.ts
 create mode 100644 src/react/MinimapProvider.tsx

diff --git a/package.json b/package.json
index ee2126ca..1a725825 100644
--- a/package.json
+++ b/package.json
@@ -92,6 +92,7 @@
     "react-dom": "^18.2.0",
     "react-select": "^5.8.0",
     "react-transition-group": "^4.4.5",
+    "react-zoom-pan-pinch": "3.4.4",
     "remark": "^15.0.1",
     "sanitize-filename": "^1.6.3",
     "skinview3d": "^3.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9b0e4ae3..ff67d9d0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -193,6 +193,9 @@ importers:
       react-transition-group:
         specifier: ^4.4.5
         version: 4.4.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      react-zoom-pan-pinch:
+        specifier: 3.4.4
+        version: 3.4.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       remark:
         specifier: ^15.0.1
         version: 15.0.1
@@ -7927,6 +7930,13 @@ packages:
       react: ^18.2.0
       react-dom: ^16.8.0  || ^17.0.0
 
+  react-zoom-pan-pinch@3.4.4:
+    resolution: {integrity: sha512-lGTu7D9lQpYEQ6sH+NSlLA7gicgKRW8j+D/4HO1AbSV2POvKRFzdWQ8eI0r3xmOsl4dYQcY+teV6MhULeg1xBw==}
+    engines: {node: '>=8', npm: '>=5'}
+    peerDependencies:
+      react: ^18.2.0
+      react-dom: '*'
+
   react@18.2.0:
     resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
     engines: {node: '>=0.10.0'}
@@ -9849,7 +9859,7 @@ snapshots:
       '@babel/core': 7.22.11
       '@babel/helper-compilation-targets': 7.22.10
       '@babel/helper-plugin-utils': 7.22.5
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.4
     transitivePeerDependencies:
@@ -10576,7 +10586,7 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.22.13
       '@babel/types': 7.23.0
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -13135,7 +13145,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.5.4)
       '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4)
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.50.0
       ts-api-utils: 1.0.3(typescript@5.5.4)
     optionalDependencies:
@@ -13153,7 +13163,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.1.0
       '@typescript-eslint/visitor-keys': 6.1.0
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.0
@@ -13167,7 +13177,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.7.3
       '@typescript-eslint/visitor-keys': 6.7.3
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.0
@@ -13181,7 +13191,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 8.0.0
       '@typescript-eslint/visitor-keys': 8.0.0
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -14908,7 +14918,7 @@ snapshots:
   detect-port@1.5.1:
     dependencies:
       address: 1.2.2
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -16561,7 +16571,7 @@ snapshots:
   https-proxy-agent@4.0.0:
     dependencies:
       agent-base: 5.1.1
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -16576,7 +16586,7 @@ snapshots:
   https-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -17650,7 +17660,7 @@ snapshots:
   micromark@4.0.0:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.3.7
+      debug: 4.3.4(supports-color@8.1.1)
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.0
@@ -19175,6 +19185,11 @@ snapshots:
       ts-easing: 0.2.0
       tslib: 2.6.2
 
+  react-zoom-pan-pinch@3.4.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+    dependencies:
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+
   react@18.2.0:
     dependencies:
       loose-envify: 1.4.0
diff --git a/prismarine-viewer/viewer/lib/mesher/models.ts b/prismarine-viewer/viewer/lib/mesher/models.ts
index 91c0cf40..8baec4dc 100644
--- a/prismarine-viewer/viewer/lib/mesher/models.ts
+++ b/prismarine-viewer/viewer/lib/mesher/models.ts
@@ -4,7 +4,9 @@ import legacyJson from '../../../../src/preflatMap.json'
 import { BlockType } from '../../../examples/shared'
 import { World, BlockModelPartsResolved, WorldBlock as Block } from './world'
 import { BlockElement, buildRotationMatrix, elemFaces, matmul3, matmulmat3, vecadd3, vecsub3 } from './modelsGeometryCommon'
-import { MesherGeometryOutput } from './shared'
+import { INVISIBLE_BLOCKS } from './worldConstants'
+import { MesherGeometryOutput, HighestBlockInfo } from './shared'
+
 
 let blockProvider: WorldBlockProvider
 
@@ -439,8 +441,6 @@ function renderElement (world: World, cursor: Vec3, element: BlockElement, doAO:
   }
 }
 
-const invisibleBlocks = new Set(['air', 'cave_air', 'void_air', 'barrier'])
-
 const isBlockWaterlogged = (block: Block) => block.getProperties().waterlogged === true || block.getProperties().waterlogged === 'true'
 
 let unknownBlockModel: BlockModelPartsResolved
@@ -464,7 +464,7 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
     // todo this can be removed here
     signs: {},
     // isFull: true,
-    highestBlocks: {}, // todo migrate to map for 2% boost perf
+    highestBlocks: new Map<string, HighestBlockInfo>([]),
     hadErrors: false,
     blocksCount: 0
   }
@@ -474,16 +474,13 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
     for (cursor.z = sz; cursor.z < sz + 16; cursor.z++) {
       for (cursor.x = sx; cursor.x < sx + 16; cursor.x++) {
         let block = world.getBlock(cursor, blockProvider, attr)!
-        if (!invisibleBlocks.has(block.name)) {
-          const highest = attr.highestBlocks[`${cursor.x},${cursor.z}`]
+        if (!INVISIBLE_BLOCKS.has(block.name)) {
+          const highest = attr.highestBlocks.get(`${cursor.x},${cursor.z}`)
           if (!highest || highest.y < cursor.y) {
-            attr.highestBlocks[`${cursor.x},${cursor.z}`] = {
-              y: cursor.y,
-              name: block.name
-            }
+            attr.highestBlocks.set(`${cursor.x},${cursor.z}`, { y: cursor.y, stateId: block.stateId, biomeId: block.biome.id })
           }
         }
-        if (invisibleBlocks.has(block.name)) continue
+        if (INVISIBLE_BLOCKS.has(block.name)) continue
         if ((block.name.includes('_sign') || block.name === 'sign') && !world.config.disableSignsMapsSupport) {
           const key = `${cursor.x},${cursor.y},${cursor.z}`
           const props: any = block.getProperties()
@@ -531,7 +528,7 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
           renderLiquid(world, cursor, blockProvider.getTextureInfo('lava_still'), block.type, biome, false, attr)
           attr.blocksCount++
         }
-        if (block.name !== 'water' && block.name !== 'lava' && !invisibleBlocks.has(block.name)) {
+        if (block.name !== 'water' && block.name !== 'lava' && !INVISIBLE_BLOCKS.has(block.name)) {
           // cache
           let { models } = block
 
diff --git a/prismarine-viewer/viewer/lib/mesher/shared.ts b/prismarine-viewer/viewer/lib/mesher/shared.ts
index b08a2bd7..57d7d6a4 100644
--- a/prismarine-viewer/viewer/lib/mesher/shared.ts
+++ b/prismarine-viewer/viewer/lib/mesher/shared.ts
@@ -32,7 +32,9 @@ export type MesherGeometryOutput = {
   tiles: Record<string, BlockType>,
   signs: Record<string, any>,
   // isFull: boolean
-  highestBlocks: Record<string, { y: number, name: string }>
+  highestBlocks: Map<string, HighestBlockInfo>
   hadErrors: boolean
   blocksCount: number
 }
+
+export type HighestBlockInfo = { y: number, stateId: number | undefined, biomeId: number | undefined }
diff --git a/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts b/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
index e1d51f22..4e322bcf 100644
--- a/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
+++ b/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
@@ -1,5 +1,6 @@
 import { test, expect } from 'vitest'
 import supportedVersions from '../../../../../src/supportedVersions.mjs'
+import { INVISIBLE_BLOCKS } from '../worldConstants'
 import { setup } from './mesherTester'
 
 const lastVersion = supportedVersions.at(-1)
@@ -16,7 +17,7 @@ const addPositions = [
 
 test('Known blocks are not rendered', () => {
   const { mesherWorld, getGeometry, pos, mcData } = setup(lastVersion, addPositions as any)
-  const ignoreAsExpected = new Set(['air', 'cave_air', 'void_air', 'barrier', 'water', 'lava', 'moving_piston', 'light'])
+  const ignoreAsExpected = new Set([...INVISIBLE_BLOCKS, 'water', 'lava', 'moving_piston', 'light'])
 
   let time = 0
   let times = 0
diff --git a/prismarine-viewer/viewer/lib/mesher/worldConstants.ts b/prismarine-viewer/viewer/lib/mesher/worldConstants.ts
new file mode 100644
index 00000000..75f08e89
--- /dev/null
+++ b/prismarine-viewer/viewer/lib/mesher/worldConstants.ts
@@ -0,0 +1 @@
+export const INVISIBLE_BLOCKS = new Set(['air', 'void_air', 'cave_air', 'barrier'])
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
index 65546de4..7beb0a92 100644
--- a/prismarine-viewer/viewer/lib/worldrendererCommon.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -14,7 +14,7 @@ import TypedEmitter from 'typed-emitter'
 import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
 import { toMajorVersion } from '../../../src/utils'
 import { buildCleanupDecorator } from './cleanupDecorator'
-import { MesherGeometryOutput, defaultMesherConfig } from './mesher/shared'
+import { defaultMesherConfig, HighestBlockInfo, MesherGeometryOutput } from './mesher/shared'
 import { chunkPos } from './simpleUtils'
 import { HandItemBlock } from './holdingBlock'
 import { updateStatText } from './ui/newStats'
@@ -62,6 +62,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     dirty (pos: Vec3, value: boolean): void
     update (/* pos: Vec3, value: boolean */): void
     textureDownloaded (): void
+    chunkFinished (key: string): void
   }>
   customTexturesDataUrl = undefined as string | undefined
   @worldCleanup()
@@ -81,7 +82,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   handleResize = () => { }
   mesherConfig = defaultMesherConfig
   camera: THREE.PerspectiveCamera
-  highestBlocks: Record<string, { y: number, name: string }> = {}
+  highestBlocks = new Map<string, HighestBlockInfo>()
   blockstatesModels: any
   customBlockStates: Record<string, any> | undefined
   customModels: Record<string, any> | undefined
@@ -134,10 +135,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         this.handleWorkerMessage(data)
         if (data.type === 'geometry') {
           const geometry = data.geometry as MesherGeometryOutput
-          for (const key in geometry.highestBlocks) {
-            const highest = geometry.highestBlocks[key]
-            if (!this.highestBlocks[key] || this.highestBlocks[key].y < highest.y) {
-              this.highestBlocks[key] = highest
+          for (const [key, highest] of geometry.highestBlocks.entries()) {
+            const currHighest = this.highestBlocks.get(key)
+            if (!currHighest || currHighest.y < highest.y) {
+              this.highestBlocks.set(key, highest)
             }
           }
           const chunkCoords = data.key.split(',').map(Number)
@@ -156,6 +157,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
               return x === chunkCoords[0] && z === chunkCoords[2]
             })) {
               this.finishedChunks[`${chunkCoords[0]},${chunkCoords[2]}`] = true
+              this.renderUpdateEmitter.emit(`chunkFinished`, `${chunkCoords[0] / 16},${chunkCoords[2] / 16}`)
             }
           }
           if (this.sectionsOutstanding.size === 0) {
@@ -363,7 +365,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     const endZ = Math.ceil((z + 1) / 16) * 16
     for (let x = startX; x < endX; x += 16) {
       for (let z = startZ; z < endZ; z += 16) {
-        delete this.highestBlocks[`${x},${z}`]
+        this.highestBlocks.delete(`${x},${z}`)
       }
     }
   }
diff --git a/src/controls.ts b/src/controls.ts
index 602ea81d..3b41c06f 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -7,7 +7,7 @@ import { ControMax } from 'contro-max/build/controMax'
 import { CommandEventArgument, SchemaCommandInput } from 'contro-max/build/types'
 import { stringStartsWith } from 'contro-max/build/stringUtils'
 import { UserOverrideCommand, UserOverridesConfig } from 'contro-max/build/types/store'
-import { isGameActive, showModal, gameAdditionalState, activeModalStack, hideCurrentModal, miscUiState, loadedGameState } from './globalState'
+import { isGameActive, showModal, gameAdditionalState, activeModalStack, hideCurrentModal, miscUiState, loadedGameState, hideModal } from './globalState'
 import { goFullscreen, pointerLock, reloadChunks } from './utils'
 import { options } from './optionsStorage'
 import { openPlayerInventory } from './inventoryWindows'
@@ -54,6 +54,7 @@ export const contro = new ControMax({
     ui: {
       toggleFullscreen: ['F11'],
       back: [null/* 'Escape' */, 'B'],
+      toggleMap: ['KeyM'],
       leftClick: [null, 'A'],
       rightClick: [null, 'Y'],
       speedupCursor: [null, 'Left Stick'],
@@ -424,6 +425,14 @@ contro.on('trigger', ({ command }) => {
   if (command === 'ui.toggleFullscreen') {
     void goFullscreen(true)
   }
+
+  if (command === 'ui.toggleMap') {
+    if (activeModalStack.at(-1)?.reactType === 'full-map') {
+      hideModal({ reactType: 'full-map' })
+    } else {
+      showModal({ reactType: 'full-map' })
+    }
+  }
 })
 
 contro.on('release', ({ command }) => {
diff --git a/src/globalState.ts b/src/globalState.ts
index cefa7810..90e3e359 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -1,6 +1,7 @@
 //@ts-check
 
 import { proxy, ref, subscribe } from 'valtio'
+import { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
 import { pointerLock } from './utils'
 import type { OptionsGroupType } from './optionsGuiScheme'
 
@@ -153,6 +154,7 @@ export const gameAdditionalState = proxy({
   isFlying: false,
   isSprinting: false,
   isSneaking: false,
+  warps: [] as WorldWarp[]
 })
 
 window.gameAdditionalState = gameAdditionalState
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 434ad484..94d6cdf8 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -250,6 +250,19 @@ export const guiOptionsScheme: {
         ],
       },
     },
+    {
+      custom () {
+        return <Category>Map</Category>
+      },
+      showMinimap: {
+        text: 'Enable Minimap',
+        values: [
+          'always',
+          'singleplayer',
+          'never'
+        ],
+      },
+    },
     {
       custom () {
         return <Category>Experimental</Category>
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 53deb927..618d99e8 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -88,6 +88,8 @@ const defaultOptions = {
   /** Wether to popup sign editor on server action */
   autoSignEditor: true,
   wysiwygSignEditor: 'auto' as 'auto' | 'always' | 'never',
+  showMinimap: 'never' as 'always' | 'singleplayer' | 'never',
+  minimapOptimizations: true,
   displayBossBars: false, // boss bar overlay was removed for some reason, enable safely
   disabledUiParts: [] as string[],
   neighborChunkUpdates: true
diff --git a/src/react/Fullmap.css b/src/react/Fullmap.css
new file mode 100644
index 00000000..5b4b37ce
--- /dev/null
+++ b/src/react/Fullmap.css
@@ -0,0 +1,13 @@
+
+.map {
+  width: 70% !important;
+  height: 80% !important;
+  border: 1px solid black;
+}
+
+@media (max-width: 500px) {
+  .map {
+    width: 100% !important;
+    height: 100% !important;
+  }
+}
diff --git a/src/react/Fullmap.tsx b/src/react/Fullmap.tsx
new file mode 100644
index 00000000..69a2c514
--- /dev/null
+++ b/src/react/Fullmap.tsx
@@ -0,0 +1,512 @@
+import { Vec3 } from 'vec3'
+import { useRef, useEffect, useState, CSSProperties, Dispatch, SetStateAction } from 'react'
+import { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
+import { TransformWrapper, TransformComponent, ReactZoomPanPinchRef } from 'react-zoom-pan-pinch'
+import { MinimapDrawer, DrawerAdapter, ChunkInfo } from './MinimapDrawer'
+import Button from './Button'
+import Input from './Input'
+import './Fullmap.css'
+
+
+type FullmapProps = {
+  toggleFullMap: () => void,
+  adapter: DrawerAdapter,
+  drawer: MinimapDrawer | null,
+  canvasRef: any
+}
+
+export default ({ toggleFullMap, adapter }: FullmapProps) => {
+  const [grid, setGrid] = useState(() => new Set<string>())
+  const zoomRef = useRef<ReactZoomPanPinchRef>(null)
+  const redrawCell = useRef(false)
+  const [lastWarpPos, setLastWarpPos] = useState({ x: 0, y: 0, z: 0 })
+  const stateRef = useRef({ scale: 1, positionX: 0, positionY: 0 })
+  const cells = useRef({ columns: 0, rows: 0 })
+  const [isWarpInfoOpened, setIsWarpInfoOpened] = useState(false)
+  const [initWarp, setInitWarp] = useState<WorldWarp | undefined>(undefined)
+  const [warpPreview, setWarpPreview] = useState<{ name: string, x: number, z: number, clientX: number, clientY: number } | undefined>(undefined)
+
+  const updateGrid = () => {
+    const wrapperRect = zoomRef.current?.instance.wrapperComponent?.getBoundingClientRect()
+    if (!wrapperRect) return
+    const cellSize = 64
+    const columns = Math.ceil(wrapperRect.width / (cellSize * stateRef.current.scale))
+    const rows = Math.ceil(wrapperRect.height / (cellSize * stateRef.current.scale))
+    cells.current.rows = rows
+    cells.current.columns = columns
+    const leftBorder = - Math.floor(stateRef.current.positionX / (stateRef.current.scale * cellSize)) * cellSize
+    const topBorder = - Math.floor(stateRef.current.positionY / (stateRef.current.scale * cellSize)) * cellSize
+    const newGrid = new Set<string>()
+    for (let row = -1; row < rows; row += 1) {
+      for (let col = -1; col < columns; col += 1) {
+        const x = leftBorder + col * cellSize
+        const y = topBorder + row * cellSize
+        newGrid.add(`${x},${y}`)
+      }
+    }
+    setGrid(newGrid)
+  }
+
+  useEffect(() => {
+    adapter.full = true
+    console.log('[fullmap] set full property to true')
+    updateGrid()
+  }, [])
+
+  return <div
+    style={{
+      position: 'fixed',
+      isolation: 'isolate',
+      inset: '0px',
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center',
+      backgroundColor: 'rgba(0, 0, 0, 0.4)',
+      zIndex: 100
+    }}
+  >
+    {window.screen.width > 500 ? <div
+      style={{
+        position: 'absolute',
+        width: '100%',
+        height: '100%',
+        zIndex: '-1'
+      }}
+      onClick={toggleFullMap}
+    />
+      : <Button
+        icon="close-box"
+        onClick={toggleFullMap}
+        style={{
+          position: 'absolute',
+          top: '20px',
+          right: '20px',
+          zIndex: 1
+        }}
+      />}
+    <TransformWrapper
+      limitToBounds={false}
+      ref={zoomRef}
+      minScale={0.1}
+      doubleClick={{
+        disabled: false
+      }}
+      panning={{
+        allowLeftClickPan: true,
+        allowRightClickPan: false
+      }}
+      onTransformed={(ref, state) => {
+        stateRef.current = { ...state }
+      }}
+      onPanningStop={() => {
+        updateGrid()
+      }}
+      onZoomStop={() => {
+        updateGrid()
+      }}
+    >
+      <TransformComponent
+        wrapperClass="map"
+        wrapperStyle={{
+          willChange: 'transform',
+        }}
+      >
+        {[...grid].map((cellCoords) => {
+          const [x, y] = cellCoords.split(',').map(Number)
+          const playerChunkLeft = Math.floor(adapter.playerPosition.x / 16) * 16
+          const playerChunkTop = Math.floor(adapter.playerPosition.z / 16) * 16
+          const wrapperRect = zoomRef.current?.instance.wrapperComponent?.getBoundingClientRect()
+          const offsetX = Math.floor((wrapperRect?.width ?? 0) / (8 * 16)) * 16
+          const offsetY = Math.floor((wrapperRect?.height ?? 0) / (8 * 16)) * 16
+
+          return <MapChunk
+            key={'mapcell:' + cellCoords}
+            x={x}
+            y={y}
+            scale={stateRef.current.scale}
+            adapter={adapter}
+            worldX={playerChunkLeft + x / 4 - offsetX}
+            worldZ={playerChunkTop + y / 4 - offsetY}
+            setIsWarpInfoOpened={setIsWarpInfoOpened}
+            setLastWarpPos={setLastWarpPos}
+            redraw={redrawCell.current}
+            setInitWarp={setInitWarp}
+            setWarpPreview={setWarpPreview}
+          />
+        })}
+      </TransformComponent>
+    </TransformWrapper>
+    {warpPreview && <div
+      style={{
+        position: 'absolute',
+        top: warpPreview.clientY - 70,
+        left: warpPreview.clientX - 70,
+        textAlign: 'center',
+        fontSize: '1.5em',
+        textShadow: '0.1em 0 black, 0 0.1em black, -0.1em 0 black, 0 -0.1em black, -0.1em -0.1em black, -0.1em 0.1em black, 0.1em -0.1em black, 0.1em 0.1em black'
+      } as any}
+    >
+      {warpPreview.name}
+      <div>
+        {warpPreview.x} {warpPreview.z}
+      </div>
+    </div>}
+    {
+      isWarpInfoOpened && <WarpInfo
+        adapter={adapter}
+        warpPos={lastWarpPos}
+        setIsWarpInfoOpened={setIsWarpInfoOpened}
+        afterWarpIsSet={() => {
+          redrawCell.current = !redrawCell.current
+        }}
+        initWarp={initWarp}
+        setInitWarp={setInitWarp}
+        toggleFullMap={toggleFullMap}
+      />
+    }
+  </div>
+}
+
+
+const MapChunk = (
+  { x, y, scale, adapter, worldX, worldZ, setIsWarpInfoOpened, setLastWarpPos, redraw, setInitWarp, setWarpPreview }:
+  {
+    x: number,
+    y: number,
+    scale: number,
+    adapter: DrawerAdapter,
+    worldX: number,
+    worldZ: number,
+    setIsWarpInfoOpened: (x: boolean) => void,
+    setLastWarpPos: (obj: { x: number, y: number, z: number }) => void,
+    redraw?: boolean
+    setInitWarp?: (warp: WorldWarp | undefined) => void
+    setWarpPreview?: (warpInfo) => void
+  }
+) => {
+  const containerRef = useRef(null)
+  const drawerRef = useRef<MinimapDrawer | null>(null)
+  const touchTimer = useRef<ReturnType<typeof setTimeout> | null>(null)
+  const canvasRef = useRef<HTMLCanvasElement>(null)
+  const [isCanvas, setIsCanvas] = useState(false)
+
+  const longPress = (e) => {
+    touchTimer.current = setTimeout(() => {
+      touchTimer.current = null
+      handleClick(e)
+    }, 500)
+  }
+
+  const cancel = () => {
+    if (touchTimer.current) clearTimeout(touchTimer.current)
+  }
+
+  const handleClick = (e: MouseEvent | TouchEvent) => {
+    // console.log('click:', e)
+    if (!drawerRef.current) return
+    let clientX: number
+    let clientY: number
+    if ('buttons' in e && e.button === 2) {
+      clientX = e.clientX
+      clientY = e.clientY
+    } else if ('changedTouches' in e) {
+      clientX = (e).changedTouches[0].clientX
+      clientY = (e).changedTouches[0].clientY
+    } else { return }
+    const [x, z] = getXZ(clientX, clientY)
+    const mapX = Math.floor(x + worldX)
+    const mapZ = Math.floor(z + worldZ)
+    const y = adapter.getHighestBlockY(mapX, mapZ)
+    drawerRef.current.setWarpPosOnClick(new Vec3(mapX, y, mapZ))
+    setLastWarpPos(drawerRef.current.lastWarpPos)
+    const { lastWarpPos } = drawerRef.current
+    const initWarp = adapter.warps.find(warp => Math.hypot(lastWarpPos.x - warp.x, lastWarpPos.z - warp.z) < 2)
+    setInitWarp?.(initWarp)
+    setIsWarpInfoOpened(true)
+  }
+
+  const getXZ = (clientX: number, clientY: number) => {
+    const rect = canvasRef.current!.getBoundingClientRect()
+    const factor = scale * (drawerRef.current?.mapPixel ?? 1)
+    const x = (clientX - rect.left) / factor
+    const y = (clientY - rect.top) / factor
+    return [x, y]
+  }
+
+  const handleMouseMove = (e: MouseEvent) => {
+    const [x, z] = getXZ(e.clientX, e.clientY)
+    const warp = adapter.warps.find(w => Math.hypot(w.x - x - worldX, w.z - z - worldZ) < 2)
+    setWarpPreview?.(
+      warp ? { name: warp.name, x: warp.x, z: warp.z, clientX: e.clientX, clientY: e.clientY } : undefined
+    )
+  }
+
+  const handleRedraw = (key?: string, chunk?: ChunkInfo) => {
+    if (key !== `${worldX / 16},${worldZ / 16}`) return
+    adapter.mapDrawer.canvas = canvasRef.current!
+    adapter.mapDrawer.full = true
+    // console.log('handle redraw:', key)
+    // if (chunk) {
+    //   drawerRef.current?.chunksStore.set(key, chunk)
+    // }
+    if (!adapter.chunksStore.has(key)) {
+      adapter.chunksStore.set(key, 'requested')
+      void adapter.loadChunk(key)
+      return
+    }
+    const timeout = setTimeout(() => {
+      const center = new Vec3(worldX + 8, 0, worldZ + 8)
+      drawerRef.current!.lastBotPos = center
+      drawerRef.current?.drawChunk(key)
+      // drawerRef.current?.drawWarps(center)
+      // drawerRef.current?.drawPlayerPos(center.x, center.z)
+      clearTimeout(timeout)
+    }, 100)
+  }
+
+  useEffect(() => {
+    // if (canvasRef.current && !drawerRef.current) {
+    //   drawerRef.current = adapter.mapDrawer
+    // } else if (canvasRef.current && drawerRef.current) {
+    // }
+    if (canvasRef.current) void adapter.drawChunkOnCanvas(`${worldX / 16},${worldZ / 16}`, canvasRef.current)
+  }, [canvasRef.current])
+
+  useEffect(() => {
+    canvasRef.current?.addEventListener('contextmenu', handleClick)
+    canvasRef.current?.addEventListener('touchstart', longPress)
+    canvasRef.current?.addEventListener('touchend', cancel)
+    canvasRef.current?.addEventListener('touchmove', cancel)
+    canvasRef.current?.addEventListener('mousemove', handleMouseMove)
+
+    return () => {
+      canvasRef.current?.removeEventListener('contextmenu', handleClick)
+      canvasRef.current?.removeEventListener('touchstart', longPress)
+      canvasRef.current?.removeEventListener('touchend', cancel)
+      canvasRef.current?.removeEventListener('touchmove', cancel)
+      canvasRef.current?.removeEventListener('mousemove', handleMouseMove)
+    }
+  }, [canvasRef.current, scale])
+
+  useEffect(() => {
+    // handleRedraw()
+  }, [drawerRef.current, redraw])
+
+  useEffect(() => {
+    const intersectionObserver = new IntersectionObserver((entries) => {
+      for (const entry of entries) {
+        if (entry.isIntersecting) {
+          setIsCanvas(true)
+        }
+      }
+    })
+    intersectionObserver.observe(containerRef.current!)
+
+    // adapter.on('chunkReady', handleRedraw)
+
+    return () => {
+      intersectionObserver.disconnect()
+      // adapter.off('chunkReady', handleRedraw)
+    }
+  }, [])
+
+  return <div
+    ref={containerRef}
+    style={{
+      position: 'absolute',
+      width: '64px',
+      height: '64px',
+      top: `${y}px`,
+      left: `${x}px`,
+    }}
+  >
+    <canvas
+      ref={canvasRef}
+      style={{
+        width: '100%',
+        height: '100%',
+        imageRendering: 'pixelated'
+      }}
+      width={64}
+      height={64}
+    />
+  </div>
+}
+
+const WarpInfo = (
+  { adapter, warpPos, setIsWarpInfoOpened, afterWarpIsSet, initWarp, toggleFullMap }:
+  {
+    adapter: DrawerAdapter,
+    warpPos: { x: number, y: number, z: number },
+    setIsWarpInfoOpened: Dispatch<SetStateAction<boolean>>,
+    afterWarpIsSet?: () => void
+    initWarp?: WorldWarp,
+    setInitWarp?: React.Dispatch<React.SetStateAction<WorldWarp | undefined>>,
+    toggleFullMap?: ({ command }: { command: string }) => void
+  }
+) => {
+  const [warp, setWarp] = useState<WorldWarp>(initWarp ?? {
+    name: '',
+    x: warpPos?.x ?? 100,
+    y: warpPos?.y ?? 100,
+    z: warpPos?.z ?? 100,
+    color: '',
+    disabled: false,
+    world: adapter.world
+  })
+
+  const posInputStyle: CSSProperties = {
+    flexGrow: '1',
+  }
+  const fieldCont: CSSProperties = {
+    display: 'flex',
+    alignItems: 'center',
+    gap: '5px'
+  }
+
+  const updateChunk = () => {
+    for (let i = -1; i < 2; i += 1) {
+      for (let j = -1; j < 2; j += 1) {
+        adapter.emit(
+          'chunkReady',
+          `${Math.floor(warp.x / 16) + j},${Math.floor(warp.z / 16) + i}`
+        )
+      }
+    }
+  }
+
+  const tpNow = () => {
+    adapter.off('updateChunk', tpNow)
+  }
+
+  const quickTp = () => {
+    toggleFullMap?.({ command: 'ui.toggleMap' })
+    adapter.quickTp?.(warp.x, warp.z)
+  }
+
+  return <div
+    style={{
+      position: 'absolute',
+      inset: '0px',
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center',
+      flexDirection: 'column',
+      backgroundColor: 'rgba(0, 0, 0, 0.5)',
+      fontSize: '0.8em',
+      transform: 'scale(2)'
+    }}
+  >
+    <form
+      style={{
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '10px',
+        width: window.screen.width > 500 ? '100%' : '50%',
+        minWidth: '100px',
+        maxWidth: '300px',
+        padding: '20px',
+        backgroundColor: 'rgba(0, 0, 0, 0.5)',
+        border: '2px solid black'
+      }}
+    >
+      <h2 style={{ alignSelf: 'center' }}>Point on the map</h2>
+      <div style={fieldCont}>
+        <div>
+          Name:
+        </div>
+        <Input
+          defaultValue={warp.name}
+          onChange={(e) => {
+            if (!e.target) return
+            setWarp(prev => { return { ...prev, name: e.target.value } })
+          }}
+          autoFocus
+        />
+      </div>
+      <div style={fieldCont}>
+        <div>
+          X:
+        </div>
+        <Input
+          rootStyles={posInputStyle}
+          defaultValue={warp.x ?? 100}
+          onChange={(e) => {
+            if (!e.target) return
+            setWarp(prev => { return { ...prev, x: Number(e.target.value) } })
+          }}
+        />
+        <div>
+          Z:
+        </div>
+        <Input
+          rootStyles={posInputStyle}
+          defaultValue={warp.z ?? 100}
+          onChange={(e) => {
+            if (!e.target) return
+            setWarp(prev => { return { ...prev, z: Number(e.target.value) } })
+          }}
+        />
+      </div>
+      <div style={fieldCont}>
+        <div>Color:</div>
+        <Input
+          type='color'
+          defaultValue={warp.color === '' ? '#232323' : warp.color}
+          onChange={(e) => {
+            if (!e.target) return
+            setWarp(prev => { return { ...prev, color: e.target.value } })
+          }}
+          rootStyles={{ width: '30px', }}
+          style={{ left: '0px' }}
+        />
+      </div>
+      <div style={fieldCont} >
+        <label htmlFor='warp-disabled'>Disabled:</label>
+        <input
+          id='warp-disabled'
+          type="checkbox"
+          checked={warp.disabled ?? false}
+          onChange={(e) => {
+            if (!e.target) return
+            setWarp(prev => { return { ...prev, disabled: e.target.checked } })
+          }}
+        />
+      </div>
+      <Button
+        style={{ alignSelf: 'center' }}
+        onClick={() => {
+          quickTp()
+        }}
+      >Quick TP</Button>
+      <div style={fieldCont}>
+        <Button
+          onClick={() => {
+            setIsWarpInfoOpened(false)
+          }}
+        >Cancel</Button>
+        <Button
+          onClick={() => {
+            adapter.setWarp({ ...warp })
+            console.log(adapter.warps)
+            setIsWarpInfoOpened(false)
+            updateChunk()
+            afterWarpIsSet?.()
+          }}
+          type='submit'
+        >Add Warp</Button>
+        {initWarp && <Button
+          onClick={() => {
+            const index = adapter.warps.findIndex(thisWarp => thisWarp.name === warp.name)
+            if (index !== -1) {
+              adapter.setWarp({ name: warp.name, x: 0, y: 0, z: 0, color: '', disabled: false, world: '' }, true)
+              setIsWarpInfoOpened(false)
+              updateChunk()
+              afterWarpIsSet?.()
+            }
+          }}
+        >Delete</Button>}
+      </div>
+    </form>
+  </div>
+}
diff --git a/src/react/Input.tsx b/src/react/Input.tsx
index 41dbc7ba..1da36cc3 100644
--- a/src/react/Input.tsx
+++ b/src/react/Input.tsx
@@ -9,10 +9,10 @@ interface Props extends React.ComponentProps<'input'> {
   validateInput?: (value: string) => CSSProperties | undefined
 }
 
-export default ({ autoFocus, rootStyles, inputRef, validateInput, ...inputProps }: Props) => {
+export default ({ autoFocus, rootStyles, inputRef, validateInput, defaultValue, ...inputProps }: Props) => {
   const ref = useRef<HTMLInputElement>(null!)
   const [validationStyle, setValidationStyle] = useState<CSSProperties>({})
-  const [value, setValue] = useState(inputProps.value ?? '')
+  const [value, setValue] = useState(defaultValue ?? '')
 
   useEffect(() => {
     setValue(inputProps.value === '' || inputProps.value ? inputProps.value : value)
diff --git a/src/react/Minimap.stories.tsx b/src/react/Minimap.stories.tsx
new file mode 100644
index 00000000..5b28a5b9
--- /dev/null
+++ b/src/react/Minimap.stories.tsx
@@ -0,0 +1,74 @@
+import { Vec3 } from 'vec3'
+import type { Meta, StoryObj } from '@storybook/react'
+import { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
+import { TypedEventEmitter } from 'contro-max/build/typedEventEmitter'
+import { useEffect } from 'react'
+
+import Minimap from './Minimap'
+import { DrawerAdapter, MapUpdates } from './MinimapDrawer'
+
+const meta: Meta<typeof Minimap> = {
+  component: Minimap,
+  decorators: [
+    (Story, context) => {
+
+      useEffect(() => {
+        console.log('map updated')
+        adapter.emit('updateMap')
+
+      }, [context.args['fullMap']])
+
+      return <div> <Story /> </div>
+    }
+  ]
+}
+
+export default meta
+type Story = StoryObj<typeof Minimap>
+
+
+class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> {
+  playerPosition: Vec3
+  yaw: number
+  warps: WorldWarp[]
+  chunksStore: any = {}
+  full: boolean
+
+  constructor (pos?: Vec3, warps?: WorldWarp[]) {
+    super()
+    this.playerPosition = pos ?? new Vec3(0, 0, 0)
+    this.warps = warps ?? [] as WorldWarp[]
+  }
+
+  async getHighestBlockColor (x: number, z: number) {
+    console.log('got color')
+    return 'green'
+  }
+
+  getHighestBlockY (x: number, z: number) {
+    return 0
+  }
+
+  setWarp (warp: WorldWarp, remove?: boolean): void {
+    const index = this.warps.findIndex(w => w.name === warp.name)
+    if (index === -1) {
+      this.warps.push(warp)
+    } else {
+      this.warps[index] = warp
+    }
+    this.emit('updateWarps')
+  }
+
+  clearChunksStore (x: number, z: number) { }
+
+  async loadChunk (key: string) {}
+}
+
+const adapter = new DrawerAdapterImpl() as any
+
+export const Primary: Story = {
+  args: {
+    adapter,
+    fullMap: false
+  },
+}
diff --git a/src/react/Minimap.tsx b/src/react/Minimap.tsx
new file mode 100644
index 00000000..1dae0344
--- /dev/null
+++ b/src/react/Minimap.tsx
@@ -0,0 +1,175 @@
+import { useRef, useEffect, useState } from 'react'
+import { MinimapDrawer, DrawerAdapter, ChunkInfo } from './MinimapDrawer'
+import Fullmap from './Fullmap'
+
+
+export type DisplayMode = 'fullmapOnly' | 'minimapOnly'
+
+export default (
+  { adapter, showMinimap, showFullmap, singleplayer, fullMap, toggleFullMap, displayMode }:
+  {
+    adapter: DrawerAdapter,
+    showMinimap: string,
+    showFullmap: string,
+    singleplayer: boolean,
+    fullMap?: boolean,
+    toggleFullMap?: ({ command }: { command: string }) => void
+    displayMode?: DisplayMode
+  }
+) => {
+  const full = useRef(false)
+  const canvasTick = useRef(0)
+  const canvasRef = useRef<HTMLCanvasElement>(null)
+  const warpsAndPartsCanvasRef = useRef<HTMLCanvasElement>(null)
+  const playerPosCanvasRef = useRef<HTMLCanvasElement>(null)
+  const warpsDrawerRef = useRef<MinimapDrawer | null>(null)
+  const drawerRef = useRef<MinimapDrawer | null>(null)
+  const playerPosDrawerRef = useRef<MinimapDrawer | null>(null)
+  const [position, setPosition] = useState({ x: 0, y: 0, z: 0 })
+
+  const updateMap = () => {
+    setPosition({ x: adapter.playerPosition.x, y: adapter.playerPosition.y, z: adapter.playerPosition.z })
+    if (drawerRef.current) {
+      if (!full.current) {
+        rotateMap()
+        drawerRef.current.draw(adapter.playerPosition)
+        drawerRef.current.drawPlayerPos()
+        drawerRef.current.drawWarps()
+      }
+      if (canvasTick.current % 300 === 0 && !fullMap) {
+        if ('requestIdleCallback' in window) {
+          requestIdleCallback(() => {
+            drawerRef.current?.clearChunksStore()
+          })
+        } else {
+          drawerRef.current.clearChunksStore()
+        }
+        canvasTick.current = 0
+      }
+    }
+    canvasTick.current += 1
+  }
+
+  const updateWarps = () => { }
+
+  const rotateMap = () => {
+    if (!drawerRef.current) return
+    drawerRef.current.canvas.style.transform = `rotate(${adapter.yaw}rad)`
+    if (!warpsDrawerRef.current) return
+    warpsDrawerRef.current.canvas.style.transform = `rotate(${adapter.yaw}rad)`
+  }
+
+  const updateChunkOnMap = (key: string, chunk: ChunkInfo) => {
+    adapter.chunksStore.set(key, chunk)
+  }
+
+  useEffect(() => {
+    if (canvasRef.current && !drawerRef.current) {
+      drawerRef.current = adapter.mapDrawer
+      drawerRef.current.canvas = canvasRef.current
+      // drawerRef.current.adapter.on('chunkReady', updateChunkOnMap)
+    } else if (canvasRef.current && drawerRef.current) {
+      drawerRef.current.canvas = canvasRef.current
+    }
+
+  }, [canvasRef.current])
+
+  // useEffect(() => {
+  //   if (warpsAndPartsCanvasRef.current && !warpsDrawerRef.current) {
+  //     warpsDrawerRef.current = new MinimapDrawer(warpsAndPartsCanvasRef.current, adapter)
+  //   } else if (warpsAndPartsCanvasRef.current && warpsDrawerRef.current) {
+  //     warpsDrawerRef.current.canvas = warpsAndPartsCanvasRef.current
+  //   }
+  // }, [warpsAndPartsCanvasRef.current])
+
+  // useEffect(() => {
+  //   if (playerPosCanvasRef.current && !playerPosDrawerRef.current) {
+  //     playerPosDrawerRef.current = new MinimapDrawer(playerPosCanvasRef.current, adapter)
+  //   } else if (playerPosCanvasRef.current && playerPosDrawerRef.current) {
+  //     playerPosDrawerRef.current.canvas = playerPosCanvasRef.current
+  //   }
+  // }, [playerPosCanvasRef.current])
+
+  useEffect(() => {
+    adapter.on('updateMap', updateMap)
+    adapter.on('updateWaprs', updateWarps)
+
+    return () => {
+      adapter.off('updateMap', updateMap)
+      adapter.off('updateWaprs', updateWarps)
+    }
+  }, [adapter])
+
+  useEffect(() => {
+    return () => {
+      // if (drawerRef.current) drawerRef.current.adapter.off('chunkReady', updateChunkOnMap)
+    }
+  }, [])
+
+  const displayFullmap = fullMap && displayMode !== 'minimapOnly' && (showFullmap === 'singleplayer' && singleplayer || showFullmap === 'always')
+  const displayMini = displayMode !== 'fullmapOnly' && (showMinimap === 'singleplayer' && singleplayer || showMinimap === 'always')
+  return displayFullmap
+    ? <Fullmap
+      toggleFullMap={() => {
+        toggleFullMap?.({ command: 'ui.toggleMap' })
+      }}
+      adapter={adapter}
+      drawer={drawerRef.current}
+      canvasRef={canvasRef}
+    />
+    : displayMini
+      ? <div
+        className='minimap'
+        style={{
+          position: 'absolute',
+          right: '0px',
+          top: '0px',
+          padding: '5px 5px 0px 0px',
+          textAlign: 'center',
+        }}
+        onClick={() => {
+          toggleFullMap?.({ command: 'ui.toggleMap' })
+        }}
+      >
+        <canvas
+          style={{
+            transition: '0.5s',
+            transitionTimingFunction: 'ease-out',
+            borderRadius: '1000px'
+          }}
+          width={80}
+          height={80}
+          ref={canvasRef}
+        />
+        <canvas
+          style={{
+            transition: '0.5s',
+            transitionTimingFunction: 'ease-out',
+            position: 'absolute',
+            left: '0px'
+          }}
+          width={80}
+          height={80}
+          ref={warpsAndPartsCanvasRef}
+        />
+        <canvas
+          style={{
+            transition: '0.5s',
+            transitionTimingFunction: 'ease-out',
+            position: 'absolute',
+            left: '0px'
+          }}
+          width={80}
+          height={80}
+          ref={playerPosCanvasRef}
+        />
+        <div
+          style={{
+            fontSize: '0.5em',
+            textShadow: '0.1em 0 black, 0 0.1em black, -0.1em 0 black, 0 -0.1em black, -0.1em -0.1em black, -0.1em 0.1em black, 0.1em -0.1em black, 0.1em 0.1em black'
+          }}
+        >
+          {position.x.toFixed(2)} {position.y.toFixed(2)} {position.z.toFixed(2)}
+        </div>
+      </div> : null
+}
diff --git a/src/react/MinimapDrawer.ts b/src/react/MinimapDrawer.ts
new file mode 100644
index 00000000..935bdd4b
--- /dev/null
+++ b/src/react/MinimapDrawer.ts
@@ -0,0 +1,324 @@
+import { Vec3 } from 'vec3'
+import { TypedEventEmitter } from 'contro-max/build/typedEventEmitter'
+import { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
+import { Chunk } from 'prismarine-world/types/world'
+
+export type MapUpdates = {
+  updateBlockColor: (pos: Vec3) => void
+  updatePlayerPosition: () => void
+  updateWarps: () => void
+}
+
+export interface DrawerAdapter extends TypedEventEmitter<MapUpdates> {
+  getHighestBlockY: (x: number, z: number, chunk?: Chunk) => number
+  clearChunksStore: (x: number, z: number) => void
+  chunksStore: Map<string, undefined | null | 'requested' | ChunkInfo >
+  playerPosition: Vec3
+  warps: WorldWarp[]
+  loadingChunksQueue: Set<string>
+  mapDrawer: MinimapDrawer
+  yaw: number
+  full: boolean
+  world: string
+  setWarp: (warp: WorldWarp, remove?: boolean) => void
+  quickTp?: (x: number, z: number) => void
+  loadChunk: (key: string) => Promise<void>
+  drawChunkOnCanvas: (key: string, canvas: HTMLCanvasElement) => Promise<void>
+}
+
+export type ChunkInfo = {
+  heightmap: Uint8Array,
+  colors: string[],
+}
+
+export class MinimapDrawer {
+  canvasWidthCenterX: number
+  canvasWidthCenterY: number
+  _mapSize: number
+  radius: number
+  ctx: CanvasRenderingContext2D
+  _canvas: HTMLCanvasElement
+  chunksInView = new Set<string>()
+  lastBotPos: Vec3
+  lastWarpPos: Vec3
+  mapPixel: number
+  yaw: number
+  chunksStore = new Map<string, undefined | null | 'requested' | ChunkInfo >()
+  loadingChunksQueue: undefined | Set<string>
+  warps: WorldWarp[]
+  loadChunk: undefined | ((key: string) => Promise<void>)
+  _full = false
+
+  setMapPixel () {
+    if (this.full) {
+      this.radius = Math.floor(Math.min(this.canvas.width, this.canvas.height) / 2)
+      this._mapSize = 16
+    } else {
+      this.radius = Math.floor(Math.min(this.canvas.width, this.canvas.height) / 2.2)
+      this._mapSize = this.radius * 2
+    }
+    this.mapPixel = Math.floor(this.radius * 2 / this.mapSize)
+  }
+
+  get full () {
+    return this._full
+  }
+
+  set full (full: boolean) {
+    this._full = full
+    this.setMapPixel()
+  }
+
+  get canvas () {
+    return this._canvas
+  }
+
+  set canvas (canvas: HTMLCanvasElement) {
+    this.ctx = canvas.getContext('2d', { willReadFrequently: true })!
+    this.ctx.imageSmoothingEnabled = false
+    this.canvasWidthCenterX = canvas.width / 2
+    this.canvasWidthCenterY = canvas.height / 2
+    this._canvas = canvas
+    this.setMapPixel()
+  }
+
+  get mapSize () {
+    return this._mapSize
+  }
+
+  set mapSize (mapSize: number) {
+    this._mapSize = mapSize
+    this.mapPixel = Math.floor(this.radius * 2 / this.mapSize)
+    this.draw(this.lastBotPos)
+  }
+
+  draw (botPos: Vec3,) {
+    this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height)
+
+    this.lastBotPos = botPos
+    this.updateChunksInView()
+    for (const key of this.chunksInView) {
+      if (!this.chunksStore.has(key) && !this.loadingChunksQueue?.has(key)) {
+        void this.loadChunk?.(key)
+      }
+      this.drawChunk(key)
+    }
+    if (!this.full) this.drawPartsOfWorld()
+  }
+
+  updateChunksInView (viewX?: number, viewZ?: number) {
+    const worldCenterX = viewX ?? this.lastBotPos.x
+    const worldCenterZ = viewZ ?? this.lastBotPos.z
+
+    const radius = this.mapSize / 2
+    const leftViewBorder = Math.floor((worldCenterX - radius) / 16) - 1
+    const rightViewBorder = Math.ceil((worldCenterX + radius) / 16)
+    const topViewBorder = Math.floor((worldCenterZ - radius) / 16) - 1
+    const bottomViewBorder = Math.ceil((worldCenterZ + radius) / 16)
+
+    this.chunksInView.clear()
+    for (let i = topViewBorder; i <= bottomViewBorder; i += 1) {
+      for (let j = leftViewBorder; j <= rightViewBorder; j += 1) {
+        this.chunksInView.add(`${j},${i}`)
+      }
+    }
+  }
+
+  drawChunk (key: string, chunkInfo?: ChunkInfo | null) {
+    const [chunkX, chunkZ] = key.split(',').map(Number)
+    const chunkWorldX = chunkX * 16
+    const chunkWorldZ = chunkZ * 16
+    const chunkCanvasX = Math.floor((chunkWorldX - this.lastBotPos.x) * this.mapPixel + this.canvasWidthCenterX)
+    const chunkCanvasY = Math.floor((chunkWorldZ - this.lastBotPos.z) * this.mapPixel + this.canvasWidthCenterY)
+    const chunk = chunkInfo ?? this.chunksStore.get(key)
+    if (typeof chunk !== 'object') {
+      const chunkSize = this.mapPixel * 16
+      this.ctx.fillStyle = chunk === 'requested' ? 'rgb(200, 200, 200)' : 'rgba(0, 0, 0, 0.5)'
+      this.ctx.fillRect(chunkCanvasX, chunkCanvasY, chunkSize, chunkSize)
+      return
+    }
+    for (let row = 0; row < 16; row += 1) {
+      for (let col = 0; col < 16; col += 1) {
+        const index = row * 16 + col
+        const color = chunk?.colors[index] ?? 'rgb(255, 0, 0)'
+        const pixelX = chunkCanvasX + this.mapPixel * col
+        const pixelY = chunkCanvasY + this.mapPixel * row
+        this.drawPixel(pixelX, pixelY, color)
+      }
+    }
+  }
+
+  drawPixel (pixelX: number, pixelY: number, color: string) {
+    // if (!this.full && Math.hypot(pixelX - this.canvasWidthCenterX, pixelY - this.canvasWidthCenterY) > this.radius) {
+    //   this.ctx.clearRect(pixelX, pixelY, this.mapPixel, this.mapPixel)
+    //   return
+    // }
+    this.ctx.fillStyle = color
+    this.ctx.fillRect(
+      pixelX,
+      pixelY,
+      this.mapPixel,
+      this.mapPixel
+    )
+  }
+
+  clearChunksStore () {
+    for (const key of this.chunksStore.keys()) {
+      const [x, z] = key.split(',').map(x => Number(x) * 16)
+      if (Math.hypot((this.lastBotPos.x - x), (this.lastBotPos.z - z)) > this.radius * 5) {
+        this.chunksStore.delete(key)
+      }
+    }
+  }
+
+  setWarpPosOnClick (mousePos: Vec3) {
+    this.lastWarpPos = new Vec3(mousePos.x, mousePos.y, mousePos.z)
+  }
+
+  drawWarps (centerPos?: Vec3) {
+    for (const warp of this.warps) {
+      // if (!full) {
+      //   const distance = this.getDistance(
+      //     centerPos?.x ?? this.adapter.playerPosition.x,
+      //     centerPos?.z ?? this.adapter.playerPosition.z,
+      //     warp.x,
+      //     warp.z
+      //   )
+      //   if (distance > this.mapSize) continue
+      // }
+      const offset = this.full ? 0 : this.radius * 0.1
+      const z = Math.floor(
+        (this.mapSize / 2 - (centerPos?.z ?? this.lastBotPos.z) + warp.z) * this.mapPixel
+      ) + offset
+      const x = Math.floor(
+        (this.mapSize / 2 - (centerPos?.x ?? this.lastBotPos.x) + warp.x) * this.mapPixel
+      ) + offset
+      const dz = z - this.canvasWidthCenterX
+      const dx = x - this.canvasWidthCenterY
+      const circleDist = Math.hypot(dx, dz)
+
+      const angle = Math.atan2(dz, dx)
+      const circleZ = circleDist > this.mapSize / 2 && !this.full ?
+        this.canvasWidthCenterX + this.mapSize / 2 * Math.sin(angle)
+        : z
+      const circleX = circleDist > this.mapSize / 2 && !this.full ?
+        this.canvasWidthCenterY + this.mapSize / 2 * Math.cos(angle)
+        : x
+      this.ctx.beginPath()
+      this.ctx.arc(
+        circleX,
+        circleZ,
+        circleDist > this.mapSize / 2 && !this.full
+          ? this.mapPixel * 1.5
+          : this.full ? this.mapPixel : this.mapPixel * 2,
+        0,
+        Math.PI * 2,
+        false
+      )
+      this.ctx.strokeStyle = 'black'
+      this.ctx.lineWidth = this.mapPixel
+      this.ctx.stroke()
+      this.ctx.fillStyle = warp.disabled ? 'rgba(255, 255, 255, 0.4)' : warp.color ?? '#d3d3d3'
+      this.ctx.fill()
+      this.ctx.closePath()
+    }
+  }
+
+  drawPartsOfWorld () {
+    this.ctx.fillStyle = 'white'
+    this.ctx.shadowOffsetX = 1
+    this.ctx.shadowOffsetY = 1
+    this.ctx.shadowColor = 'black'
+    this.ctx.font = `${this.radius / 4}px serif`
+    this.ctx.textAlign = 'center'
+    this.ctx.textBaseline = 'middle'
+    this.ctx.strokeStyle = 'black'
+    this.ctx.lineWidth = 1
+
+    const angle = - Math.PI / 2
+    const angleS = angle + Math.PI
+    const angleW = angle + Math.PI * 3 / 2
+    const angleE = angle + Math.PI / 2
+
+    this.ctx.strokeText(
+      'N',
+      this.canvasWidthCenterX + this.radius * Math.cos(angle),
+      this.canvasWidthCenterY + this.radius * Math.sin(angle)
+    )
+    this.ctx.strokeText(
+      'S',
+      this.canvasWidthCenterX + this.radius * Math.cos(angleS),
+      this.canvasWidthCenterY + this.radius * Math.sin(angleS)
+    )
+    this.ctx.strokeText(
+      'W',
+      this.canvasWidthCenterX + this.radius * Math.cos(angleW),
+      this.canvasWidthCenterY + this.radius * Math.sin(angleW)
+    )
+    this.ctx.strokeText(
+      'E',
+      this.canvasWidthCenterX + this.radius * Math.cos(angleE),
+      this.canvasWidthCenterY + this.radius * Math.sin(angleE)
+    )
+    this.ctx.fillText(
+      'N',
+      this.canvasWidthCenterX + this.radius * Math.cos(angle),
+      this.canvasWidthCenterY + this.radius * Math.sin(angle)
+    )
+    this.ctx.fillText(
+      'S',
+      this.canvasWidthCenterX + this.radius * Math.cos(angleS),
+      this.canvasWidthCenterY + this.radius * Math.sin(angleS)
+    )
+    this.ctx.fillText(
+      'W',
+      this.canvasWidthCenterX + this.radius * Math.cos(angleW),
+      this.canvasWidthCenterY + this.radius * Math.sin(angleW)
+    )
+    this.ctx.fillText(
+      'E',
+      this.canvasWidthCenterX + this.radius * Math.cos(angleE),
+      this.canvasWidthCenterY + this.radius * Math.sin(angleE)
+    )
+
+    this.ctx.shadowOffsetX = 0
+    this.ctx.shadowOffsetY = 0
+  }
+
+  drawPlayerPos (canvasWorldCenterX?: number, canvasWorldCenterZ?: number, disableTurn?: boolean) {
+    this.ctx.setTransform(1, 0, 0, 1, 0, 0)
+
+    const x = (this.lastBotPos.x - (canvasWorldCenterX ?? this.lastBotPos.x)) * this.mapPixel
+    const z = (this.lastBotPos.z - (canvasWorldCenterZ ?? this.lastBotPos.z)) * this.mapPixel
+    const center = this.mapSize / 2 * this.mapPixel + (this.full ? 0 : this.radius * 0.1)
+    this.ctx.translate(center + x, center + z)
+    if (!disableTurn) this.ctx.rotate(-this.yaw)
+
+    const size = 3
+    const factor = this.full ? 2 : 1
+    const width = size * factor
+    const height = size * factor
+
+    this.ctx.beginPath()
+    this.ctx.moveTo(0, -height)
+    this.ctx.lineTo(-width, height)
+    this.ctx.lineTo(width, height)
+    this.ctx.closePath()
+
+    this.ctx.strokeStyle = '#000000'
+    this.ctx.lineWidth = this.full ? 2 : 1
+    this.ctx.stroke()
+    this.ctx.fillStyle = '#FFFFFF'
+    this.ctx.fill()
+
+    // Reset transformations
+    this.ctx.setTransform(1, 0, 0, 1, 0, 0)
+  }
+
+  rotateMap (angle: number) {
+    this.ctx.setTransform(1, 0, 0, 1, 0, 0)
+    this.ctx.translate(this.canvasWidthCenterX, this.canvasWidthCenterY)
+    this.ctx.rotate(angle)
+    this.ctx.translate(-this.canvasWidthCenterX, -this.canvasWidthCenterY)
+  }
+}
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
new file mode 100644
index 00000000..4b877732
--- /dev/null
+++ b/src/react/MinimapProvider.tsx
@@ -0,0 +1,610 @@
+import { useEffect, useState } from 'react'
+import { versions } from 'minecraft-data'
+import { simplify } from 'prismarine-nbt'
+import RegionFile from 'prismarine-provider-anvil/src/region'
+import { Vec3 } from 'vec3'
+import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+import { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
+import { TypedEventEmitter } from 'contro-max/build/typedEventEmitter'
+import { PCChunk } from 'prismarine-chunk'
+import { Chunk } from 'prismarine-world/types/world'
+import { Block } from 'prismarine-block'
+import { INVISIBLE_BLOCKS } from 'prismarine-viewer/viewer/lib/mesher/worldConstants'
+import { getRenamedData } from 'flying-squid/dist/blockRenames'
+import { useSnapshot } from 'valtio'
+import BlockData from '../../prismarine-viewer/viewer/lib/moreBlockDataGenerated.json'
+import preflatMap from '../preflatMap.json'
+import { contro } from '../controls'
+import { gameAdditionalState, showModal, hideModal, miscUiState, loadedGameState, activeModalStack } from '../globalState'
+import { options } from '../optionsStorage'
+import Minimap, { DisplayMode } from './Minimap'
+import { ChunkInfo, DrawerAdapter, MapUpdates, MinimapDrawer } from './MinimapDrawer'
+import { useIsModalActive } from './utilsApp'
+
+const getBlockKey = (x: number, z: number) => {
+  return `${x},${z}`
+}
+
+const findHeightMap = (obj: PCChunk): number[] | undefined => {
+  function search (obj: any): any | undefined {
+    for (const key in obj) {
+      if (['heightmap', 'heightmaps'].includes(key.toLowerCase())) {
+        return obj[key]
+      } else if (typeof obj[key] === 'object' && obj[key] !== null) {
+        const result = search(obj[key])
+        return result
+      }
+    }
+  }
+  return search(obj)
+}
+
+export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements DrawerAdapter {
+  playerPosition: Vec3
+  yaw: number
+  mapDrawer = new MinimapDrawer()
+  warps: WorldWarp[]
+  world: string
+  chunksStore = new Map<string, undefined | null | 'requested' | ChunkInfo >()
+  loadingChunksQueue = new Set<string>()
+  currChunk: PCChunk | undefined
+  currChunkPos: { x: number, z: number } = { x: 0, z: 0 }
+  isOldVersion: boolean
+  blockData: any
+  heightMap: Record<string, number> = {}
+  regions = new Map<string, RegionFile>()
+  chunksHeightmaps: Record<string, any> = {}
+  loadChunk: (key: string) => Promise<void>
+  loadChunkFullmap: ((key: string) => Promise<ChunkInfo | null | undefined>) | undefined
+  _full: boolean
+  isBuiltinHeightmapAvailable = false
+
+  constructor (pos?: Vec3) {
+    super()
+    this.full = false
+    this.playerPosition = pos ?? new Vec3(0, 0, 0)
+    this.warps = gameAdditionalState.warps
+    this.mapDrawer.warps = this.warps
+    this.mapDrawer.loadChunk = this.loadChunk
+    this.mapDrawer.loadingChunksQueue = this.loadingChunksQueue
+    this.mapDrawer.chunksStore = this.chunksStore
+
+    // check if should use heightmap
+    if (localServer) {
+      const chunkX = Math.floor(this.playerPosition.x / 16)
+      const chunkZ = Math.floor(this.playerPosition.z / 16)
+      const regionX = Math.floor(chunkX / 32)
+      const regionZ = Math.floor(chunkZ / 32)
+      const regionKey = `${regionX},${regionZ}`
+      const worldFolder = this.getSingleplayerRootPath()
+      if (worldFolder && options.minimapOptimizations) {
+        const path = `${worldFolder}/region/r.${regionX}.${regionZ}.mca`
+        const region = new RegionFile(path)
+        void region.initialize()
+        this.regions.set(regionKey, region)
+        const readX = chunkX % 32
+        const readZ = chunkZ % 32
+        void this.regions.get(regionKey)!.read(readX, readZ).then((rawChunk) => {
+          const chunk = simplify(rawChunk as any)
+          const heightmap = findHeightMap(chunk)
+          if (heightmap) {
+            this.isBuiltinHeightmapAvailable = true
+            this.loadChunkFullmap = this.loadChunkFromRegion
+            console.log('using heightmap')
+          } else {
+            this.isBuiltinHeightmapAvailable = false
+            this.loadChunkFullmap = this.loadChunkNoRegion
+            console.log('[minimap] not using heightmap')
+          }
+        }).catch(err => {
+          console.error(err)
+          this.isBuiltinHeightmapAvailable = false
+          this.loadChunkFullmap = this.loadChunkFromViewer
+        })
+      } else {
+        this.isBuiltinHeightmapAvailable = false
+        this.loadChunkFullmap = this.loadChunkFromViewer
+      }
+    } else {
+      this.isBuiltinHeightmapAvailable = false
+      this.loadChunkFullmap = this.loadChunkFromViewer
+    }
+    // if (localServer) {
+    //   this.overwriteWarps(localServer.warps)
+    //   this.on('cellReady', (key: string) => {
+    //     if (this.loadingChunksQueue.size === 0) return
+    //     const [x, z] = this.loadingChunksQueue.values().next().value.split(',').map(Number)
+    //     this.loadChunk(x, z)
+    //     this.loadingChunksQueue.delete(`${x},${z}`)
+    //   })
+    // } else {
+    //   const storageWarps = localStorage.getItem(`warps: ${loadedGameState.username} ${loadedGameState.serverIp ?? ''}`)
+    //   this.overwriteWarps(JSON.parse(storageWarps ?? '[]'))
+    // }
+    this.isOldVersion = versionToNumber(bot.version) < versionToNumber('1.13')
+    this.blockData = {}
+    for (const blockKey of Object.keys(BlockData.colors)) {
+      const renamedKey = getRenamedData('blocks', blockKey, '1.20.2', bot.version)
+      this.blockData[renamedKey as string] = BlockData.colors[blockKey]
+    }
+
+    viewer.world?.renderUpdateEmitter.on('chunkFinished', (key) => {
+      if (!this.loadingChunksQueue.has(key)) return
+      void this.loadChunk(key)
+      this.loadingChunksQueue.delete(key)
+    })
+  }
+
+  get full () {
+    return this._full
+  }
+
+  set full (full: boolean) {
+    console.log('this is minimap')
+    this.loadChunk = this.loadChunkMinimap
+    this.mapDrawer.loadChunk = this.loadChunk
+    this._full = full
+  }
+
+  overwriteWarps (newWarps: WorldWarp[]) {
+    this.warps.splice(0, this.warps.length)
+    for (const warp of newWarps) {
+      this.warps.push({ ...warp })
+    }
+  }
+
+  setWarp (warp: WorldWarp, remove?: boolean): void {
+    this.world = bot.game.dimension
+    const index = this.warps.findIndex(w => w.name === warp.name)
+    if (index === -1) {
+      this.warps.push(warp)
+    } else if (remove && index !== -1) {
+      this.warps.splice(index, 1)
+    } else {
+      this.warps[index] = warp
+    }
+    if (localServer) {
+      // type suppressed until server is updated. It works fine
+      void (localServer as any).setWarp(warp, remove)
+    } else if (remove) {
+      localStorage.removeItem(`warps: ${loadedGameState.username} ${loadedGameState.serverIp}`)
+    } else {
+      localStorage.setItem(`warps: ${loadedGameState.username} ${loadedGameState.serverIp}`, JSON.stringify(this.warps))
+    }
+    this.emit('updateWarps')
+  }
+
+  getHighestBlockY (x: number, z: number, chunk?: Chunk) {
+    const chunkX = Math.floor(x / 16) * 16
+    const chunkZ = Math.floor(z / 16) * 16
+    if (this.chunksHeightmaps[`${chunkX},${chunkZ}`]) {
+      return this.chunksHeightmaps[`${chunkX},${chunkZ}`][x - chunkX + (z - chunkZ) * 16] - 1
+    }
+    const source = chunk ?? bot.world
+    const { height, minY } = (bot.game as any)
+    for (let i = height; i > 0; i -= 1) {
+      const block = source.getBlock(new Vec3(x & 15, minY + i, z & 15))
+      if (block && !INVISIBLE_BLOCKS.has(block.name)) {
+        return minY + i
+      }
+    }
+    return minY
+  }
+
+  async getChunkSingleplayer (chunkX: number, chunkZ: number) {
+    // absolute coords
+    const region = (localServer!.overworld.storageProvider as any).getRegion(chunkX * 16, chunkZ * 16)
+    if (!region) return 'unavailable'
+    const chunk = await localServer!.players[0]!.world.getColumn(chunkX, chunkZ)
+    return chunk
+  }
+
+  async loadChunkMinimap (key: string) {
+    const [chunkX, chunkZ] = key.split(',').map(Number)
+    const chunkWorldX = chunkX * 16
+    const chunkWorldZ = chunkZ * 16
+    if (viewer.world.finishedChunks[`${chunkWorldX},${chunkWorldZ}`]) {
+      const heightmap = new Uint8Array(256)
+      const colors = Array.from({ length: 256 }).fill('') as string[]
+      for (let z = 0; z < 16; z += 1) {
+        for (let x = 0; x < 16; x += 1) {
+          const blockX = chunkWorldX + x
+          const blockZ = chunkWorldZ + z
+          const hBlock = viewer.world.highestBlocks.get(`${blockX},${blockZ}`)
+          const block = bot.world.getBlock(new Vec3(blockX, hBlock?.y ?? 0, blockZ))
+          // const block = Block.fromStateId(hBlock?.stateId ?? -1, hBlock?.biomeId ?? -1)
+          const index = z * 16 + x
+          if (!block || !hBlock) {
+            console.warn(`[loadChunk] ${chunkX}, ${chunkZ}, ${chunkWorldX + x}, ${chunkWorldZ + z}`)
+            heightmap[index] = 0
+            colors[index] = 'rgba(0, 0, 0, 0.5)'
+            continue
+          }
+          heightmap[index] = hBlock.y
+          let color: string
+          if (this.isOldVersion) {
+            color = BlockData.colors[preflatMap.blocks[`${block.type}:${block.metadata}`]?.replaceAll(/\[.*?]/g, '')]
+            ?? 'rgb(0, 0, 255)'
+          } else {
+            color = this.blockData[block.name] ?? 'rgb(0, 255, 0)'
+          }
+          colors[index] = color
+        }
+      }
+      const chunk = { heightmap, colors }
+      this.applyShadows(chunk)
+      this.chunksStore.set(key, chunk)
+      this.emit(`chunkReady`, `${chunkX},${chunkZ}`)
+    } else {
+      this.loadingChunksQueue.add(`${chunkX},${chunkZ}`)
+      this.chunksStore.set(key, 'requested')
+    }
+  }
+
+  async loadChunkNoRegion (key: string) {
+    const [chunkX, chunkZ] = key.split(',').map(Number)
+    const chunkWorldX = chunkX * 16
+    const chunkWorldZ = chunkZ * 16
+    const chunkInfo = await this.getChunkSingleplayer(chunkX, chunkZ)
+    if (chunkInfo === 'unavailable') return null
+    const heightmap = new Uint8Array(256)
+    const colors = Array.from({ length: 256 }).fill('') as string[]
+    for (let z = 0; z < 16; z += 1) {
+      for (let x = 0; x < 16; x += 1) {
+        const blockX = chunkWorldX + x
+        const blockZ = chunkWorldZ + z
+        const blockY = this.getHighestBlockY(blockX, blockZ, chunkInfo)
+        const block = chunkInfo.getBlock(new Vec3(blockX & 15, blockY, blockZ & 15))
+        if (!block) {
+          console.warn(`[cannot get the block] ${chunkX}, ${chunkZ}, ${chunkWorldX + x}, ${chunkWorldZ + z}`)
+          return null
+        }
+        const index = z * 16 + x
+        heightmap[index] = blockY
+        const color = this.isOldVersion ? BlockData.colors[preflatMap.blocks[`${block.type}:${block.metadata}`]?.replaceAll(/\[.*?]/g, '')] ?? 'rgb(0, 0, 255)' : this.blockData[block.name] ?? 'rgb(0, 255, 0)'
+        colors[index] = color
+      }
+    }
+    const chunk: ChunkInfo = { heightmap, colors }
+    this.applyShadows(chunk)
+    return chunk
+  }
+
+  async loadChunkFromRegion (key: string): Promise<ChunkInfo | null | undefined> {
+    const [chunkX, chunkZ] = key.split(',').map(Number)
+    const chunkWorldX = chunkX * 16
+    const chunkWorldZ = chunkZ * 16
+    const heightmap = await this.getChunkHeightMapFromRegion(chunkX, chunkZ) as unknown as Uint8Array
+    if (!heightmap) return null
+    const chunkInfo = await this.getChunkSingleplayer(chunkX, chunkZ)
+    if (chunkInfo === 'unavailable') return null
+    const colors = Array.from({ length: 256 }).fill('') as string[]
+    for (let z = 0; z < 16; z += 1) {
+      for (let x = 0; x < 16; x += 1) {
+        const blockX = chunkWorldX + x
+        const blockZ = chunkWorldZ + z
+        const index = z * 16 + x
+        heightmap[index] -= 1
+        if (heightmap[index] < 0) heightmap[index] = 0
+        const blockY = heightmap[index]
+        const block = chunkInfo.getBlock(new Vec3(blockX & 15, blockY, blockZ & 15))
+        if (!block) {
+          console.warn(`[cannot get the block] ${chunkX}, ${chunkZ}, ${chunkWorldX + x}, ${chunkWorldZ + z}`)
+          return null
+        }
+        const color = this.isOldVersion ? BlockData.colors[preflatMap.blocks[`${block.type}:${block.metadata}`]?.replaceAll(/\[.*?]/g, '')] ?? 'rgb(0, 0, 255)' : this.blockData[block.name] ?? 'rgb(0, 255, 0)'
+        colors[index] = color
+      }
+    }
+    const chunk: ChunkInfo = { heightmap, colors }
+    this.applyShadows(chunk)
+    return chunk
+  }
+
+  getSingleplayerRootPath (): string | undefined {
+    return localServer!.options.worldFolder
+  }
+
+  async getChunkHeightMapFromRegion (chunkX: number, chunkZ: number, cb?: (hm: number[]) => void) {
+    const regionX = Math.floor(chunkX / 32)
+    const regionZ = Math.floor(chunkZ / 32)
+    const regionKey = `${regionX},${regionZ}`
+    if (!this.regions.has(regionKey)) {
+      const worldFolder = this.getSingleplayerRootPath()
+      if (!worldFolder) return
+      const path = `${worldFolder}/region/r.${regionX}.${regionZ}.mca`
+      const region = new RegionFile(path)
+      await region.initialize()
+      this.regions.set(regionKey, region)
+    }
+    const rawChunk = await this.regions.get(regionKey)!.read(chunkX % 32, chunkZ % 32)
+    const chunk = simplify(rawChunk as any)
+    console.log(`chunk ${chunkX}, ${chunkZ}:`, chunk)
+    const heightmap = findHeightMap(chunk)
+    console.log(`heightmap ${chunkX}, ${chunkZ}:`, heightmap)
+    cb?.(heightmap!)
+    return heightmap
+    // this.chunksHeightmaps[`${chunkX},${chunkZ}`] = heightmap
+  }
+
+  async loadChunkFromViewer (key: string) {
+    const [chunkX, chunkZ] = key.split(',').map(Number)
+    const chunkWorldX = chunkX * 16
+    const chunkWorldZ = chunkZ * 16
+    if (viewer.world.finishedChunks[`${chunkWorldX},${chunkWorldZ}`]) {
+      const heightmap = new Uint8Array(256)
+      const colors = Array.from({ length: 256 }).fill('') as string[]
+      for (let z = 0; z < 16; z += 1) {
+        for (let x = 0; x < 16; x += 1) {
+          const blockX = chunkWorldX + x
+          const blockZ = chunkWorldZ + z
+          const hBlock = viewer.world.highestBlocks.get(`${blockX},${blockZ}`)
+          const block = bot.world.getBlock(new Vec3(blockX, hBlock?.y ?? 0, blockZ))
+          // const block = Block.fromStateId(hBlock?.stateId ?? -1, hBlock?.biomeId ?? -1)
+          const index = z * 16 + x
+          if (!block || !hBlock) {
+            console.warn(`[loadChunk] ${chunkX}, ${chunkZ}, ${chunkWorldX + x}, ${chunkWorldZ + z}`)
+            heightmap[index] = 0
+            colors[index] = 'rgba(0, 0, 0, 0.5)'
+            continue
+          }
+          heightmap[index] = hBlock.y
+          const color = this.isOldVersion ? BlockData.colors[preflatMap.blocks[`${block.type}:${block.metadata}`]?.replaceAll(/\[.*?]/g, '')] ?? 'rgb(0, 0, 255)' : this.blockData[block.name] ?? 'rgb(0, 255, 0)'
+          colors[index] = color
+        }
+      }
+      const chunk = { heightmap, colors }
+      this.applyShadows(chunk)
+      return chunk
+    } else {
+      return null
+    }
+  }
+
+  applyShadows (chunk: ChunkInfo) {
+    for (let j = 0; j < 16; j += 1) {
+      for (let i = 0; i < 16; i += 1) {
+        const index = j * 16 + i
+        const color = chunk.colors[index]
+        // if (i === 0 || j === 0 || i === 15 || j === 16) {
+        //   const r = Math.floor(Math.random() * 2)
+        //   chunk.colors[index] = r===0 ? this.makeDarker(color) : this.makeLighter(color)
+        //   continue
+        // }
+
+        const h = chunk.heightmap[index]
+        let isLighterOrDarker = 0
+
+        const r = chunk.heightmap[index + 1] ?? 0
+        const u = chunk.heightmap[index - 16] ?? 0
+        const ur = chunk.heightmap[index - 15] ?? 0
+        if (r > h || u > h || ur > h) {
+          chunk.colors[index] = this.makeDarker(color)
+          isLighterOrDarker -= 1
+        }
+
+        const l = chunk.heightmap[index - 1] ?? 0
+        const d = chunk.heightmap[index + 16] ?? 0
+        const dl = chunk.heightmap[index + 15] ?? 0
+        if (l > h || d > h || dl > h) {
+          chunk.colors[index] = this.makeLighter(color)
+          isLighterOrDarker += 1
+        }
+
+        let linkedIndex: number | undefined
+        if (i === 1) {
+          linkedIndex = index - 1
+        } else if (i === 14) {
+          linkedIndex = index + 1
+        } else if (j === 1) {
+          linkedIndex = index - 16
+        } else if (j === 14) {
+          linkedIndex = index + 16
+        }
+        if (linkedIndex !== undefined) {
+          const linkedColor = chunk.colors[linkedIndex]
+          switch (isLighterOrDarker) {
+            case 1:
+              chunk.colors[linkedIndex] = this.makeLighter(linkedColor)
+              break
+            case -1:
+              chunk.colors[linkedIndex] = this.makeDarker(linkedColor)
+              break
+            default:
+              break
+          }
+        }
+      }
+    }
+  }
+
+  makeDarker (color: string) {
+    let rgbArray = color.match(/\d+/g)?.map(Number) ?? []
+    if (rgbArray.length !== 3) return color
+    rgbArray = rgbArray.map(element => {
+      let newColor = element - 20
+      if (newColor < 0) newColor = 0
+      return newColor
+    })
+    return `rgb(${rgbArray.join(',')})`
+  }
+
+  makeLighter (color: string) {
+    let rgbArray = color.match(/\d+/g)?.map(Number) ?? []
+    if (rgbArray.length !== 3) return color
+    rgbArray = rgbArray.map(element => {
+      let newColor = element + 20
+      if (newColor > 255) newColor = 255
+      return newColor
+    })
+    return `rgb(${rgbArray.join(',')})`
+  }
+
+  clearChunksStore (x: number, z: number) {
+    for (const key of Object.keys(this.chunksStore)) {
+      const [chunkX, chunkZ] = key.split(',').map(Number)
+      if (Math.hypot((chunkX - x), (chunkZ - z)) > 300) {
+        delete this.chunksStore[key]
+        delete this.chunksHeightmaps[key]
+        for (let i = 0; i < 16; i += 1) {
+          for (let j = 0; j < 16; j += 1) {
+            delete this.heightMap[`${chunkX + i},${chunkZ + j}`]
+          }
+        }
+      }
+    }
+  }
+
+  quickTp (x: number, z: number) {
+    const y = this.getHighestBlockY(x, z)
+    bot.chat(`/tp ${x} ${y + 20} ${z}`)
+    const timeout = setTimeout(() => {
+      const y = this.getHighestBlockY(x, z)
+      bot.chat(`/tp ${x} ${y + 20} ${z}`)
+      clearTimeout(timeout)
+    }, 500)
+  }
+
+  async drawChunkOnCanvas (key: string, canvas: HTMLCanvasElement) {
+    // console.log('chunk', key, 'on canvas')
+    if (!this.loadChunkFullmap) {
+      // wait for it to be available
+      await new Promise(resolve => {
+        const interval = setInterval(() => {
+          if (this.loadChunkFullmap) {
+            clearInterval(interval)
+            resolve(undefined)
+          }
+        }, 100)
+        setTimeout(() => {
+          clearInterval(interval)
+          resolve(undefined)
+        }, 10_000)
+      })
+      if (!this.loadChunkFullmap) {
+        throw new Error('loadChunkFullmap not available')
+      }
+    }
+    const chunk = await this.loadChunkFullmap(key)
+    const [worldX, worldZ] = key.split(',').map(x => Number(x) * 16)
+    const center = new Vec3(worldX + 8, 0, worldZ + 8)
+    this.mapDrawer.lastBotPos = center
+    this.mapDrawer.canvas = canvas
+    this.mapDrawer.full = true
+    this.mapDrawer.drawChunk(key, chunk)
+  }
+}
+
+const Inner = (
+  { adapter, displayMode, toggleFullMap }:
+  {
+    adapter: DrawerAdapterImpl
+    displayMode?: DisplayMode,
+    toggleFullMap?: ({ command }: { command?: string }) => void
+  }
+) => {
+
+  const updateWarps = (newWarps: WorldWarp[] | Error) => {
+    if (newWarps instanceof Error) {
+      console.error('An error occurred:', newWarps.message)
+      return
+    }
+
+    adapter.overwriteWarps(newWarps)
+  }
+
+  const updateMap = () => {
+    if (!adapter) return
+    adapter.playerPosition = bot.entity.position
+    adapter.yaw = bot.entity.yaw
+    adapter.emit('updateMap')
+  }
+
+  useEffect(() => {
+    bot.on('move', updateMap)
+    localServer?.on('warpsUpdated' as keyof ServerEvents, updateWarps)
+
+    return () => {
+      bot?.off('move', updateMap)
+      localServer?.off('warpsUpdated' as keyof ServerEvents, updateWarps)
+    }
+  }, [])
+
+  return <div>
+    <Minimap
+      adapter={adapter}
+      showMinimap={options.showMinimap}
+      showFullmap='always'
+      singleplayer={miscUiState.singleplayer}
+      fullMap={displayMode === 'fullmapOnly'}
+      toggleFullMap={toggleFullMap}
+      displayMode={displayMode}
+    />
+  </div>
+}
+
+export default ({ displayMode }: { displayMode?: DisplayMode }) => {
+  const [adapter] = useState(() => new DrawerAdapterImpl(bot.entity.position))
+
+  const { showMinimap } = useSnapshot(options)
+  const fullMapOpened = useIsModalActive('full-map')
+
+
+  const readChunksHeightMaps = async () => {
+    const { worldFolder } = localServer!.options
+    const path = `${worldFolder}/region/r.0.0.mca`
+    const region = new RegionFile(path)
+    await region.initialize()
+    const chunks: Record<string, any> = {}
+    console.log('Reading chunks...')
+    console.log(chunks)
+    let versionDetected = false
+    for (const [i, _] of Array.from({ length: 32 }).entries()) {
+      for (const [k, _] of Array.from({ length: 32 }).entries()) {
+        // todo, may use faster reading, but features is not commonly used
+        // eslint-disable-next-line no-await-in-loop
+        const nbt = await region.read(i, k)
+        chunks[`${i},${k}`] = nbt
+        if (nbt && !versionDetected) {
+          const simplified = simplify(nbt)
+          const version = versions.pc.find(x => x['dataVersion'] === simplified.DataVersion)?.minecraftVersion
+          console.log('Detected version', version ?? 'unknown')
+          versionDetected = true
+        }
+      }
+    }
+    Object.defineProperty(chunks, 'simplified', {
+      get () {
+        const mapped = {}
+        for (const [i, _] of Array.from({ length: 32 }).entries()) {
+          for (const [k, _] of Array.from({ length: 32 }).entries()) {
+            const key = `${i},${k}`
+            const chunk = chunks[key]
+            if (!chunk) continue
+            mapped[key] = simplify(chunk)
+          }
+        }
+        return mapped
+      },
+    })
+    console.log('Done!', chunks)
+  }
+
+  if (
+    displayMode === 'minimapOnly'
+      ? showMinimap === 'never' || (showMinimap === 'singleplayer' && !miscUiState.singleplayer)
+      : !fullMapOpened
+  ) {
+    return null
+  }
+
+  const toggleFullMap = () => {
+    if (activeModalStack.at(-1)?.reactType === 'full-map') {
+      hideModal({ reactType: 'full-map' })
+    } else {
+      showModal({ reactType: 'full-map' })
+    }
+  }
+
+  return <Inner adapter={adapter} displayMode={displayMode} toggleFullMap={toggleFullMap} />
+}
diff --git a/src/react/utilsApp.ts b/src/react/utilsApp.ts
index 53df4cda..445007ec 100644
--- a/src/react/utilsApp.ts
+++ b/src/react/utilsApp.ts
@@ -6,7 +6,8 @@ import { activeModalStack, miscUiState } from '../globalState'
 export const watchedModalsFromHooks = new Set<string>()
 // todo should not be there
 export const hardcodedKnownModals = [
-  'player_win:'
+  'player_win:',
+  'full-map' // todo
 ]
 
 export const useUsingTouch = () => {
@@ -17,6 +18,7 @@ export const useIsModalActive = (modal: string, useIncludes = false) => {
     watchedModalsFromHooks.add(modal)
   }, [])
   useEffect(() => {
+    // watchedModalsFromHooks.add(modal)
     return () => {
       watchedModalsFromHooks.delete(modal)
     }
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 2fb63c19..1a3af31e 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -19,6 +19,7 @@ import ScoreboardProvider from './react/ScoreboardProvider'
 import SignEditorProvider from './react/SignEditorProvider'
 import IndicatorEffectsProvider from './react/IndicatorEffectsProvider'
 import PlayerListOverlayProvider from './react/PlayerListOverlayProvider'
+import MinimapProvider from './react/MinimapProvider'
 import HudBarsProvider from './react/HudBarsProvider'
 import XPBarProvider from './react/XPBarProvider'
 import DebugOverlay from './react/DebugOverlay'
@@ -27,7 +28,7 @@ import PauseScreen from './react/PauseScreen'
 import SoundMuffler from './react/SoundMuffler'
 import TouchControls from './react/TouchControls'
 import widgets from './react/widgets'
-import { useIsWidgetActive } from './react/utilsApp'
+import { useIsModalActive, useIsWidgetActive } from './react/utilsApp'
 import GlobalSearchInput from './react/GlobalSearchInput'
 import TouchAreasControlsProvider from './react/TouchAreasControlsProvider'
 import NotificationProvider, { showNotification } from './react/NotificationProvider'
@@ -101,9 +102,11 @@ const InGameComponent = ({ children }) => {
 
 const InGameUi = () => {
   const { gameLoaded, showUI: showUIRaw } = useSnapshot(miscUiState)
-  const { disabledUiParts, displayBossBars } = useSnapshot(options)
-  const hasModals = useSnapshot(activeModalStack).length > 0
+  const { disabledUiParts, displayBossBars, showMinimap } = useSnapshot(options)
+  const modalsSnapshot = useSnapshot(activeModalStack)
+  const hasModals = modalsSnapshot.length > 0
   const showUI = showUIRaw || hasModals
+  const displayFullmap = modalsSnapshot.some(modal => modal.reactType === 'full-map')
   if (!gameLoaded || !bot || disabledUiParts.includes('*')) return
 
   return <>
@@ -116,6 +119,7 @@ const InGameUi = () => {
         {!disabledUiParts.includes('players-list') && <PlayerListOverlayProvider />}
         {!disabledUiParts.includes('chat') && <ChatProvider />}
         <SoundMuffler />
+        {showMinimap !== 'never' && <MinimapProvider displayMode='minimapOnly' />}
         {!disabledUiParts.includes('title') && <TitleProvider />}
         {!disabledUiParts.includes('scoreboard') && <ScoreboardProvider />}
         {!disabledUiParts.includes('effects-indicators') && <IndicatorEffectsProvider />}
@@ -137,6 +141,7 @@ const InGameUi = () => {
       <DisplayQr />
     </PerComponentErrorBoundary>
     <RobustPortal to={document.body}>
+      {displayFullmap && <MinimapProvider displayMode='fullmapOnly' />}
       {/* because of z-index */}
       {showUI && <TouchControls />}
       <GlobalSearchInput />
diff --git a/tsconfig.json b/tsconfig.json
index 3c20075c..addc64f1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -29,6 +29,6 @@
         "prismarine-viewer/examples"
     ],
     "exclude": [
-        "node_modules",
+        "node_modules"
     ]
 }

From dd20994f78aea56b93c1dd77b634338cbfd34dc1 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 27 Nov 2024 21:12:43 +0100
Subject: [PATCH 057/753] feat: Text display orientation and rendering fixes
 (#235)

---
 prismarine-viewer/viewer/lib/entities.ts | 86 ++++++++++++++++++------
 1 file changed, 65 insertions(+), 21 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index 8ee93c3b..47a0303e 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -22,22 +22,41 @@ export const TWEEN_DURATION = 120
 
 type PlayerObjectType = PlayerObject & { animation?: PlayerAnimation }
 
-function toRgba (color?: string) {
-  if (!color || parseInt(color, 10) === 0) {
+function convert2sComplementToHex (complement: number) {
+  if (complement < 0) {
+    complement = (0xFF_FF_FF_FF + complement + 1) >>> 0
+  }
+  return complement.toString(16)
+}
+
+function toRgba (color: string | undefined) {
+  if (color === undefined) {
+    return undefined
+  }
+  if (parseInt(color, 10) === 0) {
     return 'rgba(0, 0, 0, 0)'
   }
-  const hex = parseInt(color, 10).toString(16)
-  const r = parseInt(hex.slice(1, 3), 16)
-  const g = parseInt(hex.slice(3, 5), 16)
-  const b = parseInt(hex.slice(5, 7), 16)
-  if (hex.length === 9) {
-    const a = parseInt(hex.slice(7, 9), 16) / 255
-    return `rgba(${r}, ${g}, ${b}, ${a})`
+  const hex = convert2sComplementToHex(parseInt(color, 10))
+  if (hex.length === 8) {
+    return `#${hex.slice(2, 8)}${hex.slice(0, 2)}`
   } else {
-    return `rgb(${r}, ${g}, ${b})`
+    return `#${hex}`
   }
 }
 
+function toQuaternion (quaternion: any, defaultValue?: THREE.Quaternion) {
+  if (quaternion === undefined) {
+    return defaultValue
+  }
+  if (quaternion instanceof THREE.Quaternion) {
+    return quaternion
+  }
+  if (Array.isArray(quaternion)) {
+    return new THREE.Quaternion(quaternion[0], quaternion[1], quaternion[2], quaternion[3])
+  }
+  return new THREE.Quaternion(quaternion.x, quaternion.y, quaternion.z, quaternion.w)
+}
+
 function getUsernameTexture ({
   username,
   nameTagBackgroundColor = 'rgba(0, 0, 0, 0.3)',
@@ -47,7 +66,7 @@ function getUsernameTexture ({
   const ctx = canvas.getContext('2d')
   if (!ctx) throw new Error('Could not get 2d context')
 
-  const fontSize = 50
+  const fontSize = 48
   const padding = 5
   ctx.font = `${fontSize}px ${fontFamily}`
 
@@ -60,7 +79,7 @@ function getUsernameTexture ({
   }
 
   canvas.width = textWidth
-  canvas.height = (fontSize + padding * 2) * lines.length
+  canvas.height = (fontSize + padding) * lines.length
 
   ctx.fillStyle = nameTagBackgroundColor
   ctx.fillRect(0, 0, canvas.width, canvas.height)
@@ -70,7 +89,7 @@ function getUsernameTexture ({
   let i = 0
   for (const line of lines) {
     i++
-    ctx.fillText(line, padding + (textWidth - ctx.measureText(line).width) / 2, fontSize * i)
+    ctx.fillText(line, (textWidth - ctx.measureText(line).width) / 2, -padding + fontSize * i)
   }
 
   return canvas
@@ -82,14 +101,36 @@ const addNametag = (entity, options, mesh) => {
     const canvas = getUsernameTexture(entity, options)
     const tex = new THREE.Texture(canvas)
     tex.needsUpdate = true
-    const spriteMat = new THREE.SpriteMaterial({ map: tex })
-    const sprite = new THREE.Sprite(spriteMat)
-    sprite.renderOrder = 1000
-    sprite.scale.set(canvas.width * 0.005, canvas.height * 0.005, 1)
-    sprite.position.y += entity.height + 0.6
-    sprite.name = 'nametag'
+    let nameTag
+    if (entity.nameTagFixed) {
+      const geometry = new THREE.PlaneGeometry()
+      const material = new THREE.MeshBasicMaterial({ map: tex })
+      material.transparent = true
+      nameTag = new THREE.Mesh(geometry, material)
+      nameTag.rotation.set(entity.pitch, THREE.MathUtils.degToRad(entity.yaw + 180), 0)
+      nameTag.position.y += entity.height + 0.3
+    } else {
+      const spriteMat = new THREE.SpriteMaterial({ map: tex })
+      nameTag = new THREE.Sprite(spriteMat)
+      nameTag.position.y += entity.height + 0.6
+    }
+    nameTag.renderOrder = 1000
+    nameTag.scale.set(canvas.width * 0.005, canvas.height * 0.005, 1)
+    if (entity.nameTagRotationRight) {
+      nameTag.applyQuaternion(entity.nameTagRotationRight)
+    }
+    if (entity.nameTagScale) {
+      nameTag.scale.multiply(entity.nameTagScale)
+    }
+    if (entity.nameTagRotationLeft) {
+      nameTag.applyQuaternion(entity.nameTagRotationLeft)
+    }
+    if (entity.nameTagTranslation) {
+      nameTag.position.add(entity.nameTagTranslation)
+    }
+    nameTag.name = 'nametag'
 
-    mesh.add(sprite)
+    mesh.add(nameTag)
   }
 }
 
@@ -494,6 +535,7 @@ export class Entities extends EventEmitter {
     const displayTextRaw = textDisplayMeta?.text || meta.custom_name_visible && meta.custom_name
     const displayText = this.parseEntityLabel(displayTextRaw)
     if (entity.name !== 'player' && displayText) {
+      const nameTagFixed = textDisplayMeta && (textDisplayMeta.billboard_render_constraints === 'fixed' || !textDisplayMeta.billboard_render_constraints)
       const nameTagBackgroundColor = textDisplayMeta && toRgba(textDisplayMeta.background_color)
       let nameTagTextOpacity: any
       if (textDisplayMeta?.text_opacity) {
@@ -501,7 +543,9 @@ export class Entities extends EventEmitter {
         nameTagTextOpacity = rawOpacity > 0 ? rawOpacity : 256 - rawOpacity
       }
       addNametag(
-        { ...entity, username: displayText, nameTagBackgroundColor, nameTagTextOpacity },
+        { ...entity, username: displayText, nameTagBackgroundColor, nameTagTextOpacity, nameTagFixed,
+          nameTagScale: textDisplayMeta?.scale, nameTagTranslation: textDisplayMeta && (textDisplayMeta.translation || new THREE.Vector3(0, 0, 0)),
+          nameTagRotationLeft: toQuaternion(textDisplayMeta?.left_rotation), nameTagRotationRight: toQuaternion(textDisplayMeta?.right_rotation) },
         this.entitiesOptions,
         this.entities[entity.id].children.find(c => c.name === 'mesh')
       )

From 0b8eaa4ad2fbb391fbe4fd266020e6e7a0f9b4e0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 3 Dec 2024 03:54:43 +0300
Subject: [PATCH 058/753] fix: fix renderer bug cactus was exposing the world

---
 prismarine-viewer/viewer/lib/mesher/models.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/mesher/models.ts b/prismarine-viewer/viewer/lib/mesher/models.ts
index 8baec4dc..954f4354 100644
--- a/prismarine-viewer/viewer/lib/mesher/models.ts
+++ b/prismarine-viewer/viewer/lib/mesher/models.ts
@@ -228,14 +228,12 @@ const identicalCull = (currentElement: BlockElement, neighbor: Block, direction:
   const models = neighbor.models?.map(m => m[useVar] ?? m[0]) ?? []
   // TODO we should support it! rewrite with optimizing general pipeline
   if (models.some(m => m.x || m.y || m.z)) return
-  for (const model of models) {
-    for (const element of model.elements ?? []) {
+  return models.every(model => {
+    return (model.elements ?? []).every(element => {
       // todo check alfa on texture
-      if (element.faces[lookForOppositeSide]?.cullface && elemCompareForm(currentElement) === elemCompareForm(element) && elementEdgeValidator(element)) {
-        return true
-      }
-    }
-  }
+      return !!(element.faces[lookForOppositeSide]?.cullface && elemCompareForm(currentElement) === elemCompareForm(element) && elementEdgeValidator(element))
+    })
+  })
 }
 
 let needSectionRecomputeOnChange = false

From cf7c4664f24a5ad31112a3b6b1436eb6462d7ff9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 3 Dec 2024 10:06:18 +0300
Subject: [PATCH 059/753] copy .map file for mesher in dev for better dx

---
 rsbuild.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index b9594242..1085e3fc 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -105,6 +105,7 @@ const appConfig = defineConfig({
                     if (fs.existsSync('./prismarine-viewer/dist/mesher.js') && dev) {
                         // copy mesher
                         fs.copyFileSync('./prismarine-viewer/dist/mesher.js', './dist/mesher.js')
+                        fs.copyFileSync('./prismarine-viewer/dist/mesher.js.map', './dist/mesher.js.map')
                     } else if (!dev) {
                         await execAsync('pnpm run build-mesher')
                     }

From 84dce0941c6509d775b15c8f56b438da673b6b36 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 4 Dec 2024 23:19:21 +0300
Subject: [PATCH 060/753] write build info to all deploys!

(cherry picked from commit 4afccbefbdf96beb62fbc2ea0d442d9f7cd1c370)
---
 .github/workflows/preview.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index ddb386b7..701d0968 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -55,6 +55,9 @@ jobs:
         run: npm install --global vercel
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
+      - name: Write Release Info
+        run: |
+          echo "{\"latestTag\": \"$(git rev-parse --short $GITHUB_SHA)\"}" > assets/release.json
       - name: Build Project Artifacts
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
       - run: pnpm build-storybook

From 5783b98e742247ccca28d7abee7af4420643d8f2 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 6 Dec 2024 09:53:13 +0300
Subject: [PATCH 061/753] fix: spectator: display cursor block in f3, hide
 hotbar and hunger

---
 src/react/DebugOverlay.tsx | 2 +-
 src/react/FoodBar.tsx      | 2 +-
 src/reactUi.tsx            | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index 23f0d7db..9079eed9 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -105,7 +105,7 @@ export default () => {
       setBiomeId(bot.world.getBiome(bot.entity.position))
       setDimension(bot.game.dimension)
       setDay(bot.time.day)
-      setCursorBlock(worldInteractions.cursorBlock)
+      setCursorBlock(bot.blockAtCursor(5))
       setEntitiesCount(Object.values(bot.entities).length)
     }, 100)
 
diff --git a/src/react/FoodBar.tsx b/src/react/FoodBar.tsx
index 5a131c07..dbed0502 100644
--- a/src/react/FoodBar.tsx
+++ b/src/react/FoodBar.tsx
@@ -25,7 +25,7 @@ export default ({
 
   useEffect(() => {
     if (foodRef.current) {
-      foodRef.current.classList.toggle('creative', gameMode === 'creative')
+      foodRef.current.classList.toggle('creative', gameMode === 'creative' || gameMode === 'spectator')
     }
   }, [gameMode])
 
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 1a3af31e..a490d6c7 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -107,6 +107,12 @@ const InGameUi = () => {
   const hasModals = modalsSnapshot.length > 0
   const showUI = showUIRaw || hasModals
   const displayFullmap = modalsSnapshot.some(modal => modal.reactType === 'full-map')
+  const [gameMode, setGameMode] = useState(bot.game.gameMode)
+  useEffect(() => {
+    bot.on('game', () => {
+      setGameMode(bot.game.gameMode)
+    })
+  }, [])
   if (!gameLoaded || !bot || disabledUiParts.includes('*')) return
 
   return <>
@@ -134,7 +140,7 @@ const InGameUi = () => {
         {!disabledUiParts.includes('hud-bars') && <HudBarsProvider />}
         <BedTime />
       </div>
-      {showUI && !disabledUiParts.includes('hotbar') && <HotbarRenderApp />}
+      {showUI && gameMode !== 'spectator' && !disabledUiParts.includes('hotbar') && <HotbarRenderApp />}
     </RobustPortal>
     <PerComponentErrorBoundary>
       <SignEditorProvider />

From 3bacef125118bee6bb814f88826708a384956ec1 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 7 Dec 2024 01:54:00 +0300
Subject: [PATCH 062/753] fix: fix race condition when state id change was
 received from server faster than chunk was processed by mesher: now the
 change will await for the chunk load first instead of ignoring it. sync
 common code from webgpu

---
 prismarine-viewer/viewer/lib/viewer.ts        | 55 +++++++----
 .../viewer/lib/worldDataEmitter.ts            | 18 ++--
 .../viewer/lib/worldrendererCommon.ts         | 93 +++++++++++++------
 src/react/HotbarRenderApp.tsx                 | 13 ++-
 src/reactUi.tsx                               | 10 +-
 5 files changed, 128 insertions(+), 61 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/viewer.ts b/prismarine-viewer/viewer/lib/viewer.ts
index d16dbe81..2671ba07 100644
--- a/prismarine-viewer/viewer/lib/viewer.ts
+++ b/prismarine-viewer/viewer/lib/viewer.ts
@@ -78,15 +78,15 @@ export class Viewer {
     // this.primitives.clear()
   }
 
-  setVersion (userVersion: string, texturesVersion = userVersion) {
+  setVersion (userVersion: string, texturesVersion = userVersion): void | Promise<void> {
     console.log('[viewer] Using version:', userVersion, 'textures:', texturesVersion)
-    void this.world.setVersion(userVersion, texturesVersion).then(async () => {
+    this.entities.clear()
+    // this.primitives.clear()
+    return this.world.setVersion(userVersion, texturesVersion).then(async () => {
       return new THREE.TextureLoader().loadAsync(this.world.itemsAtlasParser!.latestImage)
     }).then((texture) => {
       this.entities.itemsTexture = texture
     })
-    this.entities.clear()
-    // this.primitives.clear()
   }
 
   addColumn (x, z, chunk, isLightUpdate = false) {
@@ -98,10 +98,18 @@ export class Viewer {
   }
 
   setBlockStateId (pos: Vec3, stateId: number) {
-    if (!this.world.loadedChunks[`${Math.floor(pos.x / 16) * 16},${Math.floor(pos.z / 16) * 16}`]) {
-      console.debug('[should be unreachable] setBlockStateId called for unloaded chunk', pos)
+    const set = async () => {
+      const sectionX = Math.floor(pos.x / 16) * 16
+      const sectionZ = Math.floor(pos.z / 16) * 16
+      if (this.world.queuedChunks.has(`${sectionX},${sectionZ}`)) {
+        await this.world.waitForChunkToLoad(pos)
+      }
+      if (!this.world.loadedChunks[`${sectionX},${sectionZ}`]) {
+        console.debug('[should be unreachable] setBlockStateId called for unloaded chunk', pos)
+      }
+      this.world.setBlockStateId(pos, stateId)
     }
-    this.world.setBlockStateId(pos, stateId)
+    void set()
   }
 
   demoModel () {
@@ -153,9 +161,8 @@ export class Viewer {
     let yOffset = this.playerHeight
     if (this.isSneaking) yOffset -= 0.3
 
-    if (this.world instanceof WorldRendererThree) {
-      this.world.camera = cam as THREE.PerspectiveCamera
-    }
+    this.world.camera = cam as THREE.PerspectiveCamera
+
     this.world.updateCamera(pos?.offset(0, yOffset, 0) ?? null, yaw, pitch)
   }
 
@@ -205,6 +212,7 @@ export class Viewer {
     } | null
     worldEmitter.on('loadChunk', ({ x, z, chunk, worldConfig, isLightUpdate }) => {
       this.world.worldConfig = worldConfig
+      this.world.queuedChunks.add(`${x},${z}`)
       const args = [x, z, chunk, isLightUpdate]
       if (!currentLoadChunkBatch) {
         // add a setting to use debounce instead
@@ -212,6 +220,7 @@ export class Viewer {
           data: [],
           timeout: setTimeout(() => {
             for (const args of currentLoadChunkBatch!.data) {
+              this.world.queuedChunks.delete(`${args[0]},${args[1]}`)
               this.addColumn(...args as Parameters<typeof this.addColumn>)
             }
             currentLoadChunkBatch = null
@@ -222,7 +231,7 @@ export class Viewer {
     })
     // todo remove and use other architecture instead so data flow is clear
     worldEmitter.on('blockEntities', (blockEntities) => {
-      if (this.world instanceof WorldRendererThree) this.world.blockEntities = blockEntities
+      if (this.world instanceof WorldRendererThree) (this.world).blockEntities = blockEntities
     })
 
     worldEmitter.on('unloadChunk', ({ x, z }) => {
@@ -237,14 +246,24 @@ export class Viewer {
       this.world.updateViewerPosition(pos)
     })
 
+
+    worldEmitter.on('renderDistance', (d) => {
+      this.world.viewDistance = d
+      this.world.chunksLength = d === 0 ? 1 : generateSpiralMatrix(d).length
+    })
+
     worldEmitter.on('renderDistance', (d) => {
       this.world.viewDistance = d
       this.world.chunksLength = d === 0 ? 1 : generateSpiralMatrix(d).length
       this.world.allChunksFinished = Object.keys(this.world.finishedChunks).length === this.world.chunksLength
     })
 
+    worldEmitter.on('markAsLoaded', ({ x, z }) => {
+      this.world.markAsLoaded(x, z)
+    })
+
     worldEmitter.on('updateLight', ({ pos }) => {
-      if (this.world instanceof WorldRendererThree) this.world.updateLight(pos.x, pos.z)
+      if (this.world instanceof WorldRendererThree) (this.world).updateLight(pos.x, pos.z)
     })
 
     worldEmitter.on('time', (timeOfDay) => {
@@ -264,16 +283,20 @@ export class Viewer {
       skyLight = Math.floor(skyLight) // todo: remove this after optimization
 
       if (this.world.mesherConfig.skyLight === skyLight) return
-      this.world.mesherConfig.skyLight = skyLight;
-      (this.world as WorldRendererThree).rerenderAllChunks?.()
+      this.world.mesherConfig.skyLight = skyLight
+      if (this.world instanceof WorldRendererThree) {
+        (this.world).rerenderAllChunks?.()
+      }
     })
 
     worldEmitter.emit('listening')
   }
 
   render () {
-    this.world.render()
-    this.entities.render()
+    if (this.world instanceof WorldRendererThree) {
+      (this.world).render()
+      this.entities.render()
+    }
   }
 
   async waitForChunksToRender () {
diff --git a/prismarine-viewer/viewer/lib/worldDataEmitter.ts b/prismarine-viewer/viewer/lib/worldDataEmitter.ts
index 51c0a08b..0223b855 100644
--- a/prismarine-viewer/viewer/lib/worldDataEmitter.ts
+++ b/prismarine-viewer/viewer/lib/worldDataEmitter.ts
@@ -6,6 +6,7 @@ import { generateSpiralMatrix, ViewRect } from 'flying-squid/dist/utils'
 import { Vec3 } from 'vec3'
 import { BotEvents } from 'mineflayer'
 import { getItemFromBlock } from '../../../src/chatUtils'
+import { delayedIterator } from '../../examples/shared'
 import { chunkPos } from './simpleUtils'
 
 export type ChunkPosKey = string
@@ -23,6 +24,7 @@ export class WorldDataEmitter extends EventEmitter {
   keepChunksDistance = 0
   addWaitTime = 1
   _handDisplay = false
+  isPlayground = false
   get handDisplay () {
     return this._handDisplay
   }
@@ -173,19 +175,11 @@ export class WorldDataEmitter extends EventEmitter {
   }
 
   async _loadChunks (positions: Vec3[], sliceSize = 5) {
-    let i = 0
     const promises = [] as Array<Promise<void>>
-    return new Promise<void>(resolve => {
-      const interval = setInterval(() => {
-        if (i >= positions.length) {
-          clearInterval(interval)
-          void Promise.all(promises).then(() => resolve())
-          return
-        }
-        promises.push(this.loadChunk(positions[i]))
-        i++
-      }, this.addWaitTime)
+    await delayedIterator(positions, this.addWaitTime, (pos) => {
+      promises.push(this.loadChunk(pos))
     })
+    await Promise.all(promises)
   }
 
   readdDebug () {
@@ -221,6 +215,8 @@ export class WorldDataEmitter extends EventEmitter {
         //@ts-expect-error
         this.emitter.emit('loadChunk', { x: pos.x, z: pos.z, chunk, blockEntities: column.blockEntities, worldConfig, isLightUpdate })
         this.loadedChunks[`${pos.x},${pos.z}`] = true
+      } else if (this.isPlayground) { // don't allow in real worlds pre-flag chunks as loaded to avoid race condition when the chunk might still be loading. In playground it's assumed we always pre-load all chunks first
+        this.emitter.emit('markAsLoaded', { x: pos.x, z: pos.z })
       }
     } else {
       // console.debug('skipped loading chunk', dx, dz, '>', this.viewDistance)
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
index 7beb0a92..995e7d29 100644
--- a/prismarine-viewer/viewer/lib/worldrendererCommon.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -49,13 +49,17 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   version = undefined as string | undefined
   @worldCleanup()
-  loadedChunks = {} as Record<string, boolean>
+  loadedChunks = {} as Record<string, boolean> // data is added for these chunks and they might be still processing
 
   @worldCleanup()
-  finishedChunks = {} as Record<string, boolean>
+  finishedChunks = {} as Record<string, boolean> // these chunks are fully loaded into the world (scene)
 
   @worldCleanup()
-  sectionsOutstanding = new Map<string, number>()
+  // loading sections (chunks)
+  sectionsWaiting = new Map<string, number>()
+
+  @worldCleanup()
+  queuedChunks = new Set<string>()
 
   @worldCleanup()
   renderUpdateEmitter = new EventEmitter() as unknown as TypedEmitter<{
@@ -109,13 +113,15 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   abstract outputFormat: 'threeJs' | 'webgpu'
 
+  abstract changeBackgroundColor (color: [number, number, number]): void
+
   constructor (public config: WorldRendererConfig) {
     // this.initWorkers(1) // preload script on page load
     this.snapshotInitialValues()
 
     this.renderUpdateEmitter.on('update', () => {
       const loadedChunks = Object.keys(this.finishedChunks).length
-      updateStatText('loaded-chunks', `${loadedChunks}/${this.chunksLength} chunks (${this.lastChunkDistance})`)
+      updateStatText('loaded-chunks', `${loadedChunks}/${this.chunksLength} chunks (${this.lastChunkDistance}/${this.viewDistance})`)
     })
   }
 
@@ -135,38 +141,31 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         this.handleWorkerMessage(data)
         if (data.type === 'geometry') {
           const geometry = data.geometry as MesherGeometryOutput
-          for (const [key, highest] of geometry.highestBlocks.entries()) {
-            const currHighest = this.highestBlocks.get(key)
-            if (!currHighest || currHighest.y < highest.y) {
-              this.highestBlocks.set(key, highest)
+          for (const key in geometry.highestBlocks) {
+            const highest = geometry.highestBlocks[key]
+            if (!this.highestBlocks[key] || this.highestBlocks[key].y < highest.y) {
+              this.highestBlocks[key] = highest
             }
           }
           const chunkCoords = data.key.split(',').map(Number)
           this.lastChunkDistance = Math.max(...this.getDistance(new Vec3(chunkCoords[0], 0, chunkCoords[2])))
         }
         if (data.type === 'sectionFinished') { // on after load & unload section
-          if (!this.sectionsOutstanding.get(data.key)) throw new Error(`sectionFinished event for non-outstanding section ${data.key}`)
-          this.sectionsOutstanding.set(data.key, this.sectionsOutstanding.get(data.key)! - 1)
-          if (this.sectionsOutstanding.get(data.key) === 0) this.sectionsOutstanding.delete(data.key)
+          if (!this.sectionsWaiting.get(data.key)) throw new Error(`sectionFinished event for non-outstanding section ${data.key}`)
+          this.sectionsWaiting.set(data.key, this.sectionsWaiting.get(data.key)! - 1)
+          if (this.sectionsWaiting.get(data.key) === 0) this.sectionsWaiting.delete(data.key)
 
           const chunkCoords = data.key.split(',').map(Number)
           if (this.loadedChunks[`${chunkCoords[0]},${chunkCoords[2]}`]) { // ensure chunk data was added, not a neighbor chunk update
-            const loadingKeys = [...this.sectionsOutstanding.keys()]
+            const loadingKeys = [...this.sectionsWaiting.keys()]
             if (!loadingKeys.some(key => {
               const [x, y, z] = key.split(',').map(Number)
               return x === chunkCoords[0] && z === chunkCoords[2]
             })) {
               this.finishedChunks[`${chunkCoords[0]},${chunkCoords[2]}`] = true
-              this.renderUpdateEmitter.emit(`chunkFinished`, `${chunkCoords[0] / 16},${chunkCoords[2] / 16}`)
-            }
-          }
-          if (this.sectionsOutstanding.size === 0) {
-            const allFinished = Object.keys(this.finishedChunks).length === this.chunksLength
-            if (allFinished) {
-              this.allChunksLoaded?.()
-              this.allChunksFinished = true
             }
           }
+          this.checkAllFinished()
 
           this.renderUpdateEmitter.emit('update')
           if (data.processTime) {
@@ -189,6 +188,16 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
   }
 
+  checkAllFinished () {
+    if (this.sectionsWaiting.size === 0) {
+      const allFinished = Object.keys(this.finishedChunks).length === this.chunksLength
+      if (allFinished) {
+        this.allChunksLoaded?.()
+        this.allChunksFinished = true
+      }
+    }
+  }
+
   onHandItemSwitch (item: HandItemBlock | undefined): void { }
   changeHandSwingingState (isAnimationPlaying: boolean): void { }
 
@@ -270,7 +279,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
   }
 
-  async updateTexturesData () {
+  async updateTexturesData (resourcePackUpdate = false) {
     const blocksAssetsParser = new AtlasParser(this.blocksAtlases, blocksAtlasLatest, blocksAtlasLegacy)
     const itemsAssetsParser = new AtlasParser(this.itemsAtlases, itemsAtlasLatest, itemsAtlasLegacy)
     const { atlas: blocksAtlas, canvas: blocksCanvas } = await blocksAssetsParser.makeNewAtlas(this.texturesVersion ?? this.version ?? 'latest', (textureName) => {
@@ -327,11 +336,16 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     return Math.floor(Math.max(this.worldConfig.minY, this.mesherConfig.clipWorldBelowY ?? -Infinity) / 16) * 16
   }
 
+  updateDownloadedChunksText () {
+    updateStatText('downloaded-chunks', `${Object.keys(this.loadedChunks).length}/${this.chunksLength} chunks D`)
+  }
+
   addColumn (x: number, z: number, chunk: any, isLightUpdate: boolean) {
     if (!this.active) return
     if (this.workers.length === 0) throw new Error('workers not initialized yet')
     this.initialChunksLoad = false
     this.loadedChunks[`${x},${z}`] = true
+    this.updateDownloadedChunksText()
     for (const worker of this.workers) {
       // todo optimize
       worker.postMessage({ type: 'chunk', x, z, chunk })
@@ -348,13 +362,19 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
   }
 
+  markAsLoaded (x, z) {
+    this.loadedChunks[`${x},${z}`] = true
+    this.finishedChunks[`${x},${z}`] = true
+    this.checkAllFinished()
+  }
+
   removeColumn (x, z) {
     delete this.loadedChunks[`${x},${z}`]
     for (const worker of this.workers) {
       worker.postMessage({ type: 'unloadChunk', x, z })
     }
-    this.allChunksFinished = Object.keys(this.finishedChunks).length === this.chunksLength
     delete this.finishedChunks[`${x},${z}`]
+    this.allChunksFinished = Object.keys(this.finishedChunks).length === this.chunksLength
     for (let y = this.worldConfig.minY; y < this.worldConfig.worldHeight; y += 16) {
       this.setSectionDirty(new Vec3(x, y, z), false)
     }
@@ -365,7 +385,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     const endZ = Math.ceil((z + 1) / 16) * 16
     for (let x = startX; x < endX; x += 16) {
       for (let z = startZ; z < endZ; z += 16) {
-        this.highestBlocks.delete(`${x},${z}`)
+        delete this.highestBlocks[`${x},${z}`]
       }
     }
   }
@@ -400,7 +420,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     // This guarantees uniformity accross workers and that a given section
     // is always dispatched to the same worker
     const hash = mod(Math.floor(pos.x / 16) + Math.floor(pos.y / 16) + Math.floor(pos.z / 16), this.workers.length)
-    this.sectionsOutstanding.set(key, (this.sectionsOutstanding.get(key) ?? 0) + 1)
+    this.sectionsWaiting.set(key, (this.sectionsWaiting.get(key) ?? 0) + 1)
     this.messagesQueue[hash] ??= []
     this.messagesQueue[hash].push({
       // this.workers[hash].postMessage({
@@ -432,13 +452,13 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   // of sections not rendered are 0
   async waitForChunksToRender () {
     return new Promise<void>((resolve, reject) => {
-      if ([...this.sectionsOutstanding].length === 0) {
+      if ([...this.sectionsWaiting].length === 0) {
         resolve()
         return
       }
 
       const updateHandler = () => {
-        if (this.sectionsOutstanding.size === 0) {
+        if (this.sectionsWaiting.size === 0) {
           this.renderUpdateEmitter.removeListener('update', updateHandler)
           resolve()
         }
@@ -446,4 +466,25 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       this.renderUpdateEmitter.on('update', updateHandler)
     })
   }
+
+  async waitForChunkToLoad (pos: Vec3) {
+    return new Promise<void>((resolve, reject) => {
+      const key = `${Math.floor(pos.x / 16) * 16},${Math.floor(pos.z / 16) * 16}`
+      if (this.loadedChunks[key]) {
+        resolve()
+        return
+      }
+      const updateHandler = () => {
+        if (this.loadedChunks[key]) {
+          this.renderUpdateEmitter.removeListener('update', updateHandler)
+          resolve()
+        }
+      }
+      this.renderUpdateEmitter.on('update', updateHandler)
+    })
+  }
+
+  destroy () {
+    console.warn('world destroy is not implemented')
+  }
 }
diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index 5b65f890..1c94905f 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -73,7 +73,7 @@ const ItemName = ({ itemKey }: { itemKey: string }) => {
   </Transition>
 }
 
-export default () => {
+const Inner = () => {
   const container = useRef<HTMLDivElement>(null!)
   const [itemKey, setItemKey] = useState('')
   const hasModals = useSnapshot(activeModalStack).length
@@ -221,6 +221,17 @@ export default () => {
   </SharedHudVars>
 }
 
+export default () => {
+  const [gameMode, setGameMode] = useState(bot.game?.gameMode ?? 'creative')
+  useEffect(() => {
+    bot.on('game', () => {
+      setGameMode(bot.game.gameMode)
+    })
+  }, [])
+
+  return gameMode === 'spectator' ? null : <Inner />
+}
+
 const Portal = ({ children, to = document.body }) => {
   return createPortal(children, to)
 }
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index a490d6c7..f0144d14 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -107,12 +107,8 @@ const InGameUi = () => {
   const hasModals = modalsSnapshot.length > 0
   const showUI = showUIRaw || hasModals
   const displayFullmap = modalsSnapshot.some(modal => modal.reactType === 'full-map')
-  const [gameMode, setGameMode] = useState(bot.game.gameMode)
-  useEffect(() => {
-    bot.on('game', () => {
-      setGameMode(bot.game.gameMode)
-    })
-  }, [])
+  // bot can't be used here
+
   if (!gameLoaded || !bot || disabledUiParts.includes('*')) return
 
   return <>
@@ -140,7 +136,7 @@ const InGameUi = () => {
         {!disabledUiParts.includes('hud-bars') && <HudBarsProvider />}
         <BedTime />
       </div>
-      {showUI && gameMode !== 'spectator' && !disabledUiParts.includes('hotbar') && <HotbarRenderApp />}
+      {showUI && !disabledUiParts.includes('hotbar') && <HotbarRenderApp />}
     </RobustPortal>
     <PerComponentErrorBoundary>
       <SignEditorProvider />

From 18a191a03c9e13b4f1a426d83f5f41fc2ef72256 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 5 Dec 2024 00:03:36 +0300
Subject: [PATCH 063/753] feat: add ping display on mobile & via f3, playground
 ui improvements

---
 prismarine-viewer/examples/playgroundUi.tsx | 62 ++++++++++++++++++---
 src/controls.ts                             |  9 +++
 src/react/useLongPress.ts                   |  7 +--
 3 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/prismarine-viewer/examples/playgroundUi.tsx b/prismarine-viewer/examples/playgroundUi.tsx
index 0de20d62..ed183d78 100644
--- a/prismarine-viewer/examples/playgroundUi.tsx
+++ b/prismarine-viewer/examples/playgroundUi.tsx
@@ -4,10 +4,14 @@ import { proxy, useSnapshot } from 'valtio'
 import { LeftTouchArea, RightTouchArea, useInterfaceState } from '@dimaka/interface'
 import { css } from '@emotion/css'
 import { Vec3 } from 'vec3'
+import useLongPress from '../../src/react/useLongPress'
+import { isMobile } from '../viewer/lib/simpleUtils'
 
 export const playgroundGlobalUiState = proxy({
   scenes: [] as string[],
-  selected: ''
+  selected: '',
+  selectorOpened: false,
+  actions: {} as Record<string, () => void>,
 })
 
 renderToDom(<Playground />)
@@ -17,7 +21,7 @@ function Playground () {
     const style = document.createElement('style')
     style.innerHTML = /* css */ `
       .lil-gui {
-        top: 40px !important;
+        top: 60px !important;
         right: 0 !important;
       }
     `
@@ -33,24 +37,31 @@ function Playground () {
   }}>
     <Controls />
     <SceneSelector />
+    <ActionsSelector />
   </div>
 }
 
 function SceneSelector () {
+  const mobile = isMobile()
   const { scenes, selected } = useSnapshot(playgroundGlobalUiState)
+  const longPressEvents = useLongPress(() => {
+    playgroundGlobalUiState.selectorOpened = true
+  }, () => { })
 
-  return <div style={{
-    position: 'fixed',
-    top: 0,
-    left: 0,
-  }}>
+  return <div
+    style={{
+      position: 'fixed',
+      top: 0,
+      left: 0,
+    }} {...longPressEvents}>
     {scenes.map(scene => <div
       key={scene}
       style={{
-        padding: '2px 5px',
+        padding: mobile ? '5px' : '2px 5px',
         cursor: 'pointer',
         userSelect: 'none',
         background: scene === selected ? 'rgba(0, 0, 0, 0.5)' : 'rgba(0, 0, 0, 0.6)',
+        fontWeight: scene === selected ? 'bold' : 'normal',
       }}
       onClick={() => {
         const qs = new URLSearchParams(window.location.search)
@@ -61,6 +72,41 @@ function SceneSelector () {
   </div>
 }
 
+const ActionsSelector = () => {
+  const { actions, selectorOpened } = useSnapshot(playgroundGlobalUiState)
+
+  if (!selectorOpened) return null
+  return <div style={{
+    position: 'fixed',
+    inset: 0,
+    background: 'rgba(0, 0, 0, 0.5)',
+    zIndex: 10,
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'center',
+    alignItems: 'center',
+    gap: 5,
+    fontSize: 24,
+  }}>{Object.entries({
+      ...actions,
+      'Close' () {
+        playgroundGlobalUiState.selectorOpened = false
+      }
+    }).map(([name, action]) => <div
+      key={name}
+      style={{
+        padding: '2px 5px',
+        cursor: 'pointer',
+        userSelect: 'none',
+        background: 'rgba(0, 0, 0, 0.5)',
+      }}
+      onClick={() => {
+        action()
+        playgroundGlobalUiState.selectorOpened = false
+      }}
+    >{name}</div>)}</div>
+}
+
 const Controls = () => {
   // todo setting
   const usingTouch = navigator.maxTouchPoints > 0
diff --git a/src/controls.ts b/src/controls.ts
index 3b41c06f..7f3b7d34 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -523,6 +523,15 @@ export const f3Keybinds = [
       }
     },
     mobileTitle: 'Cycle Game Mode'
+  },
+  {
+    key: 'KeyP',
+    async action () {
+      const { uuid, ping: playerPing, username } = bot.player
+      const proxyPing = await bot['pingProxy']()
+      void showOptionsModal(`${username}: last known total latency (ping): ${playerPing}. Connected to ${lastConnectOptions.value?.proxy} with current ping ${proxyPing}. Player UUID: ${uuid}`, [])
+    },
+    mobileTitle: 'Show Proxy & Ping Details'
   }
 ]
 
diff --git a/src/react/useLongPress.ts b/src/react/useLongPress.ts
index 3807221d..49a1dec6 100644
--- a/src/react/useLongPress.ts
+++ b/src/react/useLongPress.ts
@@ -31,9 +31,9 @@ const useLongPress = (
   )
 
   const clear = useCallback(
-    (event: React.MouseEvent | React.TouchEvent, shouldTriggerClick = true) => {
+    (event: React.MouseEvent | React.TouchEvent) => {
       if (timeout.current) clearTimeout(timeout.current)
-      if (shouldTriggerClick && !longPressTriggered) onClick()
+      if (!longPressTriggered) onClick()
       setLongPressTriggered(false)
       if (shouldPreventDefault && target.current) {
         target.current.removeEventListener('touchend', preventDefault)
@@ -46,7 +46,7 @@ const useLongPress = (
     onMouseDown: (e: React.MouseEvent) => start(e),
     onTouchStart: (e: React.TouchEvent) => start(e),
     onMouseUp: (e: React.MouseEvent) => clear(e),
-    onMouseLeave: (e: React.MouseEvent) => clear(e, false),
+    onMouseLeave: (e: React.MouseEvent) => clear(e),
     onTouchEnd: (e: React.TouchEvent) => clear(e)
   }
 }
@@ -61,4 +61,3 @@ const preventDefault = (event: Event) => {
 }
 
 export default useLongPress
-

From 3c5c8b78e3316ce19525ff5b8165f41a6a473764 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 7 Dec 2024 03:27:48 +0300
Subject: [PATCH 064/753] implement changeBackgroundColor method

---
 prismarine-viewer/viewer/lib/worldrendererThree.ts | 4 ++++
 src/water.ts                                       | 7 ++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/worldrendererThree.ts b/prismarine-viewer/viewer/lib/worldrendererThree.ts
index e8769c88..bf0999a4 100644
--- a/prismarine-viewer/viewer/lib/worldrendererThree.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererThree.ts
@@ -54,6 +54,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     void this.holdingBlock.initHandObject(this.material, this.blockstatesModels, this.blocksAtlases, item)
   }
 
+  changeBackgroundColor (color: [number, number, number]): void {
+    this.scene.background = new THREE.Color(color[0], color[1], color[2])
+  }
+
   changeHandSwingingState (isAnimationPlaying: boolean) {
     if (isAnimationPlaying) {
       this.holdingBlock.startSwing()
diff --git a/src/water.ts b/src/water.ts
index 2d3be46f..94875e33 100644
--- a/src/water.ts
+++ b/src/water.ts
@@ -31,9 +31,6 @@ customEvents.on('gameLoaded', () => {
 let sceneBg = { r: 0, g: 0, b: 0 }
 export const updateBackground = (newSceneBg = sceneBg) => {
   sceneBg = newSceneBg
-  if (inWater) {
-    viewer.scene.background = new THREE.Color(0x00_00_ff)
-  } else {
-    viewer.scene.background = new THREE.Color(sceneBg.r, sceneBg.g, sceneBg.b)
-  }
+  const color: [number, number, number] = inWater ? [0, 0, 1] : [sceneBg.r, sceneBg.g, sceneBg.b]
+  viewer.world.changeBackgroundColor(color)
 }

From 2f21e2b453200ac49669c1b677b05ae63cdb9133 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 9 Dec 2024 09:28:14 +0300
Subject: [PATCH 065/753] write pr & commit redirect

---
 .github/workflows/preview.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 701d0968..2001d51d 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -66,6 +66,14 @@ jobs:
           mkdir -p .vercel/output/static/playground
           pnpm build-playground
           cp -r prismarine-viewer/dist/* .vercel/output/static/playground/
+      - name: Write pr redirect index.html
+        run: |
+          mkdir -p .vercel/output/pr
+          echo "<meta http-equiv='refresh' content='0;url=https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}'>" > .vercel/output/pr/index.html
+      - name: Write commit redirect index.html
+        run: |
+          mkdir -p .vercel/output/commit
+          echo "<meta http-equiv='refresh' content='0;url=https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}/commits/${{ github.sha }}'>" > .vercel/output/commit/index.html
       - name: Download Generated Sounds map
         run: node scripts/downloadSoundsMap.mjs
       - name: Deploy Project Artifacts to Vercel

From 68dba89bf5df49cc0834cb08073162737b64ac32 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 9 Dec 2024 09:32:37 +0300
Subject: [PATCH 066/753] ci: update paths for PR and commit redirect
 index.html in preview workflow

---
 .github/workflows/preview.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 2001d51d..4b66ac9f 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -68,12 +68,12 @@ jobs:
           cp -r prismarine-viewer/dist/* .vercel/output/static/playground/
       - name: Write pr redirect index.html
         run: |
-          mkdir -p .vercel/output/pr
-          echo "<meta http-equiv='refresh' content='0;url=https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}'>" > .vercel/output/pr/index.html
+          mkdir -p .vercel/output/static/pr
+          echo "<meta http-equiv='refresh' content='0;url=https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}'>" > .vercel/output/static/pr/index.html
       - name: Write commit redirect index.html
         run: |
-          mkdir -p .vercel/output/commit
-          echo "<meta http-equiv='refresh' content='0;url=https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}/commits/${{ github.sha }}'>" > .vercel/output/commit/index.html
+          mkdir -p .vercel/output/static/commit
+          echo "<meta http-equiv='refresh' content='0;url=https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}/commits/${{ github.sha }}'>" > .vercel/output/static/commit/index.html
       - name: Download Generated Sounds map
         run: node scripts/downloadSoundsMap.mjs
       - name: Deploy Project Artifacts to Vercel

From b02b250ee8e0d9473575362bdaecc134ba02fffd Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 9 Dec 2024 09:48:16 +0300
Subject: [PATCH 067/753] ci(preview): correctly set pr number in url

---
 .github/workflows/preview.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 4b66ac9f..d066effe 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -69,11 +69,11 @@ jobs:
       - name: Write pr redirect index.html
         run: |
           mkdir -p .vercel/output/static/pr
-          echo "<meta http-equiv='refresh' content='0;url=https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}'>" > .vercel/output/static/pr/index.html
+          echo "<meta http-equiv='refresh' content='0;url=https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number || github.event.pull_request.number }}'>" > .vercel/output/static/pr/index.html
       - name: Write commit redirect index.html
         run: |
           mkdir -p .vercel/output/static/commit
-          echo "<meta http-equiv='refresh' content='0;url=https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}/commits/${{ github.sha }}'>" > .vercel/output/static/commit/index.html
+          echo "<meta http-equiv='refresh' content='0;url=https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number || github.event.pull_request.number }}/commits/${{ github.sha }}'>" > .vercel/output/static/commit/index.html
       - name: Download Generated Sounds map
         run: node scripts/downloadSoundsMap.mjs
       - name: Deploy Project Artifacts to Vercel

From 74cb815940d29706c379026cc614203d6831c686 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 10 Dec 2024 07:03:55 +0300
Subject: [PATCH 068/753] feat: support for multiple sources for `mapDir` url
 in case if first source can't be fetched

---
 src/browserfs.ts           | 38 ++++++++++++++++++++++++++++----------
 src/downloadAndOpenFile.ts |  4 ++--
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/browserfs.ts b/src/browserfs.ts
index e3675b4c..ce8fa56a 100644
--- a/src/browserfs.ts
+++ b/src/browserfs.ts
@@ -389,7 +389,7 @@ export const copyFilesAsyncWithProgress = async (pathSrc: string, pathDest: stri
     return
   }
   if (!stat.isDirectory()) {
-    await fs.promises.writeFile(pathDest, await fs.promises.readFile(pathSrc))
+    await fs.promises.writeFile(pathDest, await fs.promises.readFile(pathSrc) as any)
     console.debug('copied single file', pathSrc, pathDest)
     return
   }
@@ -464,7 +464,7 @@ export const copyFilesAsync = async (pathSrc: string, pathDest: string, fileCopi
     } else {
       // Copy file
       try {
-        await fs.promises.writeFile(curPathDest, await fs.promises.readFile(curPathSrc))
+        await fs.promises.writeFile(curPathDest, await fs.promises.readFile(curPathSrc) as any)
         console.debug('copied file', curPathSrc, curPathDest)
       } catch (err) {
         console.error('Error copying file', curPathSrc, curPathDest, err)
@@ -475,17 +475,35 @@ export const copyFilesAsync = async (pathSrc: string, pathDest: string, fileCopi
   }))
 }
 
-export const openWorldFromHttpDir = async (fileDescriptorUrl: string/*  | undefined */, baseUrl = fileDescriptorUrl.split('/').slice(0, -1).join('/')) => {
+export const openWorldFromHttpDir = async (fileDescriptorUrls: string[]/*  | undefined */, baseUrlParam) => {
   // todo try go guess mode
   let index
-  const file = await fetch(fileDescriptorUrl).then(async a => a.json())
-  if (file.baseUrl) {
-    baseUrl = new URL(file.baseUrl, baseUrl).toString()
-    index = file.index
-  } else {
-    index = file
+  let baseUrl
+  for (const url of fileDescriptorUrls) {
+    let response: Response | undefined
+    try {
+      setLoadingScreenStatus(`Trying to get world descriptor from ${new URL(url).host}`)
+      const controller = new AbortController()
+      setTimeout(() => {
+        controller.abort()
+      }, 3000)
+      // eslint-disable-next-line no-await-in-loop
+      response = await fetch(url, { signal: controller.signal })
+    } catch (err) {
+      console.error('Error fetching file descriptor', url, err)
+    }
+    if (!response) continue
+    // eslint-disable-next-line no-await-in-loop
+    const file = await response.json()
+    if (file.baseUrl) {
+      baseUrl = new URL(file.baseUrl, baseUrl).toString()
+      index = file.index
+    } else {
+      index = file
+      baseUrl = baseUrlParam ?? url.split('/').slice(0, -1).join('/')
+    }
   }
-  if (!index) throw new Error(`The provided mapDir file is not valid descriptor file! ${fileDescriptorUrl}`)
+  if (!index) throw new Error(`The provided mapDir file is not valid descriptor file! ${fileDescriptorUrls.join(', ')}`)
   await new Promise<void>(async resolve => {
     browserfs.configure({
       fs: 'MountableFileSystem',
diff --git a/src/downloadAndOpenFile.ts b/src/downloadAndOpenFile.ts
index 49fc5c35..6e59ea02 100644
--- a/src/downloadAndOpenFile.ts
+++ b/src/downloadAndOpenFile.ts
@@ -9,10 +9,10 @@ export const getFixedFilesize = (bytes: number) => {
 
 const inner = async () => {
   const qs = new URLSearchParams(window.location.search)
-  const mapUrlDir = qs.get('mapDir')
+  const mapUrlDir = qs.getAll('mapDir')
   const mapUrlDirGuess = qs.get('mapDirGuess')
   const mapUrlDirBaseUrl = qs.get('mapDirBaseUrl')
-  if (mapUrlDir) {
+  if (mapUrlDir.length) {
     await openWorldFromHttpDir(mapUrlDir, mapUrlDirBaseUrl ?? undefined)
     return true
   }

From 37b84ae003e4a620e587e438d1f8ab97c5a324c5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 10 Dec 2024 07:17:11 +0300
Subject: [PATCH 069/753] ci: fix use pr commit SHA, not base branch

---
 .github/workflows/preview.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index d066effe..7fe5998b 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -57,7 +57,7 @@ jobs:
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
       - name: Write Release Info
         run: |
-          echo "{\"latestTag\": \"$(git rev-parse --short $GITHUB_SHA)\"}" > assets/release.json
+          echo "{\"latestTag\": \"$(git rev-parse --short ${{ github.event.pull_request.head.sha }})\"}" > assets/release.json
       - name: Build Project Artifacts
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
       - run: pnpm build-storybook
@@ -73,7 +73,7 @@ jobs:
       - name: Write commit redirect index.html
         run: |
           mkdir -p .vercel/output/static/commit
-          echo "<meta http-equiv='refresh' content='0;url=https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number || github.event.pull_request.number }}/commits/${{ github.sha }}'>" > .vercel/output/static/commit/index.html
+          echo "<meta http-equiv='refresh' content='0;url=https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number || github.event.pull_request.number }}/commits/${{ github.event.pull_request.head.sha }}'>" > .vercel/output/static/commit/index.html
       - name: Download Generated Sounds map
         run: node scripts/downloadSoundsMap.mjs
       - name: Deploy Project Artifacts to Vercel

From 50d1d37ff3c261e42c7785acf482d774735bc99c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 11 Dec 2024 08:38:46 +0300
Subject: [PATCH 070/753] dev: lock url so app restores the same game state
 after reloads

---
 src/browserfs.ts | 11 ++++++-----
 src/controls.ts  |  2 +-
 src/index.ts     |  5 ++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/browserfs.ts b/src/browserfs.ts
index ce8fa56a..7e66dfe0 100644
--- a/src/browserfs.ts
+++ b/src/browserfs.ts
@@ -480,7 +480,7 @@ export const openWorldFromHttpDir = async (fileDescriptorUrls: string[]/*  | und
   let index
   let baseUrl
   for (const url of fileDescriptorUrls) {
-    let response: Response | undefined
+    let file
     try {
       setLoadingScreenStatus(`Trying to get world descriptor from ${new URL(url).host}`)
       const controller = new AbortController()
@@ -488,13 +488,13 @@ export const openWorldFromHttpDir = async (fileDescriptorUrls: string[]/*  | und
         controller.abort()
       }, 3000)
       // eslint-disable-next-line no-await-in-loop
-      response = await fetch(url, { signal: controller.signal })
+      const response = await fetch(url, { signal: controller.signal })
+      // eslint-disable-next-line no-await-in-loop
+      file = await response.json()
     } catch (err) {
       console.error('Error fetching file descriptor', url, err)
     }
-    if (!response) continue
-    // eslint-disable-next-line no-await-in-loop
-    const file = await response.json()
+    if (!file) continue
     if (file.baseUrl) {
       baseUrl = new URL(file.baseUrl, baseUrl).toString()
       index = file.index
@@ -502,6 +502,7 @@ export const openWorldFromHttpDir = async (fileDescriptorUrls: string[]/*  | und
       index = file
       baseUrl = baseUrlParam ?? url.split('/').slice(0, -1).join('/')
     }
+    break
   }
   if (!index) throw new Error(`The provided mapDir file is not valid descriptor file! ${fileDescriptorUrls.join(', ')}`)
   await new Promise<void>(async resolve => {
diff --git a/src/controls.ts b/src/controls.ts
index 7f3b7d34..cb1c132b 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -300,7 +300,7 @@ const alwaysPressedHandledCommand = (command: Command) => {
   }
 }
 
-function lockUrl () {
+export function lockUrl () {
   let newQs = ''
   if (fsState.saveLoaded) {
     const save = localServer!.options.worldFolder.split('/').at(-1)
diff --git a/src/index.ts b/src/index.ts
index 28d8eedd..d660ec50 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -22,7 +22,7 @@ import PrismarineItem from 'prismarine-item'
 
 import { options, watchValue } from './optionsStorage'
 import './reactUi'
-import { contro, onBotCreate } from './controls'
+import { contro, lockUrl, onBotCreate } from './controls'
 import './dragndrop'
 import { possiblyCleanHandle, resetStateAfterDisconnect } from './browserfs'
 import { watchOptionsAfterViewerInit, watchOptionsAfterWorldViewInit } from './watchOptions'
@@ -692,6 +692,9 @@ async function connect (connectOptions: ConnectOptions) {
     setLoadingScreenStatus('Placing blocks (starting viewer)')
     localStorage.lastConnectOptions = JSON.stringify(connectOptions)
     connectOptions.onSuccessfulPlay?.()
+    if (process.env.NODE_ENV === 'development' && !localStorage.lockUrl && new URLSearchParams(location.search).size === 0) {
+      lockUrl()
+    }
     updateDataAfterJoin()
     if (connectOptions.autoLoginPassword) {
       bot.chat(`/login ${connectOptions.autoLoginPassword}`)

From 2d77bdb9b260707d47bde306ddf6fa973762e70f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 12 Dec 2024 01:30:51 +0300
Subject: [PATCH 071/753] ci: allow setting multiple aliases

---
 .github/workflows/next-deploy.yml | 11 +++++------
 .github/workflows/preview.yml     |  5 ++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml
index d829fc1f..5641588b 100644
--- a/.github/workflows/next-deploy.yml
+++ b/.github/workflows/next-deploy.yml
@@ -38,9 +38,8 @@ jobs:
         with:
           run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
         id: deploy
-      - name: Set deployment alias
-        run: vercel alias set ${{ steps.deploy.outputs.stdout }} ${{ secrets.TEST_PREVIEW_DOMAIN }} --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro
-      # - uses: mshick/add-pr-comment@v2
-      #   with:
-      #     message: |
-      #       Deployed to Vercel Preview: ${{ steps.deploy.outputs.stdout }}
+      - name: Set deployment aliases
+        run: |
+          for alias in $(echo ${{ secrets.ALIASES }} | tr "," "\n"); do
+            vercel alias set ${{ steps.deploy.outputs.stdout }} $alias --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro
+          done
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 7fe5998b..f03b80f8 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -92,4 +92,7 @@ jobs:
       # - run: git checkout next scripts/githubActions.mjs
       - name: Set deployment alias
         if: ${{ steps.alias.outputs.alias != '' && steps.alias.outputs.alias != 'mcraft.fun' && steps.alias.outputs.alias != 's.mcraft.fun' }}
-        run: vercel alias set ${{ steps.deploy.outputs.stdout }} ${{ steps.alias.outputs.alias }} --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro
+        run: |
+          for alias in $(echo ${{ steps.alias.outputs.alias }} | tr "," "\n"); do
+            vercel alias set ${{ steps.deploy.outputs.stdout }} $alias --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro
+          done

From 75965203fce77ff2aa85c02fb955b5339c0e9218 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 12 Dec 2024 02:05:53 +0300
Subject: [PATCH 072/753] fix: replace Available Offline text with Downloaded
 to avoid confustion when the app is Offline

---
 src/react/MainMenuRenderApp.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/MainMenuRenderApp.tsx b/src/react/MainMenuRenderApp.tsx
index 7c6385dc..f62cf165 100644
--- a/src/react/MainMenuRenderApp.tsx
+++ b/src/react/MainMenuRenderApp.tsx
@@ -62,7 +62,7 @@ export default () => {
           return
         }
         const upStatus = () => {
-          setVersionStatus(`(${isLatest ? 'latest' : 'new version available'}${mainMenuState.serviceWorkerLoaded ? ' - Available Offline' : ''})`)
+          setVersionStatus(`(${isLatest ? 'latest' : 'new version available'}${mainMenuState.serviceWorkerLoaded ? ', Downloaded' : ''})`)
         }
         subscribe(mainMenuState, upStatus)
         upStatus()

From c5f6c087ac55d512aeff6792776b57fe9b9cc558 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 12 Dec 2024 02:07:36 +0300
Subject: [PATCH 073/753] ci: restore linkin preview domains

---
 .github/workflows/next-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml
index 5641588b..488af273 100644
--- a/.github/workflows/next-deploy.yml
+++ b/.github/workflows/next-deploy.yml
@@ -40,6 +40,6 @@ jobs:
         id: deploy
       - name: Set deployment aliases
         run: |
-          for alias in $(echo ${{ secrets.ALIASES }} | tr "," "\n"); do
+          for alias in $(echo ${{ secrets.TEST_PREVIEW_DOMAIN }} | tr "," "\n"); do
             vercel alias set ${{ steps.deploy.outputs.stdout }} $alias --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro
           done

From 5902918729e5caae3ae54e7039fada5139c286e3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 12 Dec 2024 07:31:00 +0300
Subject: [PATCH 074/753] fix: finally fix issues with ray casting on small
 distances. which was easy to notice on blocks like buttons when very close

---
 pnpm-lock.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ff67d9d0..7e05419c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -353,7 +353,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
       mineflayer:
         specifier: github:zardoy/mineflayer
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/ece6755d94931116924874d9f55bc024998cc1ae(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/36454a8bfac7e69072cd7b59c4be47afeac7e433(encoding@0.1.13)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -6802,8 +6802,8 @@ packages:
     resolution: {integrity: sha512-wSchhS59hK+oPs8tFg847H82YEvxU7zYKdDKj4e5FVo3CxJ74eXJVT+JcFwEvoqFO7kXiQlhJITxEvO13GOSKA==}
     engines: {node: '>=18'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/ece6755d94931116924874d9f55bc024998cc1ae:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/ece6755d94931116924874d9f55bc024998cc1ae}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/36454a8bfac7e69072cd7b59c4be47afeac7e433:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/36454a8bfac7e69072cd7b59c4be47afeac7e433}
     version: 4.23.0
     engines: {node: '>=18'}
 
@@ -17831,7 +17831,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/ece6755d94931116924874d9f55bc024998cc1ae(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/36454a8bfac7e69072cd7b59c4be47afeac7e433(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.78.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)

From 376c358d43c7f600bbbbdee58899cb915029fa6d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 12 Dec 2024 07:43:46 +0300
Subject: [PATCH 075/753] feat: add support for 1.21.3

---
 package.json   |   9 +--
 pnpm-lock.yaml | 170 +++++++++++++++++++++++++------------------------
 2 files changed, 93 insertions(+), 86 deletions(-)

diff --git a/package.json b/package.json
index 1a725825..9f452807 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
   "scripts": {
     "dev-rsbuild": "rsbuild dev",
     "dev-proxy": "node server.js",
-    "start": "run-p dev-rsbuild dev-proxy watch-mesher",
+    "start": "run-p dev-proxy dev-rsbuild watch-mesher",
+    "start2": "run-p dev-rsbuild watch-mesher",
     "build": "pnpm build-other-workers && rsbuild build",
     "build-analyze": "BUNDLE_ANALYZE=true rsbuild build && pnpm build-other-workers",
     "check-build": "tsx scripts/genShims.ts && tsc && pnpm build",
@@ -72,7 +73,7 @@
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
-    "minecraft-data": "3.78.0",
+    "minecraft-data": "3.80.0",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
@@ -173,7 +174,7 @@
       "diamond-square": "github:zardoy/diamond-square",
       "prismarine-block": "github:zardoy/prismarine-block#next-era",
       "prismarine-world": "github:zardoy/prismarine-world#next-era",
-      "minecraft-data": "3.78.0",
+      "minecraft-data": "3.80.0",
       "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything",
       "prismarine-physics": "github:zardoy/prismarine-physics",
       "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
@@ -188,7 +189,7 @@
       "three@0.154.0": "patches/three@0.154.0.patch",
       "pixelarticons@1.8.1": "patches/pixelarticons@1.8.1.patch",
       "mineflayer-item-map-downloader@1.2.0": "patches/mineflayer-item-map-downloader@1.2.0.patch",
-      "minecraft-protocol@1.50.0": "patches/minecraft-protocol@1.49.0.patch"
+      "minecraft-protocol@1.51.0": "patches/minecraft-protocol@1.49.0.patch"
     }
   },
   "packageManager": "pnpm@9.0.4"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7e05419c..5a9cd7cd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,7 +11,7 @@ overrides:
   diamond-square: github:zardoy/diamond-square
   prismarine-block: github:zardoy/prismarine-block#next-era
   prismarine-world: github:zardoy/prismarine-world#next-era
-  minecraft-data: 3.78.0
+  minecraft-data: 3.80.0
   prismarine-provider-anvil: github:zardoy/prismarine-provider-anvil#everything
   prismarine-physics: github:zardoy/prismarine-physics
   minecraft-protocol: github:PrismarineJS/node-minecraft-protocol#master
@@ -20,7 +20,7 @@ overrides:
   prismarine-item: latest
 
 patchedDependencies:
-  minecraft-protocol@1.50.0:
+  minecraft-protocol@1.51.0:
     hash: 7sh5krubuk2vjuogjioaktvwzi
     path: patches/minecraft-protocol@1.49.0.patch
   mineflayer-item-map-downloader@1.2.0:
@@ -134,11 +134,11 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       minecraft-data:
-        specifier: 3.78.0
-        version: 3.78.0
+        specifier: 3.80.0
+        version: 3.80.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/642fd4f7023a98a96da4caf8f993f8e19361a1e7(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13)
@@ -162,7 +162,7 @@ importers:
         version: 6.1.1
       prismarine-provider-anvil:
         specifier: github:zardoy/prismarine-provider-anvil#everything
-        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.78.0)
+        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.80.0)
       prosemirror-example-setup:
         specifier: ^1.2.2
         version: 1.2.2
@@ -353,7 +353,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
       mineflayer:
         specifier: github:zardoy/mineflayer
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/36454a8bfac7e69072cd7b59c4be47afeac7e433(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/390ce12c1e1f25e440a94ba422e45c874f8bbd2b(encoding@0.1.13)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -431,7 +431,7 @@ importers:
         version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
-        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0)
+        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0)
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
@@ -3044,6 +3044,9 @@ packages:
   '@types/node-fetch@2.6.6':
     resolution: {integrity: sha512-95X8guJYhfqiuVVhRFxVQcf4hW/2bCuoPwDasMf/531STFoNoWTT7YDnWdXHEZKqAGUigmpG31r2FE70LwnzJw==}
 
+  '@types/node-rsa@1.1.4':
+    resolution: {integrity: sha512-dB0ECel6JpMnq5ULvpUTunx3yNm8e/dIkv8Zu9p2c8me70xIRUUG3q+qXRwcSf9rN3oqamv4116iHy90dJGRpA==}
+
   '@types/node@14.18.56':
     resolution: {integrity: sha512-+k+57NVS9opgrEn5l9c0gvD1r6C+PtyhVE4BTnMMRwiEA8ZO8uFcs6Yy2sXIy0eC95ZurBtRSvhZiHXBysbl6w==}
 
@@ -6769,8 +6772,8 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  minecraft-data@3.78.0:
-    resolution: {integrity: sha512-Ssks8QD31lsoxqa7LySTqeP9romsfAbfsSGiUHiGMeqfxRi/PtOxGLyKD1BXB8V/tXLztFcbQYqzIhprDkPguw==}
+  minecraft-data@3.80.0:
+    resolution: {integrity: sha512-UYq+ADpS9K1+cqiJiz6tqkht4y4cRYF3qOYanG9eIiHY+VC+qIAC7/UcW6G3adayvj5YBOCurlqaw3E0TMAtHg==}
 
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
@@ -6779,9 +6782,9 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159}
-    version: 1.50.0
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d}
+    version: 1.51.0
     engines: {node: '>=14'}
 
   minecraft-wrap@1.5.1:
@@ -6802,8 +6805,8 @@ packages:
     resolution: {integrity: sha512-wSchhS59hK+oPs8tFg847H82YEvxU7zYKdDKj4e5FVo3CxJ74eXJVT+JcFwEvoqFO7kXiQlhJITxEvO13GOSKA==}
     engines: {node: '>=18'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/36454a8bfac7e69072cd7b59c4be47afeac7e433:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/36454a8bfac7e69072cd7b59c4be47afeac7e433}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/390ce12c1e1f25e440a94ba422e45c874f8bbd2b:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/390ce12c1e1f25e440a94ba422e45c874f8bbd2b}
     version: 4.23.0
     engines: {node: '>=18'}
 
@@ -7515,7 +7518,7 @@ packages:
   prismarine-biome@1.3.0:
     resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==}
     peerDependencies:
-      minecraft-data: 3.78.0
+      minecraft-data: 3.80.0
       prismarine-registry: ^1.1.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05:
@@ -9859,7 +9862,7 @@ snapshots:
       '@babel/core': 7.22.11
       '@babel/helper-compilation-targets': 7.22.10
       '@babel/helper-plugin-utils': 7.22.5
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       lodash.debounce: 4.0.8
       resolve: 1.22.4
     transitivePeerDependencies:
@@ -10586,7 +10589,7 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.22.13
       '@babel/types': 7.23.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -11123,7 +11126,7 @@ snapshots:
       '@jest/schemas': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.2
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
       '@types/yargs': 17.0.28
       chalk: 4.1.2
 
@@ -12829,7 +12832,7 @@ snapshots:
   '@types/body-parser@1.19.3':
     dependencies:
       '@types/connect': 3.4.36
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
 
   '@types/chai-subset@1.3.3':
     dependencies:
@@ -12839,17 +12842,17 @@ snapshots:
 
   '@types/connect@3.4.36':
     dependencies:
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
 
   '@types/cookie@0.4.1': {}
 
   '@types/cors@2.8.15':
     dependencies:
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
 
   '@types/cross-spawn@6.0.3':
     dependencies:
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
 
   '@types/debug@4.1.12':
     dependencies:
@@ -12889,7 +12892,7 @@ snapshots:
 
   '@types/express-serve-static-core@4.17.37':
     dependencies:
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
       '@types/qs': 6.9.8
       '@types/range-parser': 1.2.5
       '@types/send': 0.17.2
@@ -12908,11 +12911,11 @@ snapshots:
   '@types/glob@7.2.0':
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
 
   '@types/graceful-fs@4.1.7':
     dependencies:
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
 
   '@types/http-cache-semantics@4.0.2': {}
 
@@ -12960,9 +12963,13 @@ snapshots:
 
   '@types/node-fetch@2.6.6':
     dependencies:
-      '@types/node': 20.8.0
+      '@types/node': 22.8.1
       form-data: 4.0.0
 
+  '@types/node-rsa@1.1.4':
+    dependencies:
+      '@types/node': 22.8.1
+
   '@types/node@14.18.56':
     optional: true
 
@@ -12977,7 +12984,6 @@ snapshots:
   '@types/node@22.8.1':
     dependencies:
       undici-types: 6.19.8
-    optional: true
 
   '@types/normalize-package-data@2.4.2': {}
 
@@ -13018,7 +13024,7 @@ snapshots:
 
   '@types/resolve@1.17.1':
     dependencies:
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
 
   '@types/sat@0.0.31': {}
 
@@ -13029,13 +13035,13 @@ snapshots:
   '@types/send@0.17.2':
     dependencies:
       '@types/mime': 1.3.3
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
 
   '@types/serve-static@1.15.3':
     dependencies:
       '@types/http-errors': 2.0.2
       '@types/mime': 3.0.2
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
 
   '@types/sinonjs__fake-timers@8.1.1':
     optional: true
@@ -13085,11 +13091,11 @@ snapshots:
 
   '@types/yauzl@2.10.1':
     dependencies:
-      '@types/node': 20.8.0
+      '@types/node': 22.8.1
 
   '@types/yauzl@2.10.3':
     dependencies:
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
     optional: true
 
   '@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4)':
@@ -13145,7 +13151,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.5.4)
       '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4)
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       eslint: 8.50.0
       ts-api-utils: 1.0.3(typescript@5.5.4)
     optionalDependencies:
@@ -13163,7 +13169,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.1.0
       '@typescript-eslint/visitor-keys': 6.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.0
@@ -13177,7 +13183,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.7.3
       '@typescript-eslint/visitor-keys': 6.7.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.0
@@ -13191,7 +13197,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 8.0.0
       '@typescript-eslint/visitor-keys': 8.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -13435,16 +13441,16 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.2.3
-      minecraft-data: 3.78.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+      minecraft-data: 3.80.0
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0)
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.78.0)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.80.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       rambda: 9.2.0
@@ -14918,7 +14924,7 @@ snapshots:
   detect-port@1.5.1:
     dependencies:
       address: 1.2.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -14928,8 +14934,8 @@ snapshots:
 
   diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71:
     dependencies:
-      minecraft-data: 3.78.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0)
+      minecraft-data: 3.80.0
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0)
       prismarine-registry: 1.10.0
       random-seed: 0.3.0
       vec3: 0.1.8
@@ -15133,7 +15139,7 @@ snapshots:
     dependencies:
       '@types/cookie': 0.4.1
       '@types/cors': 2.8.15
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
       accepts: 1.3.8
       base64id: 2.0.0
       cookie: 0.4.2
@@ -16571,7 +16577,7 @@ snapshots:
   https-proxy-agent@4.0.0:
     dependencies:
       agent-base: 5.1.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -16586,7 +16592,7 @@ snapshots:
   https-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -16982,7 +16988,7 @@ snapshots:
     dependencies:
       '@jest/types': 29.6.3
       '@types/graceful-fs': 4.1.7
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -16999,7 +17005,7 @@ snapshots:
   jest-util@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
       chalk: 4.1.2
       ci-info: 3.8.0
       graceful-fs: 4.2.11
@@ -17007,19 +17013,19 @@ snapshots:
 
   jest-worker@26.6.2:
     dependencies:
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
       merge-stream: 2.0.0
       supports-color: 7.2.0
 
   jest-worker@27.5.1:
     dependencies:
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
   jest-worker@29.7.0:
     dependencies:
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
@@ -17660,7 +17666,7 @@ snapshots:
   micromark@4.0.0:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.0
@@ -17731,7 +17737,7 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  minecraft-data@3.78.0: {}
+  minecraft-data@3.80.0: {}
 
   minecraft-folder-path@1.2.0: {}
 
@@ -17742,8 +17748,9 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13):
     dependencies:
+      '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.12
       aes-js: 3.1.2
       buffer-equal: 1.0.1
@@ -17751,7 +17758,7 @@ snapshots:
       endian-toggle: 0.0.0
       lodash.get: 4.4.2
       lodash.merge: 4.6.2
-      minecraft-data: 3.78.0
+      minecraft-data: 3.80.0
       minecraft-folder-path: 1.2.0
       node-fetch: 2.7.0(encoding@0.1.13)
       node-rsa: 0.4.2
@@ -17800,7 +17807,7 @@ snapshots:
 
   mineflayer-pathfinder@2.4.4:
     dependencies:
-      minecraft-data: 3.78.0
+      minecraft-data: 3.80.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
@@ -17810,12 +17817,12 @@ snapshots:
 
   mineflayer@4.23.0(encoding@0.1.13):
     dependencies:
-      minecraft-data: 3.78.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.78.0)(prismarine-registry@1.10.0)
+      minecraft-data: 3.80.0
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+      prismarine-biome: 1.3.0(minecraft-data@3.80.0)(prismarine-registry@1.10.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-chat: 1.10.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0)
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
@@ -17831,14 +17838,14 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/36454a8bfac7e69072cd7b59c4be47afeac7e433(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/390ce12c1e1f25e440a94ba422e45c874f8bbd2b(encoding@0.1.13):
     dependencies:
-      minecraft-data: 3.78.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/590dc33fed2100e77ef58e7db716dfc45eb61159(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.78.0)(prismarine-registry@1.10.0)
+      minecraft-data: 3.80.0
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+      prismarine-biome: 1.3.0(minecraft-data@3.80.0)(prismarine-registry@1.10.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-chat: 1.10.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0)
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
@@ -18634,20 +18641,20 @@ snapshots:
       - encoding
       - supports-color
 
-  prismarine-biome@1.3.0(minecraft-data@3.78.0)(prismarine-registry@1.10.0):
+  prismarine-biome@1.3.0(minecraft-data@3.80.0)(prismarine-registry@1.10.0):
     dependencies:
-      minecraft-data: 3.78.0
+      minecraft-data: 3.80.0
       prismarine-registry: 1.10.0
 
-  prismarine-biome@1.3.0(minecraft-data@3.78.0)(prismarine-registry@1.7.0):
+  prismarine-biome@1.3.0(minecraft-data@3.80.0)(prismarine-registry@1.7.0):
     dependencies:
-      minecraft-data: 3.78.0
+      minecraft-data: 3.80.0
       prismarine-registry: 1.7.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05:
     dependencies:
-      minecraft-data: 3.78.0
-      prismarine-biome: 1.3.0(minecraft-data@3.78.0)(prismarine-registry@1.7.0)
+      minecraft-data: 3.80.0
+      prismarine-biome: 1.3.0(minecraft-data@3.80.0)(prismarine-registry@1.7.0)
       prismarine-chat: 1.10.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
@@ -18659,9 +18666,9 @@ snapshots:
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.10.0
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0):
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0):
     dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.78.0)(prismarine-registry@1.10.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.80.0)(prismarine-registry@1.10.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.10.0
@@ -18694,14 +18701,14 @@ snapshots:
 
   prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     dependencies:
-      minecraft-data: 3.78.0
+      minecraft-data: 3.80.0
       prismarine-nbt: 2.5.0
       vec3: 0.1.8
 
-  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.78.0):
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.80.0):
     dependencies:
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.78.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0)
       prismarine-nbt: 2.5.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       uint4: 0.1.2
@@ -18723,17 +18730,17 @@ snapshots:
 
   prismarine-registry@1.10.0:
     dependencies:
-      minecraft-data: 3.78.0
+      minecraft-data: 3.80.0
       prismarine-nbt: 2.5.0
 
   prismarine-registry@1.7.0:
     dependencies:
-      minecraft-data: 3.78.0
+      minecraft-data: 3.80.0
       prismarine-nbt: 2.5.0
 
   prismarine-schematic@1.2.3:
     dependencies:
-      minecraft-data: 3.78.0
+      minecraft-data: 3.80.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-nbt: 2.2.1
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
@@ -20586,8 +20593,7 @@ snapshots:
 
   undici-types@5.26.5: {}
 
-  undici-types@6.19.8:
-    optional: true
+  undici-types@6.19.8: {}
 
   undici@5.25.4:
     dependencies:

From 689bebde3d3a928dc4a580a0560b8d1868e83d89 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 12 Dec 2024 07:45:20 +0300
Subject: [PATCH 076/753] cleanup eyeHeight code

---
 prismarine-viewer/viewer/lib/viewer.ts | 4 +++-
 src/index.ts                           | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/viewer.ts b/prismarine-viewer/viewer/lib/viewer.ts
index 2671ba07..73f29fb2 100644
--- a/prismarine-viewer/viewer/lib/viewer.ts
+++ b/prismarine-viewer/viewer/lib/viewer.ts
@@ -26,6 +26,8 @@ export class Viewer {
   renderingUntilNoUpdates = false
   processEntityOverrides = (e, overrides) => overrides
 
+  getMineflayerBot (): void | Record<string, any> {} // to be overridden
+
   get camera () {
     return this.world.camera
   }
@@ -158,7 +160,7 @@ export class Viewer {
 
   setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number, roll = 0) {
     const cam = this.cameraObjectOverride || this.camera
-    let yOffset = this.playerHeight
+    let yOffset = this.getMineflayerBot()?.entity?.eyeHeight ?? this.playerHeight
     if (this.isSneaking) yOffset -= 0.3
 
     this.world.camera = cam as THREE.PerspectiveCamera
diff --git a/src/index.ts b/src/index.ts
index d660ec50..93bbe6b9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -157,6 +157,7 @@ if (isIphone) {
 // Create viewer
 const viewer: import('prismarine-viewer/viewer/lib/viewer').Viewer = new Viewer(renderer)
 window.viewer = viewer
+viewer.getMineflayerBot = () => bot
 // todo unify
 viewer.entities.getItemUv = (idOrName: number | string) => {
   try {
@@ -420,7 +421,7 @@ async function connect (connectOptions: ConnectOptions) {
         }
       }
       viewer.world.blockstatesModels = await import('mc-assets/dist/blockStatesModels.json')
-      viewer.setVersion(version, options.useVersionsTextures === 'latest' ? version : options.useVersionsTextures)
+      void viewer.setVersion(version, options.useVersionsTextures === 'latest' ? version : options.useVersionsTextures)
     }
 
     const downloadVersion = connectOptions.botVersion || (singleplayer ? serverOptions.version : undefined)

From a4c86d707baf74b34345f16b1475fad63595d3ec Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 12 Dec 2024 09:18:54 +0300
Subject: [PATCH 077/753] fix: update changed blocks quicker in the world by
 using a dedicated mesher thread reserved for blocks updates only

---
 prismarine-viewer/viewer/lib/mesher/mesher.ts |  2 +-
 .../viewer/lib/worldrendererCommon.ts         | 52 +++++++---
 .../viewer/lib/worldrendererThree.ts          | 55 +++++++++--
 src/optionsGuiScheme.tsx                      |  1 -
 src/react/DebugOverlay.tsx                    | 15 +--
 src/worldInteractions.ts                      | 94 ++++++-------------
 6 files changed, 121 insertions(+), 98 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/mesher/mesher.ts b/prismarine-viewer/viewer/lib/mesher/mesher.ts
index b38f0427..7c120abc 100644
--- a/prismarine-viewer/viewer/lib/mesher/mesher.ts
+++ b/prismarine-viewer/viewer/lib/mesher/mesher.ts
@@ -159,7 +159,7 @@ setInterval(() => {
       const geometry = getSectionGeometry(x, y, z, world)
       const transferable = [geometry.positions?.buffer, geometry.normals?.buffer, geometry.colors?.buffer, geometry.uvs?.buffer].filter(Boolean)
       //@ts-expect-error
-      postMessage({ type: 'geometry', key, geometry }, transferable)
+      postMessage({ type: 'geometry', key, geometry, workerIndex }, transferable)
       processTime = performance.now() - start
     } else {
       // console.info('[mesher] Missing section', x, y, z)
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
index 995e7d29..4f4545a7 100644
--- a/prismarine-viewer/viewer/lib/worldrendererCommon.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -11,6 +11,7 @@ import itemsAtlasLatest from 'mc-assets/dist/itemsAtlasLatest.png'
 import itemsAtlasLegacy from 'mc-assets/dist/itemsAtlasLegacy.png'
 import { AtlasParser } from 'mc-assets'
 import TypedEmitter from 'typed-emitter'
+import { LineMaterial } from 'three-stdlib'
 import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
 import { toMajorVersion } from '../../../src/utils'
 import { buildCleanupDecorator } from './cleanupDecorator'
@@ -18,6 +19,7 @@ import { defaultMesherConfig, HighestBlockInfo, MesherGeometryOutput } from './m
 import { chunkPos } from './simpleUtils'
 import { HandItemBlock } from './holdingBlock'
 import { updateStatText } from './ui/newStats'
+import { WorldRendererThree } from './worldrendererThree'
 
 function mod (x, n) {
   return ((x % n) + n) % n
@@ -38,8 +40,14 @@ type CustomTexturesData = {
 }
 
 export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any> {
+  // todo
+  @worldCleanup()
+  threejsCursorLineMaterial: LineMaterial
+  @worldCleanup()
+  cursorBlock = null as Vec3 | null
   isPlayground = false
   displayStats = true
+  @worldCleanup()
   worldConfig = { minY: 0, worldHeight: 256 }
   // todo need to cleanup
   material = new THREE.MeshLambertMaterial({ vertexColors: true, transparent: true, alphaTest: 0.1 })
@@ -72,9 +80,13 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   @worldCleanup()
   currentTextureImage = undefined as any
   workers: any[] = []
+  @worldCleanup()
   viewerPosition?: Vec3
   lastCamUpdate = 0
   droppedFpsPercentage = 0
+  @worldCleanup()
+  initialChunkLoadWasStartedIn: number | undefined
+  @worldCleanup()
   initialChunksLoad = true
   enableChunksLoadDelay = false
   texturesVersion?: string
@@ -102,6 +114,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   workersProcessAverageTime = 0
   workersProcessAverageTimeCount = 0
   maxWorkersProcessTime = 0
+  geometryReceiveCount = {}
+  allLoadedIn: undefined | number
+  rendererDevice = '...'
+
   edgeChunks = {} as Record<string, boolean>
   lastAddChunk = null as null | {
     timeout: any
@@ -129,7 +145,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   initWorkers (numWorkers = this.config.numWorkers) {
     // init workers
-    for (let i = 0; i < numWorkers; i++) {
+    for (let i = 0; i < numWorkers + 1; i++) {
       // Node environment needs an absolute path, but browser needs the url of the file
       const workerName = 'mesher.js'
       // eslint-disable-next-line node/no-path-concat
@@ -140,6 +156,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         if (!this.active) return
         this.handleWorkerMessage(data)
         if (data.type === 'geometry') {
+          this.geometryReceiveCount[data.workerIndex] ??= 0
+          this.geometryReceiveCount[data.workerIndex]++
           const geometry = data.geometry as MesherGeometryOutput
           for (const key in geometry.highestBlocks) {
             const highest = geometry.highestBlocks[key]
@@ -336,16 +354,17 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     return Math.floor(Math.max(this.worldConfig.minY, this.mesherConfig.clipWorldBelowY ?? -Infinity) / 16) * 16
   }
 
-  updateDownloadedChunksText () {
-    updateStatText('downloaded-chunks', `${Object.keys(this.loadedChunks).length}/${this.chunksLength} chunks D`)
+  updateChunksStatsText () {
+    updateStatText('downloaded-chunks', `${Object.keys(this.loadedChunks).length}/${this.chunksLength} chunks D (${this.workers.length}:${this.workersProcessAverageTime.toFixed(0)}ms/${this.allLoadedIn?.toFixed(1) ?? '-'}s)`)
   }
 
   addColumn (x: number, z: number, chunk: any, isLightUpdate: boolean) {
     if (!this.active) return
     if (this.workers.length === 0) throw new Error('workers not initialized yet')
     this.initialChunksLoad = false
+    this.initialChunkLoadWasStartedIn ??= Date.now()
     this.loadedChunks[`${x},${z}`] = true
-    this.updateDownloadedChunksText()
+    this.updateChunksStatsText()
     for (const worker of this.workers) {
       // todo optimize
       worker.postMessage({ type: 'chunk', x, z, chunk })
@@ -394,21 +413,26 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     for (const worker of this.workers) {
       worker.postMessage({ type: 'blockUpdate', pos, stateId })
     }
-    this.setSectionDirty(pos)
+    this.setSectionDirty(pos, true, true)
     if (this.neighborChunkUpdates) {
-      if ((pos.x & 15) === 0) this.setSectionDirty(pos.offset(-16, 0, 0))
-      if ((pos.x & 15) === 15) this.setSectionDirty(pos.offset(16, 0, 0))
-      if ((pos.y & 15) === 0) this.setSectionDirty(pos.offset(0, -16, 0))
-      if ((pos.y & 15) === 15) this.setSectionDirty(pos.offset(0, 16, 0))
-      if ((pos.z & 15) === 0) this.setSectionDirty(pos.offset(0, 0, -16))
-      if ((pos.z & 15) === 15) this.setSectionDirty(pos.offset(0, 0, 16))
+      if ((pos.x & 15) === 0) this.setSectionDirty(pos.offset(-16, 0, 0), true, true)
+      if ((pos.x & 15) === 15) this.setSectionDirty(pos.offset(16, 0, 0), true, true)
+      if ((pos.y & 15) === 0) this.setSectionDirty(pos.offset(0, -16, 0), true, true)
+      if ((pos.y & 15) === 15) this.setSectionDirty(pos.offset(0, 16, 0), true, true)
+      if ((pos.z & 15) === 0) this.setSectionDirty(pos.offset(0, 0, -16), true, true)
+      if ((pos.z & 15) === 15) this.setSectionDirty(pos.offset(0, 0, 16), true, true)
     }
   }
 
   queueAwaited = false
   messagesQueue = {} as { [workerIndex: string]: any[] }
 
-  setSectionDirty (pos: Vec3, value = true) { // value false is used for unloading chunks
+  getWorkerNumber (pos: Vec3) {
+    const hash = mod(Math.floor(pos.x / 16) + Math.floor(pos.y / 16) + Math.floor(pos.z / 16), this.workers.length - 1)
+    return hash + 1
+  }
+
+  setSectionDirty (pos: Vec3, value = true, useChangeWorker = false) { // value false is used for unloading chunks
     if (this.viewDistance === -1) throw new Error('viewDistance not set')
     this.allChunksFinished = false
     const distance = this.getDistance(pos)
@@ -419,7 +443,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     // Dispatch sections to workers based on position
     // This guarantees uniformity accross workers and that a given section
     // is always dispatched to the same worker
-    const hash = mod(Math.floor(pos.x / 16) + Math.floor(pos.y / 16) + Math.floor(pos.z / 16), this.workers.length)
+    const hash = useChangeWorker ? 0 : this.getWorkerNumber(pos)
     this.sectionsWaiting.set(key, (this.sectionsWaiting.get(key) ?? 0) + 1)
     this.messagesQueue[hash] ??= []
     this.messagesQueue[hash].push({
@@ -487,4 +511,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   destroy () {
     console.warn('world destroy is not implemented')
   }
+
+  abstract setHighlightCursorBlock (block: typeof this.cursorBlock, shapePositions?: Array<{ position; width; height; depth }>): void
 }
diff --git a/prismarine-viewer/viewer/lib/worldrendererThree.ts b/prismarine-viewer/viewer/lib/worldrendererThree.ts
index bf0999a4..8671bfaf 100644
--- a/prismarine-viewer/viewer/lib/worldrendererThree.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererThree.ts
@@ -3,7 +3,7 @@ import { Vec3 } from 'vec3'
 import nbt from 'prismarine-nbt'
 import PrismarineChatLoader from 'prismarine-chat'
 import * as tweenJs from '@tweenjs/tween.js'
-import { BloomPass, RenderPass, UnrealBloomPass, EffectComposer, WaterPass, GlitchPass } from 'three-stdlib'
+import { BloomPass, RenderPass, UnrealBloomPass, EffectComposer, WaterPass, GlitchPass, LineSegmentsGeometry, Wireframe, LineMaterial } from 'three-stdlib'
 import worldBlockProvider from 'mc-assets/dist/worldBlockProvider'
 import { renderSign } from '../sign-renderer'
 import { chunkPos, sectionPos } from './simpleUtils'
@@ -14,6 +14,7 @@ import { addNewStat } from './ui/newStats'
 import { MesherGeometryOutput } from './mesher/shared'
 
 export class WorldRendererThree extends WorldRendererCommon {
+  interactionLines: null | { blockPos; mesh } = null
   outputFormat = 'threeJs' as const
   blockEntities = {}
   sectionObjects: Record<string, THREE.Object3D> = {}
@@ -22,6 +23,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   starField: StarField
   cameraSectionPos: Vec3 = new Vec3(0, 0, 0)
   holdingBlock: HoldingBlock
+  rendererDevice = '...'
 
   get tilesRendered () {
     return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).tilesCount, 0)
@@ -33,6 +35,7 @@ export class WorldRendererThree extends WorldRendererCommon {
 
   constructor (public scene: THREE.Scene, public renderer: THREE.WebGLRenderer, public config: WorldRendererConfig) {
     super(config)
+    this.rendererDevice = String(WorldRendererThree.getRendererInfo(this.renderer))
     this.starField = new StarField(scene)
     this.holdingBlock = new HoldingBlock(this.scene)
 
@@ -54,10 +57,6 @@ export class WorldRendererThree extends WorldRendererCommon {
     void this.holdingBlock.initHandObject(this.material, this.blockstatesModels, this.blocksAtlases, item)
   }
 
-  changeBackgroundColor (color: [number, number, number]): void {
-    this.scene.background = new THREE.Color(color[0], color[1], color[2])
-  }
-
   changeHandSwingingState (isAnimationPlaying: boolean) {
     if (isAnimationPlaying) {
       this.holdingBlock.startSwing()
@@ -66,6 +65,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     }
   }
 
+  changeBackgroundColor (color: [number, number, number]): void {
+    this.scene.background = new THREE.Color(color[0], color[1], color[2])
+  }
+
   timeUpdated (newTime: number): void {
     const nightTime = 13_500
     const morningStart = 23_000
@@ -365,9 +368,47 @@ export class WorldRendererThree extends WorldRendererCommon {
     }
   }
 
-  setSectionDirty (pos, value = true) {
+  setSectionDirty (...args: Parameters<WorldRendererCommon['setSectionDirty']>) {
+    const [pos] = args
     this.cleanChunkTextures(pos.x, pos.z) // todo don't do this!
-    super.setSectionDirty(pos, value)
+    super.setSectionDirty(...args)
+  }
+
+  setHighlightCursorBlock (blockPos: typeof this.cursorBlock, shapePositions?: Array<{ position: any; width: any; height: any; depth: any; }>): void {
+    this.cursorBlock = blockPos
+    if (blockPos && this.interactionLines && blockPos.equals(this.interactionLines.blockPos)) {
+      return
+    }
+    if (this.interactionLines !== null) {
+      this.scene.remove(this.interactionLines.mesh)
+      this.interactionLines = null
+    }
+    if (blockPos === null) {
+      return
+    }
+
+    const group = new THREE.Group()
+    for (const { position, width, height, depth } of shapePositions ?? []) {
+      const scale = [1.0001 * width, 1.0001 * height, 1.0001 * depth] as const
+      const geometry = new THREE.BoxGeometry(...scale)
+      const lines = new LineSegmentsGeometry().fromEdgesGeometry(new THREE.EdgesGeometry(geometry))
+      const wireframe = new Wireframe(lines, this.threejsCursorLineMaterial)
+      const pos = blockPos.plus(position)
+      wireframe.position.set(pos.x, pos.y, pos.z)
+      wireframe.computeLineDistances()
+      group.add(wireframe)
+    }
+    this.scene.add(group)
+    this.interactionLines = { blockPos, mesh: group }
+  }
+
+  static getRendererInfo (renderer: THREE.WebGLRenderer) {
+    try {
+      const gl = renderer.getContext()
+      return `${gl.getParameter(gl.getExtension('WEBGL_debug_renderer_info')!.UNMASKED_RENDERER_WEBGL)} powered by three.js r{THREE.REVISION}`
+    } catch (err) {
+      console.warn('Failed to get renderer info', err)
+    }
   }
 }
 
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 94d6cdf8..c6a979c1 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -89,7 +89,6 @@ export const guiOptionsScheme: {
         tooltip: 'Additional distance to keep the chunks loading before unloading them by marking them as too far',
       },
       handDisplay: {},
-      neighborChunkUpdates: {},
       renderDebug: {
         values: [
           'advanced',
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index 9079eed9..54d8cb40 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -1,8 +1,8 @@
 import { useEffect, useRef, useMemo, useState } from 'react'
 import * as THREE from 'three'
+import type { Block } from 'prismarine-block'
 import { getFixedFilesize } from '../downloadAndOpenFile'
 import { options } from '../optionsStorage'
-import worldInteractions from '../worldInteractions'
 import styles from './DebugOverlay.module.css'
 
 export default () => {
@@ -35,10 +35,10 @@ export default () => {
   const [day, setDay] = useState(0)
   const [entitiesCount, setEntitiesCount] = useState(0)
   const [dimension, setDimension] = useState('')
-  const [cursorBlock, setCursorBlock] = useState<typeof worldInteractions.cursorBlock>(null)
-  const [rendererDevice, setRendererDevice] = useState('')
+  const [cursorBlock, setCursorBlock] = useState<Block | null>(null)
   const minecraftYaw = useRef(0)
   const minecraftQuad = useRef(0)
+  const { rendererDevice } = viewer.world
 
   const quadsDescription = [
     'north (towards negative Z)',
@@ -118,13 +118,6 @@ export default () => {
       managePackets('sent', name, data)
     })
 
-    try {
-      const gl = window.renderer.getContext()
-      setRendererDevice(gl.getParameter(gl.getExtension('WEBGL_debug_renderer_info')!.UNMASKED_RENDERER_WEBGL))
-    } catch (err) {
-      console.warn(err)
-    }
-
     return () => {
       document.removeEventListener('keydown', handleF3)
       clearInterval(packetsUpdateInterval)
@@ -159,7 +152,7 @@ export default () => {
     </div>
 
     <div className={styles['debug-right-side']}>
-      <p>Renderer: {rendererDevice} powered by three.js r{THREE.REVISION}</p>
+      <p>Renderer: {rendererDevice}</p>
       <div className={styles.empty} />
       {cursorBlock ? (<>
         <p>{cursorBlock.name}</p>
diff --git a/src/worldInteractions.ts b/src/worldInteractions.ts
index dcd5dc3d..d6674ce3 100644
--- a/src/worldInteractions.ts
+++ b/src/worldInteractions.ts
@@ -4,7 +4,7 @@ import * as THREE from 'three'
 
 // wouldn't better to create atlas instead?
 import { Vec3 } from 'vec3'
-import { LineMaterial, Wireframe, LineSegmentsGeometry } from 'three-stdlib'
+import { LineMaterial } from 'three-stdlib'
 import { Entity } from 'prismarine-entity'
 import destroyStage0 from '../assets/destroy_stage_0.png'
 import destroyStage1 from '../assets/destroy_stage_1.png'
@@ -34,7 +34,6 @@ function getViewDirection (pitch, yaw) {
 
 class WorldInteraction {
   ready = false
-  interactionLines: null | { blockPos; mesh } = null
   prevBreakState
   currentDigTime
   prevOnGround
@@ -44,11 +43,9 @@ class WorldInteraction {
   lastButtons = [false, false, false]
   breakStartTime: number | undefined = 0
   lastDugBlock: Vec3 | null = null
-  cursorBlock: import('prismarine-block').Block | null = null
   blockBreakMesh: THREE.Mesh
   breakTextures: THREE.Texture[]
   lastDigged: number
-  lineMaterial: LineMaterial
   debugDigStatus: string
 
   oneTimeInit () {
@@ -109,10 +106,10 @@ class WorldInteraction {
     })
 
     beforeRenderFrame.push(() => {
-      if (this.lineMaterial) {
+      if (viewer.world.threejsCursorLineMaterial) {
         const { renderer } = viewer
-        this.lineMaterial.resolution.set(renderer.domElement.width, renderer.domElement.height)
-        this.lineMaterial.dashOffset = performance.now() / 750
+        viewer.world.threejsCursorLineMaterial.resolution.set(renderer.domElement.width, renderer.domElement.height)
+        viewer.world.threejsCursorLineMaterial.dashOffset = performance.now() / 750
       }
     })
   }
@@ -133,7 +130,7 @@ class WorldInteraction {
       this.debugDigStatus = 'done'
     })
     bot.on('diggingAborted', (block) => {
-      if (!this.cursorBlock?.position.equals(block.position)) return
+      if (!viewer.world.cursorBlock?.equals(block.position)) return
       this.debugDigStatus = 'aborted'
       // if (this.lastDugBlock)
       this.breakStartTime = undefined
@@ -151,7 +148,7 @@ class WorldInteraction {
     const upLineMaterial = () => {
       const inCreative = bot.game.gameMode === 'creative'
       const pixelRatio = viewer.renderer.getPixelRatio()
-      this.lineMaterial = new LineMaterial({
+      viewer.world.threejsCursorLineMaterial = new LineMaterial({
         color: inCreative ? 0x40_80_ff : 0x00_00_00,
         linewidth: Math.max(pixelRatio * 0.7, 1) * 2,
         // dashed: true,
@@ -192,34 +189,6 @@ class WorldInteraction {
     }
   }
 
-  updateBlockInteractionLines (blockPos: Vec3 | null, shapePositions?: Array<{ position; width; height; depth }>) {
-    assertDefined(viewer)
-    if (blockPos && this.interactionLines && blockPos.equals(this.interactionLines.blockPos)) {
-      return
-    }
-    if (this.interactionLines !== null) {
-      viewer.scene.remove(this.interactionLines.mesh)
-      this.interactionLines = null
-    }
-    if (blockPos === null) {
-      return
-    }
-
-    const group = new THREE.Group()
-    for (const { position, width, height, depth } of shapePositions ?? []) {
-      const scale = [1.0001 * width, 1.0001 * height, 1.0001 * depth] as const
-      const geometry = new THREE.BoxGeometry(...scale)
-      const lines = new LineSegmentsGeometry().fromEdgesGeometry(new THREE.EdgesGeometry(geometry))
-      const wireframe = new Wireframe(lines, this.lineMaterial)
-      const pos = blockPos.plus(position)
-      wireframe.position.set(pos.x, pos.y, pos.z)
-      wireframe.computeLineDistances()
-      group.add(wireframe)
-    }
-    viewer.scene.add(group)
-    this.interactionLines = { blockPos, mesh: group }
-  }
-
   // todo this shouldnt be done in the render loop, migrate the code to dom events to avoid delays on lags
   update () {
     const inSpectator = bot.game.gameMode === 'spectator'
@@ -232,10 +201,7 @@ class WorldInteraction {
     let cursorBlockDiggable = cursorBlock
     if (cursorBlock && !bot.canDigBlock(cursorBlock) && bot.game.gameMode !== 'creative') cursorBlockDiggable = null
 
-    let cursorChanged = !cursorBlock !== !this.cursorBlock
-    if (cursorBlock && this.cursorBlock) {
-      cursorChanged = !cursorBlock.position.equals(this.cursorBlock.position)
-    }
+    const cursorChanged = cursorBlock && viewer.world.cursorBlock ? !viewer.world.cursorBlock.equals(cursorBlock.position) : viewer.world.cursorBlock !== cursorBlock
 
     // Place / interact / activate
     if (this.buttons[2] && this.lastBlockPlaced >= 4) {
@@ -363,30 +329,24 @@ class WorldInteraction {
     this.prevOnGround = onGround
 
     // Show cursor
+    const allShapes = [...cursorBlock?.shapes ?? [], ...cursorBlock?.['interactionShapes'] ?? []]
     if (cursorBlock) {
-      const allShapes = [...cursorBlock.shapes, ...cursorBlock['interactionShapes'] ?? []]
-      this.updateBlockInteractionLines(cursorBlock.position, allShapes.map(shape => {
-        return getDataFromShape(shape)
-      }))
-      {
-        // union of all values
-        const breakShape = allShapes.reduce((acc, cur) => {
-          return [
-            Math.min(acc[0], cur[0]),
-            Math.min(acc[1], cur[1]),
-            Math.min(acc[2], cur[2]),
-            Math.max(acc[3], cur[3]),
-            Math.max(acc[4], cur[4]),
-            Math.max(acc[5], cur[5])
-          ]
-        })
-        const { position, width, height, depth } = getDataFromShape(breakShape)
-        this.blockBreakMesh.scale.set(width * 1.001, height * 1.001, depth * 1.001)
-        position.add(cursorBlock.position)
-        this.blockBreakMesh.position.set(position.x, position.y, position.z)
-      }
-    } else {
-      this.updateBlockInteractionLines(null)
+      // BREAK MESH
+      // union of all values
+      const breakShape = allShapes.reduce((acc, cur) => {
+        return [
+          Math.min(acc[0], cur[0]),
+          Math.min(acc[1], cur[1]),
+          Math.min(acc[2], cur[2]),
+          Math.max(acc[3], cur[3]),
+          Math.max(acc[4], cur[4]),
+          Math.max(acc[5], cur[5])
+        ]
+      })
+      const { position, width, height, depth } = getDataFromShape(breakShape)
+      this.blockBreakMesh.scale.set(width * 1.001, height * 1.001, depth * 1.001)
+      position.add(cursorBlock.position)
+      this.blockBreakMesh.position.set(position.x, position.y, position.z)
     }
 
     // Show break animation
@@ -411,7 +371,11 @@ class WorldInteraction {
     }
 
     // Update state
-    this.cursorBlock = cursorBlock
+    if (cursorChanged) {
+      viewer.world.setHighlightCursorBlock(cursorBlock?.position ?? null, allShapes.map(shape => {
+        return getDataFromShape(shape)
+      }))
+    }
     this.lastButtons[0] = this.buttons[0]
     this.lastButtons[1] = this.buttons[1]
     this.lastButtons[2] = this.buttons[2]

From 0624e018dd059b362f103c8bc5936380b572da74 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 12 Dec 2024 14:17:25 +0300
Subject: [PATCH 078/753] fix critical but rare bug in new change worker
 implementation

---
 .../viewer/lib/worldrendererCommon.ts           | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
index 4f4545a7..71c094b4 100644
--- a/prismarine-viewer/viewer/lib/worldrendererCommon.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -74,6 +74,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     dirty (pos: Vec3, value: boolean): void
     update (/* pos: Vec3, value: boolean */): void
     textureDownloaded (): void
+    itemsTextureDownloaded (): void
     chunkFinished (key: string): void
   }>
   customTexturesDataUrl = undefined as string | undefined
@@ -410,17 +411,19 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   setBlockStateId (pos: Vec3, stateId: number) {
+    const key = `${Math.floor(pos.x / 16) * 16},${Math.floor(pos.y / 16) * 16},${Math.floor(pos.z / 16) * 16}`
+    const useChangeWorker = !this.sectionsWaiting[key]
     for (const worker of this.workers) {
       worker.postMessage({ type: 'blockUpdate', pos, stateId })
     }
-    this.setSectionDirty(pos, true, true)
+    this.setSectionDirty(pos, true, useChangeWorker)
     if (this.neighborChunkUpdates) {
-      if ((pos.x & 15) === 0) this.setSectionDirty(pos.offset(-16, 0, 0), true, true)
-      if ((pos.x & 15) === 15) this.setSectionDirty(pos.offset(16, 0, 0), true, true)
-      if ((pos.y & 15) === 0) this.setSectionDirty(pos.offset(0, -16, 0), true, true)
-      if ((pos.y & 15) === 15) this.setSectionDirty(pos.offset(0, 16, 0), true, true)
-      if ((pos.z & 15) === 0) this.setSectionDirty(pos.offset(0, 0, -16), true, true)
-      if ((pos.z & 15) === 15) this.setSectionDirty(pos.offset(0, 0, 16), true, true)
+      if ((pos.x & 15) === 0) this.setSectionDirty(pos.offset(-16, 0, 0), true, useChangeWorker)
+      if ((pos.x & 15) === 15) this.setSectionDirty(pos.offset(16, 0, 0), true, useChangeWorker)
+      if ((pos.y & 15) === 0) this.setSectionDirty(pos.offset(0, -16, 0), true, useChangeWorker)
+      if ((pos.y & 15) === 15) this.setSectionDirty(pos.offset(0, 16, 0), true, useChangeWorker)
+      if ((pos.z & 15) === 0) this.setSectionDirty(pos.offset(0, 0, -16), true, useChangeWorker)
+      if ((pos.z & 15) === 15) this.setSectionDirty(pos.offset(0, 0, 16), true, useChangeWorker)
     }
   }
 

From 13a55b4414e80b8bd444f9747337b31c7b34afed Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 12 Dec 2024 14:46:45 +0300
Subject: [PATCH 079/753] update all latest models! fix test

---
 package.json                                           |  2 +-
 pnpm-lock.yaml                                         | 10 +++++-----
 prismarine-viewer/viewer/lib/mesher/models.ts          |  4 ++--
 .../viewer/lib/mesher/test/mesherTester.ts             |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 9f452807..4ed5a449 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.12",
+    "mc-assets": "^0.2.23",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5a9cd7cd..7a89eb6d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -346,8 +346,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.12
-        version: 0.2.12
+        specifier: ^0.2.23
+        version: 0.2.23
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -6582,8 +6582,8 @@ packages:
     peerDependencies:
       react: ^18.2.0
 
-  mc-assets@0.2.12:
-    resolution: {integrity: sha512-ZbiodI0vgcwGT0M3AGc+0N2h7JsnrfjzhlA5AzpSQfkGbNp3wp/VeFmI4/lGm0JPJi9+LgXGDUuspRQzQwhobg==}
+  mc-assets@0.2.23:
+    resolution: {integrity: sha512-sLbPhsSOYdW8nYllIyPZbVPnLu7V3bZTgIO4mI4nlG525q17NIbUNEjItHKtdi60u0vI6qLgHKjf0CoNRqa/Nw==}
     engines: {node: '>=18.0.0'}
 
   md5-file@4.0.0:
@@ -17453,7 +17453,7 @@ snapshots:
     dependencies:
       react: 18.2.0
 
-  mc-assets@0.2.12: {}
+  mc-assets@0.2.23: {}
 
   md5-file@4.0.0: {}
 
diff --git a/prismarine-viewer/viewer/lib/mesher/models.ts b/prismarine-viewer/viewer/lib/mesher/models.ts
index 954f4354..51a00a44 100644
--- a/prismarine-viewer/viewer/lib/mesher/models.ts
+++ b/prismarine-viewer/viewer/lib/mesher/models.ts
@@ -619,8 +619,8 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
   return attr
 }
 
-export const setBlockStatesData = (blockstatesModels, blocksAtlas: any, _needTiles = false, useUnknownBlockModel = true) => {
-  blockProvider = worldBlockProvider(blockstatesModels, blocksAtlas, 'latest')
+export const setBlockStatesData = (blockstatesModels, blocksAtlas: any, _needTiles = false, useUnknownBlockModel = true, version = 'latest') => {
+  blockProvider = worldBlockProvider(blockstatesModels, blocksAtlas, version)
   globalThis.blockProvider = blockProvider
   if (useUnknownBlockModel) {
     unknownBlockModel = blockProvider.getAllResolvedModels0_1({ name: 'unknown', properties: {} })
diff --git a/prismarine-viewer/viewer/lib/mesher/test/mesherTester.ts b/prismarine-viewer/viewer/lib/mesher/test/mesherTester.ts
index ef91b191..e75d803d 100644
--- a/prismarine-viewer/viewer/lib/mesher/test/mesherTester.ts
+++ b/prismarine-viewer/viewer/lib/mesher/test/mesherTester.ts
@@ -33,7 +33,7 @@ export const setup = (version, initialBlocks: Array<[number[], string]>) => {
     }
   }
 
-  setBlockStatesData(blockStatesModels, blocksAtlasesJson, true, false)
+  setBlockStatesData(blockStatesModels, blocksAtlasesJson, true, false, version)
   const reload = () => {
     mesherWorld.removeColumn(0, 0)
     mesherWorld.addColumn(0, 0, chunk1.toJson())

From c7830940685e6138655559c66a3db8df3aff1822 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 13 Dec 2024 20:56:20 +0300
Subject: [PATCH 080/753] suppress test error

---
 prismarine-viewer/viewer/lib/mesher/test/tests.test.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts b/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
index 4e322bcf..78374b6b 100644
--- a/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
+++ b/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
@@ -43,11 +43,14 @@ test('Known blocks are not rendered', () => {
       }
     }
   }
+  console.log('Checking blocks of version', lastVersion)
   console.log('Average time', time / times)
   // should be fixed, but to avoid regressions & for visibility
+  // TODO resolve creaking_heart issue (1.21.3)
   expect(missingBlocks).toMatchInlineSnapshot(`
     {
       "bubble_column": true,
+      "creaking_heart": true,
       "end_gateway": true,
       "end_portal": true,
       "structure_void": true,

From 4d411fe561282541a20cf7148418b951290d72c4 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 13 Dec 2024 21:04:45 +0300
Subject: [PATCH 081/753] feat: true hand display behind the setting (#217)

---
 prismarine-viewer/viewer/lib/hand.ts          |  96 ++++++
 prismarine-viewer/viewer/lib/holdingBlock.ts  | 297 +++++++++++++++---
 prismarine-viewer/viewer/lib/viewer.ts        |  15 +-
 .../viewer/lib/worldDataEmitter.ts            |  40 ++-
 .../viewer/lib/worldrendererCommon.ts         |   4 +-
 .../viewer/lib/worldrendererThree.ts          |  33 +-
 src/devtools.ts                               |   2 +-
 src/flyingSquidUtils.ts                       |   2 +
 src/optionsStorage.ts                         |   1 +
 src/topRightStats.ts                          |  41 ++-
 src/worldInteractions.ts                      |   8 +-
 11 files changed, 446 insertions(+), 93 deletions(-)
 create mode 100644 prismarine-viewer/viewer/lib/hand.ts

diff --git a/prismarine-viewer/viewer/lib/hand.ts b/prismarine-viewer/viewer/lib/hand.ts
new file mode 100644
index 00000000..6c9aacc5
--- /dev/null
+++ b/prismarine-viewer/viewer/lib/hand.ts
@@ -0,0 +1,96 @@
+import * as THREE from 'three'
+import { loadSkinToCanvas } from 'skinview-utils'
+import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
+
+let steveTexture: THREE.Texture
+export const getMyHand = async (image?: string) => {
+  let newMap: THREE.Texture
+  if (!image && steveTexture) {
+    newMap = steveTexture
+  } else {
+    image ??= stevePng
+    const skinCanvas = document.createElement('canvas')
+    const img = new Image()
+    img.src = image
+    await new Promise<void>(resolve => {
+      img.onload = () => {
+        resolve()
+      }
+    })
+    loadSkinToCanvas(skinCanvas, img)
+    newMap = new THREE.CanvasTexture(skinCanvas)
+    // newMap.flipY = false
+    newMap.magFilter = THREE.NearestFilter
+    newMap.minFilter = THREE.NearestFilter
+    if (!image) {
+      steveTexture = newMap
+    }
+  }
+
+  // right arm
+  const box = new THREE.BoxGeometry()
+  const material = new THREE.MeshStandardMaterial()
+  const slim = false
+  const mesh = new THREE.Mesh(box, material)
+  mesh.scale.x = slim ? 3 : 4
+  mesh.scale.y = 12
+  mesh.scale.z = 4
+  setSkinUVs(box, 40, 16, slim ? 3 : 4, 12, 4)
+  material.map = newMap
+  material.needsUpdate = true
+  const group = new THREE.Group()
+  group.add(mesh)
+  group.scale.set(0.1, 0.1, 0.1)
+  mesh.rotation.z = Math.PI
+  return group
+}
+
+function setUVs (
+  box: THREE.BoxGeometry,
+  u: number,
+  v: number,
+  width: number,
+  height: number,
+  depth: number,
+  textureWidth: number,
+  textureHeight: number
+): void {
+  const toFaceVertices = (x1: number, y1: number, x2: number, y2: number) => [
+    new THREE.Vector2(x1 / textureWidth, 1 - y2 / textureHeight),
+    new THREE.Vector2(x2 / textureWidth, 1 - y2 / textureHeight),
+    new THREE.Vector2(x2 / textureWidth, 1 - y1 / textureHeight),
+    new THREE.Vector2(x1 / textureWidth, 1 - y1 / textureHeight),
+  ]
+
+  const top = toFaceVertices(u + depth, v, u + width + depth, v + depth)
+  const bottom = toFaceVertices(u + width + depth, v, u + width * 2 + depth, v + depth)
+  const left = toFaceVertices(u, v + depth, u + depth, v + depth + height)
+  const front = toFaceVertices(u + depth, v + depth, u + width + depth, v + depth + height)
+  const right = toFaceVertices(u + width + depth, v + depth, u + width + depth * 2, v + height + depth)
+  const back = toFaceVertices(u + width + depth * 2, v + depth, u + width * 2 + depth * 2, v + height + depth)
+
+  const uvAttr = box.attributes.uv as THREE.BufferAttribute
+  const uvRight = [right[3], right[2], right[0], right[1]]
+  const uvLeft = [left[3], left[2], left[0], left[1]]
+  const uvTop = [top[3], top[2], top[0], top[1]]
+  const uvBottom = [bottom[0], bottom[1], bottom[3], bottom[2]]
+  const uvFront = [front[3], front[2], front[0], front[1]]
+  const uvBack = [back[3], back[2], back[0], back[1]]
+
+  // Create a new array to hold the modified UV data
+  const newUVData = [] as number[]
+
+  // Iterate over the arrays and copy the data to uvData
+  for (const uvArray of [uvRight, uvLeft, uvTop, uvBottom, uvFront, uvBack]) {
+    for (const uv of uvArray) {
+      newUVData.push(uv.x, uv.y)
+    }
+  }
+
+  uvAttr.set(new Float32Array(newUVData))
+  uvAttr.needsUpdate = true
+}
+
+function setSkinUVs (box: THREE.BoxGeometry, u: number, v: number, width: number, height: number, depth: number): void {
+  setUVs(box, u, v, width, height, depth, 64, 64)
+}
diff --git a/prismarine-viewer/viewer/lib/holdingBlock.ts b/prismarine-viewer/viewer/lib/holdingBlock.ts
index f5a0ca79..5fc3e03c 100644
--- a/prismarine-viewer/viewer/lib/holdingBlock.ts
+++ b/prismarine-viewer/viewer/lib/holdingBlock.ts
@@ -1,14 +1,19 @@
 import * as THREE from 'three'
 import * as tweenJs from '@tweenjs/tween.js'
 import worldBlockProvider from 'mc-assets/dist/worldBlockProvider'
+import { GUI } from 'lil-gui'
 import { getThreeBlockModelGroup, renderBlockThree, setBlockPosition } from './mesher/standaloneRenderer'
+import { getMyHand } from './hand'
 
 export type HandItemBlock = {
-  name
-  properties
+  name?
+  properties?
+  type: 'block' | 'item' | 'hand'
+  id?: number
 }
 
 export default class HoldingBlock {
+  // TODO refactor with the tree builder for better visual understanding
   holdingBlock: THREE.Object3D | undefined = undefined
   swingAnimation: tweenJs.Group | undefined = undefined
   blockSwapAnimation: {
@@ -16,22 +21,25 @@ export default class HoldingBlock {
     hidden: boolean
   } | undefined = undefined
   cameraGroup = new THREE.Mesh()
-  objectOuterGroup = new THREE.Group()
-  objectInnerGroup = new THREE.Group()
-  camera: THREE.Group | THREE.PerspectiveCamera
+  objectOuterGroup = new THREE.Group() // 3
+  objectInnerGroup = new THREE.Group() // 4
+  holdingBlockInnerGroup = new THREE.Group() // 5
+  camera = new THREE.PerspectiveCamera(75, 1, 0.1, 100)
   stopUpdate = false
   lastHeldItem: HandItemBlock | undefined
   toBeRenderedItem: HandItemBlock | undefined
   isSwinging = false
   nextIterStopCallbacks: Array<() => void> | undefined
+  rightSide = true
 
-  constructor (public scene: THREE.Scene) {
+  debug = {} as Record<string, any>
+
+  constructor () {
     this.initCameraGroup()
   }
 
   initCameraGroup () {
     this.cameraGroup = new THREE.Mesh()
-    this.scene.add(this.cameraGroup)
   }
 
   startSwing () {
@@ -44,17 +52,18 @@ export default class HoldingBlock {
       // const DURATION = 1000 * 0.35 / 2
       const DURATION = 1000 * 0.35 / 3
       // const DURATION = 1000
+      const { position, rotation, object } = this.getFinalSwingPositionRotation()
       const initialPos = {
-        x: this.objectInnerGroup.position.x,
-        y: this.objectInnerGroup.position.y,
-        z: this.objectInnerGroup.position.z
+        x: object.position.x,
+        y: object.position.y,
+        z: object.position.z
       }
       const initialRot = {
-        x: this.objectInnerGroup.rotation.x,
-        y: this.objectInnerGroup.rotation.y,
-        z: this.objectInnerGroup.rotation.z
+        x: object.rotation.x,
+        y: object.rotation.y,
+        z: object.rotation.z
       }
-      const mainAnim = new tweenJs.Tween(this.objectInnerGroup.position, this.swingAnimation).to({ y: this.objectInnerGroup.position.y - this.objectInnerGroup.scale.y / 2 }, DURATION).yoyo(true).repeat(Infinity).start()
+      const mainAnim = new tweenJs.Tween(object.position, this.swingAnimation).to(position, DURATION).yoyo(true).repeat(Infinity).start()
       let i = 0
       mainAnim.onRepeat(() => {
         i++
@@ -67,14 +76,66 @@ export default class HoldingBlock {
           this.swingAnimation!.removeAll()
           this.swingAnimation = undefined
           // todo refactor to be more generic for animations
-          this.objectInnerGroup.position.set(initialPos.x, initialPos.y, initialPos.z)
-          // this.objectInnerGroup.rotation.set(initialRot.x, initialRot.y, initialRot.z)
-          Object.assign(this.objectInnerGroup.rotation, initialRot)
+          object.position.set(initialPos.x, initialPos.y, initialPos.z)
+          // object.rotation.set(initialRot.x, initialRot.y, initialRot.z)
+          Object.assign(object.rotation, initialRot)
         }
       })
 
-      new tweenJs.Tween(this.objectInnerGroup.rotation, this.swingAnimation).to({ z: THREE.MathUtils.degToRad(90) }, DURATION).yoyo(true).repeat(Infinity).start()
-      new tweenJs.Tween(this.objectInnerGroup.rotation, this.swingAnimation).to({ x: -THREE.MathUtils.degToRad(90) }, DURATION).yoyo(true).repeat(Infinity).start()
+      new tweenJs.Tween(object.rotation, this.swingAnimation).to(rotation, DURATION).yoyo(true).repeat(Infinity).start()
+    }
+  }
+
+  getFinalSwingPositionRotation (origPosition?: THREE.Vector3) {
+    const object = this.objectInnerGroup
+    if (this.lastHeldItem?.type === 'block') {
+      origPosition ??= object.position
+      return {
+        position: { y: origPosition.y - this.objectInnerGroup.scale.y / 2 },
+        rotation: { z: THREE.MathUtils.degToRad(90), x: -THREE.MathUtils.degToRad(90) },
+        object
+      }
+    }
+    if (this.lastHeldItem?.type === 'item') {
+      const object = this.holdingBlockInnerGroup
+      origPosition ??= object.position
+      return {
+        position: {
+          y: origPosition.y - object.scale.y * 2,
+          // z: origPosition.z - window.zFinal,
+          // x: origPosition.x - window.xFinal,
+        },
+        // rotation: { z: THREE.MathUtils.degToRad(90), x: -THREE.MathUtils.degToRad(90) }
+        rotation: {
+          // z: THREE.MathUtils.degToRad(window.zRotationFinal ?? 0),
+          // x: THREE.MathUtils.degToRad(window.xRotationFinal ?? 0),
+          // y: THREE.MathUtils.degToRad(window.yRotationFinal ?? 0),
+          x: THREE.MathUtils.degToRad(-120)
+        },
+        object
+      }
+    }
+    if (this.lastHeldItem?.type === 'hand') {
+      const object = this.holdingBlockInnerGroup
+      origPosition ??= object.position
+      return {
+        position: {
+          y: origPosition.y - (window.yFinal ?? 0.15),
+          z: origPosition.z - window.zFinal,
+          x: origPosition.x - window.xFinal,
+        },
+        rotation: {
+          x: THREE.MathUtils.degToRad(window.xRotationFinal || -14.7),
+          y: THREE.MathUtils.degToRad(window.yRotationFinal || 33.95),
+          z: THREE.MathUtils.degToRad(window.zRotationFinal || -28),
+        },
+        object
+      }
+    }
+    return {
+      position: {},
+      rotation: {},
+      object
     }
   }
 
@@ -89,11 +150,35 @@ export default class HoldingBlock {
     })
   }
 
-  update (camera: typeof this.camera) {
-    this.camera = camera
+  render (originalCamera: THREE.PerspectiveCamera, renderer: THREE.WebGLRenderer, ambientLight: THREE.AmbientLight, directionalLight: THREE.DirectionalLight) {
+    if (!this.lastHeldItem) return
     this.swingAnimation?.update()
     this.blockSwapAnimation?.tween.update()
+
+    const scene = new THREE.Scene()
+    scene.add(this.cameraGroup)
+    // if (this.camera.aspect !== originalCamera.aspect) {
+    //   this.camera.aspect = originalCamera.aspect
+    //   this.camera.updateProjectionMatrix()
+    // }
     this.updateCameraGroup()
+    scene.add(ambientLight.clone())
+    scene.add(directionalLight.clone())
+
+    const viewerSize = renderer.getSize(new THREE.Vector2())
+    const minSize = Math.min(viewerSize.width, viewerSize.height)
+
+    renderer.autoClear = false
+    renderer.clearDepth()
+    if (this.rightSide) {
+      const x = viewerSize.width - minSize
+      // if (x) x -= x / 4
+      renderer.setViewport(x, 0, minSize, minSize)
+    } else {
+      renderer.setViewport(0, 0, minSize, minSize)
+    }
+    renderer.render(scene, this.camera)
+    renderer.setViewport(0, 0, viewerSize.width, viewerSize.height)
   }
 
   // worldTest () {
@@ -142,23 +227,36 @@ export default class HoldingBlock {
     this.cameraGroup.position.copy(camera.position)
     this.cameraGroup.rotation.copy(camera.rotation)
 
-    const viewerSize = viewer.renderer.getSize(new THREE.Vector2())
-    // const x = window.x ?? 0.25 * viewerSize.width / viewerSize.height
-    // const x = 0 * viewerSize.width / viewerSize.height
-    const x = 0.2 * viewerSize.width / viewerSize.height
-    this.objectOuterGroup.position.set(x, -0.3, -0.45)
+    // const viewerSize = viewer.renderer.getSize(new THREE.Vector2())
+    // const aspect = viewerSize.width / viewerSize.height
+    const aspect = 1
+
+
+    // Adjust the position based on the aspect ratio
+    const { position, scale: scaleData } = this.getHandHeld3d()
+    const distance = -position.z
+    const side = this.rightSide ? 1 : -1
+    this.objectOuterGroup.position.set(
+      distance * position.x * aspect * side,
+      distance * position.y,
+      -distance
+    )
+
+    // const scale = Math.min(0.8, Math.max(1, 1 * aspect))
+    const scale = scaleData * 2.22 * 0.2
+    this.objectOuterGroup.scale.set(scale, scale, scale)
   }
 
-  async initHandObject (material: THREE.Material, blockstatesModels: any, blocksAtlases: any, block?: HandItemBlock) {
+  async initHandObject (material: THREE.Material, blockstatesModels: any, blocksAtlases: any, handItem?: HandItemBlock) {
     let animatingCurrent = false
-    if (!this.swingAnimation && !this.blockSwapAnimation && this.isDifferentItem(block)) {
+    if (!this.swingAnimation && !this.blockSwapAnimation && this.isDifferentItem(handItem)) {
       animatingCurrent = true
       await this.playBlockSwapAnimation()
       this.holdingBlock?.removeFromParent()
       this.holdingBlock = undefined
     }
-    this.lastHeldItem = block
-    if (!block) {
+    this.lastHeldItem = handItem
+    if (!handItem) {
       this.holdingBlock?.removeFromParent()
       this.holdingBlock = undefined
       this.swingAnimation = undefined
@@ -166,16 +264,28 @@ export default class HoldingBlock {
       return
     }
     const blockProvider = worldBlockProvider(blockstatesModels, blocksAtlases, 'latest')
-    const models = blockProvider.getAllResolvedModels0_1(block, true)
-    const blockInner = getThreeBlockModelGroup(material, models, undefined, 'plains', loadedData)
-    // const { mesh: itemMesh } = viewer.entities.getItemMesh({
-    //   itemId: 541,
-    // })!
-    // itemMesh.position.set(0.5, 0.5, 0.5)
-    // const blockInner = itemMesh
+    let blockInner
+    if (handItem.type === 'block') {
+      const models = blockProvider.getAllResolvedModels0_1({
+        name: handItem.name,
+        properties: handItem.properties ?? {}
+      }, true)
+      blockInner = getThreeBlockModelGroup(material, models, undefined, 'plains', loadedData)
+    } else if (handItem.type === 'item') {
+      const { mesh: itemMesh } = viewer.entities.getItemMesh({
+        itemId: handItem.id,
+      })!
+      itemMesh.position.set(0.5, 0.5, 0.5)
+      blockInner = itemMesh
+    } else {
+      blockInner = await getMyHand()
+    }
     blockInner.name = 'holdingBlock'
     const blockOuterGroup = new THREE.Group()
-    blockOuterGroup.add(blockInner)
+    this.holdingBlockInnerGroup.removeFromParent()
+    this.holdingBlockInnerGroup = new THREE.Group()
+    this.holdingBlockInnerGroup.add(blockInner)
+    blockOuterGroup.add(this.holdingBlockInnerGroup)
     this.holdingBlock = blockInner
     this.objectInnerGroup = new THREE.Group()
     this.objectInnerGroup.add(blockOuterGroup)
@@ -190,18 +300,113 @@ export default class HoldingBlock {
     this.objectOuterGroup.add(this.objectInnerGroup)
 
     this.cameraGroup.add(this.objectOuterGroup)
-    const rotation = -45 + -90
-    // const rotation = -45 // should be for item
-    this.holdingBlock.rotation.set(0, THREE.MathUtils.degToRad(rotation), 0, 'ZYX')
+    const rotationDeg = this.getHandHeld3d().rotation
+    let origPosition
+    const setRotation = () => {
+      const final = this.getFinalSwingPositionRotation(origPosition)
+      origPosition ??= final.object.position.clone()
+      if (this.debug.displayFinal) {
+        Object.assign(final.object.position, final.position)
+        Object.assign(final.object.rotation, final.rotation)
+      } else if (this.debug.displayFinal === false) {
+        final.object.rotation.set(0, 0, 0)
+      }
 
-    // const scale = window.scale ?? 0.2
-    const scale = 0.2
-    this.objectOuterGroup.scale.set(scale, scale, scale)
-    // this.objectOuterGroup.position.set(x, window.y ?? -0.41, window.z ?? -0.45)
-    // this.objectOuterGroup.position.set(x, 0, -0.45)
+      this.holdingBlock!.rotation.x = THREE.MathUtils.degToRad(rotationDeg.x)
+      this.holdingBlock!.rotation.y = THREE.MathUtils.degToRad(rotationDeg.y)
+      this.holdingBlock!.rotation.z = THREE.MathUtils.degToRad(rotationDeg.z)
+      this.objectOuterGroup.rotation.y = THREE.MathUtils.degToRad(rotationDeg.yOuter)
+    }
+    // const gui = new GUI()
+    // gui.add(rotationDeg, 'x', -180, 180, 0.1)
+    // gui.add(rotationDeg, 'y', -180, 180, 0.1)
+    // gui.add(rotationDeg, 'z', -180, 180, 0.1)
+    // gui.add(rotationDeg, 'yOuter', -180, 180, 0.1)
+    // Object.assign(window, { xFinal: 0, yFinal: 0, zFinal: 0, xRotationFinal: 0, yRotationFinal: 0, zRotationFinal: 0, displayFinal: true })
+    // gui.add(window, 'xFinal', -10, 10, 0.05)
+    // gui.add(window, 'yFinal', -10, 10, 0.05)
+    // gui.add(window, 'zFinal', -10, 10, 0.05)
+    // gui.add(window, 'xRotationFinal', -180, 180, 0.05)
+    // gui.add(window, 'yRotationFinal', -180, 180, 0.05)
+    // gui.add(window, 'zRotationFinal', -180, 180, 0.05)
+    // gui.add(window, 'displayFinal')
+    // gui.onChange(setRotation)
+    setRotation()
 
     if (animatingCurrent) {
       await this.playBlockSwapAnimation()
     }
   }
+
+  getHandHeld3d () {
+    const type = this.lastHeldItem?.type ?? 'hand'
+    const { debug } = this
+
+    let scale = type === 'item' ? 0.68 : 0.45
+
+    const position = {
+      x: debug.x ?? 0.4,
+      y: debug.y ?? -0.7,
+      z: -0.45
+    }
+
+    if (type === 'item') {
+      position.x = -0.05
+      // position.y -= 3.2 / 10
+      // position.z += 1.13 / 10
+    }
+
+    if (type === 'hand') {
+      // position.x = viewer.camera.aspect > 1 ? 0.7 : 1.1
+      position.y = -0.8
+      scale = 0.8
+    }
+
+    const rotations = {
+      block: {
+        x: 0,
+        y: -45 + 90,
+        z: 0,
+        yOuter: 0
+      },
+      // hand: {
+      //   x: 166.7,
+      //   // y: -180,
+      //   y: -165.2,
+      //   // z: -156.3,
+      //   z: -134.2,
+      //   yOuter: -81.1
+      // },
+      hand: {
+        x: -32.4,
+        // y: 25.1
+        y: 42.8,
+        z: -41.3,
+        yOuter: 0
+      },
+      // item: {
+      //   x: -174,
+      //   y: 47.3,
+      //   z: -134.2,
+      //   yOuter: -41.2
+      // }
+      item: {
+        // x: -174,
+        // y: 47.3,
+        // z: -134.2,
+        // yOuter: -41.2
+        x: 0,
+        // y: -90, // todo thats the correct one but we don't make it look too cheap because of no depth
+        y: -70,
+        z: window.z ?? 25,
+        yOuter: 0
+      }
+    }
+
+    return {
+      rotation: rotations[type],
+      position,
+      scale
+    }
+  }
 }
diff --git a/prismarine-viewer/viewer/lib/viewer.ts b/prismarine-viewer/viewer/lib/viewer.ts
index 73f29fb2..20f10284 100644
--- a/prismarine-viewer/viewer/lib/viewer.ts
+++ b/prismarine-viewer/viewer/lib/viewer.ts
@@ -3,12 +3,14 @@ import * as THREE from 'three'
 import { Vec3 } from 'vec3'
 import { generateSpiralMatrix } from 'flying-squid/dist/utils'
 import worldBlockProvider from 'mc-assets/dist/worldBlockProvider'
+import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
 import { Entities } from './entities'
 import { Primitives } from './primitives'
 import { WorldRendererThree } from './worldrendererThree'
 import { WorldRendererCommon, WorldRendererConfig, defaultWorldRendererConfig } from './worldrendererCommon'
 import { getThreeBlockModelGroup, renderBlockThree, setBlockPosition } from './mesher/standaloneRenderer'
 import { addNewStat } from './ui/newStats'
+import { getMyHand } from './hand'
 
 export class Viewer {
   scene: THREE.Scene
@@ -88,6 +90,7 @@ export class Viewer {
       return new THREE.TextureLoader().loadAsync(this.world.itemsAtlasParser!.latestImage)
     }).then((texture) => {
       this.entities.itemsTexture = texture
+      this.world.renderUpdateEmitter.emit('itemsTextureDownloaded')
     })
   }
 
@@ -114,18 +117,12 @@ export class Viewer {
     void set()
   }
 
-  demoModel () {
+  async demoModel () {
     //@ts-expect-error
     const pos = cursorBlockRel(0, 1, 0).position
     const blockProvider = worldBlockProvider(this.world.blockstatesModels, this.world.blocksAtlases, 'latest')
-    const models = blockProvider.getAllResolvedModels0_1({
-      name: 'item_frame',
-      properties: {
-        // map: false
-      }
-    }, true)
-    const { material } = this.world
-    const mesh = getThreeBlockModelGroup(material, models, undefined, 'plains', loadedData)
+
+    const mesh = await getMyHand()
     // mesh.rotation.y = THREE.MathUtils.degToRad(90)
     setBlockPosition(mesh, pos)
     const helper = new THREE.BoxHelper(mesh, 0xff_ff_00)
diff --git a/prismarine-viewer/viewer/lib/worldDataEmitter.ts b/prismarine-viewer/viewer/lib/worldDataEmitter.ts
index 0223b855..371ef8f5 100644
--- a/prismarine-viewer/viewer/lib/worldDataEmitter.ts
+++ b/prismarine-viewer/viewer/lib/worldDataEmitter.ts
@@ -107,23 +107,33 @@ export class WorldDataEmitter extends EventEmitter {
       time: () => {
         this.emitter.emit('time', bot.time.timeOfDay)
       },
-      heldItemChanged: () => {
-        if (!this.handDisplay) {
-          viewer.world.onHandItemSwitch(undefined)
-          return
-        }
-        const newItem = bot.heldItem
-        if (!newItem) {
-          viewer.world.onHandItemSwitch(undefined)
-          return
-        }
-        const block = loadedData.blocksByName[newItem.name]
-        // todo clean types
-        const blockProperties = block ? new window.PrismarineBlock(block.id, 'void', newItem.metadata).getProperties() : {}
-        viewer.world.onHandItemSwitch({ name: newItem.name, properties: blockProperties })
+      heldItemChanged () {
+        handChanged(false)
       },
     } satisfies Partial<BotEvents>
-    this.eventListeners.heldItemChanged()
+    const handChanged = (isLeftHand: boolean) => {
+      if (!this.handDisplay) {
+        viewer.world.onHandItemSwitch(undefined, isLeftHand)
+        return
+      }
+      const newItem = isLeftHand ? bot.inventory.slots[45] : bot.heldItem
+      if (!newItem) {
+        viewer.world.onHandItemSwitch(undefined, isLeftHand)
+        return
+      }
+      const block = loadedData.blocksByName[newItem.name]
+      // todo clean types
+      const blockProperties = block ? new window.PrismarineBlock(block.id, 'void', newItem.metadata).getProperties() : {}
+      // todo item props
+      viewer.world.onHandItemSwitch({ name: newItem.name, properties: blockProperties, id: newItem.type, type: block ? 'block' : 'item', }, isLeftHand)
+    }
+    bot.inventory.on('updateSlot', (index) => {
+      if (index === 45) {
+        handChanged(true)
+      }
+    })
+    handChanged(false)
+    handChanged(true)
 
 
     bot._client.on('update_light', ({ chunkX, chunkZ }) => {
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
index 71c094b4..a7c3972c 100644
--- a/prismarine-viewer/viewer/lib/worldrendererCommon.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -217,8 +217,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
   }
 
-  onHandItemSwitch (item: HandItemBlock | undefined): void { }
-  changeHandSwingingState (isAnimationPlaying: boolean): void { }
+  onHandItemSwitch (item: HandItemBlock | undefined, isLeftHand: boolean): void { }
+  changeHandSwingingState (isAnimationPlaying: boolean, isLeftHand: boolean): void { }
 
   abstract handleWorkerMessage (data: WorkerReceive): void
 
diff --git a/prismarine-viewer/viewer/lib/worldrendererThree.ts b/prismarine-viewer/viewer/lib/worldrendererThree.ts
index 8671bfaf..de111690 100644
--- a/prismarine-viewer/viewer/lib/worldrendererThree.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererThree.ts
@@ -23,6 +23,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   starField: StarField
   cameraSectionPos: Vec3 = new Vec3(0, 0, 0)
   holdingBlock: HoldingBlock
+  holdingBlockLeft: HoldingBlock
   rendererDevice = '...'
 
   get tilesRendered () {
@@ -37,31 +38,44 @@ export class WorldRendererThree extends WorldRendererCommon {
     super(config)
     this.rendererDevice = String(WorldRendererThree.getRendererInfo(this.renderer))
     this.starField = new StarField(scene)
-    this.holdingBlock = new HoldingBlock(this.scene)
+    this.holdingBlock = new HoldingBlock()
+    this.holdingBlockLeft = new HoldingBlock()
+    this.holdingBlockLeft.rightSide = false
 
-    this.renderUpdateEmitter.on('textureDownloaded', () => {
+    this.renderUpdateEmitter.on('itemsTextureDownloaded', () => {
       if (this.holdingBlock.toBeRenderedItem) {
         this.onHandItemSwitch(this.holdingBlock.toBeRenderedItem)
         this.holdingBlock.toBeRenderedItem = undefined
       }
+      if (this.holdingBlockLeft.toBeRenderedItem) {
+        this.onHandItemSwitch(this.holdingBlock.toBeRenderedItem, true)
+        this.holdingBlockLeft.toBeRenderedItem = undefined
+      }
     })
 
     this.addDebugOverlay()
   }
 
-  onHandItemSwitch (item: HandItemBlock | undefined) {
+  onHandItemSwitch (item: HandItemBlock | undefined, isLeft = false) {
+    if (!isLeft) {
+      item ??= {
+        type: 'hand',
+      }
+    }
+    const holdingBlock = isLeft ? this.holdingBlockLeft : this.holdingBlock
     if (!this.currentTextureImage) {
-      this.holdingBlock.toBeRenderedItem = item
+      holdingBlock.toBeRenderedItem = item
       return
     }
-    void this.holdingBlock.initHandObject(this.material, this.blockstatesModels, this.blocksAtlases, item)
+    void holdingBlock.initHandObject(this.material, this.blockstatesModels, this.blocksAtlases, item)
   }
 
-  changeHandSwingingState (isAnimationPlaying: boolean) {
+  changeHandSwingingState (isAnimationPlaying: boolean, isLeft = false) {
+    const holdingBlock = isLeft ? this.holdingBlockLeft : this.holdingBlock
     if (isAnimationPlaying) {
-      this.holdingBlock.startSwing()
+      holdingBlock.startSwing()
     } else {
-      void this.holdingBlock.stopSwing()
+      void holdingBlock.stopSwing()
     }
   }
 
@@ -223,10 +237,11 @@ export class WorldRendererThree extends WorldRendererCommon {
 
   render () {
     tweenJs.update()
-    this.holdingBlock.update(this.camera)
     // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
     const cam = this.camera instanceof THREE.Group ? this.camera.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
+    this.holdingBlock.render(this.camera, this.renderer, viewer.ambientLight, viewer.directionalLight)
+    this.holdingBlockLeft.render(this.camera, this.renderer, viewer.ambientLight, viewer.directionalLight)
   }
 
   renderSign (position: Vec3, rotation: number, isWall: boolean, isHanging: boolean, blockEntity) {
diff --git a/src/devtools.ts b/src/devtools.ts
index 16337c1d..e87b6d33 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -46,7 +46,7 @@ customEvents.on('gameLoaded', () => {
 window.inspectPacket = (packetName, full = false) => {
   const listener = (...args) => console.log('packet', packetName, full ? args : args[0])
   const attach = () => {
-    bot?._client.on(packetName, listener)
+    bot?._client.prependListener(packetName, listener)
   }
   attach()
   customEvents.on('mineflayerBotCreated', attach)
diff --git a/src/flyingSquidUtils.ts b/src/flyingSquidUtils.ts
index 78254cf2..012830d9 100644
--- a/src/flyingSquidUtils.ts
+++ b/src/flyingSquidUtils.ts
@@ -27,8 +27,10 @@ export async function savePlayers (autoSave: boolean) {
 export const saveServer = async (autoSave = true) => {
   if (!localServer || fsState.isReadonly) return
   // todo
+  console.time('save server')
   const worlds = [(localServer as any).overworld] as Array<import('prismarine-world').world.World>
   await Promise.all([localServer.writeLevelDat(), savePlayers(autoSave), ...worlds.map(async world => world.saveNow())])
+  console.timeEnd('save server')
 }
 export const disconnect = async () => {
   if (localServer) {
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 618d99e8..a242107c 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -80,6 +80,7 @@ const defaultOptions = {
   autoParkour: false,
   vrSupport: true, // doesn't directly affect the VR mode, should only disable the button which is annoying to android users
   renderDebug: (isDev ? 'advanced' : 'basic') as 'none' | 'advanced' | 'basic',
+  autoVersionSelect: '1.20.4',
 
   // advanced bot options
   autoRespawn: false,
diff --git a/src/topRightStats.ts b/src/topRightStats.ts
index 4bcd7264..fd717ef4 100644
--- a/src/topRightStats.ts
+++ b/src/topRightStats.ts
@@ -88,13 +88,40 @@ export const statsEnd = () => {
 
 // for advanced debugging, use with watch expression
 
-window.statsPerSec = {}
-let statsPerSec = {}
-window.addStatPerSec = (name) => {
-  statsPerSec[name] ??= 0
-  statsPerSec[name]++
+window.statsPerSecAvg = {}
+let currentStatsPerSec = {} as Record<string, number[]>
+const waitingStatsPerSec = {}
+window.markStart = (label) => {
+  waitingStatsPerSec[label] ??= []
+  waitingStatsPerSec[label][0] = performance.now()
 }
+window.markEnd = (label) => {
+  if (!waitingStatsPerSec[label]?.[0]) return
+  currentStatsPerSec[label] ??= []
+  currentStatsPerSec[label].push(performance.now() - waitingStatsPerSec[label][0])
+  delete waitingStatsPerSec[label]
+}
+const updateStatsPerSecAvg = () => {
+  window.statsPerSecAvg = Object.fromEntries(Object.entries(currentStatsPerSec).map(([key, value]) => {
+    return [key, {
+      avg: value.reduce((a, b) => a + b, 0) / value.length,
+      count: value.length
+    }]
+  }))
+  currentStatsPerSec = {}
+}
+
+
+window.statsPerSec = {}
+let statsPerSecCurrent = {}
+window.addStatPerSec = (name) => {
+  statsPerSecCurrent[name] ??= 0
+  statsPerSecCurrent[name]++
+}
+window.statsPerSecCurrent = statsPerSecCurrent
 setInterval(() => {
-  window.statsPerSec = statsPerSec
-  statsPerSec = {}
+  window.statsPerSec = statsPerSecCurrent
+  statsPerSecCurrent = {}
+  window.statsPerSecCurrent = statsPerSecCurrent
+  updateStatsPerSecAvg()
 }, 1000)
diff --git a/src/worldInteractions.ts b/src/worldInteractions.ts
index d6674ce3..1134d7f8 100644
--- a/src/worldInteractions.ts
+++ b/src/worldInteractions.ts
@@ -257,8 +257,8 @@ class WorldInteraction {
             bot.lookAt = oldLookAt
           }).catch(console.warn)
         }
-        viewer.world.changeHandSwingingState(true)
-        viewer.world.changeHandSwingingState(false)
+        viewer.world.changeHandSwingingState(true, false)
+        viewer.world.changeHandSwingingState(false, false)
       } else if (!stop) {
         const offhand = activate ? false : activatableItems(bot.inventory.slots[45]?.name ?? '')
         bot.activateItem(offhand) // todo offhand
@@ -317,14 +317,14 @@ class WorldInteraction {
         })
         customEvents.emit('digStart')
         this.lastDigged = Date.now()
-        viewer.world.changeHandSwingingState(true)
+        viewer.world.changeHandSwingingState(true, false)
       } else if (performance.now() - this.lastSwing > 200) {
         bot.swingArm('right')
         this.lastSwing = performance.now()
       }
     }
     if (!this.buttons[0] && this.lastButtons[0]) {
-      viewer.world.changeHandSwingingState(false)
+      viewer.world.changeHandSwingingState(false, false)
     }
     this.prevOnGround = onGround
 

From b10c6809ff64effeea87bb7d87044f2b8b2bdb01 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 14 Dec 2024 08:08:30 +0300
Subject: [PATCH 082/753] fix: fix signs could not be rendered properly because
 font was not in the build

---
 src/styles.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles.css b/src/styles.css
index 817fae8c..1e5407f6 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -119,7 +119,7 @@ body {
 
 @font-face {
   font-family: mojangles;
-  src: url(../assets/mojangles.ttf);
+  src: url(../assets/mojangles.ttf?inline);
 }
 
 #ui-root {

From 9b5155d3fe83f3bbadea2583fc48de6711e45477 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 14 Dec 2024 08:08:58 +0300
Subject: [PATCH 083/753] up singleplayer version

---
 src/defaultLocalServerOptions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/defaultLocalServerOptions.js b/src/defaultLocalServerOptions.js
index 130726e0..cd949567 100644
--- a/src/defaultLocalServerOptions.js
+++ b/src/defaultLocalServerOptions.js
@@ -33,6 +33,6 @@ module.exports = {
   keepAlive: false,
   'everybody-op': true,
   'max-entities': 100,
-  'version': '1.14.4',
-  versionMajor: '1.14'
+  'version': '1.18.2',
+  versionMajor: '1.18'
 }

From ad0502dcb93d9cf04d0005b2c0b4e5d2182603a1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 14 Dec 2024 08:09:09 +0300
Subject: [PATCH 084/753] recenter edition in ui

---
 src/react/mainMenu.module.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/mainMenu.module.css b/src/react/mainMenu.module.css
index db072ce1..dcec47c3 100644
--- a/src/react/mainMenu.module.css
+++ b/src/react/mainMenu.module.css
@@ -45,7 +45,7 @@
     display: block;
     position: absolute;
     top: 37px;
-    left: calc(88px + 5px);
+    left: calc((512px / 2 - 176px / 2) / 2);
     background-image: url('../../assets/edition.png');
     background-size: 128px;
     width: 88px;

From 725f6ec3643eb3a7c8fde399a3b88cc0cf910aea Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 14 Dec 2024 08:17:01 +0300
Subject: [PATCH 085/753] restore hand display setting

---
 prismarine-viewer/viewer/lib/worldDataEmitter.ts    | 12 ------------
 prismarine-viewer/viewer/lib/worldrendererCommon.ts |  4 +++-
 prismarine-viewer/viewer/lib/worldrendererThree.ts  |  6 ++++--
 src/watchOptions.ts                                 |  2 +-
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/worldDataEmitter.ts b/prismarine-viewer/viewer/lib/worldDataEmitter.ts
index 371ef8f5..61d5a503 100644
--- a/prismarine-viewer/viewer/lib/worldDataEmitter.ts
+++ b/prismarine-viewer/viewer/lib/worldDataEmitter.ts
@@ -23,15 +23,7 @@ export class WorldDataEmitter extends EventEmitter {
   private readonly emitter: WorldDataEmitter
   keepChunksDistance = 0
   addWaitTime = 1
-  _handDisplay = false
   isPlayground = false
-  get handDisplay () {
-    return this._handDisplay
-  }
-  set handDisplay (newVal) {
-    this._handDisplay = newVal
-    this.eventListeners.heldItemChanged?.()
-  }
 
   constructor (public world: typeof __type_bot['world'], public viewDistance: number, position: Vec3 = new Vec3(0, 0, 0)) {
     super()
@@ -112,10 +104,6 @@ export class WorldDataEmitter extends EventEmitter {
       },
     } satisfies Partial<BotEvents>
     const handChanged = (isLeftHand: boolean) => {
-      if (!this.handDisplay) {
-        viewer.world.onHandItemSwitch(undefined, isLeftHand)
-        return
-      }
       const newItem = isLeftHand ? bot.inventory.slots[45] : bot.heldItem
       if (!newItem) {
         viewer.world.onHandItemSwitch(undefined, isLeftHand)
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
index a7c3972c..ec649a14 100644
--- a/prismarine-viewer/viewer/lib/worldrendererCommon.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -29,7 +29,9 @@ export const worldCleanup = buildCleanupDecorator('resetWorld')
 
 export const defaultWorldRendererConfig = {
   showChunkBorders: false,
-  numWorkers: 4
+  numWorkers: 4,
+  // game renderer setting actually
+  displayHand: false
 }
 
 export type WorldRendererConfig = typeof defaultWorldRendererConfig
diff --git a/prismarine-viewer/viewer/lib/worldrendererThree.ts b/prismarine-viewer/viewer/lib/worldrendererThree.ts
index de111690..4d317354 100644
--- a/prismarine-viewer/viewer/lib/worldrendererThree.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererThree.ts
@@ -240,8 +240,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
     const cam = this.camera instanceof THREE.Group ? this.camera.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
-    this.holdingBlock.render(this.camera, this.renderer, viewer.ambientLight, viewer.directionalLight)
-    this.holdingBlockLeft.render(this.camera, this.renderer, viewer.ambientLight, viewer.directionalLight)
+    if (this.config.displayHand) {
+      this.holdingBlock.render(this.camera, this.renderer, viewer.ambientLight, viewer.directionalLight)
+      this.holdingBlockLeft.render(this.camera, this.renderer, viewer.ambientLight, viewer.directionalLight)
+    }
   }
 
   renderSign (position: Vec3, rotation: number, isWall: boolean, isHanging: boolean, blockEntity) {
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 4b69726c..84092de2 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -96,6 +96,6 @@ export const watchOptionsAfterWorldViewInit = () => {
   watchValue(options, o => {
     if (!worldView) return
     worldView.keepChunksDistance = o.keepChunksDistance
-    worldView.handDisplay = o.handDisplay
+    viewer.world.config.displayHand = o.handDisplay
   })
 }

From 372583be7d9155e7c68f3aa2a18ec55dd50da178 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 14 Dec 2024 10:31:12 +0300
Subject: [PATCH 086/753] fix ci build type checks

---
 prismarine-viewer/examples/baseScene.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/prismarine-viewer/examples/baseScene.ts b/prismarine-viewer/examples/baseScene.ts
index 1db68eb8..4b01abcd 100644
--- a/prismarine-viewer/examples/baseScene.ts
+++ b/prismarine-viewer/examples/baseScene.ts
@@ -17,6 +17,7 @@ import { WorldDataEmitter } from '../viewer'
 import { Viewer } from '../viewer/lib/viewer'
 import { BlockNames } from '../../src/mcDataTypes'
 import { initWithRenderer, statsEnd, statsStart } from '../../src/topRightStats'
+import { defaultWorldRendererConfig } from '../viewer/lib/worldrendererCommon'
 import { getSyncWorld } from './shared'
 
 window.THREE = THREE
@@ -158,7 +159,7 @@ export class BasePlaygroundScene {
     renderer.setSize(window.innerWidth, window.innerHeight)
 
     // Create viewer
-    const viewer = new Viewer(renderer, { numWorkers: 6, showChunkBorders: false, })
+    const viewer = new Viewer(renderer, { ...defaultWorldRendererConfig, numWorkers: 6 })
     window.viewer = viewer
     const isWebgpu = false
     const promises = [] as Array<Promise<void>>

From 5f87385486eed08571fb7e15da92d76919f27b60 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 14 Dec 2024 10:34:28 +0300
Subject: [PATCH 087/753] make title selectable

---
 src/react/AppStatus.tsx | 2 +-
 src/react/Screen.tsx    | 5 +++--
 src/styles.css          | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/react/AppStatus.tsx b/src/react/AppStatus.tsx
index f9e5217e..2c24b153 100644
--- a/src/react/AppStatus.tsx
+++ b/src/react/AppStatus.tsx
@@ -38,10 +38,10 @@ export default ({
   return (
     <Screen
       className='small-content'
+      titleSelectable={isError}
       title={
         <>
           <span style={{
-            userSelect: isError ? 'text' : undefined,
             wordBreak: 'break-word',
           }}
           >
diff --git a/src/react/Screen.tsx b/src/react/Screen.tsx
index c80b880a..6654e4dd 100644
--- a/src/react/Screen.tsx
+++ b/src/react/Screen.tsx
@@ -4,15 +4,16 @@ interface Props {
   backdrop?: boolean | 'dirt'
   style?: React.CSSProperties
   className?: string
+  titleSelectable?: boolean
 }
 
-export default ({ title, children, backdrop = true, style, className }: Props) => {
+export default ({ title, children, backdrop = true, style, className, titleSelectable }: Props) => {
   return (
     <>
       {backdrop === 'dirt' ? <div className='dirt-bg' /> : backdrop ? <div className="backdrop" /> : null}
       <div className={`fullscreen ${className}`} style={{ overflow: 'auto', ...style }}>
         <div className="screen-content">
-          <div className="screen-title">{title}</div>
+          <div className={`screen-title ${titleSelectable ? 'text-select' : ''}`}>{title}</div>
           {children}
         </div>
       </div>
diff --git a/src/styles.css b/src/styles.css
index 1e5407f6..2c645ae9 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -181,6 +181,10 @@ body::xr-overlay #viewer-canvas {
   color: #999;
 }
 
+.text-select {
+  user-select: text;
+}
+
 @media screen and (min-width: 430px) {
   .span-2 {
     grid-column: span 2;

From 963a769db326eb621468a05d194c42e5ce3a8d87 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 15 Dec 2024 17:00:59 +0300
Subject: [PATCH 088/753] docs: change description to avoid confustion with
 eaglercraft project

---
 README.MD | 10 ++++++----
 TECH.md   | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 TECH.md

diff --git a/README.MD b/README.MD
index ceba1c6c..b2220a74 100644
--- a/README.MD
+++ b/README.MD
@@ -2,18 +2,20 @@
 
 ![banner](./docs-assets/banner.jpg)
 
-A true Minecraft client running in your browser! A port of the original game to the web, written in JavaScript using the best modern web technologies.
+Minecraft **clone** rewritten in TypeScript using the best modern web technologies. Minecraft vanilla-compatible client and integrated server packaged into a single web app.
 
-You can try this out at [mcraft.fun](https://mcraft.fun/), [pcm.gg](https://pcm.gg) (short link) [mcon.vercel.app](https://mcon.vercel.app/) or the GitHub pages deploy. Every commit from the `develop` (default) branch is deployed to [s.mcraft.fun](https://s.mcraft.fun/) - so it's usually newer, but might be less stable.
+You can try this out at [mcraft.fun](https://mcraft.fun/), [pcm.gg](https://pcm.gg) (short link), [mcon.vercel.app](https://mcon.vercel.app/) or the GitHub pages deploy. Every commit from the default (`develop`) branch is deployed to [s.mcraft.fun](https://s.mcraft.fun/) and [s.pcm.gg](https://s.pcm.gg/) - so it's usually newer, but might be less stable.
 
-For building the project yourself / contributing, see [Development, Debugging & Contributing](#development-debugging--contributing). If you encounter any bugs or usability issues, please report them!
+Don't confuse with [Eaglercraft](https://git.eaglercraft.rip/eaglercraft/eaglercraft-1.8) that is a REAL vanilla Minecraft Java edition port to the web. Eaglercraft is a fully playable solution, but this project is more in position of a "technical demo" to show how it's possible to build games for web at scale entirely in JS ecosystem.
+
+For building the project yourself / contributing, see [Development, Debugging & Contributing](#development-debugging--contributing). For reference at what and how web technologies / frameworks are used, see [TECH.md](./TECH.md).
 
 ### Big Features
 
 - Open any zip world file or even folder in read-write mode!
 - Connect to Java servers running in both offline (cracked) and online mode* (it's possible because of proxy servers, see below)
 - Singleplayer mode with simple world generations!
-- Google Drive support for reading / saving worlds
+- Google Drive support for reading / saving worlds back to the cloud
 - Works offline
 - Play with friends over internet! (P2P is powered by Peer.js discovery servers)
 - First-class touch (mobile) & controller support
diff --git a/TECH.md b/TECH.md
new file mode 100644
index 00000000..eca13dce
--- /dev/null
+++ b/TECH.md
@@ -0,0 +1,47 @@
+### Eaglercraft Comparison
+
+This project uses proxies, Eaglercraft uses relays to connect to vanilla servers from the browser, these serve the same purpose but have different implementations. Though they have the same limitations such as increased latency and servers will complain about using VPN.
+
+| Feature                           | This project | Eaglercraft | Description                                                                                                                                                                                                              |
+| --------------------------------- | ------------ | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| General                           |              |             |                                                                                                                                                                                                                          |
+| Mobile Support (touch)            | ✅(+)         | ✅           |                                                                                                                                                                                                                          |
+| Gamepad Support                   | ✅            | ❌           |                                                                                                                                                                                                                          |
+| Game Features                     |              |             |                                                                                                                                                                                                                          |
+| Servers Support (quality)         | ❌            | ✅           | Eaglercraft is vanilla Minecraft, while this project tries to emulate original game behavior at protocol level (Mineflayer is used)                                                                                      |
+| Servers Support (any version)     | ✅            | ❌           | We support almost all Minecraft versions, only important if you connect to a server where you need new content like blocks or if you play with friends                                                                   |
+| Singleplayer Survival Features    | ❌            | ✅           | Just like Eaglercraft this project can generate and save worlds, but generator is simple and only a few survival features are supported (look here for [supported features list](https://github.com/zardoy/space-squid)) |
+| Singleplayer Maps                 | ✅            | ✅           | We support any version, but adventure maps won't work, but simple parkour and build maps might be interesting to explore...                                                                                              |
+| Singleplayer Maps World Streaming | ✅            | ❌           | Thanks to Browserfs, saves can be loaded to local singleplayer server using multiple ways: from local folder, server directory (not zip), dropbox or other cloud *backend* etc...                                        |
+| P2P Multiplayer                   | ✅            | ✅           | A way to connect to other browser running the project. But it's almost useless here since many survival features are not implemented. Maybe only to build / explore maps together...                                     |
+| Voice Chat                        | ❌            | ✅           | Eaglercraft has custom WebRTC voice chat implementation, though it could also be easily implemented there                                                                                                                |
+| Online Servers                    | ✅            | ❌           | We have custom implementation (including integration on proxy side) for joining to servers                                                                                                                               |
+| Graphics                          |              |             |                                                                                                                                                                                                                          |
+| Fancy Graphics                    | ❌            | ✅           | While Eaglercraft has top-level shaders we don't even support lighting                                                                                                                                                   |
+| Fast & Efficient Graphics         | ❌(+)         | ❌           | Feels like no one needs to have 64 rendering distance work smoothly                                                                                                                                                      |
+| VR                                | ✅            | ❌           | Feels like not needed feature. UI is missing in this project since DOM can't be rendered in VR so Eaglercraft could be better in that aspect                                                                             |
+| Minimap                           | ✅(-)         | ❌           | We have buggy minimap, which can be enabled in settings and full map is opened by pressing `M` key                                                                                                                       |
+| Plugin Features                   | ✅            | ❌           | We have Mineflayer plugins support, like Auto Jump & Auto Parkour was added here that way                                                                                                                                |
+
+Features available to only this project:
+
+- CSS & JS Customization
+- JS Real Time Debugging & Console Scripting (eg Devtools)
+
+### Tech Stack
+
+Bundler: Rsbuild!
+UI: powered by React and css modules. Storybook helps with UI development.
+
+### Rare WEB Features
+
+There are a number of web features that are not commonly used but you might be interested in them if you decide to build your own game in the web.
+
+TODO
+
+| API                                                    | Usage & Description                                                                                                                           |
+| ------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------- |
+| `Crypto` API                                           | Used to make chat features work when joining online servers with authentication.                                                              |
+| `requestPointerLock({ unadjustedMovement: true })` API | Required for games. Disables system mouse acceleration (important for Mac users)                                                              |
+| `navigator.keyboard.lock()`                            | (only in Chromium browsers) When entering fullscreen it allows to use any key combination like ctrl+w in the game                             |
+| `navigator.keyboard.getLayoutMap()`                    | (only in Chromium browsers) To display the right keyboard symbol for the key keybinding on different keyboard layouts (e.g. QWERTY vs AZERTY) |

From 652120c71b63f5c2b979b4b94c20f7ecb0fc090e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 15 Dec 2024 17:48:05 +0300
Subject: [PATCH 089/753] docs: more eaglercraft comparison

---
 TECH.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/TECH.md b/TECH.md
index eca13dce..b1d14908 100644
--- a/TECH.md
+++ b/TECH.md
@@ -7,6 +7,7 @@ This project uses proxies, Eaglercraft uses relays to connect to vanilla servers
 | General                           |              |             |                                                                                                                                                                                                                          |
 | Mobile Support (touch)            | ✅(+)         | ✅           |                                                                                                                                                                                                                          |
 | Gamepad Support                   | ✅            | ❌           |                                                                                                                                                                                                                          |
+| A11Y                              | ✅            | ❌           | We have DOM for almost all UI so your extensions and other browser features will work natively like on any other web page (but maybe it's not needed)                                                                    |
 | Game Features                     |              |             |                                                                                                                                                                                                                          |
 | Servers Support (quality)         | ❌            | ✅           | Eaglercraft is vanilla Minecraft, while this project tries to emulate original game behavior at protocol level (Mineflayer is used)                                                                                      |
 | Servers Support (any version)     | ✅            | ❌           | We support almost all Minecraft versions, only important if you connect to a server where you need new content like blocks or if you play with friends                                                                   |
@@ -16,12 +17,17 @@ This project uses proxies, Eaglercraft uses relays to connect to vanilla servers
 | P2P Multiplayer                   | ✅            | ✅           | A way to connect to other browser running the project. But it's almost useless here since many survival features are not implemented. Maybe only to build / explore maps together...                                     |
 | Voice Chat                        | ❌            | ✅           | Eaglercraft has custom WebRTC voice chat implementation, though it could also be easily implemented there                                                                                                                |
 | Online Servers                    | ✅            | ❌           | We have custom implementation (including integration on proxy side) for joining to servers                                                                                                                               |
+| Plugin Features                   | ✅            | ❌           | We have Mineflayer plugins support, like Auto Jump & Auto Parkour was added here that way                                                                                                                                |
+| Direct Connection                 | ❌            | ✅           | We have DOM for almost all UI so your extensions and other browser features will work natively like on any other web page                                                                                                |
+| Mods                              | ❌(roadmap)   | ❌           | This project will support mods for singleplayer. In theory its possible to implement support for modded servers on protocol level (including all needed mods)                                                            |
+| Video Recording                   | ❌            | ✅           | Don't feel needed                                                                                                                                                                                                        |
+| Metaverse Features                | ❌(roadmap)   | ❌           | Iframes, video streams inside of game world (custom protocol channel)                                                                                                                                                    |
 | Graphics                          |              |             |                                                                                                                                                                                                                          |
 | Fancy Graphics                    | ❌            | ✅           | While Eaglercraft has top-level shaders we don't even support lighting                                                                                                                                                   |
 | Fast & Efficient Graphics         | ❌(+)         | ❌           | Feels like no one needs to have 64 rendering distance work smoothly                                                                                                                                                      |
 | VR                                | ✅            | ❌           | Feels like not needed feature. UI is missing in this project since DOM can't be rendered in VR so Eaglercraft could be better in that aspect                                                                             |
-| Minimap                           | ✅(-)         | ❌           | We have buggy minimap, which can be enabled in settings and full map is opened by pressing `M` key                                                                                                                       |
-| Plugin Features                   | ✅            | ❌           | We have Mineflayer plugins support, like Auto Jump & Auto Parkour was added here that way                                                                                                                                |
+| AR                                | ❌            | ❌           | Would be the most useless feature                                                                                                                                                                                        |
+| Minimap & Waypoints               | ✅(-)         | ❌           | We have buggy minimap, which can be enabled in settings and full map is opened by pressing `M` key                                                                                                                       |
 
 Features available to only this project:
 

From 45b8ae6f7ca5da96c3980111b602a6aafe54d266 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 15 Dec 2024 17:54:22 +0300
Subject: [PATCH 090/753] docs: more comparison eagler

---
 TECH.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/TECH.md b/TECH.md
index b1d14908..c557e1e2 100644
--- a/TECH.md
+++ b/TECH.md
@@ -22,6 +22,9 @@ This project uses proxies, Eaglercraft uses relays to connect to vanilla servers
 | Mods                              | ❌(roadmap)   | ❌           | This project will support mods for singleplayer. In theory its possible to implement support for modded servers on protocol level (including all needed mods)                                                            |
 | Video Recording                   | ❌            | ✅           | Don't feel needed                                                                                                                                                                                                        |
 | Metaverse Features                | ❌(roadmap)   | ❌           | Iframes, video streams inside of game world (custom protocol channel)                                                                                                                                                    |
+| Sounds                            | ✅            | ✅(-)        | Eaglercraft has reduced sound quality, but better general support for them                                                                                                                                               |
+| Resource Packs                    | ✅(--)        | ✅(-)        | Eaglercraft obviously don't support server resource pack, but this project has very limited support for them (only textures images are loadable for now)                                                                 |
+| Assets Compressing                | ✅            | ✅❌          | We have advanced Minecraft data processing and good code chunk splitting so the web app will open faster and use less memory                                                                                             |
 | Graphics                          |              |             |                                                                                                                                                                                                                          |
 | Fancy Graphics                    | ❌            | ✅           | While Eaglercraft has top-level shaders we don't even support lighting                                                                                                                                                   |
 | Fast & Efficient Graphics         | ❌(+)         | ❌           | Feels like no one needs to have 64 rendering distance work smoothly                                                                                                                                                      |

From ee257d7916ba00532febed635ce2c50e0bdcc632 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Mon, 16 Dec 2024 19:16:58 +0300
Subject: [PATCH 091/753] Docs eaglercraft change (#239)

A lot misleading information removed
---
 README.MD |  2 +-
 TECH.md   | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.MD b/README.MD
index b2220a74..6b8bdc97 100644
--- a/README.MD
+++ b/README.MD
@@ -6,7 +6,7 @@ Minecraft **clone** rewritten in TypeScript using the best modern web technologi
 
 You can try this out at [mcraft.fun](https://mcraft.fun/), [pcm.gg](https://pcm.gg) (short link), [mcon.vercel.app](https://mcon.vercel.app/) or the GitHub pages deploy. Every commit from the default (`develop`) branch is deployed to [s.mcraft.fun](https://s.mcraft.fun/) and [s.pcm.gg](https://s.pcm.gg/) - so it's usually newer, but might be less stable.
 
-Don't confuse with [Eaglercraft](https://git.eaglercraft.rip/eaglercraft/eaglercraft-1.8) that is a REAL vanilla Minecraft Java edition port to the web. Eaglercraft is a fully playable solution, but this project is more in position of a "technical demo" to show how it's possible to build games for web at scale entirely in JS ecosystem.
+Don't confuse with [Eaglercraft](https://git.eaglercraft.rip/eaglercraft/eaglercraft-1.8) which is a REAL vanilla Minecraft Java edition port to the web (but with its own limitations). Eaglercraft is a fully playable solution, but this project is more in position of a "technical demo" to show how it's possible to build games for web at scale entirely with the JS ecosystem. Have fun!
 
 For building the project yourself / contributing, see [Development, Debugging & Contributing](#development-debugging--contributing). For reference at what and how web technologies / frameworks are used, see [TECH.md](./TECH.md).
 
diff --git a/TECH.md b/TECH.md
index c557e1e2..3ea76719 100644
--- a/TECH.md
+++ b/TECH.md
@@ -1,6 +1,7 @@
 ### Eaglercraft Comparison
 
-This project uses proxies, Eaglercraft uses relays to connect to vanilla servers from the browser, these serve the same purpose but have different implementations. Though they have the same limitations such as increased latency and servers will complain about using VPN.
+This project uses proxies so you can connect to almost any vanilla server. Though proxies have some limitations such as increased latency and servers will complain about using VPN (though we have a workaround for that, but ping will be much higher).
+This client generally has better performance but some features reproduction might be inaccurate eg its less stable and more buggy in some cases.
 
 | Feature                           | This project | Eaglercraft | Description                                                                                                                                                                                                              |
 | --------------------------------- | ------------ | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
@@ -10,7 +11,7 @@ This project uses proxies, Eaglercraft uses relays to connect to vanilla servers
 | A11Y                              | ✅            | ❌           | We have DOM for almost all UI so your extensions and other browser features will work natively like on any other web page (but maybe it's not needed)                                                                    |
 | Game Features                     |              |             |                                                                                                                                                                                                                          |
 | Servers Support (quality)         | ❌            | ✅           | Eaglercraft is vanilla Minecraft, while this project tries to emulate original game behavior at protocol level (Mineflayer is used)                                                                                      |
-| Servers Support (any version)     | ✅            | ❌           | We support almost all Minecraft versions, only important if you connect to a server where you need new content like blocks or if you play with friends                                                                   |
+| Servers Support (any version, ip)     | ✅            | ❌           | We support almost all Minecraft versions, only important if you connect to a server where you need new content like blocks or if you play with friends. And you can connect to almost any server using proxy servers!                                                                   |
 | Singleplayer Survival Features    | ❌            | ✅           | Just like Eaglercraft this project can generate and save worlds, but generator is simple and only a few survival features are supported (look here for [supported features list](https://github.com/zardoy/space-squid)) |
 | Singleplayer Maps                 | ✅            | ✅           | We support any version, but adventure maps won't work, but simple parkour and build maps might be interesting to explore...                                                                                              |
 | Singleplayer Maps World Streaming | ✅            | ❌           | Thanks to Browserfs, saves can be loaded to local singleplayer server using multiple ways: from local folder, server directory (not zip), dropbox or other cloud *backend* etc...                                        |
@@ -22,9 +23,9 @@ This project uses proxies, Eaglercraft uses relays to connect to vanilla servers
 | Mods                              | ❌(roadmap)   | ❌           | This project will support mods for singleplayer. In theory its possible to implement support for modded servers on protocol level (including all needed mods)                                                            |
 | Video Recording                   | ❌            | ✅           | Don't feel needed                                                                                                                                                                                                        |
 | Metaverse Features                | ❌(roadmap)   | ❌           | Iframes, video streams inside of game world (custom protocol channel)                                                                                                                                                    |
-| Sounds                            | ✅            | ✅(-)        | Eaglercraft has reduced sound quality, but better general support for them                                                                                                                                               |
-| Resource Packs                    | ✅(--)        | ✅(-)        | Eaglercraft obviously don't support server resource pack, but this project has very limited support for them (only textures images are loadable for now)                                                                 |
-| Assets Compressing                | ✅            | ✅❌          | We have advanced Minecraft data processing and good code chunk splitting so the web app will open faster and use less memory                                                                                             |
+| Sounds                            | ✅            | ✅       |                                                                                                                                                |
+| Resource Packs                    | ✅(--)        | ✅        | This project has very limited support for them (only textures images are loadable for now)                                                                 |
+| Assets Compressing & Splitting                | ✅            | ❌          | We have advanced Minecraft data processing and good code chunk splitting so the web app will open much faster and use less memory                                                                                             |
 | Graphics                          |              |             |                                                                                                                                                                                                                          |
 | Fancy Graphics                    | ❌            | ✅           | While Eaglercraft has top-level shaders we don't even support lighting                                                                                                                                                   |
 | Fast & Efficient Graphics         | ❌(+)         | ❌           | Feels like no one needs to have 64 rendering distance work smoothly                                                                                                                                                      |
@@ -51,6 +52,6 @@ TODO
 | API                                                    | Usage & Description                                                                                                                           |
 | ------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------- |
 | `Crypto` API                                           | Used to make chat features work when joining online servers with authentication.                                                              |
-| `requestPointerLock({ unadjustedMovement: true })` API | Required for games. Disables system mouse acceleration (important for Mac users)                                                              |
+| `requestPointerLock({ unadjustedMovement: true })` API | Required for games. Disables system mouse acceleration (important for Mac users). Aka mouse raw input                                                              |
 | `navigator.keyboard.lock()`                            | (only in Chromium browsers) When entering fullscreen it allows to use any key combination like ctrl+w in the game                             |
 | `navigator.keyboard.getLayoutMap()`                    | (only in Chromium browsers) To display the right keyboard symbol for the key keybinding on different keyboard layouts (e.g. QWERTY vs AZERTY) |

From 7b0ead559547c32be9035e45b110456136381bb5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 17 Dec 2024 11:00:40 +0300
Subject: [PATCH 092/753] fix renderer string

---
 prismarine-viewer/viewer/lib/worldrendererThree.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/worldrendererThree.ts b/prismarine-viewer/viewer/lib/worldrendererThree.ts
index 4d317354..36008797 100644
--- a/prismarine-viewer/viewer/lib/worldrendererThree.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererThree.ts
@@ -36,7 +36,7 @@ export class WorldRendererThree extends WorldRendererCommon {
 
   constructor (public scene: THREE.Scene, public renderer: THREE.WebGLRenderer, public config: WorldRendererConfig) {
     super(config)
-    this.rendererDevice = String(WorldRendererThree.getRendererInfo(this.renderer))
+    this.rendererDevice = `${WorldRendererThree.getRendererInfo(this.renderer)} powered by three.js r${THREE.REVISION}`
     this.starField = new StarField(scene)
     this.holdingBlock = new HoldingBlock()
     this.holdingBlockLeft = new HoldingBlock()
@@ -422,7 +422,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   static getRendererInfo (renderer: THREE.WebGLRenderer) {
     try {
       const gl = renderer.getContext()
-      return `${gl.getParameter(gl.getExtension('WEBGL_debug_renderer_info')!.UNMASKED_RENDERER_WEBGL)} powered by three.js r{THREE.REVISION}`
+      return `${gl.getParameter(gl.getExtension('WEBGL_debug_renderer_info')!.UNMASKED_RENDERER_WEBGL)}`
     } catch (err) {
       console.warn('Failed to get renderer info', err)
     }

From 064d70480df479d74d3ccc375be7b1720698851b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 18 Dec 2024 09:06:31 +0300
Subject: [PATCH 093/753] fix: a lot of edge case world block updates fixes &
 improvements. Fix all known visual incosistencies after chunk edge block
 updates, make them faster

---
 prismarine-viewer/examples/baseScene.ts       |  57 ++++--
 .../examples/scenes/frequentUpdates.ts        | 162 ++++++++++++------
 prismarine-viewer/viewer/lib/viewer.ts        |  10 +-
 .../viewer/lib/worldrendererCommon.ts         |  80 +++++++--
 4 files changed, 226 insertions(+), 83 deletions(-)

diff --git a/prismarine-viewer/examples/baseScene.ts b/prismarine-viewer/examples/baseScene.ts
index 4b01abcd..daa56fcc 100644
--- a/prismarine-viewer/examples/baseScene.ts
+++ b/prismarine-viewer/examples/baseScene.ts
@@ -24,6 +24,7 @@ window.THREE = THREE
 
 export class BasePlaygroundScene {
   continuousRender = false
+  stopRender = false
   guiParams = {}
   viewDistance = 0
   targetPos = new Vec3(2, 90, 2)
@@ -49,6 +50,15 @@ export class BasePlaygroundScene {
   windowHidden = false
   world: ReturnType<typeof getSyncWorld>
 
+  _worldConfig = defaultWorldRendererConfig
+  get worldConfig () {
+    return this._worldConfig
+  }
+  set worldConfig (value) {
+    this._worldConfig = value
+    viewer.world.config = value
+  }
+
   constructor () {
     void this.initData().then(() => {
       this.addKeyboardShortcuts()
@@ -56,16 +66,19 @@ export class BasePlaygroundScene {
   }
 
   onParamsUpdate (paramName: string, object: any) {}
-  updateQs () {
+  updateQs (paramName: string, valueSet: any) {
     if (this.skipUpdateQs) return
-    const oldQs = new URLSearchParams(window.location.search)
-    const newQs = new URLSearchParams()
-    if (oldQs.get('scene')) {
-      newQs.set('scene', oldQs.get('scene')!)
-    }
-    for (const [key, value] of Object.entries(this.params)) {
-      if (!value || typeof value === 'function' || this.params.skipQs?.includes(key) || this.alwaysIgnoreQs.includes(key)) continue
-      newQs.set(key, value)
+    const newQs = new URLSearchParams(window.location.search)
+    // if (oldQs.get('scene')) {
+    //   newQs.set('scene', oldQs.get('scene')!)
+    // }
+    for (const [key, value] of Object.entries({ [paramName]: valueSet })) {
+      if (typeof value === 'function' || this.params.skipQs?.includes(key) || this.alwaysIgnoreQs.includes(key)) continue
+      if (value) {
+        newQs.set(key, value)
+      } else {
+        newQs.delete(key)
+      }
     }
     window.history.replaceState({}, '', `${window.location.pathname}?${newQs.toString()}`)
   }
@@ -89,7 +102,9 @@ export class BasePlaygroundScene {
       if (option?.hide) continue
       this.gui.add(this.params, param, option?.options ?? option?.min, option?.max)
     }
-    this.gui.open(false)
+    if (window.innerHeight < 700) {
+      this.gui.open(false)
+    }
 
     this.gui.onChange(({ property, object }) => {
       if (object === this.params) {
@@ -101,16 +116,18 @@ export class BasePlaygroundScene {
             window.location.reload()
           })
         }
+        this.updateQs(property, value)
       } else {
         this.onParamsUpdate(property, object)
       }
-      this.updateQs()
     })
   }
 
   // mainChunk: import('prismarine-chunk/types/index').PCChunk
 
+  // overridables
   setupWorld () { }
+  sceneReset () {}
 
   // eslint-disable-next-line max-params
   addWorldBlock (xOffset: number, yOffset: number, zOffset: number, blockName: BlockNames, properties?: Record<string, any>) {
@@ -159,8 +176,9 @@ export class BasePlaygroundScene {
     renderer.setSize(window.innerWidth, window.innerHeight)
 
     // Create viewer
-    const viewer = new Viewer(renderer, { ...defaultWorldRendererConfig, numWorkers: 6 })
+    const viewer = new Viewer(renderer, this.worldConfig)
     window.viewer = viewer
+    window.world = window.viewer.world
     const isWebgpu = false
     const promises = [] as Array<Promise<void>>
     if (isWebgpu) {
@@ -269,12 +287,14 @@ export class BasePlaygroundScene {
 
   loop () {
     if (this.continuousRender && !this.windowHidden) {
-      this.render()
+      this.render(true)
       requestAnimationFrame(() => this.loop())
     }
   }
 
-  render () {
+  render (fromLoop = false) {
+    if (!fromLoop && this.continuousRender) return
+    if (this.stopRender) return
     statsStart()
     viewer.render()
     statsEnd()
@@ -287,8 +307,13 @@ export class BasePlaygroundScene {
           this.controls?.reset()
           this.resetCamera()
         }
-        if (e.code === 'KeyE') {
-          worldView?.setBlockStateId(this.targetPos, this.world.getBlockStateId(this.targetPos))
+        if (e.code === 'KeyE') { // refresh block (main)
+          worldView!.setBlockStateId(this.targetPos, this.world.getBlockStateId(this.targetPos))
+        }
+        if (e.code === 'KeyF') { // reload all chunks
+          this.sceneReset()
+          worldView!.unloadAllChunks()
+          void worldView!.init(this.targetPos)
         }
       }
     })
diff --git a/prismarine-viewer/examples/scenes/frequentUpdates.ts b/prismarine-viewer/examples/scenes/frequentUpdates.ts
index 6b0718f4..bc401255 100644
--- a/prismarine-viewer/examples/scenes/frequentUpdates.ts
+++ b/prismarine-viewer/examples/scenes/frequentUpdates.ts
@@ -1,3 +1,4 @@
+import { Vec3 } from 'vec3'
 import { BasePlaygroundScene } from '../baseScene'
 
 export default class extends BasePlaygroundScene {
@@ -6,69 +7,125 @@ export default class extends BasePlaygroundScene {
 
   override initGui (): void {
     this.params = {
-      squareSize: 50
+      testActive: false,
+      testUpdatesPerSecond: 10,
+      testInitialUpdate: false,
+      stopGeometryUpdate: false,
+      manualTest: () => {
+        this.updateBlock()
+      },
+      testNeighborUpdates: () => {
+        this.testNeighborUpdates()
+      }
     }
 
     super.initGui()
   }
 
+  lastUpdatedOffset = 0
+  lastUpdatedId = 2
+  updateBlock () {
+    const x = this.lastUpdatedOffset % 16
+    const z = Math.floor(this.lastUpdatedOffset / 16)
+    const y = 90
+    worldView!.setBlockStateId(new Vec3(x, y, z), this.lastUpdatedId++)
+    this.lastUpdatedOffset++
+    if (this.lastUpdatedOffset > 16 * 16) this.lastUpdatedOffset = 0
+    if (this.lastUpdatedId > 500) this.lastUpdatedId = 1
+  }
+
+  testNeighborUpdates () {
+    viewer.world.setBlockStateId(new Vec3(15, 95, 15), 1)
+    viewer.world.setBlockStateId(new Vec3(0, 95, 15), 1)
+    viewer.world.setBlockStateId(new Vec3(15, 95, 0), 1)
+    viewer.world.setBlockStateId(new Vec3(0, 95, 0), 1)
+
+    viewer.world.setBlockStateId(new Vec3(16, 95, 15), 1)
+    viewer.world.setBlockStateId(new Vec3(-1, 95, 15), 1)
+    viewer.world.setBlockStateId(new Vec3(15, 95, -1), 1)
+    viewer.world.setBlockStateId(new Vec3(-1, 95, 0), 1)
+    setTimeout(() => {
+      viewer.world.setBlockStateId(new Vec3(16, 96, 16), 1)
+      viewer.world.setBlockStateId(new Vec3(-1, 96, 16), 1)
+      viewer.world.setBlockStateId(new Vec3(16, 96, -1), 1)
+      viewer.world.setBlockStateId(new Vec3(-1, 96, -1), 1)
+    }, 3000)
+  }
+
   setupTimer () {
+    // this.stopRender = true
+
+    let lastTime = 0
+    const tick = () => {
+      viewer.world.debugStopGeometryUpdate = this.params.stopGeometryUpdate
+      const updateEach = 1000 / this.params.testUpdatesPerSecond
+      requestAnimationFrame(tick)
+      if (!this.params.testActive) return
+      const updateCount = Math.floor(performance.now() - lastTime) / updateEach
+      for (let i = 0; i < updateCount; i++) {
+        this.updateBlock()
+      }
+      lastTime = performance.now()
+    }
+
+    requestAnimationFrame(tick)
+
     // const limit = 1000
     // const limit = 100
-    const limit = 1
-    const updatedChunks = new Set<string>()
-    const updatedBlocks = new Set<string>()
-    let lastSecond = 0
-    setInterval(() => {
-      const second = Math.floor(performance.now() / 1000)
-      if (lastSecond !== second) {
-        lastSecond = second
-        updatedChunks.clear()
-        updatedBlocks.clear()
-      }
-      const isEven = second % 2 === 0
-      if (updatedBlocks.size > limit) {
-        return
-      }
-      const changeBlock = (x, z) => {
-        const chunkKey = `${Math.floor(x / 16)},${Math.floor(z / 16)}`
-        const key = `${x},${z}`
-        if (updatedBlocks.has(chunkKey)) return
+    // const limit = 1
+    // const updatedChunks = new Set<string>()
+    // const updatedBlocks = new Set<string>()
+    // let lastSecond = 0
+    // setInterval(() => {
+    //   const second = Math.floor(performance.now() / 1000)
+    //   if (lastSecond !== second) {
+    //     lastSecond = second
+    //     updatedChunks.clear()
+    //     updatedBlocks.clear()
+    //   }
+    //   const isEven = second % 2 === 0
+    //   if (updatedBlocks.size > limit) {
+    //     return
+    //   }
+    //   const changeBlock = (x, z) => {
+    //     const chunkKey = `${Math.floor(x / 16)},${Math.floor(z / 16)}`
+    //     const key = `${x},${z}`
+    //     if (updatedBlocks.has(chunkKey)) return
 
-        updatedChunks.add(chunkKey)
-        worldView!.world.setBlock(this.targetPos.offset(x, 0, z), this.Block.fromStateId(isEven ? 2 : 3, 0))
-        updatedBlocks.add(key)
-      }
-      const { squareSize } = this.params
-      const xStart = -squareSize
-      const zStart = -squareSize
-      const xEnd = squareSize
-      const zEnd = squareSize
-      for (let x = xStart; x <= xEnd; x += 16) {
-        for (let z = zStart; z <= zEnd; z += 16) {
-          const key = `${x},${z}`
-          if (updatedChunks.has(key)) continue
-          changeBlock(x, z)
-          return
-        }
-      }
-      // for (let x = xStart; x <= xEnd; x += 16) {
-      //   for (let z = zStart; z <= zEnd; z += 16) {
-      //     const key = `${x},${z}`
-      //     if (updatedChunks.has(key)) continue
-      //     changeBlock(x, z)
-      //     return
-      //   }
-      // }
-    }, 1)
+    //     updatedChunks.add(chunkKey)
+    //     worldView!.world.setBlock(this.targetPos.offset(x, 0, z), this.Block.fromStateId(isEven ? 2 : 3, 0))
+    //     updatedBlocks.add(key)
+    //   }
+    //   const { squareSize } = this.params
+    //   const xStart = -squareSize
+    //   const zStart = -squareSize
+    //   const xEnd = squareSize
+    //   const zEnd = squareSize
+    //   for (let x = xStart; x <= xEnd; x += 16) {
+    //     for (let z = zStart; z <= zEnd; z += 16) {
+    //       const key = `${x},${z}`
+    //       if (updatedChunks.has(key)) continue
+    //       changeBlock(x, z)
+    //       return
+    //     }
+    //   }
+    // for (let x = xStart; x <= xEnd; x += 16) {
+    //   for (let z = zStart; z <= zEnd; z += 16) {
+    //     const key = `${x},${z}`
+    //     if (updatedChunks.has(key)) continue
+    //     changeBlock(x, z)
+    //     return
+    //   }
+    // }
+    // }, 1)
   }
 
   setupWorld () {
-    this.params.squareSize ??= 30
-    const { squareSize } = this.params
-    const maxSquareSize = this.viewDistance * 16 * 2
-    if (squareSize > maxSquareSize) throw new Error(`Square size too big, max is ${maxSquareSize}`)
+    this.worldConfig.showChunkBorders = true
+
+    const maxSquareRadius = this.viewDistance * 16
     // const fullBlocks = loadedData.blocksArray.map(x => x.name)
+    const squareSize = maxSquareRadius
     for (let x = -squareSize; x <= squareSize; x++) {
       for (let z = -squareSize; z <= squareSize; z++) {
         const i = Math.abs(x + z) * squareSize
@@ -81,5 +138,10 @@ export default class extends BasePlaygroundScene {
       done = true
       this.setupTimer()
     })
+    setTimeout(() => {
+      if (this.params.testInitialUpdate) {
+        this.updateBlock()
+      }
+    })
   }
 }
diff --git a/prismarine-viewer/viewer/lib/viewer.ts b/prismarine-viewer/viewer/lib/viewer.ts
index 20f10284..c90bc811 100644
--- a/prismarine-viewer/viewer/lib/viewer.ts
+++ b/prismarine-viewer/viewer/lib/viewer.ts
@@ -107,7 +107,11 @@ export class Viewer {
       const sectionX = Math.floor(pos.x / 16) * 16
       const sectionZ = Math.floor(pos.z / 16) * 16
       if (this.world.queuedChunks.has(`${sectionX},${sectionZ}`)) {
-        await this.world.waitForChunkToLoad(pos)
+        await new Promise<void>(resolve => {
+          this.world.queuedFunctions.push(() => {
+            resolve()
+          })
+        })
       }
       if (!this.world.loadedChunks[`${sectionX},${sectionZ}`]) {
         console.debug('[should be unreachable] setBlockStateId called for unloaded chunk', pos)
@@ -222,6 +226,10 @@ export class Viewer {
               this.world.queuedChunks.delete(`${args[0]},${args[1]}`)
               this.addColumn(...args as Parameters<typeof this.addColumn>)
             }
+            for (const fn of this.world.queuedFunctions) {
+              fn()
+            }
+            this.world.queuedFunctions = []
             currentLoadChunkBatch = null
           }, this.addChunksBatchWaitTime)
         }
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
index ec649a14..4dc1ff90 100644
--- a/prismarine-viewer/viewer/lib/worldrendererCommon.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -30,6 +30,7 @@ export const worldCleanup = buildCleanupDecorator('resetWorld')
 export const defaultWorldRendererConfig = {
   showChunkBorders: false,
   numWorkers: 4,
+  isPlayground: false,
   // game renderer setting actually
   displayHand: false
 }
@@ -47,7 +48,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   threejsCursorLineMaterial: LineMaterial
   @worldCleanup()
   cursorBlock = null as Vec3 | null
-  isPlayground = false
   displayStats = true
   @worldCleanup()
   worldConfig = { minY: 0, worldHeight: 256 }
@@ -58,18 +58,24 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   active = false
 
   version = undefined as string | undefined
+  // #region CHUNK & SECTIONS TRACKING
   @worldCleanup()
   loadedChunks = {} as Record<string, boolean> // data is added for these chunks and they might be still processing
 
   @worldCleanup()
   finishedChunks = {} as Record<string, boolean> // these chunks are fully loaded into the world (scene)
 
+  @worldCleanup()
+  finishedSections = {} as Record<string, boolean> // these sections are fully loaded into the world (scene)
+
   @worldCleanup()
   // loading sections (chunks)
   sectionsWaiting = new Map<string, number>()
 
   @worldCleanup()
   queuedChunks = new Set<string>()
+  queuedFunctions = [] as Array<() => void>
+  // #endregion
 
   @worldCleanup()
   renderUpdateEmitter = new EventEmitter() as unknown as TypedEmitter<{
@@ -129,6 +135,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
   neighborChunkUpdates = true
   lastChunkDistance = 0
+  debugStopGeometryUpdate = false
 
   abstract outputFormat: 'threeJs' | 'webgpu'
 
@@ -157,7 +164,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       const worker: any = new Worker(src)
       const handleMessage = (data) => {
         if (!this.active) return
-        this.handleWorkerMessage(data)
+        if (data.type !== 'geometry' || !this.debugStopGeometryUpdate) {
+          this.handleWorkerMessage(data)
+        }
         if (data.type === 'geometry') {
           this.geometryReceiveCount[data.workerIndex] ??= 0
           this.geometryReceiveCount[data.workerIndex]++
@@ -174,7 +183,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         if (data.type === 'sectionFinished') { // on after load & unload section
           if (!this.sectionsWaiting.get(data.key)) throw new Error(`sectionFinished event for non-outstanding section ${data.key}`)
           this.sectionsWaiting.set(data.key, this.sectionsWaiting.get(data.key)! - 1)
-          if (this.sectionsWaiting.get(data.key) === 0) this.sectionsWaiting.delete(data.key)
+          if (this.sectionsWaiting.get(data.key) === 0) {
+            this.sectionsWaiting.delete(data.key)
+            this.finishedSections[data.key] = true
+          }
 
           const chunkCoords = data.key.split(',').map(Number)
           if (this.loadedChunks[`${chunkCoords[0]},${chunkCoords[2]}`]) { // ensure chunk data was added, not a neighbor chunk update
@@ -215,6 +227,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       if (allFinished) {
         this.allChunksLoaded?.()
         this.allChunksFinished = true
+        this.allLoadedIn ??= Date.now() - this.initialChunkLoadWasStartedIn!
       }
     }
   }
@@ -300,14 +313,15 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
   }
 
-  async updateTexturesData (resourcePackUpdate = false) {
+  async updateTexturesData (resourcePackUpdate = false, prioritizeBlockTextures?: string[]) {
     const blocksAssetsParser = new AtlasParser(this.blocksAtlases, blocksAtlasLatest, blocksAtlasLegacy)
     const itemsAssetsParser = new AtlasParser(this.itemsAtlases, itemsAtlasLatest, itemsAtlasLegacy)
+    const customBlockTextures = Object.keys(this.customTextures.blocks?.textures ?? {}).filter(x => x.includes('/'))
     const { atlas: blocksAtlas, canvas: blocksCanvas } = await blocksAssetsParser.makeNewAtlas(this.texturesVersion ?? this.version ?? 'latest', (textureName) => {
       const texture = this.customTextures?.blocks?.textures[textureName]
       if (!texture) return
       return texture
-    }, this.customTextures?.blocks?.tileSize)
+    }, /* this.customTextures?.blocks?.tileSize */undefined, prioritizeBlockTextures, customBlockTextures)
     const { atlas: itemsAtlas, canvas: itemsCanvas } = await itemsAssetsParser.makeNewAtlas(this.texturesVersion ?? this.version ?? 'latest', (textureName) => {
       const texture = this.customTextures?.items?.textures[textureName]
       if (!texture) return
@@ -397,9 +411,15 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
     delete this.finishedChunks[`${x},${z}`]
     this.allChunksFinished = Object.keys(this.finishedChunks).length === this.chunksLength
+    if (!this.allChunksFinished) {
+      this.allLoadedIn = undefined
+      this.initialChunkLoadWasStartedIn = undefined
+    }
     for (let y = this.worldConfig.minY; y < this.worldConfig.worldHeight; y += 16) {
       this.setSectionDirty(new Vec3(x, y, z), false)
+      delete this.finishedSections[`${x},${y},${z}`]
     }
+
     // remove from highestBlocks
     const startX = Math.floor(x / 16) * 16
     const startZ = Math.floor(z / 16) * 16
@@ -413,26 +433,54 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   setBlockStateId (pos: Vec3, stateId: number) {
-    const key = `${Math.floor(pos.x / 16) * 16},${Math.floor(pos.y / 16) * 16},${Math.floor(pos.z / 16) * 16}`
-    const useChangeWorker = !this.sectionsWaiting[key]
+    const needAoRecalculation = true
     for (const worker of this.workers) {
       worker.postMessage({ type: 'blockUpdate', pos, stateId })
     }
-    this.setSectionDirty(pos, true, useChangeWorker)
+    this.setSectionDirty(pos, true, true)
     if (this.neighborChunkUpdates) {
-      if ((pos.x & 15) === 0) this.setSectionDirty(pos.offset(-16, 0, 0), true, useChangeWorker)
-      if ((pos.x & 15) === 15) this.setSectionDirty(pos.offset(16, 0, 0), true, useChangeWorker)
-      if ((pos.y & 15) === 0) this.setSectionDirty(pos.offset(0, -16, 0), true, useChangeWorker)
-      if ((pos.y & 15) === 15) this.setSectionDirty(pos.offset(0, 16, 0), true, useChangeWorker)
-      if ((pos.z & 15) === 0) this.setSectionDirty(pos.offset(0, 0, -16), true, useChangeWorker)
-      if ((pos.z & 15) === 15) this.setSectionDirty(pos.offset(0, 0, 16), true, useChangeWorker)
+      if ((pos.x & 15) === 0) this.setSectionDirty(pos.offset(-16, 0, 0), true, true)
+      if ((pos.x & 15) === 15) this.setSectionDirty(pos.offset(16, 0, 0), true, true)
+      if ((pos.y & 15) === 0) this.setSectionDirty(pos.offset(0, -16, 0), true, true)
+      if ((pos.y & 15) === 15) this.setSectionDirty(pos.offset(0, 16, 0), true, true)
+      if ((pos.z & 15) === 0) this.setSectionDirty(pos.offset(0, 0, -16), true, true)
+      if ((pos.z & 15) === 15) this.setSectionDirty(pos.offset(0, 0, 16), true, true)
+
+      if (needAoRecalculation) {
+        // top view neighbors
+        if ((pos.x & 15) === 0 && (pos.z & 15) === 0) this.setSectionDirty(pos.offset(-16, 0, -16), true, true)
+        if ((pos.x & 15) === 15 && (pos.z & 15) === 0) this.setSectionDirty(pos.offset(16, 0, -16), true, true)
+        if ((pos.x & 15) === 0 && (pos.z & 15) === 15) this.setSectionDirty(pos.offset(-16, 0, 16), true, true)
+        if ((pos.x & 15) === 15 && (pos.z & 15) === 15) this.setSectionDirty(pos.offset(16, 0, 16), true, true)
+
+        // side view neighbors (but ignore updates above)
+        // z view neighbors
+        if ((pos.x & 15) === 0 && (pos.y & 15) === 0) this.setSectionDirty(pos.offset(-16, -16, 0), true, true)
+        if ((pos.x & 15) === 15 && (pos.y & 15) === 0) this.setSectionDirty(pos.offset(16, -16, 0), true, true)
+
+        // x view neighbors
+        if ((pos.z & 15) === 0 && (pos.y & 15) === 0) this.setSectionDirty(pos.offset(0, -16, -16), true, true)
+        if ((pos.z & 15) === 15 && (pos.y & 15) === 0) this.setSectionDirty(pos.offset(0, -16, 16), true, true)
+
+        // x & z neighbors
+        if ((pos.y & 15) === 0 && (pos.x & 15) === 0 && (pos.z & 15) === 0) this.setSectionDirty(pos.offset(-16, -16, -16), true, true)
+        if ((pos.y & 15) === 0 && (pos.x & 15) === 15 && (pos.z & 15) === 0) this.setSectionDirty(pos.offset(16, -16, -16), true, true)
+        if ((pos.y & 15) === 0 && (pos.x & 15) === 0 && (pos.z & 15) === 15) this.setSectionDirty(pos.offset(-16, -16, 16), true, true)
+        if ((pos.y & 15) === 0 && (pos.x & 15) === 15 && (pos.z & 15) === 15) this.setSectionDirty(pos.offset(16, -16, 16), true, true)
+      }
     }
   }
 
   queueAwaited = false
   messagesQueue = {} as { [workerIndex: string]: any[] }
 
-  getWorkerNumber (pos: Vec3) {
+  getWorkerNumber (pos: Vec3, updateAction = false) {
+    if (updateAction) {
+      const key = `${Math.floor(pos.x / 16) * 16},${Math.floor(pos.y / 16) * 16},${Math.floor(pos.z / 16) * 16}`
+      const cantUseChangeWorker = this.sectionsWaiting.get(key) && !this.finishedSections[key]
+      if (!cantUseChangeWorker) return 0
+    }
+
     const hash = mod(Math.floor(pos.x / 16) + Math.floor(pos.y / 16) + Math.floor(pos.z / 16), this.workers.length - 1)
     return hash + 1
   }
@@ -448,7 +496,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     // Dispatch sections to workers based on position
     // This guarantees uniformity accross workers and that a given section
     // is always dispatched to the same worker
-    const hash = useChangeWorker ? 0 : this.getWorkerNumber(pos)
+    const hash = this.getWorkerNumber(pos, useChangeWorker)
     this.sectionsWaiting.set(key, (this.sectionsWaiting.get(key) ?? 0) + 1)
     this.messagesQueue[hash] ??= []
     this.messagesQueue[hash].push({

From 51c1346456102ef660ca7e107e04c03667d45b47 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 18 Dec 2024 09:20:59 +0300
Subject: [PATCH 094/753] print debug duration

---
 src/topRightStats.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/topRightStats.ts b/src/topRightStats.ts
index fd717ef4..529aa964 100644
--- a/src/topRightStats.ts
+++ b/src/topRightStats.ts
@@ -114,14 +114,16 @@ const updateStatsPerSecAvg = () => {
 
 window.statsPerSec = {}
 let statsPerSecCurrent = {}
+let lastReset = performance.now()
 window.addStatPerSec = (name) => {
   statsPerSecCurrent[name] ??= 0
   statsPerSecCurrent[name]++
 }
 window.statsPerSecCurrent = statsPerSecCurrent
 setInterval(() => {
-  window.statsPerSec = statsPerSecCurrent
+  window.statsPerSec = { duration: Math.floor(performance.now() - lastReset), ...statsPerSecCurrent, }
   statsPerSecCurrent = {}
   window.statsPerSecCurrent = statsPerSecCurrent
   updateStatsPerSecAvg()
+  lastReset = performance.now()
 }, 1000)

From 2c0b99ffdbd6f6edcff84bdb6d0176f2b41efc4e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 18 Dec 2024 10:23:58 +0300
Subject: [PATCH 095/753] fix wrong cache hit on local dev

---
 src/connect.ts | 24 ++++++++++++++++++++++++
 src/index.ts   | 19 ++-----------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/connect.ts b/src/connect.ts
index 40a47669..09ee1542 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -1,4 +1,9 @@
+import { versionsByMinecraftVersion } from 'minecraft-data'
+import minecraftInitialDataJson from '../generated/minecraft-initial-data.json'
 import { AuthenticatedAccount } from './react/ServersListProvider'
+import { setLoadingScreenStatus } from './utils'
+import { downloadSoundsIfNeeded } from './soundSystem'
+import { miscUiState } from './globalState'
 
 export type ConnectOptions = {
   server?: string
@@ -17,3 +22,22 @@ export type ConnectOptions = {
   authenticatedAccount?: AuthenticatedAccount | true
   peerOptions?: any
 }
+
+export const downloadNeededDataOnConnect = async (version: string) => {
+  // todo expose cache
+  const initialDataVersion = Object.keys(minecraftInitialDataJson)[0]!
+  if (version === initialDataVersion) {
+    // ignore cache hit
+    versionsByMinecraftVersion.pc[initialDataVersion]!.dataVersion!++
+  }
+  setLoadingScreenStatus(`Loading data for ${version}`)
+  if (!document.fonts.check('1em mojangles')) {
+    // todo instead re-render signs on load
+    await document.fonts.load('1em mojangles').catch(() => {
+      console.error('Failed to load font, signs wont be rendered correctly')
+    })
+  }
+  await window._MC_DATA_RESOLVER.promise // ensure data is loaded
+  await downloadSoundsIfNeeded()
+  miscUiState.loadedDataVersion = version
+}
diff --git a/src/index.ts b/src/index.ts
index 93bbe6b9..a1fa8e3b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -93,7 +93,7 @@ import { saveToBrowserMemory } from './react/PauseScreen'
 import { ViewerWrapper } from 'prismarine-viewer/viewer/lib/viewerWrapper'
 import './devReload'
 import './water'
-import { ConnectOptions } from './connect'
+import { ConnectOptions, downloadNeededDataOnConnect } from './connect'
 import { ref, subscribe } from 'valtio'
 import { signInMessageState } from './react/SignInMessageProvider'
 import { updateAuthenticatedAccountData, updateLoadedServerData } from './react/ServersListProvider'
@@ -395,22 +395,7 @@ async function connect (connectOptions: ConnectOptions) {
         throw new Error('Microsoft authentication is only supported on 1.19.4 - 1.20.6 (at least for now)')
       }
 
-      // todo expose cache
-      const lastVersion = supportedVersions.at(-1)
-      if (version === lastVersion) {
-        // ignore cache hit
-        versionsByMinecraftVersion.pc[lastVersion]!['dataVersion']!++
-      }
-      setLoadingScreenStatus(`Loading data for ${version}`)
-      if (!document.fonts.check('1em mojangles')) {
-        // todo instead re-render signs on load
-        await document.fonts.load('1em mojangles').catch(() => {
-          console.error('Failed to load font, signs wont be rendered correctly')
-        })
-      }
-      await window._MC_DATA_RESOLVER.promise // ensure data is loaded
-      await downloadSoundsIfNeeded()
-      miscUiState.loadedDataVersion = version
+      await downloadNeededDataOnConnect(version)
       try {
         await resourcepackReload(version)
       } catch (err) {

From 961cf01a0e3c5090fc752694e57d12e0dc72dab0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 18 Dec 2024 11:01:50 +0300
Subject: [PATCH 096/753] allow inspectFn to be function eg for debugger
 statement

---
 src/devtools.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/devtools.ts b/src/devtools.ts
index e87b6d33..9aec8b77 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -43,8 +43,8 @@ customEvents.on('gameLoaded', () => {
   })
 })
 
-window.inspectPacket = (packetName, full = false) => {
-  const listener = (...args) => console.log('packet', packetName, full ? args : args[0])
+window.inspectPacket = (packetName, fullOrListener: boolean | ((...args) => void) = false) => {
+  const listener = typeof fullOrListener === 'function' ? fullOrListener : (...args) => console.log('packet', packetName, fullOrListener ? args : args[0])
   const attach = () => {
     bot?._client.prependListener(packetName, listener)
   }

From 10ee4c00aefaff663b534239ea839378b1378d6a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 18 Dec 2024 12:53:27 +0300
Subject: [PATCH 097/753] feat: initial support for websocket (direct
 connection) servers. mcraft-fun-mineflayer plugin

---
 src/connect.ts |  1 +
 src/index.ts   | 27 ++++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/connect.ts b/src/connect.ts
index 09ee1542..b7023880 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -21,6 +21,7 @@ export type ConnectOptions = {
   /** If true, will show a UI to authenticate with a new account */
   authenticatedAccount?: AuthenticatedAccount | true
   peerOptions?: any
+  viewerWsConnect?: string
 }
 
 export const downloadNeededDataOnConnect = async (version: string) => {
diff --git a/src/index.ts b/src/index.ts
index a1fa8e3b..0e481cd8 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -103,6 +103,7 @@ import { mainMenuState } from './react/MainMenuRenderApp'
 import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
+import { getWsProtocolStream } from './viewerConnector'
 
 window.debug = debug
 window.THREE = THREE
@@ -471,12 +472,20 @@ async function connect (connectOptions: ConnectOptions) {
       connectingServer: server.host
     }) : undefined
 
+    let clientDataStream
+    if (p2pMultiplayer) {
+      clientDataStream = await connectToPeer(connectOptions.peerId!, connectOptions.peerOptions)
+    }
+    if (connectOptions.viewerWsConnect) {
+      clientDataStream = await getWsProtocolStream(connectOptions.viewerWsConnect)
+    }
+
     bot = mineflayer.createBot({
       host: server.host,
       port: server.port ? +server.port : undefined,
       version: connectOptions.botVersion || false,
-      ...p2pMultiplayer ? {
-        stream: await connectToPeer(connectOptions.peerId!, connectOptions.peerOptions),
+      ...clientDataStream ? {
+        stream: clientDataStream,
       } : {},
       ...singleplayer || p2pMultiplayer ? {
         keepAlive: false,
@@ -559,12 +568,15 @@ async function connect (connectOptions: ConnectOptions) {
         return _supportFeature(feature)
       }) as typeof bot.supportFeature
 
+      bot.emit('inject_allowed')
+      bot._client.emit('connect')
+    } else if (connectOptions.viewerWsConnect) {
       bot.emit('inject_allowed')
       bot._client.emit('connect')
     } else {
       const setupConnectHandlers = () => {
         bot._client.socket.on('connect', () => {
-          console.log('WebSocket connection established')
+          console.log('Proxy WebSocket connection established')
           //@ts-expect-error
           bot._client.socket._ws.addEventListener('close', () => {
             console.log('WebSocket connection closed')
@@ -1039,6 +1051,15 @@ downloadAndOpenFile().then((downloadAction) => {
   if (qs.get('serversList')) {
     showModal({ reactType: 'serversList' })
   }
+
+  const viewerWsConnect = qs.get('viewerConnect')
+  if (viewerWsConnect) {
+    void connect({
+      username: `viewer-${Math.random().toString(36).slice(2, 10)}`,
+      botVersion: '1.21.1',
+      viewerWsConnect,
+    })
+  }
 }, (err) => {
   console.error(err)
   alert(`Failed to download file: ${err}`)

From 10e14bd675f7fdc6502d3d6a337f8c96a8bd0ec7 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 18 Dec 2024 12:53:54 +0300
Subject: [PATCH 098/753] add viewer connector impl

---
 src/viewerConnector.ts | 60 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 src/viewerConnector.ts

diff --git a/src/viewerConnector.ts b/src/viewerConnector.ts
new file mode 100644
index 00000000..5d4cc4fa
--- /dev/null
+++ b/src/viewerConnector.ts
@@ -0,0 +1,60 @@
+import { EventEmitter } from 'events'
+import { Duplex } from 'stream'
+import states from 'minecraft-protocol/src/states'
+import { createClient } from 'minecraft-protocol'
+
+class CustomDuplex extends Duplex {
+  constructor (options, public writeAction) {
+    super(options)
+  }
+
+  override _read () {}
+
+  override _write (chunk, encoding, callback) {
+    this.writeAction(chunk)
+    callback()
+  }
+}
+
+export const getWsProtocolStream = async (url: string) => {
+  if (url.startsWith(':')) url = `ws://localhost${url}`
+  if (!url.startsWith('ws')) url = `ws://${url}`
+  const ws = new WebSocket(url)
+  await new Promise<void>((resolve, reject) => {
+    ws.onopen = () => resolve()
+    ws.onerror = reject
+    ws.onclose = reject
+  })
+  const clientDuplex = new CustomDuplex(undefined, data => {
+    // console.log('send', Buffer.from(data).toString('hex'))
+    ws.send(data)
+  })
+  // todo use keep alive instead?
+  let lastMessageTime = performance.now()
+  ws.addEventListener('message', async (message) => {
+    let { data } = message
+    if (data instanceof Blob) {
+      data = await data.arrayBuffer()
+    }
+    clientDuplex.push(Buffer.from(data))
+    lastMessageTime = performance.now()
+  })
+  setInterval(() => {
+    if (performance.now() - lastMessageTime > 10_000) {
+      console.log('no packats received in 10s!')
+      clientDuplex.end()
+    }
+  }, 5000)
+
+  ws.addEventListener('close', () => {
+    console.log('ws closed')
+    clientDuplex.end()
+    // bot.emit('end', 'Disconnected.')
+  })
+
+  ws.addEventListener('error', err => {
+    console.log('ws error', err)
+  })
+
+  return clientDuplex
+}

From c289283e7fb7899fca127802e5344aea463edd13 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 18 Dec 2024 12:57:43 +0300
Subject: [PATCH 099/753] meaningful errors

---
 src/viewerConnector.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/viewerConnector.ts b/src/viewerConnector.ts
index 5d4cc4fa..f4984fea 100644
--- a/src/viewerConnector.ts
+++ b/src/viewerConnector.ts
@@ -22,8 +22,8 @@ export const getWsProtocolStream = async (url: string) => {
   const ws = new WebSocket(url)
   await new Promise<void>((resolve, reject) => {
     ws.onopen = () => resolve()
-    ws.onerror = reject
-    ws.onclose = reject
+    ws.onerror = (err) => reject(new Error(`Failed to connect to websocket ${url}`))
+    ws.onclose = (ev) => reject(ev.reason)
   })
   const clientDuplex = new CustomDuplex(undefined, data => {
     // console.log('send', Buffer.from(data).toString('hex'))

From b13c8df46918a99a8ac5c1eb3b1c8aefbae96b89 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 18 Dec 2024 13:59:55 +0300
Subject: [PATCH 100/753] implement auto version configuration for viewer

---
 src/index.ts           | 13 ++++++++----
 src/viewerConnector.ts | 47 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 0e481cd8..36eda63c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -103,7 +103,7 @@ import { mainMenuState } from './react/MainMenuRenderApp'
 import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
-import { getWsProtocolStream } from './viewerConnector'
+import { getViewerVersionData, getWsProtocolStream } from './viewerConnector'
 
 window.debug = debug
 window.THREE = THREE
@@ -377,7 +377,7 @@ async function connect (connectOptions: ConnectOptions) {
     signal: errorAbortController.signal
   })
 
-  if (proxy) {
+  if (proxy && !connectOptions.viewerWsConnect) {
     console.log(`using proxy ${proxy.host}:${proxy.port || location.port}`)
 
     net['setProxy']({ hostname: proxy.host, port: proxy.port })
@@ -477,6 +477,12 @@ async function connect (connectOptions: ConnectOptions) {
       clientDataStream = await connectToPeer(connectOptions.peerId!, connectOptions.peerOptions)
     }
     if (connectOptions.viewerWsConnect) {
+      const { version, time } = await getViewerVersionData(connectOptions.viewerWsConnect)
+      console.log('Latency:', Date.now() - time, 'ms')
+      // const version = '1.21.1'
+      connectOptions.botVersion = version
+      await downloadMcData(version)
+      setLoadingScreenStatus(`Connecting to WebSocket server ${connectOptions.viewerWsConnect}`)
       clientDataStream = await getWsProtocolStream(connectOptions.viewerWsConnect)
     }
 
@@ -571,7 +577,7 @@ async function connect (connectOptions: ConnectOptions) {
       bot.emit('inject_allowed')
       bot._client.emit('connect')
     } else if (connectOptions.viewerWsConnect) {
-      bot.emit('inject_allowed')
+      // bot.emit('inject_allowed')
       bot._client.emit('connect')
     } else {
       const setupConnectHandlers = () => {
@@ -1056,7 +1062,6 @@ downloadAndOpenFile().then((downloadAction) => {
   if (viewerWsConnect) {
     void connect({
       username: `viewer-${Math.random().toString(36).slice(2, 10)}`,
-      botVersion: '1.21.1',
       viewerWsConnect,
     })
   }
diff --git a/src/viewerConnector.ts b/src/viewerConnector.ts
index f4984fea..45d85bb0 100644
--- a/src/viewerConnector.ts
+++ b/src/viewerConnector.ts
@@ -16,15 +16,49 @@ class CustomDuplex extends Duplex {
   }
 }
 
-export const getWsProtocolStream = async (url: string) => {
+export const getViewerVersionData = async (url: string) => {
+  const ws = await openWebsocket(url)
+  ws.send('version')
+  return new Promise<{
+    version: string
+    time: number,
+    clientIgnoredPackets?: string[]
+  }>((resolve, reject) => {
+    ws.addEventListener('message', async (message) => {
+      const { data } = message
+      const parsed = JSON.parse(data.toString())
+      resolve(parsed)
+      ws.close()
+      // todo
+      customEvents.on('mineflayerBotCreated', () => {
+        const client = bot._client as any
+        const oldWrite = client.write.bind(client)
+        client.write = (...args) => {
+          const [name] = args
+          if (parsed?.clientIgnoredPackets?.includes(name)) {
+            return
+          }
+          oldWrite(...args)
+        }
+      })
+    })
+  })
+}
+
+const openWebsocket = async (url: string) => {
   if (url.startsWith(':')) url = `ws://localhost${url}`
   if (!url.startsWith('ws')) url = `ws://${url}`
   const ws = new WebSocket(url)
   await new Promise<void>((resolve, reject) => {
     ws.onopen = () => resolve()
-    ws.onerror = (err) => reject(new Error(`Failed to connect to websocket ${url}`))
+    ws.onerror = (err) => reject(new Error(`[websocket] Failed to connect to ${url}`))
     ws.onclose = (ev) => reject(ev.reason)
   })
+  return ws
+}
+
+export const getWsProtocolStream = async (url: string) => {
+  const ws = await openWebsocket(url)
   const clientDuplex = new CustomDuplex(undefined, data => {
     // console.log('send', Buffer.from(data).toString('hex'))
     ws.send(data)
@@ -40,10 +74,11 @@ export const getWsProtocolStream = async (url: string) => {
     lastMessageTime = performance.now()
   })
   setInterval(() => {
-    if (performance.now() - lastMessageTime > 10_000) {
-      console.log('no packats received in 10s!')
-      clientDuplex.end()
-    }
+    // if (clientDuplex.destroyed) return
+    // if (performance.now() - lastMessageTime > 10_000) {
+    //   console.log('no packats received in 10s!')
+    //   clientDuplex.end()
+    // }
   }, 5000)
 
   ws.addEventListener('close', () => {

From bf676cdf529f5a6c3a02ecce837ea0e54d2054d4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 18 Dec 2024 14:12:09 +0300
Subject: [PATCH 101/753] up mc-assets

---
 package.json                                 |  2 +-
 pnpm-lock.yaml                               | 10 +++++-----
 prismarine-viewer/viewer/lib/mesher/world.ts |  5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 4ed5a449..15b27b15 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.23",
+    "mc-assets": "^0.2.25",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7a89eb6d..c5ad3115 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -346,8 +346,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.23
-        version: 0.2.23
+        specifier: ^0.2.25
+        version: 0.2.25
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -6582,8 +6582,8 @@ packages:
     peerDependencies:
       react: ^18.2.0
 
-  mc-assets@0.2.23:
-    resolution: {integrity: sha512-sLbPhsSOYdW8nYllIyPZbVPnLu7V3bZTgIO4mI4nlG525q17NIbUNEjItHKtdi60u0vI6qLgHKjf0CoNRqa/Nw==}
+  mc-assets@0.2.25:
+    resolution: {integrity: sha512-MdtncPBC6kwIkYXsBsSEJGP+q2e+7Q4Wnb4j3FjS7gmafz50Vjp4E/S3MsM7H8R3FoDrjVIx6qR24l/rneW/Lw==}
     engines: {node: '>=18.0.0'}
 
   md5-file@4.0.0:
@@ -17453,7 +17453,7 @@ snapshots:
     dependencies:
       react: 18.2.0
 
-  mc-assets@0.2.23: {}
+  mc-assets@0.2.25: {}
 
   md5-file@4.0.0: {}
 
diff --git a/prismarine-viewer/viewer/lib/mesher/world.ts b/prismarine-viewer/viewer/lib/mesher/world.ts
index c69da751..be764681 100644
--- a/prismarine-viewer/viewer/lib/mesher/world.ts
+++ b/prismarine-viewer/viewer/lib/mesher/world.ts
@@ -6,6 +6,7 @@ import { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import moreBlockDataGeneratedJson from '../moreBlockDataGenerated.json'
 import legacyJson from '../../../../src/preflatMap.json'
 import { defaultMesherConfig } from './shared'
+import { INVISIBLE_BLOCKS } from './worldConstants'
 
 const ignoreAoBlocks = Object.keys(moreBlockDataGeneratedJson.noOcclusions)
 
@@ -178,7 +179,9 @@ export class World {
           properties: props,
         }, this.preflat)! // fixme! this is a hack (also need a setting for all versions)
         if (!block.models!.length) {
-          console.debug('[mesher] block to render not found', block.name, props)
+          if (block.name !== 'water' && block.name !== 'lava' && !INVISIBLE_BLOCKS.has(block.name)) {
+            console.debug('[mesher] block to render not found', block.name, props)
+          }
           block.models = null
         }
       } catch (err) {

From db7a9b9dd2c3f2dd825df34697a530caf12671aa Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 18 Dec 2024 22:22:11 +0300
Subject: [PATCH 102/753] feat: add zoom keybinding (Key - C)

---
 src/controls.ts      | 6 ++++++
 src/globalState.ts   | 1 +
 src/rendererUtils.ts | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/controls.ts b/src/controls.ts
index cb1c132b..4a6d1f6f 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -49,6 +49,7 @@ export const contro = new ControMax({
       chat: [['KeyT', 'Enter']],
       command: ['Slash'],
       swapHands: ['KeyF'],
+      zoom: ['KeyC'],
       selectItem: ['KeyH'] // default will be removed
     },
     ui: {
@@ -282,6 +283,9 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
       case 'general.interactPlace':
         document.dispatchEvent(new MouseEvent(pressed ? 'mousedown' : 'mouseup', { button: 2 }))
         break
+      case 'general.zoom':
+        gameAdditionalState.isZooming = pressed
+        break
     }
   }
 }
@@ -415,6 +419,8 @@ contro.on('trigger', ({ command }) => {
       case 'general.prevHotbarSlot':
         cycleHotbarSlot(-1)
         break
+      case 'general.zoom':
+        break
     }
   }
 
diff --git a/src/globalState.ts b/src/globalState.ts
index 90e3e359..54c5fc35 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -154,6 +154,7 @@ export const gameAdditionalState = proxy({
   isFlying: false,
   isSprinting: false,
   isSneaking: false,
+  isZooming: false,
   warps: [] as WorldWarp[]
 })
 
diff --git a/src/rendererUtils.ts b/src/rendererUtils.ts
index 6b83fd01..0a43ee1b 100644
--- a/src/rendererUtils.ts
+++ b/src/rendererUtils.ts
@@ -5,7 +5,7 @@ import { options } from './optionsStorage'
 export const watchFov = () => {
   const updateFov = () => {
     if (!bot) return
-    let fovSetting = options.fov
+    let fovSetting = gameAdditionalState.isZooming ? 30 : options.fov
     // todo check values and add transition
     if (bot.controlState.sprint && !bot.controlState.sneak) {
       fovSetting += 5
@@ -20,6 +20,7 @@ export const watchFov = () => {
   subscribeKey(options, 'fov', updateFov)
   subscribeKey(gameAdditionalState, 'isFlying', updateFov)
   subscribeKey(gameAdditionalState, 'isSprinting', updateFov)
+  subscribeKey(gameAdditionalState, 'isZooming', updateFov)
   subscribeKey(gameAdditionalState, 'isSneaking', () => {
     viewer.isSneaking = gameAdditionalState.isSneaking
     viewer.setFirstPersonCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch)

From 16fe17edf50ffa32e3f9a3856cd59ae3cca04bfe Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 18 Dec 2024 22:49:17 +0300
Subject: [PATCH 103/753] fix lint

---
 prismarine-viewer/viewer/lib/mesher/models.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prismarine-viewer/viewer/lib/mesher/models.ts b/prismarine-viewer/viewer/lib/mesher/models.ts
index 51a00a44..84c591a1 100644
--- a/prismarine-viewer/viewer/lib/mesher/models.ts
+++ b/prismarine-viewer/viewer/lib/mesher/models.ts
@@ -123,7 +123,7 @@ const isCube = (block: Block) => {
   if (block.isCube) return true
   if (!block.models?.length || block.models.length !== 1) return false
   // all variants
-  return block.models[0].every(v => v.elements!.every(e => {
+  return block.models[0].every(v => v.elements.every(e => {
     return e.from[0] === 0 && e.from[1] === 0 && e.from[2] === 0 && e.to[0] === 16 && e.to[1] === 16 && e.to[2] === 16
   }))
 }

From cb82963b86cd3e1540c49903cd3b8b19922cadf7 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Thu, 19 Dec 2024 13:24:39 +0100
Subject: [PATCH 104/753] feat: Armor Stand and armor model support (#242)

Co-authored-by: Vitaly <vital2580@icloud.com>
---
 prismarine-viewer/viewer/lib/entities.ts      | 226 ++++++++++++++++--
 .../viewer/lib/entity/EntityMesh.js           |  31 ++-
 .../viewer/lib/entity/armorModels.json        | 158 ++++++++++++
 .../viewer/lib/entity/armorModels.ts          |  36 +++
 .../viewer/lib/entity/entities.json           |  39 +--
 .../viewer/lib/entity/objModels.js            |   1 +
 6 files changed, 446 insertions(+), 45 deletions(-)
 create mode 100644 prismarine-viewer/viewer/lib/entity/armorModels.json
 create mode 100644 prismarine-viewer/viewer/lib/entity/armorModels.ts

diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index 47a0303e..efc80b5d 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -8,15 +8,19 @@ import { PlayerObject, PlayerAnimation } from 'skinview3d'
 import { loadSkinToCanvas, loadEarsToCanvasFromSkin, inferModelType, loadCapeToCanvas, loadImage } from 'skinview-utils'
 // todo replace with url
 import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
+import { degreesToRadians } from '@nxg-org/mineflayer-tracker/lib/mathUtils'
 import { NameTagObject } from 'skinview3d/libs/nametag'
 import { flat, fromFormattedString } from '@xmcl/text-component'
 import mojangson from 'mojangson'
 import { snakeCase } from 'change-case'
+import { Item } from 'prismarine-item'
 import { EntityMetadataVersions } from '../../../src/mcDataTypes'
 import * as Entity from './entity/EntityMesh'
+import { getMesh } from './entity/EntityMesh'
 import { WalkingGeneralSwing } from './entity/animations'
-import externalTexturesJson from './entity/externalTextures.json'
 import { disposeObject } from './threeJsUtils'
+import { armorModels } from './entity/objModels'
+const { loadTexture } = globalThis.isElectron ? require('./utils.electron.js') : require('./utils')
 
 export const TWEEN_DURATION = 120
 
@@ -57,6 +61,26 @@ function toQuaternion (quaternion: any, defaultValue?: THREE.Quaternion) {
   return new THREE.Quaternion(quaternion.x, quaternion.y, quaternion.z, quaternion.w)
 }
 
+function poseToEuler (pose: any, defaultValue?: THREE.Euler) {
+  if (pose === undefined) {
+    return defaultValue ?? new THREE.Euler()
+  }
+  if (pose instanceof THREE.Euler) {
+    return pose
+  }
+  if (pose['yaw'] !== undefined && pose['pitch'] !== undefined && pose['roll'] !== undefined) {
+    // Convert Minecraft pitch, yaw, roll definitions to our angle system
+    return new THREE.Euler(-degreesToRadians(pose.pitch), -degreesToRadians(pose.yaw), degreesToRadians(pose.roll), 'ZYX')
+  }
+  if (pose['x'] !== undefined && pose['y'] !== undefined && pose['z'] !== undefined) {
+    return new THREE.Euler(pose.z, pose.y, pose.x, 'ZYX')
+  }
+  if (Array.isArray(pose)) {
+    return new THREE.Euler(pose[0], pose[1], pose[2])
+  }
+  return defaultValue ?? new THREE.Euler()
+}
+
 function getUsernameTexture ({
   username,
   nameTagBackgroundColor = 'rgba(0, 0, 0, 0.3)',
@@ -369,13 +393,17 @@ export class Entities extends EventEmitter {
         return jsonLike.value
       }
       const parsed = typeof jsonLike === 'string' ? mojangson.simplify(mojangson.parse(jsonLike)) : nbt.simplify(jsonLike)
-      const text = flat(parsed).map(x => x.text)
+      const text = flat(parsed).map(this.textFromComponent)
       return text.join('')
     } catch (err) {
       return jsonLike
     }
   }
 
+  private textFromComponent (component) {
+    return typeof component === 'string' ? component : component.text ?? ''
+  }
+
   getItemMesh (item) {
     const textureUv = this.getItemUv?.(item.itemId ?? item.blockId)
     if (textureUv) {
@@ -418,14 +446,38 @@ export class Entities extends EventEmitter {
     }
   }
 
+  setVisible (mesh: THREE.Object3D, visible: boolean) {
+    //mesh.visible = visible
+    //TODO: Fix workaround for visibility setting
+    if (visible) {
+      mesh.scale.set(1, 1, 1)
+    } else {
+      mesh.scale.set(0, 0, 0)
+    }
+  }
+
   update (entity: import('prismarine-entity').Entity & { delete?; pos, name }, overrides) {
     const isPlayerModel = entity.name === 'player'
     if (entity.name === 'zombie' || entity.name === 'zombie_villager' || entity.name === 'husk') {
       overrides.texture = `textures/1.16.4/entity/${entity.name === 'zombie_villager' ? 'zombie_villager/zombie_villager.png' : `zombie/${entity.name}.png`}`
     }
-    if (!this.entities[entity.id] && !entity.delete) {
+    // this can be undefined in case where packet entity_destroy was sent twice (so it was already deleted)
+    let e = this.entities[entity.id]
+
+    if (entity.delete) {
+      if (!e) return
+      if (e.additionalCleanup) e.additionalCleanup()
+      this.emit('remove', entity)
+      this.scene.remove(e)
+      disposeObject(e)
+      // todo dispose textures as well ?
+      delete this.entities[entity.id]
+      return
+    }
+
+    let mesh
+    if (e === undefined) {
       const group = new THREE.Group()
-      let mesh
       if (entity.name === 'item') {
         const item = entity.metadata?.find((m: any) => typeof m === 'object' && m?.itemCount)
         if (item) {
@@ -508,7 +560,8 @@ export class Entities extends EventEmitter {
       boxHelper.visible = false
       this.scene.add(group)
 
-      this.entities[entity.id] = group
+      e = group
+      this.entities[entity.id] = e
 
       this.emit('add', entity)
 
@@ -517,6 +570,16 @@ export class Entities extends EventEmitter {
       }
       this.setDebugMode(this.debugMode, group)
       this.setRendering(this.rendering, group)
+    } else {
+      mesh = e.children.find(c => c.name === 'mesh')
+    }
+
+    // check if entity has armor
+    if (entity.equipment) {
+      addArmorModel(e, 'feet', entity.equipment[2])
+      addArmorModel(e, 'legs', entity.equipment[3], 2)
+      addArmorModel(e, 'chest', entity.equipment[4])
+      addArmorModel(e, 'head', entity.equipment[5])
     }
 
     const meta = getGeneralEntitiesMetadata(entity)
@@ -524,7 +587,7 @@ export class Entities extends EventEmitter {
     //@ts-expect-error
     // set visibility
     const isInvisible = entity.metadata?.[0] & 0x20
-    for (const child of this.entities[entity.id]?.children.find(c => c.name === 'mesh')?.children ?? []) {
+    for (const child of mesh.children ?? []) {
       if (child.name !== 'nametag') {
         child.visible = !isInvisible
       }
@@ -547,10 +610,77 @@ export class Entities extends EventEmitter {
           nameTagScale: textDisplayMeta?.scale, nameTagTranslation: textDisplayMeta && (textDisplayMeta.translation || new THREE.Vector3(0, 0, 0)),
           nameTagRotationLeft: toQuaternion(textDisplayMeta?.left_rotation), nameTagRotationRight: toQuaternion(textDisplayMeta?.right_rotation) },
         this.entitiesOptions,
-        this.entities[entity.id].children.find(c => c.name === 'mesh')
+        mesh
       )
     }
 
+    const armorStandMeta = getSpecificEntityMetadata('armor_stand', entity)
+    if (armorStandMeta) {
+      const isSmall = (parseInt(armorStandMeta.client_flags, 10) & 0x01) !== 0
+      const hasArms = (parseInt(armorStandMeta.client_flags, 10) & 0x04) !== 0
+      const hasBasePlate = (parseInt(armorStandMeta.client_flags, 10) & 0x08) === 0
+      const isMarker = (parseInt(armorStandMeta.client_flags, 10) & 0x10) !== 0
+      mesh.castShadow = !isMarker
+      mesh.receiveShadow = !isMarker
+      if (isSmall) {
+        e.scale.set(0.5, 0.5, 0.5)
+      } else {
+        e.scale.set(1, 1, 1)
+      }
+      e.traverse(c => {
+        switch (c.name) {
+          case 'bone_baseplate':
+            this.setVisible(c, hasBasePlate)
+            c.rotation.y = -e.rotation.y
+            break
+          case 'bone_head':
+            if (armorStandMeta.head_pose) {
+              c.setRotationFromEuler(poseToEuler(armorStandMeta.head_pose))
+            }
+            break
+          case 'bone_body':
+            if (armorStandMeta.body_pose) {
+              c.setRotationFromEuler(poseToEuler(armorStandMeta.body_pose))
+            }
+            break
+          case 'bone_leftarm':
+            if (c.parent?.name !== 'bone_armor') {
+              this.setVisible(c, hasArms)
+            }
+            if (armorStandMeta.left_arm_pose) {
+              c.setRotationFromEuler(poseToEuler(armorStandMeta.left_arm_pose))
+            } else {
+              c.setRotationFromEuler(poseToEuler({ 'yaw': -10, 'pitch': -10, 'roll': 0 }))
+            }
+            break
+          case 'bone_rightarm':
+            if (c.parent?.name !== 'bone_armor') {
+              this.setVisible(c, hasArms)
+            }
+            if (armorStandMeta.right_arm_pose) {
+              c.setRotationFromEuler(poseToEuler(armorStandMeta.right_arm_pose))
+            } else {
+              c.setRotationFromEuler(poseToEuler({ 'yaw': 10, 'pitch': -10, 'roll': 0 }))
+            }
+            break
+          case 'bone_leftleg':
+            if (armorStandMeta.left_leg_pose) {
+              c.setRotationFromEuler(poseToEuler(armorStandMeta.left_leg_pose))
+            } else {
+              c.setRotationFromEuler(poseToEuler({ 'yaw': -1, 'pitch': -1, 'roll': 0 }))
+            }
+            break
+          case 'bone_rightleg':
+            if (armorStandMeta.right_leg_pose) {
+              c.setRotationFromEuler(poseToEuler(armorStandMeta.right_leg_pose))
+            } else {
+              c.setRotationFromEuler(poseToEuler({ 'yaw': 1, 'pitch': 1, 'roll': 0 }))
+            }
+            break
+        }
+      })
+    }
+
     // todo handle map, map_chunks events
     // if (entity.name === 'item_frame' || entity.name === 'glow_item_frame') {
     //   const example = {
@@ -578,9 +708,6 @@ export class Entities extends EventEmitter {
     //   }
     // }
 
-    // this can be undefined in case where packet entity_destroy was sent twice (so it was already deleted)
-    const e = this.entities[entity.id]
-
     if (entity.username) {
       e.username = entity.username
     }
@@ -592,15 +719,6 @@ export class Entities extends EventEmitter {
       playerObject.skin.head.rotation.x = overrides.rotation.head.x ? - overrides.rotation.head.x : 0
     }
 
-    if (entity.delete && e) {
-      if (e.additionalCleanup) e.additionalCleanup()
-      this.emit('remove', entity)
-      this.scene.remove(e)
-      disposeObject(e)
-      // todo dispose textures as well ?
-      delete this.entities[entity.id]
-    }
-
     if (entity.pos) {
       new TWEEN.Tween(e.position).to({ x: entity.pos.x, y: entity.pos.y, z: entity.pos.z }, TWEEN_DURATION).start()
     }
@@ -645,3 +763,73 @@ function getSpecificEntityMetadata<T extends keyof EntityMetadataVersions> (name
   if (entity.name !== name) return
   return getGeneralEntitiesMetadata(entity) as any
 }
+
+function addArmorModel (entityMesh: THREE.Object3D, slotType: string, item: Item, layer = 1, overlay = false) {
+  if (!item) {
+    removeArmorModel(entityMesh, slotType)
+    return
+  }
+  const itemParts = item.name.split('_')
+  const armorMaterial = itemParts[0]
+  if (!armorMaterial) {
+    removeArmorModel(entityMesh, slotType)
+    return
+  }
+  // TODO: Support resource pack
+  // TODO: Support mirroring on certain parts of the model
+  const texturePath = armorModels[`${armorMaterial}Layer${layer}${overlay ? 'Overlay' : ''}`]
+  if (!texturePath || !armorModels.armorModel[slotType]) {
+    return
+  }
+
+  const meshName = `geometry_armor_${slotType}${overlay ? '_overlay' : ''}`
+  let mesh = entityMesh.children.findLast(c => c.name === meshName) as THREE.Mesh
+  let material
+  if (mesh) {
+    material = mesh.material
+    loadTexture(texturePath, texture => {
+      texture.magFilter = THREE.NearestFilter
+      texture.minFilter = THREE.NearestFilter
+      texture.flipY = false
+      texture.wrapS = THREE.MirroredRepeatWrapping
+      texture.wrapT = THREE.MirroredRepeatWrapping
+      material.map = texture
+    })
+  } else {
+    mesh = getMesh(texturePath, armorModels.armorModel[slotType])
+    mesh.name = meshName
+    material = mesh.material
+    material.side = THREE.DoubleSide
+  }
+  if (armorMaterial === 'leather' && !overlay) {
+    const color = (item.nbt?.value as any)?.display?.value?.color?.value
+    if (color) {
+      const r = color >> 16 & 0xff
+      const g = color >> 8 & 0xff
+      const b = color & 0xff
+      material.color.setRGB(r / 255, g / 255, b / 255)
+    } else {
+      material.color.setHex(0xB5_6D_51) // default brown color
+    }
+    addArmorModel(entityMesh, slotType, item, layer, true)
+  }
+  const group = new THREE.Object3D()
+  group.name = `armor_${slotType}${overlay ? '_overlay' : ''}`
+  group.add(mesh)
+
+  const skeletonHelper = new THREE.SkeletonHelper(mesh)
+  //@ts-expect-error
+  skeletonHelper.material.linewidth = 2
+  skeletonHelper.visible = false
+  group.add(skeletonHelper)
+
+  entityMesh.add(mesh)
+}
+
+function removeArmorModel (entityMesh: THREE.Object3D, slotType: string) {
+  for (const c of entityMesh.children) {
+    if (c.name === `geometry_armor_${slotType}` || c.name === `geometry_armor_${slotType}_overlay`) {
+      c.removeFromParent()
+    }
+  }
+}
diff --git a/prismarine-viewer/viewer/lib/entity/EntityMesh.js b/prismarine-viewer/viewer/lib/entity/EntityMesh.js
index 1350dcf0..69dd95d6 100644
--- a/prismarine-viewer/viewer/lib/entity/EntityMesh.js
+++ b/prismarine-viewer/viewer/lib/entity/EntityMesh.js
@@ -94,7 +94,7 @@ function dot(a, b) {
   return a[0] * b[0] + a[1] * b[1] + a[2] * b[2]
 }
 
-function addCube(attr, boneId, bone, cube, texWidth = 64, texHeight = 64) {
+function addCube(attr, boneId, bone, cube, texWidth = 64, texHeight = 64, mirror = false) {
   const cubeRotation = new THREE.Euler(0, 0, 0)
   if (cube.rotation) {
     cubeRotation.x = -cube.rotation[0] * Math.PI / 180
@@ -104,15 +104,20 @@ function addCube(attr, boneId, bone, cube, texWidth = 64, texHeight = 64) {
   for (const { dir, corners, u0, v0, u1, v1 } of Object.values(elemFaces)) {
     const ndx = Math.floor(attr.positions.length / 3)
 
+    const eastOrWest = dir[0] !== 0
+    const faceUvs = []
     for (const pos of corners) {
       const u = (cube.uv[0] + dot(pos[3] ? u1 : u0, cube.size)) / texWidth
       const v = (cube.uv[1] + dot(pos[4] ? v1 : v0, cube.size)) / texHeight
 
+      const posX = eastOrWest && mirror ? pos[0] ^ 1 : pos[0]
+      const posY = pos[1]
+      const posZ = eastOrWest && mirror ? pos[2] ^ 1 : pos[2]
       const inflate = cube.inflate ?? 0
       let vecPos = new THREE.Vector3(
-        cube.origin[0] + pos[0] * cube.size[0] + (pos[0] ? inflate : -inflate),
-        cube.origin[1] + pos[1] * cube.size[1] + (pos[1] ? inflate : -inflate),
-        cube.origin[2] + pos[2] * cube.size[2] + (pos[2] ? inflate : -inflate)
+        cube.origin[0] + posX * cube.size[0] + (posX ? inflate : -inflate),
+        cube.origin[1] + posY * cube.size[1] + (posY ? inflate : -inflate),
+        cube.origin[2] + posZ * cube.size[2] + (posZ ? inflate : -inflate)
       )
 
       vecPos = vecPos.applyEuler(cubeRotation)
@@ -122,16 +127,28 @@ function addCube(attr, boneId, bone, cube, texWidth = 64, texHeight = 64) {
 
       attr.positions.push(vecPos.x, vecPos.y, vecPos.z)
       attr.normals.push(...dir)
-      attr.uvs.push(u, v)
+      faceUvs.push(u, v)
       attr.skinIndices.push(boneId, 0, 0, 0)
       attr.skinWeights.push(1, 0, 0, 0)
     }
 
+    if (mirror) {
+      for (let i = 0; i + 1 < corners.length; i += 2) {
+        const faceIndex = i * 2
+        const tempFaceUvs = faceUvs.slice(faceIndex, faceIndex + 4)
+        faceUvs[faceIndex] = tempFaceUvs[2]
+        faceUvs[faceIndex + 1] = tempFaceUvs[eastOrWest ? 1 : 3]
+        faceUvs[faceIndex + 2] = tempFaceUvs[0]
+        faceUvs[faceIndex + 3] = tempFaceUvs[eastOrWest ? 3 : 1]
+      }
+    }
+    attr.uvs.push(...faceUvs)
+
     attr.indices.push(ndx, ndx + 1, ndx + 2, ndx + 2, ndx + 1, ndx + 3)
   }
 }
 
-function getMesh(texture, jsonModel, overrides = {}) {
+export function getMesh(texture, jsonModel, overrides = {}) {
   const bones = {}
 
   const geoData = {
@@ -169,7 +186,7 @@ function getMesh(texture, jsonModel, overrides = {}) {
 
     if (jsonBone.cubes) {
       for (const cube of jsonBone.cubes) {
-        addCube(geoData, i, bone, cube, jsonModel.texturewidth, jsonModel.textureheight)
+        addCube(geoData, i, bone, cube, jsonModel.texturewidth, jsonModel.textureheight, jsonBone.mirror)
       }
     }
     i++
diff --git a/prismarine-viewer/viewer/lib/entity/armorModels.json b/prismarine-viewer/viewer/lib/entity/armorModels.json
new file mode 100644
index 00000000..3632bad1
--- /dev/null
+++ b/prismarine-viewer/viewer/lib/entity/armorModels.json
@@ -0,0 +1,158 @@
+{
+  "head": {
+    "bones": [
+      {"name": "armor", "pivot": [0, 12, 0]},
+      {
+        "name": "head",
+        "parent": "armor",
+        "pivot": [0, 12, 0],
+        "cubes": [
+          {
+            "origin": [-4, 23, -4],
+            "size": [8, 8, 8],
+            "uv": [0, 0],
+            "inflate": 1
+          }
+        ]
+      }
+    ],
+    "visible_bounds_width": 1.5,
+    "visible_bounds_offset": [0, 0.5, 0],
+    "texturewidth": 64,
+    "textureheight": 32
+  },
+  "chest": {
+    "bones": [
+      {"name": "armor", "pivot": [0, 12, 0]},
+      {
+        "name": "body",
+        "parent": "armor",
+        "pivot": [0, 13, 0],
+        "cubes": [
+          {
+            "origin": [-4, 12, -2],
+            "size": [8, 12, 4],
+            "uv": [16, 16],
+            "inflate": 1
+          }
+        ]
+      },
+      {
+        "name": "rightarm",
+        "parent": "armor",
+        "pivot": [5, 10, 0],
+        "cubes": [
+          {
+            "origin": [4, 12, -2],
+            "size": [4, 12, 4],
+            "uv": [40, 16],
+            "inflate": 0.75
+          }
+        ]
+      },
+      {
+        "name": "leftarm",
+        "parent": "armor",
+        "pivot": [-5, 10, 0],
+        "cubes": [
+          {
+            "origin": [-8, 12, -2],
+            "size": [4, 12, 4],
+            "uv": [40, 16],
+            "inflate": 0.75
+          }
+        ],
+        "mirror": true
+      }
+    ],
+    "visible_bounds_width": 1.5,
+    "visible_bounds_offset": [0, 0.5, 0],
+    "texturewidth": 64,
+    "textureheight": 32
+  },
+  "legs": {
+    "bones": [
+      {"name": "armor", "pivot": [0, 12, 0]},
+      {
+        "name": "body",
+        "parent": "armor",
+        "pivot": [0, 13, 0],
+        "cubes": [
+          {
+            "origin": [-4, 12, -2],
+            "size": [8, 12, 4],
+            "uv": [16, 16],
+            "inflate": 0.75
+          }
+        ]
+      },
+      {
+        "name": "rightleg",
+        "parent": "armor",
+        "pivot": [1.9, 1, 0],
+        "cubes": [
+          {
+            "origin": [-0.1, 0, -2],
+            "size": [4, 12, 4],
+            "uv": [0, 16],
+            "inflate": 0.5
+          }
+        ]
+      },
+      {
+        "name": "leftleg",
+        "parent": "armor",
+        "pivot": [-1.9, 1, 0],
+        "cubes": [
+          {
+            "origin": [-3.9, 0, -2],
+            "size": [4, 12, 4],
+            "uv": [0, 16],
+            "inflate": 0.5
+          }
+        ],
+        "mirror": true
+      }
+    ],
+    "visible_bounds_width": 1.5,
+    "visible_bounds_offset": [0, 0.5, 0],
+    "texturewidth": 64,
+    "textureheight": 32
+  },
+  "feet": {
+    "bones": [
+      {"name": "armor", "pivot": [0, 12, 0]},
+      {
+        "name": "rightleg",
+        "parent": "armor",
+        "pivot": [1.9, 1, 0],
+        "cubes": [
+          {
+            "origin": [-0.1, 0, -2],
+            "size": [4, 12, 4],
+            "uv": [0, 16],
+            "inflate": 0.75
+          }
+        ]
+      },
+      {
+        "name": "leftleg",
+        "parent": "armor",
+        "pivot": [-1.9, 1, 0],
+        "cubes": [
+          {
+            "origin": [-3.9, 0, -2],
+            "size": [4, 12, 4],
+            "uv": [0, 16],
+            "inflate": 0.75
+          }
+        ],
+        "mirror": true
+      }
+    ],
+    "visible_bounds_width": 1.5,
+    "visible_bounds_offset": [0, 0.5, 0],
+    "texturewidth": 64,
+    "textureheight": 32
+  }
+}
\ No newline at end of file
diff --git a/prismarine-viewer/viewer/lib/entity/armorModels.ts b/prismarine-viewer/viewer/lib/entity/armorModels.ts
new file mode 100644
index 00000000..e1d3f87b
--- /dev/null
+++ b/prismarine-viewer/viewer/lib/entity/armorModels.ts
@@ -0,0 +1,36 @@
+/*
+ * prismarine-web-client - prismarine-web-client
+ * Copyright (C) 2024 Max Lee aka Phoenix616 (mail@moep.tv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+// TODO: replace with load from resource pack
+export { default as chainmailLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/chainmail_layer_1.png'
+export { default as chainmailLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/chainmail_layer_2.png'
+export { default as diamondLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/diamond_layer_1.png'
+export { default as diamondLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/diamond_layer_2.png'
+export { default as goldenLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/gold_layer_1.png'
+export { default as goldenLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/gold_layer_2.png'
+export { default as ironLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/iron_layer_1.png'
+export { default as ironLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/iron_layer_2.png'
+export { default as leatherLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/leather_layer_1.png'
+export { default as leatherLayer1Overlay } from 'mc-assets/dist/other-textures/latest/models/armor/leather_layer_1_overlay.png'
+export { default as leatherLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/leather_layer_2.png'
+export { default as leatherLayer2Overlay } from 'mc-assets/dist/other-textures/latest/models/armor/leather_layer_2_overlay.png'
+export { default as netheriteLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/netherite_layer_1.png'
+export { default as netheriteLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/netherite_layer_2.png'
+export { default as turtleLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/turtle_layer_1.png'
+
+export { default as armorModel } from './armorModels.json'
diff --git a/prismarine-viewer/viewer/lib/entity/entities.json b/prismarine-viewer/viewer/lib/entity/entities.json
index e084a5cd..9824d418 100644
--- a/prismarine-viewer/viewer/lib/entity/entities.json
+++ b/prismarine-viewer/viewer/lib/entity/entities.json
@@ -186,15 +186,16 @@
         "bones": [
           {
             "name": "baseplate",
+            "parent": "waist",
             "cubes": [
               {"origin": [-6, 0, -6], "size": [12, 1, 12], "uv": [0, 32]}
             ]
           },
-          {"name": "waist", "parent": "baseplate", "pivot": [0, 12, 0]},
+          {"name": "waist", "pivot": [0, 12, 0]},
           {
             "name": "body",
             "parent": "waist",
-            "pivot": [0, 24, 0],
+            "pivot": [0, 13, 0],
             "cubes": [
               {"origin": [-6, 21, -1.5], "size": [12, 3, 3], "uv": [0, 26]},
               {"origin": [-3, 14, -1], "size": [2, 7, 2], "uv": [16, 0]},
@@ -204,50 +205,50 @@
           },
           {
             "name": "head",
-            "parent": "body",
-            "pivot": [0, 24, 0],
+            "parent": "waist",
+            "pivot": [0, 12, 0],
             "cubes": [{"origin": [-1, 24, -1], "size": [2, 7, 2], "uv": [0, 0]}]
           },
           {
             "name": "hat",
             "parent": "head",
-            "pivot": [0, 24, 0],
+            "pivot": [0, 12, 0],
             "cubes": [
               {"origin": [-4, 24, -4], "size": [8, 8, 8], "uv": [32, 0]}
             ]
           },
           {
-            "name": "leftarm",
-            "parent": "body",
+            "name": "rightarm",
+            "parent": "waist",
             "mirror": true,
-            "pivot": [5, 22, 0],
+            "pivot": [5, 10, 0],
             "cubes": [
               {"origin": [5, 12, -1], "size": [2, 12, 2], "uv": [32, 16]}
             ]
           },
-          {"name": "leftitem", "parent": "leftarm", "pivot": [6, 15, 1]},
+          {"name": "rightitem", "parent": "leftarm", "pivot": [6, 15, 1]},
           {
-            "name": "leftleg",
-            "parent": "body",
+            "name": "rightleg",
+            "parent": "waist",
             "mirror": true,
-            "pivot": [1.9, 12, 0],
+            "pivot": [1.9, 1, 0],
             "cubes": [
               {"origin": [0.9, 1, -1], "size": [2, 11, 2], "uv": [40, 16]}
             ]
           },
           {
-            "name": "rightarm",
-            "parent": "body",
-            "pivot": [-5, 22, 0],
+            "name": "leftarm",
+            "parent": "waist",
+            "pivot": [-5, 10, 0],
             "cubes": [
               {"origin": [-7, 12, -1], "size": [2, 12, 2], "uv": [24, 0]}
             ]
           },
-          {"name": "rightitem", "parent": "rightarm", "pivot": [-6, 15, 1]},
+          {"name": "leftitem", "parent": "rightarm", "pivot": [-6, 15, 1]},
           {
-            "name": "rightleg",
-            "parent": "body",
-            "pivot": [-1.9, 12, 0],
+            "name": "leftleg",
+            "parent": "waist",
+            "pivot": [-1.9, 1, 0],
             "cubes": [
               {"origin": [-2.9, 1, -1], "size": [2, 11, 2], "uv": [8, 0]}
             ]
diff --git a/prismarine-viewer/viewer/lib/entity/objModels.js b/prismarine-viewer/viewer/lib/entity/objModels.js
index edff440b..5af29606 100644
--- a/prismarine-viewer/viewer/lib/entity/objModels.js
+++ b/prismarine-viewer/viewer/lib/entity/objModels.js
@@ -1 +1,2 @@
 export * as externalModels from './exportedModels'
+export * as armorModels from './armorModels'

From dd7c9c172ea38796078c7d6e1d9c1f236ba8f2be Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 19 Dec 2024 20:44:04 +0300
Subject: [PATCH 105/753] feat: add modal query parameter for page load fix:
 improve servers list UI for small width screens

---
 README.MD                  |  6 +++++-
 src/index.ts               |  7 +++++++
 src/react/Input.tsx        |  7 +++++--
 src/react/ServersList.tsx  | 16 ++++++++++++----
 src/react/Singleplayer.tsx | 10 ++++++++--
 5 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/README.MD b/README.MD
index 6b8bdc97..34f9f272 100644
--- a/README.MD
+++ b/README.MD
@@ -133,6 +133,7 @@ There are some parameters you can set in the url to archive some specific behavi
 General:
 
 - **`?setting=<setting_name>:<setting_value>`** - Set and lock the setting on load. You can set multiple settings by separating them with `&` e.g. `?setting=autoParkour:true&setting=renderDistance:4`
+- `?modal=<modal>` - Open specific modal on page load eg `keybindings`. Very useful on UI changes testing during dev. For path use `,` as separator. To get currently opened modal type this in the console: `activeModalStack.at(-1).reactType`
 
 Server specific:
 
@@ -142,7 +143,6 @@ Server specific:
 - `?proxy=<proxy_address>` - Set the proxy server address to use for  the server
 - `?username=<username>` - Set the username for the server
 - `?lockConnect=true` - Only works then `ip` parameter is set. Disables cancel/save buttons and all inputs in the connect screen already set as parameters. Useful for integrates iframes.
-- `?reconnect=true` - Reconnect to the server on page reloads. Available in **dev mode only** and very useful on server testing.
 - `?serversList=<list_or_url>` - `<list_or_url>` can be a list of servers in the format `ip:version,ip` or a url to a json file with the same format (array) or a txt file with line-delimited list of server IPs.
 
 Single player specific:
@@ -176,6 +176,10 @@ In this case you must use `?mapDirBaseUrl` to specify the base URL to fetch the
 
 - `?mapDirBaseUrl` - See above.
 
+Only during development:
+
+- `?reconnect=true` - Reconnect to the server on page reloads. Very useful on server testing.
+
 <!-- - `?mapDirGuess=<base_url>` - Load the map from the provided URL and paths will be guessed with a few additional fetch requests. -->
 
 ### Notable Things that Power this Project
diff --git a/src/index.ts b/src/index.ts
index 36eda63c..81e0d78d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1065,6 +1065,13 @@ downloadAndOpenFile().then((downloadAction) => {
       viewerWsConnect,
     })
   }
+
+  if (qs.get('modal')) {
+    const modals = qs.get('modal')!.split(',')
+    for (const modal of modals) {
+      showModal({ reactType: modal })
+    }
+  }
 }, (err) => {
   console.error(err)
   alert(`Failed to download file: ${err}`)
diff --git a/src/react/Input.tsx b/src/react/Input.tsx
index 1da36cc3..72baef53 100644
--- a/src/react/Input.tsx
+++ b/src/react/Input.tsx
@@ -2,14 +2,17 @@ import React, { CSSProperties, useEffect, useRef, useState } from 'react'
 import { isMobile } from 'prismarine-viewer/viewer/lib/simpleUtils'
 import styles from './input.module.css'
 
-interface Props extends React.ComponentProps<'input'> {
+interface Props extends Omit<React.ComponentProps<'input'>, 'width'> {
   rootStyles?: React.CSSProperties
   autoFocus?: boolean
   inputRef?: React.RefObject<HTMLInputElement>
   validateInput?: (value: string) => CSSProperties | undefined
+  width?: number
 }
 
-export default ({ autoFocus, rootStyles, inputRef, validateInput, defaultValue, ...inputProps }: Props) => {
+export default ({ autoFocus, rootStyles, inputRef, validateInput, defaultValue, width, ...inputProps }: Props) => {
+  if (width) rootStyles = { ...rootStyles, width }
+
   const ref = useRef<HTMLInputElement>(null!)
   const [validationStyle, setValidationStyle] = useState<CSSProperties>({})
   const [value, setValue] = useState(defaultValue ?? '')
diff --git a/src/react/ServersList.tsx b/src/react/ServersList.tsx
index 57316d22..cc75e037 100644
--- a/src/react/ServersList.tsx
+++ b/src/react/ServersList.tsx
@@ -2,9 +2,10 @@ import React from 'react'
 import Singleplayer from './Singleplayer'
 import Input from './Input'
 import Button from './Button'
-import PixelartIcon from './PixelartIcon'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import Select from './Select'
 import { BaseServerInfo } from './AddServerOrConnect'
+import { useIsSmallWidth } from './simpleHooks'
 
 interface Props extends React.ComponentProps<typeof Singleplayer> {
   joinServer: (info: BaseServerInfo, additional: {
@@ -52,6 +53,8 @@ export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer,
     return styles
   }
 
+  const isSmallWidth = useIsSmallWidth()
+
   return <Singleplayer
     {...props}
     firstRowChildrenOverride={<form
@@ -93,6 +96,7 @@ export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer,
             setQuickConnectIp?.(value)
             setServerIp(value)
           }}
+          width={isSmallWidth ? 120 : 180}
         />
         <label style={{ fontSize: 10, display: 'flex', alignItems: 'center', gap: 5, height: '100%', marginTop: '-1px' }}>
           <input
@@ -101,7 +105,7 @@ export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer,
             onChange={({ target: { checked } }) => setSave(checked)}
           /> Save
         </label>
-        <Button style={{ width: 90 }} type='submit'>Join Server</Button>
+        <Button style={{ width: 90 }} type='submit'>Connect</Button>
       </div>
     </form>}
     searchRowChildrenOverride={
@@ -110,14 +114,18 @@ export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer,
       }}
       >
         <div style={{ display: 'flex', gap: 3, alignItems: 'center' }}>
-          <span style={{ color: 'lightgray', fontSize: 14 }}>Proxy:</span>
+          {isSmallWidth
+            ? <PixelartIcon iconName={pixelartIcons.server} styles={{ fontSize: 14, color: 'lightgray', marginLeft: 2 }} onClick={onProfileClick} />
+            : <span style={{ color: 'lightgray', fontSize: 14 }}>Proxy:</span>}
           <Select
             initialOptions={proxies.proxies.map(p => { return { value: p, label: p } })}
             defaultValue={{ value: proxies.selected, label: proxies.selected }}
             updateOptions={(newSel) => {
               updateProxies({ proxies: [...proxies.proxies], selected: newSel })
             }}
-
+            containerStyle={{
+              width: isSmallWidth ? 140 : 180,
+            }}
           />
           <PixelartIcon iconName='user' styles={{ fontSize: 14, color: 'lightgray', marginLeft: 2 }} onClick={onProfileClick} />
           <Input rootStyles={{ width: 80 }} value={username} onChange={({ target: { value } }) => setUsername(value)} />
diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index 024f7764..e8fa8224 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -11,6 +11,7 @@ import Input from './Input'
 import Button from './Button'
 import Tabs from './Tabs'
 import MessageFormattedString from './MessageFormattedString'
+import { useIsSmallWidth } from './simpleHooks'
 
 export interface WorldProps {
   name: string
@@ -146,6 +147,8 @@ export default ({
     onRowSelect?.(name, index)
     setFocusedWorld(name)
   }
+  const isSmallWidth = useIsSmallWidth()
+
   return <div ref={containerRef} hidden={hidden}>
     <div className="dirt-bg" />
     <div className={classNames('fullscreen', styles.root)}>
@@ -209,12 +212,15 @@ export default ({
           }
         </div>
       </div>
-      <div style={{ display: 'flex', flexDirection: 'column', minWidth: 400, paddingBottom: 3 }}>
+      <div style={{ display: 'flex', flexDirection: 'column', minWidth: 400, paddingBottom: 3, alignItems: 'center', }}>
         {firstRowChildrenOverride || <div>
           <Button rootRef={firstButton} disabled={!focusedWorld} onClick={() => onWorldAction('load', focusedWorld)}>Load World</Button>
           <Button onClick={() => onGeneralAction('create')} disabled={isReadonly}>Create New World</Button>
         </div>}
-        <div style={{ ...secondRowStyles }}>
+        <div style={{
+          ...secondRowStyles,
+          ...isSmallWidth ? { display: 'grid', gridTemplateColumns: '1fr 1fr' } : {}
+        }}>
           {serversLayout ? <Button style={{ width: 100 }} disabled={!focusedWorld || lockedEditing} onClick={() => onWorldAction('edit', focusedWorld)}>Edit</Button> : <Button style={{ width: 100 }} disabled={!focusedWorld} onClick={() => onWorldAction('export', focusedWorld)}>Export</Button>}
           <Button style={{ width: 100 }} disabled={!focusedWorld || lockedEditing} onClick={() => onWorldAction('delete', focusedWorld)}>Delete</Button>
           {serversLayout ?

From a064892a9bb81ed525c0b759d35c56452192ff49 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 20 Dec 2024 17:54:38 +0300
Subject: [PATCH 106/753] fix rare crash on auth error (cancel server connect
 later)

---
 src/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/index.ts b/src/index.ts
index 81e0d78d..9eaf35d1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -623,6 +623,7 @@ async function connect (connectOptions: ConnectOptions) {
       } else {
         const originalSetSocket = bot._client.setSocket.bind(bot._client)
         bot._client.setSocket = (socket) => {
+          if (!bot) return
           originalSetSocket(socket)
           setupConnectHandlers()
         }

From d754593849d8f9ff411ced69db3337a533d21cb1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 20 Dec 2024 22:37:16 +0300
Subject: [PATCH 107/753] add christmas textures, update docs, fix singleplayer
 initial gamemode

---
 README.MD                                     |  8 +++++---
 package.json                                  |  4 ++--
 pnpm-lock.yaml                                | 20 +++++++++----------
 .../viewer/lib/worldrendererCommon.ts         | 11 ++++++++--
 src/react/GlobalSearchInput.tsx               |  1 -
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/README.MD b/README.MD
index 34f9f272..b7494cdb 100644
--- a/README.MD
+++ b/README.MD
@@ -14,13 +14,15 @@ For building the project yourself / contributing, see [Development, Debugging &
 
 - Open any zip world file or even folder in read-write mode!
 - Connect to Java servers running in both offline (cracked) and online mode* (it's possible because of proxy servers, see below)
+- Integrated JS server capable of opening Java world saves in any way (folders, zip, web streaming, etc)
 - Singleplayer mode with simple world generations!
-- Google Drive support for reading / saving worlds back to the cloud
 - Works offline
-- Play with friends over internet! (P2P is powered by Peer.js discovery servers)
 - First-class touch (mobile) & controller support
+- First-class keybindings configuration
 - Basic Resource pack support: Custom GUI, all textures. Server resource packs are not supported yet.
-- Builtin JEI with recipes & guides for every item (also replaces creative inventory)
+- Builtin JEI with recipes & descriptions for every item (JEI is creative inventory replacement)
+- Play with friends over internet! (P2P is powered by Peer.js discovery servers)
+- ~~Google Drive support for reading / saving worlds back to the cloud~~
 - even even more!
 
 All components that are in [Storybook](https://mcraft.fun/storybook) are published as npm module and can be used in other projects: [`minecraft-react`](https://npmjs.com/minecraft-react)
diff --git a/package.json b/package.json
index 15b27b15..af5aaa29 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "express": "^4.18.2",
     "filesize": "^10.0.12",
-    "flying-squid": "npm:@zardoy/flying-squid@^0.0.49",
+    "flying-squid": "npm:@zardoy/flying-squid@^0.0.51",
     "fs-extra": "^11.1.1",
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
@@ -142,7 +142,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.25",
+    "mc-assets": "^0.2.26",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c5ad3115..64c2333d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -119,8 +119,8 @@ importers:
         specifier: ^10.0.12
         version: 10.0.12
       flying-squid:
-        specifier: npm:@zardoy/flying-squid@^0.0.49
-        version: '@zardoy/flying-squid@0.0.49(encoding@0.1.13)'
+        specifier: npm:@zardoy/flying-squid@^0.0.51
+        version: '@zardoy/flying-squid@0.0.51(encoding@0.1.13)'
       fs-extra:
         specifier: ^11.1.1
         version: 11.1.1
@@ -346,8 +346,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.25
-        version: 0.2.25
+        specifier: ^0.2.26
+        version: 0.2.26
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -3401,8 +3401,8 @@ packages:
     resolution: {integrity: sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==}
     engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'}
 
-  '@zardoy/flying-squid@0.0.49':
-    resolution: {integrity: sha512-Kt4wr5/R+44tcLU9gjuNG2an9weWeKEpIoKXfsgJN2GGQqdnbd5nBpxfGDdgZ9aMdFugsVW8BsyPZNhj9vbMXA==}
+  '@zardoy/flying-squid@0.0.51':
+    resolution: {integrity: sha512-HHZ79H9NkS44lL9vk6gVEuJDJqj88gpiBt9Ihh5p4rHXTVbRid95riiNK5dD0kHI94P5/DXdtNalvmJDPU86oQ==}
     engines: {node: '>=8'}
     hasBin: true
 
@@ -6582,8 +6582,8 @@ packages:
     peerDependencies:
       react: ^18.2.0
 
-  mc-assets@0.2.25:
-    resolution: {integrity: sha512-MdtncPBC6kwIkYXsBsSEJGP+q2e+7Q4Wnb4j3FjS7gmafz50Vjp4E/S3MsM7H8R3FoDrjVIx6qR24l/rneW/Lw==}
+  mc-assets@0.2.26:
+    resolution: {integrity: sha512-BDrdD/kAMuVvD18nnvukE9StddL1VokParxSlFSRQdAAQmqTuYZlC19rho/SjYb+dBGZSVxwC+e0hZnSuyP9hA==}
     engines: {node: '>=18.0.0'}
 
   md5-file@4.0.0:
@@ -13431,7 +13431,7 @@ snapshots:
       '@types/emscripten': 1.39.8
       tslib: 1.14.1
 
-  '@zardoy/flying-squid@0.0.49(encoding@0.1.13)':
+  '@zardoy/flying-squid@0.0.51(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
       chalk: 5.3.0
@@ -17453,7 +17453,7 @@ snapshots:
     dependencies:
       react: 18.2.0
 
-  mc-assets@0.2.25: {}
+  mc-assets@0.2.26: {}
 
   md5-file@4.0.0: {}
 
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
index 4dc1ff90..eb0c7f4d 100644
--- a/prismarine-viewer/viewer/lib/worldrendererCommon.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -12,6 +12,7 @@ import itemsAtlasLegacy from 'mc-assets/dist/itemsAtlasLegacy.png'
 import { AtlasParser } from 'mc-assets'
 import TypedEmitter from 'typed-emitter'
 import { LineMaterial } from 'three-stdlib'
+import christmasPack from 'mc-assets/dist/textureReplacements/christmas'
 import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
 import { toMajorVersion } from '../../../src/utils'
 import { buildCleanupDecorator } from './cleanupDecorator'
@@ -316,11 +317,17 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   async updateTexturesData (resourcePackUpdate = false, prioritizeBlockTextures?: string[]) {
     const blocksAssetsParser = new AtlasParser(this.blocksAtlases, blocksAtlasLatest, blocksAtlasLegacy)
     const itemsAssetsParser = new AtlasParser(this.itemsAtlases, itemsAtlasLatest, itemsAtlasLegacy)
+
+    const blockTexturesChanges = {} as Record<string, string>
+    const date = new Date()
+    if ((date.getMonth() === 11 && date.getDate() >= 24) || (date.getMonth() === 0 && date.getDate() <= 6)) {
+      Object.assign(blockTexturesChanges, christmasPack)
+    }
+
     const customBlockTextures = Object.keys(this.customTextures.blocks?.textures ?? {}).filter(x => x.includes('/'))
     const { atlas: blocksAtlas, canvas: blocksCanvas } = await blocksAssetsParser.makeNewAtlas(this.texturesVersion ?? this.version ?? 'latest', (textureName) => {
       const texture = this.customTextures?.blocks?.textures[textureName]
-      if (!texture) return
-      return texture
+      return blockTexturesChanges[textureName] ?? texture
     }, /* this.customTextures?.blocks?.tileSize */undefined, prioritizeBlockTextures, customBlockTextures)
     const { atlas: itemsAtlas, canvas: itemsCanvas } = await itemsAssetsParser.makeNewAtlas(this.texturesVersion ?? this.version ?? 'latest', (textureName) => {
       const texture = this.customTextures?.items?.textures[textureName]
diff --git a/src/react/GlobalSearchInput.tsx b/src/react/GlobalSearchInput.tsx
index 6f2d56d1..05b102ac 100644
--- a/src/react/GlobalSearchInput.tsx
+++ b/src/react/GlobalSearchInput.tsx
@@ -17,7 +17,6 @@ function InnerSearch () {
   >
     <Input
       autoFocus={currentTouch === false}
-      width={50}
       placeholder='Search...'
       onChange={({ target: { value } }) => {
         customEvents.emit('search', value)

From 9dad509bc2ad724c0359168d92caa6f9d3aff6a6 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 20 Dec 2024 23:18:16 +0300
Subject: [PATCH 108/753] feat: improve main menu and sign in UIs. Add QR code
 so you can login to MS account on mobile

---
 src/react/MainMenu.tsx              | 18 +++++++++---------
 src/react/Screen.tsx                |  5 +++--
 src/react/SignInMessage.tsx         | 24 +++++++++++++++---------
 src/react/SignInMessageProvider.tsx |  4 +++-
 src/react/mainMenu.module.css       |  2 +-
 src/react/mainMenu.module.css.d.ts  |  2 --
 src/screens.css                     |  2 ++
 7 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 45196f4c..0c5b4007 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -71,7 +71,7 @@ export default ({
         </ButtonWithTooltip>
         <div style={{ display: 'flex', justifyContent: 'space-between' }}>
           <ButtonWithTooltip
-            style={{ width: 170 }}
+            style={{ width: 150 }}
             onClick={singleplayerAction}
             data-test-id='singleplayer-button'
             initialTooltip={{
@@ -83,6 +83,14 @@ export default ({
             Singleplayer
           </ButtonWithTooltip>
 
+          <ButtonWithTooltip
+            disabled={!mapsProvider}
+            // className={styles['maps-provider']}
+            icon={pixelartIcons.map}
+            initialTooltip={{ content: 'Explore maps to play from provider!', placement: 'top-start' }}
+            onClick={() => mapsProvider && openURL(httpsRegex.test(mapsProvider) ? mapsProvider : 'https://' + mapsProvider, false)}
+          />
+
           <ButtonWithTooltip
             data-test-id='select-file-folder'
             icon={pixelartIcons.folder}
@@ -145,14 +153,6 @@ export default ({
           <span>A Minecraft client in the browser!</span>
         </span>
       </div>
-
-      {mapsProvider &&
-        <ButtonWithTooltip
-          className={styles['maps-provider']}
-          icon={pixelartIcons.map}
-          initialTooltip={{ content: 'Explore maps to play from provider!', placement: 'right' }}
-          onClick={() => openURL(httpsRegex.test(mapsProvider) ? mapsProvider : 'https://' + mapsProvider, false)}
-        />}
     </div>
   )
 }
diff --git a/src/react/Screen.tsx b/src/react/Screen.tsx
index 6654e4dd..a17ede40 100644
--- a/src/react/Screen.tsx
+++ b/src/react/Screen.tsx
@@ -5,14 +5,15 @@ interface Props {
   style?: React.CSSProperties
   className?: string
   titleSelectable?: boolean
+  titleMarginTop?: number
 }
 
-export default ({ title, children, backdrop = true, style, className, titleSelectable }: Props) => {
+export default ({ title, children, backdrop = true, style, className = '', titleSelectable, titleMarginTop }: Props) => {
   return (
     <>
       {backdrop === 'dirt' ? <div className='dirt-bg' /> : backdrop ? <div className="backdrop" /> : null}
       <div className={`fullscreen ${className}`} style={{ overflow: 'auto', ...style }}>
-        <div className="screen-content">
+        <div className="screen-content" style={titleMarginTop === undefined ? {} : { marginTop: titleMarginTop }}>
           <div className={`screen-title ${titleSelectable ? 'text-select' : ''}`}>{title}</div>
           {children}
         </div>
diff --git a/src/react/SignInMessage.tsx b/src/react/SignInMessage.tsx
index 2c530f3a..b51edee9 100644
--- a/src/react/SignInMessage.tsx
+++ b/src/react/SignInMessage.tsx
@@ -1,6 +1,7 @@
 import { useState } from 'react'
 import { useUtilsEffect } from '@zardoy/react-util'
-import PixelartIcon from './PixelartIcon'
+import { QRCodeSVG } from 'qrcode.react'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import Screen from './Screen'
 import Button from './Button'
 
@@ -8,7 +9,6 @@ export default ({
   code = 'ABCD-EFGH-IJKL-MNOP',
   loginLink = 'https://aka.ms/devicelogin',
   connectingServer = 'mc.example.comsdlfjsklfjsfjdskfjsj',
-  warningText = true,
   expiresEnd = Date.now() + 1000 * 60 * 5,
   setSaveToken = (() => { }) as ((state: boolean) => void) | undefined,
   defaultSaveToken = true,
@@ -28,7 +28,7 @@ export default ({
     })
   }, [])
 
-  return <Screen title='Microsoft Account Authentication'>
+  return <Screen title='Microsoft Account Authentication' titleMarginTop={5}>
     <div style={{
       background: 'white',
       padding: '20px 18px',
@@ -83,19 +83,25 @@ export default ({
             fontWeight: 600,
           }}
           target='_blank'
-        >{loginLink}
+        >{loginLink.replace(/(https?:\/\/)?(www\.)?/, '')}
         </a>
         {' '}
         and enter the code above.
       </div>
-      {warningText && <div style={{
-        fontSize: 12,
+      <div style={{
+        fontSize: 11,
         marginTop: 5,
-        color: 'gray'
+        color: 'gray',
+        display: 'flex',
+        gap: 2
       }}
       >
-        <PixelartIcon iconName='alert' /> Join only <b>vanilla servers</b>! This client is detectable and may result in a ban by anti-cheat plugins.
-      </div>}
+        <div>
+          <PixelartIcon iconName={pixelartIcons.alert} styles={{ display: 'inline-block', }} />
+          Join only <b>vanilla servers</b>! This client is detectable and may result in a ban by anti-cheat plugins.
+        </div>
+        <QRCodeSVG size={40} value={directLink} style={{ display: 'block', flexShrink: 0 }} color='gray' />
+      </div>
       {setSaveToken && <label style={{
         fontSize: 12,
         display: 'flex',
diff --git a/src/react/SignInMessageProvider.tsx b/src/react/SignInMessageProvider.tsx
index 68ea83aa..8998aaf3 100644
--- a/src/react/SignInMessageProvider.tsx
+++ b/src/react/SignInMessageProvider.tsx
@@ -1,6 +1,7 @@
 import { proxy, ref, useSnapshot } from 'valtio'
 import SignInMessage from './SignInMessage'
 import { lastConnectOptions } from './AppStatusProvider'
+import { useIsModalActive } from './utilsApp'
 
 export const signInMessageState = proxy({
   code: '',
@@ -12,8 +13,9 @@ export const signInMessageState = proxy({
 
 export default () => {
   const { code, expiresOn, link, shouldSaveToken } = useSnapshot(signInMessageState)
+  const signInTestModal = useIsModalActive('sign-in-test')
 
-  if (!code) return null
+  if (!code && !signInTestModal) return null
 
   return <SignInMessage
     code={code}
diff --git a/src/react/mainMenu.module.css b/src/react/mainMenu.module.css
index dcec47c3..8e303c3b 100644
--- a/src/react/mainMenu.module.css
+++ b/src/react/mainMenu.module.css
@@ -100,10 +100,10 @@
     color: white;
     text-shadow: 1px 1px #222;
     font-size: 10px;
+    padding-left: calc(env(safe-area-inset-left) / 2);
 }
 
 .product-info {
-    padding-left: calc(env(safe-area-inset-left) / 2);
 }
 
 .product-description {
diff --git a/src/react/mainMenu.module.css.d.ts b/src/react/mainMenu.module.css.d.ts
index c60cf208..df6f35e9 100644
--- a/src/react/mainMenu.module.css.d.ts
+++ b/src/react/mainMenu.module.css.d.ts
@@ -14,10 +14,8 @@ interface CssExports {
   minec: string;
   minecraft: string;
   'product-description': string;
-  'product-info': string;
   'product-link': string;
   productDescription: string;
-  productInfo: string;
   productLink: string;
   raft: string;
   root: string;
diff --git a/src/screens.css b/src/screens.css
index 752b5932..289fe129 100644
--- a/src/screens.css
+++ b/src/screens.css
@@ -37,6 +37,8 @@
     /* todo I'm not sure about it */
     /* margin-top: calc(100% / 6 - 16px); */
     align-items: center;
+    /* apply safe area padding */
+    padding: 0 calc(env(safe-area-inset-left) / 2) 0 calc(env(safe-area-inset-right) / 2);
 
     gap: 10px;
 }

From 36747e6bef4df2376e26338418a2898dda07a765 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 21 Dec 2024 00:00:27 +0300
Subject: [PATCH 109/753] add screen edges debug component (#edges in url) fix:
 provide possible fix for rare issue when mobile control elements were going
 outside of the screen on ios

---
 prismarine-viewer/viewer/lib/ui/newStats.ts |  2 +-
 src/react/DebugEdges.tsx                    | 55 +++++++++++++++++++++
 src/react/TouchControls.tsx                 |  4 +-
 src/react/simpleHooks.ts                    | 17 +++++++
 src/reactUi.tsx                             |  2 +
 5 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 src/react/DebugEdges.tsx

diff --git a/prismarine-viewer/viewer/lib/ui/newStats.ts b/prismarine-viewer/viewer/lib/ui/newStats.ts
index 4f4b5cee..6fccac53 100644
--- a/prismarine-viewer/viewer/lib/ui/newStats.ts
+++ b/prismarine-viewer/viewer/lib/ui/newStats.ts
@@ -6,7 +6,6 @@ const stats = {}
 let lastY = 20
 export const addNewStat = (id: string, width = 80, x = rightOffset, y = lastY) => {
   const pane = document.createElement('div')
-  pane.id = 'fps-counter'
   pane.style.position = 'fixed'
   pane.style.top = `${y}px`
   pane.style.right = `${x}px`
@@ -27,6 +26,7 @@ export const addNewStat = (id: string, width = 80, x = rightOffset, y = lastY) =
 
   return {
     updateText (text: string) {
+      if (pane.innerText === text) return
       pane.innerText = text
     },
     setVisibility (visible: boolean) {
diff --git a/src/react/DebugEdges.tsx b/src/react/DebugEdges.tsx
new file mode 100644
index 00000000..a65b9f92
--- /dev/null
+++ b/src/react/DebugEdges.tsx
@@ -0,0 +1,55 @@
+import { useState } from 'react'
+import { useIsHashActive } from './simpleHooks'
+
+export default () => {
+  const MODES_COUNT = 4
+  const [mode, setMode] = useState(0)
+  const isHashActive = useIsHashActive('#edges')
+
+  if (!isHashActive) return null
+
+  const styles: React.CSSProperties = {
+    display: 'flex',
+    fontSize: 18,
+    zIndex: 10_000,
+    background: 'rgba(0, 0, 255, 0.5)',
+    border: '2px solid red',
+    whiteSpace: 'pre',
+  }
+  let text = ''
+  if (mode === 0) {
+    styles.position = 'fixed'
+    styles.inset = 0
+    styles.height = '100%'
+    text = 'inset 0 fixed 100% height'
+  }
+  if (mode === 1) {
+    styles.position = 'fixed'
+    styles.inset = 0
+    text = 'inset 0 fixed'
+  }
+  if (mode === 2) {
+    styles.position = 'absolute'
+    styles.inset = 0
+    text = 'inset 0 absolute'
+  }
+  if (mode === 3) {
+    styles.position = 'fixed'
+    styles.top = 0
+    styles.left = 0
+    styles.right = 0
+    styles.height = '100dvh'
+    text = 'top 0 fixed 100dvh'
+  }
+
+  return <div
+    style={styles}
+    onClick={() => {
+      setMode((mode + 1) % MODES_COUNT)
+    }}
+  >
+    {mode}: {text}{'\n'}
+    inner: {window.innerWidth}x{window.innerHeight}{'\n'}
+    outer: {window.outerWidth}x{window.outerHeight}{'\n'}
+  </div>
+}
diff --git a/src/react/TouchControls.tsx b/src/react/TouchControls.tsx
index b49d57c4..1b97ffd8 100644
--- a/src/react/TouchControls.tsx
+++ b/src/react/TouchControls.tsx
@@ -57,8 +57,8 @@ export default () => {
       style={{ zIndex: modals.length ? 7 : 8 }}
       className={css`
         position: fixed;
-        inset: 0;
-        height: 100%;
+        bottom: 0;
+        /* height: 100%; */
         display: flex;
         width: 100%;
         justify-content: space-between;
diff --git a/src/react/simpleHooks.ts b/src/react/simpleHooks.ts
index da8dd9e0..ec9c88e1 100644
--- a/src/react/simpleHooks.ts
+++ b/src/react/simpleHooks.ts
@@ -1,4 +1,5 @@
 import { useUtilsEffect } from '@zardoy/react-util'
+import { useEffect, useState } from 'react'
 import { useMedia } from 'react-use'
 
 const SMALL_SCREEN_MEDIA = '@media (max-width: 440px)'
@@ -25,3 +26,19 @@ export const useCopyKeybinding = (getCopyText: () => string | undefined) => {
     }, { signal })
   }, [getCopyText])
 }
+
+export const useIsHashActive = (hash: `#${string}`) => {
+  const [isActive, setIsActive] = useState(false)
+
+  useEffect(() => {
+    const checkHash = () => {
+      setIsActive(location.hash === hash)
+    }
+    checkHash()
+    addEventListener('hashchange', checkHash)
+    return () => {
+      removeEventListener('hashchange', checkHash)
+    }
+  }, [])
+  return isActive
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index f0144d14..b432c58d 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -45,6 +45,7 @@ import SignInMessageProvider from './react/SignInMessageProvider'
 import BookProvider from './react/BookProvider'
 import { options } from './optionsStorage'
 import BossBarOverlayProvider from './react/BossBarOverlayProvider'
+import DebugEdges from './react/DebugEdges'
 
 const RobustPortal = ({ children, to }) => {
   return createPortal(<PerComponentErrorBoundary>{children}</PerComponentErrorBoundary>, to)
@@ -198,6 +199,7 @@ const App = () => {
           <GamepadUiCursor />
         </div>
         <div />
+        <DebugEdges />
       </RobustPortal>
     </ButtonAppProvider>
   </div>

From 87b795bdc4a240b5caccb8ba07a0608c62a07ce0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 9 Jan 2025 21:44:59 +0700
Subject: [PATCH 110/753] fix(regression): ip qs param was ignored fix: add
 local (gitignored) config that is merged into single config after the build

---
 .gitignore                        |  1 +
 rsbuild.config.ts                 |  6 +++++-
 src/globalState.ts                |  3 +++
 src/react/AddServerOrConnect.tsx  | 13 ++++++++++---
 src/react/ServersListProvider.tsx |  1 +
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3a188862..f2a0006e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,6 @@ out
 generated
 storybook-static
 server-jar
+config.local.json
 
 src/react/npmReactComponents.ts
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 1085e3fc..933a6d02 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -95,10 +95,14 @@ const appConfig = defineConfig({
                         fs.copyFileSync('./assets/release.json', './dist/release.json')
                     }
                     const configJson = JSON.parse(fs.readFileSync('./config.json', 'utf8'))
+                    let configLocalJson = {}
+                    try {
+                        configLocalJson = JSON.parse(fs.readFileSync('./config.local.json', 'utf8'))
+                    } catch (err) {}
                     if (dev) {
                         configJson.defaultProxy = ':8080'
                     }
-                    fs.writeFileSync('./dist/config.json', JSON.stringify(configJson), 'utf8')
+                    fs.writeFileSync('./dist/config.json', JSON.stringify({ ...configJson, ...configLocalJson }), 'utf8')
                     // childProcess.execSync('./scripts/prepareSounds.mjs', { stdio: 'inherit' })
                     // childProcess.execSync('tsx ./scripts/genMcDataTypes.ts', { stdio: 'inherit' })
                     // childProcess.execSync('tsx ./scripts/genPixelartTypes.ts', { stdio: 'inherit' })
diff --git a/src/globalState.ts b/src/globalState.ts
index 54c5fc35..fbaabe81 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -114,6 +114,9 @@ export type AppConfig = {
   peerJsServerFallback?: string
   promoteServers?: Array<{ ip, description, version? }>
   mapsProvider?: string
+
+  defaultSettings?: Record<string, any>
+  allowAutoConnect?: boolean
 }
 
 export const miscUiState = proxy({
diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index d98a74b8..e3fb2a15 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 import Screen from './Screen'
 import Input from './Input'
 import Button from './Button'
@@ -26,11 +26,12 @@ interface Props {
   accounts?: string[]
   authenticatedAccounts?: number
   versions?: string[]
+  allowAutoConnect?: boolean
 }
 
 const ELEMENTS_WIDTH = 190
 
-export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions, authenticatedAccounts }: Props) => {
+export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions, allowAutoConnect }: Props) => {
   const qsParams = parseQs ? new URLSearchParams(window.location.search) : undefined
   const qsParamName = qsParams?.get('name')
   const qsParamIp = qsParams?.get('ip')
@@ -40,7 +41,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   const qsParamLockConnect = qsParams?.get('lockConnect')
 
   const qsIpParts = qsParamIp?.split(':')
-  const ipParts = initialData?.ip.split(':')
+  const ipParts = initialData?.ip ? initialData?.ip.split(':') : undefined
 
   const [serverName, setServerName] = React.useState(initialData?.name ?? qsParamName ?? '')
   const [serverIp, setServerIp] = React.useState(ipParts?.[0] ?? qsIpParts?.[0] ?? '')
@@ -69,6 +70,12 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
     authenticatedAccountOverride,
   }
 
+  useEffect(() => {
+    if (qsParams?.get('autoConnect') === 'true' && qsParams?.get('ip') && allowAutoConnect) {
+      onQsConnect?.(commonUseOptions)
+    }
+  }, [])
+
   return <Screen title={qsParamIp ? 'Connect to Server' : title} backdrop>
     <form
       style={{
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index c5cff9f2..c4777d10 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -252,6 +252,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
   })
 
   const editModalJsx = isEditScreenModal ? <AddServerOrConnect
+    allowAutoConnect={miscUiState.appConfig?.allowAutoConnect}
     placeholders={{
       proxyOverride: selectedProxy,
       usernameOverride: defaultUsername,

From 30dd64a3c6e05576f837eb4afce01fcc4508c209 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 10 Jan 2025 15:58:13 +0700
Subject: [PATCH 111/753] feat: add 1.20.4 data fix: data for some versions
 were missing like 1.16.4 or 1.16.5

---
 package.json              |  4 +-
 pnpm-lock.yaml            | 90 +++++++++++++++++++++++----------------
 src/supportedVersions.mjs |  8 ++--
 3 files changed, 61 insertions(+), 41 deletions(-)

diff --git a/package.json b/package.json
index af5aaa29..2397a899 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
-    "minecraft-data": "3.80.0",
+    "minecraft-data": "3.83.1",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
@@ -174,7 +174,7 @@
       "diamond-square": "github:zardoy/diamond-square",
       "prismarine-block": "github:zardoy/prismarine-block#next-era",
       "prismarine-world": "github:zardoy/prismarine-world#next-era",
-      "minecraft-data": "3.80.0",
+      "minecraft-data": "3.83.1",
       "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything",
       "prismarine-physics": "github:zardoy/prismarine-physics",
       "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 64c2333d..02ddfedf 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,7 +11,7 @@ overrides:
   diamond-square: github:zardoy/diamond-square
   prismarine-block: github:zardoy/prismarine-block#next-era
   prismarine-world: github:zardoy/prismarine-world#next-era
-  minecraft-data: 3.80.0
+  minecraft-data: 3.83.1
   prismarine-provider-anvil: github:zardoy/prismarine-provider-anvil#everything
   prismarine-physics: github:zardoy/prismarine-physics
   minecraft-protocol: github:PrismarineJS/node-minecraft-protocol#master
@@ -134,8 +134,8 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       minecraft-data:
-        specifier: 3.80.0
-        version: 3.80.0
+        specifier: 3.83.1
+        version: 3.83.1
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
         version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
@@ -162,7 +162,7 @@ importers:
         version: 6.1.1
       prismarine-provider-anvil:
         specifier: github:zardoy/prismarine-provider-anvil#everything
-        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.80.0)
+        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.83.1)
       prosemirror-example-setup:
         specifier: ^1.2.2
         version: 1.2.2
@@ -431,7 +431,7 @@ importers:
         version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
-        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0)
+        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1)
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
@@ -6772,8 +6772,8 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  minecraft-data@3.80.0:
-    resolution: {integrity: sha512-UYq+ADpS9K1+cqiJiz6tqkht4y4cRYF3qOYanG9eIiHY+VC+qIAC7/UcW6G3adayvj5YBOCurlqaw3E0TMAtHg==}
+  minecraft-data@3.83.1:
+    resolution: {integrity: sha512-5K26za9k5WV1OnfkGexA77lBhfGZeFw3rT3NM7/rbFXRZC65prCx7Tk2BQvC9UfzgxxvmxHfxM5y8G1U+Oxgfg==}
 
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
@@ -7518,7 +7518,7 @@ packages:
   prismarine-biome@1.3.0:
     resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==}
     peerDependencies:
-      minecraft-data: 3.80.0
+      minecraft-data: 3.83.1
       prismarine-registry: ^1.1.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05:
@@ -7533,6 +7533,11 @@ packages:
     version: 1.36.0
     engines: {node: '>=14'}
 
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/aba0d8e1efa49f4c75646cdb9635cfab41ad4ad9:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/aba0d8e1efa49f4c75646cdb9635cfab41ad4ad9}
+    version: 1.38.0
+    engines: {node: '>=14'}
+
   prismarine-entity@2.3.1:
     resolution: {integrity: sha512-HOv8l7IetHNf4hwZ7V/W4vM3GNl+e6VCtKDkH9h02TRq7jWngsggKtJV+VanCce/sNwtJUhJDjORGs728ep4MA==}
 
@@ -13441,16 +13446,16 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.2.3
-      minecraft-data: 3.80.0
+      minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.80.0)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.83.1)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       rambda: 9.2.0
@@ -14934,8 +14939,8 @@ snapshots:
 
   diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71:
     dependencies:
-      minecraft-data: 3.80.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0)
+      minecraft-data: 3.83.1
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/aba0d8e1efa49f4c75646cdb9635cfab41ad4ad9(minecraft-data@3.83.1)
       prismarine-registry: 1.10.0
       random-seed: 0.3.0
       vec3: 0.1.8
@@ -17737,7 +17742,7 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  minecraft-data@3.80.0: {}
+  minecraft-data@3.83.1: {}
 
   minecraft-folder-path@1.2.0: {}
 
@@ -17758,7 +17763,7 @@ snapshots:
       endian-toggle: 0.0.0
       lodash.get: 4.4.2
       lodash.merge: 4.6.2
-      minecraft-data: 3.80.0
+      minecraft-data: 3.83.1
       minecraft-folder-path: 1.2.0
       node-fetch: 2.7.0(encoding@0.1.13)
       node-rsa: 0.4.2
@@ -17807,7 +17812,7 @@ snapshots:
 
   mineflayer-pathfinder@2.4.4:
     dependencies:
-      minecraft-data: 3.80.0
+      minecraft-data: 3.83.1
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
@@ -17817,12 +17822,12 @@ snapshots:
 
   mineflayer@4.23.0(encoding@0.1.13):
     dependencies:
-      minecraft-data: 3.80.0
+      minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.80.0)(prismarine-registry@1.10.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-chat: 1.10.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
@@ -17840,12 +17845,12 @@ snapshots:
 
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/390ce12c1e1f25e440a94ba422e45c874f8bbd2b(encoding@0.1.13):
     dependencies:
-      minecraft-data: 3.80.0
+      minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.80.0)(prismarine-registry@1.10.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-chat: 1.10.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
@@ -18641,20 +18646,20 @@ snapshots:
       - encoding
       - supports-color
 
-  prismarine-biome@1.3.0(minecraft-data@3.80.0)(prismarine-registry@1.10.0):
+  prismarine-biome@1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0):
     dependencies:
-      minecraft-data: 3.80.0
+      minecraft-data: 3.83.1
       prismarine-registry: 1.10.0
 
-  prismarine-biome@1.3.0(minecraft-data@3.80.0)(prismarine-registry@1.7.0):
+  prismarine-biome@1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.7.0):
     dependencies:
-      minecraft-data: 3.80.0
+      minecraft-data: 3.83.1
       prismarine-registry: 1.7.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05:
     dependencies:
-      minecraft-data: 3.80.0
-      prismarine-biome: 1.3.0(minecraft-data@3.80.0)(prismarine-registry@1.7.0)
+      minecraft-data: 3.83.1
+      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.7.0)
       prismarine-chat: 1.10.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
@@ -18666,9 +18671,22 @@ snapshots:
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.10.0
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0):
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1):
     dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.80.0)(prismarine-registry@1.10.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
+      prismarine-nbt: 2.5.0
+      prismarine-registry: 1.10.0
+      smart-buffer: 4.2.0
+      uint4: 0.1.2
+      vec3: 0.1.8
+      xxhash-wasm: 0.4.2
+    transitivePeerDependencies:
+      - minecraft-data
+
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/aba0d8e1efa49f4c75646cdb9635cfab41ad4ad9(minecraft-data@3.83.1):
+    dependencies:
+      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.10.0
@@ -18701,14 +18719,14 @@ snapshots:
 
   prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     dependencies:
-      minecraft-data: 3.80.0
+      minecraft-data: 3.83.1
       prismarine-nbt: 2.5.0
       vec3: 0.1.8
 
-  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.80.0):
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.83.1):
     dependencies:
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.80.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1)
       prismarine-nbt: 2.5.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       uint4: 0.1.2
@@ -18730,17 +18748,17 @@ snapshots:
 
   prismarine-registry@1.10.0:
     dependencies:
-      minecraft-data: 3.80.0
+      minecraft-data: 3.83.1
       prismarine-nbt: 2.5.0
 
   prismarine-registry@1.7.0:
     dependencies:
-      minecraft-data: 3.80.0
+      minecraft-data: 3.83.1
       prismarine-nbt: 2.5.0
 
   prismarine-schematic@1.2.3:
     dependencies:
-      minecraft-data: 3.80.0
+      minecraft-data: 3.83.1
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-nbt: 2.2.1
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
diff --git a/src/supportedVersions.mjs b/src/supportedVersions.mjs
index 9ff75576..05801b9e 100644
--- a/src/supportedVersions.mjs
+++ b/src/supportedVersions.mjs
@@ -1,5 +1,7 @@
-import { supportedVersions } from 'minecraft-data'
+import { supportedVersions, postNettyVersionsByProtocolVersion } from 'minecraft-data'
 
-const ignoredVersionsRegex = /(^0\.30c$)|w|-pre|-rc/
+export const ignoredVersionsRegex = /(^0\.30c$)|w|-pre|-rc/
 
-export default supportedVersions.pc.filter(x => x !== '1.7').filter(v => !ignoredVersionsRegex.test(v))
+const versionsFromProtocol = Object.values(postNettyVersionsByProtocolVersion.pc).flat().filter(x => !ignoredVersionsRegex.test(x.minecraftVersion)).map(x => x.minecraftVersion)
+
+export default versionsFromProtocol.filter(x => x !== '1.7' && !x.startsWith('1.7.'))

From c070fe836fc13ee017b0c855527d59409fb0e01e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 12 Jan 2025 12:58:36 +0700
Subject: [PATCH 112/753] fix type regression

---
 src/supportedVersions.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/supportedVersions.mjs b/src/supportedVersions.mjs
index 05801b9e..39fd38d1 100644
--- a/src/supportedVersions.mjs
+++ b/src/supportedVersions.mjs
@@ -2,6 +2,7 @@ import { supportedVersions, postNettyVersionsByProtocolVersion } from 'minecraft
 
 export const ignoredVersionsRegex = /(^0\.30c$)|w|-pre|-rc/
 
+/** @type {string[]} */
 const versionsFromProtocol = Object.values(postNettyVersionsByProtocolVersion.pc).flat().filter(x => !ignoredVersionsRegex.test(x.minecraftVersion)).map(x => x.minecraftVersion)
 
 export default versionsFromProtocol.filter(x => x !== '1.7' && !x.startsWith('1.7.'))

From cbd90aeb53889ece98ae0cbf6994a3e705ff2b4d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 13 Jan 2025 10:38:29 +0700
Subject: [PATCH 113/753] add release pr auto opening

---
 .github/workflows/next-deploy.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml
index 488af273..55fb8746 100644
--- a/.github/workflows/next-deploy.yml
+++ b/.github/workflows/next-deploy.yml
@@ -43,3 +43,26 @@ jobs:
           for alias in $(echo ${{ secrets.TEST_PREVIEW_DOMAIN }} | tr "," "\n"); do
             vercel alias set ${{ steps.deploy.outputs.stdout }} $alias --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro
           done
+
+      - name: Create Release Pull Request
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const { data: pulls } = await github.rest.pulls.list({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              head: `${context.repo.owner}:next`,
+              base: 'release',
+              state: 'open'
+            });
+
+            if (pulls.length === 0) {
+              await github.rest.pulls.create({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                title: 'Release',
+                head: 'next',
+                base: 'release',
+                body: 'PR was created automatically by the release workflow, hope you release it as soon as possible!',
+              });
+            }

From a5bd38619ccb7c7ba91d6d9a0b7587eedb816a60 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 13 Jan 2025 10:39:12 +0700
Subject: [PATCH 114/753] fix test

---
 prismarine-viewer/viewer/lib/mesher/test/tests.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts b/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
index 78374b6b..d12b1755 100644
--- a/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
+++ b/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
@@ -50,7 +50,6 @@ test('Known blocks are not rendered', () => {
   expect(missingBlocks).toMatchInlineSnapshot(`
     {
       "bubble_column": true,
-      "creaking_heart": true,
       "end_gateway": true,
       "end_portal": true,
       "structure_void": true,

From 5d480d4265dbb1d1f0077943acedda383c7c160a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 14 Jan 2025 17:31:01 +0700
Subject: [PATCH 115/753] fix: full support for minecity, no more map loading
 crashes

---
 pnpm-lock.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 02ddfedf..fd8cd071 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -162,7 +162,7 @@ importers:
         version: 6.1.1
       prismarine-provider-anvil:
         specifier: github:zardoy/prismarine-provider-anvil#everything
-        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.83.1)
+        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b(minecraft-data@3.83.1)
       prosemirror-example-setup:
         specifier: ^1.2.2
         version: 1.2.2
@@ -7554,8 +7554,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b}
     version: 1.9.0
 
-  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a}
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b}
     version: 2.8.0
 
   prismarine-realms@1.3.2:
@@ -13455,7 +13455,7 @@ snapshots:
       prismarine-entity: 2.3.1
       prismarine-item: 1.15.0
       prismarine-nbt: 2.5.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.83.1)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b(minecraft-data@3.83.1)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       rambda: 9.2.0
@@ -18723,7 +18723,7 @@ snapshots:
       prismarine-nbt: 2.5.0
       vec3: 0.1.8
 
-  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/d807fc339a3d95a7aef91468d4d64d367e7c682a(minecraft-data@3.83.1):
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b(minecraft-data@3.83.1):
     dependencies:
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1)

From 2edf425ecf210301c940698095d9fc1f7edbf396 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 16 Jan 2025 14:37:05 +0700
Subject: [PATCH 116/753] fix: fix 1.20.3 and 1.20.4 was not playable, fix
 issues on these versions

---
 pnpm-lock.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fd8cd071..b743905e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -353,7 +353,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
       mineflayer:
         specifier: github:zardoy/mineflayer
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/390ce12c1e1f25e440a94ba422e45c874f8bbd2b(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -6805,8 +6805,8 @@ packages:
     resolution: {integrity: sha512-wSchhS59hK+oPs8tFg847H82YEvxU7zYKdDKj4e5FVo3CxJ74eXJVT+JcFwEvoqFO7kXiQlhJITxEvO13GOSKA==}
     engines: {node: '>=18'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/390ce12c1e1f25e440a94ba422e45c874f8bbd2b:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/390ce12c1e1f25e440a94ba422e45c874f8bbd2b}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5}
     version: 4.23.0
     engines: {node: '>=18'}
 
@@ -17843,7 +17843,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/390ce12c1e1f25e440a94ba422e45c874f8bbd2b(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)

From 102a3e499beedc856d69079fdd8d8009bbd31297 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 16 Jan 2025 17:27:34 +0700
Subject: [PATCH 117/753] fix mineflayer, prismarine package versions

---
 package.json   |   2 +-
 pnpm-lock.yaml | 124 ++++++++++++++++++++++++++-----------------------
 2 files changed, 66 insertions(+), 60 deletions(-)

diff --git a/package.json b/package.json
index 2397a899..02f854db 100644
--- a/package.json
+++ b/package.json
@@ -189,7 +189,7 @@
       "three@0.154.0": "patches/three@0.154.0.patch",
       "pixelarticons@1.8.1": "patches/pixelarticons@1.8.1.patch",
       "mineflayer-item-map-downloader@1.2.0": "patches/mineflayer-item-map-downloader@1.2.0.patch",
-      "minecraft-protocol@1.51.0": "patches/minecraft-protocol@1.49.0.patch"
+      "minecraft-protocol@1.53.0": "patches/minecraft-protocol@1.49.0.patch"
     }
   },
   "packageManager": "pnpm@9.0.4"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b743905e..1247d9c2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,7 +20,7 @@ overrides:
   prismarine-item: latest
 
 patchedDependencies:
-  minecraft-protocol@1.51.0:
+  minecraft-protocol@1.53.0:
     hash: 7sh5krubuk2vjuogjioaktvwzi
     path: patches/minecraft-protocol@1.49.0.patch
   mineflayer-item-map-downloader@1.2.0:
@@ -138,7 +138,7 @@ importers:
         version: 3.83.1
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/642fd4f7023a98a96da4caf8f993f8e19361a1e7(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13)
@@ -6782,9 +6782,9 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d}
-    version: 1.51.0
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117}
+    version: 1.53.0
     engines: {node: '>=14'}
 
   minecraft-wrap@1.5.1:
@@ -6801,13 +6801,13 @@ packages:
   mineflayer-pathfinder@2.4.4:
     resolution: {integrity: sha512-HAXakZrJRb1UC+5dv8EaDrqjW3ZnBnBk3nkb6x/YWyhHCUKn/E7VU0FO+UN9whuqPlkSaVumEdXJdydE6lSYxQ==}
 
-  mineflayer@4.23.0:
-    resolution: {integrity: sha512-wSchhS59hK+oPs8tFg847H82YEvxU7zYKdDKj4e5FVo3CxJ74eXJVT+JcFwEvoqFO7kXiQlhJITxEvO13GOSKA==}
+  mineflayer@4.25.0:
+    resolution: {integrity: sha512-q7cmpZFaSI6sodcMJxc2GkV8IO84HbsUP+xNipGKfGg+FMISKabzdJ838Axb60qRtZrp6ny7LluQE7lesHvvxQ==}
     engines: {node: '>=18'}
 
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5}
-    version: 4.23.0
+    version: 4.25.0
     engines: {node: '>=18'}
 
   minimalistic-assert@1.0.1:
@@ -7525,6 +7525,10 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05}
     version: 1.19.0
 
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3}
+    version: 1.20.0
+
   prismarine-chat@1.10.1:
     resolution: {integrity: sha512-XukYcuueuhDxzEXG7r8BZyt6jOObrPPB4JESCgb+/XenB9nExoSHF8eTQWWj8faKPLqm1dRQaYwFJlNBlJZJUw==}
 
@@ -7533,16 +7537,16 @@ packages:
     version: 1.36.0
     engines: {node: '>=14'}
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/aba0d8e1efa49f4c75646cdb9635cfab41ad4ad9:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/aba0d8e1efa49f4c75646cdb9635cfab41ad4ad9}
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734}
     version: 1.38.0
     engines: {node: '>=14'}
 
   prismarine-entity@2.3.1:
     resolution: {integrity: sha512-HOv8l7IetHNf4hwZ7V/W4vM3GNl+e6VCtKDkH9h02TRq7jWngsggKtJV+VanCce/sNwtJUhJDjORGs728ep4MA==}
 
-  prismarine-item@1.15.0:
-    resolution: {integrity: sha512-DysyiCzaI8S7PpRLFylAZnQo2CppXiBbaUp+8rhK+EzvzmMdS+D1/oETQm9ysB5Jw9eCer6iWGMgzZXxJE5+/w==}
+  prismarine-item@1.16.0:
+    resolution: {integrity: sha512-88Tz+/6HquYIsDuseae5G3IbqLeMews2L+ba2gX+p6K6soU9nuFhCfbwN56QuB7d/jZFcWrCYAPE5+UhwWh67w==}
 
   prismarine-nbt@2.2.1:
     resolution: {integrity: sha512-Mb50c58CPnuZ+qvM31DBa08tf9UumlTq1LkvpMoUpKfCuN05GZHTqCUwER3lxTSHLL0GZKghIPbYR/JQkINijQ==}
@@ -7668,12 +7672,8 @@ packages:
     resolution: {integrity: sha512-lZ5FWKZYR9xOjpMw1+EfZRfCjzNRQWPq+Dk+jki47Sikl2EeWEPnTfnJERwnU/EwFq6us+0zqHHzSsmLeYX+Lg==}
     hasBin: true
 
-  protodef@1.15.0:
-    resolution: {integrity: sha512-bZ2Omw8dT+DACjJHLrBWZlqN4MlT9g9oSpJDdkUAJOStUzgJp+Zn42FJfPUdwutUxjaxA0PftN0PDlNa2XbneA==}
-    engines: {node: '>=14'}
-
-  protodef@1.17.0:
-    resolution: {integrity: sha512-mnpNPV3xwu63u3NwZuXM1RCp979vjHxUGHzVrb6dxbvof5Fx+b8Rs0G0c3xtEuFDreGAMWS7VrlNkDUDBMsFWQ==}
+  protodef@1.18.0:
+    resolution: {integrity: sha512-jO64lkzkh0dYc0AVWCU/GzCKwqhFFIz1kfEz0NBf0RUuRNcmvgKbopabJdfZ6W8NvALdySUXgEhvKDZPhdBwrg==}
     engines: {node: '>=14'}
 
   proxy-addr@2.0.7:
@@ -13024,7 +13024,7 @@ snapshots:
 
   '@types/readable-stream@4.0.12':
     dependencies:
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
       safe-buffer: 5.1.2
 
   '@types/resolve@1.17.1':
@@ -13370,10 +13370,10 @@ snapshots:
 
   '@xboxreplay/errors@0.1.0': {}
 
-  '@xboxreplay/xboxlive-auth@3.3.3(debug@4.3.4)':
+  '@xboxreplay/xboxlive-auth@3.3.3(debug@4.3.7)':
     dependencies:
       '@xboxreplay/errors': 0.1.0
-      axios: 0.21.4(debug@4.3.4)
+      axios: 0.21.4(debug@4.3.7)
     transitivePeerDependencies:
       - debug
 
@@ -13447,13 +13447,13 @@ snapshots:
       flatmap: 0.0.3
       long: 5.2.3
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
-      prismarine-item: 1.15.0
+      prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
       prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b(minecraft-data@3.83.1)
       prismarine-windows: 2.9.0
@@ -13838,9 +13838,9 @@ snapshots:
   aws4@1.12.0:
     optional: true
 
-  axios@0.21.4(debug@4.3.4):
+  axios@0.21.4(debug@4.3.7):
     dependencies:
-      follow-redirects: 1.15.6(debug@4.3.4)
+      follow-redirects: 1.15.6(debug@4.3.7)
     transitivePeerDependencies:
       - debug
 
@@ -14940,7 +14940,7 @@ snapshots:
   diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/aba0d8e1efa49f4c75646cdb9635cfab41ad4ad9(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1)
       prismarine-registry: 1.10.0
       random-seed: 0.3.0
       vec3: 0.1.8
@@ -16029,6 +16029,10 @@ snapshots:
     optionalDependencies:
       debug: 4.3.4(supports-color@8.1.1)
 
+  follow-redirects@1.15.6(debug@4.3.7):
+    optionalDependencies:
+      debug: 4.3.7
+
   for-each@0.3.3:
     dependencies:
       is-callable: 1.2.7
@@ -17753,13 +17757,13 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.12
       aes-js: 3.1.2
       buffer-equal: 1.0.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       endian-toggle: 0.0.0
       lodash.get: 4.4.2
       lodash.merge: 4.6.2
@@ -17771,7 +17775,7 @@ snapshots:
       prismarine-chat: 1.10.1
       prismarine-nbt: 2.5.0
       prismarine-realms: 1.3.2(encoding@0.1.13)
-      protodef: 1.17.0
+      protodef: 1.18.0
       readable-stream: 4.5.2
       uuid-1345: 1.0.2
       yggdrasil: 1.7.0(encoding@0.1.13)
@@ -17804,7 +17808,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/642fd4f7023a98a96da4caf8f993f8e19361a1e7(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13):
     dependencies:
-      mineflayer: 4.23.0(encoding@0.1.13)
+      mineflayer: 4.25.0(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17815,28 +17819,28 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-entity: 2.3.1
-      prismarine-item: 1.15.0
+      prismarine-item: 1.16.0
       prismarine-nbt: 2.2.1
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.8
 
-  mineflayer@4.23.0(encoding@0.1.13):
+  mineflayer@4.25.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
       prismarine-chat: 1.10.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
-      prismarine-item: 1.15.0
+      prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       prismarine-recipe: 1.3.1(prismarine-registry@1.10.0)
       prismarine-registry: 1.10.0
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
-      protodef: 1.17.0
+      protodef: 1.18.0
       typed-emitter: 1.4.0
       vec3: 0.1.8
     transitivePeerDependencies:
@@ -17846,20 +17850,20 @@ snapshots:
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/f258c76b3a15badd902e82cd892168849444d79d(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
       prismarine-chat: 1.10.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
-      prismarine-item: 1.15.0
+      prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       prismarine-recipe: 1.3.1(prismarine-registry@1.10.0)
       prismarine-registry: 1.10.0
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
-      protodef: 1.17.0
+      protodef: 1.18.0
       typed-emitter: 1.4.0
       vec3: 0.1.8
     transitivePeerDependencies:
@@ -18636,8 +18640,8 @@ snapshots:
   prismarine-auth@2.4.2(encoding@0.1.13):
     dependencies:
       '@azure/msal-node': 2.7.0
-      '@xboxreplay/xboxlive-auth': 3.3.3(debug@4.3.4)
-      debug: 4.3.4(supports-color@8.1.1)
+      '@xboxreplay/xboxlive-auth': 3.3.3(debug@4.3.7)
+      debug: 4.3.7
       jose: 4.15.5
       node-fetch: 2.7.0(encoding@0.1.13)
       smart-buffer: 4.2.0
@@ -18661,10 +18665,19 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.7.0)
       prismarine-chat: 1.10.1
-      prismarine-item: 1.15.0
+      prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.7.0
 
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3:
+    dependencies:
+      minecraft-data: 3.83.1
+      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
+      prismarine-chat: 1.10.1
+      prismarine-item: 1.16.0
+      prismarine-nbt: 2.5.0
+      prismarine-registry: 1.10.0
+
   prismarine-chat@1.10.1:
     dependencies:
       mojangson: 2.0.4
@@ -18684,10 +18697,10 @@ snapshots:
     transitivePeerDependencies:
       - minecraft-data
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/aba0d8e1efa49f4c75646cdb9635cfab41ad4ad9(minecraft-data@3.83.1):
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.10.0
       smart-buffer: 4.2.0
@@ -18700,22 +18713,22 @@ snapshots:
   prismarine-entity@2.3.1:
     dependencies:
       prismarine-chat: 1.10.1
-      prismarine-item: 1.15.0
+      prismarine-item: 1.16.0
       prismarine-registry: 1.10.0
       vec3: 0.1.8
 
-  prismarine-item@1.15.0:
+  prismarine-item@1.16.0:
     dependencies:
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.10.0
 
   prismarine-nbt@2.2.1:
     dependencies:
-      protodef: 1.15.0
+      protodef: 1.18.0
 
   prismarine-nbt@2.5.0:
     dependencies:
-      protodef: 1.17.0
+      protodef: 1.18.0
 
   prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     dependencies:
@@ -18736,7 +18749,7 @@ snapshots:
 
   prismarine-realms@1.3.2(encoding@0.1.13):
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7
       node-fetch: 2.7.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
@@ -18766,7 +18779,7 @@ snapshots:
 
   prismarine-windows@2.9.0:
     dependencies:
-      prismarine-item: 1.15.0
+      prismarine-item: 1.16.0
       prismarine-registry: 1.10.0
       typed-emitter: 2.1.0
 
@@ -18894,14 +18907,7 @@ snapshots:
     dependencies:
       ajv: 6.12.6
 
-  protodef@1.15.0:
-    dependencies:
-      lodash.get: 4.4.2
-      lodash.reduce: 4.6.0
-      protodef-validator: 1.3.1
-      readable-stream: 3.6.2
-
-  protodef@1.17.0:
+  protodef@1.18.0:
     dependencies:
       lodash.get: 4.4.2
       lodash.reduce: 4.6.0

From b946271d8779ab8427713692e6c5a2c36c8a3bdf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 16 Jan 2025 17:35:27 +0700
Subject: [PATCH 118/753] pnpm dedupe: remove a lot of duplicated packages

---
 pnpm-lock.yaml | 1638 +++++++-----------------------------------------
 1 file changed, 234 insertions(+), 1404 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1247d9c2..74919f88 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -99,7 +99,7 @@ importers:
         version: 2.8.5
       debug:
         specifier: ^4.3.4
-        version: 4.3.4(supports-color@8.1.1)
+        version: 4.3.7(supports-color@8.1.1)
       diff-match-patch:
         specifier: ^1.0.5
         version: 1.0.5
@@ -108,10 +108,10 @@ importers:
         version: 3.0.1
       esbuild:
         specifier: ^0.19.3
-        version: 0.19.3
+        version: 0.19.11
       esbuild-plugin-polyfill-node:
         specifier: ^0.3.0
-        version: 0.3.0(esbuild@0.19.3)
+        version: 0.3.0(esbuild@0.19.11)
       express:
         specifier: ^4.18.2
         version: 4.18.2
@@ -207,7 +207,7 @@ importers:
         version: 3.0.1
       source-map-js:
         specifier: ^1.0.2
-        version: 1.0.2
+        version: 1.2.1
       stats-gl:
         specifier: ^1.0.5
         version: 1.0.5
@@ -234,7 +234,7 @@ importers:
         version: 0.1.8
       wait-on:
         specifier: ^7.2.0
-        version: 7.2.0(debug@4.3.4)
+        version: 7.2.0(debug@4.3.7)
       workbox-build:
         specifier: ^7.0.0
         version: 7.0.0(@types/babel__core@7.20.2)
@@ -260,7 +260,7 @@ importers:
         version: 1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)
       '@rsbuild/plugin-type-check':
         specifier: ^1.0.1-beta.9
-        version: 1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)(esbuild@0.19.3)(typescript@5.5.4)
+        version: 1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)(esbuild@0.19.11)(typescript@5.5.4)
       '@rsbuild/plugin-typed-css-modules':
         specifier: ^1.0.1
         version: 1.0.1(@rsbuild/core@1.0.1-beta.9)
@@ -278,7 +278,7 @@ importers:
         version: 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
       '@storybook/react-vite':
         specifier: ^7.4.6
-        version: 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.4)(vite@4.5.3(@types/node@20.8.0)(terser@5.31.3))
+        version: 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.4)(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))
       '@types/diff-match-patch':
         specifier: ^1.0.36
         version: 1.0.36
@@ -305,7 +305,7 @@ importers:
         version: 5.1.0
       assert:
         specifier: ^2.0.0
-        version: 2.0.0
+        version: 2.1.0
       browserify-zlib:
         specifier: ^0.2.0
         version: 0.2.0
@@ -341,7 +341,7 @@ importers:
         version: 1.7.0
       http-server:
         specifier: ^14.1.1
-        version: 14.1.1(debug@4.3.4)
+        version: 14.1.1(debug@4.3.7)
       https-browserify:
         specifier: ^1.0.0
         version: 1.0.0
@@ -398,7 +398,7 @@ importers:
         version: 0.34.6(terser@5.31.3)
       yaml:
         specifier: ^2.3.2
-        version: 2.3.2
+        version: 2.4.1
 
   prismarine-viewer:
     dependencies:
@@ -407,7 +407,7 @@ importers:
         version: 20.0.3
       assert:
         specifier: ^2.0.0
-        version: 2.0.0
+        version: 2.1.0
       buffer:
         specifier: ^6.0.3
         version: 6.0.3
@@ -428,10 +428,10 @@ importers:
         version: 1.3.6
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
-        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1)
+        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1)
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
@@ -475,7 +475,7 @@ importers:
     dependencies:
       vite:
         specifier: ^4.4.9
-        version: 4.4.10(@types/node@22.8.1)(terser@5.31.3)
+        version: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
 
 packages:
 
@@ -533,12 +533,6 @@ packages:
     resolution: {integrity: sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-create-class-features-plugin@7.22.11':
-    resolution: {integrity: sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
   '@babel/helper-create-class-features-plugin@7.22.15':
     resolution: {integrity: sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==}
     engines: {node: '>=6.9.0'}
@@ -560,10 +554,6 @@ packages:
     resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-environment-visitor@7.22.5':
-    resolution: {integrity: sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-function-name@7.22.5':
     resolution: {integrity: sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==}
     engines: {node: '>=6.9.0'}
@@ -572,10 +562,6 @@ packages:
     resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-member-expression-to-functions@7.22.5':
-    resolution: {integrity: sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-member-expression-to-functions@7.23.0':
     resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==}
     engines: {node: '>=6.9.0'}
@@ -584,16 +570,6 @@ packages:
     resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-module-imports@7.22.5':
-    resolution: {integrity: sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-module-transforms@7.22.9':
-    resolution: {integrity: sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
   '@babel/helper-module-transforms@7.23.0':
     resolution: {integrity: sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==}
     engines: {node: '>=6.9.0'}
@@ -640,18 +616,10 @@ packages:
     resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-validator-identifier@7.22.5':
-    resolution: {integrity: sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-validator-option@7.22.15':
     resolution: {integrity: sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-validator-option@7.22.5':
-    resolution: {integrity: sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-wrap-function@7.22.10':
     resolution: {integrity: sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==}
     engines: {node: '>=6.9.0'}
@@ -960,12 +928,6 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-modules-commonjs@7.22.11':
-    resolution: {integrity: sha512-o2+bg7GDS60cJMgz9jWqRUsWkMzLCxp+jFDeDUT5sjRlAxcJWZ2ylNdI7QQ2+CH5hWu7OnN+Cv3htt7AkSf96g==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
   '@babel/plugin-transform-modules-commonjs@7.23.0':
     resolution: {integrity: sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==}
     engines: {node: '>=6.9.0'}
@@ -1172,10 +1134,6 @@ packages:
   '@babel/regjsgen@0.8.0':
     resolution: {integrity: sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==}
 
-  '@babel/runtime@7.22.11':
-    resolution: {integrity: sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/runtime@7.24.5':
     resolution: {integrity: sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==}
     engines: {node: '>=6.9.0'}
@@ -1188,10 +1146,6 @@ packages:
     resolution: {integrity: sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/types@7.22.11':
-    resolution: {integrity: sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/types@7.23.0':
     resolution: {integrity: sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==}
     engines: {node: '>=6.9.0'}
@@ -1252,15 +1206,9 @@ packages:
     resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==}
     engines: {node: '>=10.0.0'}
 
-  '@emotion/babel-plugin@11.11.0':
-    resolution: {integrity: sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==}
-
   '@emotion/babel-plugin@11.12.0':
     resolution: {integrity: sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw==}
 
-  '@emotion/cache@11.11.0':
-    resolution: {integrity: sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==}
-
   '@emotion/cache@11.13.1':
     resolution: {integrity: sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==}
 
@@ -1272,15 +1220,9 @@ packages:
       '@babel/core':
         optional: true
 
-  '@emotion/hash@0.9.1':
-    resolution: {integrity: sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==}
-
   '@emotion/hash@0.9.2':
     resolution: {integrity: sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==}
 
-  '@emotion/memoize@0.8.1':
-    resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==}
-
   '@emotion/memoize@0.9.0':
     resolution: {integrity: sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==}
 
@@ -1293,43 +1235,23 @@ packages:
       '@types/react':
         optional: true
 
-  '@emotion/serialize@1.1.2':
-    resolution: {integrity: sha512-zR6a/fkFP4EAcCMQtLOhIgpprZOwNmCldtpaISpvz348+DP4Mz8ZoKaGGCQpbzepNIUWbq4w6hNZkwDyKoS+HA==}
-
   '@emotion/serialize@1.3.0':
     resolution: {integrity: sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==}
 
-  '@emotion/sheet@1.2.2':
-    resolution: {integrity: sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==}
-
   '@emotion/sheet@1.4.0':
     resolution: {integrity: sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==}
 
-  '@emotion/unitless@0.8.1':
-    resolution: {integrity: sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==}
-
   '@emotion/unitless@0.9.0':
     resolution: {integrity: sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ==}
 
-  '@emotion/use-insertion-effect-with-fallbacks@1.0.1':
-    resolution: {integrity: sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==}
-    peerDependencies:
-      react: ^18.2.0
-
   '@emotion/use-insertion-effect-with-fallbacks@1.1.0':
     resolution: {integrity: sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==}
     peerDependencies:
       react: ^18.2.0
 
-  '@emotion/utils@1.2.1':
-    resolution: {integrity: sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==}
-
   '@emotion/utils@1.4.0':
     resolution: {integrity: sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ==}
 
-  '@emotion/weak-memoize@0.3.1':
-    resolution: {integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==}
-
   '@emotion/weak-memoize@0.4.0':
     resolution: {integrity: sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==}
 
@@ -1351,12 +1273,6 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.19.3':
-    resolution: {integrity: sha512-w+Akc0vv5leog550kjJV9Ru+MXMR2VuMrui3C61mnysim0gkFCPOUTAfzTP0qX+HpN9Syu3YA3p1hf3EPqObRw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-
   '@esbuild/android-arm@0.18.20':
     resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==}
     engines: {node: '>=12'}
@@ -1369,12 +1285,6 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.19.3':
-    resolution: {integrity: sha512-Lemgw4io4VZl9GHJmjiBGzQ7ONXRfRPHcUEerndjwiSkbxzrpq0Uggku5MxxrXdwJ+pTj1qyw4jwTu7hkPsgIA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-
   '@esbuild/android-x64@0.18.20':
     resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==}
     engines: {node: '>=12'}
@@ -1387,12 +1297,6 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.19.3':
-    resolution: {integrity: sha512-FKQJKkK5MXcBHoNZMDNUAg1+WcZlV/cuXrWCoGF/TvdRiYS4znA0m5Il5idUwfxrE20bG/vU1Cr5e1AD6IEIjQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-
   '@esbuild/darwin-arm64@0.18.20':
     resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==}
     engines: {node: '>=12'}
@@ -1405,12 +1309,6 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.19.3':
-    resolution: {integrity: sha512-kw7e3FXU+VsJSSSl2nMKvACYlwtvZB8RUIeVShIEY6PVnuZ3c9+L9lWB2nWeeKWNNYDdtL19foCQ0ZyUL7nqGw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-
   '@esbuild/darwin-x64@0.18.20':
     resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==}
     engines: {node: '>=12'}
@@ -1423,12 +1321,6 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.19.3':
-    resolution: {integrity: sha512-tPfZiwF9rO0jW6Jh9ipi58N5ZLoSjdxXeSrAYypy4psA2Yl1dAMhM71KxVfmjZhJmxRjSnb29YlRXXhh3GqzYw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-
   '@esbuild/freebsd-arm64@0.18.20':
     resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==}
     engines: {node: '>=12'}
@@ -1441,12 +1333,6 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.19.3':
-    resolution: {integrity: sha512-ERDyjOgYeKe0Vrlr1iLrqTByB026YLPzTytDTz1DRCYM+JI92Dw2dbpRHYmdqn6VBnQ9Bor6J8ZlNwdZdxjlSg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-
   '@esbuild/freebsd-x64@0.18.20':
     resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==}
     engines: {node: '>=12'}
@@ -1459,12 +1345,6 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.19.3':
-    resolution: {integrity: sha512-nXesBZ2Ad1qL+Rm3crN7NmEVJ5uvfLFPLJev3x1j3feCQXfAhoYrojC681RhpdOph8NsvKBBwpYZHR7W0ifTTA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-
   '@esbuild/linux-arm64@0.18.20':
     resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==}
     engines: {node: '>=12'}
@@ -1477,12 +1357,6 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.19.3':
-    resolution: {integrity: sha512-qXvYKmXj8GcJgWq3aGvxL/JG1ZM3UR272SdPU4QSTzD0eymrM7leiZH77pvY3UetCy0k1xuXZ+VPvoJNdtrsWQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-
   '@esbuild/linux-arm@0.18.20':
     resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==}
     engines: {node: '>=12'}
@@ -1495,12 +1369,6 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.19.3':
-    resolution: {integrity: sha512-zr48Cg/8zkzZCzDHNxXO/89bf9e+r4HtzNUPoz4GmgAkF1gFAFmfgOdCbR8zMbzFDGb1FqBBhdXUpcTQRYS1cQ==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-
   '@esbuild/linux-ia32@0.18.20':
     resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==}
     engines: {node: '>=12'}
@@ -1513,12 +1381,6 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.19.3':
-    resolution: {integrity: sha512-7XlCKCA0nWcbvYpusARWkFjRQNWNGlt45S+Q18UeS///K6Aw8bB2FKYe9mhVWy/XLShvCweOLZPrnMswIaDXQA==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-
   '@esbuild/linux-loong64@0.18.20':
     resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==}
     engines: {node: '>=12'}
@@ -1531,12 +1393,6 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.19.3':
-    resolution: {integrity: sha512-qGTgjweER5xqweiWtUIDl9OKz338EQqCwbS9c2Bh5jgEH19xQ1yhgGPNesugmDFq+UUSDtWgZ264st26b3de8A==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-
   '@esbuild/linux-mips64el@0.18.20':
     resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==}
     engines: {node: '>=12'}
@@ -1549,12 +1405,6 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.19.3':
-    resolution: {integrity: sha512-gy1bFskwEyxVMFRNYSvBauDIWNggD6pyxUksc0MV9UOBD138dKTzr8XnM2R4mBsHwVzeuIH8X5JhmNs2Pzrx+A==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-
   '@esbuild/linux-ppc64@0.18.20':
     resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==}
     engines: {node: '>=12'}
@@ -1567,12 +1417,6 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.19.3':
-    resolution: {integrity: sha512-UrYLFu62x1MmmIe85rpR3qou92wB9lEXluwMB/STDzPF9k8mi/9UvNsG07Tt9AqwPQXluMQ6bZbTzYt01+Ue5g==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-
   '@esbuild/linux-riscv64@0.18.20':
     resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==}
     engines: {node: '>=12'}
@@ -1585,12 +1429,6 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.19.3':
-    resolution: {integrity: sha512-9E73TfyMCbE+1AwFOg3glnzZ5fBAFK4aawssvuMgCRqCYzE0ylVxxzjEfut8xjmKkR320BEoMui4o/t9KA96gA==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-
   '@esbuild/linux-s390x@0.18.20':
     resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==}
     engines: {node: '>=12'}
@@ -1603,12 +1441,6 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.19.3':
-    resolution: {integrity: sha512-LlmsbuBdm1/D66TJ3HW6URY8wO6IlYHf+ChOUz8SUAjVTuaisfuwCOAgcxo3Zsu3BZGxmI7yt//yGOxV+lHcEA==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-
   '@esbuild/linux-x64@0.18.20':
     resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==}
     engines: {node: '>=12'}
@@ -1621,12 +1453,6 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.19.3':
-    resolution: {integrity: sha512-ogV0+GwEmvwg/8ZbsyfkYGaLACBQWDvO0Kkh8LKBGKj9Ru8VM39zssrnu9Sxn1wbapA2qNS6BiLdwJZGouyCwQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-
   '@esbuild/netbsd-x64@0.18.20':
     resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==}
     engines: {node: '>=12'}
@@ -1639,12 +1465,6 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.19.3':
-    resolution: {integrity: sha512-o1jLNe4uzQv2DKXMlmEzf66Wd8MoIhLNO2nlQBHLtWyh2MitDG7sMpfCO3NTcoTMuqHjfufgUQDFRI5C+xsXQw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-
   '@esbuild/openbsd-x64@0.18.20':
     resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==}
     engines: {node: '>=12'}
@@ -1657,12 +1477,6 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.19.3':
-    resolution: {integrity: sha512-AZJCnr5CZgZOdhouLcfRdnk9Zv6HbaBxjcyhq0StNcvAdVZJSKIdOiPB9az2zc06ywl0ePYJz60CjdKsQacp5Q==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-
   '@esbuild/sunos-x64@0.18.20':
     resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==}
     engines: {node: '>=12'}
@@ -1675,12 +1489,6 @@ packages:
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.19.3':
-    resolution: {integrity: sha512-Acsujgeqg9InR4glTRvLKGZ+1HMtDm94ehTIHKhJjFpgVzZG9/pIcWW/HA/DoMfEyXmANLDuDZ2sNrWcjq1lxw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-
   '@esbuild/win32-arm64@0.18.20':
     resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==}
     engines: {node: '>=12'}
@@ -1693,12 +1501,6 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.19.3':
-    resolution: {integrity: sha512-FSrAfjVVy7TifFgYgliiJOyYynhQmqgPj15pzLyJk8BUsnlWNwP/IAy6GAiB1LqtoivowRgidZsfpoYLZH586A==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-
   '@esbuild/win32-ia32@0.18.20':
     resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==}
     engines: {node: '>=12'}
@@ -1711,12 +1513,6 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.19.3':
-    resolution: {integrity: sha512-xTScXYi12xLOWZ/sc5RBmMN99BcXp/eEf7scUC0oeiRoiT5Vvo9AycuqCp+xdpDyAU+LkrCqEpUS9fCSZF8J3Q==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-
   '@esbuild/win32-x64@0.18.20':
     resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==}
     engines: {node: '>=12'}
@@ -1729,12 +1525,6 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.19.3':
-    resolution: {integrity: sha512-FbUN+0ZRXsypPyWE2IwIkVjDkDnJoMJARWOcFZn4KPPli+QnKqF0z1anvfaYe3ev5HFCpRDLLBDHyOALLppWHw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-
   '@eslint-community/eslint-utils@4.4.0':
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -1766,12 +1556,6 @@ packages:
   '@floating-ui/dom@1.5.3':
     resolution: {integrity: sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==}
 
-  '@floating-ui/react-dom@2.0.2':
-    resolution: {integrity: sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ==}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: '>=16.8.0'
-
   '@floating-ui/react-dom@2.0.9':
     resolution: {integrity: sha512-q0umO0+LQK4+p6aGyvzASqKbKOJcAHJ7ycE9CuUvfx3s9zTHWmGJTPOIlM/hmSBfUfg/XfY5YhLBLR/LHwShQQ==}
     peerDependencies:
@@ -2025,9 +1809,6 @@ packages:
   '@jridgewell/sourcemap-codec@1.4.15':
     resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
 
-  '@jridgewell/trace-mapping@0.3.19':
-    resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==}
-
   '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
@@ -2963,9 +2744,6 @@ packages:
   '@types/estree@0.0.51':
     resolution: {integrity: sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==}
 
-  '@types/estree@1.0.2':
-    resolution: {integrity: sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==}
-
   '@types/estree@1.0.5':
     resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
 
@@ -3053,12 +2831,6 @@ packages:
   '@types/node@16.18.58':
     resolution: {integrity: sha512-YGncyA25/MaVtQkjWW9r0EFBukZ+JulsLcVZBlGUfIb96OBMjkoRWwQo5IEWJ8Fj06Go3GHw+bjYDitv6BaGsA==}
 
-  '@types/node@20.12.8':
-    resolution: {integrity: sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==}
-
-  '@types/node@20.8.0':
-    resolution: {integrity: sha512-LzcWltT83s1bthcvjBmiBvGJiiUe84NWRHkw+ZV6Fr41z2FbIzvc815dk2nQ3RAKMuN2fkenM/z3Xv2QzEpYxQ==}
-
   '@types/node@22.8.1':
     resolution: {integrity: sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==}
 
@@ -3077,9 +2849,6 @@ packages:
   '@types/prop-types@15.7.12':
     resolution: {integrity: sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==}
 
-  '@types/prop-types@15.7.5':
-    resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
-
   '@types/qs@6.9.8':
     resolution: {integrity: sha512-u95svzDlTysU5xecFNTgfFG5RUWu1A9P0VzgpcIiGZA9iraHOdSzcxMxQ55DyeRaGCSxQi7LxXDI4rzq/MYfdg==}
 
@@ -3161,9 +2930,6 @@ packages:
   '@types/yargs@17.0.28':
     resolution: {integrity: sha512-N3e3fkS86hNhtk6BEnc0rj3zcehaxx8QWhCROJkqpl5Zaoi7nAic3jH8q94jVD3zu5LGk+PUB6KAiDmimYOEQw==}
 
-  '@types/yauzl@2.10.1':
-    resolution: {integrity: sha512-CHzgNU3qYBnp/O4S3yv2tXPlvMTq0YWSTVg2/JYLqWZGHwwgJGAwd00poay/11asPq8wLFwHzubyInqHIFmmiw==}
-
   '@types/yauzl@2.10.3':
     resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
 
@@ -3454,11 +3220,6 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  acorn@8.10.0:
-    resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-
   acorn@8.12.1:
     resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==}
     engines: {node: '>=0.4.0'}
@@ -3606,9 +3367,6 @@ packages:
     resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
     engines: {node: '>=0.10.0'}
 
-  array-buffer-byte-length@1.0.0:
-    resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==}
-
   array-buffer-byte-length@1.0.1:
     resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
     engines: {node: '>= 0.4'}
@@ -3616,10 +3374,6 @@ packages:
   array-flatten@1.1.1:
     resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}
 
-  array-includes@3.1.7:
-    resolution: {integrity: sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==}
-    engines: {node: '>= 0.4'}
-
   array-includes@3.1.8:
     resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
     engines: {node: '>= 0.4'}
@@ -3651,10 +3405,6 @@ packages:
     resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==}
     engines: {node: '>= 0.4'}
 
-  arraybuffer.prototype.slice@1.0.2:
-    resolution: {integrity: sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==}
-    engines: {node: '>= 0.4'}
-
   arraybuffer.prototype.slice@1.0.3:
     resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
     engines: {node: '>= 0.4'}
@@ -3679,9 +3429,6 @@ packages:
     resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
     engines: {node: '>=0.8'}
 
-  assert@2.0.0:
-    resolution: {integrity: sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==}
-
   assert@2.1.0:
     resolution: {integrity: sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==}
 
@@ -3732,10 +3479,6 @@ packages:
     engines: {node: '>= 4.5.0'}
     hasBin: true
 
-  available-typed-arrays@1.0.5:
-    resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
-    engines: {node: '>= 0.4'}
-
   available-typed-arrays@1.0.7:
     resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
     engines: {node: '>= 0.4'}
@@ -3925,11 +3668,6 @@ packages:
   browserify-zlib@0.2.0:
     resolution: {integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==}
 
-  browserslist@4.21.10:
-    resolution: {integrity: sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
-
   browserslist@4.23.2:
     resolution: {integrity: sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
@@ -3997,9 +3735,6 @@ packages:
     resolution: {integrity: sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==}
     engines: {node: '>=6'}
 
-  call-bind@1.0.2:
-    resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
-
   call-bind@1.0.7:
     resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
     engines: {node: '>= 0.4'}
@@ -4023,9 +3758,6 @@ packages:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
     engines: {node: '>=10'}
 
-  caniuse-lite@1.0.30001643:
-    resolution: {integrity: sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==}
-
   caniuse-lite@1.0.30001646:
     resolution: {integrity: sha512-dRg00gudiBDDTmUhClSdv3hqRfpbOnU28IpI1T6PBTLWa+kOj0681C8uML3PifYfREuBrVjDGhL3adYpBT6spw==}
 
@@ -4080,7 +3812,6 @@ packages:
 
   chokidar@2.1.8:
     resolution: {integrity: sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==}
-    deprecated: Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies
 
   chokidar@3.5.3:
     resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
@@ -4443,15 +4174,6 @@ packages:
       supports-color:
         optional: true
 
-  debug@4.3.4:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-
   debug@4.3.7:
     resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
     engines: {node: '>=6.0'}
@@ -4510,10 +4232,6 @@ packages:
   defaults@1.0.4:
     resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
 
-  define-data-property@1.1.0:
-    resolution: {integrity: sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==}
-    engines: {node: '>= 0.4'}
-
   define-data-property@1.1.4:
     resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
     engines: {node: '>= 0.4'}
@@ -4701,9 +4419,6 @@ packages:
     engines: {node: '>=0.10.0'}
     hasBin: true
 
-  electron-to-chromium@1.4.504:
-    resolution: {integrity: sha512-cSMwIAd8yUh54VwitVRVvHK66QqHWE39C3DRj8SWiXitEpVSY3wNPD9y1pxQtLIi4w3UdzF9klLsmuPshz09DQ==}
-
   electron-to-chromium@1.5.0:
     resolution: {integrity: sha512-Vb3xHHYnLseK8vlMJQKJYXJ++t4u1/qJ3vykuVrVjvdiOEhYyT1AuP4x03G8EnPmYvYOhe9T+dADTmthjRQMkA==}
 
@@ -4791,10 +4506,6 @@ packages:
   eruda@3.0.1:
     resolution: {integrity: sha512-6q1Xdwga4JTr1mKSW4mzuWSSbmXgqpm/8Wa1QGFGfCWRjC0bCQjbS4u06M1te1moucIS3hBLlbSTPWYH2W0qbQ==}
 
-  es-abstract@1.22.2:
-    resolution: {integrity: sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==}
-    engines: {node: '>= 0.4'}
-
   es-abstract@1.23.3:
     resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
     engines: {node: '>= 0.4'}
@@ -4821,17 +4532,10 @@ packages:
     resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
     engines: {node: '>= 0.4'}
 
-  es-set-tostringtag@2.0.1:
-    resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
-    engines: {node: '>= 0.4'}
-
   es-set-tostringtag@2.0.3:
     resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
     engines: {node: '>= 0.4'}
 
-  es-shim-unscopables@1.0.0:
-    resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==}
-
   es-shim-unscopables@1.0.2:
     resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
 
@@ -4839,9 +4543,6 @@ packages:
     resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
     engines: {node: '>= 0.4'}
 
-  es6-object-assign@1.1.0:
-    resolution: {integrity: sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==}
-
   es6-promise@4.2.8:
     resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==}
 
@@ -4871,11 +4572,6 @@ packages:
     engines: {node: '>=12'}
     hasBin: true
 
-  esbuild@0.19.3:
-    resolution: {integrity: sha512-UlJ1qUUA2jL2nNib1JTSkifQTcYTroFqRjwCFW4QYEKEsixXD5Tik9xML7zh2gTxkYTBKGHNH9y7txMwVyPbjw==}
-    engines: {node: '>=12'}
-    hasBin: true
-
   escalade@3.1.2:
     resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}
     engines: {node: '>=6'}
@@ -5042,6 +4738,7 @@ packages:
   eslint@8.50.0:
     resolution: {integrity: sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
     hasBin: true
 
   espree@10.1.0:
@@ -5298,15 +4995,6 @@ packages:
     resolution: {integrity: sha512-mk4e7UK4P/W3tjrJyto6oxPuCjwvRMyzBh72hTl8T0dOcTzkP0M2JJHpncgyhKphMFi9pnjwHfc8e0oe4Uk3LA==}
     engines: {node: '>=0.4.0'}
 
-  follow-redirects@1.15.3:
-    resolution: {integrity: sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-
   follow-redirects@1.15.6:
     resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==}
     engines: {node: '>=4.0'}
@@ -5404,9 +5092,6 @@ packages:
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
 
-  function-bind@1.1.1:
-    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
-
   function-bind@1.1.2:
     resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
@@ -5438,9 +5123,6 @@ packages:
   get-func-name@2.0.2:
     resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==}
 
-  get-intrinsic@1.2.1:
-    resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}
-
   get-intrinsic@1.2.4:
     resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
     engines: {node: '>= 0.4'}
@@ -5472,10 +5154,6 @@ packages:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
     engines: {node: '>=10'}
 
-  get-symbol-description@1.0.0:
-    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
-    engines: {node: '>= 0.4'}
-
   get-symbol-description@1.0.2:
     resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
     engines: {node: '>= 0.4'}
@@ -5556,10 +5234,6 @@ packages:
     resolution: {integrity: sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==}
     engines: {node: '>=8'}
 
-  globalthis@1.0.3:
-    resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
-    engines: {node: '>= 0.4'}
-
   globalthis@1.0.4:
     resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
     engines: {node: '>= 0.4'}
@@ -5614,16 +5288,9 @@ packages:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
 
-  has-property-descriptors@1.0.0:
-    resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
-
   has-property-descriptors@1.0.2:
     resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
 
-  has-proto@1.0.1:
-    resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
-    engines: {node: '>= 0.4'}
-
   has-proto@1.0.3:
     resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
     engines: {node: '>= 0.4'}
@@ -5632,10 +5299,6 @@ packages:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
 
-  has-tostringtag@1.0.0:
-    resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
-    engines: {node: '>= 0.4'}
-
   has-tostringtag@1.0.2:
     resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
     engines: {node: '>= 0.4'}
@@ -5670,10 +5333,6 @@ packages:
   hash.js@1.1.7:
     resolution: {integrity: sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==}
 
-  hasown@2.0.1:
-    resolution: {integrity: sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==}
-    engines: {node: '>= 0.4'}
-
   hasown@2.0.2:
     resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
     engines: {node: '>= 0.4'}
@@ -5854,10 +5513,6 @@ packages:
   inline-style-prefixer@6.0.4:
     resolution: {integrity: sha512-FwXmZC2zbeeS7NzGjJ6pAiqRhXR0ugUShSNb6GApMl6da0/XGc4MOJsoWAywia52EEWbXNSy0pzkwz/+Y+swSg==}
 
-  internal-slot@1.0.5:
-    resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==}
-    engines: {node: '>= 0.4'}
-
   internal-slot@1.0.7:
     resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
     engines: {node: '>= 0.4'}
@@ -5884,9 +5539,6 @@ packages:
     resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
     engines: {node: '>= 0.4'}
 
-  is-array-buffer@3.0.2:
-    resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
-
   is-array-buffer@3.0.4:
     resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
     engines: {node: '>= 0.4'}
@@ -5931,9 +5583,6 @@ packages:
     resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
     hasBin: true
 
-  is-core-module@2.13.0:
-    resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==}
-
   is-core-module@2.15.1:
     resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==}
     engines: {node: '>= 0.4'}
@@ -6026,10 +5675,6 @@ packages:
     resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
     engines: {node: '>= 0.4'}
 
-  is-negative-zero@2.0.2:
-    resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
-    engines: {node: '>= 0.4'}
-
   is-negative-zero@2.0.3:
     resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
     engines: {node: '>= 0.4'}
@@ -6086,9 +5731,6 @@ packages:
     resolution: {integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==}
     engines: {node: '>= 0.4'}
 
-  is-shared-array-buffer@1.0.2:
-    resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
-
   is-shared-array-buffer@1.0.3:
     resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
     engines: {node: '>= 0.4'}
@@ -6105,10 +5747,6 @@ packages:
     resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
     engines: {node: '>= 0.4'}
 
-  is-typed-array@1.1.12:
-    resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==}
-    engines: {node: '>= 0.4'}
-
   is-typed-array@1.1.13:
     resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
     engines: {node: '>= 0.4'}
@@ -6823,10 +6461,6 @@ packages:
     resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
     engines: {node: '>=10'}
 
-  minimatch@9.0.3:
-    resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
   minimatch@9.0.5:
     resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -6919,9 +6553,6 @@ packages:
   ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 
-  ms@2.1.2:
-    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
-
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
@@ -6937,11 +6568,6 @@ packages:
       react: ^18.2.0
       react-dom: '*'
 
-  nanoid@3.3.6:
-    resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-
   nanoid@3.3.7:
     resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -7028,9 +6654,6 @@ packages:
   node-int64@0.4.0:
     resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
 
-  node-releases@2.0.13:
-    resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==}
-
   node-releases@2.0.18:
     resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
 
@@ -7098,12 +6721,6 @@ packages:
     resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
     engines: {node: '>=0.10.0'}
 
-  object-inspect@1.12.3:
-    resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
-
-  object-inspect@1.13.1:
-    resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
-
   object-inspect@1.13.2:
     resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
     engines: {node: '>= 0.4'}
@@ -7120,10 +6737,6 @@ packages:
     resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
     engines: {node: '>=0.10.0'}
 
-  object.assign@4.1.4:
-    resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
-    engines: {node: '>= 0.4'}
-
   object.assign@4.1.5:
     resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
     engines: {node: '>= 0.4'}
@@ -7144,10 +6757,6 @@ packages:
     resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
     engines: {node: '>=0.10.0'}
 
-  object.values@1.1.7:
-    resolution: {integrity: sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==}
-    engines: {node: '>= 0.4'}
-
   object.values@1.2.0:
     resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
     engines: {node: '>= 0.4'}
@@ -7379,12 +6988,6 @@ packages:
     resolution: {integrity: sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==}
     deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
 
-  picocolors@1.0.0:
-    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
-
-  picocolors@1.0.1:
-    resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
-
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
@@ -7466,10 +7069,6 @@ packages:
     resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
     engines: {node: '>= 0.4'}
 
-  postcss@8.4.31:
-    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
-    engines: {node: ^10 || ^12 || >=14}
-
   postcss@8.4.47:
     resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==}
     engines: {node: ^10 || ^12 || >=14}
@@ -7521,10 +7120,6 @@ packages:
       minecraft-data: 3.83.1
       prismarine-registry: ^1.1.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05}
-    version: 1.19.0
-
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3:
     resolution: {tarball: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3}
     version: 1.20.0
@@ -7532,11 +7127,6 @@ packages:
   prismarine-chat@1.10.1:
     resolution: {integrity: sha512-XukYcuueuhDxzEXG7r8BZyt6jOObrPPB4JESCgb+/XenB9nExoSHF8eTQWWj8faKPLqm1dRQaYwFJlNBlJZJUw==}
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb}
-    version: 1.36.0
-    engines: {node: '>=14'}
-
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734:
     resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734}
     version: 1.38.0
@@ -7548,9 +7138,6 @@ packages:
   prismarine-item@1.16.0:
     resolution: {integrity: sha512-88Tz+/6HquYIsDuseae5G3IbqLeMews2L+ba2gX+p6K6soU9nuFhCfbwN56QuB7d/jZFcWrCYAPE5+UhwWh67w==}
 
-  prismarine-nbt@2.2.1:
-    resolution: {integrity: sha512-Mb50c58CPnuZ+qvM31DBa08tf9UumlTq1LkvpMoUpKfCuN05GZHTqCUwER3lxTSHLL0GZKghIPbYR/JQkINijQ==}
-
   prismarine-nbt@2.5.0:
     resolution: {integrity: sha512-F0/8UAa9SDDnAGrBYqZc4nG8h2zj5cE2eAJU5xlDR/IsQQ3moVxkOjE3h3nMv6SbvZrvAcgX7waA/nd9LLHYdA==}
 
@@ -7573,9 +7160,6 @@ packages:
   prismarine-registry@1.10.0:
     resolution: {integrity: sha512-6TYQiZHtsJ87HsB2E0yamCFp77ZyyLT16OmW5iXB5V30yCPflhHvR5TR2IqISmmiRc2093BkHfiIhsOZaMatmQ==}
 
-  prismarine-registry@1.7.0:
-    resolution: {integrity: sha512-yyva0FpWI078nNeMhx8ekVza5uUTYhEv+C+ADu3wUQXiG8qhXkvrf0uzsnhTgZL8BLdsi2axgCEiKw9qSKIuxQ==}
-
   prismarine-schematic@1.2.3:
     resolution: {integrity: sha512-Mwpn43vEHhm3aw3cPhJjWqztkW+nX+QLajDHlTask8lEOTGl1WmpvFja4iwiws4GIvaC8x0Foptf4uvDsnjrAg==}
 
@@ -7715,10 +7299,6 @@ packages:
   punycode@1.4.1:
     resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==}
 
-  punycode@2.3.0:
-    resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
-    engines: {node: '>=6'}
-
   punycode@2.3.1:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
@@ -8037,10 +7617,6 @@ packages:
     resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==}
     hasBin: true
 
-  regexp.prototype.flags@1.5.1:
-    resolution: {integrity: sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==}
-    engines: {node: '>= 0.4'}
-
   regexp.prototype.flags@1.5.3:
     resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
     engines: {node: '>= 0.4'}
@@ -8197,10 +7773,6 @@ packages:
   rxjs@7.8.1:
     resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
 
-  safe-array-concat@1.0.1:
-    resolution: {integrity: sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==}
-    engines: {node: '>=0.4'}
-
   safe-array-concat@1.1.2:
     resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
     engines: {node: '>=0.4'}
@@ -8211,9 +7783,6 @@ packages:
   safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
-  safe-regex-test@1.0.0:
-    resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
-
   safe-regex-test@1.0.3:
     resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
     engines: {node: '>= 0.4'}
@@ -8258,11 +7827,6 @@ packages:
     resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
     hasBin: true
 
-  semver@7.5.4:
-    resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==}
-    engines: {node: '>=10'}
-    hasBin: true
-
   semver@7.6.0:
     resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==}
     engines: {node: '>=10'}
@@ -8300,10 +7864,6 @@ packages:
     resolution: {integrity: sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==}
     engines: {node: '>= 0.4'}
 
-  set-function-name@2.0.1:
-    resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==}
-    engines: {node: '>= 0.4'}
-
   set-function-name@2.0.2:
     resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
     engines: {node: '>= 0.4'}
@@ -8356,13 +7916,6 @@ packages:
   shell-quote@1.8.1:
     resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
 
-  side-channel@1.0.4:
-    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
-
-  side-channel@1.0.5:
-    resolution: {integrity: sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==}
-    engines: {node: '>= 0.4'}
-
   side-channel@1.0.6:
     resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
     engines: {node: '>= 0.4'}
@@ -8472,10 +8025,6 @@ packages:
     resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==}
     engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
 
-  source-map-js@1.0.2:
-    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
-    engines: {node: '>=0.10.0'}
-
   source-map-js@1.2.1:
     resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
     engines: {node: '>=0.10.0'}
@@ -8611,9 +8160,6 @@ packages:
     resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
     engines: {node: '>=12'}
 
-  string.prototype.matchall@4.0.10:
-    resolution: {integrity: sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==}
-
   string.prototype.matchall@4.0.11:
     resolution: {integrity: sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==}
     engines: {node: '>= 0.4'}
@@ -8622,23 +8168,13 @@ packages:
     resolution: {integrity: sha512-67otBXoksdjsnXXRUq+KMVTdlVRZ2af422Y0aTyTjVaoQkGr3mxl2Bc5emi7dOQ3OGVVQQskmLEWwFXwommpNw==}
     engines: {node: '>= 0.4'}
 
-  string.prototype.trim@1.2.8:
-    resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==}
-    engines: {node: '>= 0.4'}
-
   string.prototype.trim@1.2.9:
     resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
     engines: {node: '>= 0.4'}
 
-  string.prototype.trimend@1.0.7:
-    resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==}
-
   string.prototype.trimend@1.0.8:
     resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
 
-  string.prototype.trimstart@1.0.7:
-    resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==}
-
   string.prototype.trimstart@1.0.8:
     resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
     engines: {node: '>= 0.4'}
@@ -8776,11 +8312,6 @@ packages:
       uglify-js:
         optional: true
 
-  terser@5.19.2:
-    resolution: {integrity: sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==}
-    engines: {node: '>=10'}
-    hasBin: true
-
   terser@5.31.3:
     resolution: {integrity: sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==}
     engines: {node: '>=10'}
@@ -8914,12 +8445,6 @@ packages:
   truncate-utf8-bytes@1.0.2:
     resolution: {integrity: sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==}
 
-  ts-api-utils@1.0.3:
-    resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==}
-    engines: {node: '>=16.13.0'}
-    peerDependencies:
-      typescript: '>=4.2.0'
-
   ts-api-utils@1.3.0:
     resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==}
     engines: {node: '>=16'}
@@ -8996,33 +8521,18 @@ packages:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}
 
-  typed-array-buffer@1.0.0:
-    resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==}
-    engines: {node: '>= 0.4'}
-
   typed-array-buffer@1.0.2:
     resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
     engines: {node: '>= 0.4'}
 
-  typed-array-byte-length@1.0.0:
-    resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==}
-    engines: {node: '>= 0.4'}
-
   typed-array-byte-length@1.0.1:
     resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
     engines: {node: '>= 0.4'}
 
-  typed-array-byte-offset@1.0.0:
-    resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==}
-    engines: {node: '>= 0.4'}
-
   typed-array-byte-offset@1.0.2:
     resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
     engines: {node: '>= 0.4'}
 
-  typed-array-length@1.0.4:
-    resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
-
   typed-array-length@1.0.6:
     resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
     engines: {node: '>= 0.4'}
@@ -9061,9 +8571,6 @@ packages:
   unbox-primitive@1.0.2:
     resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
 
-  undici-types@5.26.5:
-    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
-
   undici-types@6.19.8:
     resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
 
@@ -9168,12 +8675,6 @@ packages:
     resolution: {integrity: sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==}
     engines: {node: '>=4'}
 
-  update-browserslist-db@1.0.11:
-    resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==}
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
-
   update-browserslist-db@1.1.0:
     resolution: {integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==}
     hasBin: true
@@ -9334,34 +8835,6 @@ packages:
     engines: {node: '>=v14.18.0'}
     hasBin: true
 
-  vite@4.4.10:
-    resolution: {integrity: sha512-TzIjiqx9BEXF8yzYdF2NTf1kFFbjMjUSV0LFZ3HyHoI3SGSPLnnFUKiIQtL3gl2AjHvMrprOvQ3amzaHgQlAxw==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': '>= 14'
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-
   vite@4.5.3:
     resolution: {integrity: sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -9438,10 +8911,6 @@ packages:
   warning@4.0.3:
     resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
 
-  watchpack@2.4.0:
-    resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==}
-    engines: {node: '>=10.13.0'}
-
   watchpack@2.4.1:
     resolution: {integrity: sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==}
     engines: {node: '>=10.13.0'}
@@ -9508,10 +8977,6 @@ packages:
     resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==}
     engines: {node: '>= 0.4'}
 
-  which-typed-array@1.1.11:
-    resolution: {integrity: sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==}
-    engines: {node: '>= 0.4'}
-
   which-typed-array@1.1.15:
     resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
     engines: {node: '>= 0.4'}
@@ -9697,10 +9162,6 @@ packages:
     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
     engines: {node: '>= 6'}
 
-  yaml@2.3.2:
-    resolution: {integrity: sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==}
-    engines: {node: '>= 14'}
-
   yaml@2.4.1:
     resolution: {integrity: sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==}
     engines: {node: '>= 14'}
@@ -9799,7 +9260,7 @@ snapshots:
       '@babel/traverse': 7.22.11
       '@babel/types': 7.23.0
       convert-source-map: 1.9.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -9808,18 +9269,18 @@ snapshots:
 
   '@babel/generator@7.22.10':
     dependencies:
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
       '@jridgewell/gen-mapping': 0.3.3
-      '@jridgewell/trace-mapping': 0.3.19
+      '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
 
   '@babel/helper-annotate-as-pure@7.22.5':
     dependencies:
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
 
   '@babel/helper-builder-binary-assignment-operator-visitor@7.22.10':
     dependencies:
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
 
   '@babel/helper-compilation-targets@7.22.10':
     dependencies:
@@ -9829,24 +9290,11 @@ snapshots:
       lru-cache: 5.1.1
       semver: 6.3.1
 
-  '@babel/helper-create-class-features-plugin@7.22.11(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-environment-visitor': 7.22.5
-      '@babel/helper-function-name': 7.22.5
-      '@babel/helper-member-expression-to-functions': 7.22.5
-      '@babel/helper-optimise-call-expression': 7.22.5
-      '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.11)
-      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      semver: 6.3.1
-
   '@babel/helper-create-class-features-plugin@7.22.15(@babel/core@7.22.11)':
     dependencies:
       '@babel/core': 7.22.11
       '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-function-name': 7.22.5
       '@babel/helper-member-expression-to-functions': 7.23.0
       '@babel/helper-optimise-call-expression': 7.22.5
@@ -9867,7 +9315,7 @@ snapshots:
       '@babel/core': 7.22.11
       '@babel/helper-compilation-targets': 7.22.10
       '@babel/helper-plugin-utils': 7.22.5
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.4
     transitivePeerDependencies:
@@ -9875,18 +9323,12 @@ snapshots:
 
   '@babel/helper-environment-visitor@7.22.20': {}
 
-  '@babel/helper-environment-visitor@7.22.5': {}
-
   '@babel/helper-function-name@7.22.5':
     dependencies:
       '@babel/template': 7.22.5
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
 
   '@babel/helper-hoist-variables@7.22.5':
-    dependencies:
-      '@babel/types': 7.22.11
-
-  '@babel/helper-member-expression-to-functions@7.22.5':
     dependencies:
       '@babel/types': 7.23.0
 
@@ -9898,19 +9340,6 @@ snapshots:
     dependencies:
       '@babel/types': 7.23.0
 
-  '@babel/helper-module-imports@7.22.5':
-    dependencies:
-      '@babel/types': 7.22.11
-
-  '@babel/helper-module-transforms@7.22.9(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-environment-visitor': 7.22.5
-      '@babel/helper-module-imports': 7.22.15
-      '@babel/helper-simple-access': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/helper-validator-identifier': 7.22.5
-
   '@babel/helper-module-transforms@7.23.0(@babel/core@7.22.11)':
     dependencies:
       '@babel/core': 7.22.11
@@ -9922,7 +9351,7 @@ snapshots:
 
   '@babel/helper-optimise-call-expression@7.22.5':
     dependencies:
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
 
   '@babel/helper-plugin-utils@7.22.5': {}
 
@@ -9930,38 +9359,34 @@ snapshots:
     dependencies:
       '@babel/core': 7.22.11
       '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-wrap-function': 7.22.10
 
   '@babel/helper-replace-supers@7.22.9(@babel/core@7.22.11)':
     dependencies:
       '@babel/core': 7.22.11
-      '@babel/helper-environment-visitor': 7.22.5
-      '@babel/helper-member-expression-to-functions': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-member-expression-to-functions': 7.23.0
       '@babel/helper-optimise-call-expression': 7.22.5
 
   '@babel/helper-simple-access@7.22.5':
     dependencies:
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
 
   '@babel/helper-skip-transparent-expression-wrappers@7.22.5':
     dependencies:
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
 
   '@babel/helper-split-export-declaration@7.22.6':
     dependencies:
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
 
   '@babel/helper-string-parser@7.22.5': {}
 
   '@babel/helper-validator-identifier@7.22.20': {}
 
-  '@babel/helper-validator-identifier@7.22.5': {}
-
   '@babel/helper-validator-option@7.22.15': {}
 
-  '@babel/helper-validator-option@7.22.5': {}
-
   '@babel/helper-wrap-function@7.22.10':
     dependencies:
       '@babel/helper-function-name': 7.22.5
@@ -9978,7 +9403,7 @@ snapshots:
 
   '@babel/highlight@7.22.13':
     dependencies:
-      '@babel/helper-validator-identifier': 7.22.5
+      '@babel/helper-validator-identifier': 7.22.20
       chalk: 2.4.2
       js-tokens: 4.0.0
 
@@ -10001,7 +9426,7 @@ snapshots:
   '@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.22.11)':
     dependencies:
       '@babel/core': 7.22.11
-      '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11)
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.11)
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.22.11)':
@@ -10135,7 +9560,7 @@ snapshots:
   '@babel/plugin-transform-async-generator-functions@7.22.11(@babel/core@7.22.11)':
     dependencies:
       '@babel/core': 7.22.11
-      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.22.11)
       '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.11)
@@ -10143,7 +9568,7 @@ snapshots:
   '@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.22.11)':
     dependencies:
       '@babel/core': 7.22.11
-      '@babel/helper-module-imports': 7.22.5
+      '@babel/helper-module-imports': 7.22.15
       '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.22.11)
 
@@ -10160,13 +9585,13 @@ snapshots:
   '@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.22.11)':
     dependencies:
       '@babel/core': 7.22.11
-      '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11)
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.11)
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-transform-class-static-block@7.22.11(@babel/core@7.22.11)':
     dependencies:
       '@babel/core': 7.22.11
-      '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11)
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.11)
       '@babel/helper-plugin-utils': 7.22.5
       '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.22.11)
 
@@ -10175,7 +9600,7 @@ snapshots:
       '@babel/core': 7.22.11
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-compilation-targets': 7.22.10
-      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-function-name': 7.22.5
       '@babel/helper-optimise-call-expression': 7.22.5
       '@babel/helper-plugin-utils': 7.22.5
@@ -10266,16 +9691,9 @@ snapshots:
   '@babel/plugin-transform-modules-amd@7.22.5(@babel/core@7.22.11)':
     dependencies:
       '@babel/core': 7.22.11
-      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11)
+      '@babel/helper-module-transforms': 7.23.0(@babel/core@7.22.11)
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-transform-modules-commonjs@7.22.11(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-simple-access': 7.22.5
-
   '@babel/plugin-transform-modules-commonjs@7.23.0(@babel/core@7.22.11)':
     dependencies:
       '@babel/core': 7.22.11
@@ -10287,14 +9705,14 @@ snapshots:
     dependencies:
       '@babel/core': 7.22.11
       '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11)
+      '@babel/helper-module-transforms': 7.23.0(@babel/core@7.22.11)
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-identifier': 7.22.5
+      '@babel/helper-validator-identifier': 7.22.20
 
   '@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.22.11)':
     dependencies:
       '@babel/core': 7.22.11
-      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11)
+      '@babel/helper-module-transforms': 7.23.0(@babel/core@7.22.11)
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.22.11)':
@@ -10356,14 +9774,14 @@ snapshots:
   '@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.22.11)':
     dependencies:
       '@babel/core': 7.22.11
-      '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11)
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.11)
       '@babel/helper-plugin-utils': 7.22.5
 
   '@babel/plugin-transform-private-property-in-object@7.22.11(@babel/core@7.22.11)':
     dependencies:
       '@babel/core': 7.22.11
       '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11)
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.11)
       '@babel/helper-plugin-utils': 7.22.5
       '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.22.11)
 
@@ -10456,7 +9874,7 @@ snapshots:
       '@babel/core': 7.22.11
       '@babel/helper-compilation-targets': 7.22.10
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-option': 7.22.5
+      '@babel/helper-validator-option': 7.22.15
       '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.22.5(@babel/core@7.22.11)
       '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.22.5(@babel/core@7.22.11)
       '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.22.11)
@@ -10500,7 +9918,7 @@ snapshots:
       '@babel/plugin-transform-logical-assignment-operators': 7.22.11(@babel/core@7.22.11)
       '@babel/plugin-transform-member-expression-literals': 7.22.5(@babel/core@7.22.11)
       '@babel/plugin-transform-modules-amd': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-modules-commonjs': 7.22.11(@babel/core@7.22.11)
+      '@babel/plugin-transform-modules-commonjs': 7.23.0(@babel/core@7.22.11)
       '@babel/plugin-transform-modules-systemjs': 7.22.11(@babel/core@7.22.11)
       '@babel/plugin-transform-modules-umd': 7.22.5(@babel/core@7.22.11)
       '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.22.11)
@@ -10527,7 +9945,7 @@ snapshots:
       '@babel/plugin-transform-unicode-regex': 7.22.5(@babel/core@7.22.11)
       '@babel/plugin-transform-unicode-sets-regex': 7.22.5(@babel/core@7.22.11)
       '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.22.11)
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
       babel-plugin-polyfill-corejs2: 0.4.5(@babel/core@7.22.11)
       babel-plugin-polyfill-corejs3: 0.8.3(@babel/core@7.22.11)
       babel-plugin-polyfill-regenerator: 0.5.2(@babel/core@7.22.11)
@@ -10547,7 +9965,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.22.11
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
       esutils: 2.0.3
 
   '@babel/preset-typescript@7.23.0(@babel/core@7.22.11)':
@@ -10570,10 +9988,6 @@ snapshots:
 
   '@babel/regjsgen@0.8.0': {}
 
-  '@babel/runtime@7.22.11':
-    dependencies:
-      regenerator-runtime: 0.14.0
-
   '@babel/runtime@7.24.5':
     dependencies:
       regenerator-runtime: 0.14.0
@@ -10594,17 +10008,11 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.22.13
       '@babel/types': 7.23.0
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/types@7.22.11':
-    dependencies:
-      '@babel/helper-string-parser': 7.22.5
-      '@babel/helper-validator-identifier': 7.22.5
-      to-fast-properties: 2.0.0
-
   '@babel/types@7.23.0':
     dependencies:
       '@babel/helper-string-parser': 7.22.5
@@ -10687,20 +10095,6 @@ snapshots:
 
   '@discoveryjs/json-ext@0.5.7': {}
 
-  '@emotion/babel-plugin@11.11.0':
-    dependencies:
-      '@babel/helper-module-imports': 7.22.5
-      '@babel/runtime': 7.24.5
-      '@emotion/hash': 0.9.1
-      '@emotion/memoize': 0.8.1
-      '@emotion/serialize': 1.1.2
-      babel-plugin-macros: 3.1.0
-      convert-source-map: 1.9.0
-      escape-string-regexp: 4.0.0
-      find-root: 1.1.0
-      source-map: 0.5.7
-      stylis: 4.2.0
-
   '@emotion/babel-plugin@11.12.0':
     dependencies:
       '@babel/helper-module-imports': 7.22.15
@@ -10715,14 +10109,6 @@ snapshots:
       source-map: 0.5.7
       stylis: 4.2.0
 
-  '@emotion/cache@11.11.0':
-    dependencies:
-      '@emotion/memoize': 0.8.1
-      '@emotion/sheet': 1.2.2
-      '@emotion/utils': 1.2.1
-      '@emotion/weak-memoize': 0.3.1
-      stylis: 4.2.0
-
   '@emotion/cache@11.13.1':
     dependencies:
       '@emotion/memoize': 0.9.0
@@ -10733,20 +10119,16 @@ snapshots:
 
   '@emotion/css@11.5.0(@babel/core@7.22.11)':
     dependencies:
-      '@emotion/babel-plugin': 11.11.0
-      '@emotion/cache': 11.11.0
-      '@emotion/serialize': 1.1.2
-      '@emotion/sheet': 1.2.2
-      '@emotion/utils': 1.2.1
+      '@emotion/babel-plugin': 11.12.0
+      '@emotion/cache': 11.13.1
+      '@emotion/serialize': 1.3.0
+      '@emotion/sheet': 1.4.0
+      '@emotion/utils': 1.4.0
     optionalDependencies:
       '@babel/core': 7.22.11
 
-  '@emotion/hash@0.9.1': {}
-
   '@emotion/hash@0.9.2': {}
 
-  '@emotion/memoize@0.8.1': {}
-
   '@emotion/memoize@0.9.0': {}
 
   '@emotion/react@11.13.0(@types/react@18.2.20)(react@18.2.0)':
@@ -10763,14 +10145,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.2.20
 
-  '@emotion/serialize@1.1.2':
-    dependencies:
-      '@emotion/hash': 0.9.1
-      '@emotion/memoize': 0.8.1
-      '@emotion/unitless': 0.8.1
-      '@emotion/utils': 1.2.1
-      csstype: 3.1.2
-
   '@emotion/serialize@1.3.0':
     dependencies:
       '@emotion/hash': 0.9.2
@@ -10779,28 +10153,16 @@ snapshots:
       '@emotion/utils': 1.4.0
       csstype: 3.1.2
 
-  '@emotion/sheet@1.2.2': {}
-
   '@emotion/sheet@1.4.0': {}
 
-  '@emotion/unitless@0.8.1': {}
-
   '@emotion/unitless@0.9.0': {}
 
-  '@emotion/use-insertion-effect-with-fallbacks@1.0.1(react@18.2.0)':
-    dependencies:
-      react: 18.2.0
-
   '@emotion/use-insertion-effect-with-fallbacks@1.1.0(react@18.2.0)':
     dependencies:
       react: 18.2.0
 
-  '@emotion/utils@1.2.1': {}
-
   '@emotion/utils@1.4.0': {}
 
-  '@emotion/weak-memoize@0.3.1': {}
-
   '@emotion/weak-memoize@0.4.0': {}
 
   '@esbuild/aix-ppc64@0.19.11':
@@ -10812,198 +10174,132 @@ snapshots:
   '@esbuild/android-arm64@0.19.11':
     optional: true
 
-  '@esbuild/android-arm64@0.19.3':
-    optional: true
-
   '@esbuild/android-arm@0.18.20':
     optional: true
 
   '@esbuild/android-arm@0.19.11':
     optional: true
 
-  '@esbuild/android-arm@0.19.3':
-    optional: true
-
   '@esbuild/android-x64@0.18.20':
     optional: true
 
   '@esbuild/android-x64@0.19.11':
     optional: true
 
-  '@esbuild/android-x64@0.19.3':
-    optional: true
-
   '@esbuild/darwin-arm64@0.18.20':
     optional: true
 
   '@esbuild/darwin-arm64@0.19.11':
     optional: true
 
-  '@esbuild/darwin-arm64@0.19.3':
-    optional: true
-
   '@esbuild/darwin-x64@0.18.20':
     optional: true
 
   '@esbuild/darwin-x64@0.19.11':
     optional: true
 
-  '@esbuild/darwin-x64@0.19.3':
-    optional: true
-
   '@esbuild/freebsd-arm64@0.18.20':
     optional: true
 
   '@esbuild/freebsd-arm64@0.19.11':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.19.3':
-    optional: true
-
   '@esbuild/freebsd-x64@0.18.20':
     optional: true
 
   '@esbuild/freebsd-x64@0.19.11':
     optional: true
 
-  '@esbuild/freebsd-x64@0.19.3':
-    optional: true
-
   '@esbuild/linux-arm64@0.18.20':
     optional: true
 
   '@esbuild/linux-arm64@0.19.11':
     optional: true
 
-  '@esbuild/linux-arm64@0.19.3':
-    optional: true
-
   '@esbuild/linux-arm@0.18.20':
     optional: true
 
   '@esbuild/linux-arm@0.19.11':
     optional: true
 
-  '@esbuild/linux-arm@0.19.3':
-    optional: true
-
   '@esbuild/linux-ia32@0.18.20':
     optional: true
 
   '@esbuild/linux-ia32@0.19.11':
     optional: true
 
-  '@esbuild/linux-ia32@0.19.3':
-    optional: true
-
   '@esbuild/linux-loong64@0.18.20':
     optional: true
 
   '@esbuild/linux-loong64@0.19.11':
     optional: true
 
-  '@esbuild/linux-loong64@0.19.3':
-    optional: true
-
   '@esbuild/linux-mips64el@0.18.20':
     optional: true
 
   '@esbuild/linux-mips64el@0.19.11':
     optional: true
 
-  '@esbuild/linux-mips64el@0.19.3':
-    optional: true
-
   '@esbuild/linux-ppc64@0.18.20':
     optional: true
 
   '@esbuild/linux-ppc64@0.19.11':
     optional: true
 
-  '@esbuild/linux-ppc64@0.19.3':
-    optional: true
-
   '@esbuild/linux-riscv64@0.18.20':
     optional: true
 
   '@esbuild/linux-riscv64@0.19.11':
     optional: true
 
-  '@esbuild/linux-riscv64@0.19.3':
-    optional: true
-
   '@esbuild/linux-s390x@0.18.20':
     optional: true
 
   '@esbuild/linux-s390x@0.19.11':
     optional: true
 
-  '@esbuild/linux-s390x@0.19.3':
-    optional: true
-
   '@esbuild/linux-x64@0.18.20':
     optional: true
 
   '@esbuild/linux-x64@0.19.11':
     optional: true
 
-  '@esbuild/linux-x64@0.19.3':
-    optional: true
-
   '@esbuild/netbsd-x64@0.18.20':
     optional: true
 
   '@esbuild/netbsd-x64@0.19.11':
     optional: true
 
-  '@esbuild/netbsd-x64@0.19.3':
-    optional: true
-
   '@esbuild/openbsd-x64@0.18.20':
     optional: true
 
   '@esbuild/openbsd-x64@0.19.11':
     optional: true
 
-  '@esbuild/openbsd-x64@0.19.3':
-    optional: true
-
   '@esbuild/sunos-x64@0.18.20':
     optional: true
 
   '@esbuild/sunos-x64@0.19.11':
     optional: true
 
-  '@esbuild/sunos-x64@0.19.3':
-    optional: true
-
   '@esbuild/win32-arm64@0.18.20':
     optional: true
 
   '@esbuild/win32-arm64@0.19.11':
     optional: true
 
-  '@esbuild/win32-arm64@0.19.3':
-    optional: true
-
   '@esbuild/win32-ia32@0.18.20':
     optional: true
 
   '@esbuild/win32-ia32@0.19.11':
     optional: true
 
-  '@esbuild/win32-ia32@0.19.3':
-    optional: true
-
   '@esbuild/win32-x64@0.18.20':
     optional: true
 
   '@esbuild/win32-x64@0.19.11':
     optional: true
 
-  '@esbuild/win32-x64@0.19.3':
-    optional: true
-
   '@eslint-community/eslint-utils@4.4.0(eslint@8.50.0)':
     dependencies:
       eslint: 8.50.0
@@ -11014,7 +10310,7 @@ snapshots:
   '@eslint/eslintrc@2.1.2':
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       espree: 9.6.1
       globals: 13.21.0
       ignore: 5.2.4
@@ -11040,12 +10336,6 @@ snapshots:
       '@floating-ui/core': 1.5.0
       '@floating-ui/utils': 0.1.6
 
-  '@floating-ui/react-dom@2.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
-    dependencies:
-      '@floating-ui/dom': 1.5.3
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-
   '@floating-ui/react-dom@2.0.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@floating-ui/dom': 1.5.3
@@ -11054,7 +10344,7 @@ snapshots:
 
   '@floating-ui/react@0.26.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@floating-ui/react-dom': 2.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@floating-ui/react-dom': 2.0.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@floating-ui/utils': 0.1.6
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -11074,7 +10364,7 @@ snapshots:
   '@humanwhocodes/config-array@0.11.11':
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -11110,7 +10400,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.22.11
       '@jest/types': 29.6.3
-      '@jridgewell/trace-mapping': 0.3.19
+      '@jridgewell/trace-mapping': 0.3.25
       babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
       convert-source-map: 2.0.0
@@ -11437,13 +10727,13 @@ snapshots:
       regenerator-runtime: 0.13.11
     optional: true
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.2.1(typescript@5.5.4)(vite@4.5.3(@types/node@20.8.0)(terser@5.31.3))':
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.2.1(typescript@5.5.4)(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))':
     dependencies:
       glob: 7.2.3
       glob-promise: 4.2.2(glob@7.2.3)
       magic-string: 0.27.0
       react-docgen-typescript: 2.2.2(typescript@5.5.4)
-      vite: 4.5.3(@types/node@20.8.0)(terser@5.31.3)
+      vite: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
     optionalDependencies:
       typescript: 5.5.4
 
@@ -11451,7 +10741,7 @@ snapshots:
     dependencies:
       '@jridgewell/set-array': 1.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
-      '@jridgewell/trace-mapping': 0.3.19
+      '@jridgewell/trace-mapping': 0.3.25
 
   '@jridgewell/resolve-uri@3.1.1': {}
 
@@ -11460,15 +10750,10 @@ snapshots:
   '@jridgewell/source-map@0.3.5':
     dependencies:
       '@jridgewell/gen-mapping': 0.3.3
-      '@jridgewell/trace-mapping': 0.3.19
+      '@jridgewell/trace-mapping': 0.3.25
 
   '@jridgewell/sourcemap-codec@1.4.15': {}
 
-  '@jridgewell/trace-mapping@0.3.19':
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.1
-      '@jridgewell/sourcemap-codec': 1.4.15
-
   '@jridgewell/trace-mapping@0.3.25':
     dependencies:
       '@jridgewell/resolve-uri': 3.1.1
@@ -11487,7 +10772,7 @@ snapshots:
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
-      semver: 7.5.4
+      semver: 7.6.0
       tar: 6.2.0
     transitivePeerDependencies:
       - encoding
@@ -11697,7 +10982,7 @@ snapshots:
   '@radix-ui/react-popper@1.1.2(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.24.5
-      '@floating-ui/react-dom': 2.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@floating-ui/react-dom': 2.0.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.20)(react@18.2.0)
       '@radix-ui/react-context': 1.0.1(@types/react@18.2.20)(react@18.2.0)
@@ -11918,7 +11203,7 @@ snapshots:
   '@rollup/plugin-babel@5.3.1(@babel/core@7.22.11)(@types/babel__core@7.20.2)(rollup@2.79.1)':
     dependencies:
       '@babel/core': 7.22.11
-      '@babel/helper-module-imports': 7.22.5
+      '@babel/helper-module-imports': 7.22.15
       '@rollup/pluginutils': 3.1.0(rollup@2.79.1)
       rollup: 2.79.1
     optionalDependencies:
@@ -11949,7 +11234,7 @@ snapshots:
 
   '@rollup/pluginutils@5.0.5(rollup@2.79.1)':
     dependencies:
-      '@types/estree': 1.0.2
+      '@types/estree': 1.0.5
       estree-walker: 2.0.2
       picomatch: 2.3.1
     optionalDependencies:
@@ -11999,14 +11284,14 @@ snapshots:
       '@rspack/plugin-react-refresh': 1.0.0-beta.1(react-refresh@0.14.2)
       react-refresh: 0.14.2
 
-  '@rsbuild/plugin-type-check@1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)(esbuild@0.19.3)(typescript@5.5.4)':
+  '@rsbuild/plugin-type-check@1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)(esbuild@0.19.11)(typescript@5.5.4)':
     dependencies:
       '@rsbuild/core': 1.0.1-beta.9
       deepmerge: 4.3.1
-      fork-ts-checker-webpack-plugin: 9.0.2(typescript@5.5.4)(webpack@5.93.0(esbuild@0.19.3))
+      fork-ts-checker-webpack-plugin: 9.0.2(typescript@5.5.4)(webpack@5.93.0(esbuild@0.19.11))
       json5: 2.2.3
       reduce-configs: 1.0.0
-      webpack: 5.93.0(esbuild@0.19.3)
+      webpack: 5.93.0(esbuild@0.19.11)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild
@@ -12352,7 +11637,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@storybook/builder-vite@7.4.6(encoding@0.1.13)(typescript@5.5.4)(vite@4.5.3(@types/node@20.8.0)(terser@5.31.3))':
+  '@storybook/builder-vite@7.4.6(encoding@0.1.13)(typescript@5.5.4)(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))':
     dependencies:
       '@storybook/channels': 7.4.6
       '@storybook/client-logger': 7.4.6
@@ -12373,7 +11658,7 @@ snapshots:
       remark-external-links: 8.0.0
       remark-slug: 6.1.0
       rollup: 3.29.4
-      vite: 4.5.3(@types/node@20.8.0)(terser@5.31.3)
+      vite: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
     optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -12393,7 +11678,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.22.11
       '@babel/preset-env': 7.22.10(@babel/core@7.22.11)
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
       '@ndelangen/get-tarball': 3.0.9
       '@storybook/codemod': 7.4.6
       '@storybook/core-common': 7.4.6(encoding@0.1.13)
@@ -12426,7 +11711,7 @@ snapshots:
       prompts: 2.4.2
       puppeteer-core: 2.1.1
       read-pkg-up: 7.0.1
-      semver: 7.5.4
+      semver: 7.6.0
       simple-update-notifier: 2.0.0
       strip-json-comments: 3.1.1
       tempy: 1.0.1
@@ -12446,7 +11731,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.22.11
       '@babel/preset-env': 7.22.10(@babel/core@7.22.11)
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
       '@storybook/csf': 0.1.1
       '@storybook/csf-tools': 7.4.6
       '@storybook/node-logger': 7.4.6
@@ -12552,13 +11837,13 @@ snapshots:
       pretty-hrtime: 1.0.3
       prompts: 2.4.2
       read-pkg-up: 7.0.1
-      semver: 7.5.4
+      semver: 7.6.0
       telejson: 7.2.0
       tiny-invariant: 1.3.1
       ts-dedent: 2.2.0
       util: 0.12.5
       util-deprecate: 1.0.2
-      watchpack: 2.4.0
+      watchpack: 2.4.1
       ws: 8.11.0
     transitivePeerDependencies:
       - bufferutil
@@ -12578,7 +11863,7 @@ snapshots:
       '@babel/generator': 7.22.10
       '@babel/parser': 7.22.13
       '@babel/traverse': 7.22.11
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
       '@storybook/csf': 0.1.1
       '@storybook/types': 7.4.6
       fs-extra: 11.1.1
@@ -12622,7 +11907,7 @@ snapshots:
       memoizerific: 1.11.3
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      semver: 7.5.4
+      semver: 7.6.0
       store2: 2.14.2
       telejson: 7.2.0
       ts-dedent: 2.2.0
@@ -12659,19 +11944,19 @@ snapshots:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
 
-  '@storybook/react-vite@7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.4)(vite@4.5.3(@types/node@20.8.0)(terser@5.31.3))':
+  '@storybook/react-vite@7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.4)(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))':
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.2.1(typescript@5.5.4)(vite@4.5.3(@types/node@20.8.0)(terser@5.31.3))
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.2.1(typescript@5.5.4)(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))
       '@rollup/pluginutils': 5.0.5(rollup@2.79.1)
-      '@storybook/builder-vite': 7.4.6(encoding@0.1.13)(typescript@5.5.4)(vite@4.5.3(@types/node@20.8.0)(terser@5.31.3))
+      '@storybook/builder-vite': 7.4.6(encoding@0.1.13)(typescript@5.5.4)(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))
       '@storybook/react': 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
-      '@vitejs/plugin-react': 3.1.0(vite@4.5.3(@types/node@20.8.0)(terser@5.31.3))
+      '@vitejs/plugin-react': 3.1.0(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))
       ast-types: 0.14.2
       magic-string: 0.30.4
       react: 18.2.0
       react-docgen: 6.0.0-alpha.3
       react-dom: 18.2.0(react@18.2.0)
-      vite: 4.5.3(@types/node@20.8.0)(terser@5.31.3)
+      vite: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - encoding
@@ -12735,7 +12020,7 @@ snapshots:
 
   '@storybook/theming@7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0)
+      '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@18.2.0)
       '@storybook/client-logger': 7.4.6
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
@@ -12801,7 +12086,7 @@ snapshots:
       ejs: 3.1.9
       json5: 2.2.3
       magic-string: 0.25.9
-      string.prototype.matchall: 4.0.10
+      string.prototype.matchall: 4.0.11
 
   '@swc/helpers@0.5.11':
     dependencies:
@@ -12816,23 +12101,23 @@ snapshots:
   '@types/babel__core@7.20.2':
     dependencies:
       '@babel/parser': 7.22.13
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
       '@types/babel__generator': 7.6.5
       '@types/babel__template': 7.4.2
       '@types/babel__traverse': 7.20.2
 
   '@types/babel__generator@7.6.5':
     dependencies:
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
 
   '@types/babel__template@7.4.2':
     dependencies:
       '@babel/parser': 7.22.13
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
 
   '@types/babel__traverse@7.20.2':
     dependencies:
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.0
 
   '@types/body-parser@1.19.3':
     dependencies:
@@ -12891,8 +12176,6 @@ snapshots:
 
   '@types/estree@0.0.51': {}
 
-  '@types/estree@1.0.2': {}
-
   '@types/estree@1.0.5': {}
 
   '@types/express-serve-static-core@4.17.37':
@@ -12950,7 +12233,7 @@ snapshots:
 
   '@types/mdast@4.0.3':
     dependencies:
-      '@types/unist': 2.0.8
+      '@types/unist': 3.0.2
 
   '@types/mdx@2.0.8': {}
 
@@ -12980,12 +12263,6 @@ snapshots:
 
   '@types/node@16.18.58': {}
 
-  '@types/node@20.12.8':
-    dependencies:
-      undici-types: 5.26.5
-
-  '@types/node@20.8.0': {}
-
   '@types/node@22.8.1':
     dependencies:
       undici-types: 6.19.8
@@ -13000,8 +12277,6 @@ snapshots:
 
   '@types/prop-types@15.7.12': {}
 
-  '@types/prop-types@15.7.5': {}
-
   '@types/qs@6.9.8': {}
 
   '@types/range-parser@1.2.5': {}
@@ -13018,7 +12293,7 @@ snapshots:
 
   '@types/react@18.2.20':
     dependencies:
-      '@types/prop-types': 15.7.5
+      '@types/prop-types': 15.7.12
       '@types/scheduler': 0.16.3
       csstype: 3.1.2
 
@@ -13082,7 +12357,7 @@ snapshots:
 
   '@types/wait-on@5.3.4':
     dependencies:
-      '@types/node': 20.12.8
+      '@types/node': 22.8.1
 
   '@types/webxr@0.5.7': {}
 
@@ -13094,14 +12369,9 @@ snapshots:
     dependencies:
       '@types/yargs-parser': 21.0.1
 
-  '@types/yauzl@2.10.1':
-    dependencies:
-      '@types/node': 22.8.1
-
   '@types/yauzl@2.10.3':
     dependencies:
       '@types/node': 22.8.1
-    optional: true
 
   '@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4)':
     dependencies:
@@ -13111,14 +12381,14 @@ snapshots:
       '@typescript-eslint/type-utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4)
       '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4)
       '@typescript-eslint/visitor-keys': 6.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       eslint: 8.50.0
       graphemer: 1.4.0
       ignore: 5.2.4
       natural-compare: 1.4.0
       natural-compare-lite: 1.4.0
-      semver: 7.5.4
-      ts-api-utils: 1.0.3(typescript@5.5.4)
+      semver: 7.6.0
+      ts-api-utils: 1.3.0(typescript@5.5.4)
     optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -13130,7 +12400,7 @@ snapshots:
       '@typescript-eslint/types': 6.7.3
       '@typescript-eslint/typescript-estree': 6.7.3(typescript@5.5.4)
       '@typescript-eslint/visitor-keys': 6.7.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       eslint: 8.50.0
     optionalDependencies:
       typescript: 5.5.4
@@ -13156,9 +12426,9 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.5.4)
       '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4)
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
       eslint: 8.50.0
-      ts-api-utils: 1.0.3(typescript@5.5.4)
+      ts-api-utils: 1.3.0(typescript@5.5.4)
     optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -13174,11 +12444,11 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.1.0
       '@typescript-eslint/visitor-keys': 6.1.0
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.0
-      ts-api-utils: 1.0.3(typescript@5.5.4)
+      ts-api-utils: 1.3.0(typescript@5.5.4)
     optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -13188,11 +12458,11 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.7.3
       '@typescript-eslint/visitor-keys': 6.7.3
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.0
-      ts-api-utils: 1.0.3(typescript@5.5.4)
+      ts-api-utils: 1.3.0(typescript@5.5.4)
     optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -13202,7 +12472,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 8.0.0
       '@typescript-eslint/visitor-keys': 8.0.0
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -13253,14 +12523,14 @@ snapshots:
       '@typescript-eslint/types': 8.0.0
       eslint-visitor-keys: 3.4.3
 
-  '@vitejs/plugin-react@3.1.0(vite@4.5.3(@types/node@20.8.0)(terser@5.31.3))':
+  '@vitejs/plugin-react@3.1.0(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))':
     dependencies:
       '@babel/core': 7.22.11
       '@babel/plugin-transform-react-jsx-self': 7.22.5(@babel/core@7.22.11)
       '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.22.11)
       magic-string: 0.27.0
       react-refresh: 0.14.2
-      vite: 4.5.3(@types/node@20.8.0)(terser@5.31.3)
+      vite: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -13412,7 +12682,7 @@ snapshots:
 
   '@xmcl/unzip@2.1.2(yauzl@2.10.0)':
     dependencies:
-      '@types/yauzl': 2.10.1
+      '@types/yauzl': 2.10.3
       yauzl: 2.10.0
 
   '@xobotyi/scrollbar-width@1.9.5': {}
@@ -13451,7 +12721,7 @@ snapshots:
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
@@ -13508,10 +12778,6 @@ snapshots:
     dependencies:
       acorn: 7.4.1
 
-  acorn-jsx@5.3.2(acorn@8.10.0):
-    dependencies:
-      acorn: 8.10.0
-
   acorn-jsx@5.3.2(acorn@8.12.1):
     dependencies:
       acorn: 8.12.1
@@ -13522,8 +12788,6 @@ snapshots:
 
   acorn@7.4.1: {}
 
-  acorn@8.10.0: {}
-
   acorn@8.12.1: {}
 
   address@1.2.2: {}
@@ -13539,14 +12803,14 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     optional: true
 
   agent-base@7.1.0:
     dependencies:
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -13663,11 +12927,6 @@ snapshots:
 
   arr-union@3.1.0: {}
 
-  array-buffer-byte-length@1.0.0:
-    dependencies:
-      call-bind: 1.0.2
-      is-array-buffer: 3.0.2
-
   array-buffer-byte-length@1.0.1:
     dependencies:
       call-bind: 1.0.7
@@ -13675,14 +12934,6 @@ snapshots:
 
   array-flatten@1.1.1: {}
 
-  array-includes@3.1.7:
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.1
-      es-abstract: 1.22.2
-      get-intrinsic: 1.2.1
-      is-string: 1.0.7
-
   array-includes@3.1.8:
     dependencies:
       call-bind: 1.0.7
@@ -13707,17 +12958,17 @@ snapshots:
 
   array.prototype.flat@1.3.2:
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.2
-      es-shim-unscopables: 1.0.0
+      es-abstract: 1.23.3
+      es-shim-unscopables: 1.0.2
 
   array.prototype.flatmap@1.3.2:
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.2
-      es-shim-unscopables: 1.0.0
+      es-abstract: 1.23.3
+      es-shim-unscopables: 1.0.2
 
   array.prototype.toreversed@1.1.2:
     dependencies:
@@ -13734,16 +12985,6 @@ snapshots:
       es-errors: 1.3.0
       es-shim-unscopables: 1.0.2
 
-  arraybuffer.prototype.slice@1.0.2:
-    dependencies:
-      array-buffer-byte-length: 1.0.0
-      call-bind: 1.0.2
-      define-properties: 1.2.1
-      es-abstract: 1.22.2
-      get-intrinsic: 1.2.1
-      is-array-buffer: 3.0.2
-      is-shared-array-buffer: 1.0.2
-
   arraybuffer.prototype.slice@1.0.3:
     dependencies:
       array-buffer-byte-length: 1.0.1
@@ -13776,13 +13017,6 @@ snapshots:
   assert-plus@1.0.0:
     optional: true
 
-  assert@2.0.0:
-    dependencies:
-      es6-object-assign: 1.1.0
-      is-nan: 1.3.2
-      object-is: 1.1.5
-      util: 0.12.5
-
   assert@2.1.0:
     dependencies:
       call-bind: 1.0.7
@@ -13826,8 +13060,6 @@ snapshots:
 
   atob@2.1.2: {}
 
-  available-typed-arrays@1.0.5: {}
-
   available-typed-arrays@1.0.7:
     dependencies:
       possible-typed-array-names: 1.0.0
@@ -13844,9 +13076,9 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  axios@1.7.2(debug@4.3.4):
+  axios@1.7.2(debug@4.3.7):
     dependencies:
-      follow-redirects: 1.15.6(debug@4.3.4)
+      follow-redirects: 1.15.6(debug@4.3.7)
       form-data: 4.0.0
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
@@ -14098,16 +13330,9 @@ snapshots:
     dependencies:
       pako: 1.0.11
 
-  browserslist@4.21.10:
-    dependencies:
-      caniuse-lite: 1.0.30001643
-      electron-to-chromium: 1.4.504
-      node-releases: 2.0.13
-      update-browserslist-db: 1.0.11(browserslist@4.21.10)
-
   browserslist@4.23.2:
     dependencies:
-      caniuse-lite: 1.0.30001643
+      caniuse-lite: 1.0.30001646
       electron-to-chromium: 1.5.0
       node-releases: 2.0.18
       update-browserslist-db: 1.1.0(browserslist@4.23.2)
@@ -14198,11 +13423,6 @@ snapshots:
   cachedir@2.4.0:
     optional: true
 
-  call-bind@1.0.2:
-    dependencies:
-      function-bind: 1.1.1
-      get-intrinsic: 1.2.1
-
   call-bind@1.0.7:
     dependencies:
       es-define-property: 1.0.0
@@ -14229,8 +13449,6 @@ snapshots:
 
   camelcase@6.3.0: {}
 
-  caniuse-lite@1.0.30001643: {}
-
   caniuse-lite@1.0.30001646: {}
 
   canvas@2.11.2(encoding@0.1.13):
@@ -14561,7 +13779,7 @@ snapshots:
 
   core-js-compat@3.32.1:
     dependencies:
-      browserslist: 4.21.10
+      browserslist: 4.23.2
 
   core-js@3.37.1: {}
 
@@ -14714,7 +13932,7 @@ snapshots:
       commander: 5.1.0
       common-tags: 1.8.2
       dayjs: 1.11.9
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       enquirer: 2.4.1
       eventemitter2: 6.4.7
       execa: 4.1.0
@@ -14789,15 +14007,11 @@ snapshots:
       ms: 2.1.3
     optional: true
 
-  debug@4.3.4(supports-color@8.1.1):
-    dependencies:
-      ms: 2.1.2
-    optionalDependencies:
-      supports-color: 8.1.1
-
-  debug@4.3.7:
+  debug@4.3.7(supports-color@8.1.1):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 8.1.1
 
   decamelize-keys@1.1.1:
     dependencies:
@@ -14842,12 +14056,6 @@ snapshots:
     dependencies:
       clone: 1.0.4
 
-  define-data-property@1.1.0:
-    dependencies:
-      get-intrinsic: 1.2.1
-      gopd: 1.0.1
-      has-property-descriptors: 1.0.0
-
   define-data-property@1.1.4:
     dependencies:
       es-define-property: 1.0.0
@@ -14858,8 +14066,8 @@ snapshots:
 
   define-properties@1.2.1:
     dependencies:
-      define-data-property: 1.1.0
-      has-property-descriptors: 1.0.0
+      define-data-property: 1.1.4
+      has-property-descriptors: 1.0.2
       object-keys: 1.1.1
 
   define-property@0.2.5:
@@ -14929,7 +14137,7 @@ snapshots:
   detect-port@1.5.1:
     dependencies:
       address: 1.2.2
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -15049,8 +14257,6 @@ snapshots:
     dependencies:
       jake: 10.8.7
 
-  electron-to-chromium@1.4.504: {}
-
   electron-to-chromium@1.5.0: {}
 
   elliptic@6.5.4:
@@ -15106,7 +14312,7 @@ snapshots:
   engine.io-client@6.5.2:
     dependencies:
       '@socket.io/component-emitter': 3.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       engine.io-parser: 5.2.1
       ws: 8.11.0
       xmlhttprequest-ssl: 2.0.0
@@ -15149,7 +14355,7 @@ snapshots:
       base64id: 2.0.0
       cookie: 0.4.2
       cors: 2.8.5
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       engine.io-parser: 5.2.1
       ws: 8.11.0
     transitivePeerDependencies:
@@ -15188,48 +14394,6 @@ snapshots:
 
   eruda@3.0.1: {}
 
-  es-abstract@1.22.2:
-    dependencies:
-      array-buffer-byte-length: 1.0.0
-      arraybuffer.prototype.slice: 1.0.2
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
-      es-set-tostringtag: 2.0.1
-      es-to-primitive: 1.2.1
-      function.prototype.name: 1.1.6
-      get-intrinsic: 1.2.1
-      get-symbol-description: 1.0.0
-      globalthis: 1.0.3
-      gopd: 1.0.1
-      has: 1.0.3
-      has-property-descriptors: 1.0.0
-      has-proto: 1.0.1
-      has-symbols: 1.0.3
-      internal-slot: 1.0.5
-      is-array-buffer: 3.0.2
-      is-callable: 1.2.7
-      is-negative-zero: 2.0.2
-      is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.2
-      is-string: 1.0.7
-      is-typed-array: 1.1.12
-      is-weakref: 1.0.2
-      object-inspect: 1.12.3
-      object-keys: 1.1.1
-      object.assign: 4.1.4
-      regexp.prototype.flags: 1.5.1
-      safe-array-concat: 1.0.1
-      safe-regex-test: 1.0.0
-      string.prototype.trim: 1.2.8
-      string.prototype.trimend: 1.0.7
-      string.prototype.trimstart: 1.0.7
-      typed-array-buffer: 1.0.0
-      typed-array-byte-length: 1.0.0
-      typed-array-byte-offset: 1.0.0
-      typed-array-length: 1.0.4
-      unbox-primitive: 1.0.2
-      which-typed-array: 1.1.11
-
   es-abstract@1.23.3:
     dependencies:
       array-buffer-byte-length: 1.0.1
@@ -15310,22 +14474,12 @@ snapshots:
     dependencies:
       es-errors: 1.3.0
 
-  es-set-tostringtag@2.0.1:
-    dependencies:
-      get-intrinsic: 1.2.1
-      has: 1.0.3
-      has-tostringtag: 1.0.0
-
   es-set-tostringtag@2.0.3:
     dependencies:
       get-intrinsic: 1.2.4
       has-tostringtag: 1.0.2
       hasown: 2.0.2
 
-  es-shim-unscopables@1.0.0:
-    dependencies:
-      has: 1.0.3
-
   es-shim-unscopables@1.0.2:
     dependencies:
       hasown: 2.0.2
@@ -15336,8 +14490,6 @@ snapshots:
       is-date-object: 1.0.5
       is-symbol: 1.0.4
 
-  es6-object-assign@1.1.0: {}
-
   es6-promise@4.2.8: {}
 
   es6-promisify@5.0.0:
@@ -15346,15 +14498,15 @@ snapshots:
 
   esbuild-plugin-alias@0.2.1: {}
 
-  esbuild-plugin-polyfill-node@0.3.0(esbuild@0.19.3):
+  esbuild-plugin-polyfill-node@0.3.0(esbuild@0.19.11):
     dependencies:
       '@jspm/core': 2.0.1
-      esbuild: 0.19.3
+      esbuild: 0.19.11
       import-meta-resolve: 3.0.0
 
   esbuild-register@3.5.0(esbuild@0.18.20):
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       esbuild: 0.18.20
     transitivePeerDependencies:
       - supports-color
@@ -15410,31 +14562,6 @@ snapshots:
       '@esbuild/win32-ia32': 0.19.11
       '@esbuild/win32-x64': 0.19.11
 
-  esbuild@0.19.3:
-    optionalDependencies:
-      '@esbuild/android-arm': 0.19.3
-      '@esbuild/android-arm64': 0.19.3
-      '@esbuild/android-x64': 0.19.3
-      '@esbuild/darwin-arm64': 0.19.3
-      '@esbuild/darwin-x64': 0.19.3
-      '@esbuild/freebsd-arm64': 0.19.3
-      '@esbuild/freebsd-x64': 0.19.3
-      '@esbuild/linux-arm': 0.19.3
-      '@esbuild/linux-arm64': 0.19.3
-      '@esbuild/linux-ia32': 0.19.3
-      '@esbuild/linux-loong64': 0.19.3
-      '@esbuild/linux-mips64el': 0.19.3
-      '@esbuild/linux-ppc64': 0.19.3
-      '@esbuild/linux-riscv64': 0.19.3
-      '@esbuild/linux-s390x': 0.19.3
-      '@esbuild/linux-x64': 0.19.3
-      '@esbuild/netbsd-x64': 0.19.3
-      '@esbuild/openbsd-x64': 0.19.3
-      '@esbuild/sunos-x64': 0.19.3
-      '@esbuild/win32-arm64': 0.19.3
-      '@esbuild/win32-ia32': 0.19.3
-      '@esbuild/win32-x64': 0.19.3
-
   escalade@3.1.2: {}
 
   escape-html@1.0.3: {}
@@ -15499,7 +14626,7 @@ snapshots:
   eslint-import-resolver-node@0.3.9:
     dependencies:
       debug: 3.2.7(supports-color@8.1.1)
-      is-core-module: 2.13.0
+      is-core-module: 2.15.1
       resolve: 1.22.4
     transitivePeerDependencies:
       - supports-color
@@ -15528,7 +14655,7 @@ snapshots:
 
   eslint-plugin-import@2.27.5(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0):
     dependencies:
-      array-includes: 3.1.7
+      array-includes: 3.1.8
       array.prototype.flat: 1.3.2
       array.prototype.flatmap: 1.3.2
       debug: 3.2.7(supports-color@8.1.1)
@@ -15537,10 +14664,10 @@ snapshots:
       eslint-import-resolver-node: 0.3.9
       eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@8.50.0)
       has: 1.0.3
-      is-core-module: 2.13.0
+      is-core-module: 2.15.1
       is-glob: 4.0.3
       minimatch: 3.1.2
-      object.values: 1.1.7
+      object.values: 1.2.0
       resolve: 1.22.4
       semver: 6.3.1
       tsconfig-paths: 3.14.2
@@ -15593,7 +14720,7 @@ snapshots:
 
   eslint-plugin-unicorn@48.0.0(eslint@8.50.0):
     dependencies:
-      '@babel/helper-validator-identifier': 7.22.5
+      '@babel/helper-validator-identifier': 7.22.20
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.50.0)
       ci-info: 3.8.0
       clean-regexp: 1.0.0
@@ -15607,7 +14734,7 @@ snapshots:
       read-pkg-up: 7.0.1
       regexp-tree: 0.1.27
       regjsparser: 0.10.0
-      semver: 7.5.4
+      semver: 7.6.0
       strip-indent: 3.0.0
 
   eslint-scope@5.1.1:
@@ -15642,7 +14769,7 @@ snapshots:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -15680,8 +14807,8 @@ snapshots:
 
   espree@9.6.1:
     dependencies:
-      acorn: 8.10.0
-      acorn-jsx: 5.3.2(acorn@8.10.0)
+      acorn: 8.12.1
+      acorn-jsx: 5.3.2(acorn@8.12.1)
       eslint-visitor-keys: 3.4.3
 
   esprima@4.0.1: {}
@@ -15869,7 +14996,7 @@ snapshots:
 
   extract-zip@2.0.1(supports-color@8.1.1):
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
@@ -16021,17 +15148,9 @@ snapshots:
 
   flow-parser@0.218.0: {}
 
-  follow-redirects@1.15.3(debug@4.3.4):
-    optionalDependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-
-  follow-redirects@1.15.6(debug@4.3.4):
-    optionalDependencies:
-      debug: 4.3.4(supports-color@8.1.1)
-
   follow-redirects@1.15.6(debug@4.3.7):
     optionalDependencies:
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
 
   for-each@0.3.3:
     dependencies:
@@ -16052,7 +15171,7 @@ snapshots:
   forever-agent@0.6.1:
     optional: true
 
-  fork-ts-checker-webpack-plugin@9.0.2(typescript@5.5.4)(webpack@5.93.0(esbuild@0.19.3)):
+  fork-ts-checker-webpack-plugin@9.0.2(typescript@5.5.4)(webpack@5.93.0(esbuild@0.19.11)):
     dependencies:
       '@babel/code-frame': 7.22.13
       chalk: 4.1.2
@@ -16067,7 +15186,7 @@ snapshots:
       semver: 7.6.0
       tapable: 2.2.1
       typescript: 5.5.4
-      webpack: 5.93.0(esbuild@0.19.3)
+      webpack: 5.93.0(esbuild@0.19.11)
 
   form-data@2.3.3:
     dependencies:
@@ -16137,15 +15256,13 @@ snapshots:
   fsevents@2.3.3:
     optional: true
 
-  function-bind@1.1.1: {}
-
   function-bind@1.1.2: {}
 
   function.prototype.name@1.1.6:
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.2
+      es-abstract: 1.23.3
       functions-have-names: 1.2.3
 
   functions-have-names@1.2.3: {}
@@ -16181,20 +15298,13 @@ snapshots:
 
   get-func-name@2.0.2: {}
 
-  get-intrinsic@1.2.1:
-    dependencies:
-      function-bind: 1.1.1
-      has: 1.0.3
-      has-proto: 1.0.1
-      has-symbols: 1.0.3
-
   get-intrinsic@1.2.4:
     dependencies:
       es-errors: 1.3.0
       function-bind: 1.1.2
-      has-proto: 1.0.1
+      has-proto: 1.0.3
       has-symbols: 1.0.3
-      hasown: 2.0.1
+      hasown: 2.0.2
 
   get-nonce@1.0.1: {}
 
@@ -16212,11 +15322,6 @@ snapshots:
 
   get-stream@6.0.1: {}
 
-  get-symbol-description@1.0.0:
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
-
   get-symbol-description@1.0.2:
     dependencies:
       call-bind: 1.0.7
@@ -16293,7 +15398,7 @@ snapshots:
     dependencies:
       foreground-child: 3.1.1
       jackspeak: 2.3.0
-      minimatch: 9.0.3
+      minimatch: 9.0.5
       minipass: 7.0.3
       path-scurry: 1.10.1
 
@@ -16332,10 +15437,6 @@ snapshots:
     dependencies:
       type-fest: 0.20.2
 
-  globalthis@1.0.3:
-    dependencies:
-      define-properties: 1.2.1
-
   globalthis@1.0.4:
     dependencies:
       define-properties: 1.2.1
@@ -16357,7 +15458,7 @@ snapshots:
 
   gopd@1.0.1:
     dependencies:
-      get-intrinsic: 1.2.1
+      get-intrinsic: 1.2.4
 
   graceful-fs@4.2.11: {}
 
@@ -16401,24 +15502,14 @@ snapshots:
 
   has-flag@4.0.0: {}
 
-  has-property-descriptors@1.0.0:
-    dependencies:
-      get-intrinsic: 1.2.1
-
   has-property-descriptors@1.0.2:
     dependencies:
       es-define-property: 1.0.0
 
-  has-proto@1.0.1: {}
-
   has-proto@1.0.3: {}
 
   has-symbols@1.0.3: {}
 
-  has-tostringtag@1.0.0:
-    dependencies:
-      has-symbols: 1.0.3
-
   has-tostringtag@1.0.2:
     dependencies:
       has-symbols: 1.0.3
@@ -16447,7 +15538,7 @@ snapshots:
 
   has@1.0.3:
     dependencies:
-      function-bind: 1.1.1
+      function-bind: 1.1.2
 
   hash-base@3.1.0:
     dependencies:
@@ -16460,10 +15551,6 @@ snapshots:
       inherits: 2.0.4
       minimalistic-assert: 1.0.1
 
-  hasown@2.0.1:
-    dependencies:
-      function-bind: 1.1.2
-
   hasown@2.0.2:
     dependencies:
       function-bind: 1.1.2
@@ -16542,27 +15629,27 @@ snapshots:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     optional: true
 
-  http-proxy@1.18.1(debug@4.3.4):
+  http-proxy@1.18.1(debug@4.3.7):
     dependencies:
       eventemitter3: 4.0.7
-      follow-redirects: 1.15.3(debug@4.3.4)
+      follow-redirects: 1.15.6(debug@4.3.7)
       requires-port: 1.0.0
     transitivePeerDependencies:
       - debug
 
-  http-server@14.1.1(debug@4.3.4):
+  http-server@14.1.1(debug@4.3.7):
     dependencies:
       basic-auth: 2.0.1
       chalk: 4.1.2
       corser: 2.0.1
       he: 1.2.0
       html-encoding-sniffer: 3.0.0
-      http-proxy: 1.18.1(debug@4.3.4)
+      http-proxy: 1.18.1(debug@4.3.7)
       mime: 1.6.0
       minimist: 1.2.8
       opener: 1.5.2
@@ -16586,14 +15673,14 @@ snapshots:
   https-proxy-agent@4.0.0:
     dependencies:
       agent-base: 5.1.1
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -16601,7 +15688,7 @@ snapshots:
   https-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -16674,12 +15761,6 @@ snapshots:
       css-in-js-utils: 3.1.0
       fast-loops: 1.1.3
 
-  internal-slot@1.0.5:
-    dependencies:
-      get-intrinsic: 1.2.1
-      has: 1.0.3
-      side-channel: 1.0.4
-
   internal-slot@1.0.7:
     dependencies:
       es-errors: 1.3.0
@@ -16702,14 +15783,8 @@ snapshots:
 
   is-arguments@1.1.1:
     dependencies:
-      call-bind: 1.0.2
-      has-tostringtag: 1.0.0
-
-  is-array-buffer@3.0.2:
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
-      is-typed-array: 1.1.12
+      call-bind: 1.0.7
+      has-tostringtag: 1.0.2
 
   is-array-buffer@3.0.4:
     dependencies:
@@ -16738,8 +15813,8 @@ snapshots:
 
   is-boolean-object@1.1.2:
     dependencies:
-      call-bind: 1.0.2
-      has-tostringtag: 1.0.0
+      call-bind: 1.0.7
+      has-tostringtag: 1.0.2
 
   is-buffer@1.1.6: {}
 
@@ -16754,10 +15829,6 @@ snapshots:
       ci-info: 3.8.0
     optional: true
 
-  is-core-module@2.13.0:
-    dependencies:
-      has: 1.0.3
-
   is-core-module@2.15.1:
     dependencies:
       hasown: 2.0.2
@@ -16772,7 +15843,7 @@ snapshots:
 
   is-date-object@1.0.5:
     dependencies:
-      has-tostringtag: 1.0.0
+      has-tostringtag: 1.0.2
 
   is-deflate@1.0.0: {}
 
@@ -16807,7 +15878,7 @@ snapshots:
 
   is-generator-function@1.0.10:
     dependencies:
-      has-tostringtag: 1.0.0
+      has-tostringtag: 1.0.2
 
   is-glob@3.1.0:
     dependencies:
@@ -16836,16 +15907,14 @@ snapshots:
 
   is-nan@1.3.2:
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.1
 
-  is-negative-zero@2.0.2: {}
-
   is-negative-zero@2.0.3: {}
 
   is-number-object@1.0.7:
     dependencies:
-      has-tostringtag: 1.0.0
+      has-tostringtag: 1.0.2
 
   is-number@3.0.0:
     dependencies:
@@ -16871,17 +15940,13 @@ snapshots:
 
   is-regex@1.1.4:
     dependencies:
-      call-bind: 1.0.2
-      has-tostringtag: 1.0.0
+      call-bind: 1.0.7
+      has-tostringtag: 1.0.2
 
   is-regexp@1.0.0: {}
 
   is-set@2.0.3: {}
 
-  is-shared-array-buffer@1.0.2:
-    dependencies:
-      call-bind: 1.0.2
-
   is-shared-array-buffer@1.0.3:
     dependencies:
       call-bind: 1.0.7
@@ -16890,16 +15955,12 @@ snapshots:
 
   is-string@1.0.7:
     dependencies:
-      has-tostringtag: 1.0.0
+      has-tostringtag: 1.0.2
 
   is-symbol@1.0.4:
     dependencies:
       has-symbols: 1.0.3
 
-  is-typed-array@1.1.12:
-    dependencies:
-      which-typed-array: 1.1.11
-
   is-typed-array@1.1.13:
     dependencies:
       which-typed-array: 1.1.15
@@ -16913,7 +15974,7 @@ snapshots:
 
   is-weakref@1.0.2:
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
 
   is-weakset@2.0.3:
     dependencies:
@@ -17088,7 +16149,7 @@ snapshots:
       '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.22.11)
       '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.22.11)
       '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.22.11)
-      '@babel/plugin-transform-modules-commonjs': 7.22.11(@babel/core@7.22.11)
+      '@babel/plugin-transform-modules-commonjs': 7.23.0(@babel/core@7.22.11)
       '@babel/preset-env': 7.22.10(@babel/core@7.22.11)
       '@babel/preset-flow': 7.22.15(@babel/core@7.22.11)
       '@babel/preset-typescript': 7.23.0(@babel/core@7.22.11)
@@ -17675,7 +16736,7 @@ snapshots:
   micromark@4.0.0:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.0
@@ -17763,7 +16824,7 @@ snapshots:
       '@types/readable-stream': 4.0.12
       aes-js: 3.1.2
       buffer-equal: 1.0.1
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
       endian-toggle: 0.0.0
       lodash.get: 4.4.2
       lodash.merge: 4.6.2
@@ -17785,7 +16846,7 @@ snapshots:
 
   minecraft-wrap@1.5.1(encoding@0.1.13):
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       es6-promisify: 5.0.0
       extract-zip: 2.0.1(supports-color@8.1.1)
       flatmap: 0.0.3
@@ -17817,10 +16878,10 @@ snapshots:
   mineflayer-pathfinder@2.4.4:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
       prismarine-entity: 2.3.1
       prismarine-item: 1.16.0
-      prismarine-nbt: 2.2.1
+      prismarine-nbt: 2.5.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.8
 
@@ -17852,9 +16913,9 @@ snapshots:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
       prismarine-chat: 1.10.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
@@ -17882,10 +16943,6 @@ snapshots:
     dependencies:
       brace-expansion: 2.0.1
 
-  minimatch@9.0.3:
-    dependencies:
-      brace-expansion: 2.0.1
-
   minimatch@9.0.5:
     dependencies:
       brace-expansion: 2.0.1
@@ -17985,8 +17042,6 @@ snapshots:
 
   ms@2.0.0: {}
 
-  ms@2.1.2: {}
-
   ms@2.1.3: {}
 
   mz@2.7.0:
@@ -18011,8 +17066,6 @@ snapshots:
       stacktrace-js: 2.0.2
       stylis: 4.2.0
 
-  nanoid@3.3.6: {}
-
   nanoid@3.3.7: {}
 
   nanomatch@1.2.13:
@@ -18127,8 +17180,6 @@ snapshots:
 
   node-int64@0.4.0: {}
 
-  node-releases@2.0.13: {}
-
   node-releases@2.0.18: {}
 
   node-rsa@0.4.2:
@@ -18164,7 +17215,7 @@ snapshots:
   normalize-package-data@3.0.3:
     dependencies:
       hosted-git-info: 4.1.0
-      is-core-module: 2.13.0
+      is-core-module: 2.15.1
       semver: 7.6.0
       validate-npm-package-license: 3.0.4
 
@@ -18218,16 +17269,11 @@ snapshots:
       define-property: 0.2.5
       kind-of: 3.2.2
 
-  object-inspect@1.12.3: {}
-
-  object-inspect@1.13.1:
-    optional: true
-
   object-inspect@1.13.2: {}
 
   object-is@1.1.5:
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.1
 
   object-keys@1.1.1: {}
@@ -18236,13 +17282,6 @@ snapshots:
     dependencies:
       isobject: 3.0.1
 
-  object.assign@4.1.4:
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.1
-      has-symbols: 1.0.3
-      object-keys: 1.1.1
-
   object.assign@4.1.5:
     dependencies:
       call-bind: 1.0.7
@@ -18273,12 +17312,6 @@ snapshots:
     dependencies:
       isobject: 3.0.1
 
-  object.values@1.1.7:
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.1
-      es-abstract: 1.22.2
-
   object.values@1.2.0:
     dependencies:
       call-bind: 1.0.7
@@ -18520,10 +17553,6 @@ snapshots:
   phin@2.9.3:
     optional: true
 
-  picocolors@1.0.0: {}
-
-  picocolors@1.0.1: {}
-
   picocolors@1.1.1: {}
 
   picomatch@2.3.1: {}
@@ -18573,7 +17602,7 @@ snapshots:
 
   polished@4.2.2:
     dependencies:
-      '@babel/runtime': 7.22.11
+      '@babel/runtime': 7.24.5
 
   poly-decomp@0.3.0: {}
 
@@ -18589,12 +17618,6 @@ snapshots:
 
   possible-typed-array-names@1.0.0: {}
 
-  postcss@8.4.31:
-    dependencies:
-      nanoid: 3.3.6
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-
   postcss@8.4.47:
     dependencies:
       nanoid: 3.3.7
@@ -18641,7 +17664,7 @@ snapshots:
     dependencies:
       '@azure/msal-node': 2.7.0
       '@xboxreplay/xboxlive-auth': 3.3.3(debug@4.3.7)
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
       jose: 4.15.5
       node-fetch: 2.7.0(encoding@0.1.13)
       smart-buffer: 4.2.0
@@ -18655,20 +17678,6 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-registry: 1.10.0
 
-  prismarine-biome@1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.7.0):
-    dependencies:
-      minecraft-data: 3.83.1
-      prismarine-registry: 1.7.0
-
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05:
-    dependencies:
-      minecraft-data: 3.83.1
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.7.0)
-      prismarine-chat: 1.10.1
-      prismarine-item: 1.16.0
-      prismarine-nbt: 2.5.0
-      prismarine-registry: 1.7.0
-
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3:
     dependencies:
       minecraft-data: 3.83.1
@@ -18684,19 +17693,6 @@ snapshots:
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.10.0
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1):
-    dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
-      prismarine-nbt: 2.5.0
-      prismarine-registry: 1.10.0
-      smart-buffer: 4.2.0
-      uint4: 0.1.2
-      vec3: 0.1.8
-      xxhash-wasm: 0.4.2
-    transitivePeerDependencies:
-      - minecraft-data
-
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
@@ -18722,10 +17718,6 @@ snapshots:
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.10.0
 
-  prismarine-nbt@2.2.1:
-    dependencies:
-      protodef: 1.18.0
-
   prismarine-nbt@2.5.0:
     dependencies:
       protodef: 1.18.0
@@ -18738,8 +17730,8 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b(minecraft-data@3.83.1):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/416dd49bec42f4cc9f50ccf79527e6e4c01cebcb(minecraft-data@3.83.1)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1)
       prismarine-nbt: 2.5.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       uint4: 0.1.2
@@ -18749,7 +17741,7 @@ snapshots:
 
   prismarine-realms@1.3.2(encoding@0.1.13):
     dependencies:
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
       node-fetch: 2.7.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
@@ -18764,16 +17756,11 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-nbt: 2.5.0
 
-  prismarine-registry@1.7.0:
-    dependencies:
-      minecraft-data: 3.83.1
-      prismarine-nbt: 2.5.0
-
   prismarine-schematic@1.2.3:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/23849d4d24af91f45a5bd38781a6f82d40316c05
-      prismarine-nbt: 2.2.1
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
+      prismarine-nbt: 2.5.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       vec3: 0.1.8
 
@@ -18921,7 +17908,8 @@ snapshots:
 
   proxy-compare@2.5.1: {}
 
-  proxy-from-env@1.0.0: {}
+  proxy-from-env@1.0.0:
+    optional: true
 
   proxy-from-env@1.1.0: {}
 
@@ -18959,20 +17947,18 @@ snapshots:
 
   punycode@1.4.1: {}
 
-  punycode@2.3.0: {}
-
   punycode@2.3.1: {}
 
   puppeteer-core@2.1.1:
     dependencies:
       '@types/mime-types': 2.1.2
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
       extract-zip: 1.7.0
       https-proxy-agent: 4.0.0
       mime: 2.6.0
       mime-types: 2.1.35
       progress: 2.0.3
-      proxy-from-env: 1.0.0
+      proxy-from-env: 1.1.0
       rimraf: 2.7.1
       ws: 6.2.2
     transitivePeerDependencies:
@@ -18986,16 +17972,16 @@ snapshots:
 
   qs@6.10.4:
     dependencies:
-      side-channel: 1.0.5
+      side-channel: 1.0.6
     optional: true
 
   qs@6.11.0:
     dependencies:
-      side-channel: 1.0.4
+      side-channel: 1.0.6
 
   qs@6.11.2:
     dependencies:
-      side-channel: 1.0.4
+      side-channel: 1.0.6
 
   querystring-es3@0.2.1: {}
 
@@ -19155,7 +18141,7 @@ snapshots:
   react-select@5.8.0(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       '@babel/runtime': 7.24.5
-      '@emotion/cache': 11.11.0
+      '@emotion/cache': 11.13.1
       '@emotion/react': 11.13.0(@types/react@18.2.20)(react@18.2.0)
       '@floating-ui/dom': 1.5.3
       '@types/react-transition-group': 4.4.7
@@ -19179,7 +18165,7 @@ snapshots:
 
   react-transition-group@4.4.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
-      '@babel/runtime': 7.22.11
+      '@babel/runtime': 7.24.5
       dom-helpers: 5.2.1
       loose-envify: 1.4.0
       prop-types: 15.8.1
@@ -19312,7 +18298,7 @@ snapshots:
 
   recast@0.23.4:
     dependencies:
-      assert: 2.0.0
+      assert: 2.1.0
       ast-types: 0.16.1
       esprima: 4.0.1
       source-map: 0.6.1
@@ -19359,12 +18345,6 @@ snapshots:
 
   regexp-tree@0.1.27: {}
 
-  regexp.prototype.flags@1.5.1:
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.1
-      set-function-name: 2.0.1
-
   regexp.prototype.flags@1.5.3:
     dependencies:
       call-bind: 1.0.7
@@ -19458,7 +18438,7 @@ snapshots:
 
   resolve@1.22.4:
     dependencies:
-      is-core-module: 2.13.0
+      is-core-module: 2.15.1
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
@@ -19510,7 +18490,7 @@ snapshots:
       jest-worker: 26.6.2
       rollup: 2.79.1
       serialize-javascript: 4.0.0
-      terser: 5.19.2
+      terser: 5.31.3
 
   rollup@2.79.1:
     optionalDependencies:
@@ -19534,13 +18514,6 @@ snapshots:
     dependencies:
       tslib: 2.6.2
 
-  safe-array-concat@1.0.1:
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
-      has-symbols: 1.0.3
-      isarray: 2.0.5
-
   safe-array-concat@1.1.2:
     dependencies:
       call-bind: 1.0.7
@@ -19552,12 +18525,6 @@ snapshots:
 
   safe-buffer@5.2.1: {}
 
-  safe-regex-test@1.0.0:
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
-      is-regex: 1.1.4
-
   safe-regex-test@1.0.3:
     dependencies:
       call-bind: 1.0.7
@@ -19599,10 +18566,6 @@ snapshots:
 
   semver@6.3.1: {}
 
-  semver@7.5.4:
-    dependencies:
-      lru-cache: 6.0.0
-
   semver@7.6.0:
     dependencies:
       lru-cache: 6.0.0
@@ -19627,7 +18590,7 @@ snapshots:
 
   send@1.1.0:
     dependencies:
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
       destroy: 1.2.0
       encodeurl: 2.0.0
       escape-html: 1.0.3
@@ -19689,12 +18652,6 @@ snapshots:
       gopd: 1.0.1
       has-property-descriptors: 1.0.2
 
-  set-function-name@2.0.1:
-    dependencies:
-      define-data-property: 1.1.0
-      functions-have-names: 1.2.3
-      has-property-descriptors: 1.0.0
-
   set-function-name@2.0.2:
     dependencies:
       define-data-property: 1.1.4
@@ -19751,20 +18708,6 @@ snapshots:
 
   shell-quote@1.8.1: {}
 
-  side-channel@1.0.4:
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
-      object-inspect: 1.12.3
-
-  side-channel@1.0.5:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      object-inspect: 1.13.1
-    optional: true
-
   side-channel@1.0.6:
     dependencies:
       call-bind: 1.0.7
@@ -19889,7 +18832,7 @@ snapshots:
   socket.io-client@4.7.2:
     dependencies:
       '@socket.io/component-emitter': 3.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       engine.io-client: 6.5.2
       socket.io-parser: 4.2.4
     transitivePeerDependencies:
@@ -19918,7 +18861,7 @@ snapshots:
   socket.io-parser@4.2.4:
     dependencies:
       '@socket.io/component-emitter': 3.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -19941,7 +18884,7 @@ snapshots:
       accepts: 1.3.8
       base64id: 2.0.0
       cors: 2.8.5
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       engine.io: 6.5.3
       socket.io-adapter: 2.5.2
       socket.io-parser: 4.2.4
@@ -19953,7 +18896,7 @@ snapshots:
   socks-proxy-agent@7.0.0:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.7
+      debug: 4.3.7(supports-color@8.1.1)
       socks: 2.7.1
     transitivePeerDependencies:
       - supports-color
@@ -19965,8 +18908,6 @@ snapshots:
       smart-buffer: 4.2.0
     optional: true
 
-  source-map-js@1.0.2: {}
-
   source-map-js@1.2.1: {}
 
   source-map-resolve@0.5.3:
@@ -20117,18 +19058,6 @@ snapshots:
       emoji-regex: 9.2.2
       strip-ansi: 7.1.0
 
-  string.prototype.matchall@4.0.10:
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.1
-      es-abstract: 1.22.2
-      get-intrinsic: 1.2.1
-      has-symbols: 1.0.3
-      internal-slot: 1.0.5
-      regexp.prototype.flags: 1.5.1
-      set-function-name: 2.0.1
-      side-channel: 1.0.4
-
   string.prototype.matchall@4.0.11:
     dependencies:
       call-bind: 1.0.7
@@ -20146,15 +19075,9 @@ snapshots:
 
   string.prototype.padend@3.1.4:
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.22.2
-
-  string.prototype.trim@1.2.8:
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.1
-      es-abstract: 1.22.2
+      es-abstract: 1.23.3
 
   string.prototype.trim@1.2.9:
     dependencies:
@@ -20163,24 +19086,12 @@ snapshots:
       es-abstract: 1.23.3
       es-object-atoms: 1.0.0
 
-  string.prototype.trimend@1.0.7:
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.1
-      es-abstract: 1.22.2
-
   string.prototype.trimend@1.0.8:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-object-atoms: 1.0.0
 
-  string.prototype.trimstart@1.0.7:
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.2.1
-      es-abstract: 1.22.2
-
   string.prototype.trimstart@1.0.8:
     dependencies:
       call-bind: 1.0.7
@@ -20232,7 +19143,7 @@ snapshots:
 
   strip-literal@1.3.0:
     dependencies:
-      acorn: 8.10.0
+      acorn: 8.12.1
 
   stylis@4.2.0: {}
 
@@ -20308,23 +19219,16 @@ snapshots:
       type-fest: 0.16.0
       unique-string: 2.0.0
 
-  terser-webpack-plugin@5.3.10(esbuild@0.19.3)(webpack@5.93.0(esbuild@0.19.3)):
+  terser-webpack-plugin@5.3.10(esbuild@0.19.11)(webpack@5.93.0(esbuild@0.19.11)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.2
       terser: 5.31.3
-      webpack: 5.93.0(esbuild@0.19.3)
+      webpack: 5.93.0(esbuild@0.19.11)
     optionalDependencies:
-      esbuild: 0.19.3
-
-  terser@5.19.2:
-    dependencies:
-      '@jridgewell/source-map': 0.3.5
-      acorn: 8.12.1
-      commander: 2.20.3
-      source-map-support: 0.5.21
+      esbuild: 0.19.11
 
   terser@5.31.3:
     dependencies:
@@ -20463,10 +19367,6 @@ snapshots:
     dependencies:
       utf8-byte-length: 1.0.4
 
-  ts-api-utils@1.0.3(typescript@5.5.4):
-    dependencies:
-      typescript: 5.5.4
-
   ts-api-utils@1.3.0(typescript@5.5.4):
     dependencies:
       typescript: 5.5.4
@@ -20528,25 +19428,12 @@ snapshots:
       media-typer: 0.3.0
       mime-types: 2.1.35
 
-  typed-array-buffer@1.0.0:
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.2.1
-      is-typed-array: 1.1.12
-
   typed-array-buffer@1.0.2:
     dependencies:
       call-bind: 1.0.7
       es-errors: 1.3.0
       is-typed-array: 1.1.13
 
-  typed-array-byte-length@1.0.0:
-    dependencies:
-      call-bind: 1.0.2
-      for-each: 0.3.3
-      has-proto: 1.0.1
-      is-typed-array: 1.1.12
-
   typed-array-byte-length@1.0.1:
     dependencies:
       call-bind: 1.0.7
@@ -20555,14 +19442,6 @@ snapshots:
       has-proto: 1.0.3
       is-typed-array: 1.1.13
 
-  typed-array-byte-offset@1.0.0:
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
-      for-each: 0.3.3
-      has-proto: 1.0.1
-      is-typed-array: 1.1.12
-
   typed-array-byte-offset@1.0.2:
     dependencies:
       available-typed-arrays: 1.0.7
@@ -20572,12 +19451,6 @@ snapshots:
       has-proto: 1.0.3
       is-typed-array: 1.1.13
 
-  typed-array-length@1.0.4:
-    dependencies:
-      call-bind: 1.0.2
-      for-each: 0.3.3
-      is-typed-array: 1.1.12
-
   typed-array-length@1.0.6:
     dependencies:
       call-bind: 1.0.7
@@ -20610,13 +19483,11 @@ snapshots:
 
   unbox-primitive@1.0.2:
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       has-bigints: 1.0.2
       has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
 
-  undici-types@5.26.5: {}
-
   undici-types@6.19.8: {}
 
   undici@5.25.4:
@@ -20734,17 +19605,11 @@ snapshots:
 
   upath@1.2.0: {}
 
-  update-browserslist-db@1.0.11(browserslist@4.21.10):
-    dependencies:
-      browserslist: 4.21.10
-      escalade: 3.1.2
-      picocolors: 1.0.1
-
   update-browserslist-db@1.1.0(browserslist@4.23.2):
     dependencies:
       browserslist: 4.23.2
       escalade: 3.1.2
-      picocolors: 1.0.1
+      picocolors: 1.1.1
 
   upper-case-first@2.0.2:
     dependencies:
@@ -20756,7 +19621,7 @@ snapshots:
 
   uri-js@4.4.1:
     dependencies:
-      punycode: 2.3.0
+      punycode: 2.3.1
 
   urix@0.1.0: {}
 
@@ -20811,7 +19676,7 @@ snapshots:
 
   use-typed-event-listener@4.0.2(react@18.2.0)(typescript@5.5.4):
     dependencies:
-      '@babel/runtime': 7.22.11
+      '@babel/runtime': 7.24.5
       react: 18.2.0
       use-deep-compare: 1.1.0(react@18.2.0)
     optionalDependencies:
@@ -20833,8 +19698,8 @@ snapshots:
       inherits: 2.0.4
       is-arguments: 1.1.1
       is-generator-function: 1.0.10
-      is-typed-array: 1.1.12
-      which-typed-array: 1.1.11
+      is-typed-array: 1.1.13
+      which-typed-array: 1.1.15
 
   utils-merge@1.0.1: {}
 
@@ -20850,7 +19715,7 @@ snapshots:
 
   v8-to-istanbul@9.1.3:
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.19
+      '@jridgewell/trace-mapping': 0.3.25
       '@types/istanbul-lib-coverage': 2.0.4
       convert-source-map: 2.0.0
 
@@ -20889,14 +19754,14 @@ snapshots:
       unist-util-stringify-position: 4.0.0
       vfile-message: 4.0.2
 
-  vite-node@0.34.6(@types/node@20.8.0)(terser@5.31.3):
+  vite-node@0.34.6(@types/node@22.8.1)(terser@5.31.3):
     dependencies:
       cac: 6.7.14
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       mlly: 1.4.2
       pathe: 1.1.1
-      picocolors: 1.0.0
-      vite: 4.4.10(@types/node@20.8.0)(terser@5.31.3)
+      picocolors: 1.1.1
+      vite: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -20907,33 +19772,13 @@ snapshots:
       - supports-color
       - terser
 
-  vite@4.4.10(@types/node@20.8.0)(terser@5.31.3):
-    dependencies:
-      esbuild: 0.18.20
-      postcss: 8.4.31
-      rollup: 3.29.4
-    optionalDependencies:
-      '@types/node': 20.8.0
-      fsevents: 2.3.3
-      terser: 5.31.3
-
-  vite@4.4.10(@types/node@22.8.1)(terser@5.31.3):
-    dependencies:
-      esbuild: 0.18.20
-      postcss: 8.4.31
-      rollup: 3.29.4
-    optionalDependencies:
-      '@types/node': 22.8.1
-      fsevents: 2.3.3
-      terser: 5.31.3
-
-  vite@4.5.3(@types/node@20.8.0)(terser@5.31.3):
+  vite@4.5.3(@types/node@22.8.1)(terser@5.31.3):
     dependencies:
       esbuild: 0.18.20
       postcss: 8.4.47
       rollup: 3.29.4
     optionalDependencies:
-      '@types/node': 20.8.0
+      '@types/node': 22.8.1
       fsevents: 2.3.3
       terser: 5.31.3
 
@@ -20941,27 +19786,27 @@ snapshots:
     dependencies:
       '@types/chai': 4.3.6
       '@types/chai-subset': 1.3.3
-      '@types/node': 20.8.0
+      '@types/node': 22.8.1
       '@vitest/expect': 0.34.6
       '@vitest/runner': 0.34.6
       '@vitest/snapshot': 0.34.6
       '@vitest/spy': 0.34.6
       '@vitest/utils': 0.34.6
-      acorn: 8.10.0
+      acorn: 8.12.1
       acorn-walk: 8.2.0
       cac: 6.7.14
       chai: 4.3.10
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.7(supports-color@8.1.1)
       local-pkg: 0.4.3
       magic-string: 0.30.4
       pathe: 1.1.1
-      picocolors: 1.0.0
+      picocolors: 1.1.1
       std-env: 3.4.3
       strip-literal: 1.3.0
       tinybench: 2.5.1
       tinypool: 0.7.0
-      vite: 4.4.10(@types/node@20.8.0)(terser@5.31.3)
-      vite-node: 0.34.6(@types/node@20.8.0)(terser@5.31.3)
+      vite: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
+      vite-node: 0.34.6(@types/node@22.8.1)(terser@5.31.3)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -20976,9 +19821,9 @@ snapshots:
 
   w3c-keyname@2.2.8: {}
 
-  wait-on@7.2.0(debug@4.3.4):
+  wait-on@7.2.0(debug@4.3.7):
     dependencies:
-      axios: 1.7.2(debug@4.3.4)
+      axios: 1.7.2(debug@4.3.7)
       joi: 17.13.1
       lodash: 4.17.21
       minimist: 1.2.8
@@ -20994,11 +19839,6 @@ snapshots:
     dependencies:
       loose-envify: 1.4.0
 
-  watchpack@2.4.0:
-    dependencies:
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.11
-
   watchpack@2.4.1:
     dependencies:
       glob-to-regexp: 0.4.1
@@ -21016,7 +19856,7 @@ snapshots:
 
   webpack-virtual-modules@0.5.0: {}
 
-  webpack@5.93.0(esbuild@0.19.3):
+  webpack@5.93.0(esbuild@0.19.11):
     dependencies:
       '@types/eslint-scope': 3.7.7
       '@types/estree': 1.0.5
@@ -21039,7 +19879,7 @@ snapshots:
       neo-async: 2.6.2
       schema-utils: 3.3.0
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.10(esbuild@0.19.3)(webpack@5.93.0(esbuild@0.19.3))
+      terser-webpack-plugin: 5.3.10(esbuild@0.19.11)(webpack@5.93.0(esbuild@0.19.11))
       watchpack: 2.4.1
       webpack-sources: 3.2.3
     transitivePeerDependencies:
@@ -21107,14 +19947,6 @@ snapshots:
       is-weakmap: 2.0.2
       is-weakset: 2.0.3
 
-  which-typed-array@1.1.11:
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-tostringtag: 1.0.0
-
   which-typed-array@1.1.15:
     dependencies:
       available-typed-arrays: 1.0.7
@@ -21157,7 +19989,7 @@ snapshots:
       '@apideck/better-ajv-errors': 0.3.6(ajv@8.12.0)
       '@babel/core': 7.22.11
       '@babel/preset-env': 7.22.10(@babel/core@7.22.11)
-      '@babel/runtime': 7.22.11
+      '@babel/runtime': 7.24.5
       '@rollup/plugin-babel': 5.3.1(@babel/core@7.22.11)(@types/babel__core@7.20.2)(rollup@2.79.1)
       '@rollup/plugin-node-resolve': 11.2.1(rollup@2.79.1)
       '@rollup/plugin-replace': 2.4.2(rollup@2.79.1)
@@ -21338,8 +20170,6 @@ snapshots:
 
   yaml@1.10.2: {}
 
-  yaml@2.3.2: {}
-
   yaml@2.4.1: {}
 
   yargs-parser@20.2.9: {}

From 8f91d282d2637e353ccf39eebe27c58797b682b0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 16 Jan 2025 18:01:54 +0700
Subject: [PATCH 119/753] ci: add deduped packages check

---
 .github/workflows/ci.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2208e460..c0765839 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,3 +40,25 @@ jobs:
       #   if: ${{ github.event.pull_request.base.ref == 'release' }}
       #   env:
       #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  dedupe-check:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/next'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install pnpm
+        run: npm install -g pnpm@9.0.4
+        
+      - name: Run pnpm dedupe
+        run: pnpm dedupe
+
+      - name: Check for changes
+        run: |
+          if ! git diff --exit-code --quiet pnpm-lock.yaml; then
+            echo "pnpm dedupe introduced changes:"
+            git diff --color=always pnpm-lock.yaml
+            exit 1
+          else
+            echo "No changes detected after pnpm dedupe in pnpm-lock.yaml"
+          fi
\ No newline at end of file

From ce8e414528bf03dc02653293b2799a837ddc91fe Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 16 Jan 2025 18:04:33 +0700
Subject: [PATCH 120/753] fix: sometimes kick messages where not formatted

---
 src/botUtils.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/botUtils.ts b/src/botUtils.ts
index 4dadb529..665a665f 100644
--- a/src/botUtils.ts
+++ b/src/botUtils.ts
@@ -21,6 +21,11 @@ export const displayClientChat = (text: string) => {
 }
 
 export const parseFormattedMessagePacket = (arg) => {
+  if (typeof arg === 'string') {
+    try {
+      arg = JSON.parse(arg)
+    } catch {}
+  }
   if (typeof arg === 'object') {
     try {
       return {

From b052422c9978f48dcd2c0aa31371ff8c7baf4fcb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 16 Jan 2025 18:09:49 +0700
Subject: [PATCH 121/753] ci: fix update CI workflow condition for dedupe-check
 to use pull request head ref

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c0765839..3eb1fc74 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
       #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   dedupe-check:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/next'
+    if: github.event.pull_request.head.ref == 'next'
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

From d0f7f574005dfcc827dfa89420b945f0298a0769 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 22 Jan 2025 20:02:07 +0300
Subject: [PATCH 122/753] disable parsing of disconnect kick messages that
 works in the wrong way

---
 src/botUtils.ts | 14 +++++++++-----
 src/index.ts    |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/botUtils.ts b/src/botUtils.ts
index 665a665f..4e803de2 100644
--- a/src/botUtils.ts
+++ b/src/botUtils.ts
@@ -21,11 +21,15 @@ export const displayClientChat = (text: string) => {
 }
 
 export const parseFormattedMessagePacket = (arg) => {
-  if (typeof arg === 'string') {
-    try {
-      arg = JSON.parse(arg)
-    } catch {}
-  }
+  // if (typeof arg === 'string') {
+  //   try {
+  //     arg = JSON.parse(arg)
+  //     return {
+  //       formatted: arg,
+  //       plain: ''
+  //     }
+  //   } catch {}
+  // }
   if (typeof arg === 'object') {
     try {
       return {
diff --git a/src/index.ts b/src/index.ts
index 9eaf35d1..2408f839 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -650,6 +650,8 @@ async function connect (connectOptions: ConnectOptions) {
     destroyAll()
   })
 
+  // bot.emit('kicked', '{"translate":"disconnect.genericReason","with":["Internal Exception: io.netty.handler.codec.EncoderException: com.viaversion.viaversion.exception.InformativeException: Please report this on the Via support Discord or open an issue on the relevant GitHub repository\\nPacket Type: SYSTEM_CHAT, Index: 1, Type: TagType, Data: [], Packet ID: 103, Source 0: com.viaversion.viabackwards.protocol.v1_20_3to1_20_2.Protocol1_20_3To1_20_2$$Lambda/0x00007f9930f63080"]}', false)
+
   const packetBeforePlay = (_, __, ___, fullBuffer) => {
     lastPacket = fullBuffer.toString()
   }

From 4ce95de03ff43439f0a99e26f2049b0687585878 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 22 Jan 2025 20:03:54 +0300
Subject: [PATCH 123/753] fix: fov changing based on player state was changed
 incorrectly

---
 src/index.ts         | 1 +
 src/rendererUtils.ts | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 2408f839..7f143e7b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1006,6 +1006,7 @@ downloadAndOpenFile().then((downloadAction) => {
     const ip = qs.get('ip')
     const lastConnect = JSON.parse(localStorage.lastConnectOptions ?? {})
     void connect({
+      botVersion: qs.get('version') ?? undefined,
       ...lastConnect, // todo mixing is not good idea
       ip: ip || undefined
     })
diff --git a/src/rendererUtils.ts b/src/rendererUtils.ts
index 0a43ee1b..faad6ede 100644
--- a/src/rendererUtils.ts
+++ b/src/rendererUtils.ts
@@ -5,15 +5,15 @@ import { options } from './optionsStorage'
 export const watchFov = () => {
   const updateFov = () => {
     if (!bot) return
-    let fovSetting = gameAdditionalState.isZooming ? 30 : options.fov
+    let fov = gameAdditionalState.isZooming ? 30 : options.fov
     // todo check values and add transition
     if (bot.controlState.sprint && !bot.controlState.sneak) {
-      fovSetting += 5
+      fov -= 5
     }
     if (gameAdditionalState.isFlying) {
-      fovSetting += 5
+      fov -= 5
     }
-    viewer.camera.fov = fovSetting
+    viewer.camera.fov = fov
     viewer.camera.updateProjectionMatrix()
   }
   updateFov()

From 61659d82b483f82b6a6b514b1c97c10167e25870 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 22 Jan 2025 20:53:30 +0300
Subject: [PATCH 124/753] feat: experimental namespaces support in resource
 packs

---
 package.json                                  |   2 +-
 pnpm-lock.yaml                                |  30 ++-
 .../viewer/lib/worldrendererCommon.ts         |   2 +-
 src/inventoryWindows.ts                       |  12 +-
 src/resourcePack.ts                           | 200 ++++++++++++------
 5 files changed, 171 insertions(+), 75 deletions(-)

diff --git a/package.json b/package.json
index 02f854db..66d1649c 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.26",
+    "mc-assets": "^0.2.27",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 74919f88..b479143a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -346,8 +346,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.26
-        version: 0.2.26
+        specifier: ^0.2.27
+        version: 0.2.27
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -6220,8 +6220,8 @@ packages:
     peerDependencies:
       react: ^18.2.0
 
-  mc-assets@0.2.26:
-    resolution: {integrity: sha512-BDrdD/kAMuVvD18nnvukE9StddL1VokParxSlFSRQdAAQmqTuYZlC19rho/SjYb+dBGZSVxwC+e0hZnSuyP9hA==}
+  mc-assets@0.2.27:
+    resolution: {integrity: sha512-9VUM89lRIhclj/+CvSXeum6frA7UWXTQR2TUC/qtXJp7DJ6Jf4Mmo/vM/m6Ztev1jG5ZgKNwL6rrP9lwt0YybA==}
     engines: {node: '>=18.0.0'}
 
   md5-file@4.0.0:
@@ -7132,6 +7132,11 @@ packages:
     version: 1.38.0
     engines: {node: '>=14'}
 
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374}
+    version: 1.38.1
+    engines: {node: '>=14'}
+
   prismarine-entity@2.3.1:
     resolution: {integrity: sha512-HOv8l7IetHNf4hwZ7V/W4vM3GNl+e6VCtKDkH9h02TRq7jWngsggKtJV+VanCce/sNwtJUhJDjORGs728ep4MA==}
 
@@ -14148,7 +14153,7 @@ snapshots:
   diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-registry: 1.10.0
       random-seed: 0.3.0
       vec3: 0.1.8
@@ -16523,7 +16528,7 @@ snapshots:
     dependencies:
       react: 18.2.0
 
-  mc-assets@0.2.26: {}
+  mc-assets@0.2.27: {}
 
   md5-file@4.0.0: {}
 
@@ -17706,6 +17711,19 @@ snapshots:
     transitivePeerDependencies:
       - minecraft-data
 
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1):
+    dependencies:
+      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
+      prismarine-nbt: 2.5.0
+      prismarine-registry: 1.10.0
+      smart-buffer: 4.2.0
+      uint4: 0.1.2
+      vec3: 0.1.8
+      xxhash-wasm: 0.4.2
+    transitivePeerDependencies:
+      - minecraft-data
+
   prismarine-entity@2.3.1:
     dependencies:
       prismarine-chat: 1.10.1
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
index eb0c7f4d..6cc34285 100644
--- a/prismarine-viewer/viewer/lib/worldrendererCommon.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -324,7 +324,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       Object.assign(blockTexturesChanges, christmasPack)
     }
 
-    const customBlockTextures = Object.keys(this.customTextures.blocks?.textures ?? {}).filter(x => x.includes('/'))
+    const customBlockTextures = Object.keys(this.customTextures.blocks?.textures ?? {})
     const { atlas: blocksAtlas, canvas: blocksCanvas } = await blocksAssetsParser.makeNewAtlas(this.texturesVersion ?? this.version ?? 'latest', (textureName) => {
       const texture = this.customTextures?.blocks?.textures[textureName]
       return blockTexturesChanges[textureName] ?? texture
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index c1101cbb..bfa5b65f 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -45,9 +45,13 @@ export const onGameLoad = (onLoad) => {
     if (!viewer.world.itemsAtlasParser) return
     itemsRenderer = new ItemsRenderer(bot.version, viewer.world.blockstatesModels, viewer.world.itemsAtlasParser, viewer.world.blocksAtlasParser)
     globalThis.itemsRenderer = itemsRenderer
-    if (allImagesLoadedState.value) return
-    onLoad?.()
-    allImagesLoadedState.value = true
+    if (!allImagesLoadedState.value) {
+      onLoad?.()
+    }
+    allImagesLoadedState.value = false
+    setTimeout(() => {
+      allImagesLoadedState.value = true
+    }, 0)
   }
   viewer.world.renderUpdateEmitter.on('textureDownloaded', checkIfLoaded)
   checkIfLoaded()
@@ -190,7 +194,7 @@ const renderSlot = (slot: RenderSlot, skipBlock = false): {
     itemTexture = itemsRenderer.getItemTexture(itemName) ?? itemsRenderer.getItemTexture('item/missing_texture')!
   } catch (err) {
     itemTexture = itemsRenderer.getItemTexture('block/errored')!
-    inGameError(`Failed to render item ${itemName} on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.message}`)
+    inGameError(`Failed to render item ${itemName} on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
   }
   if ('type' in itemTexture) {
     // is item
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 0ab9ec49..d7bbdc47 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -1,7 +1,9 @@
+/* eslint-disable no-await-in-loop */
 import { join, dirname, basename } from 'path'
 import fs from 'fs'
 import JSZip from 'jszip'
 import { proxy, subscribe } from 'valtio'
+import { WorldRendererThree } from 'prismarine-viewer/viewer/lib/worldrendererThree'
 import { mkdirRecursive, removeFileRecursiveAsync } from './browserfs'
 import { setLoadingScreenStatus } from './utils'
 import { showNotification } from './react/NotificationProvider'
@@ -9,7 +11,8 @@ import { options } from './optionsStorage'
 import { showOptionsModal } from './react/SelectOption'
 import { appStatusState } from './react/AppStatusProvider'
 import { appReplacableResources, resourcesContentOriginal } from './generated/resources'
-import { loadedGameState } from './globalState'
+import { loadedGameState, miscUiState } from './globalState'
+import { watchUnloadForCleanup } from './gameUnload'
 
 export const resourcePackState = proxy({
   resourcePackInstalled: false,
@@ -169,64 +172,106 @@ export const getActiveTexturepackBasePath = async () => {
   return null
 }
 
+const isDirSafe = async (filePath: string) => {
+  try {
+    return await fs.promises.stat(filePath).then(stat => stat.isDirectory()).catch(() => false)
+  } catch (err) {
+    return false
+  }
+}
+
+const getFilesMapFromDir = async (dir: string) => {
+  const files = [] as string[]
+  const scan = async (dir) => {
+    const dirFiles = await fs.promises.readdir(dir)
+    for (const file of dirFiles) {
+      const filePath = join(dir, file)
+      if (await isDirSafe(filePath)) {
+        await scan(filePath)
+      } else {
+        files.push(filePath)
+      }
+    }
+  }
+  await scan(dir)
+  return files
+}
+
 export const getResourcepackTiles = async (type: 'blocks' | 'items', existingTextures: string[]) => {
   const basePath = await getActiveTexturepackBasePath()
   if (!basePath) return
-  const texturesCommonBasePath = `${basePath}/assets/minecraft/textures`
-  let texturesBasePath = `${texturesCommonBasePath}/${type === 'blocks' ? 'block' : 'item'}`
-  const texturesBasePathAlt = `${texturesCommonBasePath}/${type === 'blocks' ? 'blocks' : 'items'}`
-  if (!(await existsAsync(texturesBasePath))) {
-    if (await existsAsync(texturesBasePathAlt)) {
-      texturesBasePath = texturesBasePathAlt
-    }
-  }
-  const allInterestedPaths = existingTextures.map(tex => {
-    if (tex.includes('/')) {
-      return join(`${texturesCommonBasePath}/${tex}`)
-    }
-    return join(texturesBasePath, tex)
-  })
-  const allInterestedPathsPerDir = new Map<string, string[]>()
-  for (const path of allInterestedPaths) {
-    const dir = dirname(path)
-    if (!allInterestedPathsPerDir.has(dir)) {
-      allInterestedPathsPerDir.set(dir, [])
-    }
-    const file = basename(path)
-    allInterestedPathsPerDir.get(dir)!.push(file)
-  }
-  // filter out by readdir each dir
-  const allInterestedImages = [] as string[]
-  for (const [dir, paths] of allInterestedPathsPerDir) {
-    if (!await existsAsync(dir)) {
-      continue
-    }
-    const dirImages = (await fs.promises.readdir(dir)).filter(f => f.endsWith('.png')).map(f => f.replace('.png', ''))
-    allInterestedImages.push(...dirImages.filter(image => paths.includes(image)).map(image => `${dir}/${image}`))
-  }
-
-  if (allInterestedImages.length === 0) {
-    return
-  }
-
+  let firstTextureSize: number | undefined
+  const namespaces = await fs.promises.readdir(join(basePath, 'assets'))
   if (appStatusState.status) {
     setLoadingScreenStatus(`Generating atlas texture for ${type}`)
   }
+  const textures = {} as Record<string, HTMLImageElement>
+  for (const namespace of namespaces) {
+    const texturesCommonBasePath = `${basePath}/assets/${namespace}/textures`
+    const isMinecraftNamespace = namespace === 'minecraft'
+    let texturesBasePath = `${texturesCommonBasePath}/${type === 'blocks' ? 'block' : 'item'}`
+    const texturesBasePathAlt = `${texturesCommonBasePath}/${type === 'blocks' ? 'blocks' : 'items'}`
+    if (!(await existsAsync(texturesBasePath))) {
+      if (await existsAsync(texturesBasePathAlt)) {
+        texturesBasePath = texturesBasePathAlt
+      }
+    }
+    const allInterestedPaths = new Set(
+      existingTextures
+        .filter(tex => (isMinecraftNamespace && !tex.includes(':')) || (tex.includes(':') && tex.split(':')[0] === namespace))
+        .map(tex => {
+          tex = tex.split(':')[1] ?? tex
+          if (tex.includes('/')) {
+            return join(`${texturesCommonBasePath}/${tex}`)
+          }
+          return join(texturesBasePath, tex)
+        })
+    )
+    // add all files from texturesCommonBasePath
+    // if (!isMinecraftNamespace) {
+    //   const commonBasePathFiles = await getFilesMapFromDir(texturesCommonBasePath)
+    //   for (const file of commonBasePathFiles) {
+    //     allInterestedPaths.add(file)
+    //   }
+    // }
+    const allInterestedPathsPerDir = new Map<string, string[]>()
+    for (const path of allInterestedPaths) {
+      const dir = dirname(path)
+      if (!allInterestedPathsPerDir.has(dir)) {
+        allInterestedPathsPerDir.set(dir, [])
+      }
+      const file = basename(path)
+      allInterestedPathsPerDir.get(dir)!.push(file)
+    }
+    // filter out by readdir each dir
+    const allInterestedImages = [] as string[]
+    for (const [dir, paths] of allInterestedPathsPerDir) {
+      if (!await existsAsync(dir)) {
+        continue
+      }
+      const dirImages = (await fs.promises.readdir(dir)).filter(f => f.endsWith('.png')).map(f => f.replace('.png', ''))
+      allInterestedImages.push(...dirImages.filter(image => paths.includes(image)).map(image => `${dir}/${image}`))
+    }
 
-  const firstImageFile = allInterestedImages[0]!
+    if (allInterestedImages.length === 0) {
+      continue
+    }
 
-  let firstTextureSize: number | undefined
-  try {
-    // todo compare sizes from atlas
-    firstTextureSize = await getSizeFromImage(`${firstImageFile}.png`)
-  } catch (err) { }
-  const textures = Object.fromEntries(await Promise.all(allInterestedImages.map(async (image) => {
-    const imagePath = `${image}.png`
-    const contents = await fs.promises.readFile(imagePath, 'base64')
-    const img = await getLoadedImage(`data:image/png;base64,${contents}`)
-    const imageRelative = image.replace(`${texturesBasePath}/`, '').replace(`${texturesCommonBasePath}/`, '')
-    return [imageRelative, img]
-  })))
+    const firstImageFile = allInterestedImages[0]!
+    try {
+      // todo check all sizes from atlas
+      firstTextureSize ??= await getSizeFromImage(`${firstImageFile}.png`)
+    } catch (err) { }
+    const newTextures = Object.fromEntries(await Promise.all(allInterestedImages.map(async (image) => {
+      const imagePath = `${image}.png`
+      const contents = await fs.promises.readFile(imagePath, 'base64')
+      const img = await getLoadedImage(`data:image/png;base64,${contents}`)
+      const imageRelative = image.replace(`${texturesBasePath}/`, '').replace(`${texturesCommonBasePath}/`, '')
+      const textureName = isMinecraftNamespace ? imageRelative : `${namespace}:${imageRelative}`
+      return [textureName, img]
+    })))
+    Object.assign(textures, newTextures) as any
+  }
   return {
     firstTextureSize,
     textures
@@ -234,8 +279,9 @@ export const getResourcepackTiles = async (type: 'blocks' | 'items', existingTex
 }
 
 const prepareBlockstatesAndModels = async () => {
-  viewer.world.customBlockStates = undefined
-  viewer.world.customModels = undefined
+  viewer.world.customBlockStates = {}
+  viewer.world.customModels = {}
+  const usedTextures = new Set<string>()
   const basePath = await getActiveTexturepackBasePath()
   if (!basePath) return
   if (appStatusState.status) {
@@ -256,16 +302,25 @@ const prepareBlockstatesAndModels = async () => {
           if (type === 'models') {
             name = `block/${name}`
           }
-          if (namespaceDir !== 'minecraft') {
-            name = `${namespaceDir}:${name}`
+          const parsed = JSON.parse(contents)
+          if (namespaceDir === 'minecraft') {
+            jsons[name] = parsed
+          }
+          jsons[`${namespaceDir}:${name}`] = parsed
+          if (type === 'models') {
+            for (let texturePath of Object.values(parsed.textures ?? {})) {
+              if (typeof texturePath !== 'string') continue
+              if (texturePath.startsWith('#')) continue
+              if (!texturePath.includes(':')) texturePath = `minecraft:${texturePath}`
+              usedTextures.add(texturePath as string)
+            }
           }
-          jsons[name] = JSON.parse(contents)
         }
       }))
       return jsons
     }
-    viewer.world.customBlockStates = await getAllJson(blockstatesPath, 'blockstates')
-    viewer.world.customModels = await getAllJson(modelsPath, 'models')
+    Object.assign(viewer.world.customBlockStates!, await getAllJson(blockstatesPath, 'blockstates'))
+    Object.assign(viewer.world.customModels!, await getAllJson(modelsPath, 'models'))
   }
   try {
     const assetsDirs = await fs.promises.readdir(join(basePath, 'assets'))
@@ -277,6 +332,7 @@ const prepareBlockstatesAndModels = async () => {
     viewer.world.customBlockStates = undefined
     viewer.world.customModels = undefined
   }
+  return { usedTextures }
 }
 
 const downloadAndUseResourcePack = async (url: string): Promise<void> => {
@@ -290,6 +346,17 @@ const downloadAndUseResourcePack = async (url: string): Promise<void> => {
   })
 }
 
+const waitForGameEvent = async () => {
+  if (miscUiState.gameLoaded) return
+  await new Promise<void>(resolve => {
+    const listener = () => resolve()
+    customEvents.once('gameLoaded', listener)
+    watchUnloadForCleanup(() => {
+      customEvents.removeListener('gameLoaded', listener)
+    })
+  })
+}
+
 export const onAppLoad = () => {
   customEvents.on('mineflayerBotCreated', () => {
     // todo also handle resourcePack
@@ -307,8 +374,12 @@ export const onAppLoad = () => {
           minecraftJsonMessage: promptMessagePacket,
         })
       if (!choice) return
+      await new Promise(resolve => {
+        setTimeout(resolve, 500)
+      })
+      console.log('accepting resource pack')
       bot.acceptResourcePack()
-      if (choice === 'Download & Install (recommended)') {
+      if (choice === true || choice === 'Download & Install (recommended)') {
         await downloadAndUseResourcePack(packet.url).catch((err) => {
           console.error(err)
           showNotification('Failed to download resource pack: ' + err.message)
@@ -349,10 +420,10 @@ const updateAllReplacableTextures = async () => {
   for (const [key, { cssVar, cssVarRepeat, resourcePackPath }] of vars) {
     const resPath = `${basePath}/assets/${resourcePackPath}`
     if (cssVar) {
-      // eslint-disable-next-line no-await-in-loop
+
       await setCustomCss(resPath, cssVar, cssVarRepeat ?? 1)
     } else {
-      // eslint-disable-next-line no-await-in-loop
+
       await setCustomPicture(key, resPath)
     }
   }
@@ -363,10 +434,10 @@ const repeatArr = (arr, i) => Array.from({ length: i }, () => arr)
 const updateTextures = async () => {
   const blocksFiles = Object.keys(viewer.world.blocksAtlases.latest.textures)
   const itemsFiles = Object.keys(viewer.world.itemsAtlases.latest.textures)
-  const blocksData = await getResourcepackTiles('blocks', blocksFiles)
+  const { usedTextures: extraBlockTextures = new Set<string>() } = await prepareBlockstatesAndModels() ?? {}
+  const blocksData = await getResourcepackTiles('blocks', [...blocksFiles, ...extraBlockTextures])
   const itemsData = await getResourcepackTiles('items', itemsFiles)
   await updateAllReplacableTextures()
-  await prepareBlockstatesAndModels()
   viewer.world.customTextures = {}
   if (blocksData) {
     viewer.world.customTextures.blocks = {
@@ -382,6 +453,9 @@ const updateTextures = async () => {
   }
   if (viewer.world.active) {
     await viewer.world.updateTexturesData()
+    if (viewer.world instanceof WorldRendererThree) {
+      viewer.world.rerenderAllChunks?.()
+    }
   }
 }
 

From f2fde37e6ad0c0ee4a1a912ced641223ec286b49 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 22 Jan 2025 21:04:14 +0300
Subject: [PATCH 125/753] ci: update patch, should fix dedupe

---
 package.json                                   |  2 +-
 ...0.patch => minecraft-protocol@1.53.0.patch} | 18 +++++++++---------
 pnpm-lock.yaml                                 | 14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)
 rename patches/{minecraft-protocol@1.49.0.patch => minecraft-protocol@1.53.0.patch} (93%)

diff --git a/package.json b/package.json
index 66d1649c..5fbe3082 100644
--- a/package.json
+++ b/package.json
@@ -189,7 +189,7 @@
       "three@0.154.0": "patches/three@0.154.0.patch",
       "pixelarticons@1.8.1": "patches/pixelarticons@1.8.1.patch",
       "mineflayer-item-map-downloader@1.2.0": "patches/mineflayer-item-map-downloader@1.2.0.patch",
-      "minecraft-protocol@1.53.0": "patches/minecraft-protocol@1.49.0.patch"
+      "minecraft-protocol@1.53.0": "patches/minecraft-protocol@1.53.0.patch"
     }
   },
   "packageManager": "pnpm@9.0.4"
diff --git a/patches/minecraft-protocol@1.49.0.patch b/patches/minecraft-protocol@1.53.0.patch
similarity index 93%
rename from patches/minecraft-protocol@1.49.0.patch
rename to patches/minecraft-protocol@1.53.0.patch
index c54d5469..243e0bd7 100644
--- a/patches/minecraft-protocol@1.49.0.patch
+++ b/patches/minecraft-protocol@1.53.0.patch
@@ -95,10 +95,10 @@ index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108
  
        function onJoinServerResponse (err) {
 diff --git a/src/client.js b/src/client.js
-index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c278950ba7f396 100644
+index 74749698f8cee05b5dc749c271544f78d06645b0..e77e0a3f41c1ee780c3abbd54b0801d248c2a07c 100644
 --- a/src/client.js
 +++ b/src/client.js
-@@ -88,10 +88,12 @@ class Client extends EventEmitter {
+@@ -89,10 +89,12 @@ class Client extends EventEmitter {
        parsed.metadata.name = parsed.data.name
        parsed.data = parsed.data.params
        parsed.metadata.state = state
@@ -115,7 +115,7 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895
        }
        if (this._hasBundlePacket && parsed.metadata.name === 'bundle_delimiter') {
          if (this._mcBundle.length) { // End bundle
-@@ -109,7 +111,13 @@ class Client extends EventEmitter {
+@@ -110,7 +112,13 @@ class Client extends EventEmitter {
            this._hasBundlePacket = false
          }
        } else {
@@ -130,7 +130,7 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895
        }
      })
    }
-@@ -167,7 +175,10 @@ class Client extends EventEmitter {
+@@ -168,7 +176,10 @@ class Client extends EventEmitter {
      }
  
      const onFatalError = (err) => {
@@ -142,7 +142,7 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895
        endSocket()
      }
  
-@@ -196,6 +207,8 @@ class Client extends EventEmitter {
+@@ -197,6 +208,8 @@ class Client extends EventEmitter {
      serializer -> framer -> socket -> splitter -> deserializer */
      if (this.serializer) {
        this.serializer.end()
@@ -151,7 +151,7 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895
      } else {
        if (this.socket) this.socket.end()
      }
-@@ -237,8 +250,11 @@ class Client extends EventEmitter {
+@@ -238,8 +251,11 @@ class Client extends EventEmitter {
  
    write (name, params) {
      if (!this.serializer.writable) { return }
@@ -166,10 +166,10 @@ index 5b63c295080f62ca54928660cdfa134214002fa1..d2d24bff963d8ed7747ccb48f8c27895
    }
  
 diff --git a/src/index.d.ts b/src/index.d.ts
-index 423085259176a10c9dfeb617f00975df077d02be..ae0558b7c53ab24474b22240e8a2f4e4cde02f19 100644
+index e61d5403bab46251d35b22a2ea30eb09b2746a26..84f597427893671eeac231b11e6e42aa815601df 100644
 --- a/src/index.d.ts
 +++ b/src/index.d.ts
-@@ -134,6 +134,7 @@ declare module 'minecraft-protocol' {
+@@ -135,6 +135,7 @@ declare module 'minecraft-protocol' {
  		sessionServer?: string
  		keepAlive?: boolean
  		closeTimeout?: number
@@ -177,7 +177,7 @@ index 423085259176a10c9dfeb617f00975df077d02be..ae0558b7c53ab24474b22240e8a2f4e4
  		noPongTimeout?: number
  		checkTimeoutInterval?: number
  		version?: string
-@@ -154,6 +155,8 @@ declare module 'minecraft-protocol' {
+@@ -155,6 +156,8 @@ declare module 'minecraft-protocol' {
  		disableChatSigning?: boolean
  		/** Pass custom client implementation if needed. */
  		Client?: Client
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b479143a..39ceba48 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,8 +21,8 @@ overrides:
 
 patchedDependencies:
   minecraft-protocol@1.53.0:
-    hash: 7sh5krubuk2vjuogjioaktvwzi
-    path: patches/minecraft-protocol@1.49.0.patch
+    hash: 2xxbvh5jy3p5fjsq3y4zvvhxye
+    path: patches/minecraft-protocol@1.53.0.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: bck55yjvd4wrgz46x7o4vfur5q
     path: patches/mineflayer-item-map-downloader@1.2.0.patch
@@ -138,7 +138,7 @@ importers:
         version: 3.83.1
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/642fd4f7023a98a96da4caf8f993f8e19361a1e7(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13)
@@ -12722,7 +12722,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.2.3
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -16823,7 +16823,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.12
@@ -16893,7 +16893,7 @@ snapshots:
   mineflayer@4.25.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
       prismarine-chat: 1.10.1
@@ -16916,7 +16916,7 @@ snapshots:
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=7sh5krubuk2vjuogjioaktvwzi)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
       prismarine-chat: 1.10.1

From 77e529b6f462aebe844a1fe169429e7786c7193a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 25 Jan 2025 18:34:18 +0300
Subject: [PATCH 126/753] feat: ctrl or cmd + Escape now closes all modals!

---
 src/controls.ts | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/controls.ts b/src/controls.ts
index 4a6d1f6f..57ba345b 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -736,11 +736,22 @@ addEventListener('mousedown', async (e) => {
 window.addEventListener('keydown', (e) => {
   if (e.code !== 'Escape') return
   if (activeModalStack.length) {
-    hideCurrentModal(undefined, () => {
-      if (!activeModalStack.length) {
-        pointerLock.justHitEscape = true
+    const hideAll = e.ctrlKey || e.metaKey
+    if (hideAll) {
+      while (activeModalStack.length > 0) {
+        hideCurrentModal(undefined, () => {
+          if (!activeModalStack.length) {
+            pointerLock.justHitEscape = true
+          }
+        })
       }
-    })
+    } else {
+      hideCurrentModal(undefined, () => {
+        if (!activeModalStack.length) {
+          pointerLock.justHitEscape = true
+        }
+      })
+    }
   } else if (pointerLock.hasPointerLock) {
     document.exitPointerLock?.()
     if (options.autoExitFullscreen) {

From 798eb34466fa229234729f656dfc271dcd32bf73 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 25 Jan 2025 18:39:26 +0300
Subject: [PATCH 127/753] fix: fix Y keybinding: fix URL on server, add proxy
 and username parameters

---
 src/controls.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/controls.ts b/src/controls.ts
index 57ba345b..559379a3 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -313,9 +313,11 @@ export function lockUrl () {
     newQs = `reconnect=1`
   } else if (lastConnectOptions.value?.server) {
     const qs = new URLSearchParams()
-    const { server, botVersion } = lastConnectOptions.value
-    qs.set('server', server)
+    const { server, botVersion, proxy, username } = lastConnectOptions.value
+    qs.set('ip', server)
     if (botVersion) qs.set('version', botVersion)
+    if (proxy) qs.set('proxy', proxy)
+    if (username) qs.set('username', username)
     newQs = String(qs.toString())
   }
 

From 7d6986ccb458144b2a2e41473602a50bf2709233 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 25 Jan 2025 19:38:50 +0300
Subject: [PATCH 128/753] update all deps

---
 package.json   |    2 +-
 pnpm-lock.yaml | 1237 +++++++++++++++++++++++++++---------------------
 2 files changed, 698 insertions(+), 541 deletions(-)

diff --git a/package.json b/package.json
index 5fbe3082..60032b9a 100644
--- a/package.json
+++ b/package.json
@@ -189,7 +189,7 @@
       "three@0.154.0": "patches/three@0.154.0.patch",
       "pixelarticons@1.8.1": "patches/pixelarticons@1.8.1.patch",
       "mineflayer-item-map-downloader@1.2.0": "patches/mineflayer-item-map-downloader@1.2.0.patch",
-      "minecraft-protocol@1.53.0": "patches/minecraft-protocol@1.53.0.patch"
+      "minecraft-protocol@1.54.0": "patches/minecraft-protocol@1.54.0.patch"
     }
   },
   "packageManager": "pnpm@9.0.4"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 39ceba48..10d56d19 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,9 +20,9 @@ overrides:
   prismarine-item: latest
 
 patchedDependencies:
-  minecraft-protocol@1.53.0:
-    hash: 2xxbvh5jy3p5fjsq3y4zvvhxye
-    path: patches/minecraft-protocol@1.53.0.patch
+  minecraft-protocol@1.54.0:
+    hash: 3wm2z233n46lqi64rbxem4nyv4
+    path: patches/minecraft-protocol@1.54.0.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: bck55yjvd4wrgz46x7o4vfur5q
     path: patches/mineflayer-item-map-downloader@1.2.0.patch
@@ -99,7 +99,7 @@ importers:
         version: 2.8.5
       debug:
         specifier: ^4.3.4
-        version: 4.3.7(supports-color@8.1.1)
+        version: 4.4.0(supports-color@8.1.1)
       diff-match-patch:
         specifier: ^1.0.5
         version: 1.0.5
@@ -138,10 +138,10 @@ importers:
         version: 3.83.1
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
-        version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/642fd4f7023a98a96da4caf8f993f8e19361a1e7(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13)
       mojangson:
         specifier: ^2.0.4
         version: 2.0.4
@@ -234,7 +234,7 @@ importers:
         version: 0.1.8
       wait-on:
         specifier: ^7.2.0
-        version: 7.2.0(debug@4.3.7)
+        version: 7.2.0(debug@4.4.0)
       workbox-build:
         specifier: ^7.0.0
         version: 7.0.0(@types/babel__core@7.20.2)
@@ -341,7 +341,7 @@ importers:
         version: 1.7.0
       http-server:
         specifier: ^14.1.1
-        version: 14.1.1(debug@4.3.7)
+        version: 14.1.1(debug@4.4.0)
       https-browserify:
         specifier: ^1.0.0
         version: 1.0.0
@@ -428,10 +428,10 @@ importers:
         version: 1.3.6
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
-        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1)
+        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
@@ -3367,8 +3367,8 @@ packages:
     resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
     engines: {node: '>=0.10.0'}
 
-  array-buffer-byte-length@1.0.1:
-    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
+  array-buffer-byte-length@1.0.2:
+    resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==}
     engines: {node: '>= 0.4'}
 
   array-flatten@1.1.1:
@@ -3390,12 +3390,12 @@ packages:
     resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==}
     engines: {node: '>= 0.4'}
 
-  array.prototype.flat@1.3.2:
-    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
+  array.prototype.flat@1.3.3:
+    resolution: {integrity: sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==}
     engines: {node: '>= 0.4'}
 
-  array.prototype.flatmap@1.3.2:
-    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
+  array.prototype.flatmap@1.3.3:
+    resolution: {integrity: sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==}
     engines: {node: '>= 0.4'}
 
   array.prototype.toreversed@1.1.2:
@@ -3405,8 +3405,8 @@ packages:
     resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==}
     engines: {node: '>= 0.4'}
 
-  arraybuffer.prototype.slice@1.0.3:
-    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
+  arraybuffer.prototype.slice@1.0.4:
+    resolution: {integrity: sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==}
     engines: {node: '>= 0.4'}
 
   arraybuffer.slice@0.0.7:
@@ -3458,6 +3458,10 @@ packages:
   async-each@1.0.6:
     resolution: {integrity: sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==}
 
+  async-function@1.0.0:
+    resolution: {integrity: sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==}
+    engines: {node: '>= 0.4'}
+
   async-limiter@1.0.1:
     resolution: {integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==}
 
@@ -3735,8 +3739,16 @@ packages:
     resolution: {integrity: sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==}
     engines: {node: '>=6'}
 
-  call-bind@1.0.7:
-    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
+  call-bind-apply-helpers@1.0.1:
+    resolution: {integrity: sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==}
+    engines: {node: '>= 0.4'}
+
+  call-bind@1.0.8:
+    resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==}
+    engines: {node: '>= 0.4'}
+
+  call-bound@1.0.3:
+    resolution: {integrity: sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==}
     engines: {node: '>= 0.4'}
 
   callsites@3.1.0:
@@ -4123,16 +4135,16 @@ packages:
     resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
     engines: {node: '>=0.10'}
 
-  data-view-buffer@1.0.1:
-    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
+  data-view-buffer@1.0.2:
+    resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==}
     engines: {node: '>= 0.4'}
 
-  data-view-byte-length@1.0.1:
-    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
+  data-view-byte-length@1.0.2:
+    resolution: {integrity: sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==}
     engines: {node: '>= 0.4'}
 
-  data-view-byte-offset@1.0.0:
-    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
+  data-view-byte-offset@1.0.1:
+    resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==}
     engines: {node: '>= 0.4'}
 
   dayjs@1.11.9:
@@ -4183,6 +4195,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.4.0:
+    resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decamelize-keys@1.1.1:
     resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
     engines: {node: '>=0.10.0'}
@@ -4396,6 +4417,10 @@ packages:
   draco3d@1.5.6:
     resolution: {integrity: sha512-+3NaRjWktb5r61ZFoDejlykPEFKT5N/LkbXsaddlw6xNSXBanUYpFc2AXXpbJDilPHazcSreU/DpQIaxfX0NfQ==}
 
+  dunder-proto@1.0.1:
+    resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
+    engines: {node: '>= 0.4'}
+
   duplexer@0.1.2:
     resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
 
@@ -4506,20 +4531,20 @@ packages:
   eruda@3.0.1:
     resolution: {integrity: sha512-6q1Xdwga4JTr1mKSW4mzuWSSbmXgqpm/8Wa1QGFGfCWRjC0bCQjbS4u06M1te1moucIS3hBLlbSTPWYH2W0qbQ==}
 
-  es-abstract@1.23.3:
-    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
+  es-abstract@1.23.9:
+    resolution: {integrity: sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==}
     engines: {node: '>= 0.4'}
 
-  es-define-property@1.0.0:
-    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
+  es-define-property@1.0.1:
+    resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
     engines: {node: '>= 0.4'}
 
   es-errors@1.3.0:
     resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
     engines: {node: '>= 0.4'}
 
-  es-iterator-helpers@1.1.0:
-    resolution: {integrity: sha512-/SurEfycdyssORP/E+bj4sEu1CWw4EmLDsHynHwSXQ7utgbrMRWW195pTrCjFgFCddf/UkYm3oqKPRq5i8bJbw==}
+  es-iterator-helpers@1.2.1:
+    resolution: {integrity: sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==}
     engines: {node: '>= 0.4'}
 
   es-module-lexer@0.9.3:
@@ -4528,19 +4553,19 @@ packages:
   es-module-lexer@1.5.4:
     resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==}
 
-  es-object-atoms@1.0.0:
-    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
+  es-object-atoms@1.1.1:
+    resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
     engines: {node: '>= 0.4'}
 
-  es-set-tostringtag@2.0.3:
-    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
+  es-set-tostringtag@2.1.0:
+    resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
     engines: {node: '>= 0.4'}
 
   es-shim-unscopables@1.0.2:
     resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
 
-  es-to-primitive@1.2.1:
-    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
+  es-to-primitive@1.3.0:
+    resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==}
     engines: {node: '>= 0.4'}
 
   es6-promise@4.2.8:
@@ -5004,8 +5029,9 @@ packages:
       debug:
         optional: true
 
-  for-each@0.3.3:
-    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+  for-each@0.3.4:
+    resolution: {integrity: sha512-kKaIINnFpzW6ffJNDjjyjrk21BkDx38c0xa/klsT8VzLCaMEefv4ZTacrcVR4DmgTeBra++jMDAfS/tS799YDw==}
+    engines: {node: '>= 0.4'}
 
   for-in@1.0.2:
     resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
@@ -5095,8 +5121,8 @@ packages:
   function-bind@1.1.2:
     resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
-  function.prototype.name@1.1.6:
-    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
+  function.prototype.name@1.1.8:
+    resolution: {integrity: sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==}
     engines: {node: '>= 0.4'}
 
   functions-have-names@1.2.3:
@@ -5123,8 +5149,8 @@ packages:
   get-func-name@2.0.2:
     resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==}
 
-  get-intrinsic@1.2.4:
-    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
+  get-intrinsic@1.2.7:
+    resolution: {integrity: sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==}
     engines: {node: '>= 0.4'}
 
   get-nonce@1.0.1:
@@ -5146,6 +5172,10 @@ packages:
     resolution: {integrity: sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==}
     engines: {node: '>=8'}
 
+  get-proto@1.0.1:
+    resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
+    engines: {node: '>= 0.4'}
+
   get-stream@5.2.0:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
     engines: {node: '>=8'}
@@ -5154,8 +5184,8 @@ packages:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
     engines: {node: '>=10'}
 
-  get-symbol-description@1.0.2:
-    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
+  get-symbol-description@1.1.0:
+    resolution: {integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==}
     engines: {node: '>= 0.4'}
 
   get-tsconfig@4.7.2:
@@ -5245,8 +5275,9 @@ packages:
   glsl-tokenizer@2.1.5:
     resolution: {integrity: sha512-XSZEJ/i4dmz3Pmbnpsy3cKh7cotvFlBiZnDOwnj/05EwNp2XrhQ4XKJxT7/pDt4kp4YcpRSKz8eTV7S+mwV6MA==}
 
-  gopd@1.0.1:
-    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
+  gopd@1.2.0:
+    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
+    engines: {node: '>= 0.4'}
 
   graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
@@ -5271,8 +5302,9 @@ packages:
     resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
     engines: {node: '>=6'}
 
-  has-bigints@1.0.2:
-    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
+  has-bigints@1.1.0:
+    resolution: {integrity: sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==}
+    engines: {node: '>= 0.4'}
 
   has-binary2@1.0.3:
     resolution: {integrity: sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==}
@@ -5291,12 +5323,12 @@ packages:
   has-property-descriptors@1.0.2:
     resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
 
-  has-proto@1.0.3:
-    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
+  has-proto@1.2.0:
+    resolution: {integrity: sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==}
     engines: {node: '>= 0.4'}
 
-  has-symbols@1.0.3:
-    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
+  has-symbols@1.1.0:
+    resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
     engines: {node: '>= 0.4'}
 
   has-tostringtag@1.0.2:
@@ -5513,8 +5545,8 @@ packages:
   inline-style-prefixer@6.0.4:
     resolution: {integrity: sha512-FwXmZC2zbeeS7NzGjJ6pAiqRhXR0ugUShSNb6GApMl6da0/XGc4MOJsoWAywia52EEWbXNSy0pzkwz/+Y+swSg==}
 
-  internal-slot@1.0.7:
-    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
+  internal-slot@1.1.0:
+    resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==}
     engines: {node: '>= 0.4'}
 
   invariant@2.2.4:
@@ -5539,8 +5571,8 @@ packages:
     resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
     engines: {node: '>= 0.4'}
 
-  is-array-buffer@3.0.4:
-    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
+  is-array-buffer@3.0.5:
+    resolution: {integrity: sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==}
     engines: {node: '>= 0.4'}
 
   is-arrayish@0.2.1:
@@ -5549,12 +5581,13 @@ packages:
   is-arrayish@0.3.2:
     resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}
 
-  is-async-function@2.0.0:
-    resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==}
+  is-async-function@2.1.1:
+    resolution: {integrity: sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==}
     engines: {node: '>= 0.4'}
 
-  is-bigint@1.0.4:
-    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
+  is-bigint@1.1.0:
+    resolution: {integrity: sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==}
+    engines: {node: '>= 0.4'}
 
   is-binary-path@1.0.1:
     resolution: {integrity: sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==}
@@ -5564,8 +5597,8 @@ packages:
     resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
     engines: {node: '>=8'}
 
-  is-boolean-object@1.1.2:
-    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
+  is-boolean-object@1.2.1:
+    resolution: {integrity: sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==}
     engines: {node: '>= 0.4'}
 
   is-buffer@1.1.6:
@@ -5583,20 +5616,20 @@ packages:
     resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
     hasBin: true
 
-  is-core-module@2.15.1:
-    resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==}
+  is-core-module@2.16.1:
+    resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==}
     engines: {node: '>= 0.4'}
 
   is-data-descriptor@1.0.1:
     resolution: {integrity: sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==}
     engines: {node: '>= 0.4'}
 
-  is-data-view@1.0.1:
-    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
+  is-data-view@1.0.2:
+    resolution: {integrity: sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==}
     engines: {node: '>= 0.4'}
 
-  is-date-object@1.0.5:
-    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
+  is-date-object@1.1.0:
+    resolution: {integrity: sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==}
     engines: {node: '>= 0.4'}
 
   is-deflate@1.0.0:
@@ -5627,8 +5660,9 @@ packages:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
 
-  is-finalizationregistry@1.0.2:
-    resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==}
+  is-finalizationregistry@1.1.1:
+    resolution: {integrity: sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==}
+    engines: {node: '>= 0.4'}
 
   is-fullwidth-code-point@3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
@@ -5637,8 +5671,8 @@ packages:
   is-function@1.0.2:
     resolution: {integrity: sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==}
 
-  is-generator-function@1.0.10:
-    resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
+  is-generator-function@1.1.0:
+    resolution: {integrity: sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==}
     engines: {node: '>= 0.4'}
 
   is-glob@3.1.0:
@@ -5675,12 +5709,8 @@ packages:
     resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
     engines: {node: '>= 0.4'}
 
-  is-negative-zero@2.0.3:
-    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
-    engines: {node: '>= 0.4'}
-
-  is-number-object@1.0.7:
-    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
+  is-number-object@1.1.1:
+    resolution: {integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==}
     engines: {node: '>= 0.4'}
 
   is-number@3.0.0:
@@ -5719,8 +5749,8 @@ packages:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
 
-  is-regex@1.1.4:
-    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
+  is-regex@1.2.1:
+    resolution: {integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==}
     engines: {node: '>= 0.4'}
 
   is-regexp@1.0.0:
@@ -5731,24 +5761,24 @@ packages:
     resolution: {integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==}
     engines: {node: '>= 0.4'}
 
-  is-shared-array-buffer@1.0.3:
-    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
+  is-shared-array-buffer@1.0.4:
+    resolution: {integrity: sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==}
     engines: {node: '>= 0.4'}
 
   is-stream@2.0.1:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
     engines: {node: '>=8'}
 
-  is-string@1.0.7:
-    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
+  is-string@1.1.1:
+    resolution: {integrity: sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==}
     engines: {node: '>= 0.4'}
 
-  is-symbol@1.0.4:
-    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
+  is-symbol@1.1.1:
+    resolution: {integrity: sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==}
     engines: {node: '>= 0.4'}
 
-  is-typed-array@1.1.13:
-    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
+  is-typed-array@1.1.15:
+    resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==}
     engines: {node: '>= 0.4'}
 
   is-typedarray@1.0.0:
@@ -5762,11 +5792,12 @@ packages:
     resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==}
     engines: {node: '>= 0.4'}
 
-  is-weakref@1.0.2:
-    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
+  is-weakref@1.1.0:
+    resolution: {integrity: sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==}
+    engines: {node: '>= 0.4'}
 
-  is-weakset@2.0.3:
-    resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==}
+  is-weakset@2.0.4:
+    resolution: {integrity: sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==}
     engines: {node: '>= 0.4'}
 
   is-windows@1.0.2:
@@ -5823,8 +5854,8 @@ packages:
     resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==}
     engines: {node: '>=8'}
 
-  iterator.prototype@1.1.3:
-    resolution: {integrity: sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==}
+  iterator.prototype@1.1.5:
+    resolution: {integrity: sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==}
     engines: {node: '>= 0.4'}
 
   jackspeak@2.3.0:
@@ -6081,6 +6112,7 @@ packages:
 
   lodash.get@4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
+    deprecated: This package is deprecated. Use the optional chaining (?.) operator instead.
 
   lodash.includes@4.3.0:
     resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==}
@@ -6220,6 +6252,10 @@ packages:
     peerDependencies:
       react: ^18.2.0
 
+  math-intrinsics@1.1.0:
+    resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
+    engines: {node: '>= 0.4'}
+
   mc-assets@0.2.27:
     resolution: {integrity: sha512-9VUM89lRIhclj/+CvSXeum6frA7UWXTQR2TUC/qtXJp7DJ6Jf4Mmo/vM/m6Ztev1jG5ZgKNwL6rrP9lwt0YybA==}
     engines: {node: '>=18.0.0'}
@@ -6420,9 +6456,9 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117}
-    version: 1.53.0
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83}
+    version: 1.54.0
     engines: {node: '>=14'}
 
   minecraft-wrap@1.5.1:
@@ -6432,8 +6468,8 @@ packages:
   minecrafthawkeye@1.3.6:
     resolution: {integrity: sha512-SlRlorxQs6nNzMiiIQ5z47wzbAI27UaCdbRB82CE8jqj4C8m3Gqk5TlgN+PSThxx8EDPXySzd8Vk+/wNigAd5A==}
 
-  mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/642fd4f7023a98a96da4caf8f993f8e19361a1e7:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/642fd4f7023a98a96da4caf8f993f8e19361a1e7}
+  mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
   mineflayer-pathfinder@2.4.4:
@@ -6721,8 +6757,8 @@ packages:
     resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
     engines: {node: '>=0.10.0'}
 
-  object-inspect@1.13.2:
-    resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
+  object-inspect@1.13.3:
+    resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==}
     engines: {node: '>= 0.4'}
 
   object-is@1.1.5:
@@ -6737,8 +6773,8 @@ packages:
     resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
     engines: {node: '>=0.10.0'}
 
-  object.assign@4.1.5:
-    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
+  object.assign@4.1.7:
+    resolution: {integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==}
     engines: {node: '>= 0.4'}
 
   object.entries@1.1.8:
@@ -6757,8 +6793,8 @@ packages:
     resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
     engines: {node: '>=0.10.0'}
 
-  object.values@1.2.0:
-    resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
+  object.values@1.2.1:
+    resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==}
     engines: {node: '>= 0.4'}
 
   omggif@1.0.10:
@@ -6813,6 +6849,10 @@ packages:
   ospath@1.2.2:
     resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}
 
+  own-keys@1.0.1:
+    resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
+    engines: {node: '>= 0.4'}
+
   p-limit@2.3.0:
     resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
     engines: {node: '>=6'}
@@ -7127,11 +7167,6 @@ packages:
   prismarine-chat@1.10.1:
     resolution: {integrity: sha512-XukYcuueuhDxzEXG7r8BZyt6jOObrPPB4JESCgb+/XenB9nExoSHF8eTQWWj8faKPLqm1dRQaYwFJlNBlJZJUw==}
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734}
-    version: 1.38.0
-    engines: {node: '>=14'}
-
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374:
     resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374}
     version: 1.38.1
@@ -7162,8 +7197,8 @@ packages:
     peerDependencies:
       prismarine-registry: ^1.4.0
 
-  prismarine-registry@1.10.0:
-    resolution: {integrity: sha512-6TYQiZHtsJ87HsB2E0yamCFp77ZyyLT16OmW5iXB5V30yCPflhHvR5TR2IqISmmiRc2093BkHfiIhsOZaMatmQ==}
+  prismarine-registry@1.11.0:
+    resolution: {integrity: sha512-uTvWE+bILxYv4i5MrrlxPQ0KYWINv1DJ3P2570GLC8uCdByDiDLBFfVyk4BrqOZBlDBft9CnaJMeOsC1Ly1iXw==}
 
   prismarine-schematic@1.2.3:
     resolution: {integrity: sha512-Mwpn43vEHhm3aw3cPhJjWqztkW+nX+QLajDHlTask8lEOTGl1WmpvFja4iwiws4GIvaC8x0Foptf4uvDsnjrAg==}
@@ -7594,8 +7629,8 @@ packages:
   reduce-configs@1.0.0:
     resolution: {integrity: sha512-/JCYSgL/QeXXsq0Lv/7kOZfqvof7vyzHWfyNQPt3c6vc73mU4WRyT8RJ6ZH5Ci08vUOqXwk7jkZy6BycHTDD9w==}
 
-  reflect.getprototypeof@1.0.6:
-    resolution: {integrity: sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==}
+  reflect.getprototypeof@1.0.10:
+    resolution: {integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==}
     engines: {node: '>= 0.4'}
 
   regenerate-unicode-properties@10.1.0:
@@ -7622,8 +7657,8 @@ packages:
     resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==}
     hasBin: true
 
-  regexp.prototype.flags@1.5.3:
-    resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
+  regexp.prototype.flags@1.5.4:
+    resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==}
     engines: {node: '>= 0.4'}
 
   regexpp@3.2.0:
@@ -7778,8 +7813,8 @@ packages:
   rxjs@7.8.1:
     resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
 
-  safe-array-concat@1.1.2:
-    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
+  safe-array-concat@1.1.3:
+    resolution: {integrity: sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==}
     engines: {node: '>=0.4'}
 
   safe-buffer@5.1.2:
@@ -7788,8 +7823,12 @@ packages:
   safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
-  safe-regex-test@1.0.3:
-    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
+  safe-push-apply@1.0.0:
+    resolution: {integrity: sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==}
+    engines: {node: '>= 0.4'}
+
+  safe-regex-test@1.1.0:
+    resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==}
     engines: {node: '>= 0.4'}
 
   safe-regex@1.1.0:
@@ -7865,8 +7904,8 @@ packages:
   set-blocking@2.0.0:
     resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
 
-  set-function-length@1.2.1:
-    resolution: {integrity: sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==}
+  set-function-length@1.2.2:
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
     engines: {node: '>= 0.4'}
 
   set-function-name@2.0.2:
@@ -7877,6 +7916,10 @@ packages:
     resolution: {integrity: sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g==}
     engines: {node: '>=6.9'}
 
+  set-proto@1.0.0:
+    resolution: {integrity: sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==}
+    engines: {node: '>= 0.4'}
+
   set-value@2.0.1:
     resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
     engines: {node: '>=0.10.0'}
@@ -7921,8 +7964,20 @@ packages:
   shell-quote@1.8.1:
     resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
 
-  side-channel@1.0.6:
-    resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
+  side-channel-list@1.0.0:
+    resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-map@1.0.1:
+    resolution: {integrity: sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-weakmap@1.0.2:
+    resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
+    engines: {node: '>= 0.4'}
+
+  side-channel@1.1.0:
+    resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
     engines: {node: '>= 0.4'}
 
   siginfo@2.0.0:
@@ -8165,20 +8220,21 @@ packages:
     resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
     engines: {node: '>=12'}
 
-  string.prototype.matchall@4.0.11:
-    resolution: {integrity: sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==}
+  string.prototype.matchall@4.0.12:
+    resolution: {integrity: sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==}
     engines: {node: '>= 0.4'}
 
   string.prototype.padend@3.1.4:
     resolution: {integrity: sha512-67otBXoksdjsnXXRUq+KMVTdlVRZ2af422Y0aTyTjVaoQkGr3mxl2Bc5emi7dOQ3OGVVQQskmLEWwFXwommpNw==}
     engines: {node: '>= 0.4'}
 
-  string.prototype.trim@1.2.9:
-    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
+  string.prototype.trim@1.2.10:
+    resolution: {integrity: sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==}
     engines: {node: '>= 0.4'}
 
-  string.prototype.trimend@1.0.8:
-    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
+  string.prototype.trimend@1.0.9:
+    resolution: {integrity: sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==}
+    engines: {node: '>= 0.4'}
 
   string.prototype.trimstart@1.0.8:
     resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
@@ -8526,20 +8582,20 @@ packages:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}
 
-  typed-array-buffer@1.0.2:
-    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
+  typed-array-buffer@1.0.3:
+    resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==}
     engines: {node: '>= 0.4'}
 
-  typed-array-byte-length@1.0.1:
-    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
+  typed-array-byte-length@1.0.3:
+    resolution: {integrity: sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==}
     engines: {node: '>= 0.4'}
 
-  typed-array-byte-offset@1.0.2:
-    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
+  typed-array-byte-offset@1.0.4:
+    resolution: {integrity: sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==}
     engines: {node: '>= 0.4'}
 
-  typed-array-length@1.0.6:
-    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
+  typed-array-length@1.0.7:
+    resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==}
     engines: {node: '>= 0.4'}
 
   typed-emitter@1.4.0:
@@ -8573,8 +8629,9 @@ packages:
   uint4@0.1.2:
     resolution: {integrity: sha512-lhEx78gdTwFWG+mt6cWAZD/R6qrIj0TTBeH5xwyuDJyswLNlGe+KVlUPQ6+mx5Ld332pS0AMUTo9hIly7YsWxQ==}
 
-  unbox-primitive@1.0.2:
-    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
+  unbox-primitive@1.1.0:
+    resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}
+    engines: {node: '>= 0.4'}
 
   undici-types@6.19.8:
     resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
@@ -8971,19 +9028,20 @@ packages:
   whatwg-url@7.1.0:
     resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==}
 
-  which-boxed-primitive@1.0.2:
-    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
+  which-boxed-primitive@1.1.1:
+    resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==}
+    engines: {node: '>= 0.4'}
 
-  which-builtin-type@1.1.4:
-    resolution: {integrity: sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==}
+  which-builtin-type@1.2.1:
+    resolution: {integrity: sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==}
     engines: {node: '>= 0.4'}
 
   which-collection@1.0.2:
     resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==}
     engines: {node: '>= 0.4'}
 
-  which-typed-array@1.1.15:
-    resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
+  which-typed-array@1.1.18:
+    resolution: {integrity: sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==}
     engines: {node: '>= 0.4'}
 
   which@1.3.1:
@@ -9265,7 +9323,7 @@ snapshots:
       '@babel/traverse': 7.22.11
       '@babel/types': 7.23.0
       convert-source-map: 1.9.0
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -9320,7 +9378,7 @@ snapshots:
       '@babel/core': 7.22.11
       '@babel/helper-compilation-targets': 7.22.10
       '@babel/helper-plugin-utils': 7.22.5
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.4
     transitivePeerDependencies:
@@ -10013,7 +10071,7 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.22.13
       '@babel/types': 7.23.0
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -10315,7 +10373,7 @@ snapshots:
   '@eslint/eslintrc@2.1.2':
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       espree: 9.6.1
       globals: 13.21.0
       ignore: 5.2.4
@@ -10369,7 +10427,7 @@ snapshots:
   '@humanwhocodes/config-array@0.11.11':
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -12091,7 +12149,7 @@ snapshots:
       ejs: 3.1.9
       json5: 2.2.3
       magic-string: 0.25.9
-      string.prototype.matchall: 4.0.11
+      string.prototype.matchall: 4.0.12
 
   '@swc/helpers@0.5.11':
     dependencies:
@@ -12386,7 +12444,7 @@ snapshots:
       '@typescript-eslint/type-utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4)
       '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4)
       '@typescript-eslint/visitor-keys': 6.1.0
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       eslint: 8.50.0
       graphemer: 1.4.0
       ignore: 5.2.4
@@ -12405,7 +12463,7 @@ snapshots:
       '@typescript-eslint/types': 6.7.3
       '@typescript-eslint/typescript-estree': 6.7.3(typescript@5.5.4)
       '@typescript-eslint/visitor-keys': 6.7.3
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       eslint: 8.50.0
     optionalDependencies:
       typescript: 5.5.4
@@ -12431,7 +12489,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.5.4)
       '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4)
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       eslint: 8.50.0
       ts-api-utils: 1.3.0(typescript@5.5.4)
     optionalDependencies:
@@ -12449,7 +12507,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.1.0
       '@typescript-eslint/visitor-keys': 6.1.0
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.0
@@ -12463,7 +12521,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.7.3
       '@typescript-eslint/visitor-keys': 6.7.3
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.0
@@ -12477,7 +12535,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 8.0.0
       '@typescript-eslint/visitor-keys': 8.0.0
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -12645,10 +12703,10 @@ snapshots:
 
   '@xboxreplay/errors@0.1.0': {}
 
-  '@xboxreplay/xboxlive-auth@3.3.3(debug@4.3.7)':
+  '@xboxreplay/xboxlive-auth@3.3.3(debug@4.4.0)':
     dependencies:
       '@xboxreplay/errors': 0.1.0
-      axios: 0.21.4(debug@4.3.7)
+      axios: 0.21.4(debug@4.4.0)
     transitivePeerDependencies:
       - debug
 
@@ -12722,11 +12780,11 @@ snapshots:
       flatmap: 0.0.3
       long: 5.2.3
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
@@ -12808,14 +12866,14 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     optional: true
 
   agent-base@7.1.0:
     dependencies:
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -12932,21 +12990,21 @@ snapshots:
 
   arr-union@3.1.0: {}
 
-  array-buffer-byte-length@1.0.1:
+  array-buffer-byte-length@1.0.2:
     dependencies:
-      call-bind: 1.0.7
-      is-array-buffer: 3.0.4
+      call-bound: 1.0.3
+      is-array-buffer: 3.0.5
 
   array-flatten@1.1.1: {}
 
   array-includes@3.1.8:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-object-atoms: 1.0.0
-      get-intrinsic: 1.2.4
-      is-string: 1.0.7
+      es-abstract: 1.23.9
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.2.7
+      is-string: 1.1.1
 
   array-union@2.1.0: {}
 
@@ -12954,52 +13012,51 @@ snapshots:
 
   array.prototype.findlast@1.2.5:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.9
       es-errors: 1.3.0
-      es-object-atoms: 1.0.0
+      es-object-atoms: 1.1.1
       es-shim-unscopables: 1.0.2
 
-  array.prototype.flat@1.3.2:
+  array.prototype.flat@1.3.3:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.9
       es-shim-unscopables: 1.0.2
 
-  array.prototype.flatmap@1.3.2:
+  array.prototype.flatmap@1.3.3:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.9
       es-shim-unscopables: 1.0.2
 
   array.prototype.toreversed@1.1.2:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.9
       es-shim-unscopables: 1.0.2
 
   array.prototype.tosorted@1.1.4:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.9
       es-errors: 1.3.0
       es-shim-unscopables: 1.0.2
 
-  arraybuffer.prototype.slice@1.0.3:
+  arraybuffer.prototype.slice@1.0.4:
     dependencies:
-      array-buffer-byte-length: 1.0.1
-      call-bind: 1.0.7
+      array-buffer-byte-length: 1.0.2
+      call-bind: 1.0.8
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.9
       es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      is-array-buffer: 3.0.4
-      is-shared-array-buffer: 1.0.3
+      get-intrinsic: 1.2.7
+      is-array-buffer: 3.0.5
 
   arraybuffer.slice@0.0.7:
     optional: true
@@ -13024,10 +13081,10 @@ snapshots:
 
   assert@2.1.0:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       is-nan: 1.3.2
       object-is: 1.1.5
-      object.assign: 4.1.5
+      object.assign: 4.1.7
       util: 0.12.5
 
   assertion-error@1.1.0: {}
@@ -13051,6 +13108,8 @@ snapshots:
 
   async-each@1.0.6: {}
 
+  async-function@1.0.0: {}
+
   async-limiter@1.0.1: {}
 
   async@2.6.4:
@@ -13075,15 +13134,15 @@ snapshots:
   aws4@1.12.0:
     optional: true
 
-  axios@0.21.4(debug@4.3.7):
+  axios@0.21.4(debug@4.4.0):
     dependencies:
-      follow-redirects: 1.15.6(debug@4.3.7)
+      follow-redirects: 1.15.6(debug@4.4.0)
     transitivePeerDependencies:
       - debug
 
-  axios@1.7.2(debug@4.3.7):
+  axios@1.7.2(debug@4.4.0):
     dependencies:
-      follow-redirects: 1.15.6(debug@4.3.7)
+      follow-redirects: 1.15.6(debug@4.4.0)
       form-data: 4.0.0
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
@@ -13428,13 +13487,22 @@ snapshots:
   cachedir@2.4.0:
     optional: true
 
-  call-bind@1.0.7:
+  call-bind-apply-helpers@1.0.1:
     dependencies:
-      es-define-property: 1.0.0
       es-errors: 1.3.0
       function-bind: 1.1.2
-      get-intrinsic: 1.2.4
-      set-function-length: 1.2.1
+
+  call-bind@1.0.8:
+    dependencies:
+      call-bind-apply-helpers: 1.0.1
+      es-define-property: 1.0.1
+      get-intrinsic: 1.2.7
+      set-function-length: 1.2.2
+
+  call-bound@1.0.3:
+    dependencies:
+      call-bind-apply-helpers: 1.0.1
+      get-intrinsic: 1.2.7
 
   callsites@3.1.0: {}
 
@@ -13937,7 +14005,7 @@ snapshots:
       commander: 5.1.0
       common-tags: 1.8.2
       dayjs: 1.11.9
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       enquirer: 2.4.1
       eventemitter2: 6.4.7
       execa: 4.1.0
@@ -13969,23 +14037,23 @@ snapshots:
       assert-plus: 1.0.0
     optional: true
 
-  data-view-buffer@1.0.1:
+  data-view-buffer@1.0.2:
     dependencies:
-      call-bind: 1.0.7
+      call-bound: 1.0.3
       es-errors: 1.3.0
-      is-data-view: 1.0.1
+      is-data-view: 1.0.2
 
-  data-view-byte-length@1.0.1:
+  data-view-byte-length@1.0.2:
     dependencies:
-      call-bind: 1.0.7
+      call-bound: 1.0.3
       es-errors: 1.3.0
-      is-data-view: 1.0.1
+      is-data-view: 1.0.2
 
-  data-view-byte-offset@1.0.0:
+  data-view-byte-offset@1.0.1:
     dependencies:
-      call-bind: 1.0.7
+      call-bound: 1.0.3
       es-errors: 1.3.0
-      is-data-view: 1.0.1
+      is-data-view: 1.0.2
 
   dayjs@1.11.9:
     optional: true
@@ -14012,7 +14080,11 @@ snapshots:
       ms: 2.1.3
     optional: true
 
-  debug@4.3.7(supports-color@8.1.1):
+  debug@4.3.7:
+    dependencies:
+      ms: 2.1.3
+
+  debug@4.4.0(supports-color@8.1.1):
     dependencies:
       ms: 2.1.3
     optionalDependencies:
@@ -14063,9 +14135,9 @@ snapshots:
 
   define-data-property@1.1.4:
     dependencies:
-      es-define-property: 1.0.0
+      es-define-property: 1.0.1
       es-errors: 1.3.0
-      gopd: 1.0.1
+      gopd: 1.2.0
 
   define-lazy-prop@2.0.0: {}
 
@@ -14142,7 +14214,7 @@ snapshots:
   detect-port@1.5.1:
     dependencies:
       address: 1.2.2
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -14154,7 +14226,7 @@ snapshots:
     dependencies:
       minecraft-data: 3.83.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
-      prismarine-registry: 1.10.0
+      prismarine-registry: 1.11.0
       random-seed: 0.3.0
       vec3: 0.1.8
 
@@ -14235,6 +14307,12 @@ snapshots:
 
   draco3d@1.5.6: {}
 
+  dunder-proto@1.0.1:
+    dependencies:
+      call-bind-apply-helpers: 1.0.1
+      es-errors: 1.3.0
+      gopd: 1.2.0
+
   duplexer@0.1.2: {}
 
   duplexify@3.7.1:
@@ -14317,7 +14395,7 @@ snapshots:
   engine.io-client@6.5.2:
     dependencies:
       '@socket.io/component-emitter': 3.1.0
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.3.7
       engine.io-parser: 5.2.1
       ws: 8.11.0
       xmlhttprequest-ssl: 2.0.0
@@ -14360,7 +14438,7 @@ snapshots:
       base64id: 2.0.0
       cookie: 0.4.2
       cors: 2.8.5
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.3.7
       engine.io-parser: 5.2.1
       ws: 8.11.0
     transitivePeerDependencies:
@@ -14399,89 +14477,95 @@ snapshots:
 
   eruda@3.0.1: {}
 
-  es-abstract@1.23.3:
+  es-abstract@1.23.9:
     dependencies:
-      array-buffer-byte-length: 1.0.1
-      arraybuffer.prototype.slice: 1.0.3
+      array-buffer-byte-length: 1.0.2
+      arraybuffer.prototype.slice: 1.0.4
       available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      data-view-buffer: 1.0.1
-      data-view-byte-length: 1.0.1
-      data-view-byte-offset: 1.0.0
-      es-define-property: 1.0.0
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      data-view-buffer: 1.0.2
+      data-view-byte-length: 1.0.2
+      data-view-byte-offset: 1.0.1
+      es-define-property: 1.0.1
       es-errors: 1.3.0
-      es-object-atoms: 1.0.0
-      es-set-tostringtag: 2.0.3
-      es-to-primitive: 1.2.1
-      function.prototype.name: 1.1.6
-      get-intrinsic: 1.2.4
-      get-symbol-description: 1.0.2
+      es-object-atoms: 1.1.1
+      es-set-tostringtag: 2.1.0
+      es-to-primitive: 1.3.0
+      function.prototype.name: 1.1.8
+      get-intrinsic: 1.2.7
+      get-proto: 1.0.1
+      get-symbol-description: 1.1.0
       globalthis: 1.0.4
-      gopd: 1.0.1
+      gopd: 1.2.0
       has-property-descriptors: 1.0.2
-      has-proto: 1.0.3
-      has-symbols: 1.0.3
+      has-proto: 1.2.0
+      has-symbols: 1.1.0
       hasown: 2.0.2
-      internal-slot: 1.0.7
-      is-array-buffer: 3.0.4
+      internal-slot: 1.1.0
+      is-array-buffer: 3.0.5
       is-callable: 1.2.7
-      is-data-view: 1.0.1
-      is-negative-zero: 2.0.3
-      is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.3
-      is-string: 1.0.7
-      is-typed-array: 1.1.13
-      is-weakref: 1.0.2
-      object-inspect: 1.13.2
+      is-data-view: 1.0.2
+      is-regex: 1.2.1
+      is-shared-array-buffer: 1.0.4
+      is-string: 1.1.1
+      is-typed-array: 1.1.15
+      is-weakref: 1.1.0
+      math-intrinsics: 1.1.0
+      object-inspect: 1.13.3
       object-keys: 1.1.1
-      object.assign: 4.1.5
-      regexp.prototype.flags: 1.5.3
-      safe-array-concat: 1.1.2
-      safe-regex-test: 1.0.3
-      string.prototype.trim: 1.2.9
-      string.prototype.trimend: 1.0.8
+      object.assign: 4.1.7
+      own-keys: 1.0.1
+      regexp.prototype.flags: 1.5.4
+      safe-array-concat: 1.1.3
+      safe-push-apply: 1.0.0
+      safe-regex-test: 1.1.0
+      set-proto: 1.0.0
+      string.prototype.trim: 1.2.10
+      string.prototype.trimend: 1.0.9
       string.prototype.trimstart: 1.0.8
-      typed-array-buffer: 1.0.2
-      typed-array-byte-length: 1.0.1
-      typed-array-byte-offset: 1.0.2
-      typed-array-length: 1.0.6
-      unbox-primitive: 1.0.2
-      which-typed-array: 1.1.15
+      typed-array-buffer: 1.0.3
+      typed-array-byte-length: 1.0.3
+      typed-array-byte-offset: 1.0.4
+      typed-array-length: 1.0.7
+      unbox-primitive: 1.1.0
+      which-typed-array: 1.1.18
 
-  es-define-property@1.0.0:
-    dependencies:
-      get-intrinsic: 1.2.4
+  es-define-property@1.0.1: {}
 
   es-errors@1.3.0: {}
 
-  es-iterator-helpers@1.1.0:
+  es-iterator-helpers@1.2.1:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.3
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.9
       es-errors: 1.3.0
-      es-set-tostringtag: 2.0.3
+      es-set-tostringtag: 2.1.0
       function-bind: 1.1.2
-      get-intrinsic: 1.2.4
+      get-intrinsic: 1.2.7
       globalthis: 1.0.4
+      gopd: 1.2.0
       has-property-descriptors: 1.0.2
-      has-proto: 1.0.3
-      has-symbols: 1.0.3
-      internal-slot: 1.0.7
-      iterator.prototype: 1.1.3
-      safe-array-concat: 1.1.2
+      has-proto: 1.2.0
+      has-symbols: 1.1.0
+      internal-slot: 1.1.0
+      iterator.prototype: 1.1.5
+      safe-array-concat: 1.1.3
 
   es-module-lexer@0.9.3: {}
 
   es-module-lexer@1.5.4: {}
 
-  es-object-atoms@1.0.0:
+  es-object-atoms@1.1.1:
     dependencies:
       es-errors: 1.3.0
 
-  es-set-tostringtag@2.0.3:
+  es-set-tostringtag@2.1.0:
     dependencies:
-      get-intrinsic: 1.2.4
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.7
       has-tostringtag: 1.0.2
       hasown: 2.0.2
 
@@ -14489,11 +14573,11 @@ snapshots:
     dependencies:
       hasown: 2.0.2
 
-  es-to-primitive@1.2.1:
+  es-to-primitive@1.3.0:
     dependencies:
       is-callable: 1.2.7
-      is-date-object: 1.0.5
-      is-symbol: 1.0.4
+      is-date-object: 1.1.0
+      is-symbol: 1.1.1
 
   es6-promise@4.2.8: {}
 
@@ -14511,7 +14595,7 @@ snapshots:
 
   esbuild-register@3.5.0(esbuild@0.18.20):
     dependencies:
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       esbuild: 0.18.20
     transitivePeerDependencies:
       - supports-color
@@ -14631,7 +14715,7 @@ snapshots:
   eslint-import-resolver-node@0.3.9:
     dependencies:
       debug: 3.2.7(supports-color@8.1.1)
-      is-core-module: 2.15.1
+      is-core-module: 2.16.1
       resolve: 1.22.4
     transitivePeerDependencies:
       - supports-color
@@ -14661,18 +14745,18 @@ snapshots:
   eslint-plugin-import@2.27.5(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0):
     dependencies:
       array-includes: 3.1.8
-      array.prototype.flat: 1.3.2
-      array.prototype.flatmap: 1.3.2
+      array.prototype.flat: 1.3.3
+      array.prototype.flatmap: 1.3.3
       debug: 3.2.7(supports-color@8.1.1)
       doctrine: 2.1.0
       eslint: 8.50.0
       eslint-import-resolver-node: 0.3.9
       eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@8.50.0)
       has: 1.0.3
-      is-core-module: 2.15.1
+      is-core-module: 2.16.1
       is-glob: 4.0.3
       minimatch: 3.1.2
-      object.values: 1.2.0
+      object.values: 1.2.1
       resolve: 1.22.4
       semver: 6.3.1
       tsconfig-paths: 3.14.2
@@ -14701,11 +14785,11 @@ snapshots:
     dependencies:
       array-includes: 3.1.8
       array.prototype.findlast: 1.2.5
-      array.prototype.flatmap: 1.3.2
+      array.prototype.flatmap: 1.3.3
       array.prototype.toreversed: 1.1.2
       array.prototype.tosorted: 1.1.4
       doctrine: 2.1.0
-      es-iterator-helpers: 1.1.0
+      es-iterator-helpers: 1.2.1
       eslint: 8.50.0
       estraverse: 5.3.0
       jsx-ast-utils: 3.3.5
@@ -14713,11 +14797,11 @@ snapshots:
       object.entries: 1.1.8
       object.fromentries: 2.0.8
       object.hasown: 1.1.4
-      object.values: 1.2.0
+      object.values: 1.2.1
       prop-types: 15.8.1
       resolve: 2.0.0-next.5
       semver: 6.3.1
-      string.prototype.matchall: 4.0.11
+      string.prototype.matchall: 4.0.12
 
   eslint-plugin-sonarjs@0.19.0(eslint@8.50.0):
     dependencies:
@@ -14774,7 +14858,7 @@ snapshots:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -15001,7 +15085,7 @@ snapshots:
 
   extract-zip@2.0.1(supports-color@8.1.1):
     dependencies:
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
@@ -15153,11 +15237,11 @@ snapshots:
 
   flow-parser@0.218.0: {}
 
-  follow-redirects@1.15.6(debug@4.3.7):
+  follow-redirects@1.15.6(debug@4.4.0):
     optionalDependencies:
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
 
-  for-each@0.3.3:
+  for-each@0.3.4:
     dependencies:
       is-callable: 1.2.7
 
@@ -15263,12 +15347,14 @@ snapshots:
 
   function-bind@1.1.2: {}
 
-  function.prototype.name@1.1.6:
+  function.prototype.name@1.1.8:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.3
       define-properties: 1.2.1
-      es-abstract: 1.23.3
       functions-have-names: 1.2.3
+      hasown: 2.0.2
+      is-callable: 1.2.7
 
   functions-have-names@1.2.3: {}
 
@@ -15303,13 +15389,18 @@ snapshots:
 
   get-func-name@2.0.2: {}
 
-  get-intrinsic@1.2.4:
+  get-intrinsic@1.2.7:
     dependencies:
+      call-bind-apply-helpers: 1.0.1
+      es-define-property: 1.0.1
       es-errors: 1.3.0
+      es-object-atoms: 1.1.1
       function-bind: 1.1.2
-      has-proto: 1.0.3
-      has-symbols: 1.0.3
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      has-symbols: 1.1.0
       hasown: 2.0.2
+      math-intrinsics: 1.1.0
 
   get-nonce@1.0.1: {}
 
@@ -15321,17 +15412,22 @@ snapshots:
 
   get-port@5.1.1: {}
 
+  get-proto@1.0.1:
+    dependencies:
+      dunder-proto: 1.0.1
+      es-object-atoms: 1.1.1
+
   get-stream@5.2.0:
     dependencies:
       pump: 3.0.0
 
   get-stream@6.0.1: {}
 
-  get-symbol-description@1.0.2:
+  get-symbol-description@1.1.0:
     dependencies:
-      call-bind: 1.0.7
+      call-bound: 1.0.3
       es-errors: 1.3.0
-      get-intrinsic: 1.2.4
+      get-intrinsic: 1.2.7
 
   get-tsconfig@4.7.2:
     dependencies:
@@ -15445,7 +15541,7 @@ snapshots:
   globalthis@1.0.4:
     dependencies:
       define-properties: 1.2.1
-      gopd: 1.0.1
+      gopd: 1.2.0
 
   globby@11.1.0:
     dependencies:
@@ -15461,9 +15557,7 @@ snapshots:
       through2: 0.6.5
     optional: true
 
-  gopd@1.0.1:
-    dependencies:
-      get-intrinsic: 1.2.4
+  gopd@1.2.0: {}
 
   graceful-fs@4.2.11: {}
 
@@ -15493,7 +15587,7 @@ snapshots:
 
   hard-rejection@2.1.0: {}
 
-  has-bigints@1.0.2: {}
+  has-bigints@1.1.0: {}
 
   has-binary2@1.0.3:
     dependencies:
@@ -15509,15 +15603,17 @@ snapshots:
 
   has-property-descriptors@1.0.2:
     dependencies:
-      es-define-property: 1.0.0
+      es-define-property: 1.0.1
 
-  has-proto@1.0.3: {}
+  has-proto@1.2.0:
+    dependencies:
+      dunder-proto: 1.0.1
 
-  has-symbols@1.0.3: {}
+  has-symbols@1.1.0: {}
 
   has-tostringtag@1.0.2:
     dependencies:
-      has-symbols: 1.0.3
+      has-symbols: 1.1.0
 
   has-unicode@2.0.1:
     optional: true
@@ -15634,27 +15730,27 @@ snapshots:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     optional: true
 
-  http-proxy@1.18.1(debug@4.3.7):
+  http-proxy@1.18.1(debug@4.4.0):
     dependencies:
       eventemitter3: 4.0.7
-      follow-redirects: 1.15.6(debug@4.3.7)
+      follow-redirects: 1.15.6(debug@4.4.0)
       requires-port: 1.0.0
     transitivePeerDependencies:
       - debug
 
-  http-server@14.1.1(debug@4.3.7):
+  http-server@14.1.1(debug@4.4.0):
     dependencies:
       basic-auth: 2.0.1
       chalk: 4.1.2
       corser: 2.0.1
       he: 1.2.0
       html-encoding-sniffer: 3.0.0
-      http-proxy: 1.18.1(debug@4.3.7)
+      http-proxy: 1.18.1(debug@4.4.0)
       mime: 1.6.0
       minimist: 1.2.8
       opener: 1.5.2
@@ -15678,14 +15774,14 @@ snapshots:
   https-proxy-agent@4.0.0:
     dependencies:
       agent-base: 5.1.1
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -15693,7 +15789,7 @@ snapshots:
   https-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -15766,11 +15862,11 @@ snapshots:
       css-in-js-utils: 3.1.0
       fast-loops: 1.1.3
 
-  internal-slot@1.0.7:
+  internal-slot@1.1.0:
     dependencies:
       es-errors: 1.3.0
       hasown: 2.0.2
-      side-channel: 1.0.6
+      side-channel: 1.1.0
 
   invariant@2.2.4:
     dependencies:
@@ -15788,25 +15884,30 @@ snapshots:
 
   is-arguments@1.1.1:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       has-tostringtag: 1.0.2
 
-  is-array-buffer@3.0.4:
+  is-array-buffer@3.0.5:
     dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      get-intrinsic: 1.2.7
 
   is-arrayish@0.2.1: {}
 
   is-arrayish@0.3.2: {}
 
-  is-async-function@2.0.0:
+  is-async-function@2.1.1:
     dependencies:
+      async-function: 1.0.0
+      call-bound: 1.0.3
+      get-proto: 1.0.1
       has-tostringtag: 1.0.2
+      safe-regex-test: 1.1.0
 
-  is-bigint@1.0.4:
+  is-bigint@1.1.0:
     dependencies:
-      has-bigints: 1.0.2
+      has-bigints: 1.1.0
 
   is-binary-path@1.0.1:
     dependencies:
@@ -15816,9 +15917,9 @@ snapshots:
     dependencies:
       binary-extensions: 2.2.0
 
-  is-boolean-object@1.1.2:
+  is-boolean-object@1.2.1:
     dependencies:
-      call-bind: 1.0.7
+      call-bound: 1.0.3
       has-tostringtag: 1.0.2
 
   is-buffer@1.1.6: {}
@@ -15834,7 +15935,7 @@ snapshots:
       ci-info: 3.8.0
     optional: true
 
-  is-core-module@2.15.1:
+  is-core-module@2.16.1:
     dependencies:
       hasown: 2.0.2
 
@@ -15842,12 +15943,15 @@ snapshots:
     dependencies:
       hasown: 2.0.2
 
-  is-data-view@1.0.1:
+  is-data-view@1.0.2:
     dependencies:
-      is-typed-array: 1.1.13
+      call-bound: 1.0.3
+      get-intrinsic: 1.2.7
+      is-typed-array: 1.1.15
 
-  is-date-object@1.0.5:
+  is-date-object@1.1.0:
     dependencies:
+      call-bound: 1.0.3
       has-tostringtag: 1.0.2
 
   is-deflate@1.0.0: {}
@@ -15872,18 +15976,21 @@ snapshots:
 
   is-extglob@2.1.1: {}
 
-  is-finalizationregistry@1.0.2:
+  is-finalizationregistry@1.1.1:
     dependencies:
-      call-bind: 1.0.7
+      call-bound: 1.0.3
 
   is-fullwidth-code-point@3.0.0: {}
 
   is-function@1.0.2:
     optional: true
 
-  is-generator-function@1.0.10:
+  is-generator-function@1.1.0:
     dependencies:
+      call-bound: 1.0.3
+      get-proto: 1.0.1
       has-tostringtag: 1.0.2
+      safe-regex-test: 1.1.0
 
   is-glob@3.1.0:
     dependencies:
@@ -15912,13 +16019,12 @@ snapshots:
 
   is-nan@1.3.2:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
 
-  is-negative-zero@2.0.3: {}
-
-  is-number-object@1.0.7:
+  is-number-object@1.1.1:
     dependencies:
+      call-bound: 1.0.3
       has-tostringtag: 1.0.2
 
   is-number@3.0.0:
@@ -15943,32 +16049,37 @@ snapshots:
 
   is-plain-object@5.0.0: {}
 
-  is-regex@1.1.4:
+  is-regex@1.2.1:
     dependencies:
-      call-bind: 1.0.7
+      call-bound: 1.0.3
+      gopd: 1.2.0
       has-tostringtag: 1.0.2
+      hasown: 2.0.2
 
   is-regexp@1.0.0: {}
 
   is-set@2.0.3: {}
 
-  is-shared-array-buffer@1.0.3:
+  is-shared-array-buffer@1.0.4:
     dependencies:
-      call-bind: 1.0.7
+      call-bound: 1.0.3
 
   is-stream@2.0.1: {}
 
-  is-string@1.0.7:
+  is-string@1.1.1:
     dependencies:
+      call-bound: 1.0.3
       has-tostringtag: 1.0.2
 
-  is-symbol@1.0.4:
+  is-symbol@1.1.1:
     dependencies:
-      has-symbols: 1.0.3
+      call-bound: 1.0.3
+      has-symbols: 1.1.0
+      safe-regex-test: 1.1.0
 
-  is-typed-array@1.1.13:
+  is-typed-array@1.1.15:
     dependencies:
-      which-typed-array: 1.1.15
+      which-typed-array: 1.1.18
 
   is-typedarray@1.0.0:
     optional: true
@@ -15977,14 +16088,14 @@ snapshots:
 
   is-weakmap@2.0.2: {}
 
-  is-weakref@1.0.2:
+  is-weakref@1.1.0:
     dependencies:
-      call-bind: 1.0.7
+      call-bound: 1.0.3
 
-  is-weakset@2.0.3:
+  is-weakset@2.0.4:
     dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
+      call-bound: 1.0.3
+      get-intrinsic: 1.2.7
 
   is-windows@1.0.2: {}
 
@@ -16038,12 +16149,13 @@ snapshots:
       html-escaper: 2.0.2
       istanbul-lib-report: 3.0.1
 
-  iterator.prototype@1.1.3:
+  iterator.prototype@1.1.5:
     dependencies:
-      define-properties: 1.2.1
-      get-intrinsic: 1.2.4
-      has-symbols: 1.0.3
-      reflect.getprototypeof: 1.0.6
+      define-data-property: 1.1.4
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.2.7
+      get-proto: 1.0.1
+      has-symbols: 1.1.0
       set-function-name: 2.0.2
 
   jackspeak@2.3.0:
@@ -16239,9 +16351,9 @@ snapshots:
   jsx-ast-utils@3.3.5:
     dependencies:
       array-includes: 3.1.8
-      array.prototype.flat: 1.3.2
-      object.assign: 4.1.5
-      object.values: 1.2.0
+      array.prototype.flat: 1.3.3
+      object.assign: 4.1.7
+      object.values: 1.2.1
 
   jszip@3.10.1:
     dependencies:
@@ -16528,6 +16640,8 @@ snapshots:
     dependencies:
       react: 18.2.0
 
+  math-intrinsics@1.1.0: {}
+
   mc-assets@0.2.27: {}
 
   md5-file@4.0.0: {}
@@ -16741,7 +16855,7 @@ snapshots:
   micromark@4.0.0:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.0
@@ -16823,13 +16937,13 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.12
       aes-js: 3.1.2
       buffer-equal: 1.0.1
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       endian-toggle: 0.0.0
       lodash.get: 4.4.2
       lodash.merge: 4.6.2
@@ -16851,7 +16965,7 @@ snapshots:
 
   minecraft-wrap@1.5.1(encoding@0.1.13):
     dependencies:
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       es6-promisify: 5.0.0
       extract-zip: 2.0.1(supports-color@8.1.1)
       flatmap: 0.0.3
@@ -16872,7 +16986,7 @@ snapshots:
       detect-collisions: 7.0.5
       vec3: 0.1.8
 
-  mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/642fd4f7023a98a96da4caf8f993f8e19361a1e7(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13):
+  mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13):
     dependencies:
       mineflayer: 4.25.0(encoding@0.1.13)
       sharp: 0.30.7
@@ -16883,7 +16997,7 @@ snapshots:
   mineflayer-pathfinder@2.4.4:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
       prismarine-entity: 2.3.1
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
@@ -16893,17 +17007,17 @@ snapshots:
   mineflayer@4.25.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
+      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
       prismarine-chat: 1.10.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
-      prismarine-recipe: 1.3.1(prismarine-registry@1.10.0)
-      prismarine-registry: 1.10.0
+      prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
+      prismarine-registry: 1.11.0
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       protodef: 1.18.0
@@ -16916,17 +17030,17 @@ snapshots:
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/556b9ddb376e089327c3fbb4ecbcabd32c7fd117(patch_hash=2xxbvh5jy3p5fjsq3y4zvvhxye)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
+      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
       prismarine-chat: 1.10.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
-      prismarine-recipe: 1.3.1(prismarine-registry@1.10.0)
-      prismarine-registry: 1.10.0
+      prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
+      prismarine-registry: 1.11.0
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       protodef: 1.18.0
@@ -17220,7 +17334,7 @@ snapshots:
   normalize-package-data@3.0.3:
     dependencies:
       hosted-git-info: 4.1.0
-      is-core-module: 2.15.1
+      is-core-module: 2.16.1
       semver: 7.6.0
       validate-npm-package-license: 3.0.4
 
@@ -17274,11 +17388,11 @@ snapshots:
       define-property: 0.2.5
       kind-of: 3.2.2
 
-  object-inspect@1.13.2: {}
+  object-inspect@1.13.3: {}
 
   object-is@1.1.5:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
 
   object-keys@1.1.1: {}
@@ -17287,41 +17401,44 @@ snapshots:
     dependencies:
       isobject: 3.0.1
 
-  object.assign@4.1.5:
+  object.assign@4.1.7:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.3
       define-properties: 1.2.1
-      has-symbols: 1.0.3
+      es-object-atoms: 1.1.1
+      has-symbols: 1.1.0
       object-keys: 1.1.1
 
   object.entries@1.1.8:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
-      es-object-atoms: 1.0.0
+      es-object-atoms: 1.1.1
 
   object.fromentries@2.0.8:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-object-atoms: 1.0.0
+      es-abstract: 1.23.9
+      es-object-atoms: 1.1.1
 
   object.hasown@1.1.4:
     dependencies:
       define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-object-atoms: 1.0.0
+      es-abstract: 1.23.9
+      es-object-atoms: 1.1.1
 
   object.pick@1.3.0:
     dependencies:
       isobject: 3.0.1
 
-  object.values@1.2.0:
+  object.values@1.2.1:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.3
       define-properties: 1.2.1
-      es-object-atoms: 1.0.0
+      es-object-atoms: 1.1.1
 
   omggif@1.0.10:
     optional: true
@@ -17384,6 +17501,12 @@ snapshots:
   ospath@1.2.2:
     optional: true
 
+  own-keys@1.0.1:
+    dependencies:
+      get-intrinsic: 1.2.7
+      object-keys: 1.1.1
+      safe-push-apply: 1.0.0
+
   p-limit@2.3.0:
     dependencies:
       p-try: 2.2.0
@@ -17668,8 +17791,8 @@ snapshots:
   prismarine-auth@2.4.2(encoding@0.1.13):
     dependencies:
       '@azure/msal-node': 2.7.0
-      '@xboxreplay/xboxlive-auth': 3.3.3(debug@4.3.7)
-      debug: 4.3.7(supports-color@8.1.1)
+      '@xboxreplay/xboxlive-auth': 3.3.3(debug@4.4.0)
+      debug: 4.4.0(supports-color@8.1.1)
       jose: 4.15.5
       node-fetch: 2.7.0(encoding@0.1.13)
       smart-buffer: 4.2.0
@@ -17678,45 +17801,34 @@ snapshots:
       - encoding
       - supports-color
 
-  prismarine-biome@1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0):
+  prismarine-biome@1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-registry: 1.10.0
+      prismarine-registry: 1.11.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3:
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-chat: 1.10.1
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
-      prismarine-registry: 1.10.0
+      prismarine-registry: 1.11.0
+    transitivePeerDependencies:
+      - prismarine-registry
 
   prismarine-chat@1.10.1:
     dependencies:
       mojangson: 2.0.4
       prismarine-nbt: 2.5.0
-      prismarine-registry: 1.10.0
-
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1):
-    dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
-      prismarine-nbt: 2.5.0
-      prismarine-registry: 1.10.0
-      smart-buffer: 4.2.0
-      uint4: 0.1.2
-      vec3: 0.1.8
-      xxhash-wasm: 0.4.2
-    transitivePeerDependencies:
-      - minecraft-data
+      prismarine-registry: 1.11.0
 
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1):
     dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.10.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
+      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
       prismarine-nbt: 2.5.0
-      prismarine-registry: 1.10.0
+      prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
       uint4: 0.1.2
       vec3: 0.1.8
@@ -17728,13 +17840,13 @@ snapshots:
     dependencies:
       prismarine-chat: 1.10.1
       prismarine-item: 1.16.0
-      prismarine-registry: 1.10.0
+      prismarine-registry: 1.11.0
       vec3: 0.1.8
 
   prismarine-item@1.16.0:
     dependencies:
       prismarine-nbt: 2.5.0
-      prismarine-registry: 1.10.0
+      prismarine-registry: 1.11.0
 
   prismarine-nbt@2.5.0:
     dependencies:
@@ -17748,8 +17860,8 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b(minecraft-data@3.83.1):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/cc4d8a232e33e946fa0929dceabe92df4d405734(minecraft-data@3.83.1)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-nbt: 2.5.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       uint4: 0.1.2
@@ -17759,25 +17871,26 @@ snapshots:
 
   prismarine-realms@1.3.2(encoding@0.1.13):
     dependencies:
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       node-fetch: 2.7.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  prismarine-recipe@1.3.1(prismarine-registry@1.10.0):
+  prismarine-recipe@1.3.1(prismarine-registry@1.11.0):
     dependencies:
-      prismarine-registry: 1.10.0
+      prismarine-registry: 1.11.0
 
-  prismarine-registry@1.10.0:
+  prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.83.1
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
       prismarine-nbt: 2.5.0
 
   prismarine-schematic@1.2.3:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
       prismarine-nbt: 2.5.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
       vec3: 0.1.8
@@ -17785,7 +17898,7 @@ snapshots:
   prismarine-windows@2.9.0:
     dependencies:
       prismarine-item: 1.16.0
-      prismarine-registry: 1.10.0
+      prismarine-registry: 1.11.0
       typed-emitter: 2.1.0
 
   prismarine-world@https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be:
@@ -17970,7 +18083,7 @@ snapshots:
   puppeteer-core@2.1.1:
     dependencies:
       '@types/mime-types': 2.1.2
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       extract-zip: 1.7.0
       https-proxy-agent: 4.0.0
       mime: 2.6.0
@@ -17990,16 +18103,16 @@ snapshots:
 
   qs@6.10.4:
     dependencies:
-      side-channel: 1.0.6
+      side-channel: 1.1.0
     optional: true
 
   qs@6.11.0:
     dependencies:
-      side-channel: 1.0.6
+      side-channel: 1.1.0
 
   qs@6.11.2:
     dependencies:
-      side-channel: 1.0.6
+      side-channel: 1.1.0
 
   querystring-es3@0.2.1: {}
 
@@ -18331,15 +18444,16 @@ snapshots:
     dependencies:
       browserslist: 4.23.2
 
-  reflect.getprototypeof@1.0.6:
+  reflect.getprototypeof@1.0.10:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.9
       es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      globalthis: 1.0.4
-      which-builtin-type: 1.1.4
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.2.7
+      get-proto: 1.0.1
+      which-builtin-type: 1.2.1
 
   regenerate-unicode-properties@10.1.0:
     dependencies:
@@ -18363,11 +18477,13 @@ snapshots:
 
   regexp-tree@0.1.27: {}
 
-  regexp.prototype.flags@1.5.3:
+  regexp.prototype.flags@1.5.4:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
       es-errors: 1.3.0
+      get-proto: 1.0.1
+      gopd: 1.2.0
       set-function-name: 2.0.2
 
   regexpp@3.2.0: {}
@@ -18456,13 +18572,13 @@ snapshots:
 
   resolve@1.22.4:
     dependencies:
-      is-core-module: 2.15.1
+      is-core-module: 2.16.1
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
   resolve@2.0.0-next.5:
     dependencies:
-      is-core-module: 2.15.1
+      is-core-module: 2.16.1
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
@@ -18532,22 +18648,28 @@ snapshots:
     dependencies:
       tslib: 2.6.2
 
-  safe-array-concat@1.1.2:
+  safe-array-concat@1.1.3:
     dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-      has-symbols: 1.0.3
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      get-intrinsic: 1.2.7
+      has-symbols: 1.1.0
       isarray: 2.0.5
 
   safe-buffer@5.1.2: {}
 
   safe-buffer@5.2.1: {}
 
-  safe-regex-test@1.0.3:
+  safe-push-apply@1.0.0:
     dependencies:
-      call-bind: 1.0.7
       es-errors: 1.3.0
-      is-regex: 1.1.4
+      isarray: 2.0.5
+
+  safe-regex-test@1.1.0:
+    dependencies:
+      call-bound: 1.0.3
+      es-errors: 1.3.0
+      is-regex: 1.2.1
 
   safe-regex@1.1.0:
     dependencies:
@@ -18608,7 +18730,7 @@ snapshots:
 
   send@1.1.0:
     dependencies:
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       destroy: 1.2.0
       encodeurl: 2.0.0
       escape-html: 1.0.3
@@ -18661,13 +18783,13 @@ snapshots:
   set-blocking@2.0.0:
     optional: true
 
-  set-function-length@1.2.1:
+  set-function-length@1.2.2:
     dependencies:
       define-data-property: 1.1.4
       es-errors: 1.3.0
       function-bind: 1.1.2
-      get-intrinsic: 1.2.4
-      gopd: 1.0.1
+      get-intrinsic: 1.2.7
+      gopd: 1.2.0
       has-property-descriptors: 1.0.2
 
   set-function-name@2.0.2:
@@ -18679,6 +18801,12 @@ snapshots:
 
   set-harmonic-interval@1.0.1: {}
 
+  set-proto@1.0.0:
+    dependencies:
+      dunder-proto: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+
   set-value@2.0.1:
     dependencies:
       extend-shallow: 2.0.1
@@ -18726,12 +18854,33 @@ snapshots:
 
   shell-quote@1.8.1: {}
 
-  side-channel@1.0.6:
+  side-channel-list@1.0.0:
     dependencies:
-      call-bind: 1.0.7
       es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      object-inspect: 1.13.2
+      object-inspect: 1.13.3
+
+  side-channel-map@1.0.1:
+    dependencies:
+      call-bound: 1.0.3
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.7
+      object-inspect: 1.13.3
+
+  side-channel-weakmap@1.0.2:
+    dependencies:
+      call-bound: 1.0.3
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.7
+      object-inspect: 1.13.3
+      side-channel-map: 1.0.1
+
+  side-channel@1.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      object-inspect: 1.13.3
+      side-channel-list: 1.0.0
+      side-channel-map: 1.0.1
+      side-channel-weakmap: 1.0.2
 
   siginfo@2.0.0: {}
 
@@ -18850,7 +18999,7 @@ snapshots:
   socket.io-client@4.7.2:
     dependencies:
       '@socket.io/component-emitter': 3.1.0
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.3.7
       engine.io-client: 6.5.2
       socket.io-parser: 4.2.4
     transitivePeerDependencies:
@@ -18879,7 +19028,7 @@ snapshots:
   socket.io-parser@4.2.4:
     dependencies:
       '@socket.io/component-emitter': 3.1.0
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
@@ -18902,7 +19051,7 @@ snapshots:
       accepts: 1.3.8
       base64id: 2.0.0
       cors: 2.8.5
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.3.7
       engine.io: 6.5.3
       socket.io-adapter: 2.5.2
       socket.io-parser: 4.2.4
@@ -18914,7 +19063,7 @@ snapshots:
   socks-proxy-agent@7.0.0:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       socks: 2.7.1
     transitivePeerDependencies:
       - supports-color
@@ -19076,45 +19225,50 @@ snapshots:
       emoji-regex: 9.2.2
       strip-ansi: 7.1.0
 
-  string.prototype.matchall@4.0.11:
+  string.prototype.matchall@4.0.12:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.3
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.9
       es-errors: 1.3.0
-      es-object-atoms: 1.0.0
-      get-intrinsic: 1.2.4
-      gopd: 1.0.1
-      has-symbols: 1.0.3
-      internal-slot: 1.0.7
-      regexp.prototype.flags: 1.5.3
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.2.7
+      gopd: 1.2.0
+      has-symbols: 1.1.0
+      internal-slot: 1.1.0
+      regexp.prototype.flags: 1.5.4
       set-function-name: 2.0.2
-      side-channel: 1.0.6
+      side-channel: 1.1.0
 
   string.prototype.padend@3.1.4:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.9
 
-  string.prototype.trim@1.2.9:
+  string.prototype.trim@1.2.10:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      define-data-property: 1.1.4
       define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-object-atoms: 1.0.0
+      es-abstract: 1.23.9
+      es-object-atoms: 1.1.1
+      has-property-descriptors: 1.0.2
 
-  string.prototype.trimend@1.0.8:
+  string.prototype.trimend@1.0.9:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.3
       define-properties: 1.2.1
-      es-object-atoms: 1.0.0
+      es-object-atoms: 1.1.1
 
   string.prototype.trimstart@1.0.8:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
-      es-object-atoms: 1.0.0
+      es-object-atoms: 1.1.1
 
   string_decoder@0.10.31:
     optional: true
@@ -19446,37 +19600,38 @@ snapshots:
       media-typer: 0.3.0
       mime-types: 2.1.35
 
-  typed-array-buffer@1.0.2:
+  typed-array-buffer@1.0.3:
     dependencies:
-      call-bind: 1.0.7
+      call-bound: 1.0.3
       es-errors: 1.3.0
-      is-typed-array: 1.1.13
+      is-typed-array: 1.1.15
 
-  typed-array-byte-length@1.0.1:
+  typed-array-byte-length@1.0.3:
     dependencies:
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
+      call-bind: 1.0.8
+      for-each: 0.3.4
+      gopd: 1.2.0
+      has-proto: 1.2.0
+      is-typed-array: 1.1.15
 
-  typed-array-byte-offset@1.0.2:
+  typed-array-byte-offset@1.0.4:
     dependencies:
       available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
+      call-bind: 1.0.8
+      for-each: 0.3.4
+      gopd: 1.2.0
+      has-proto: 1.2.0
+      is-typed-array: 1.1.15
+      reflect.getprototypeof: 1.0.10
 
-  typed-array-length@1.0.6:
+  typed-array-length@1.0.7:
     dependencies:
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
+      call-bind: 1.0.8
+      for-each: 0.3.4
+      gopd: 1.2.0
+      is-typed-array: 1.1.15
       possible-typed-array-names: 1.0.0
+      reflect.getprototypeof: 1.0.10
 
   typed-emitter@1.4.0: {}
 
@@ -19499,12 +19654,12 @@ snapshots:
 
   uint4@0.1.2: {}
 
-  unbox-primitive@1.0.2:
+  unbox-primitive@1.1.0:
     dependencies:
-      call-bind: 1.0.7
-      has-bigints: 1.0.2
-      has-symbols: 1.0.3
-      which-boxed-primitive: 1.0.2
+      call-bound: 1.0.3
+      has-bigints: 1.1.0
+      has-symbols: 1.1.0
+      which-boxed-primitive: 1.1.1
 
   undici-types@6.19.8: {}
 
@@ -19715,9 +19870,9 @@ snapshots:
     dependencies:
       inherits: 2.0.4
       is-arguments: 1.1.1
-      is-generator-function: 1.0.10
-      is-typed-array: 1.1.13
-      which-typed-array: 1.1.15
+      is-generator-function: 1.1.0
+      is-typed-array: 1.1.15
+      which-typed-array: 1.1.18
 
   utils-merge@1.0.1: {}
 
@@ -19775,7 +19930,7 @@ snapshots:
   vite-node@0.34.6(@types/node@22.8.1)(terser@5.31.3):
     dependencies:
       cac: 6.7.14
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       mlly: 1.4.2
       pathe: 1.1.1
       picocolors: 1.1.1
@@ -19814,7 +19969,7 @@ snapshots:
       acorn-walk: 8.2.0
       cac: 6.7.14
       chai: 4.3.10
-      debug: 4.3.7(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       local-pkg: 0.4.3
       magic-string: 0.30.4
       pathe: 1.1.1
@@ -19839,9 +19994,9 @@ snapshots:
 
   w3c-keyname@2.2.8: {}
 
-  wait-on@7.2.0(debug@4.3.7):
+  wait-on@7.2.0(debug@4.4.0):
     dependencies:
-      axios: 1.7.2(debug@4.3.7)
+      axios: 1.7.2(debug@4.4.0)
       joi: 17.13.1
       lodash: 4.17.21
       minimist: 1.2.8
@@ -19935,42 +20090,44 @@ snapshots:
       tr46: 1.0.1
       webidl-conversions: 4.0.2
 
-  which-boxed-primitive@1.0.2:
+  which-boxed-primitive@1.1.1:
     dependencies:
-      is-bigint: 1.0.4
-      is-boolean-object: 1.1.2
-      is-number-object: 1.0.7
-      is-string: 1.0.7
-      is-symbol: 1.0.4
+      is-bigint: 1.1.0
+      is-boolean-object: 1.2.1
+      is-number-object: 1.1.1
+      is-string: 1.1.1
+      is-symbol: 1.1.1
 
-  which-builtin-type@1.1.4:
+  which-builtin-type@1.2.1:
     dependencies:
-      function.prototype.name: 1.1.6
+      call-bound: 1.0.3
+      function.prototype.name: 1.1.8
       has-tostringtag: 1.0.2
-      is-async-function: 2.0.0
-      is-date-object: 1.0.5
-      is-finalizationregistry: 1.0.2
-      is-generator-function: 1.0.10
-      is-regex: 1.1.4
-      is-weakref: 1.0.2
+      is-async-function: 2.1.1
+      is-date-object: 1.1.0
+      is-finalizationregistry: 1.1.1
+      is-generator-function: 1.1.0
+      is-regex: 1.2.1
+      is-weakref: 1.1.0
       isarray: 2.0.5
-      which-boxed-primitive: 1.0.2
+      which-boxed-primitive: 1.1.1
       which-collection: 1.0.2
-      which-typed-array: 1.1.15
+      which-typed-array: 1.1.18
 
   which-collection@1.0.2:
     dependencies:
       is-map: 2.0.3
       is-set: 2.0.3
       is-weakmap: 2.0.2
-      is-weakset: 2.0.3
+      is-weakset: 2.0.4
 
-  which-typed-array@1.1.15:
+  which-typed-array@1.1.18:
     dependencies:
       available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
+      call-bind: 1.0.8
+      call-bound: 1.0.3
+      for-each: 0.3.4
+      gopd: 1.2.0
       has-tostringtag: 1.0.2
 
   which@1.3.1:

From e0be30b86f34e77421ec42a9320b7bc6f2170785 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 25 Jan 2025 20:02:15 +0300
Subject: [PATCH 129/753] fix: adjust FOV calculations for sprinting and flying
 to increase field of view instead of decreasing it

---
 src/rendererUtils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rendererUtils.ts b/src/rendererUtils.ts
index faad6ede..63f80492 100644
--- a/src/rendererUtils.ts
+++ b/src/rendererUtils.ts
@@ -8,10 +8,10 @@ export const watchFov = () => {
     let fov = gameAdditionalState.isZooming ? 30 : options.fov
     // todo check values and add transition
     if (bot.controlState.sprint && !bot.controlState.sneak) {
-      fov -= 5
+      fov += 5
     }
     if (gameAdditionalState.isFlying) {
-      fov -= 5
+      fov += 5
     }
     viewer.camera.fov = fov
     viewer.camera.updateProjectionMatrix()

From 1a45381b3daae98b3e17e554728c76a660ccc1d4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 25 Jan 2025 20:25:52 +0300
Subject: [PATCH 130/753] fix: fix maps display for 1.21+

---
 package.json                            |   2 +-
 patches/minecraft-protocol@1.54.0.patch | 188 ++++++++++++++++++++++++
 pnpm-lock.yaml                          |  10 +-
 src/index.ts                            |   1 +
 src/mineflayer/maps.ts                  |  23 +++
 src/react/HeldMapUi.tsx                 |  23 +--
 6 files changed, 223 insertions(+), 24 deletions(-)
 create mode 100644 patches/minecraft-protocol@1.54.0.patch
 create mode 100644 src/mineflayer/maps.ts

diff --git a/package.json b/package.json
index 60032b9a..9f5ea0f8 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.27",
+    "mc-assets": "^0.2.28",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/patches/minecraft-protocol@1.54.0.patch b/patches/minecraft-protocol@1.54.0.patch
new file mode 100644
index 00000000..32371450
--- /dev/null
+++ b/patches/minecraft-protocol@1.54.0.patch
@@ -0,0 +1,188 @@
+diff --git a/src/client/autoVersion.js b/src/client/autoVersion.js
+index 3fe1552672e4c0dd1b14b3b56950c3d7eaf3537b..6eb615e5827279c328d5547b5911626693252da4 100644
+--- a/src/client/autoVersion.js
++++ b/src/client/autoVersion.js
+@@ -9,7 +9,7 @@ module.exports = function (client, options) {
+   client.wait_connect = true // don't let src/client/setProtocol proceed on socket 'connect' until 'connect_allowed'
+   debug('pinging', options.host)
+   // TODO: use 0xfe ping instead for better compatibility/performance? https://github.com/deathcap/node-minecraft-ping
+-  ping(options, function (err, response) {
++  ping(options, async function (err, response) {
+     if (err) { return client.emit('error', err) }
+     debug('ping response', response)
+     // TODO: could also use ping pre-connect to save description, type, max players, etc.
+@@ -40,6 +40,7 @@ module.exports = function (client, options) {
+ 
+     // Reinitialize client object with new version TODO: move out of its constructor?
+     client.version = minecraftVersion
++    await options.versionSelectedHook?.(client)
+     client.state = states.HANDSHAKING
+ 
+     // Let other plugins such as Forge/FML (modinfo) respond to the ping response
+diff --git a/src/client/chat.js b/src/client/chat.js
+index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aae0d1d337 100644
+--- a/src/client/chat.js
++++ b/src/client/chat.js
+@@ -111,7 +111,7 @@ module.exports = function (client, options) {
+         for (const player of packet.data) {
+           if (!player.chatSession) continue
+           client._players[player.UUID] = {
+-            publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
++            // publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
+             publicKeyDER: player.chatSession.publicKey.keyBytes,
+             sessionUuid: player.chatSession.uuid
+           }
+@@ -127,7 +127,7 @@ module.exports = function (client, options) {
+       for (const player of packet.data) {
+         if (player.crypto) {
+           client._players[player.UUID] = {
+-            publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
++            // publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
+             publicKeyDER: player.crypto.publicKey,
+             signature: player.crypto.signature,
+             displayName: player.displayName || player.name
+@@ -198,7 +198,7 @@ module.exports = function (client, options) {
+     if (mcData.supportFeature('useChatSessions')) {
+       const tsDelta = BigInt(Date.now()) - packet.timestamp
+       const expired = !packet.timestamp || tsDelta > messageExpireTime || tsDelta < 0
+-      const verified = !packet.unsignedChatContent && updateAndValidateSession(packet.senderUuid, packet.plainMessage, packet.signature, packet.index, packet.previousMessages, packet.salt, packet.timestamp) && !expired
++      const verified = false && !packet.unsignedChatContent && updateAndValidateSession(packet.senderUuid, packet.plainMessage, packet.signature, packet.index, packet.previousMessages, packet.salt, packet.timestamp) && !expired
+       if (verified) client._signatureCache.push(packet.signature)
+       client.emit('playerChat', {
+         plainMessage: packet.plainMessage,
+@@ -363,7 +363,7 @@ module.exports = function (client, options) {
+     }
+   }
+ 
+-  client._signedChat = (message, options = {}) => {
++  client._signedChat = async (message, options = {}) => {
+     options.timestamp = options.timestamp || BigInt(Date.now())
+     options.salt = options.salt || 1n
+ 
+@@ -405,7 +405,7 @@ module.exports = function (client, options) {
+         message,
+         timestamp: options.timestamp,
+         salt: options.salt,
+-        signature: (client.profileKeys && client._session) ? client.signMessage(message, options.timestamp, options.salt, undefined, acknowledgements) : undefined,
++        signature: (client.profileKeys && client._session) ? await client.signMessage(message, options.timestamp, options.salt, undefined, acknowledgements) : undefined,
+         offset: client._lastSeenMessages.pending,
+         acknowledged
+       })
+@@ -419,7 +419,7 @@ module.exports = function (client, options) {
+         message,
+         timestamp: options.timestamp,
+         salt: options.salt,
+-        signature: client.profileKeys ? client.signMessage(message, options.timestamp, options.salt, options.preview) : Buffer.alloc(0),
++        signature: client.profileKeys ? await client.signMessage(message, options.timestamp, options.salt, options.preview) : Buffer.alloc(0),
+         signedPreview: options.didPreview,
+         previousMessages: client._lastSeenMessages.map((e) => ({
+           messageSender: e.sender,
+diff --git a/src/client/encrypt.js b/src/client/encrypt.js
+index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108f4c63536 100644
+--- a/src/client/encrypt.js
++++ b/src/client/encrypt.js
+@@ -25,7 +25,11 @@ module.exports = function (client, options) {
+         if (packet.serverId !== '-') {
+           debug('This server appears to be an online server and you are providing no password, the authentication will probably fail')
+         }
+-        sendEncryptionKeyResponse()
++        client.end('This server appears to be an online server and you are providing no authentication. Try authenticating first.')
++        // sendEncryptionKeyResponse()
++        // client.once('set_compression', () => {
++        //   clearTimeout(loginTimeout)
++        // })
+       }
+ 
+       function onJoinServerResponse (err) {
+diff --git a/src/client.js b/src/client.js
+index 74749698f8cee05b5dc749c271544f78d06645b0..e77e0a3f41c1ee780c3abbd54b0801d248c2a07c 100644
+--- a/src/client.js
++++ b/src/client.js
+@@ -89,10 +89,12 @@ class Client extends EventEmitter {
+       parsed.metadata.name = parsed.data.name
+       parsed.data = parsed.data.params
+       parsed.metadata.state = state
+-      debug('read packet ' + state + '.' + parsed.metadata.name)
+-      if (debug.enabled) {
+-        const s = JSON.stringify(parsed.data, null, 2)
+-        debug(s && s.length > 10000 ? parsed.data : s)
++      if (!globalThis.excludeCommunicationDebugEvents?.includes(parsed.metadata.name)) {
++        debug('read packet ' + state + '.' + parsed.metadata.name)
++        if (debug.enabled) {
++          const s = JSON.stringify(parsed.data, null, 2)
++          debug(s && s.length > 10000 ? parsed.data : s)
++        }
+       }
+       if (this._hasBundlePacket && parsed.metadata.name === 'bundle_delimiter') {
+         if (this._mcBundle.length) { // End bundle
+@@ -110,7 +112,13 @@ class Client extends EventEmitter {
+           this._hasBundlePacket = false
+         }
+       } else {
+-        emitPacket(parsed)
++        try {
++          emitPacket(parsed)
++        } catch (err) {
++          console.log('Client incorrectly handled packet ' + parsed.metadata.name)
++          console.error(err)
++          // todo investigate why it doesn't close the stream even if unhandled there
++        }
+       }
+     })
+   }
+@@ -168,7 +176,10 @@ class Client extends EventEmitter {
+     }
+ 
+     const onFatalError = (err) => {
+-      this.emit('error', err)
++      // todo find out what is trying to write after client disconnect
++      if(err.code !== 'ECONNABORTED') {
++        this.emit('error', err)
++      }
+       endSocket()
+     }
+ 
+@@ -197,6 +208,8 @@ class Client extends EventEmitter {
+     serializer -> framer -> socket -> splitter -> deserializer */
+     if (this.serializer) {
+       this.serializer.end()
++      this.socket?.end()
++      this.socket?.emit('end')
+     } else {
+       if (this.socket) this.socket.end()
+     }
+@@ -238,8 +251,11 @@ class Client extends EventEmitter {
+ 
+   write (name, params) {
+     if (!this.serializer.writable) { return }
+-    debug('writing packet ' + this.state + '.' + name)
+-    debug(params)
++    if (!globalThis.excludeCommunicationDebugEvents?.includes(name)) {
++      debug(`[${this.state}] from ${this.isServer ? 'server' : 'client'}: ` + name)
++      debug(params)
++    }
++    this.emit('writePacket', name, params)
+     this.serializer.write({ name, params })
+   }
+ 
+diff --git a/src/index.d.ts b/src/index.d.ts
+index e61d5403bab46251d35b22a2ea30eb09b2746a26..84f597427893671eeac231b11e6e42aa815601df 100644
+--- a/src/index.d.ts
++++ b/src/index.d.ts
+@@ -135,6 +135,7 @@ declare module 'minecraft-protocol' {
+ 		sessionServer?: string
+ 		keepAlive?: boolean
+ 		closeTimeout?: number
++		closeTimeout?: number
+ 		noPongTimeout?: number
+ 		checkTimeoutInterval?: number
+ 		version?: string
+@@ -155,6 +156,8 @@ declare module 'minecraft-protocol' {
+ 		disableChatSigning?: boolean
+ 		/** Pass custom client implementation if needed. */
+ 		Client?: Client
++		/** Can be used to prepare mc data on autoVersion (client.version has selected version) */
++		versionSelectedHook?: (client: Client) => Promise<void> | void
+ 	}
+ 
+ 	export class Server extends EventEmitter {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 10d56d19..727529eb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -346,8 +346,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.27
-        version: 0.2.27
+        specifier: ^0.2.28
+        version: 0.2.28
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -6256,8 +6256,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.27:
-    resolution: {integrity: sha512-9VUM89lRIhclj/+CvSXeum6frA7UWXTQR2TUC/qtXJp7DJ6Jf4Mmo/vM/m6Ztev1jG5ZgKNwL6rrP9lwt0YybA==}
+  mc-assets@0.2.28:
+    resolution: {integrity: sha512-NwUpKFExg/xs5YguFMeGa7Zie2yoJh2EcUSV4n46q4OF60AmgoEj0OSOS2xnZF2BL17JJ3Y97V6quAR9NCKLeQ==}
     engines: {node: '>=18.0.0'}
 
   md5-file@4.0.0:
@@ -16642,7 +16642,7 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.27: {}
+  mc-assets@0.2.28: {}
 
   md5-file@4.0.0: {}
 
diff --git a/src/index.ts b/src/index.ts
index 7f143e7b..b221f18e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,6 +5,7 @@ import './globals'
 import './devtools'
 import './entities'
 import './globalDomListeners'
+import './mineflayer/maps'
 import initCollisionShapes from './getCollisionInteractionShapes'
 import { onGameLoad } from './inventoryWindows'
 import { supportedVersions } from 'minecraft-protocol'
diff --git a/src/mineflayer/maps.ts b/src/mineflayer/maps.ts
new file mode 100644
index 00000000..c5d4f716
--- /dev/null
+++ b/src/mineflayer/maps.ts
@@ -0,0 +1,23 @@
+import { mapDownloader } from 'mineflayer-item-map-downloader'
+import { setImageConverter } from 'mineflayer-item-map-downloader/lib/util'
+
+setImageConverter((buf: Uint8Array) => {
+  const canvas = document.createElement('canvas')
+  const ctx = canvas.getContext('2d')!
+  canvas.width = 128
+  canvas.height = 128
+  const imageData = ctx.createImageData(canvas.width, canvas.height)
+  imageData.data.set(buf)
+  ctx.putImageData(imageData, 0, 0)
+  // data url
+  return canvas.toDataURL('image/png')
+})
+
+customEvents.on('mineflayerBotCreated', () => {
+  bot.on('login', () => {
+    bot.loadPlugin(mapDownloader)
+    bot.mapDownloader.on('new_map', ({ png, id }) => {
+      viewer.entities.updateMap(id, png)
+    })
+  })
+})
diff --git a/src/react/HeldMapUi.tsx b/src/react/HeldMapUi.tsx
index 12f03298..b4eaea60 100644
--- a/src/react/HeldMapUi.tsx
+++ b/src/react/HeldMapUi.tsx
@@ -1,31 +1,16 @@
 import { useEffect, useState } from 'react'
-import { mapDownloader } from 'mineflayer-item-map-downloader/'
-import { setImageConverter } from 'mineflayer-item-map-downloader/lib/util'
 
 export default () => {
   const [dataUrl, setDataUrl] = useState<string | null | true>(null) // true means loading
 
   useEffect(() => {
-    bot.loadPlugin(mapDownloader)
-
-    setImageConverter((buf: Uint8Array) => {
-      const canvas = document.createElement('canvas')
-      const ctx = canvas.getContext('2d')!
-      canvas.width = 128
-      canvas.height = 128
-      const imageData = ctx.createImageData(canvas.width, canvas.height)
-      imageData.data.set(buf)
-      ctx.putImageData(imageData, 0, 0)
-      // data url
-      return canvas.toDataURL('image/png')
-    })
-
     // TODO delete maps!
     const updateHeldMap = () => {
       setDataUrl(null)
-      if (!bot.heldItem || !['filled_map', 'map'].includes(bot.heldItem.name)) return
+      const item = bot.heldItem
+      if (!item || !['filled_map', 'map'].includes(item.name)) return
       // setDataUrl(true)
-      const mapNumber = (bot.heldItem?.nbt?.value as any)?.map?.value
+      const mapNumber = ((item?.nbt?.value as any)?.map?.value) ?? (item['components']?.find(x => x.type === 'map_id')?.data)
       // if (!mapNumber) return
       setDataUrl(bot.mapDownloader.maps?.[mapNumber] as unknown as string)
     }
@@ -38,6 +23,8 @@ export default () => {
       // total maps: Object.keys(bot.mapDownloader.maps).length
       updateHeldMap()
     })
+
+    updateHeldMap()
   }, [])
 
   return dataUrl && dataUrl !== true ? <div style={{

From 540f90fd0c669aec43b2f39029b991d56fa887e1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 25 Jan 2025 22:37:24 +0300
Subject: [PATCH 131/753] ci: fix build

---
 src/mineflayer/maps.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/mineflayer/maps.ts b/src/mineflayer/maps.ts
index c5d4f716..75169a9f 100644
--- a/src/mineflayer/maps.ts
+++ b/src/mineflayer/maps.ts
@@ -16,8 +16,5 @@ setImageConverter((buf: Uint8Array) => {
 customEvents.on('mineflayerBotCreated', () => {
   bot.on('login', () => {
     bot.loadPlugin(mapDownloader)
-    bot.mapDownloader.on('new_map', ({ png, id }) => {
-      viewer.entities.updateMap(id, png)
-    })
   })
 })

From 84bc3d59117122b5c9898355992dddd4bc5164db Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 26 Jan 2025 15:25:50 +0300
Subject: [PATCH 132/753] add recommended but optional mount volume to
 dockerfile config

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index a5f6ac06..484d158e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,4 +31,5 @@ RUN npm i -g pnpm@9.0.4
 RUN npm init -yp
 RUN pnpm i express github:zardoy/prismarinejs-net-browserify compression cors
 EXPOSE 8080
+VOLUME /app/dist
 ENTRYPOINT ["node", "server.js", "--prod"]

From 7186b183f16643900dd2416e665bbfdd0ada2a1d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 27 Jan 2025 02:22:31 +0300
Subject: [PATCH 133/753] feat: add packets logger preset option and process
 packet data based on preset

---
 src/optionsGuiScheme.tsx | 11 ++++++++++-
 src/optionsStorage.ts    |  3 ++-
 src/packetsReplay.ts     | 37 ++++++++++++++++++++++++++++++++++---
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index c6a979c1..381a70a6 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -452,7 +452,16 @@ export const guiOptionsScheme: {
           }}
         >Download Packets Replay</Button>
       },
-    }
+    },
+    {
+      packetsLoggerPreset: {
+        text: 'Packets Logger Preset',
+        values: [
+          ['all', 'All'],
+          ['no-buffers', 'No Buffers']
+        ],
+      },
+    },
   ],
 }
 export type OptionsGroupType = 'main' | 'render' | 'interface' | 'controls' | 'sound' | 'advanced' | 'VR'
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index a242107c..5d88fe38 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -49,6 +49,7 @@ const defaultOptions = {
   useVersionsTextures: 'latest',
   serverResourcePacks: 'prompt' as 'prompt' | 'always' | 'never',
   handDisplay: false,
+  packetsLoggerPreset: 'all' as 'all' | 'no-buffers',
 
   // antiAliasing: false,
 
@@ -93,7 +94,7 @@ const defaultOptions = {
   minimapOptimizations: true,
   displayBossBars: false, // boss bar overlay was removed for some reason, enable safely
   disabledUiParts: [] as string[],
-  neighborChunkUpdates: true
+  neighborChunkUpdates: true,
 }
 
 function getDefaultTouchControlsPositions () {
diff --git a/src/packetsReplay.ts b/src/packetsReplay.ts
index 57d0805e..c3cc18d9 100644
--- a/src/packetsReplay.ts
+++ b/src/packetsReplay.ts
@@ -1,25 +1,56 @@
 import { proxy } from 'valtio'
 import { PacketsLogger } from './packetsReplayBase'
+import { options } from './optionsStorage'
 
 export const packetsReplaceSessionState = proxy({
   active: false,
 })
 
 const replayLogger = new PacketsLogger()
+
+const isBufferData = (data: any): boolean => {
+  if (Buffer.isBuffer(data) || data instanceof Uint8Array) return true
+  if (typeof data === 'object' && data !== null) {
+    return Object.values(data).some(value => isBufferData(value))
+  }
+  return false
+}
+
+const processPacketData = (data: any): any => {
+  if (options.packetsLoggerPreset === 'no-buffers') {
+    if (Buffer.isBuffer(data)) {
+      return '[buffer]'
+    }
+    if (typeof data === 'object' && data !== null) {
+      const processed = {}
+      for (const [key, value] of Object.entries(data)) {
+        processed[key] = isBufferData(value) ? '[buffer]' : value
+      }
+      return processed
+    }
+  }
+  return data
+}
+
 export default () => {
   customEvents.on('mineflayerBotCreated', () => {
     replayLogger.contents = ''
-    bot._client.on('packet', (data, { name, state }) => {
+    const handleServerPacket = (data, { name, state = bot._client.state }) => {
       if (!packetsReplaceSessionState.active) {
         return
       }
-      replayLogger.log(true, { name, state }, data)
+      replayLogger.log(true, { name, state }, processPacketData(data))
+    }
+    bot._client.on('packet', handleServerPacket)
+    bot._client.on('packet_name' as any, (name, data) => {
+      handleServerPacket(data, { name })
     })
+
     bot._client.on('writePacket' as any, (name, data) => {
       if (!packetsReplaceSessionState.active) {
         return
       }
-      replayLogger.log(false, { name, state: bot._client.state }, data)
+      replayLogger.log(false, { name, state: bot._client.state }, processPacketData(data))
     })
   })
 }

From 3fc644082ab75876bdfb36d58ffe5de75099fa24 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 27 Jan 2025 03:40:24 +0300
Subject: [PATCH 134/753] update button disabled state to depend on recorded
 packets

---
 src/optionsGuiScheme.tsx        | 6 +++---
 src/packetsReplay.ts            | 7 ++++++-
 src/react/AppStatusProvider.tsx | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 381a70a6..ef7fc1c6 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -438,14 +438,14 @@ export const guiOptionsScheme: {
           onClick={() => {
             packetsReplaceSessionState.active = !active
           }}
-        >{active ? 'Disable' : 'Enable'} Packets Replay</Button>
+        >{active ? 'Stop' : 'Start'} Packets Replay Logging</Button>
       },
     },
     {
       custom () {
-        const { active } = useSnapshot(packetsReplaceSessionState)
+        const { active, hasRecordedPackets } = useSnapshot(packetsReplaceSessionState)
         return <Button
-          disabled={!active}
+          disabled={!hasRecordedPackets}
           inScreen
           onClick={() => {
             void downloadPacketsReplay()
diff --git a/src/packetsReplay.ts b/src/packetsReplay.ts
index c3cc18d9..615f7782 100644
--- a/src/packetsReplay.ts
+++ b/src/packetsReplay.ts
@@ -4,9 +4,10 @@ import { options } from './optionsStorage'
 
 export const packetsReplaceSessionState = proxy({
   active: false,
+  hasRecordedPackets: false
 })
 
-const replayLogger = new PacketsLogger()
+export const replayLogger = new PacketsLogger()
 
 const isBufferData = (data: any): boolean => {
   if (Buffer.isBuffer(data) || data instanceof Uint8Array) return true
@@ -35,11 +36,13 @@ const processPacketData = (data: any): any => {
 export default () => {
   customEvents.on('mineflayerBotCreated', () => {
     replayLogger.contents = ''
+    packetsReplaceSessionState.hasRecordedPackets = false
     const handleServerPacket = (data, { name, state = bot._client.state }) => {
       if (!packetsReplaceSessionState.active) {
         return
       }
       replayLogger.log(true, { name, state }, processPacketData(data))
+      packetsReplaceSessionState.hasRecordedPackets = true
     }
     bot._client.on('packet', handleServerPacket)
     bot._client.on('packet_name' as any, (name, data) => {
@@ -51,6 +54,7 @@ export default () => {
         return
       }
       replayLogger.log(false, { name, state: bot._client.state }, processPacketData(data))
+      packetsReplaceSessionState.hasRecordedPackets = true
     })
   })
 }
@@ -61,3 +65,4 @@ export const downloadPacketsReplay = async () => {
   a.download = `packets-replay-${new Date().toISOString()}.txt`
   a.click()
 }
+globalThis.downloadPacketsReplay = downloadPacketsReplay
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index 8aaa5d70..84d30c4a 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -5,7 +5,7 @@ import { resetLocalStorageWorld } from '../browserfs'
 import { fsState } from '../loadSave'
 import { guessProblem } from '../errorLoadingScreenHelpers'
 import { ConnectOptions } from '../connect'
-import { downloadPacketsReplay, packetsReplaceSessionState } from '../packetsReplay'
+import { downloadPacketsReplay, packetsReplaceSessionState, replayLogger } from '../packetsReplay'
 import { getProxyDetails } from '../microsoftAuthflow'
 import AppStatus from './AppStatus'
 import DiveTransition from './DiveTransition'
@@ -121,7 +121,7 @@ export default () => {
         <>
           {displayAuthButton && <Button label='Authenticate' onClick={authReconnectAction} />}
           {displayVpnButton && <PossiblyVpnBypassProxyButton reconnect={reconnect} />}
-          {replayActive && <Button label='Download Packets Replay' onClick={downloadPacketsReplay} />}
+          {replayActive && <Button label={`Download Packets Replay ${replayLogger.contents.split('\n').length}L`} onClick={downloadPacketsReplay} />}
         </>
       }
     >

From 491b5d66c5f7419ce910efe316f3e6fb356bf523 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 27 Jan 2025 03:48:42 +0300
Subject: [PATCH 135/753] feat: implement player skin display based on texture
 properties from server packets eg your custom plugin skins!

---
 prismarine-viewer/viewer/lib/entities.ts | 12 +++++++
 src/entities.ts                          | 28 ++++++++++++++++
 src/generatedServerPackets.ts            | 41 ++++--------------------
 3 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index efc80b5d..5e7a96bf 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -276,8 +276,20 @@ export class Entities extends EventEmitter {
   // fixme workaround
   defaultSteveTexture
 
+  usernamePerSkinUrlsCache = {} as Record<string, { skinUrl?: string, capeUrl?: string }>
+
   // true means use default skin url
   updatePlayerSkin (entityId: string | number, username: string | undefined, skinUrl: string | true, capeUrl: string | true | undefined = undefined) {
+    if (username) {
+      if (typeof skinUrl === 'string' || typeof capeUrl === 'string') this.usernamePerSkinUrlsCache[username] = {}
+      if (typeof skinUrl === 'string') this.usernamePerSkinUrlsCache[username].skinUrl = skinUrl
+      if (typeof capeUrl === 'string') this.usernamePerSkinUrlsCache[username].capeUrl = capeUrl
+      if (skinUrl === true) {
+        skinUrl = this.usernamePerSkinUrlsCache[username]?.skinUrl ?? skinUrl
+      }
+      capeUrl ??= this.usernamePerSkinUrlsCache[username]?.capeUrl
+    }
+
     let playerObject = this.getPlayerObject(entityId)
     if (!playerObject) return
     // const username = this.entities[entityId].username
diff --git a/src/entities.ts b/src/entities.ts
index 26641f5a..4e3a73fb 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -153,4 +153,32 @@ customEvents.on('gameLoaded', () => {
   watchValue(options, o => {
     viewer.entities.setDebugMode(o.showChunkBorders ? 'basic' : 'none')
   })
+
+  // Texture override from packet properties
+  bot._client.on('player_info', (packet) => {
+    for (const player of packet.data) {
+      const textureProperty = player.properties?.find(prop => prop.name === 'textures')
+      if (textureProperty) {
+        try {
+          const textureData = JSON.parse(Buffer.from(textureProperty.value, 'base64').toString())
+          const skinUrl = textureData.textures?.SKIN?.url
+          const capeUrl = textureData.textures?.CAPE?.url
+
+          // Find entity with matching UUID and update skin
+          let entityId = ''
+          for (const [entId, entity] of Object.entries(bot.entities)) {
+            if (entity.uuid === player.UUID) {
+              entityId = entId
+              break
+            }
+          }
+          // even if not found, still record to cache
+          viewer.entities.updatePlayerSkin(entityId, player.name, skinUrl, capeUrl)
+        } catch (err) {
+          console.error('Error decoding player texture:', err)
+        }
+      }
+    }
+
+  })
 })
diff --git a/src/generatedServerPackets.ts b/src/generatedServerPackets.ts
index 1c7ffa9e..3b3ce018 100644
--- a/src/generatedServerPackets.ts
+++ b/src/generatedServerPackets.ts
@@ -6,14 +6,7 @@ export interface ClientOnMap {
   } | /** 1.12.2 */ {
     keepAliveId: bigint;
   };
-  login: /** 1.7 */ {
-    entityId: number;
-    gameMode: number;
-    dimension: number;
-    difficulty: number;
-    maxPlayers: number;
-    levelType: string;
-  } | /** 1.8 */ {
+  login:/** 1.8 */ {
     entityId: number;
     gameMode: number;
     dimension: number;
@@ -148,9 +141,7 @@ export interface ClientOnMap {
     entityId: number;
     equipments: any;
   };
-  spawn_position: /** 1.7 */ {
-    location: any;
-  } | /** 1.8 */ {
+  spawn_position:/** 1.8 */ {
     location: { x: number, y: number, z: number };
   } | /** 1.17 */ {
     location: { x: number, y: number, z: number };
@@ -215,14 +206,7 @@ export interface ClientOnMap {
     death: any;
     portalCooldown: number;
   };
-  position: /** 1.7 */ {
-    x: number;
-    y: number;
-    z: number;
-    yaw: number;
-    pitch: number;
-    onGround: boolean;
-  } | /** 1.8 */ {
+  position: /** 1.8 */ {
     x: number;
     y: number;
     z: number;
@@ -905,11 +889,7 @@ export interface ClientOnMap {
   statistics: /** 1.7 */ {
     entries: any;
   };
-  player_info: /** 1.7 */ {
-    playerName: string;
-    online: boolean;
-    ping: number;
-  } | /** 1.8 */ {
+  player_info: /** 1.8 */ {
     action: number;
     data: any;
   };
@@ -926,22 +906,13 @@ export interface ClientOnMap {
     length: number;
     matches: any;
   };
-  scoreboard_objective: /** 1.7 */ {
-    name: string;
-    displayText: string;
-    action: number;
-  } | /** 1.8 */ {
+  scoreboard_objective:/** 1.8 */ {
     name: string;
     action: number;
     displayText: any;
     type: any;
   };
-  scoreboard_score: /** 1.7 */ {
-    itemName: string;
-    action: number;
-    scoreName: any;
-    value: any;
-  } | /** 1.8 */ {
+  scoreboard_score:/** 1.8 */ {
     itemName: string;
     action: number;
     scoreName: string;

From 5694d14d58b7379a18602fd1f24b543e5d0e6ab1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 27 Jan 2025 05:57:58 +0300
Subject: [PATCH 136/753] feat: add camera shake effect when player takes
 damage

---
 prismarine-viewer/viewer/lib/viewer.ts        |   2 +-
 .../viewer/lib/worldrendererCommon.ts         |   1 +
 .../viewer/lib/worldrendererThree.ts          |   2 +-
 src/globals.d.ts                              |   1 +
 src/index.ts                                  |   1 +
 src/mineflayer/cameraShake.ts                 | 108 ++++++++++++++++++
 6 files changed, 113 insertions(+), 2 deletions(-)
 create mode 100644 src/mineflayer/cameraShake.ts

diff --git a/prismarine-viewer/viewer/lib/viewer.ts b/prismarine-viewer/viewer/lib/viewer.ts
index c90bc811..c7dd7fe5 100644
--- a/prismarine-viewer/viewer/lib/viewer.ts
+++ b/prismarine-viewer/viewer/lib/viewer.ts
@@ -159,7 +159,7 @@ export class Viewer {
     }))
   }
 
-  setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number, roll = 0) {
+  setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number) {
     const cam = this.cameraObjectOverride || this.camera
     let yOffset = this.getMineflayerBot()?.entity?.eyeHeight ?? this.playerHeight
     if (this.isSneaking) yOffset -= 0.3
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
index 6cc34285..b456b27a 100644
--- a/prismarine-viewer/viewer/lib/worldrendererCommon.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -54,6 +54,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   worldConfig = { minY: 0, worldHeight: 256 }
   // todo need to cleanup
   material = new THREE.MeshLambertMaterial({ vertexColors: true, transparent: true, alphaTest: 0.1 })
+  cameraRoll = 0
 
   @worldCleanup()
   active = false
diff --git a/prismarine-viewer/viewer/lib/worldrendererThree.ts b/prismarine-viewer/viewer/lib/worldrendererThree.ts
index 36008797..1845c98c 100644
--- a/prismarine-viewer/viewer/lib/worldrendererThree.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererThree.ts
@@ -232,7 +232,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     if (pos) {
       new tweenJs.Tween(this.camera.position).to({ x: pos.x, y: pos.y, z: pos.z }, 50).start()
     }
-    this.camera.rotation.set(pitch, yaw, 0, 'ZYX')
+    this.camera.rotation.set(pitch, yaw, this.cameraRoll, 'ZYX')
   }
 
   render () {
diff --git a/src/globals.d.ts b/src/globals.d.ts
index 7fc9baec..10d05fa0 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -26,6 +26,7 @@ declare const customEvents: import('typed-emitter').default<{
   mineflayerBotCreated (): void
   search (q: string): void
   activateItem (item: Item, slot: number, offhand: boolean): void
+  hurtAnimation (): void
 }>
 declare const beforeRenderFrame: Array<() => void>
 
diff --git a/src/index.ts b/src/index.ts
index b221f18e..b68f3d2d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -6,6 +6,7 @@ import './devtools'
 import './entities'
 import './globalDomListeners'
 import './mineflayer/maps'
+import './mineflayer/cameraShake'
 import initCollisionShapes from './getCollisionInteractionShapes'
 import { onGameLoad } from './inventoryWindows'
 import { supportedVersions } from 'minecraft-protocol'
diff --git a/src/mineflayer/cameraShake.ts b/src/mineflayer/cameraShake.ts
new file mode 100644
index 00000000..020908b0
--- /dev/null
+++ b/src/mineflayer/cameraShake.ts
@@ -0,0 +1,108 @@
+import { downloadSoundsIfNeeded } from '../soundSystem'
+import * as THREE from 'three'
+
+class CameraShake {
+  private rollAngle = 0
+  private damageRollAmount = 5
+  private damageAnimDuration = 200
+  private rollAnimation?: { startTime: number, startRoll: number, targetRoll: number, duration: number, returnToZero?: boolean }
+
+  constructor() {
+    this.rollAngle = 0
+  }
+
+  shakeFromDamage() {
+    // Add roll animation
+    const startRoll = this.rollAngle
+    const targetRoll = startRoll + (Math.random() < 0.5 ? -1 : 1) * this.damageRollAmount
+
+    this.rollAnimation = {
+      startTime: performance.now(),
+      startRoll,
+      targetRoll,
+      duration: this.damageAnimDuration / 2
+    }
+  }
+
+  update() {
+    // Update roll animation
+    if (this.rollAnimation) {
+      const now = performance.now()
+      const elapsed = now - this.rollAnimation.startTime
+      const progress = Math.min(elapsed / this.rollAnimation.duration, 1)
+
+      if (this.rollAnimation.returnToZero) {
+        // Ease back to zero
+        this.rollAngle = this.rollAnimation.startRoll * (1 - this.easeInOut(progress))
+        if (progress === 1) {
+          this.rollAnimation = undefined
+        }
+      } else {
+        // Initial roll
+        this.rollAngle = this.rollAnimation.startRoll + (this.rollAnimation.targetRoll - this.rollAnimation.startRoll) * this.easeOut(progress)
+        if (progress === 1) {
+          // Start return to zero animation
+          this.rollAnimation = {
+            startTime: now,
+            startRoll: this.rollAngle,
+            targetRoll: 0,
+            duration: this.damageAnimDuration / 2,
+            returnToZero: true
+          }
+        }
+      }
+    }
+
+    // Apply roll in camera's local space to maintain consistent left/right roll
+    const camera = viewer.camera
+    const rollQuat = new THREE.Quaternion()
+    rollQuat.setFromAxisAngle(new THREE.Vector3(0, 0, 1), THREE.MathUtils.degToRad(this.rollAngle))
+
+    // Get camera's current rotation
+    const camQuat = new THREE.Quaternion()
+    camera.getWorldQuaternion(camQuat)
+
+    // Apply roll after camera rotation
+    const finalQuat = camQuat.multiply(rollQuat)
+    camera.setRotationFromQuaternion(finalQuat)
+  }
+
+  private easeOut(t: number): number {
+    return 1 - (1 - t) * (1 - t)
+  }
+
+  private easeInOut(t: number): number {
+    return t < 0.5 ? 2 * t * t : 1 - Math.pow(-2 * t + 2, 2) / 2
+  }
+}
+
+let cameraShake: CameraShake
+
+customEvents.on('mineflayerBotCreated', () => {
+  if (!cameraShake) {
+    cameraShake = new CameraShake()
+    beforeRenderFrame.push(() => {
+      cameraShake.update()
+    })
+  }
+
+  customEvents.on('hurtAnimation', () => {
+    cameraShake.shakeFromDamage()
+  })
+
+  bot._client.on('hurt_animation', () => {
+    customEvents.emit('hurtAnimation')
+  })
+  bot.on('entityHurt', ({ id }) => {
+    if (id === bot.entity.id) {
+      customEvents.emit('hurtAnimation')
+    }
+  })
+  let { health } = bot
+  bot.on('health', () => {
+    if (bot.health < health) {
+      customEvents.emit('hurtAnimation')
+    }
+    health = bot.health
+  })
+})

From 382a685b65ff7c43d898272e2f3e6d393dcfd7da Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 27 Jan 2025 06:10:31 +0300
Subject: [PATCH 137/753] fix: fix light and bubble_column blocks rendering,
 fix waterlogging for ocean vegetation (plants)

---
 .../viewer/lib/mesher/test/tests.test.ts          |  2 +-
 prismarine-viewer/viewer/lib/mesher/world.ts      | 15 +++++++++++++++
 .../viewer/lib/mesher/worldConstants.ts           |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts b/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
index d12b1755..82cafb6d 100644
--- a/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
+++ b/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
@@ -17,7 +17,7 @@ const addPositions = [
 
 test('Known blocks are not rendered', () => {
   const { mesherWorld, getGeometry, pos, mcData } = setup(lastVersion, addPositions as any)
-  const ignoreAsExpected = new Set([...INVISIBLE_BLOCKS, 'water', 'lava', 'moving_piston', 'light'])
+  const ignoreAsExpected = new Set([...INVISIBLE_BLOCKS, 'water', 'lava'])
 
   let time = 0
   let times = 0
diff --git a/prismarine-viewer/viewer/lib/mesher/world.ts b/prismarine-viewer/viewer/lib/mesher/world.ts
index be764681..f6094e2c 100644
--- a/prismarine-viewer/viewer/lib/mesher/world.ts
+++ b/prismarine-viewer/viewer/lib/mesher/world.ts
@@ -10,6 +10,14 @@ import { INVISIBLE_BLOCKS } from './worldConstants'
 
 const ignoreAoBlocks = Object.keys(moreBlockDataGeneratedJson.noOcclusions)
 
+const ALWAYS_WATERLOGGED = new Set([
+  'seagrass',
+  'tall_seagrass',
+  'kelp',
+  'kelp_plant',
+  'bubble_column'
+])
+
 function columnKey (x, z) {
   return `${x},${z}`
 }
@@ -160,6 +168,12 @@ export class World {
     if (block.models === undefined && blockProvider) {
       if (!attr) throw new Error('attr is required')
       const props = block.getProperties()
+
+      // Patch waterlogged property for ocean plants
+      if (ALWAYS_WATERLOGGED.has(block.name)) {
+        props.waterlogged = 'true'
+      }
+
       try {
         // fixme
         if (this.preflat) {
@@ -194,6 +208,7 @@ export class World {
 
     if (block.name === 'flowing_water') block.name = 'water'
     if (block.name === 'flowing_lava') block.name = 'lava'
+    if (block.name === 'bubble_column') block.name = 'water' // TODO need to distinguish between water and bubble column
     // block.position = loc // it overrides position of all currently loaded blocks
     block.biome = this.biomeCache[column.getBiome(locInChunk)] ?? this.biomeCache[1] ?? this.biomeCache[0]
     if (block.name === 'redstone_ore') block.transparent = false
diff --git a/prismarine-viewer/viewer/lib/mesher/worldConstants.ts b/prismarine-viewer/viewer/lib/mesher/worldConstants.ts
index 75f08e89..6aa0e0fc 100644
--- a/prismarine-viewer/viewer/lib/mesher/worldConstants.ts
+++ b/prismarine-viewer/viewer/lib/mesher/worldConstants.ts
@@ -1 +1 @@
-export const INVISIBLE_BLOCKS = new Set(['air', 'void_air', 'cave_air', 'barrier'])
+export const INVISIBLE_BLOCKS = new Set(['air', 'void_air', 'cave_air', 'barrier', 'light', 'moving_piston'])

From 463b9ef80ab8b72cfb3df98432c2aff8c2af9bdf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 27 Jan 2025 06:19:02 +0300
Subject: [PATCH 138/753] feat: enable global arrows navigation in server/saves
 list, always focus on first server

---
 src/react/ServersListProvider.tsx |  3 ++-
 src/react/Singleplayer.tsx        | 29 +++++++++++++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index c4777d10..fa9242a2 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -145,7 +145,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
   const [defaultUsername, _setDefaultUsername] = useState(localStorage['username'] ?? (`mcrafter${Math.floor(Math.random() * 1000)}`))
   const [authenticatedAccounts, _setAuthenticatedAccounts] = useState<AuthenticatedAccount[]>(JSON.parse(localStorage['authenticatedAccounts'] || '[]'))
   const [quickConnectIp, setQuickConnectIp] = useState('')
-  const [selectedIndex, setSelectedIndex] = useState(-1)
+  const [selectedIndex, setSelectedIndex] = useState(0)
 
   const setAuthenticatedAccounts = (newState: typeof authenticatedAccounts) => {
     _setAuthenticatedAccounts(newState)
@@ -413,6 +413,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
     onRowSelect={(_, i) => {
       setSelectedIndex(i)
     }}
+    selectedRow={selectedIndex}
   />
   return <>
     {serversListJsx}
diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index e8fa8224..88aa04bf 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -25,9 +25,10 @@ export interface WorldProps {
   worldNameRight?: string
   onFocus?: (name: string) => void
   onInteraction?(interaction: 'enter' | 'space')
+  elemRef?: React.Ref<HTMLDivElement>
 }
 
-const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus, onInteraction, iconSrc, formattedTextOverride, worldNameRight }: WorldProps) => {
+const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus, onInteraction, iconSrc, formattedTextOverride, worldNameRight, elemRef }: WorldProps & { ref?: React.Ref<HTMLDivElement> }) => {
   const timeRelativeFormatted = useMemo(() => {
     if (!lastPlayed) return ''
     const formatter = new Intl.RelativeTimeFormat('en', { numeric: 'auto' })
@@ -47,6 +48,7 @@ const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus,
   }, [size])
 
   return <div
+    ref={elemRef}
     className={classNames(styles.world_root, isFocused ? styles.world_focused : undefined)} tabIndex={0} onFocus={() => onFocus?.(name)} onKeyDown={(e) => {
       if (e.code === 'Enter' || e.code === 'Space') {
         e.preventDefault()
@@ -92,6 +94,7 @@ interface Props {
   onGeneralAction (action: 'cancel' | 'create'): void
   onRowSelect? (name: string, index: number): void
   defaultSelectedRow?: number
+  selectedRow?: number
   listStyle?: React.CSSProperties
   setListHovered?: (hovered: boolean) => void
   secondRowStyles?: React.CSSProperties
@@ -116,6 +119,7 @@ export default ({
   hidden,
   onRowSelect,
   defaultSelectedRow,
+  selectedRow,
   listStyle,
   setListHovered,
   secondRowStyles,
@@ -123,9 +127,10 @@ export default ({
 }: Props) => {
   const containerRef = useRef<any>()
   const firstButton = useRef<HTMLButtonElement>(null)
+  const worldRefs = useRef<Record<string, HTMLDivElement | null>>({})
 
   useTypedEventListener(window, 'keydown', (e) => {
-    if ((e.code === 'ArrowDown' || e.code === 'ArrowUp') && e.ctrlKey) {
+    if ((e.code === 'ArrowDown' || e.code === 'ArrowUp')) {
       e.preventDefault()
       const dir = e.code === 'ArrowDown' ? 1 : -1
       const elements = focusable(containerRef.current)
@@ -137,12 +142,21 @@ export default ({
   })
 
   const [search, setSearch] = useState('')
-  const [focusedWorld, setFocusedWorld] = useState(defaultSelectedRow ? worldData?.[defaultSelectedRow]?.name ?? '' : '')
+  const [focusedWorld, setFocusedWorld] = useState(defaultSelectedRow === undefined ? '' : worldData?.[defaultSelectedRow]?.name ?? '')
 
   useEffect(() => {
     setFocusedWorld('')
   }, [activeProvider])
 
+  useEffect(() => {
+    if (selectedRow === undefined) return
+    const worldName = worldData?.[selectedRow]?.name
+    setFocusedWorld(worldName ?? '')
+    if (worldName) {
+      worldRefs.current[worldName]?.focus()
+    }
+  }, [selectedRow, worldData])
+
   const onRowSelectHandler = (name: string, index: number) => {
     onRowSelect?.(name, index)
     setFocusedWorld(name)
@@ -186,7 +200,14 @@ export default ({
             worldData
               ? worldData.filter(data => data.title.toLowerCase().includes(search.toLowerCase())).map(({ name, size, detail, ...rest }, index) => (
                 <World
-                  {...rest} size={size} name={name} onFocus={row => onRowSelectHandler(row, index)} isFocused={focusedWorld === name} key={name} onInteraction={(interaction) => {
+                  {...rest}
+                  size={size}
+                  name={name}
+                  elemRef={el => worldRefs.current[name] = el}
+                  onFocus={row => onRowSelectHandler(row, index)}
+                  isFocused={focusedWorld === name}
+                  key={name}
+                  onInteraction={(interaction) => {
                     if (interaction === 'enter') onWorldAction('load', name)
                     else if (interaction === 'space') firstButton.current?.focus()
                   }}

From ccc1d760e063f3218b1863ccea7c922acd0a68b6 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 27 Jan 2025 06:19:06 +0300
Subject: [PATCH 139/753] run dedupe

---
 pnpm-lock.yaml | 56 +++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 727529eb..7a3a5ef1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -138,7 +138,7 @@ importers:
         version: 3.83.1
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13)
@@ -428,7 +428,7 @@ importers:
         version: 1.3.6
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
         version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
@@ -6456,10 +6456,10 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83}
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76}
     version: 1.54.0
-    engines: {node: '>=14'}
+    engines: {node: '>=22'}
 
   minecraft-wrap@1.5.1:
     resolution: {integrity: sha512-7DZ2WhrcRD3fUMau84l9Va0KWzV92SHNdB7mnNdNhgXID2aW6pjWuYPZi8MepEBemA4XKKdnDx7HmhTbkoiR8A==}
@@ -7160,9 +7160,9 @@ packages:
       minecraft-data: 3.83.1
       prismarine-registry: ^1.1.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3}
-    version: 1.20.0
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9}
+    version: 1.21.0
 
   prismarine-chat@1.10.1:
     resolution: {integrity: sha512-XukYcuueuhDxzEXG7r8BZyt6jOObrPPB4JESCgb+/XenB9nExoSHF8eTQWWj8faKPLqm1dRQaYwFJlNBlJZJUw==}
@@ -7206,8 +7206,8 @@ packages:
   prismarine-windows@2.9.0:
     resolution: {integrity: sha512-fm4kOLjGFPov7TEJRmXHoiPabxIQrG36r2mDjlNxfkcLfMHFb3/1ML6mp4iRQa7wL0GK4DIAyiBqCWoeWDxARg==}
 
-  prismarine-world@https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be}
+  prismarine-world@https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c}
     version: 3.6.3
     engines: {node: '>=8.0.0'}
 
@@ -12780,7 +12780,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.2.3
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -12790,7 +12790,7 @@ snapshots:
       prismarine-nbt: 2.5.0
       prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b(minecraft-data@3.83.1)
       prismarine-windows: 2.9.0
-      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
+      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.2.0
       random-seed: 0.3.0
       range: 0.0.3
@@ -16937,7 +16937,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.12
@@ -16997,7 +16997,7 @@ snapshots:
   mineflayer-pathfinder@2.4.4:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-entity: 2.3.1
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
@@ -17007,9 +17007,9 @@ snapshots:
   mineflayer@4.25.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.10.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
@@ -17019,7 +17019,7 @@ snapshots:
       prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
       prismarine-registry: 1.11.0
       prismarine-windows: 2.9.0
-      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
+      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       protodef: 1.18.0
       typed-emitter: 1.4.0
       vec3: 0.1.8
@@ -17030,9 +17030,9 @@ snapshots:
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/080aa52c5bd70a5f9c4ecc37480497dd335a9e83(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.10.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
@@ -17042,7 +17042,7 @@ snapshots:
       prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
       prismarine-registry: 1.11.0
       prismarine-windows: 2.9.0
-      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
+      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       protodef: 1.18.0
       typed-emitter: 1.4.0
       vec3: 0.1.8
@@ -17806,7 +17806,7 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-registry: 1.11.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0):
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.83.1
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
@@ -17826,7 +17826,7 @@ snapshots:
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
@@ -17860,10 +17860,10 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b(minecraft-data@3.83.1):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-nbt: 2.5.0
-      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
+      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       uint4: 0.1.2
       vec3: 0.1.8
     transitivePeerDependencies:
@@ -17884,15 +17884,15 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.5.0
 
   prismarine-schematic@1.2.3:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/5fac7911d8b9a648f08466de3af4283b2de763c3(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.5.0
-      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be
+      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.8
 
   prismarine-windows@2.9.0:
@@ -17901,7 +17901,7 @@ snapshots:
       prismarine-registry: 1.11.0
       typed-emitter: 2.1.0
 
-  prismarine-world@https://codeload.github.com/zardoy/prismarine-world/tar.gz/6221e049e2ad0f508edc23c7f5bda7fd6d9566be:
+  prismarine-world@https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c:
     dependencies:
       vec3: 0.1.8
 

From 6d91ad3d417bc424a8611efed699f3e57ebe94ba Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 27 Jan 2025 06:21:42 +0300
Subject: [PATCH 140/753] add lint-fix script

---
 package.json                  |  1 +
 src/mineflayer/cameraShake.ts | 19 +++++++++----------
 src/react/Singleplayer.tsx    |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 9f5ea0f8..1d2eb062 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "prod-start": "node server.js --prod",
     "test-mc-server": "tsx cypress/minecraft-server.mjs",
     "lint": "eslint \"{src,cypress,prismarine-viewer}/**/*.{ts,js,jsx,tsx}\"",
+    "lint-fix": "pnpm lint --fix",
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build && node scripts/build.js moveStorybookFiles",
     "start-experiments": "vite --config experiments/vite.config.ts --host",
diff --git a/src/mineflayer/cameraShake.ts b/src/mineflayer/cameraShake.ts
index 020908b0..043eb207 100644
--- a/src/mineflayer/cameraShake.ts
+++ b/src/mineflayer/cameraShake.ts
@@ -1,17 +1,16 @@
-import { downloadSoundsIfNeeded } from '../soundSystem'
 import * as THREE from 'three'
 
 class CameraShake {
   private rollAngle = 0
-  private damageRollAmount = 5
-  private damageAnimDuration = 200
+  private get damageRollAmount () { return 5 }
+  private get damageAnimDuration () { return 200 }
   private rollAnimation?: { startTime: number, startRoll: number, targetRoll: number, duration: number, returnToZero?: boolean }
 
-  constructor() {
+  constructor () {
     this.rollAngle = 0
   }
 
-  shakeFromDamage() {
+  shakeFromDamage () {
     // Add roll animation
     const startRoll = this.rollAngle
     const targetRoll = startRoll + (Math.random() < 0.5 ? -1 : 1) * this.damageRollAmount
@@ -24,7 +23,7 @@ class CameraShake {
     }
   }
 
-  update() {
+  update () {
     // Update roll animation
     if (this.rollAnimation) {
       const now = performance.now()
@@ -54,7 +53,7 @@ class CameraShake {
     }
 
     // Apply roll in camera's local space to maintain consistent left/right roll
-    const camera = viewer.camera
+    const { camera } = viewer
     const rollQuat = new THREE.Quaternion()
     rollQuat.setFromAxisAngle(new THREE.Vector3(0, 0, 1), THREE.MathUtils.degToRad(this.rollAngle))
 
@@ -67,12 +66,12 @@ class CameraShake {
     camera.setRotationFromQuaternion(finalQuat)
   }
 
-  private easeOut(t: number): number {
+  private easeOut (t: number): number {
     return 1 - (1 - t) * (1 - t)
   }
 
-  private easeInOut(t: number): number {
-    return t < 0.5 ? 2 * t * t : 1 - Math.pow(-2 * t + 2, 2) / 2
+  private easeInOut (t: number): number {
+    return t < 0.5 ? 2 * t * t : 1 - (-2 * t + 2) ** 2 / 2
   }
 }
 
diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index 88aa04bf..9305451a 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -203,7 +203,7 @@ export default ({
                   {...rest}
                   size={size}
                   name={name}
-                  elemRef={el => worldRefs.current[name] = el}
+                  elemRef={el => { worldRefs.current[name] = el }}
                   onFocus={row => onRowSelectHandler(row, index)}
                   isFocused={focusedWorld === name}
                   key={name}

From 5a948828b73b939dd62b9d6c0f1935734fe4b136 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Mon, 27 Jan 2025 14:35:33 +0300
Subject: [PATCH 141/753] Should fix test

---
 prismarine-viewer/viewer/lib/mesher/test/tests.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts b/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
index 82cafb6d..9ebd6604 100644
--- a/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
+++ b/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
@@ -49,7 +49,6 @@ test('Known blocks are not rendered', () => {
   // TODO resolve creaking_heart issue (1.21.3)
   expect(missingBlocks).toMatchInlineSnapshot(`
     {
-      "bubble_column": true,
       "end_gateway": true,
       "end_portal": true,
       "structure_void": true,

From e6ce6dc2683f13f705ccf0a0e4f925e8e6d3a528 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 27 Jan 2025 06:27:07 +0300
Subject: [PATCH 142/753] feat: enhance OptionButton navigation with shift key
 support for reverse cycling

---
 src/react/OptionsItems.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/react/OptionsItems.tsx b/src/react/OptionsItems.tsx
index efd64743..05109d0b 100644
--- a/src/react/OptionsItems.tsx
+++ b/src/react/OptionsItems.tsx
@@ -82,7 +82,7 @@ export const OptionButton = ({ item }: { item: Extract<OptionMeta, { type: 'togg
   return <Button
     data-setting={item.id}
     label={`${item.text}: ${valuesTitlesMap[optionValue]}`}
-    onClick={async () => {
+    onClick={async (event) => {
       if (disabledReason) {
         await showOptionsModal(`The option is unavailable. ${disabledReason}`, [])
         return
@@ -106,7 +106,10 @@ export const OptionButton = ({ item }: { item: Extract<OptionMeta, { type: 'togg
         if (currentIndex === -1) {
           options[item.id!] = getOptionValue(values[0])
         } else {
-          options[item.id!] = getOptionValue(values[(currentIndex + 1) % values.length])
+          const nextIndex = event.shiftKey
+            ? (currentIndex - 1 + values.length) % values.length
+            : (currentIndex + 1) % values.length
+          options[item.id!] = getOptionValue(values[nextIndex])
         }
       } else {
         options[item.id!] = !options[item.id!]

From 91ef3ccd3cc4348718651eff0f01be500ae338b4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 27 Jan 2025 19:49:27 +0300
Subject: [PATCH 143/753] wip colored button options

---
 prismarine-viewer/examples/scenes/main.ts | 2 +-
 src/react/Button.tsx                      | 4 +++-
 src/react/OptionsItems.tsx                | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/prismarine-viewer/examples/scenes/main.ts b/prismarine-viewer/examples/scenes/main.ts
index 1fe801ee..d7d2f8e0 100644
--- a/prismarine-viewer/examples/scenes/main.ts
+++ b/prismarine-viewer/examples/scenes/main.ts
@@ -295,7 +295,7 @@ class MainScene extends BasePlaygroundScene {
       }
     }
 
-    worldView!.setBlockStateId(this.targetPos, block.stateId!)
+    worldView!.setBlockStateId(this.targetPos, block.stateId)
     console.log('up stateId', block.stateId)
     this.params.metadata = block.metadata
     this.metadataGui.updateDisplay()
diff --git a/src/react/Button.tsx b/src/react/Button.tsx
index 10ff2fb0..14ecc38c 100644
--- a/src/react/Button.tsx
+++ b/src/react/Button.tsx
@@ -8,6 +8,7 @@ import PixelartIcon from './PixelartIcon'
 
 interface Props extends React.ComponentProps<'button'> {
   label?: string
+  postLabel?: React.ReactNode
   icon?: string
   children?: React.ReactNode
   inScreen?: boolean
@@ -22,7 +23,7 @@ export const ButtonProvider: FC<{ children, onClick }> = ({ children, onClick })
   return <ButtonContext.Provider value={{ onClick }}>{children}</ButtonContext.Provider>
 }
 
-export default (({ label, icon, children, inScreen, rootRef, type = 'button', ...args }) => {
+export default (({ label, icon, children, inScreen, rootRef, type = 'button', postLabel, ...args }) => {
   const ctx = useContext(ButtonContext)
 
   const onClick = (e) => {
@@ -42,6 +43,7 @@ export default (({ label, icon, children, inScreen, rootRef, type = 'button', ..
     <button ref={rootRef} {...args} className={classNames(buttonCss.button, args.className)} onClick={onClick} type={type}>
       {icon && <PixelartIcon className={buttonCss.icon} iconName={icon} />}
       {label}
+      {postLabel}
       {children}
     </button>
   </SharedHudVars>
diff --git a/src/react/OptionsItems.tsx b/src/react/OptionsItems.tsx
index 05109d0b..bc431bd2 100644
--- a/src/react/OptionsItems.tsx
+++ b/src/react/OptionsItems.tsx
@@ -63,6 +63,8 @@ export const OptionButton = ({ item }: { item: Extract<OptionMeta, { type: 'togg
   const valuesTitlesMap = useMemo(() => {
     if (!item.values) {
       return {
+        // true: <span style={{ color: 'lime' }}>ON</span>,
+        // false: <span style={{ color: 'red' }}>OFF</span>,
         true: 'ON',
         false: 'OFF',
       }
@@ -82,6 +84,8 @@ export const OptionButton = ({ item }: { item: Extract<OptionMeta, { type: 'togg
   return <Button
     data-setting={item.id}
     label={`${item.text}: ${valuesTitlesMap[optionValue]}`}
+    // label={`${item.text}:`}
+    // postLabel={valuesTitlesMap[optionValue]}
     onClick={async (event) => {
       if (disabledReason) {
         await showOptionsModal(`The option is unavailable. ${disabledReason}`, [])

From ff36f75e442dab4f73277658931694b868f15baa Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Mon, 27 Jan 2025 23:09:32 +0300
Subject: [PATCH 144/753] fix regression to quick elem re-focus

---
 src/react/Singleplayer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index 9305451a..9378c5b3 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -155,7 +155,7 @@ export default ({
     if (worldName) {
       worldRefs.current[worldName]?.focus()
     }
-  }, [selectedRow, worldData])
+  }, [selectedRow, worldData?.[selectedRow]?.name])
 
   const onRowSelectHandler = (name: string, index: number) => {
     onRowSelect?.(name, index)

From a442acf49a40aab801d9bed286ce8a397e7c99f3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 28 Jan 2025 19:25:22 +0300
Subject: [PATCH 145/753] fix build

---
 src/react/Singleplayer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index 9378c5b3..79c08ab8 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -155,7 +155,7 @@ export default ({
     if (worldName) {
       worldRefs.current[worldName]?.focus()
     }
-  }, [selectedRow, worldData?.[selectedRow]?.name])
+  }, [selectedRow, worldData?.[selectedRow as any]?.name])
 
   const onRowSelectHandler = (name: string, index: number) => {
     onRowSelect?.(name, index)

From 41684bc028f79c847606dd706d902484bcca1ef4 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Tue, 28 Jan 2025 17:42:06 +0100
Subject: [PATCH 146/753] fix: title would not get rendered and rendering times
 be wrong (#254)

---
 src/react/ChatProvider.tsx  |  1 +
 src/react/Title.stories.tsx |  6 +++---
 src/react/Title.tsx         | 19 ++++++++++---------
 src/react/TitleProvider.tsx | 25 +++++++++++++++++++++----
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 892360ce..66d7673f 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -21,6 +21,7 @@ export default () => {
 
   useEffect(() => {
     bot.addListener('message', (jsonMsg, position) => {
+      if (position === 'game_info') return // ignore action bar messages, they are handled by the TitleProvider
       const parts = formatMessage(jsonMsg)
 
       setMessages(m => {
diff --git a/src/react/Title.stories.tsx b/src/react/Title.stories.tsx
index 0bfedae4..5e30d7a2 100644
--- a/src/react/Title.stories.tsx
+++ b/src/react/Title.stories.tsx
@@ -23,9 +23,9 @@ export const Primary: Story = {
       text: 'Action bar text'
     },
     transitionTimes: {
-      fadeIn: 2500,
-      stay: 17_500,
-      fadeOut: 5000
+      fadeIn: 500,
+      stay: 3500,
+      fadeOut: 1000
     }
   }
 }
diff --git a/src/react/Title.tsx b/src/react/Title.tsx
index d8971915..fd53e1c0 100644
--- a/src/react/Title.tsx
+++ b/src/react/Title.tsx
@@ -29,7 +29,8 @@ const Title = ({
   const [mounted, setMounted] = useState(false)
   const [useEnterTransition, setUseEnterTransition] = useState(true)
 
-  const defaultDuration = 500
+  const defaultFadeIn = 500
+  const defaultFadeOut = 1000
   const startStyle = {
     opacity: 1,
     transition: `${transitionTimes.fadeIn}ms ease-in-out all` }
@@ -54,10 +55,10 @@ const Title = ({
     <div className='title-container'>
       <Transition
         in={openTitle}
-        timeout={transitionTimes ? {
-          enter: transitionTimes.fadeIn,
-          exit: transitionTimes.fadeOut,
-        } : defaultDuration}
+        timeout={{
+          enter: transitionTimes?.fadeIn ?? defaultFadeIn,
+          exit: transitionTimes?.fadeOut ?? defaultFadeOut,
+        }}
         mountOnEnter
         unmountOnExit
         enter={useEnterTransition}
@@ -83,10 +84,10 @@ const Title = ({
       </Transition>
       <Transition
         in={openActionBar}
-        timeout={transitionTimes ? {
-          enter: transitionTimes.fadeIn,
-          exit: transitionTimes.fadeOut,
-        } : defaultDuration}
+        timeout={{
+          enter: transitionTimes?.fadeIn ?? defaultFadeIn,
+          exit: transitionTimes?.fadeOut ?? defaultFadeOut,
+        }}
         mountOnEnter
         unmountOnExit
         // enter={useEnterTransition}
diff --git a/src/react/TitleProvider.tsx b/src/react/TitleProvider.tsx
index f19669ec..2023e553 100644
--- a/src/react/TitleProvider.tsx
+++ b/src/react/TitleProvider.tsx
@@ -1,11 +1,13 @@
 import { useEffect, useMemo, useState } from 'react'
+import mojangson from 'mojangson'
+import nbt from 'prismarine-nbt'
 import type { ClientOnMap } from '../generatedServerPackets'
 import Title from './Title'
 import type { AnimationTimes } from './Title'
 
 
 const defaultText: Record<string, any> = { 'text': '' }
-const defaultTimings: AnimationTimes = { fadeIn: 400, stay: 3800, fadeOut: 800 }
+const defaultTimings: AnimationTimes = { fadeIn: 500, stay: 3500, fadeOut: 1000 }
 
 const ticksToMs = (ticks: AnimationTimes) => {
   ticks.fadeIn *= 50
@@ -14,6 +16,20 @@ const ticksToMs = (ticks: AnimationTimes) => {
   return ticks
 }
 
+const getComponent = (input: string | any) => {
+  if (typeof input === 'string') {
+    // raw json is sent
+    return mojangson.simplify(mojangson.parse(input))
+  } else if (input.type === 'string') {
+    // this is used for simple chat components without any special properties
+    return { 'text': input.value }
+  } else if (input.type === 'compound') {
+    // this is used for complex chat components with special properties
+    return nbt.simplify(input)
+  }
+  return input
+}
+
 export default () => {
   const [title, setTitle] = useState<string | Record<string, any>>(defaultText)
   const [subtitle, setSubtitle] = useState<string | Record<string, any>>(defaultText)
@@ -25,14 +41,14 @@ export default () => {
   useMemo(() => {
     // todo move to mineflayer
     bot._client.on('set_title_text', (packet) => {
-      setTitle(JSON.parse(packet.text))
+      setTitle(getComponent(packet.text))
       setOpenTitle(true)
     })
     bot._client.on('set_title_subtitle', (packet) => {
-      setSubtitle(JSON.parse(packet.text))
+      setSubtitle(getComponent(packet.text))
     })
     bot._client.on('action_bar', (packet) => {
-      setActionBar(JSON.parse(packet.text))
+      setActionBar(getComponent(packet.text))
       setOpenActionBar(true)
     })
     bot._client.on('set_title_time', (packet) => {
@@ -51,6 +67,7 @@ export default () => {
 
 
     bot.on('actionBar', (packet) => {
+      setAnimTimes({ fadeIn: 0, stay: 2000, fadeOut: 1000 })
       setActionBar(packet)
       setOpenActionBar(true)
     })

From 062115c42b297639d741e0dff0cb2abc14fb2682 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 28 Jan 2025 21:29:53 +0300
Subject: [PATCH 147/753] feat: try to bring tab attention or focus it when you
 are finally joined the server

---
 src/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/index.ts b/src/index.ts
index b68f3d2d..2f412954 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -685,6 +685,7 @@ async function connect (connectOptions: ConnectOptions) {
   const spawnEarlier = !singleplayer && !p2pMultiplayer
   // don't use spawn event, player can be dead
   bot.once(spawnEarlier ? 'forcedMove' : 'health', () => {
+    window.focus?.()
     errorAbortController.abort()
     const mcData = MinecraftData(bot.version)
     window.PrismarineBlock = PrismarineBlock(mcData.version.minecraftVersion!)

From 3de1089a1c3c9df3c8a6218af4c29cfde23d4a62 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 29 Jan 2025 03:01:08 +0300
Subject: [PATCH 148/753] fix: disable block breaking in adventure (#252)

---
 src/worldInteractions.ts | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/worldInteractions.ts b/src/worldInteractions.ts
index 1134d7f8..9b370613 100644
--- a/src/worldInteractions.ts
+++ b/src/worldInteractions.ts
@@ -192,6 +192,7 @@ class WorldInteraction {
   // todo this shouldnt be done in the render loop, migrate the code to dom events to avoid delays on lags
   update () {
     const inSpectator = bot.game.gameMode === 'spectator'
+    const inAdventure = bot.game.gameMode === 'adventure'
     const entity = getEntityCursor()
     let cursorBlock = inSpectator && !options.showCursorBlockInSpectator ? null : bot.blockAtCursor(5)
     if (entity) {
@@ -199,7 +200,7 @@ class WorldInteraction {
     }
 
     let cursorBlockDiggable = cursorBlock
-    if (cursorBlock && !bot.canDigBlock(cursorBlock) && bot.game.gameMode !== 'creative') cursorBlockDiggable = null
+    if (cursorBlock && (!bot.canDigBlock(cursorBlock) || inAdventure) && bot.game.gameMode !== 'creative') cursorBlockDiggable = null
 
     const cursorChanged = cursorBlock && viewer.world.cursorBlock ? !viewer.world.cursorBlock.equals(cursorBlock.position) : viewer.world.cursorBlock !== cursorBlock
 
@@ -393,6 +394,43 @@ const getDataFromShape = (shape) => {
   return { position, width, height, depth }
 }
 
+// Blocks that can be interacted with in adventure mode
+const activatableBlockPatterns = [
+  // Containers
+  /^(chest|barrel|hopper|dispenser|dropper)$/,
+  /^.*shulker_box$/,
+  /^.*(furnace|smoker)$/,
+  /^(brewing_stand|beacon)$/,
+  // Crafting
+  /^.*table$/,
+  /^(grindstone|stonecutter|loom)$/,
+  /^.*anvil$/,
+  // Redstone
+  /^(lever|repeater|comparator|daylight_detector|observer|note_block|jukebox|bell)$/,
+  // Buttons
+  /^.*button$/,
+  // Doors and trapdoors
+  /^.*door$/,
+  /^.*trapdoor$/,
+  // Functional blocks
+  /^(enchanting_table|lectern|composter|respawn_anchor|lodestone|conduit)$/,
+  /^.*bee.*$/,
+  // Beds
+  /^.*bed$/,
+  // Misc
+  /^(cake|decorated_pot|crafter|trial_spawner|vault)$/
+]
+
+function isBlockActivatable (blockName: string) {
+  return activatableBlockPatterns.some(pattern => pattern.test(blockName))
+}
+
+function isLookingAtActivatableBlock () {
+  const cursorBlock = bot.blockAtCursor(5)
+  if (!cursorBlock) return false
+  return isBlockActivatable(cursorBlock.name)
+}
+
 export const getEntityCursor = () => {
   const entity = bot.nearestEntity((e) => {
     if (e.position.distanceTo(bot.entity.position) <= (bot.game.gameMode === 'creative' ? 5 : 3)) {

From 1f5404be9dc1d9a46ae2bf7684da55434733ff15 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 29 Jan 2025 04:02:21 +0300
Subject: [PATCH 149/753] DOWNLOAD_SOUNDS flag

---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 484d158e..330445f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,9 +6,13 @@ WORKDIR /app
 COPY . /app
 # install pnpm
 RUN npm i -g pnpm@9.0.4
+# Build arguments
+ARG DOWNLOAD_SOUNDS=false
 # TODO need flat --no-root-optional
 RUN node ./scripts/dockerPrepare.mjs
 RUN pnpm i
+# Download sounds if flag is enabled
+RUN if [ "$DOWNLOAD_SOUNDS" = "true" ] ; then node scripts/downloadSoundsMap.mjs ; fi
 
 # TODO for development
 # EXPOSE 9090

From a628f64d375157dfadb24fc86f96b12adc5c815f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 29 Jan 2025 04:03:04 +0300
Subject: [PATCH 150/753] fix: deactivate mouse buttons when window loses focus
 (edge case)

---
 src/worldInteractions.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/worldInteractions.ts b/src/worldInteractions.ts
index 9b370613..3c7e4fa9 100644
--- a/src/worldInteractions.ts
+++ b/src/worldInteractions.ts
@@ -189,8 +189,16 @@ class WorldInteraction {
     }
   }
 
+  beforeUpdateChecks () {
+    if (!document.hasFocus()) {
+      // deactive all buttson
+      this.buttons.fill(false)
+    }
+  }
+
   // todo this shouldnt be done in the render loop, migrate the code to dom events to avoid delays on lags
   update () {
+    this.beforeUpdateChecks()
     const inSpectator = bot.game.gameMode === 'spectator'
     const inAdventure = bot.game.gameMode === 'adventure'
     const entity = getEntityCursor()

From df442338f8d581511d0a9aeb0f3e45df72c4a6eb Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 29 Jan 2025 04:54:51 +0300
Subject: [PATCH 151/753] feat(sounds): Add sound variants and resource pack
 support! (#258)

feat: add in-game music support! Enable it with `options.enableMusic = true`
---
 rsbuild.config.ts                             |   3 +
 scripts/downloadSoundsMap.mjs                 |   2 +-
 scripts/prepareSounds.mjs                     |  92 +++--
 scripts/uploadSoundFiles.ts                   | 109 ++++++
 scripts/uploadSounds.ts                       |  67 ++++
 src/basicSounds.ts                            |  60 ++-
 src/connect.ts                                |   2 +-
 src/index.ts                                  |   2 +-
 src/optionsStorage.ts                         |   1 +
 src/react/SoundMuffler.tsx                    |   2 +-
 src/resourcePack.ts                           |   9 +-
 .../botSoundSystem.ts}                        | 205 +++++------
 src/sounds/musicSystem.ts                     |  33 ++
 src/sounds/soundsMap.ts                       | 347 ++++++++++++++++++
 src/sounds/testSounds.ts                      |   8 +
 15 files changed, 783 insertions(+), 159 deletions(-)
 create mode 100644 scripts/uploadSoundFiles.ts
 create mode 100644 scripts/uploadSounds.ts
 rename src/{soundSystem.ts => sounds/botSoundSystem.ts} (51%)
 create mode 100644 src/sounds/musicSystem.ts
 create mode 100644 src/sounds/soundsMap.ts
 create mode 100644 src/sounds/testSounds.ts

diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 933a6d02..cec3d901 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -103,6 +103,9 @@ const appConfig = defineConfig({
                         configJson.defaultProxy = ':8080'
                     }
                     fs.writeFileSync('./dist/config.json', JSON.stringify({ ...configJson, ...configLocalJson }), 'utf8')
+                    if (fs.existsSync('./generated/sounds.js')) {
+                        fs.copyFileSync('./generated/sounds.js', './dist/sounds.js')
+                    }
                     // childProcess.execSync('./scripts/prepareSounds.mjs', { stdio: 'inherit' })
                     // childProcess.execSync('tsx ./scripts/genMcDataTypes.ts', { stdio: 'inherit' })
                     // childProcess.execSync('tsx ./scripts/genPixelartTypes.ts', { stdio: 'inherit' })
diff --git a/scripts/downloadSoundsMap.mjs b/scripts/downloadSoundsMap.mjs
index 3c335f8f..1e56131c 100644
--- a/scripts/downloadSoundsMap.mjs
+++ b/scripts/downloadSoundsMap.mjs
@@ -1,6 +1,6 @@
 import fs from 'fs'
 
-const url = 'https://github.com/zardoy/minecraft-web-client/raw/sounds-generated/sounds.js'
+const url = 'https://github.com/zardoy/minecraft-web-client/raw/sounds-generated/sounds-v2.js'
 const savePath = 'dist/sounds.js'
 fetch(url).then(res => res.text()).then(data => {
   fs.writeFileSync(savePath, data, 'utf8')
diff --git a/scripts/prepareSounds.mjs b/scripts/prepareSounds.mjs
index 8f3e5bef..f9b8cd60 100644
--- a/scripts/prepareSounds.mjs
+++ b/scripts/prepareSounds.mjs
@@ -10,26 +10,31 @@ import { build } from 'esbuild'
 
 const __dirname = path.dirname(fileURLToPath(new URL(import.meta.url)))
 
-const targetedVersions = ['1.20.1', '1.19.2', '1.18.2', '1.17.1', '1.16.5', '1.15.2', '1.14.4', '1.13.2', '1.12.2', '1.11.2', '1.10.2', '1.9.4', '1.8.9']
+const targetedVersions = ['1.21.1', '1.20.6', '1.20.1', '1.19.2', '1.18.2', '1.17.1', '1.16.5', '1.15.2', '1.14.4', '1.13.2', '1.12.2', '1.11.2', '1.10.2', '1.9.4', '1.8.9']
 
 /** @type {{name, size, hash}[]} */
 let prevSounds = null
 
 const burgerDataUrl = (version) => `https://raw.githubusercontent.com/Pokechu22/Burger/gh-pages/${version}.json`
 const burgerDataPath = './generated/burger.json'
+const EXISTING_CACHE_PATH = './generated/existing-sounds-cache.json'
 
 // const perVersionData: Record<string, { removed: string[],
 
 const soundsPathVersionsRemap = {}
 
-const downloadAllSounds = async () => {
+const downloadAllSoundsAndCreateMap = async () => {
+  let existingSoundsCache = {}
+  try {
+    existingSoundsCache = JSON.parse(await fs.promises.readFile(EXISTING_CACHE_PATH, 'utf8'))
+  } catch (err) {}
   const { versions } = await getVersionList()
   const lastVersion = versions.filter(version => !version.id.includes('w'))[0]
   // if (lastVersion.id !== targetedVersions[0]) throw new Error('last version is not the same as targetedVersions[0], update')
-  for (const targetedVersion of targetedVersions) {
-    const versionData = versions.find(x => x.id === targetedVersion)
-    if (!versionData) throw new Error('no version data for ' + targetedVersion)
-    console.log('Getting assets for version', targetedVersion)
+  for (const version of targetedVersions) {
+    const versionData = versions.find(x => x.id === version)
+    if (!versionData) throw new Error('no version data for ' + version)
+    console.log('Getting assets for version', version)
     const { assetIndex } = await fetch(versionData.url).then((r) => r.json())
     /** @type {{objects: {[a: string]: { size, hash }}}} */
     const index = await fetch(assetIndex.url).then((r) => r.json())
@@ -45,26 +50,30 @@ const downloadAllSounds = async () => {
       const changedSize = soundAssets.filter(x => prevSoundNames.has(x.name) && prevSounds.find(y => y.name === x.name).size !== x.size)
       console.log('changed size', changedSize.map(x => ({ name: x.name, prev: prevSounds.find(y => y.name === x.name).size, curr: x.size })))
       if (addedSounds.length || changedSize.length) {
-        soundsPathVersionsRemap[targetedVersion] = [...addedSounds, ...changedSize].map(x => x.name.replace('minecraft/sounds/', '').replace('.ogg', ''))
+        soundsPathVersionsRemap[version] = [...addedSounds, ...changedSize].map(x => x.name.replace('minecraft/sounds/', '').replace('.ogg', ''))
       }
       if (addedSounds.length) {
-        console.log('downloading new sounds for version', targetedVersion)
-        downloadSounds(addedSounds, targetedVersion + '/')
+        console.log('downloading new sounds for version', version)
+        downloadSounds(version, addedSounds, version + '/')
       }
       if (changedSize.length) {
-        console.log('downloading changed sounds for version', targetedVersion)
-        downloadSounds(changedSize, targetedVersion + '/')
+        console.log('downloading changed sounds for version', version)
+        downloadSounds(version, changedSize, version + '/')
       }
     } else {
-      console.log('downloading sounds for version', targetedVersion)
-      downloadSounds(soundAssets)
+      console.log('downloading sounds for version', version)
+      downloadSounds(version, soundAssets)
     }
     prevSounds = soundAssets
   }
   async function downloadSound({ name, hash, size }, namePath, log) {
+    const cached =
+      !!namePath.replace('.ogg', '.mp3').split('/').reduce((acc, cur) => acc?.[cur], existingSoundsCache.sounds) ||
+      !!namePath.replace('.ogg', '.ogg').split('/').reduce((acc, cur) => acc?.[cur], existingSoundsCache.sounds)
     const savePath = path.resolve(`generated/sounds/${namePath}`)
-    if (fs.existsSync(savePath)) {
+    if (cached || fs.existsSync(savePath)) {
       // console.log('skipped', name)
+      existingSoundsCache.sounds[namePath] = true
       return
     }
     log()
@@ -86,7 +95,12 @@ const downloadAllSounds = async () => {
     }
     writer.close()
   }
-  async function downloadSounds(assets, addPath = '') {
+  async function downloadSounds(version, assets, addPath = '') {
+    if (addPath && existingSoundsCache.sounds[version]) {
+      console.log('using existing sounds for version', version)
+      return
+    }
+    console.log(version, 'have to download', assets.length, 'sounds')
     for (let i = 0; i < assets.length; i += 5) {
       await Promise.all(assets.slice(i, i + 5).map((asset, j) => downloadSound(asset, `${addPath}${asset.name}`, () => {
         console.log('downloading', addPath, asset.name, i + j, '/', assets.length)
@@ -95,6 +109,7 @@ const downloadAllSounds = async () => {
   }
 
   fs.writeFileSync('./generated/soundsPathVersionsRemap.json', JSON.stringify(soundsPathVersionsRemap), 'utf8')
+  fs.writeFileSync(EXISTING_CACHE_PATH, JSON.stringify(existingSoundsCache), 'utf8')
 }
 
 const lightpackOverrideSounds = {
@@ -106,7 +121,8 @@ const lightpackOverrideSounds = {
 // this is not done yet, will be used to select only sounds for bundle (most important ones)
 const isSoundWhitelisted = (name) => name.startsWith('random/') || name.startsWith('note/') || name.endsWith('/say1') || name.endsWith('/death') || (name.startsWith('mob/') && name.endsWith('/step1')) || name.endsWith('/swoop1') || /* name.endsWith('/break1') || */ name.endsWith('dig/stone1')
 
-const ffmpeg = 'C:/Users/Vitaly/Documents/LosslessCut-win-x64/resources/ffmpeg.exe' // will be ffmpeg-static
+// const ffmpeg = 'C:/Users/Vitaly/Documents/LosslessCut-win-x64/resources/ffmpeg.exe' // can be ffmpeg-static
+const ffmpegExec = 'ffmpeg'
 const maintainBitrate = true
 
 const scanFilesDeep = async (root, onOggFile) => {
@@ -127,7 +143,7 @@ const convertSounds = async () => {
   })
 
   const convertSound = async (i) => {
-    const proc = promisify(exec)(`${ffmpeg} -i "${toConvert[i]}" -y -codec:a libmp3lame ${maintainBitrate ? '-qscale:a 2' : ''} "${toConvert[i].replace('.ogg', '.mp3')}"`)
+    const proc = promisify(exec)(`${ffmpegExec} -i "${toConvert[i]}" -y -codec:a libmp3lame ${maintainBitrate ? '-qscale:a 2' : ''} "${toConvert[i].replace('.ogg', '.mp3')}"`)
     // pipe stdout to the console
     proc.child.stdout.pipe(process.stdout)
     await proc
@@ -147,8 +163,8 @@ const getSoundsMap = (burgerData) => {
 }
 
 const writeSoundsMap = async () => {
-  // const burgerData = await fetch(burgerDataUrl(targetedVersions[0])).then((r) => r.json())
-  // fs.writeFileSync(burgerDataPath, JSON.stringify(burgerData[0].sounds), 'utf8')
+  const burgerData = await fetch(burgerDataUrl(targetedVersions[0])).then((r) => r.json())
+  fs.writeFileSync(burgerDataPath, JSON.stringify(burgerData[0].sounds), 'utf8')
 
   const allSoundsMapOutput = {}
   let prevMap
@@ -174,16 +190,22 @@ const writeSoundsMap = async () => {
       // const includeSound = isSoundWhitelisted(firstName)
       // if (!includeSound) continue
       const mostUsedSound = sounds.sort((a, b) => b.weight - a.weight)[0]
-      const targetSound = sounds[0]
       // outputMap[id] = { subtitle, sounds: mostUsedSound }
       // outputMap[id] = { subtitle, sounds }
-      const soundFilePath = `generated/sounds/minecraft/sounds/${targetSound.name}.mp3`
+      // const soundFilePath = `generated/sounds/minecraft/sounds/${targetSound.name}.mp3`
       // if (!fs.existsSync(soundFilePath)) {
       //   console.warn('no sound file', targetSound.name)
       //   continue
       // }
+      let outputUseSoundLine = []
+      const minWeight = sounds.reduce((acc, cur) => cur.weight ? Math.min(acc, cur.weight) : acc, sounds[0].weight ?? 1)
+      if (isNaN(minWeight)) debugger
+      for (const sound of sounds) {
+        if (sound.weight && isNaN(sound.weight)) debugger
+        outputUseSoundLine.push(`${sound.volume ?? 1};${sound.name};${sound.weight ?? minWeight}`)
+      }
       const key = `${id};${name}`
-      outputIdMap[key] = `${targetSound.volume ?? 1};${targetSound.name}`
+      outputIdMap[key] = outputUseSoundLine.join(',')
       if (prevMap && prevMap[key]) {
         keysStats.same++
       } else {
@@ -221,7 +243,7 @@ const makeSoundsBundle = async () => {
 
   const allSoundsMeta = {
     format: 'mp3',
-    baseUrl: 'https://raw.githubusercontent.com/zardoy/minecraft-web-client/sounds-generated/sounds/'
+    baseUrl: `https://raw.githubusercontent.com/${process.env.REPO_SLUG}/sounds/sounds/`
   }
 
   await build({
@@ -235,9 +257,25 @@ const makeSoundsBundle = async () => {
     },
     metafile: true,
   })
+  // copy also to generated/sounds.js
+  fs.copyFileSync('./dist/sounds.js', './generated/sounds.js')
 }
 
-// downloadAllSounds()
-// convertSounds()
-// writeSoundsMap()
-// makeSoundsBundle()
+const action = process.argv[2]
+if (action) {
+  const execFn = {
+    download: downloadAllSoundsAndCreateMap,
+    convert: convertSounds,
+    write: writeSoundsMap,
+    bundle: makeSoundsBundle,
+  }[action]
+
+  if (execFn) {
+    execFn()
+  }
+} else {
+  // downloadAllSoundsAndCreateMap()
+  // convertSounds()
+  // writeSoundsMap()
+  makeSoundsBundle()
+}
diff --git a/scripts/uploadSoundFiles.ts b/scripts/uploadSoundFiles.ts
new file mode 100644
index 00000000..e8677c87
--- /dev/null
+++ b/scripts/uploadSoundFiles.ts
@@ -0,0 +1,109 @@
+import fetch from 'node-fetch';
+import * as fs from 'fs';
+import * as path from 'path';
+import { glob } from 'glob';
+
+// Git details
+const REPO_SLUG = process.env.REPO_SLUG;
+const owner = REPO_SLUG.split('/')[0];
+const repo = REPO_SLUG.split('/')[1];
+const branch = "sounds";
+
+// GitHub token for authentication
+const token = process.env.GITHUB_TOKEN;
+
+// GitHub API endpoint
+const baseUrl = `https://api.github.com/repos/${owner}/${repo}/contents`;
+
+const headers = {
+    Authorization: `token ${token}`,
+    'Content-Type': 'application/json'
+};
+
+async function getShaForExistingFile(repoFilePath: string): Promise<string | null> {
+    const url = `${baseUrl}/${repoFilePath}?ref=${branch}`;
+    const response = await fetch(url, { headers });
+    if (response.status === 404) {
+        return null; // File does not exist
+    }
+    if (!response.ok) {
+        throw new Error(`Failed to fetch ${url}: ${response.statusText}`);
+    }
+    const data = await response.json();
+    return data.sha;
+}
+
+async function uploadFiles() {
+    const commitMessage = "Upload multiple files via script";
+    const committer = {
+        name: "GitHub",
+        email: "noreply@github.com"
+    };
+
+    const filesToUpload = glob.sync("generated/sounds/**/*.mp3").map(localPath => {
+        const repoPath = localPath.replace(/^generated\//, '');
+        return { localPath, repoPath };
+    });
+
+    const files = await Promise.all(filesToUpload.map(async file => {
+        const content = fs.readFileSync(file.localPath, 'base64');
+        const sha = await getShaForExistingFile(file.repoPath);
+        return {
+            path: file.repoPath,
+            mode: "100644",
+            type: "blob",
+            sha: sha || undefined,
+            content: content
+        };
+    }));
+
+    const treeResponse = await fetch(`${baseUrl}/git/trees`, {
+        method: 'POST',
+        headers: headers,
+        body: JSON.stringify({
+            base_tree: null,
+            tree: files
+        })
+    });
+
+    if (!treeResponse.ok) {
+        throw new Error(`Failed to create tree: ${treeResponse.statusText}`);
+    }
+
+    const treeData = await treeResponse.json();
+
+    const commitResponse = await fetch(`${baseUrl}/git/commits`, {
+        method: 'POST',
+        headers: headers,
+        body: JSON.stringify({
+            message: commitMessage,
+            tree: treeData.sha,
+            parents: [branch],
+            committer: committer
+        })
+    });
+
+    if (!commitResponse.ok) {
+        throw new Error(`Failed to create commit: ${commitResponse.statusText}`);
+    }
+
+    const commitData = await commitResponse.json();
+
+    const updateRefResponse = await fetch(`${baseUrl}/git/refs/heads/${branch}`, {
+        method: 'PATCH',
+        headers: headers,
+        body: JSON.stringify({
+            sha: commitData.sha
+        })
+    });
+
+    if (!updateRefResponse.ok) {
+        throw new Error(`Failed to update ref: ${updateRefResponse.statusText}`);
+    }
+
+    console.log("Files uploaded successfully");
+}
+
+uploadFiles().catch(error => {
+    console.error("Error uploading files:", error);
+});
diff --git a/scripts/uploadSounds.ts b/scripts/uploadSounds.ts
new file mode 100644
index 00000000..b0e9ecd7
--- /dev/null
+++ b/scripts/uploadSounds.ts
@@ -0,0 +1,67 @@
+import fs from 'fs'
+
+// GitHub details
+const owner = "zardoy";
+const repo = "minecraft-web-client";
+const branch = "sounds-generated";
+const filePath = "dist/sounds.js"; // Local file path
+const repoFilePath = "sounds-v2.js"; // Path in the repo
+
+// GitHub token for authentication
+const token = process.env.GITHUB_TOKEN;
+
+// GitHub API endpoint
+const baseUrl = `https://api.github.com/repos/${owner}/${repo}/contents/${repoFilePath}`;
+
+const headers = {
+    Authorization: `token ${token}`,
+    'Content-Type': 'application/json'
+};
+
+async function getShaForExistingFile(): Promise<string | null> {
+    const url = `${baseUrl}?ref=${branch}`;
+    const response = await fetch(url, { headers });
+    if (response.status === 404) {
+        return null; // File does not exist
+    }
+    if (!response.ok) {
+        throw new Error(`Failed to fetch ${url}: ${response.statusText}`);
+    }
+    const data = await response.json();
+    return data.sha;
+}
+
+async function uploadFile() {
+    const content = fs.readFileSync(filePath, 'utf8');
+    const base64Content = Buffer.from(content).toString('base64');
+    const sha = await getShaForExistingFile();
+    console.log('got sha')
+
+    const body = {
+        message: "Update sounds.js",
+        content: base64Content,
+        branch: branch,
+        committer: {
+            name: "GitHub",
+            email: "noreply@github.com"
+        },
+        sha: sha || undefined
+    };
+
+    const response = await fetch(baseUrl, {
+        method: 'PUT',
+        headers: headers,
+        body: JSON.stringify(body)
+    });
+
+    if (!response.ok) {
+        throw new Error(`Failed to upload file: ${response.statusText}`);
+    }
+
+    const responseData = await response.json();
+    console.log("File uploaded successfully:", responseData);
+}
+
+uploadFile().catch(error => {
+    console.error("Error uploading file:", error);
+});
diff --git a/src/basicSounds.ts b/src/basicSounds.ts
index 48bdcac6..6c2b5f4f 100644
--- a/src/basicSounds.ts
+++ b/src/basicSounds.ts
@@ -1,3 +1,4 @@
+import { subscribeKey } from 'valtio/utils'
 import { options } from './optionsStorage'
 import { isCypress } from './standaloneUtils'
 import { reportWarningOnce } from './utils'
@@ -5,9 +6,14 @@ import { reportWarningOnce } from './utils'
 let audioContext: AudioContext
 const sounds: Record<string, any> = {}
 
+// Track currently playing sounds and their gain nodes
+const activeSounds: Array<{ source: AudioBufferSourceNode; gainNode: GainNode; volumeMultiplier: number }> = []
+window.activeSounds = activeSounds
+
 // load as many resources on page load as possible instead on demand as user can disable internet connection after he thinks the page is loaded
 const loadingSounds = [] as string[]
 const convertedSounds = [] as string[]
+
 export async function loadSound (path: string, contents = path) {
   if (loadingSounds.includes(path)) return true
   loadingSounds.push(path)
@@ -24,15 +30,15 @@ export async function loadSound (path: string, contents = path) {
   loadingSounds.splice(loadingSounds.indexOf(path), 1)
 }
 
-export const loadOrPlaySound = async (url, soundVolume = 1) => {
+export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = 500) => {
   const soundBuffer = sounds[url]
   if (!soundBuffer) {
     const start = Date.now()
     const cancelled = await loadSound(url)
-    if (cancelled || Date.now() - start > 500) return
+    if (cancelled || Date.now() - start > loadTimeout) return
   }
 
-  await playSound(url)
+  return playSound(url, soundVolume)
 }
 
 export async function playSound (url, soundVolume = 1) {
@@ -49,6 +55,7 @@ export async function playSound (url, soundVolume = 1) {
 
   for (const [soundName, sound] of Object.entries(sounds)) {
     if (convertedSounds.includes(soundName)) continue
+    // eslint-disable-next-line no-await-in-loop
     sounds[soundName] = await audioContext.decodeAudioData(sound)
     convertedSounds.push(soundName)
   }
@@ -66,4 +73,51 @@ export async function playSound (url, soundVolume = 1) {
   gainNode.connect(audioContext.destination)
   gainNode.gain.value = volume
   source.start(0)
+
+  // Add to active sounds
+  activeSounds.push({ source, gainNode, volumeMultiplier: soundVolume })
+
+  const callbacks = [] as Array<() => void>
+  source.onended = () => {
+    // Remove from active sounds when finished
+    const index = activeSounds.findIndex(s => s.source === source)
+    if (index !== -1) activeSounds.splice(index, 1)
+
+    for (const callback of callbacks) {
+      callback()
+    }
+    callbacks.length = 0
+  }
+
+  return {
+    onEnded (callback: () => void) {
+      callbacks.push(callback)
+    },
+  }
 }
+
+export function stopAllSounds () {
+  for (const { source } of activeSounds) {
+    try {
+      source.stop()
+    } catch (err) {
+      console.warn('Failed to stop sound:', err)
+    }
+  }
+  activeSounds.length = 0
+}
+
+export function changeVolumeOfCurrentlyPlayingSounds (newVolume: number) {
+  const normalizedVolume = newVolume / 100
+  for (const { gainNode, volumeMultiplier } of activeSounds) {
+    try {
+      gainNode.gain.value = normalizedVolume * volumeMultiplier
+    } catch (err) {
+      console.warn('Failed to change sound volume:', err)
+    }
+  }
+}
+
+subscribeKey(options, 'volume', () => {
+  changeVolumeOfCurrentlyPlayingSounds(options.volume)
+})
diff --git a/src/connect.ts b/src/connect.ts
index b7023880..e45769f7 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -2,7 +2,7 @@ import { versionsByMinecraftVersion } from 'minecraft-data'
 import minecraftInitialDataJson from '../generated/minecraft-initial-data.json'
 import { AuthenticatedAccount } from './react/ServersListProvider'
 import { setLoadingScreenStatus } from './utils'
-import { downloadSoundsIfNeeded } from './soundSystem'
+import { downloadSoundsIfNeeded } from './sounds/botSoundSystem'
 import { miscUiState } from './globalState'
 
 export type ConnectOptions = {
diff --git a/src/index.ts b/src/index.ts
index 2f412954..2643cccf 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -85,7 +85,7 @@ import { fsState } from './loadSave'
 import { watchFov } from './rendererUtils'
 import { loadInMemorySave } from './react/SingleplayerProvider'
 
-import { downloadSoundsIfNeeded } from './soundSystem'
+import { downloadSoundsIfNeeded } from './sounds/botSoundSystem'
 import { ua } from './react/utils'
 import { handleMovementStickDelta, joystickPointer } from './react/TouchAreasControls'
 import { possiblyHandleStateVariable } from './googledrive'
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 5d88fe38..1220baca 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -25,6 +25,7 @@ const defaultOptions = {
   chatOpacityOpened: 100,
   messagesLimit: 200,
   volume: 50,
+  enableMusic: false,
   // fov: 70,
   fov: 75,
   guiScale: 3,
diff --git a/src/react/SoundMuffler.tsx b/src/react/SoundMuffler.tsx
index d8571353..0151b97b 100644
--- a/src/react/SoundMuffler.tsx
+++ b/src/react/SoundMuffler.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react'
 import { useSnapshot } from 'valtio'
 import { hideCurrentModal } from '../globalState'
-import { lastPlayedSounds } from '../soundSystem'
+import { lastPlayedSounds } from '../sounds/botSoundSystem'
 import { options } from '../optionsStorage'
 import Button from './Button'
 import Screen from './Screen'
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index d7bbdc47..124d7e6c 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -157,7 +157,7 @@ const getSizeFromImage = async (filePath: string) => {
   return probeImg.width
 }
 
-export const getActiveTexturepackBasePath = async () => {
+export const getActiveResourcepackBasePath = async () => {
   if (await existsAsync('/resourcepack/pack.mcmeta')) {
     return '/resourcepack'
   }
@@ -198,7 +198,7 @@ const getFilesMapFromDir = async (dir: string) => {
 }
 
 export const getResourcepackTiles = async (type: 'blocks' | 'items', existingTextures: string[]) => {
-  const basePath = await getActiveTexturepackBasePath()
+  const basePath = await getActiveResourcepackBasePath()
   if (!basePath) return
   let firstTextureSize: number | undefined
   const namespaces = await fs.promises.readdir(join(basePath, 'assets'))
@@ -282,7 +282,7 @@ const prepareBlockstatesAndModels = async () => {
   viewer.world.customBlockStates = {}
   viewer.world.customModels = {}
   const usedTextures = new Set<string>()
-  const basePath = await getActiveTexturepackBasePath()
+  const basePath = await getActiveResourcepackBasePath()
   if (!basePath) return
   if (appStatusState.status) {
     setLoadingScreenStatus('Reading resource pack blockstates and models')
@@ -361,6 +361,7 @@ export const onAppLoad = () => {
   customEvents.on('mineflayerBotCreated', () => {
     // todo also handle resourcePack
     const handleResourcePackRequest = async (packet) => {
+      console.log('Received resource pack request', packet)
       if (options.serverResourcePacks === 'never') return
       const promptMessagePacket = ('promptMessage' in packet && packet.promptMessage) ? packet.promptMessage : undefined
       const promptMessageText = promptMessagePacket ? '' : 'Do you want to use server resource pack?'
@@ -397,7 +398,7 @@ export const onAppLoad = () => {
 }
 
 const updateAllReplacableTextures = async () => {
-  const basePath = await getActiveTexturepackBasePath()
+  const basePath = await getActiveResourcepackBasePath()
   const setCustomCss = async (path: string | null, varName: string, repeat = 1) => {
     if (path && await existsAsync(path)) {
       const contents = await fs.promises.readFile(path, 'base64')
diff --git a/src/soundSystem.ts b/src/sounds/botSoundSystem.ts
similarity index 51%
rename from src/soundSystem.ts
rename to src/sounds/botSoundSystem.ts
index d0caf01f..4bf014ac 100644
--- a/src/soundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -1,50 +1,51 @@
-import { subscribeKey } from 'valtio/utils'
 import { Vec3 } from 'vec3'
-import { versionToMajor, versionToNumber, versionsMapToMajor } from 'prismarine-viewer/viewer/prepare/utils'
+import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
 import { loadScript } from 'prismarine-viewer/viewer/lib/utils'
 import type { Block } from 'prismarine-block'
-import { miscUiState } from './globalState'
-import { options } from './optionsStorage'
-import { loadOrPlaySound } from './basicSounds'
-import { showNotification } from './react/NotificationProvider'
+import { subscribeKey } from 'valtio/utils'
+import { miscUiState } from '../globalState'
+import { options } from '../optionsStorage'
+import { loadOrPlaySound } from '../basicSounds'
+import { getActiveResourcepackBasePath, resourcePackState } from '../resourcePack'
+import { createSoundMap, SoundMap } from './soundsMap'
+import { musicSystem } from './musicSystem'
 
-const globalObject = window as {
-  allSoundsMap?: Record<string, Record<string, string>>,
-  allSoundsVersionedMap?: Record<string, string[]>,
+let soundMap: SoundMap | undefined
+
+const updateResourcePack = async () => {
+  if (!soundMap) return
+  soundMap.activeResourcePackBasePath = await getActiveResourcepackBasePath() ?? undefined
 }
 
+let musicInterval: ReturnType<typeof setInterval> | null = null
+
 subscribeKey(miscUiState, 'gameLoaded', async () => {
-  if (!miscUiState.gameLoaded) return
-  const soundsLegacyMap = window.allSoundsVersionedMap as Record<string, string[]>
-  const { allSoundsMap } = globalObject
-  const allSoundsMeta = window.allSoundsMeta as { format: string, baseUrl: string }
-  if (!allSoundsMap) {
+  if (!miscUiState.gameLoaded || !loadedData.sounds) {
+    stopMusicSystem()
+    soundMap?.quit()
     return
   }
 
-  const allSoundsMajor = versionsMapToMajor(allSoundsMap)
-  const soundsMap = allSoundsMajor[versionToMajor(bot.version)] ?? Object.values(allSoundsMajor)[0]
-
-  if (!soundsMap || !miscUiState.gameLoaded || !loadedData.sounds) {
-    return
-  }
-
-  // const soundsPerId = Object.fromEntries(Object.entries(soundsMap).map(([id, sound]) => [+id.split(';')[0], sound]))
-  const soundsPerName = Object.fromEntries(Object.entries(soundsMap).map(([id, sound]) => [id.split(';')[1], sound]))
+  console.log(`Loading sounds for version ${bot.version}. Resourcepack state: ${JSON.stringify(resourcePackState)}`)
+  soundMap = createSoundMap(bot.version) ?? undefined
+  if (!soundMap) return
+  void updateResourcePack()
+  startMusicSystem()
 
   const playGeneralSound = async (soundKey: string, position?: Vec3, volume = 1, pitch?: number) => {
-    if (!options.volume) return
-    const soundStaticData = soundsPerName[soundKey]?.split(';')
-    if (!soundStaticData) return
-    const soundVolume = +soundStaticData[0]!
-    const soundPath = soundStaticData[1]!
-    const versionedSound = getVersionedSound(bot.version, soundPath, Object.entries(soundsLegacyMap))
-    // todo test versionedSound
-    const url = allSoundsMeta.baseUrl.replace(/\/$/, '') + (versionedSound ? `/${versionedSound}` : '') + '/minecraft/sounds/' + soundPath + '.' + allSoundsMeta.format
-    const isMuted = options.mutedSounds.includes(soundKey) || options.mutedSounds.includes(soundPath) || options.volume === 0
+    if (!options.volume || !soundMap) return
+    const soundData = await soundMap.getSoundUrl(soundKey, volume)
+    if (!soundData) return
+
+    const isMuted = options.mutedSounds.includes(soundKey) || options.volume === 0
     if (position) {
       if (!isMuted) {
-        viewer.playSound(position, url, soundVolume * Math.max(Math.min(volume, 1), 0) * (options.volume / 100), Math.max(Math.min(pitch ?? 1, 2), 0.5))
+        viewer.playSound(
+          position,
+          soundData.url,
+          soundData.volume * (options.volume / 100),
+          Math.max(Math.min(pitch ?? 1, 2), 0.5)
+        )
       }
       if (getDistance(bot.entity.position, position) < 4 * 16) {
         lastPlayedSounds.lastServerPlayed[soundKey] ??= { count: 0, last: 0 }
@@ -53,7 +54,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
       }
     } else {
       if (!isMuted) {
-        await loadOrPlaySound(url, volume)
+        await loadOrPlaySound(soundData.url, volume)
       }
       lastPlayedSounds.lastClientPlayed.push(soundKey)
       if (lastPlayedSounds.lastClientPlayed.length > 10) {
@@ -61,84 +62,72 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
       }
     }
   }
+
+  const musicStartCheck = async (force = false) => {
+    if (!soundMap) return
+    // 20% chance to start music
+    if (Math.random() > 0.2 && !force && !options.enableMusic) return
+
+    const musicKeys = ['music.game']
+    if (bot.game.gameMode === 'creative') {
+      musicKeys.push('music.creative')
+    }
+    const randomMusicKey = musicKeys[Math.floor(Math.random() * musicKeys.length)]
+    const soundData = await soundMap.getSoundUrl(randomMusicKey)
+    if (!soundData) return
+    await musicSystem.playMusic(soundData.url, soundData.volume)
+  }
+
+  function startMusicSystem () {
+    if (musicInterval) return
+    musicInterval = setInterval(() => {
+      void musicStartCheck()
+    }, 10_000)
+  }
+
+  window.forceStartMusic = () => {
+    void musicStartCheck(true)
+  }
+
+
+  function stopMusicSystem () {
+    if (musicInterval) {
+      clearInterval(musicInterval)
+      musicInterval = null
+    }
+  }
+
   const playHardcodedSound = async (soundKey: string, position?: Vec3, volume = 1, pitch?: number) => {
     await playGeneralSound(soundKey, position, volume, pitch)
   }
+
   bot.on('soundEffectHeard', async (soundId, position, volume, pitch) => {
     await playHardcodedSound(soundId, position, volume, pitch)
   })
+
   bot.on('hardcodedSoundEffectHeard', async (soundIdNum, soundCategory, position, volume, pitch) => {
     const fixOffset = versionToNumber('1.20.4') === versionToNumber(bot.version) ? -1 : 0
     const soundKey = loadedData.sounds[soundIdNum + fixOffset]?.name
     if (soundKey === undefined) return
     await playGeneralSound(soundKey, position, volume, pitch)
   })
-  // workaround as mineflayer doesn't support soundEvent
+
   bot._client.on('sound_effect', async (packet) => {
     const soundResource = packet['soundEvent']?.resource as string | undefined
     if (packet.soundId !== 0 || !soundResource) return
     const pos = new Vec3(packet.x / 8, packet.y / 8, packet.z / 8)
     await playHardcodedSound(soundResource.replace('minecraft:', ''), pos, packet.volume, packet.pitch)
   })
+
   bot.on('entityHurt', async (entity) => {
     if (entity.id === bot.entity.id) {
       await playHardcodedSound('entity.player.hurt')
     }
   })
 
-  const useBlockSound = (blockName: string, category: string, fallback: string) => {
-    blockName = {
-      // todo somehow generated, not full
-      grass_block: 'grass',
-      tall_grass: 'grass',
-      fern: 'grass',
-      large_fern: 'grass',
-      dead_bush: 'grass',
-      seagrass: 'grass',
-      tall_seagrass: 'grass',
-      kelp: 'grass',
-      kelp_plant: 'grass',
-      sugar_cane: 'grass',
-      bamboo: 'grass',
-      vine: 'grass',
-      nether_sprouts: 'grass',
-      nether_wart: 'grass',
-      twisting_vines: 'grass',
-      weeping_vines: 'grass',
-
-      cobblestone: 'stone',
-      stone_bricks: 'stone',
-      mossy_stone_bricks: 'stone',
-      cracked_stone_bricks: 'stone',
-      chiseled_stone_bricks: 'stone',
-      stone_brick_slab: 'stone',
-      stone_brick_stairs: 'stone',
-      stone_brick_wall: 'stone',
-      polished_granite: 'stone',
-    }[blockName] ?? blockName
-    const key = 'block.' + blockName + '.' + category
-    return soundsPerName[key] ? key : fallback
-  }
-
-  const getStepSound = (blockUnder: Block) => {
-    // const soundsMap = globalObject.allSoundsMap?.[bot.version]
-    // if (!soundsMap) return
-    // let soundResult = 'block.stone.step'
-    // for (const x of Object.keys(soundsMap).map(n => n.split(';')[1])) {
-    //   const match = /block\.(.+)\.step/.exec(x)
-    //   const block = match?.[1]
-    //   if (!block) continue
-    //   if (loadedData.blocksByName[block]?.name === blockUnder.name) {
-    //     soundResult = x
-    //     break
-    //   }
-    // }
-    return useBlockSound(blockUnder.name, 'step', 'block.stone.step')
-  }
-
   let lastStepSound = 0
   const movementHappening = async () => {
-    if (!bot.player) return // no info yet
+    if (!bot.player || !soundMap) return // no info yet
     const VELOCITY_THRESHOLD = 0.1
     const { x, z, y } = bot.player.entity.velocity
     if (bot.entity.onGround && Math.abs(x) < VELOCITY_THRESHOLD && (Math.abs(z) > VELOCITY_THRESHOLD || Math.abs(y) > VELOCITY_THRESHOLD)) {
@@ -146,9 +135,9 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
       if (Date.now() - lastStepSound > 300) {
         const blockUnder = bot.world.getBlock(bot.entity.position.offset(0, -1, 0))
         if (blockUnder) {
-          const stepSound = getStepSound(blockUnder)
+          const stepSound = soundMap.getStepSound(blockUnder.name)
           if (stepSound) {
-            await playHardcodedSound(stepSound, undefined, 0.6)// todo not sure why 0.6
+            await playHardcodedSound(stepSound, undefined, 0.6)
             lastStepSound = Date.now()
           }
         }
@@ -157,8 +146,8 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
   }
 
   const playBlockBreak = async (blockName: string, position?: Vec3) => {
-    const sound = useBlockSound(blockName, 'break', 'block.stone.break')
-
+    if (!soundMap) return
+    const sound = soundMap.getBreakSound(blockName)
     await playHardcodedSound(sound, position, 0.6, 1)
   }
 
@@ -200,8 +189,8 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
       if (effectId === 1010) {
         console.log('play record', data)
       }
-      // todo add support for all current world events
     })
+
     let diggingBlock: Block | null = null
     customEvents.on('digStart', () => {
       diggingBlock = bot.blockAtCursor(5)
@@ -214,40 +203,14 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
   }
 
   registerEvents()
-
-  // 1.20+ soundEffectHeard is broken atm
-  // bot._client.on('packet', (data, { name }, buffer) => {
-  //   if (name === 'sound_effect') {
-  //     console.log(data, buffer)
-  //   }
-  // })
 })
 
-// todo
-// const music = {
-//   activated: false,
-//   playing: '',
-//   activate () {
-//     const gameMusic = Object.entries(globalObject.allSoundsMap?.[bot.version] ?? {}).find(([id, sound]) => sound.includes('music.game'))
-//     if (!gameMusic) return
-//     const soundPath = gameMusic[0].split(';')[1]
-//     const next = () => {}
-//   }
-// }
-
-const getVersionedSound = (version: string, item: string, itemsMapSortedEntries: Array<[string, string[]]>) => {
-  const verNumber = versionToNumber(version)
-  for (const [itemsVer, items] of itemsMapSortedEntries) {
-    // 1.18 < 1.18.1
-    // 1.13 < 1.13.2
-    if (items.includes(item) && verNumber <= versionToNumber(itemsVer)) {
-      return itemsVer
-    }
-  }
-}
+subscribeKey(resourcePackState, 'resourcePackInstalled', async () => {
+  await updateResourcePack()
+})
 
 export const downloadSoundsIfNeeded = async () => {
-  if (!globalObject.allSoundsMap) {
+  if (!window.allSoundsMap) {
     try {
       await loadScript('./sounds.js')
     } catch (err) {
diff --git a/src/sounds/musicSystem.ts b/src/sounds/musicSystem.ts
new file mode 100644
index 00000000..ecabf43e
--- /dev/null
+++ b/src/sounds/musicSystem.ts
@@ -0,0 +1,33 @@
+import { loadOrPlaySound } from '../basicSounds'
+import { options } from '../optionsStorage'
+
+class MusicSystem {
+  private currentMusic: string | null = null
+
+  async playMusic (url: string, musicVolume = 1) {
+    if (!options.enableMusic || this.currentMusic) return
+
+    try {
+      const { onEnded } = await loadOrPlaySound(url, 0.5 * musicVolume, 5000) ?? {}
+
+      if (!onEnded) return
+
+      this.currentMusic = url
+
+      onEnded(() => {
+        this.currentMusic = null
+      })
+    } catch (err) {
+      console.warn('Failed to play music:', err)
+      this.currentMusic = null
+    }
+  }
+
+  stopMusic () {
+    if (this.currentMusic) {
+      this.currentMusic = null
+    }
+  }
+}
+
+export const musicSystem = new MusicSystem()
diff --git a/src/sounds/soundsMap.ts b/src/sounds/soundsMap.ts
new file mode 100644
index 00000000..94c5a4d8
--- /dev/null
+++ b/src/sounds/soundsMap.ts
@@ -0,0 +1,347 @@
+import fs from 'fs'
+import path from 'path'
+import { versionsMapToMajor, versionToMajor, versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+
+import { stopAllSounds } from '../basicSounds'
+import { musicSystem } from './musicSystem'
+
+interface SoundMeta {
+  format: string
+  baseUrl: string
+}
+
+interface SoundData {
+  volume: number
+  path: string
+}
+
+interface SoundMapData {
+  allSoundsMap: Record<string, Record<string, string>>
+  soundsLegacyMap: Record<string, string[]>
+  soundsMeta: SoundMeta
+}
+
+interface BlockSoundMap {
+  [blockName: string]: string
+}
+
+interface SoundEntry {
+  file: string
+  weight: number
+  volume: number
+}
+
+export class SoundMap {
+  private readonly soundsPerName: Record<string, SoundEntry[]>
+  private readonly existingResourcePackPaths: Set<string>
+  public activeResourcePackBasePath: string | undefined
+
+  constructor (
+    private readonly soundData: SoundMapData,
+    private readonly version: string
+  ) {
+    const allSoundsMajor = versionsMapToMajor(soundData.allSoundsMap)
+    const soundsMap = allSoundsMajor[versionToMajor(version)] ?? Object.values(allSoundsMajor)[0]
+    this.soundsPerName = Object.fromEntries(
+      Object.entries(soundsMap).map(([id, soundsStr]) => {
+        const sounds = soundsStr.split(',').map(s => {
+          const [volume, name, weight] = s.split(';')
+          if (isNaN(Number(volume))) throw new Error('volume is not a number')
+          if (isNaN(Number(weight))) {
+            // debugger
+            throw new TypeError('weight is not a number')
+          }
+          return {
+            file: name,
+            weight: Number(weight),
+            volume: Number(volume)
+          }
+        })
+        return [id.split(';')[1], sounds]
+      })
+    )
+  }
+
+  async updateExistingResourcePackPaths () {
+    if (!this.activeResourcePackBasePath) return
+    // todo support sounds.js from resource pack
+    const soundsBasePath = path.join(this.activeResourcePackBasePath, 'assets/minecraft/sounds')
+    // scan recursively for sounds files
+    const scan = async (dir: string) => {
+      const entries = await fs.promises.readdir(dir, { withFileTypes: true })
+      for (const entry of entries) {
+        const entryPath = path.join(dir, entry.name)
+        if (entry.isDirectory()) {
+          await scan(entryPath)
+        } else if (entry.isFile() && entry.name.endsWith('.ogg')) {
+          const relativePath = path.relative(soundsBasePath, entryPath)
+          this.existingResourcePackPaths.add(relativePath)
+        }
+      }
+    }
+
+    await scan(soundsBasePath)
+  }
+
+  async getSoundUrl (soundKey: string, volume = 1): Promise<{ url: string; volume: number } | undefined> {
+    const sounds = this.soundsPerName[soundKey]
+    if (!sounds?.length) return undefined
+
+    // Pick a random sound based on weights
+    const totalWeight = sounds.reduce((sum, s) => sum + s.weight, 0)
+    let random = Math.random() * totalWeight
+    const sound = sounds.find(s => {
+      random -= s.weight
+      return random <= 0
+    }) ?? sounds[0]
+
+    const versionedSound = this.getVersionedSound(sound.file)
+
+    let url = this.soundData.soundsMeta.baseUrl.replace(/\/$/, '') +
+      (versionedSound ? `/${versionedSound}` : '') +
+      '/minecraft/sounds/' +
+      sound.file +
+      '.' +
+      this.soundData.soundsMeta.format
+
+    // Try loading from resource pack file first
+    if (this.activeResourcePackBasePath) {
+      const tryFormat = async (format: string) => {
+        try {
+          const resourcePackPath = path.join(this.activeResourcePackBasePath!, `/assets/minecraft/sounds/${sound.file}.${format}`)
+          const fileData = await fs.promises.readFile(resourcePackPath)
+          url = `data:audio/${format};base64,${fileData.toString('base64')}`
+          return true
+        } catch (err) {
+        }
+      }
+      const success = await tryFormat(this.soundData.soundsMeta.format)
+      if (!success && this.soundData.soundsMeta.format !== 'ogg') {
+        await tryFormat('ogg')
+      }
+    }
+
+    return {
+      url,
+      volume: sound.volume * Math.max(Math.min(volume, 1), 0)
+    }
+  }
+
+  private getVersionedSound (item: string): string | undefined {
+    const verNumber = versionToNumber(this.version)
+    const entries = Object.entries(this.soundData.soundsLegacyMap)
+    for (const [itemsVer, items] of entries) {
+      if (items.includes(item) && verNumber <= versionToNumber(itemsVer)) {
+        return itemsVer
+      }
+    }
+    return undefined
+  }
+
+  getBlockSound (blockName: string, category: string, fallback: string): string {
+    const mappedName = blockSoundAliases[blockName] ?? blockName
+    const key = `block.${mappedName}.${category}`
+    return this.soundsPerName[key] ? key : fallback
+  }
+
+  getStepSound (blockName: string): string {
+    return this.getBlockSound(blockName, 'step', 'block.stone.step')
+  }
+
+  getBreakSound (blockName: string): string {
+    return this.getBlockSound(blockName, 'break', 'block.stone.break')
+  }
+
+  quit () {
+    musicSystem.stopMusic()
+    stopAllSounds()
+  }
+}
+
+export function createSoundMap (version: string): SoundMap | null {
+  const globalObject = window as {
+    allSoundsMap?: Record<string, Record<string, string>>,
+    allSoundsVersionedMap?: Record<string, string[]>,
+    allSoundsMeta?: { format: string, baseUrl: string }
+  }
+  if (!globalObject.allSoundsMap) return null
+  return new SoundMap({
+    allSoundsMap: globalObject.allSoundsMap,
+    soundsLegacyMap: globalObject.allSoundsVersionedMap ?? {},
+    soundsMeta: globalObject.allSoundsMeta!
+  }, version)
+}
+
+// Block name mappings for sound effects
+const blockSoundAliases: BlockSoundMap = {
+  // Grass-like blocks
+  grass_block: 'grass',
+  tall_grass: 'grass',
+  fern: 'grass',
+  large_fern: 'grass',
+  dead_bush: 'grass',
+  seagrass: 'grass',
+  tall_seagrass: 'grass',
+  kelp: 'grass',
+  kelp_plant: 'grass',
+  sugar_cane: 'grass',
+  bamboo: 'grass',
+  vine: 'grass',
+  nether_sprouts: 'grass',
+  nether_wart: 'grass',
+  twisting_vines: 'grass',
+  weeping_vines: 'grass',
+  sweet_berry_bush: 'grass',
+  glow_lichen: 'grass',
+  moss_carpet: 'grass',
+  moss_block: 'grass',
+  hanging_roots: 'grass',
+  spore_blossom: 'grass',
+  small_dripleaf: 'grass',
+  big_dripleaf: 'grass',
+  flowering_azalea: 'grass',
+  azalea: 'grass',
+  azalea_leaves: 'grass',
+  flowering_azalea_leaves: 'grass',
+
+  // Stone-like blocks
+  cobblestone: 'stone',
+  stone_bricks: 'stone',
+  mossy_stone_bricks: 'stone',
+  cracked_stone_bricks: 'stone',
+  chiseled_stone_bricks: 'stone',
+  stone_brick_slab: 'stone',
+  stone_brick_stairs: 'stone',
+  stone_brick_wall: 'stone',
+  polished_granite: 'stone',
+  granite: 'stone',
+  andesite: 'stone',
+  diorite: 'stone',
+  polished_andesite: 'stone',
+  polished_diorite: 'stone',
+  deepslate: 'deepslate',
+  cobbled_deepslate: 'deepslate',
+  polished_deepslate: 'deepslate',
+  deepslate_bricks: 'deepslate_bricks',
+  deepslate_tiles: 'deepslate_tiles',
+  calcite: 'stone',
+  tuff: 'stone',
+  smooth_stone: 'stone',
+  smooth_sandstone: 'stone',
+  smooth_quartz: 'stone',
+  smooth_red_sandstone: 'stone',
+
+  // Wood-like blocks
+  oak_planks: 'wood',
+  spruce_planks: 'wood',
+  birch_planks: 'wood',
+  jungle_planks: 'wood',
+  acacia_planks: 'wood',
+  dark_oak_planks: 'wood',
+  crimson_planks: 'wood',
+  warped_planks: 'wood',
+  oak_log: 'wood',
+  spruce_log: 'wood',
+  birch_log: 'wood',
+  jungle_log: 'wood',
+  acacia_log: 'wood',
+  dark_oak_log: 'wood',
+  crimson_stem: 'stem',
+  warped_stem: 'stem',
+
+  // Metal blocks
+  iron_block: 'metal',
+  gold_block: 'metal',
+  copper_block: 'copper',
+  exposed_copper: 'copper',
+  weathered_copper: 'copper',
+  oxidized_copper: 'copper',
+  netherite_block: 'netherite_block',
+  ancient_debris: 'ancient_debris',
+  lodestone: 'lodestone',
+  chain: 'chain',
+  anvil: 'anvil',
+  chipped_anvil: 'anvil',
+  damaged_anvil: 'anvil',
+
+  // Glass blocks
+  glass: 'glass',
+  glass_pane: 'glass',
+  white_stained_glass: 'glass',
+  orange_stained_glass: 'glass',
+  magenta_stained_glass: 'glass',
+  light_blue_stained_glass: 'glass',
+  yellow_stained_glass: 'glass',
+  lime_stained_glass: 'glass',
+  pink_stained_glass: 'glass',
+  gray_stained_glass: 'glass',
+  light_gray_stained_glass: 'glass',
+  cyan_stained_glass: 'glass',
+  purple_stained_glass: 'glass',
+  blue_stained_glass: 'glass',
+  brown_stained_glass: 'glass',
+  green_stained_glass: 'glass',
+  red_stained_glass: 'glass',
+  black_stained_glass: 'glass',
+  tinted_glass: 'glass',
+
+  // Wool blocks
+  white_wool: 'wool',
+  orange_wool: 'wool',
+  magenta_wool: 'wool',
+  light_blue_wool: 'wool',
+  yellow_wool: 'wool',
+  lime_wool: 'wool',
+  pink_wool: 'wool',
+  gray_wool: 'wool',
+  light_gray_wool: 'wool',
+  cyan_wool: 'wool',
+  purple_wool: 'wool',
+  blue_wool: 'wool',
+  brown_wool: 'wool',
+  green_wool: 'wool',
+  red_wool: 'wool',
+  black_wool: 'wool',
+
+  // Nether blocks
+  netherrack: 'netherrack',
+  nether_bricks: 'nether_bricks',
+  red_nether_bricks: 'nether_bricks',
+  nether_wart_block: 'wart_block',
+  warped_wart_block: 'wart_block',
+  soul_sand: 'soul_sand',
+  soul_soil: 'soul_soil',
+  basalt: 'basalt',
+  polished_basalt: 'basalt',
+  blackstone: 'gilded_blackstone',
+  gilded_blackstone: 'gilded_blackstone',
+
+  // Amethyst blocks
+  amethyst_block: 'amethyst_block',
+  amethyst_cluster: 'amethyst_cluster',
+  large_amethyst_bud: 'large_amethyst_bud',
+  medium_amethyst_bud: 'medium_amethyst_bud',
+  small_amethyst_bud: 'small_amethyst_bud',
+
+  // Miscellaneous
+  sand: 'sand',
+  red_sand: 'sand',
+  gravel: 'gravel',
+  snow: 'snow',
+  snow_block: 'snow',
+  powder_snow: 'powder_snow',
+  ice: 'glass',
+  packed_ice: 'glass',
+  blue_ice: 'glass',
+  slime_block: 'slime_block',
+  honey_block: 'honey_block',
+  scaffolding: 'scaffolding',
+  ladder: 'ladder',
+  lantern: 'lantern',
+  soul_lantern: 'lantern',
+  pointed_dripstone: 'pointed_dripstone',
+  dripstone_block: 'dripstone_block',
+  rooted_dirt: 'rooted_dirt',
+  sculk_sensor: 'sculk_sensor',
+  shroomlight: 'shroomlight'
+}
diff --git a/src/sounds/testSounds.ts b/src/sounds/testSounds.ts
new file mode 100644
index 00000000..1f493549
--- /dev/null
+++ b/src/sounds/testSounds.ts
@@ -0,0 +1,8 @@
+import { createSoundMap } from './soundsMap'
+
+//@ts-expect-error
+globalThis.window = {}
+require('../../generated/sounds.js')
+
+const soundMap = createSoundMap('1.20.1')
+console.log(soundMap?.getSoundUrl('ambient.cave'))

From 2490fbe211e90b6c3bc938d85affd1e01484047a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 29 Jan 2025 05:26:46 +0300
Subject: [PATCH 152/753] fix(regression): minecity and some other maps broke

---
 pnpm-lock.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7a3a5ef1..db949885 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -162,7 +162,7 @@ importers:
         version: 6.1.1
       prismarine-provider-anvil:
         specifier: github:zardoy/prismarine-provider-anvil#everything
-        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b(minecraft-data@3.83.1)
+        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1)
       prosemirror-example-setup:
         specifier: ^1.2.2
         version: 1.2.2
@@ -7185,8 +7185,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b}
     version: 1.9.0
 
-  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b}
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7}
     version: 2.8.0
 
   prismarine-realms@1.3.2:
@@ -12788,7 +12788,7 @@ snapshots:
       prismarine-entity: 2.3.1
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b(minecraft-data@3.83.1)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.2.0
@@ -17858,7 +17858,7 @@ snapshots:
       prismarine-nbt: 2.5.0
       vec3: 0.1.8
 
-  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/a3a7d031069373cc3e0cd05e54512dd9461ca34b(minecraft-data@3.83.1):
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
     dependencies:
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)

From 317b84943afb531b64bf35ac76887c7d5b876979 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 29 Jan 2025 19:33:55 +0300
Subject: [PATCH 153/753] feat: Add block highlight color option to allow
 always it to be blue (useful!)

---
 src/optionsGuiScheme.tsx | 13 +++++++++++++
 src/optionsStorage.ts    |  1 +
 src/worldInteractions.ts | 14 +++++++++++++-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index ef7fc1c6..eab35642 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -233,6 +233,19 @@ export const guiOptionsScheme: {
       chatSelect: {
       },
     },
+    {
+      custom () {
+        return <Category>World</Category>
+      },
+      highlightBlockColor: {
+        text: 'Block Highlight Color',
+        values: [
+          ['auto', 'Auto'],
+          ['blue', 'Blue'],
+          ['classic', 'Classic']
+        ],
+      },
+    },
     {
       custom () {
         return <Category>Sign Editor</Category>
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 1220baca..cf1eccd5 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -96,6 +96,7 @@ const defaultOptions = {
   displayBossBars: false, // boss bar overlay was removed for some reason, enable safely
   disabledUiParts: [] as string[],
   neighborChunkUpdates: true,
+  highlightBlockColor: 'auto' as 'auto' | 'blue' | 'classic',
 }
 
 function getDefaultTouchControlsPositions () {
diff --git a/src/worldInteractions.ts b/src/worldInteractions.ts
index 3c7e4fa9..b1811569 100644
--- a/src/worldInteractions.ts
+++ b/src/worldInteractions.ts
@@ -6,6 +6,7 @@ import * as THREE from 'three'
 import { Vec3 } from 'vec3'
 import { LineMaterial } from 'three-stdlib'
 import { Entity } from 'prismarine-entity'
+import { subscribeKey } from 'valtio/utils'
 import destroyStage0 from '../assets/destroy_stage_0.png'
 import destroyStage1 from '../assets/destroy_stage_1.png'
 import destroyStage2 from '../assets/destroy_stage_2.png'
@@ -149,7 +150,16 @@ class WorldInteraction {
       const inCreative = bot.game.gameMode === 'creative'
       const pixelRatio = viewer.renderer.getPixelRatio()
       viewer.world.threejsCursorLineMaterial = new LineMaterial({
-        color: inCreative ? 0x40_80_ff : 0x00_00_00,
+        color: (() => {
+          switch (options.highlightBlockColor) {
+            case 'blue':
+              return 0x40_80_ff
+            case 'classic':
+              return 0x00_00_00
+            default:
+              return inCreative ? 0x40_80_ff : 0x00_00_00
+          }
+        })(),
         linewidth: Math.max(pixelRatio * 0.7, 1) * 2,
         // dashed: true,
         // dashSize: 5,
@@ -158,6 +168,8 @@ class WorldInteraction {
     upLineMaterial()
     // todo use gamemode update only
     bot.on('game', upLineMaterial)
+    // Update material when highlight color setting changes
+    subscribeKey(options, 'highlightBlockColor', upLineMaterial)
   }
 
   activateEntity (entity: Entity) {

From 28f0546f3b07789f04da5c527ace01c5233f43e9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 31 Jan 2025 03:52:07 +0300
Subject: [PATCH 154/753] feat(ui): add back, close buttons in settings for
 mobile

---
 src/controls.ts            | 19 ++++++-------------
 src/globalState.ts         |  7 +++++++
 src/react/Button.tsx       | 10 +++++++++-
 src/react/OptionsItems.tsx | 11 ++++++++++-
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/controls.ts b/src/controls.ts
index 559379a3..c936518a 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -7,7 +7,7 @@ import { ControMax } from 'contro-max/build/controMax'
 import { CommandEventArgument, SchemaCommandInput } from 'contro-max/build/types'
 import { stringStartsWith } from 'contro-max/build/stringUtils'
 import { UserOverrideCommand, UserOverridesConfig } from 'contro-max/build/types/store'
-import { isGameActive, showModal, gameAdditionalState, activeModalStack, hideCurrentModal, miscUiState, loadedGameState, hideModal } from './globalState'
+import { isGameActive, showModal, gameAdditionalState, activeModalStack, hideCurrentModal, miscUiState, loadedGameState, hideModal, hideAllModals } from './globalState'
 import { goFullscreen, pointerLock, reloadChunks } from './utils'
 import { options } from './optionsStorage'
 import { openPlayerInventory } from './inventoryWindows'
@@ -740,19 +740,12 @@ window.addEventListener('keydown', (e) => {
   if (activeModalStack.length) {
     const hideAll = e.ctrlKey || e.metaKey
     if (hideAll) {
-      while (activeModalStack.length > 0) {
-        hideCurrentModal(undefined, () => {
-          if (!activeModalStack.length) {
-            pointerLock.justHitEscape = true
-          }
-        })
-      }
+      hideAllModals()
     } else {
-      hideCurrentModal(undefined, () => {
-        if (!activeModalStack.length) {
-          pointerLock.justHitEscape = true
-        }
-      })
+      hideCurrentModal()
+    }
+    if (activeModalStack.length === 0) {
+      pointerLock.justHitEscape = true
     }
   } else if (pointerLock.hasPointerLock) {
     document.exitPointerLock?.()
diff --git a/src/globalState.ts b/src/globalState.ts
index fbaabe81..a15e1837 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -86,6 +86,13 @@ export const hideCurrentModal = (_data?, onHide?: () => void) => {
   }
 }
 
+export const hideAllModals = () => {
+  while (activeModalStack.length > 0) {
+    if (!hideModal()) break
+  }
+  return activeModalStack.length === 0
+}
+
 export const openOptionsMenu = (group: OptionsGroupType) => {
   showModal({ reactType: `options-${group}` })
 }
diff --git a/src/react/Button.tsx b/src/react/Button.tsx
index 14ecc38c..23bef5d0 100644
--- a/src/react/Button.tsx
+++ b/src/react/Button.tsx
@@ -13,6 +13,7 @@ interface Props extends React.ComponentProps<'button'> {
   children?: React.ReactNode
   inScreen?: boolean
   rootRef?: Ref<HTMLButtonElement>
+  overlayColor?: string
 }
 
 const ButtonContext = createContext({
@@ -23,7 +24,7 @@ export const ButtonProvider: FC<{ children, onClick }> = ({ children, onClick })
   return <ButtonContext.Provider value={{ onClick }}>{children}</ButtonContext.Provider>
 }
 
-export default (({ label, icon, children, inScreen, rootRef, type = 'button', postLabel, ...args }) => {
+export default (({ label, icon, children, inScreen, rootRef, type = 'button', postLabel, overlayColor, ...args }) => {
   const ctx = useContext(ButtonContext)
 
   const onClick = (e) => {
@@ -45,6 +46,13 @@ export default (({ label, icon, children, inScreen, rootRef, type = 'button', po
       {label}
       {postLabel}
       {children}
+      {overlayColor && <div style={{
+        position: 'absolute',
+        inset: 0,
+        backgroundColor: overlayColor,
+        opacity: 0.5,
+        pointerEvents: 'none'
+      }} />}
     </button>
   </SharedHudVars>
 }) satisfies FC<Props>
diff --git a/src/react/OptionsItems.tsx b/src/react/OptionsItems.tsx
index bc431bd2..9879aeb4 100644
--- a/src/react/OptionsItems.tsx
+++ b/src/react/OptionsItems.tsx
@@ -3,11 +3,12 @@ import { noCase } from 'change-case'
 import { titleCase } from 'title-case'
 import { useMemo } from 'react'
 import { options, qsOptions } from '../optionsStorage'
-import { miscUiState } from '../globalState'
+import { hideAllModals, miscUiState } from '../globalState'
 import Button from './Button'
 import Slider from './Slider'
 import Screen from './Screen'
 import { showOptionsModal } from './SelectOption'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 
 type GeneralItem<T extends string | number | boolean> = {
   id?: string
@@ -188,10 +189,18 @@ interface Props {
 }
 
 export default ({ items, title, backButtonAction }: Props) => {
+  const { currentTouch } = useSnapshot(miscUiState)
+
   return <Screen
     title={title}
   >
     <div className='screen-items'>
+      {currentTouch && (
+        <div style={{ position: 'fixed', marginLeft: '-30px', display: 'flex', flexDirection: 'column', gap: 1, }}>
+          <Button icon={pixelartIcons['close']} onClick={hideAllModals} style={{ color: '#ff5d5d', }} />
+          <Button icon={pixelartIcons['chevron-left']} onClick={backButtonAction} style={{ color: 'yellow', }} />
+        </div>
+      )}
       {items.map((element, i) => {
         // make sure its unique!
         return <RenderOption key={element.id ?? `${title}-${i}`} item={element} />

From 14b7cb039a1211c0ba146842ef1778089b84538f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 31 Jan 2025 04:40:15 +0300
Subject: [PATCH 155/753] feat(ui): Improve server list UI

- Implement concurrent server status fetching with rate limiting
- Show offline status for servers that cannot be reached
---
 src/react/AddServerOrConnect.tsx  |  5 +-
 src/react/ServersListProvider.tsx | 87 +++++++++++++++++++++++--------
 src/react/Singleplayer.tsx        | 13 ++++-
 src/react/simpleHooks.ts          | 12 +++++
 4 files changed, 91 insertions(+), 26 deletions(-)

diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index e3fb2a15..0287779b 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -3,7 +3,7 @@ import Screen from './Screen'
 import Input from './Input'
 import Button from './Button'
 import SelectGameVersion from './SelectGameVersion'
-import { useIsSmallWidth } from './simpleHooks'
+import { useIsSmallWidth, usePassesWindowDimensions } from './simpleHooks'
 
 export interface BaseServerInfo {
   ip: string
@@ -32,6 +32,7 @@ interface Props {
 const ELEMENTS_WIDTH = 190
 
 export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions, allowAutoConnect }: Props) => {
+  const isSmallHeight = !usePassesWindowDimensions(null, 350)
   const qsParams = parseQs ? new URLSearchParams(window.location.search) : undefined
   const qsParamName = qsParams?.get('name')
   const qsParamIp = qsParams?.get('ip')
@@ -101,7 +102,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
         </>}
         <InputWithLabel required label="Server IP" value={serverIp} disabled={lockConnect && qsIpParts?.[0] !== null} onChange={({ target: { value } }) => setServerIp(value)} />
         <InputWithLabel label="Server Port" value={serverPort} disabled={lockConnect && qsIpParts?.[1] !== null} onChange={({ target: { value } }) => setServerPort(value)} placeholder='25565' />
-        <div style={{ gridColumn: smallWidth ? '' : 'span 2' }}>Overrides:</div>
+        {isSmallHeight ? <div style={{ gridColumn: 'span 2', marginTop: 10, }} /> : <div style={{ gridColumn: smallWidth ? '' : 'span 2' }}>Overrides:</div>}
         <div style={{
           display: 'flex',
           flexDirection: 'column',
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index fa9242a2..43b08344 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -47,6 +47,7 @@ type AdditionalDisplayData = {
   formattedText: string
   textNameRight: string
   icon?: string
+  offline?: boolean
 }
 
 export interface AuthenticatedAccount {
@@ -138,6 +139,9 @@ export const updateAuthenticatedAccountData = (callback: (data: AuthenticatedAcc
 // todo move to base
 const normalizeIp = (ip: string) => ip.replace(/https?:\/\//, '').replace(/\/(:|$)/, '')
 
+const FETCH_DELAY = 100 // ms between each request
+const MAX_CONCURRENT_REQUESTS = 10
+
 const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersList?: string[] }) => {
   const [proxies, setProxies] = useState<readonly string[]>(localStorage['proxies'] ? JSON.parse(localStorage['proxies']) : getInitialProxies())
   const [selectedProxy, setSelectedProxy] = useState(proxyQs ?? localStorage.getItem('selectedProxy') ?? proxies?.[0] ?? '')
@@ -198,30 +202,69 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
 
   useUtilsEffect(({ signal }) => {
     const update = async () => {
-      for (const server of serversListSorted) {
-        const isInLocalNetwork = server.ip.startsWith('192.168.') || server.ip.startsWith('10.') || server.ip.startsWith('172.') || server.ip.startsWith('127.') || server.ip.startsWith('localhost')
-        if (isInLocalNetwork || signal.aborted) continue
-        // eslint-disable-next-line no-await-in-loop
-        await fetch(`https://api.mcstatus.io/v2/status/java/${server.ip}`, {
-          // TODO: bounty for this who fix it
-          // signal
-        }).then(async r => r.json()).then((data: ServerResponse) => {
-          const versionClean = data.version?.name_raw.replace(/^[^\d.]+/, '')
-          if (!versionClean) return
-          setAdditionalData(old => {
-            return ({
-              ...old,
-              [server.ip]: {
-                formattedText: data.motd?.raw ?? '',
-                textNameRight: `${versionClean} ${data.players?.online ?? '??'}/${data.players?.max ?? '??'}`,
-                icon: data.icon,
-              }
-            })
-          })
+      const queue = serversListSorted
+        .map(server => {
+          const isInLocalNetwork = server.ip.startsWith('192.168.') ||
+            server.ip.startsWith('10.') ||
+            server.ip.startsWith('172.') ||
+            server.ip.startsWith('127.') ||
+            server.ip.startsWith('localhost') ||
+            server.ip.startsWith(':')
+
+          const VALID_IP_OR_DOMAIN = server.ip.includes('.')
+          if (isInLocalNetwork || signal.aborted || !VALID_IP_OR_DOMAIN) return null
+
+          return server
         })
+        .filter(x => x !== null)
+
+      const activeRequests = new Set<Promise<void>>()
+
+      let lastRequestStart = 0
+      for (const server of queue) {
+        // Wait if at concurrency limit
+        if (activeRequests.size >= MAX_CONCURRENT_REQUESTS) {
+          // eslint-disable-next-line no-await-in-loop
+          await Promise.race(activeRequests)
+        }
+
+        // Create and track new request
+        // eslint-disable-next-line @typescript-eslint/no-loop-func
+        const request = new Promise<void>(resolve => {
+          setTimeout(async () => {
+            try {
+              lastRequestStart = Date.now()
+              if (signal.aborted) return
+              const response = await fetch(`https://api.mcstatus.io/v2/status/java/${server.ip}`, { signal })
+              const data: ServerResponse = await response.json()
+              const versionClean = data.version?.name_raw.replace(/^[^\d.]+/, '')
+
+              setAdditionalData(old => ({
+                ...old,
+                [server.ip]: {
+                  formattedText: data.motd?.raw ?? '',
+                  textNameRight: data.online ?
+                    `${versionClean} ${data.players?.online ?? '??'}/${data.players?.max ?? '??'}` :
+                    '',
+                  icon: data.icon,
+                  offline: !data.online
+                }
+              }))
+            } finally {
+              activeRequests.delete(request)
+              resolve()
+            }
+          }, lastRequestStart ? Math.max(0, FETCH_DELAY - (Date.now() - lastRequestStart)) : 0)
+        })
+
+        activeRequests.add(request)
       }
+
+      // Wait for remaining requests
+      await Promise.all(activeRequests)
     }
-    void update().catch((err) => {})
+
+    void update()
   }, [serversListSorted])
 
   const isEditScreenModal = useIsModalActive('editServer')
@@ -394,10 +437,10 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         name: server.index.toString(),
         title: server.name || server.ip,
         detail: (server.versionOverride ?? '') + ' ' + (server.usernameOverride ?? ''),
-        // lastPlayed: server.lastJoined,
         formattedTextOverride: additional?.formattedText,
         worldNameRight: additional?.textNameRight ?? '',
         iconSrc: additional?.icon,
+        offline: additional?.offline
       }
     })}
     initialProxies={{
diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index 79c08ab8..d8291d90 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -12,6 +12,7 @@ import Button from './Button'
 import Tabs from './Tabs'
 import MessageFormattedString from './MessageFormattedString'
 import { useIsSmallWidth } from './simpleHooks'
+import PixelartIcon from './PixelartIcon'
 
 export interface WorldProps {
   name: string
@@ -26,9 +27,10 @@ export interface WorldProps {
   onFocus?: (name: string) => void
   onInteraction?(interaction: 'enter' | 'space')
   elemRef?: React.Ref<HTMLDivElement>
+  offline?: boolean
 }
 
-const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus, onInteraction, iconSrc, formattedTextOverride, worldNameRight, elemRef }: WorldProps & { ref?: React.Ref<HTMLDivElement> }) => {
+const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus, onInteraction, iconSrc, formattedTextOverride, worldNameRight, elemRef, offline }: WorldProps & { ref?: React.Ref<HTMLDivElement> }) => {
   const timeRelativeFormatted = useMemo(() => {
     if (!lastPlayed) return ''
     const formatter = new Intl.RelativeTimeFormat('en', { numeric: 'auto' })
@@ -60,7 +62,14 @@ const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus,
     <div className={styles.world_info}>
       <div className={styles.world_title}>
         <div>{title}</div>
-        <div className={styles.world_title_right}>{worldNameRight}</div>
+        <div className={styles.world_title_right}>
+          {offline ? (
+            <span style={{ color: 'red', display: 'flex', alignItems: 'center', gap: 4 }}>
+              <PixelartIcon iconName="signal-off" width={12} />
+              Offline
+            </span>
+          ) : worldNameRight}
+        </div>
       </div>
       {formattedTextOverride ? <div className={styles.world_info_formatted}>
         <MessageFormattedString message={formattedTextOverride} />
diff --git a/src/react/simpleHooks.ts b/src/react/simpleHooks.ts
index ec9c88e1..20607f15 100644
--- a/src/react/simpleHooks.ts
+++ b/src/react/simpleHooks.ts
@@ -7,6 +7,18 @@ export const useIsSmallWidth = () => {
   return useMedia(SMALL_SCREEN_MEDIA.replace('@media ', ''))
 }
 
+export const usePassesWindowDimensions = (minWidth: number | null = null, minHeight: number | null = null) => {
+  let media = '('
+  if (minWidth !== null) {
+    media += `min-width: ${minWidth}px, `
+  }
+  if (minHeight !== null) {
+    media += `min-height: ${minHeight}px, `
+  }
+  media += ')'
+  return useMedia(media)
+}
+
 export const useCopyKeybinding = (getCopyText: () => string | undefined) => {
   useUtilsEffect(({ signal }) => {
     addEventListener('keydown', (e) => {

From f75538598191300dfd23f159ff0975c035649552 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 31 Jan 2025 05:52:55 +0300
Subject: [PATCH 156/753] refactor: rm loadedGameState, add a way to copy
 server resource pack to local

---
 src/controls.ts                         | 27 ++++++++++++++-----
 src/globalState.ts                      | 10 +++----
 src/index.ts                            |  7 -----
 src/optionsGuiScheme.tsx                |  4 +--
 src/react/ChatProvider.tsx              |  4 +--
 src/react/MinimapProvider.tsx           |  7 ++---
 src/react/MobileTopButtons.tsx          |  2 +-
 src/react/PlayerListOverlayProvider.tsx |  5 ++--
 src/resourcePack.ts                     | 36 +++++++++++++++++++++----
 9 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/src/controls.ts b/src/controls.ts
index c936518a..c15a09f3 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -7,7 +7,7 @@ import { ControMax } from 'contro-max/build/controMax'
 import { CommandEventArgument, SchemaCommandInput } from 'contro-max/build/types'
 import { stringStartsWith } from 'contro-max/build/stringUtils'
 import { UserOverrideCommand, UserOverridesConfig } from 'contro-max/build/types/store'
-import { isGameActive, showModal, gameAdditionalState, activeModalStack, hideCurrentModal, miscUiState, loadedGameState, hideModal, hideAllModals } from './globalState'
+import { isGameActive, showModal, gameAdditionalState, activeModalStack, hideCurrentModal, miscUiState, hideModal, hideAllModals } from './globalState'
 import { goFullscreen, pointerLock, reloadChunks } from './utils'
 import { options } from './optionsStorage'
 import { openPlayerInventory } from './inventoryWindows'
@@ -19,7 +19,7 @@ import { showOptionsModal } from './react/SelectOption'
 import widgets from './react/widgets'
 import { getItemFromBlock } from './chatUtils'
 import { gamepadUiCursorState, moveGamepadCursorByPx } from './react/GamepadUiCursor'
-import { completeTexturePackInstall, resourcePackState } from './resourcePack'
+import { completeTexturePackInstall, copyServerResourcePackToRegular, resourcePackState } from './resourcePack'
 import { showNotification } from './react/NotificationProvider'
 import { lastConnectOptions } from './react/AppStatusProvider'
 
@@ -450,7 +450,12 @@ contro.on('release', ({ command }) => {
 
 // hard-coded keybindings
 
-export const f3Keybinds = [
+export const f3Keybinds: Array<{
+  key?: string,
+  action: () => void,
+  mobileTitle: string
+  enabled?: () => boolean
+}> = [
   {
     key: 'KeyA',
     action () {
@@ -496,9 +501,9 @@ export const f3Keybinds = [
     key: 'KeyT',
     async action () {
       // TODO!
-      if (resourcePackState.resourcePackInstalled || loadedGameState.usingServerResourcePack) {
+      if (resourcePackState.resourcePackInstalled || gameAdditionalState.usingServerResourcePack) {
         showNotification('Reloading textures...')
-        await completeTexturePackInstall('default', 'default', loadedGameState.usingServerResourcePack)
+        await completeTexturePackInstall('default', 'default', gameAdditionalState.usingServerResourcePack)
       }
     },
     mobileTitle: 'Reload Textures'
@@ -539,7 +544,15 @@ export const f3Keybinds = [
       const proxyPing = await bot['pingProxy']()
       void showOptionsModal(`${username}: last known total latency (ping): ${playerPing}. Connected to ${lastConnectOptions.value?.proxy} with current ping ${proxyPing}. Player UUID: ${uuid}`, [])
     },
-    mobileTitle: 'Show Proxy & Ping Details'
+    mobileTitle: 'Show Proxy & Ping Details',
+    enabled: () => !!lastConnectOptions.value?.proxy
+  },
+  {
+    action () {
+      void copyServerResourcePackToRegular()
+    },
+    mobileTitle: 'Copy Server Resource Pack',
+    enabled: () => !!gameAdditionalState.usingServerResourcePack
   }
 ]
 
@@ -548,7 +561,7 @@ document.addEventListener('keydown', (e) => {
   if (!isGameActive(false)) return
   if (hardcodedPressedKeys.has('F3')) {
     const keybind = f3Keybinds.find((v) => v.key === e.code)
-    if (keybind) {
+    if (keybind && (keybind.enabled?.() ?? true)) {
       keybind.action()
       e.stopPropagation()
     }
diff --git a/src/globalState.ts b/src/globalState.ts
index a15e1837..e09db053 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -146,12 +146,6 @@ export const miscUiState = proxy({
   displaySearchInput: false,
 })
 
-export const loadedGameState = proxy({
-  username: '',
-  serverIp: '' as string | null,
-  usingServerResourcePack: false,
-})
-
 export const isGameActive = (foregroundCheck: boolean) => {
   if (foregroundCheck && activeModalStack.length) return false
   return miscUiState.gameLoaded
@@ -165,7 +159,9 @@ export const gameAdditionalState = proxy({
   isSprinting: false,
   isSneaking: false,
   isZooming: false,
-  warps: [] as WorldWarp[]
+  warps: [] as WorldWarp[],
+
+  usingServerResourcePack: false,
 })
 
 window.gameAdditionalState = gameAdditionalState
diff --git a/src/index.ts b/src/index.ts
index 2643cccf..2c120bbd 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -53,7 +53,6 @@ import {
   hideModal,
   insertActiveModalStack,
   isGameActive,
-  loadedGameState,
   miscUiState,
   showModal
 } from './globalState'
@@ -884,12 +883,6 @@ async function connect (connectOptions: ConnectOptions) {
 
     console.log('Done!')
 
-    // todo
-    onGameLoad(async () => {
-      loadedGameState.serverIp = server.host ?? null
-      loadedGameState.username = username
-    })
-
     if (appStatusState.isError) return
     setTimeout(() => {
       // todo
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index eab35642..47ec5350 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -2,7 +2,7 @@ import { useRef, useState } from 'react'
 import { useSnapshot } from 'valtio'
 import { openURL } from 'prismarine-viewer/viewer/lib/simpleUtils'
 import { noCase } from 'change-case'
-import { loadedGameState, miscUiState, openOptionsMenu, showModal } from './globalState'
+import { gameAdditionalState, miscUiState, openOptionsMenu, showModal } from './globalState'
 import { AppOptions, options } from './optionsStorage'
 import Button from './react/Button'
 import { OptionMeta, OptionSlider } from './react/OptionsItems'
@@ -157,7 +157,7 @@ export const guiOptionsScheme: {
     {
       custom () {
         const { resourcePackInstalled } = useSnapshot(resourcePackState)
-        const { usingServerResourcePack } = useSnapshot(loadedGameState)
+        const { usingServerResourcePack } = useSnapshot(gameAdditionalState)
         const { enabledResourcepack } = useSnapshot(options)
         return <Button
           label={`Resource Pack: ${usingServerResourcePack ? 'SERVER ON' : resourcePackInstalled ? enabledResourcepack ? 'ON' : 'OFF' : 'NO'}`} inScreen onClick={async () => {
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 66d7673f..7caf6955 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useRef, useState } from 'react'
 import { useSnapshot } from 'valtio'
 import { formatMessage } from '../chatUtils'
 import { getBuiltinCommandsList, tryHandleBuiltinCommand } from '../builtinCommands'
-import { hideCurrentModal, loadedGameState, miscUiState } from '../globalState'
+import { hideCurrentModal, miscUiState } from '../globalState'
 import { options } from '../optionsStorage'
 import Chat, { Message, fadeMessage } from './Chat'
 import { useIsModalActive } from './utilsApp'
@@ -54,7 +54,7 @@ export default () => {
           updateLoadedServerData((server) => {
             server.autoLogin ??= {}
             const password = message.split(' ')[1]
-            server.autoLogin[loadedGameState.username] = password
+            server.autoLogin[bot.player.username] = password
             return server
           })
           hideNotification()
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
index 4b877732..44ee57b8 100644
--- a/src/react/MinimapProvider.tsx
+++ b/src/react/MinimapProvider.tsx
@@ -15,11 +15,12 @@ import { useSnapshot } from 'valtio'
 import BlockData from '../../prismarine-viewer/viewer/lib/moreBlockDataGenerated.json'
 import preflatMap from '../preflatMap.json'
 import { contro } from '../controls'
-import { gameAdditionalState, showModal, hideModal, miscUiState, loadedGameState, activeModalStack } from '../globalState'
+import { gameAdditionalState, showModal, hideModal, miscUiState, activeModalStack } from '../globalState'
 import { options } from '../optionsStorage'
 import Minimap, { DisplayMode } from './Minimap'
 import { ChunkInfo, DrawerAdapter, MapUpdates, MinimapDrawer } from './MinimapDrawer'
 import { useIsModalActive } from './utilsApp'
+import { lastConnectOptions } from './AppStatusProvider'
 
 const getBlockKey = (x: number, z: number) => {
   return `${x},${z}`
@@ -167,9 +168,9 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
       // type suppressed until server is updated. It works fine
       void (localServer as any).setWarp(warp, remove)
     } else if (remove) {
-      localStorage.removeItem(`warps: ${loadedGameState.username} ${loadedGameState.serverIp}`)
+      localStorage.removeItem(`warps: ${bot.player.username} ${lastConnectOptions.value!.server}`)
     } else {
-      localStorage.setItem(`warps: ${loadedGameState.username} ${loadedGameState.serverIp}`, JSON.stringify(this.warps))
+      localStorage.setItem(`warps: ${bot.player.username} ${lastConnectOptions.value!.server}`, JSON.stringify(this.warps))
     }
     this.emit('updateWarps')
   }
diff --git a/src/react/MobileTopButtons.tsx b/src/react/MobileTopButtons.tsx
index ffeb7adf..f686d8af 100644
--- a/src/react/MobileTopButtons.tsx
+++ b/src/react/MobileTopButtons.tsx
@@ -21,7 +21,7 @@ export default () => {
   }, [])
 
   const onLongPress = async () => {
-    const select = await showOptionsModal('', f3Keybinds.filter(f3Keybind => f3Keybind.mobileTitle).map(f3Keybind => f3Keybind.mobileTitle))
+    const select = await showOptionsModal('', f3Keybinds.filter(f3Keybind => f3Keybind.mobileTitle && (f3Keybind.enabled?.() ?? true)).map(f3Keybind => f3Keybind.mobileTitle))
     if (!select) return
     const f3Keybind = f3Keybinds.find(f3Keybind => f3Keybind.mobileTitle === select)
     if (f3Keybind) f3Keybind.action()
diff --git a/src/react/PlayerListOverlayProvider.tsx b/src/react/PlayerListOverlayProvider.tsx
index 0fb1665c..50f2295c 100644
--- a/src/react/PlayerListOverlayProvider.tsx
+++ b/src/react/PlayerListOverlayProvider.tsx
@@ -1,15 +1,16 @@
 import { useSnapshot } from 'valtio'
 import { useState, useEffect, useMemo } from 'react'
-import { isGameActive, loadedGameState } from '../globalState'
+import { isGameActive } from '../globalState'
 import PlayerListOverlay from './PlayerListOverlay'
 import './PlayerListOverlay.css'
+import { lastConnectOptions } from './AppStatusProvider'
 
 const MAX_ROWS_PER_COL = 10
 
 type Players = typeof bot.players
 
 export default () => {
-  const { serverIp } = useSnapshot(loadedGameState)
+  const serverIp = lastConnectOptions.value?.server
   const [clientId, setClientId] = useState('')
   const [players, setPlayers] = useState<Players>({})
   const [isOpen, setIsOpen] = useState(false)
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 124d7e6c..e6c835e7 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -4,14 +4,14 @@ import fs from 'fs'
 import JSZip from 'jszip'
 import { proxy, subscribe } from 'valtio'
 import { WorldRendererThree } from 'prismarine-viewer/viewer/lib/worldrendererThree'
-import { mkdirRecursive, removeFileRecursiveAsync } from './browserfs'
+import { collectFilesToCopy, copyFilesAsyncWithProgress, mkdirRecursive, removeFileRecursiveAsync } from './browserfs'
 import { setLoadingScreenStatus } from './utils'
 import { showNotification } from './react/NotificationProvider'
 import { options } from './optionsStorage'
 import { showOptionsModal } from './react/SelectOption'
 import { appStatusState } from './react/AppStatusProvider'
 import { appReplacableResources, resourcesContentOriginal } from './generated/resources'
-import { loadedGameState, miscUiState } from './globalState'
+import { gameAdditionalState, miscUiState } from './globalState'
 import { watchUnloadForCleanup } from './gameUnload'
 
 export const resourcePackState = proxy({
@@ -32,7 +32,7 @@ const texturePackBasePath = '/data/resourcePacks/'
 export const uninstallTexturePack = async (name = 'default') => {
   if (await existsAsync('/resourcepack/pack.mcmeta')) {
     await removeFileRecursiveAsync('/resourcepack')
-    loadedGameState.usingServerResourcePack = false
+    gameAdditionalState.usingServerResourcePack = false
   }
   const basePath = texturePackBasePath + name
   if (!(await existsAsync(basePath))) return
@@ -113,7 +113,7 @@ export const installTexturePack = async (file: File | ArrayBuffer, displayName =
     done++
     upStatus()
   }))
-  console.log('done')
+  console.log('resource pack install done')
   await completeTexturePackInstall(displayName, name, isServer)
 }
 
@@ -129,7 +129,7 @@ export const completeTexturePackInstall = async (displayName: string | undefined
   showNotification('Texturepack installed & enabled')
   await updateTexturePackInstalledState()
   if (isServer) {
-    loadedGameState.usingServerResourcePack = true
+    gameAdditionalState.usingServerResourcePack = true
   } else {
     options.enabledResourcepack = name
   }
@@ -463,3 +463,29 @@ const updateTextures = async () => {
 export const resourcepackReload = async (version) => {
   await updateTextures()
 }
+
+export const copyServerResourcePackToRegular = async (name = 'default') => {
+  // Check if server resource pack exists
+  if (!(await existsAsync('/resourcepack/pack.mcmeta'))) {
+    throw new Error('No server resource pack is currently installed')
+  }
+
+  // Get display name from server resource pack if available
+  let displayName
+  try {
+    displayName = await fs.promises.readFile('/resourcepack/name.txt', 'utf8')
+  } catch {
+    displayName = 'Server Resource Pack'
+  }
+
+  // Copy all files from server resource pack to regular location
+  const destPath = texturePackBasePath + name
+  await mkdirRecursive(destPath)
+
+  setLoadingScreenStatus('Copying server resource pack to regular location')
+  await copyFilesAsyncWithProgress('/resourcepack', destPath, true, ' (server -> regular)')
+
+  // Complete the installation
+  await completeTexturePackInstall(displayName, name, false)
+  showNotification('Server resource pack copied to regular location')
+}

From 92ce4dd0d855f7e72b13637343e4095b57c8e2c3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 00:35:06 +0300
Subject: [PATCH 157/753] chore(ci): Update GitHub Actions workflow
 dependencies

- Upgrade actions/upload-artifact to v4
- Minor workflow configuration refinements
---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3eb1fc74..0551b541 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: cypress-io/github-action@v5
         with:
           install: false
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-images
@@ -49,7 +49,7 @@ jobs:
 
       - name: Install pnpm
         run: npm install -g pnpm@9.0.4
-        
+
       - name: Run pnpm dedupe
         run: pnpm dedupe
 
@@ -61,4 +61,4 @@ jobs:
             exit 1
           else
             echo "No changes detected after pnpm dedupe in pnpm-lock.yaml"
-          fi
\ No newline at end of file
+          fi

From 8766eaae219dd062197deb5a324543e0ba4854da Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 00:42:49 +0300
Subject: [PATCH 158/753] fix signal crash regression

---
 src/react/ServersListProvider.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 43b08344..bbe4bfb8 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -235,7 +235,9 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
             try {
               lastRequestStart = Date.now()
               if (signal.aborted) return
-              const response = await fetch(`https://api.mcstatus.io/v2/status/java/${server.ip}`, { signal })
+              const response = await fetch(`https://api.mcstatus.io/v2/status/java/${server.ip}`, { 
+                // signal // DONT ADD SIGNAL IT WILL CRUSH JS RUNTIME
+              })
               const data: ServerResponse = await response.json()
               const versionClean = data.version?.name_raw.replace(/^[^\d.]+/, '')
 

From 81aaaab76db436d012e2432db5b34bf3418cd229 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 00:58:46 +0300
Subject: [PATCH 159/753] fix(proxy): Improve proxy URL handling for
 non-standard ports

---
 src/index.ts                      | 4 ++++
 src/react/ServersListProvider.tsx | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/index.ts b/src/index.ts
index 2c120bbd..6605331d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -300,6 +300,10 @@ async function connect (connectOptions: ConnectOptions) {
   if (connectOptions.proxy?.startsWith(':')) {
     connectOptions.proxy = `${location.protocol}//${location.hostname}${connectOptions.proxy}`
   }
+  if (connectOptions.proxy && location.port !== '80' && location.port !== '443' && !/:\d+$/.test(connectOptions.proxy)) {
+    const https = connectOptions.proxy.startsWith('https://') || location.protocol === 'https:'
+    connectOptions.proxy = `${connectOptions.proxy}:${https ? 443 : 80}`
+  }
   const proxy = cleanConnectIp(connectOptions.proxy, undefined)
   let { username } = connectOptions
 
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index bbe4bfb8..620cd91b 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -235,7 +235,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
             try {
               lastRequestStart = Date.now()
               if (signal.aborted) return
-              const response = await fetch(`https://api.mcstatus.io/v2/status/java/${server.ip}`, { 
+              const response = await fetch(`https://api.mcstatus.io/v2/status/java/${server.ip}`, {
                 // signal // DONT ADD SIGNAL IT WILL CRUSH JS RUNTIME
               })
               const data: ServerResponse = await response.json()

From b7da6e201fc1c8c276df09ba6d45b82b44b01997 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 01:52:04 +0300
Subject: [PATCH 160/753] up browserify

---
 .github/workflows/ci.yml | 2 +-
 pnpm-lock.yaml           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0551b541..db9ad30d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:
         run: npm install -g pnpm@9.0.4
 
       - name: Run pnpm dedupe
-        run: pnpm dedupe
+        run: pnpm dedupe --offline
 
       - name: Check for changes
         run: |
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index db949885..f278cf2d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -147,7 +147,7 @@ importers:
         version: 2.0.4
       net-browserify:
         specifier: github:zardoy/prismarinejs-net-browserify
-        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/ab3721ca833308a0be099d14ea0053fbd8459ace
+        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590
       node-gzip:
         specifier: ^1.1.2
         version: 1.1.2
@@ -6633,8 +6633,8 @@ packages:
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/ab3721ca833308a0be099d14ea0053fbd8459ace:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/ab3721ca833308a0be099d14ea0053fbd8459ace}
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590}
     version: 0.2.4
 
   nice-try@1.0.5:
@@ -17220,7 +17220,7 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/ab3721ca833308a0be099d14ea0053fbd8459ace:
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590:
     dependencies:
       body-parser: 1.20.2
       express: 4.18.2

From ad2ba0e24f57369723386f24969cc5ed9177cca6 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 02:23:24 +0300
Subject: [PATCH 161/753] feat(server): Add server connection validation and
 username validation on connect server UI with QS

---
 config.json                       | 14 +------
 src/api/mcStatusApi.ts            | 54 ++++++++++++++++++++++++
 src/react/AddServerOrConnect.tsx  | 69 +++++++++++++++++++++++++++++-
 src/react/Input.tsx               |  7 +++-
 src/react/ServersListProvider.tsx | 70 +++++++------------------------
 5 files changed, 142 insertions(+), 72 deletions(-)
 create mode 100644 src/api/mcStatusApi.ts

diff --git a/config.json b/config.json
index 7813b591..b1103ed8 100644
--- a/config.json
+++ b/config.json
@@ -8,18 +8,8 @@
   "promoteServers": [
     {
       "ip": "kaboom.pw",
-      "version": "1.18.2",
-      "description": "Chaos and destruction server. Free for everyone."
-    },
-    {
-      "ip": "play.applemc.fun",
-      "version": "1.18.2",
-      "description": "Very nice server. Try it now!"
-    },
-    {
-      "ip": "sus.shhnowisnottheti.me",
-      "version": "1.18.2",
-      "description": "Creative, your own 'boxes' (islands)"
+      "version": "1.20.3",
+      "description": "Very nice a polite server. Must try for everyone!"
     }
   ]
 }
diff --git a/src/api/mcStatusApi.ts b/src/api/mcStatusApi.ts
new file mode 100644
index 00000000..2a440f2b
--- /dev/null
+++ b/src/api/mcStatusApi.ts
@@ -0,0 +1,54 @@
+export const isServerValid = (ip: string) => {
+  const isInLocalNetwork = ip.startsWith('192.168.') ||
+    ip.startsWith('10.') ||
+    ip.startsWith('172.') ||
+    ip.startsWith('127.') ||
+    ip.startsWith('localhost') ||
+    ip.startsWith(':')
+  const VALID_IP_OR_DOMAIN = ip.includes('.')
+
+  return !isInLocalNetwork && VALID_IP_OR_DOMAIN
+}
+
+export async function fetchServerStatus (ip: string, signal?: AbortSignal) {
+  if (!isServerValid(ip)) return
+
+  const response = await fetch(`https://api.mcstatus.io/v2/status/java/${ip}`, { signal })
+  const data: ServerResponse = await response.json()
+  const versionClean = data.version?.name_raw.replace(/^[^\d.]+/, '')
+
+  return {
+    formattedText: data.motd?.raw ?? '',
+    textNameRight: data.online ?
+            `${versionClean} ${data.players?.online ?? '??'}/${data.players?.max ?? '??'}` :
+      '',
+    icon: data.icon,
+    offline: !data.online,
+    raw: data
+  }
+}
+
+export type ServerResponse = {
+  online: boolean
+  version?: {
+    name_raw: string
+  }
+  // display tooltip
+  players?: {
+    online: number
+    max: number
+    list: Array<{
+      name_raw: string
+      name_clean: string
+    }>
+  }
+  icon?: string
+  motd?: {
+    raw: string
+  }
+  // todo circle error icon
+  mods?: Array<{ name: string, version: string }>
+  // todo display via hammer icon
+  software?: string
+  plugins?: Array<{ name, version }>
+}
diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index 0287779b..76a1e42c 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -1,4 +1,5 @@
 import React, { useEffect } from 'react'
+import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
 import Screen from './Screen'
 import Input from './Input'
 import Button from './Button'
@@ -71,6 +72,53 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
     authenticatedAccountOverride,
   }
 
+  const [fetchedServerInfoIp, setFetchedServerInfoIp] = React.useState<string | undefined>(undefined)
+  const [serverOnline, setServerOnline] = React.useState(null as boolean | null)
+  const [onlinePlayersList, setOnlinePlayersList] = React.useState<string[]>([])
+
+  useEffect(() => {
+    const controller = new AbortController()
+
+    const checkServer = async () => {
+      if (!qsParamIp || !isServerValid(qsParamIp)) return
+
+      try {
+        const status = await fetchServerStatus(qsParamIp)
+        if (!status) return
+
+        setServerOnline(status.raw.online)
+        setOnlinePlayersList(status.raw.players?.list.map(p => p.name_raw) ?? [])
+        setFetchedServerInfoIp(qsParamIp)
+      } catch (err) {
+        console.error('Failed to fetch server status:', err)
+      }
+    }
+
+    void checkServer()
+    return () => controller.abort()
+  }, [qsParamIp])
+
+  const validateUsername = (username: string) => {
+    if (!username) return undefined
+    if (onlinePlayersList.includes(username)) {
+      return { border: 'red solid 1px' }
+    }
+    const MINECRAFT_USERNAME_REGEX = /^\w{3,16}$/
+    if (!MINECRAFT_USERNAME_REGEX.test(username)) {
+      return { border: 'red solid 1px' }
+    }
+    return undefined
+  }
+
+  const validateServerIp = () => {
+    if (!serverIp) return undefined
+    if (serverOnline) {
+      return { border: 'lightgreen solid 1px' }
+    } else {
+      return { border: 'red solid 1px' }
+    }
+  }
+
   useEffect(() => {
     if (qsParams?.get('autoConnect') === 'true' && qsParams?.get('ip') && allowAutoConnect) {
       onQsConnect?.(commonUseOptions)
@@ -100,7 +148,17 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
             <InputWithLabel label="Server Name" value={serverName} onChange={({ target: { value } }) => setServerName(value)} placeholder='Defaults to IP' />
           </div>
         </>}
-        <InputWithLabel required label="Server IP" value={serverIp} disabled={lockConnect && qsIpParts?.[0] !== null} onChange={({ target: { value } }) => setServerIp(value)} />
+        <InputWithLabel
+          required
+          label="Server IP"
+          value={serverIp}
+          disabled={lockConnect && qsIpParts?.[0] !== null}
+          onChange={({ target: { value } }) => {
+            setServerIp(value)
+            setServerOnline(false)
+          }}
+          validateInput={serverOnline === null || fetchedServerInfoIp !== serverIp ? undefined : validateServerIp}
+        />
         <InputWithLabel label="Server Port" value={serverPort} disabled={lockConnect && qsIpParts?.[1] !== null} onChange={({ target: { value } }) => setServerPort(value)} placeholder='25565' />
         {isSmallHeight ? <div style={{ gridColumn: 'span 2', marginTop: 10, }} /> : <div style={{ gridColumn: smallWidth ? '' : 'span 2' }}>Overrides:</div>}
         <div style={{
@@ -120,7 +178,14 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
         </div>
 
         <InputWithLabel label="Proxy Override" value={proxyOverride} disabled={lockConnect && qsParamProxy !== null} onChange={({ target: { value } }) => setProxyOverride(value)} placeholder={placeholders?.proxyOverride} />
-        <InputWithLabel label="Username Override" value={usernameOverride} disabled={!noAccountSelected || lockConnect && qsParamUsername !== null} onChange={({ target: { value } }) => setUsernameOverride(value)} placeholder={placeholders?.usernameOverride} />
+        <InputWithLabel
+          label="Username Override"
+          value={usernameOverride}
+          disabled={!noAccountSelected || lockConnect && qsParamUsername !== null}
+          onChange={({ target: { value } }) => setUsernameOverride(value)}
+          placeholder={placeholders?.usernameOverride}
+          validateInput={!serverOnline || fetchedServerInfoIp !== serverIp ? undefined : validateUsername}
+        />
         <label style={{
           display: 'flex',
           flexDirection: 'column',
diff --git a/src/react/Input.tsx b/src/react/Input.tsx
index 72baef53..f265eb5f 100644
--- a/src/react/Input.tsx
+++ b/src/react/Input.tsx
@@ -1,4 +1,4 @@
-import React, { CSSProperties, useEffect, useRef, useState } from 'react'
+import React, { CSSProperties, useEffect, useMemo, useRef, useState } from 'react'
 import { isMobile } from 'prismarine-viewer/viewer/lib/simpleUtils'
 import styles from './input.module.css'
 
@@ -28,6 +28,10 @@ export default ({ autoFocus, rootStyles, inputRef, validateInput, defaultValue,
   }, [])
 
 
+  useEffect(() => {
+    setValidationStyle(validateInput?.(value as any) ?? {})
+  }, [value, validateInput])
+
   return <div id='input-container' className={styles.container} style={rootStyles}>
     <input
       ref={ref}
@@ -41,7 +45,6 @@ export default ({ autoFocus, rootStyles, inputRef, validateInput, defaultValue,
       {...inputProps}
       value={value}
       onChange={(e) => {
-        setValidationStyle(validateInput?.(e.target.value) ?? {})
         setValue(e.target.value)
         inputProps.onChange?.(e)
       }}
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 620cd91b..16ce2c92 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -4,6 +4,7 @@ import { useSnapshot } from 'valtio'
 import { ConnectOptions } from '../connect'
 import { activeModalStack, hideCurrentModal, miscUiState, showModal } from '../globalState'
 import supportedVersions from '../supportedVersions.mjs'
+import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
 import ServersList from './ServersList'
 import AddServerOrConnect, { BaseServerInfo } from './AddServerOrConnect'
 import { useDidUpdateEffect } from './utils'
@@ -11,38 +12,13 @@ import { useIsModalActive } from './utilsApp'
 import { showOptionsModal } from './SelectOption'
 import { useCopyKeybinding } from './simpleHooks'
 
-interface StoreServerItem extends BaseServerInfo {
+export interface StoreServerItem extends BaseServerInfo {
   lastJoined?: number
   description?: string
   optionsOverride?: Record<string, any>
   autoLogin?: Record<string, string>
 }
 
-type ServerResponse = {
-  online: boolean
-  version?: {
-    name_raw: string
-  }
-  // display tooltip
-  players?: {
-    online: number
-    max: number
-    list: Array<{
-      name_raw: string
-      name_clean: string
-    }>
-  }
-  icon?: string
-  motd?: {
-    raw: string
-  }
-  // todo circle error icon
-  mods?: Array<{ name, version }>
-  // todo display via hammer icon
-  software?: string
-  plugins?: Array<{ name, version }>
-}
-
 type AdditionalDisplayData = {
   formattedText: string
   textNameRight: string
@@ -200,19 +176,14 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
     return serversList.map((server, index) => ({ ...server, index })).sort((a, b) => (b.lastJoined ?? 0) - (a.lastJoined ?? 0))
   }, [serversList])
 
+  const isEditScreenModal = useIsModalActive('editServer')
+
   useUtilsEffect(({ signal }) => {
+    if (isEditScreenModal) return
     const update = async () => {
       const queue = serversListSorted
         .map(server => {
-          const isInLocalNetwork = server.ip.startsWith('192.168.') ||
-            server.ip.startsWith('10.') ||
-            server.ip.startsWith('172.') ||
-            server.ip.startsWith('127.') ||
-            server.ip.startsWith('localhost') ||
-            server.ip.startsWith(':')
-
-          const VALID_IP_OR_DOMAIN = server.ip.includes('.')
-          if (isInLocalNetwork || signal.aborted || !VALID_IP_OR_DOMAIN) return null
+          if (!isServerValid(server.ip) || signal.aborted) return null
 
           return server
         })
@@ -235,23 +206,13 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
             try {
               lastRequestStart = Date.now()
               if (signal.aborted) return
-              const response = await fetch(`https://api.mcstatus.io/v2/status/java/${server.ip}`, {
-                // signal // DONT ADD SIGNAL IT WILL CRUSH JS RUNTIME
-              })
-              const data: ServerResponse = await response.json()
-              const versionClean = data.version?.name_raw.replace(/^[^\d.]+/, '')
-
-              setAdditionalData(old => ({
-                ...old,
-                [server.ip]: {
-                  formattedText: data.motd?.raw ?? '',
-                  textNameRight: data.online ?
-                    `${versionClean} ${data.players?.online ?? '??'}/${data.players?.max ?? '??'}` :
-                    '',
-                  icon: data.icon,
-                  offline: !data.online
-                }
-              }))
+              const data = await fetchServerStatus(server.ip/* , signal */) // DONT ADD SIGNAL IT WILL CRUSH JS RUNTIME
+              if (data) {
+                setAdditionalData(old => ({
+                  ...old,
+                  [server.ip]: data
+                }))
+              }
             } finally {
               activeRequests.delete(request)
               resolve()
@@ -262,14 +223,11 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         activeRequests.add(request)
       }
 
-      // Wait for remaining requests
       await Promise.all(activeRequests)
     }
 
     void update()
-  }, [serversListSorted])
-
-  const isEditScreenModal = useIsModalActive('editServer')
+  }, [serversListSorted, isEditScreenModal])
 
   useDidUpdateEffect(() => {
     if (serverEditScreen && !isEditScreenModal) {

From 28552bd1de003314a2d9f908b42b193865bebe0e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 02:23:47 +0300
Subject: [PATCH 162/753] feat: Add option to disable service worker during
 build

---
 Dockerfile           |  3 ++-
 package.json         |  2 +-
 rsbuild.config.ts    | 22 +++++++++++++---------
 src/serviceWorker.ts |  1 +
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 330445f8..aacbec19 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ COPY . /app
 RUN npm i -g pnpm@9.0.4
 # Build arguments
 ARG DOWNLOAD_SOUNDS=false
+ARG DISABLE_SERVICE_WORKER=false
 # TODO need flat --no-root-optional
 RUN node ./scripts/dockerPrepare.mjs
 RUN pnpm i
@@ -21,7 +22,7 @@ RUN if [ "$DOWNLOAD_SOUNDS" = "true" ] ; then node scripts/downloadSoundsMap.mjs
 # ENTRYPOINT ["pnpm", "run", "run-all"]
 
 # only for prod
-RUN GITHUB_REPOSITORY=zardoy/minecraft-web-client pnpm run build
+RUN GITHUB_REPOSITORY=zardoy/minecraft-web-client DISABLE_SERVICE_WORKER=$DISABLE_SERVICE_WORKER pnpm run build
 
 # ---- Run Stage ----
 FROM node:18-alpine
diff --git a/package.json b/package.json
index 1d2eb062..946632ac 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
-    "net-browserify": "github:zardoy/prismarinejs-net-browserify",
+    "net-browserify": "file:../prismarinejs-net-browserify",
     "node-gzip": "^1.1.2",
     "peerjs": "^1.5.0",
     "pixelarticons": "^1.8.1",
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index cec3d901..c84c3c92 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -20,6 +20,7 @@ const execAsync = promisify(childProcess.exec)
 const buildingVersion = new Date().toISOString().split(':')[0]
 
 const dev = process.env.NODE_ENV === 'development'
+const disableServiceWorker = process.env.DISABLE_SERVICE_WORKER === 'true'
 
 let releaseTag
 let releaseChangelog
@@ -59,6 +60,7 @@ const appConfig = defineConfig({
             'process.env.DEPS_VERSIONS': JSON.stringify({}),
             'process.env.RELEASE_TAG': JSON.stringify(releaseTag),
             'process.env.RELEASE_CHANGELOG': JSON.stringify(releaseChangelog),
+            'process.env.DISABLE_SERVICE_WORKER': JSON.stringify(disableServiceWorker),
         },
     },
     server: {
@@ -124,15 +126,17 @@ const appConfig = defineConfig({
                         prep()
                     })
                     build.onAfterBuild(async () => {
-                        const { count, size, warnings } = await generateSW({
-                            // dontCacheBustURLsMatching: [new RegExp('...')],
-                            globDirectory: 'dist',
-                            skipWaiting: true,
-                            clientsClaim: true,
-                            additionalManifestEntries: getSwAdditionalEntries(),
-                            globPatterns: [],
-                            swDest: './dist/service-worker.js',
-                        })
+                        if (!disableServiceWorker) {
+                            const { count, size, warnings } = await generateSW({
+                                // dontCacheBustURLsMatching: [new RegExp('...')],
+                                globDirectory: 'dist',
+                                skipWaiting: true,
+                                clientsClaim: true,
+                                additionalManifestEntries: getSwAdditionalEntries(),
+                                globPatterns: [],
+                                swDest: './dist/service-worker.js',
+                            })
+                        }
                     })
                 }
                 build.onBeforeStartDevServer(() => prep())
diff --git a/src/serviceWorker.ts b/src/serviceWorker.ts
index c64ba0f6..1cec6863 100644
--- a/src/serviceWorker.ts
+++ b/src/serviceWorker.ts
@@ -2,6 +2,7 @@ import { isCypress } from './standaloneUtils'
 
 // might not resolve at all
 export const registerServiceWorker = async () => {
+  if (process.env.DISABLE_SERVICE_WORKER) return
   if (!('serviceWorker' in navigator)) return
   if (!isCypress() && process.env.NODE_ENV !== 'development') {
     return new Promise<void>(resolve => {

From 51d8975f5e0c987229e9ed76a29fcd48b3838511 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 02:27:43 +0300
Subject: [PATCH 163/753] chore: Update net-browserify dependency to GitHub
 source

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 946632ac..1d2eb062 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
-    "net-browserify": "file:../prismarinejs-net-browserify",
+    "net-browserify": "github:zardoy/prismarinejs-net-browserify",
     "node-gzip": "^1.1.2",
     "peerjs": "^1.5.0",
     "pixelarticons": "^1.8.1",

From 978bd16785d8dd224054b400272f557771ca5696 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 02:34:49 +0300
Subject: [PATCH 164/753] ci: rm --offline flag

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index db9ad30d..0551b541 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:
         run: npm install -g pnpm@9.0.4
 
       - name: Run pnpm dedupe
-        run: pnpm dedupe --offline
+        run: pnpm dedupe
 
       - name: Check for changes
         run: |

From b5a8bf16ff03fa09e5c01e44339e2d12c17ead4c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 02:47:08 +0300
Subject: [PATCH 165/753] fix critical inventory regression

---
 src/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/index.ts b/src/index.ts
index 6605331d..4833f172 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -887,6 +887,8 @@ async function connect (connectOptions: ConnectOptions) {
 
     console.log('Done!')
 
+    onGameLoad(() => {})
+
     if (appStatusState.isError) return
     setTimeout(() => {
       // todo

From 379484327eb56e37575870ab25d3880684c2e56c Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 02:51:56 +0300
Subject: [PATCH 166/753] refactor: Rework mobile controls! (#260)

Separate movement and interaction touch controls
Add new options for touch control types (modern/classic)
Refactor touch interaction handling and event management
Create a new GameInteractionOverlay component for touch interactions for less bugs in future
Update touch controls UI and positioning logic

Co-authored-by: qodo-merge-pro-for-open-source[bot] <189517486+qodo-merge-pro-for-open-source[bot]@users.noreply.github.com>
---
 src/cameraRotationControls.ts            |  78 +++++++++
 src/globalState.ts                       |   4 +
 src/index.ts                             | 191 +----------------------
 src/optionsGuiScheme.tsx                 |  25 +--
 src/optionsStorage.ts                    |   6 +-
 src/react/GameInteractionOverlay.tsx     | 187 ++++++++++++++++++++++
 src/react/IndicatorEffects.css           |   2 +-
 src/react/MobileTopButtons.module.css    |   2 +-
 src/react/TouchAreasControls.tsx         | 121 +++++++-------
 src/react/TouchAreasControlsProvider.tsx |   5 +-
 src/react/TouchControls.tsx              |   4 +-
 src/reactUi.tsx                          |   2 +
 12 files changed, 371 insertions(+), 256 deletions(-)
 create mode 100644 src/cameraRotationControls.ts
 create mode 100644 src/react/GameInteractionOverlay.tsx

diff --git a/src/cameraRotationControls.ts b/src/cameraRotationControls.ts
new file mode 100644
index 00000000..aebca338
--- /dev/null
+++ b/src/cameraRotationControls.ts
@@ -0,0 +1,78 @@
+import { contro } from './controls'
+import { activeModalStack, isGameActive, miscUiState, showModal } from './globalState'
+import { options } from './optionsStorage'
+import { hideNotification, notificationProxy } from './react/NotificationProvider'
+import { pointerLock } from './utils'
+import worldInteractions from './worldInteractions'
+
+let lastMouseMove: number
+
+export const updateCursor = () => {
+  worldInteractions.update()
+}
+
+export type CameraMoveEvent = {
+  movementX: number
+  movementY: number
+  type: string
+  stopPropagation?: () => void
+}
+
+export function onCameraMove (e: MouseEvent | CameraMoveEvent) {
+  if (!isGameActive(true)) return
+  if (e.type !== 'touchmove' && !document.pointerLockElement) return
+  e.stopPropagation?.()
+  const now = performance.now()
+  // todo: limit camera movement for now to avoid unexpected jumps
+  if (now - lastMouseMove < 4) return
+  lastMouseMove = now
+  let { mouseSensX, mouseSensY } = options
+  if (mouseSensY === -1) mouseSensY = mouseSensX
+  moveCameraRawHandler({
+    x: e.movementX * mouseSensX * 0.0001,
+    y: e.movementY * mouseSensY * 0.0001
+  })
+  updateCursor()
+}
+
+export const moveCameraRawHandler = ({ x, y }: { x: number; y: number }) => {
+  const maxPitch = 0.5 * Math.PI
+  const minPitch = -0.5 * Math.PI
+
+  viewer.world.lastCamUpdate = Date.now()
+  if (!bot?.entity) return
+  const pitch = bot.entity.pitch - y
+  void bot.look(bot.entity.yaw - x, Math.max(minPitch, Math.min(maxPitch, pitch)), true)
+}
+
+
+window.addEventListener('mousemove', (e: MouseEvent) => {
+  onCameraMove(e)
+}, { capture: true })
+
+contro.on('stickMovement', ({ stick, vector }) => {
+  if (!isGameActive(true)) return
+  if (stick !== 'right') return
+  let { x, z } = vector
+  if (Math.abs(x) < 0.18) x = 0
+  if (Math.abs(z) < 0.18) z = 0
+  onCameraMove({
+    movementX: x * 10,
+    movementY: z * 10,
+    type: 'stickMovement',
+    stopPropagation () {}
+  } as CameraMoveEvent)
+  miscUiState.usingGamepadInput = true
+})
+
+function pointerLockChangeCallback () {
+  if (notificationProxy.id === 'pointerlockchange') {
+    hideNotification()
+  }
+  if (viewer.renderer.xr.isPresenting) return // todo
+  if (!pointerLock.hasPointerLock && activeModalStack.length === 0) {
+    showModal({ reactType: 'pause-screen' })
+  }
+}
+
+document.addEventListener('pointerlockchange', pointerLockChangeCallback, false)
diff --git a/src/globalState.ts b/src/globalState.ts
index e09db053..fa76db75 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -97,6 +97,10 @@ export const openOptionsMenu = (group: OptionsGroupType) => {
   showModal({ reactType: `options-${group}` })
 }
 
+subscribe(activeModalStack, () => {
+  document.body.style.setProperty('--has-modals-z', activeModalStack.length ? '-1' : null)
+})
+
 // ---
 
 export const currentContextMenu = proxy({ items: [] as ContextMenuItem[] | null, x: 0, y: 0 })
diff --git a/src/index.ts b/src/index.ts
index 4833f172..8cf07b1e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -7,12 +7,10 @@ import './entities'
 import './globalDomListeners'
 import './mineflayer/maps'
 import './mineflayer/cameraShake'
+import './inventoryWindows'
 import initCollisionShapes from './getCollisionInteractionShapes'
-import { onGameLoad } from './inventoryWindows'
-import { supportedVersions } from 'minecraft-protocol'
 import protocolMicrosoftAuth from 'minecraft-protocol/src/client/microsoftAuth'
 import microsoftAuthflow from './microsoftAuthflow'
-import nbt from 'prismarine-nbt'
 
 import 'core-js/features/array/at'
 import 'core-js/features/promise/with-resolvers'
@@ -24,7 +22,7 @@ import PrismarineItem from 'prismarine-item'
 
 import { options, watchValue } from './optionsStorage'
 import './reactUi'
-import { contro, lockUrl, onBotCreate } from './controls'
+import { lockUrl, onBotCreate } from './controls'
 import './dragndrop'
 import { possiblyCleanHandle, resetStateAfterDisconnect } from './browserfs'
 import { watchOptionsAfterViewerInit, watchOptionsAfterWorldViewInit } from './watchOptions'
@@ -40,7 +38,7 @@ import { Vec3 } from 'vec3'
 import worldInteractions from './worldInteractions'
 
 import * as THREE from 'three'
-import MinecraftData, { versionsByMinecraftVersion } from 'minecraft-data'
+import MinecraftData from 'minecraft-data'
 import debug from 'debug'
 import { defaultsDeep } from 'lodash-es'
 import initializePacketsReplay from './packetsReplay'
@@ -57,11 +55,8 @@ import {
   showModal
 } from './globalState'
 
-
 import {
-  pointerLock,
-  toMajorVersion,
-  setLoadingScreenStatus
+  pointerLock, setLoadingScreenStatus
 } from './utils'
 import { isCypress } from './standaloneUtils'
 
@@ -76,7 +71,6 @@ import dayCycle from './dayCycle'
 import { onAppLoad, resourcepackReload } from './resourcePack'
 import { ConnectPeerOptions, connectToPeer } from './localServerMultiplayer'
 import CustomChannelClient from './customClient'
-import { loadScript } from 'prismarine-viewer/viewer/lib/utils'
 import { registerServiceWorker } from './serviceWorker'
 import { appStatusState, lastConnectOptions } from './react/AppStatusProvider'
 
@@ -84,9 +78,7 @@ import { fsState } from './loadSave'
 import { watchFov } from './rendererUtils'
 import { loadInMemorySave } from './react/SingleplayerProvider'
 
-import { downloadSoundsIfNeeded } from './sounds/botSoundSystem'
 import { ua } from './react/utils'
-import { handleMovementStickDelta, joystickPointer } from './react/TouchAreasControls'
 import { possiblyHandleStateVariable } from './googledrive'
 import flyingSquidEvents from './flyingSquidEvents'
 import { hideNotification, notificationProxy, showNotification } from './react/NotificationProvider'
@@ -105,6 +97,8 @@ import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
 import { getViewerVersionData, getWsProtocolStream } from './viewerConnector'
+import { updateCursor } from './cameraRotationControls'
+import { onGameLoad } from './inventoryWindows'
 
 window.debug = debug
 window.THREE = THREE
@@ -200,37 +194,6 @@ viewer.entities.entitiesOptions = {
 }
 watchOptionsAfterViewerInit()
 
-let mouseMovePostHandle = (e) => { }
-let lastMouseMove: number
-const updateCursor = () => {
-  worldInteractions.update()
-}
-function onCameraMove (e) {
-  if (e.type !== 'touchmove' && !pointerLock.hasPointerLock) return
-  e.stopPropagation?.()
-  const now = performance.now()
-  // todo: limit camera movement for now to avoid unexpected jumps
-  if (now - lastMouseMove < 4) return
-  lastMouseMove = now
-  let { mouseSensX, mouseSensY } = options
-  if (mouseSensY === -1) mouseSensY = mouseSensX
-  mouseMovePostHandle({
-    x: e.movementX * mouseSensX * 0.0001,
-    y: e.movementY * mouseSensY * 0.0001
-  })
-  updateCursor()
-}
-window.addEventListener('mousemove', onCameraMove, { capture: true })
-contro.on('stickMovement', ({ stick, vector }) => {
-  if (!isGameActive(true)) return
-  if (stick !== 'right') return
-  let { x, z } = vector
-  if (Math.abs(x) < 0.18) x = 0
-  if (Math.abs(z) < 0.18) z = 0
-  onCameraMove({ movementX: x * 10, movementY: z * 10, type: 'touchmove' })
-  miscUiState.usingGamepadInput = true
-})
-
 function hideCurrentScreens () {
   activeModalStacks['main-menu'] = [...activeModalStack]
   insertActiveModalStack('', [])
@@ -285,7 +248,7 @@ const cleanConnectIp = (host: string | undefined, defaultPort: string | undefine
   }
 }
 
-async function connect (connectOptions: ConnectOptions) {
+export async function connect (connectOptions: ConnectOptions) {
   if (miscUiState.gameLoaded) return
   miscUiState.hasErrors = false
   lastConnectOptions.value = connectOptions
@@ -749,144 +712,6 @@ async function connect (connectOptions: ConnectOptions) {
 
     setLoadingScreenStatus('Setting callbacks')
 
-    const maxPitch = 0.5 * Math.PI
-    const minPitch = -0.5 * Math.PI
-    mouseMovePostHandle = ({ x, y }) => {
-      viewer.world.lastCamUpdate = Date.now()
-      bot.entity.pitch -= y
-      bot.entity.pitch = Math.max(minPitch, Math.min(maxPitch, bot.entity.pitch))
-      bot.entity.yaw -= x
-    }
-
-    function changeCallback () {
-      if (notificationProxy.id === 'pointerlockchange') {
-        hideNotification()
-      }
-      if (renderer.xr.isPresenting) return // todo
-      if (!pointerLock.hasPointerLock && activeModalStack.length === 0) {
-        showModal({ reactType: 'pause-screen' })
-      }
-    }
-
-    registerListener(document, 'pointerlockchange', changeCallback, false)
-
-    const cameraControlEl = document.querySelector('#ui-root')
-
-    /** after what time of holding the finger start breaking the block */
-    const touchStartBreakingBlockMs = 500
-    let virtualClickActive = false
-    let virtualClickTimeout
-    let screenTouches = 0
-    let capturedPointer: { id; x; y; sourceX; sourceY; activateCameraMove; time } | undefined
-    registerListener(document, 'pointerdown', (e) => {
-      const usingJoystick = options.touchControlsType === 'joystick-buttons'
-      const clickedEl = e.composedPath()[0]
-      if (!isGameActive(true) || !miscUiState.currentTouch || clickedEl !== cameraControlEl || e.pointerId === undefined) {
-        return
-      }
-      screenTouches++
-      if (screenTouches === 3) {
-        // todo needs fixing!
-        // window.dispatchEvent(new MouseEvent('mousedown', { button: 1 }))
-      }
-      if (usingJoystick) {
-        if (!joystickPointer.pointer && e.clientX < window.innerWidth / 2) {
-          joystickPointer.pointer = {
-            pointerId: e.pointerId,
-            x: e.clientX,
-            y: e.clientY
-          }
-          return
-        }
-      }
-      if (capturedPointer) {
-        return
-      }
-      cameraControlEl.setPointerCapture(e.pointerId)
-      capturedPointer = {
-        id: e.pointerId,
-        x: e.clientX,
-        y: e.clientY,
-        sourceX: e.clientX,
-        sourceY: e.clientY,
-        activateCameraMove: false,
-        time: Date.now()
-      }
-      if (options.touchControlsType !== 'joystick-buttons') {
-        virtualClickTimeout ??= setTimeout(() => {
-          virtualClickActive = true
-          document.dispatchEvent(new MouseEvent('mousedown', { button: 0 }))
-        }, touchStartBreakingBlockMs)
-      }
-    })
-    registerListener(document, 'pointermove', (e) => {
-      if (e.pointerId === undefined) return
-      const supportsPressure = (e as any).pressure !== undefined && (e as any).pressure !== 0 && (e as any).pressure !== 0.5 && (e as any).pressure !== 1 && (e.pointerType === 'touch' || e.pointerType === 'pen')
-      if (e.pointerId === joystickPointer.pointer?.pointerId) {
-        handleMovementStickDelta(e)
-        if (supportsPressure && (e as any).pressure > 0.5) {
-          bot.setControlState('sprint', true)
-          // todo
-        }
-        return
-      }
-      if (e.pointerId !== capturedPointer?.id) return
-      window.scrollTo(0, 0)
-      e.preventDefault()
-      e.stopPropagation()
-
-      const allowedJitter = 1.1
-      if (supportsPressure) {
-        bot.setControlState('jump', (e as any).pressure > 0.5)
-      }
-      const xDiff = Math.abs(e.pageX - capturedPointer.sourceX) > allowedJitter
-      const yDiff = Math.abs(e.pageY - capturedPointer.sourceY) > allowedJitter
-      if (!capturedPointer.activateCameraMove && (xDiff || yDiff)) capturedPointer.activateCameraMove = true
-      if (capturedPointer.activateCameraMove) {
-        clearTimeout(virtualClickTimeout)
-      }
-      onCameraMove({ movementX: e.pageX - capturedPointer.x, movementY: e.pageY - capturedPointer.y, type: 'touchmove' })
-      capturedPointer.x = e.pageX
-      capturedPointer.y = e.pageY
-    }, { passive: false })
-
-    const pointerUpHandler = (e: PointerEvent) => {
-      if (e.pointerId === undefined) return
-      if (e.pointerId === joystickPointer.pointer?.pointerId) {
-        handleMovementStickDelta()
-        joystickPointer.pointer = null
-        return
-      }
-      if (e.pointerId !== capturedPointer?.id) return
-      clearTimeout(virtualClickTimeout)
-      virtualClickTimeout = undefined
-
-      if (options.touchControlsType !== 'joystick-buttons') {
-        if (virtualClickActive) {
-          // button 0 is left click
-          document.dispatchEvent(new MouseEvent('mouseup', { button: 0 }))
-          virtualClickActive = false
-        } else if (!capturedPointer.activateCameraMove && (Date.now() - capturedPointer.time < touchStartBreakingBlockMs)) {
-          document.dispatchEvent(new MouseEvent('mousedown', { button: 2 }))
-          worldInteractions.update()
-          document.dispatchEvent(new MouseEvent('mouseup', { button: 2 }))
-        }
-      }
-      capturedPointer = undefined
-      screenTouches--
-    }
-    registerListener(document, 'pointerup', pointerUpHandler)
-    registerListener(document, 'pointercancel', pointerUpHandler)
-    registerListener(document, 'lostpointercapture', pointerUpHandler)
-
-    registerListener(document, 'contextmenu', (e) => e.preventDefault(), false)
-
-    registerListener(document, 'blur', (e) => {
-      bot.clearControlStates()
-    }, false)
-
-    console.log('Done!')
-
     onGameLoad(() => {})
 
     if (appStatusState.isError) return
@@ -912,7 +737,7 @@ async function connect (connectOptions: ConnectOptions) {
       // todo might not emit as servers simply don't send chunk if it's empty
       if (!viewer.world.allChunksFinished || done) return
       done = true
-      console.log('All done and ready! In', (Date.now() - start) / 1000, 's')
+      console.log('All chunks done and ready! Time from renderer open to ready', (Date.now() - start) / 1000, 's')
       viewer.render() // ensure the last state is rendered
       document.dispatchEvent(new Event('cypress-world-ready'))
     })
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 47ec5350..2ee07d5c 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -355,33 +355,38 @@ export const guiOptionsScheme: {
       touchButtonsSize: {
         min: 40,
         disableIf: [
-          'touchControlsType',
-          'joystick-buttons'
+          'touchMovementType',
+          'modern'
         ],
       },
       touchButtonsOpacity: {
         min: 10,
         max: 90,
         disableIf: [
-          'touchControlsType',
-          'joystick-buttons'
+          'touchMovementType',
+          'modern'
         ],
       },
       touchButtonsPosition: {
         max: 80,
         disableIf: [
-          'touchControlsType',
-          'joystick-buttons'
+          'touchMovementType',
+          'modern'
         ],
       },
-      touchControlsType: {
-        values: [['classic', 'Classic'], ['joystick-buttons', 'New']],
+      touchMovementType: {
+        text: 'Movement Controls',
+        values: [['modern', 'Modern'], ['classic', 'Classic']],
+      },
+      touchInteractionType: {
+        text: 'Interaction Controls',
+        values: [['classic', 'Classic'], ['buttons', 'Buttons']],
       },
     },
     {
       custom () {
-        const { touchControlsType } = useSnapshot(options)
-        return <Button label='Setup Touch Buttons' onClick={() => showModal({ reactType: 'touch-buttons-setup' })} inScreen disabled={touchControlsType !== 'joystick-buttons'} />
+        const { touchInteractionType, touchMovementType } = useSnapshot(options)
+        return <Button label='Setup Touch Buttons' onClick={() => showModal({ reactType: 'touch-buttons-setup' })} inScreen disabled={touchInteractionType === 'classic' && touchMovementType === 'classic'} />
       },
     },
     {
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index cf1eccd5..267a7e5f 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -34,7 +34,8 @@ const defaultOptions = {
   touchButtonsOpacity: 80,
   touchButtonsPosition: 12,
   touchControlsPositions: getDefaultTouchControlsPositions(),
-  touchControlsType: 'classic' as 'classic' | 'joystick-buttons',
+  touchMovementType: 'modern' as 'modern' | 'classic',
+  touchInteractionType: 'classic' as 'classic' | 'buttons',
   gpuPreference: 'default' as 'default' | 'high-performance' | 'low-power',
   backgroundRendering: '20fps' as 'full' | '20fps' | '5fps',
   /** @unstable */
@@ -137,6 +138,9 @@ const migrateOptions = (options: Partial<AppOptions & Record<string, any>>) => {
   if (options.touchControlsPositions?.jump === undefined) {
     options.touchControlsPositions!.jump = defaultOptions.touchControlsPositions.jump
   }
+  if (options.touchControlsType === 'joystick-buttons') {
+    options.touchInteractionType = 'buttons'
+  }
 
   return options
 }
diff --git a/src/react/GameInteractionOverlay.tsx b/src/react/GameInteractionOverlay.tsx
new file mode 100644
index 00000000..f6522e62
--- /dev/null
+++ b/src/react/GameInteractionOverlay.tsx
@@ -0,0 +1,187 @@
+import { useRef } from 'react'
+import { useSnapshot } from 'valtio'
+import { useUtilsEffect } from '@zardoy/react-util'
+import { options } from '../optionsStorage'
+import { activeModalStack, isGameActive, miscUiState } from '../globalState'
+import worldInteractions from '../worldInteractions'
+import { onCameraMove, CameraMoveEvent } from '../cameraRotationControls'
+import { handleMovementStickDelta, joystickPointer } from './TouchAreasControls'
+
+/** after what time of holding the finger start breaking the block */
+const touchStartBreakingBlockMs = 500
+
+function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
+  const overlayRef = useRef<HTMLDivElement>(null)
+
+  useUtilsEffect(({ signal }) => {
+    if (!overlayRef.current) return
+
+    const cameraControlEl = overlayRef.current
+    let virtualClickActive = false
+    let virtualClickTimeout: NodeJS.Timeout | undefined
+    let screenTouches = 0
+    let capturedPointer: {
+      id: number;
+      x: number;
+      y: number;
+      sourceX: number;
+      sourceY: number;
+      activateCameraMove: boolean;
+      time: number
+    } | undefined
+
+    const pointerDownHandler = (e: PointerEvent) => {
+      const clickedEl = e.composedPath()[0]
+      if (!isGameActive(true) || clickedEl !== cameraControlEl || e.pointerId === undefined) {
+        return
+      }
+      screenTouches++
+      if (screenTouches === 3) {
+        // todo maybe mouse wheel click?
+      }
+      const usingModernMovement = options.touchMovementType === 'modern'
+      if (usingModernMovement) {
+        if (!joystickPointer.pointer && e.clientX < window.innerWidth / 2) {
+          cameraControlEl.setPointerCapture(e.pointerId)
+          joystickPointer.pointer = {
+            pointerId: e.pointerId,
+            x: e.clientX,
+            y: e.clientY
+          }
+          return
+        }
+      }
+      if (capturedPointer) {
+        return
+      }
+      cameraControlEl.setPointerCapture(e.pointerId)
+      capturedPointer = {
+        id: e.pointerId,
+        x: e.clientX,
+        y: e.clientY,
+        sourceX: e.clientX,
+        sourceY: e.clientY,
+        activateCameraMove: false,
+        time: Date.now()
+      }
+      if (options.touchInteractionType === 'classic') {
+        virtualClickTimeout ??= setTimeout(() => {
+          virtualClickActive = true
+          document.dispatchEvent(new MouseEvent('mousedown', { button: 0 }))
+        }, touchStartBreakingBlockMs)
+      }
+    }
+
+    const pointerMoveHandler = (e: PointerEvent) => {
+      if (e.pointerId === undefined) return
+      const supportsPressure = (e as any).pressure !== undefined &&
+        (e as any).pressure !== 0 &&
+        (e as any).pressure !== 0.5 &&
+        (e as any).pressure !== 1 &&
+        (e.pointerType === 'touch' || e.pointerType === 'pen')
+
+      if (e.pointerId === joystickPointer.pointer?.pointerId) {
+        handleMovementStickDelta(e)
+        if (supportsPressure && (e as any).pressure > 0.5) {
+          bot.setControlState('sprint', true)
+        }
+        return
+      }
+      if (e.pointerId !== capturedPointer?.id) return
+      // window.scrollTo(0, 0)
+      e.preventDefault()
+      e.stopPropagation()
+
+      const allowedJitter = 1.1
+      if (supportsPressure) {
+        bot.setControlState('jump', (e as any).pressure > 0.5)
+      }
+      const xDiff = Math.abs(e.pageX - capturedPointer.sourceX) > allowedJitter
+      const yDiff = Math.abs(e.pageY - capturedPointer.sourceY) > allowedJitter
+      if (!capturedPointer.activateCameraMove && (xDiff || yDiff)) {
+        capturedPointer.activateCameraMove = true
+      }
+      if (capturedPointer.activateCameraMove) {
+        clearTimeout(virtualClickTimeout)
+      }
+
+      onCameraMove({
+        movementX: e.pageX - capturedPointer.x,
+        movementY: e.pageY - capturedPointer.y,
+        type: 'touchmove',
+        stopPropagation: () => e.stopPropagation()
+      } as CameraMoveEvent)
+      capturedPointer.x = e.pageX
+      capturedPointer.y = e.pageY
+    }
+
+    const pointerUpHandler = (e: PointerEvent) => {
+      if (e.pointerId === undefined) return
+      if (e.pointerId === joystickPointer.pointer?.pointerId) {
+        handleMovementStickDelta()
+        joystickPointer.pointer = null
+        return
+      }
+      if (e.pointerId !== capturedPointer?.id) return
+      clearTimeout(virtualClickTimeout)
+      virtualClickTimeout = undefined
+
+      if (virtualClickActive) {
+        // button 0 is left click
+        document.dispatchEvent(new MouseEvent('mouseup', { button: 0 }))
+        virtualClickActive = false
+      } else if (!capturedPointer.activateCameraMove && (Date.now() - capturedPointer.time < touchStartBreakingBlockMs)) {
+        document.dispatchEvent(new MouseEvent('mousedown', { button: 2 }))
+        worldInteractions.update()
+        document.dispatchEvent(new MouseEvent('mouseup', { button: 2 }))
+      }
+
+      capturedPointer = undefined
+      screenTouches--
+    }
+
+    const contextMenuHandler = (e: Event) => {
+      e.preventDefault()
+    }
+
+    const blurHandler = () => {
+      bot.clearControlStates()
+    }
+
+    cameraControlEl.addEventListener('pointerdown', pointerDownHandler, { signal })
+    cameraControlEl.addEventListener('pointermove', pointerMoveHandler, { signal })
+    cameraControlEl.addEventListener('pointerup', pointerUpHandler, { signal })
+    cameraControlEl.addEventListener('pointercancel', pointerUpHandler, { signal })
+    cameraControlEl.addEventListener('lostpointercapture', pointerUpHandler, { signal })
+    cameraControlEl.addEventListener('contextmenu', contextMenuHandler, { signal })
+    window.addEventListener('blur', blurHandler, { signal })
+  }, [])
+
+  return (
+    <OverlayElement divRef={overlayRef} zIndex={zIndex} />
+  )
+}
+
+const OverlayElement = ({ divRef, zIndex }: { divRef: React.RefObject<HTMLDivElement>, zIndex: number }) => {
+  return <div
+    className='game-interaction-overlay'
+    ref={divRef}
+    style={{
+      position: 'fixed',
+      top: 0,
+      left: 0,
+      right: 0,
+      bottom: 0,
+      zIndex,
+      touchAction: 'none',
+      userSelect: 'none'
+    }}
+  />
+}
+
+export default function GameInteractionOverlay ({ zIndex }: { zIndex: number }) {
+  const modalStack = useSnapshot(activeModalStack)
+  const { currentTouch } = useSnapshot(miscUiState)
+  if (modalStack.length > 0 || !currentTouch) return null
+  return <GameInteractionOverlayInner zIndex={zIndex} />
+}
diff --git a/src/react/IndicatorEffects.css b/src/react/IndicatorEffects.css
index 7ddad807..dda3e87e 100644
--- a/src/react/IndicatorEffects.css
+++ b/src/react/IndicatorEffects.css
@@ -1,6 +1,6 @@
 .effectsScreen-container {
   position: fixed;
-  top: 6%;
+  top: max(6%, 30px);
   left: 0px;
   z-index: -2;
   pointer-events: none;
diff --git a/src/react/MobileTopButtons.module.css b/src/react/MobileTopButtons.module.css
index 239518bf..d1692f8b 100644
--- a/src/react/MobileTopButtons.module.css
+++ b/src/react/MobileTopButtons.module.css
@@ -6,7 +6,7 @@
   left: 50%;
   transform: translate(-50%);
   gap: 0 5px;
-  z-index: -1;
+  z-index: var(--has-modals-z, 7);
 }
 
 .pause-btn,
diff --git a/src/react/TouchAreasControls.tsx b/src/react/TouchAreasControls.tsx
index 58ea51aa..981ebebb 100644
--- a/src/react/TouchAreasControls.tsx
+++ b/src/react/TouchAreasControls.tsx
@@ -2,6 +2,7 @@ import { CSSProperties, PointerEvent, useEffect, useRef } from 'react'
 import { proxy, ref, useSnapshot } from 'valtio'
 import { contro } from '../controls'
 import worldInteractions from '../worldInteractions'
+import { options } from '../optionsStorage'
 import PixelartIcon from './PixelartIcon'
 import Button from './Button'
 
@@ -9,13 +10,6 @@ export type ButtonName = 'action' | 'sneak' | 'break' | 'jump'
 
 type ButtonsPositions = Record<ButtonName, [number, number]>
 
-interface Props {
-  touchActive: boolean
-  setupActive: boolean
-  buttonsPositions: ButtonsPositions
-  closeButtonsSetup: (newPositions?: ButtonsPositions) => void
-}
-
 const getCurrentAppScaling = () => {
   // body has css property --guiScale
   const guiScale = getComputedStyle(document.body).getPropertyValue('--guiScale')
@@ -51,15 +45,23 @@ export const handleMovementStickDelta = (e?: { clientX, clientY }) => {
   })
 }
 
-export default ({ touchActive, setupActive, buttonsPositions, closeButtonsSetup }: Props) => {
+type Props = {
+  setupActive: boolean
+  closeButtonsSetup: (newPositions?: ButtonsPositions) => void
+  foregroundGameActive: boolean
+}
+
+const Z_INDEX_INTERACTIBLE = 8
+
+export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props) => {
   const bot = window.bot as typeof __type_bot | undefined
-  if (setupActive) touchActive = true
+  const { touchControlsPositions, touchMovementType, touchInteractionType } = useSnapshot(options)
+  const buttonsPositions = touchControlsPositions as ButtonsPositions
 
   const joystickOuter = useRef<HTMLDivElement>(null)
   const joystickInner = useRef<HTMLDivElement>(null)
 
   const { pointer } = useSnapshot(joystickPointer)
-  // const { isFlying, isSneaking } = useSnapshot(gameAdditionalState)
   const newButtonPositions = { ...buttonsPositions }
 
   const buttonProps = (name: ButtonName) => {
@@ -146,6 +148,7 @@ export default ({ touchActive, setupActive, buttonsPositions, closeButtonsSetup
         justifyContent: 'center',
         alignItems: 'center',
         transition: 'background 0.1s',
+        zIndex: Z_INDEX_INTERACTIBLE,
       } satisfies CSSProperties,
       onPointerDown (e: PType) {
         const elem = e.currentTarget as HTMLElement
@@ -162,8 +165,8 @@ export default ({ touchActive, setupActive, buttonsPositions, closeButtonsSetup
           const elem = e.currentTarget as HTMLElement
           const size = 32
           const scale = getCurrentAppScaling()
-          const xPerc = (e.clientX - size / 4 / scale) / window.innerWidth * 100
-          const yPerc = (e.clientY - size / 4 / scale) / window.innerHeight * 100
+          const xPerc = (e.clientX - (size * scale) / 2) / window.innerWidth * 100
+          const yPerc = (e.clientY - (size * scale) / 2) / window.innerHeight * 100
           elem.style.left = `${xPerc}%`
           elem.style.top = `${yPerc}%`
           newButtonPositions[name] = [xPerc, yPerc]
@@ -178,55 +181,65 @@ export default ({ touchActive, setupActive, buttonsPositions, closeButtonsSetup
   useEffect(() => {
     joystickPointer.joystickInner = joystickInner.current && ref(joystickInner.current)
     // todo antipattern
-  }, [touchActive])
+  }, [foregroundGameActive])
 
-  if (!touchActive) return null
+  if (!foregroundGameActive && !setupActive) return null
 
   return <div>
-    <div
-      className='movement_joystick_outer'
-      ref={joystickOuter}
-      style={{
-        display: pointer ? 'flex' : 'none',
-        borderRadius: '50%',
-        width: 50,
-        height: 50,
-        border: '2px solid rgba(0, 0, 0, 0.5)',
-        backgroundColor: 'rgba(255, 255, div, 0.5)',
-        position: 'fixed',
-        justifyContent: 'center',
-        alignItems: 'center',
-        translate: '-50% -50%',
-        ...pointer ? {
-          left: `${pointer.x / window.innerWidth * 100}%`,
-          top: `${pointer.y / window.innerHeight * 100}%`
-        } : {}
-      }}
-    >
+    {touchMovementType === 'modern' && (
       <div
-        className='movement_joystick_inner'
+        className='movement_joystick_outer'
+        ref={joystickOuter}
         style={{
+          display: pointer ? 'flex' : 'none',
           borderRadius: '50%',
-          width: 20,
-          height: 20,
-          backgroundColor: 'rgba(0, 0, 0, 0.5)',
-          position: 'absolute',
+          width: 50,
+          height: 50,
+          border: '2px solid rgba(0, 0, 0, 0.5)',
+          backgroundColor: 'rgba(255, 255, div, 0.5)',
+          position: 'fixed',
+          justifyContent: 'center',
+          alignItems: 'center',
+          translate: '-50% -50%',
+          ...pointer ? {
+            left: `${pointer.x / window.innerWidth * 100}%`,
+            top: `${pointer.y / window.innerHeight * 100}%`
+          } : {}
         }}
-        ref={joystickInner}
-      />
-    </div>
-    <div {...buttonProps('action')}>
-      <PixelartIcon iconName='circle' />
-    </div>
-    <div {...buttonProps('sneak')}>
-      <PixelartIcon iconName='arrow-down' />
-    </div>
-    <div {...buttonProps('jump')}>
-      <PixelartIcon iconName='arrow-up' />
-    </div>
-    <div {...buttonProps('break')}>
-      <MineIcon />
-    </div>
+      >
+        <div
+          className='movement_joystick_inner'
+          style={{
+            borderRadius: '50%',
+            width: 20,
+            height: 20,
+            backgroundColor: 'rgba(0, 0, 0, 0.5)',
+            position: 'absolute',
+          }}
+          ref={joystickInner}
+        />
+      </div>
+    )}
+    {touchMovementType === 'modern' && (
+      <>
+        <div {...buttonProps('sneak')}>
+          <PixelartIcon iconName='arrow-down' />
+        </div>
+        <div {...buttonProps('jump')}>
+          <PixelartIcon iconName='arrow-up' />
+        </div>
+      </>
+    )}
+    {touchInteractionType === 'buttons' && (
+      <>
+        <div {...buttonProps('action')}>
+          <PixelartIcon iconName='circle' />
+        </div>
+        <div {...buttonProps('break')}>
+          <MineIcon />
+        </div>
+      </>
+    )}
     {setupActive && <div style={{
       position: 'fixed',
       bottom: 0,
diff --git a/src/react/TouchAreasControlsProvider.tsx b/src/react/TouchAreasControlsProvider.tsx
index 70c8bdf2..f5440bb1 100644
--- a/src/react/TouchAreasControlsProvider.tsx
+++ b/src/react/TouchAreasControlsProvider.tsx
@@ -8,12 +8,10 @@ export default () => {
   const usingTouch = useUsingTouch()
   const hasModals = useSnapshot(activeModalStack).length !== 0
   const setupActive = useIsModalActive('touch-buttons-setup')
-  const { touchControlsPositions, touchControlsType } = useSnapshot(options)
 
   return <TouchAreasControls
-    touchActive={!!bot && !!usingTouch && !hasModals && touchControlsType === 'joystick-buttons'}
+    foregroundGameActive={!!bot && !!usingTouch && !hasModals}
     setupActive={setupActive}
-    buttonsPositions={touchControlsPositions as any}
     closeButtonsSetup={(newPositions) => {
       if (newPositions) {
         options.touchControlsPositions = newPositions
@@ -21,5 +19,4 @@ export default () => {
       hideModal()
     }}
   />
-
 }
diff --git a/src/react/TouchControls.tsx b/src/react/TouchControls.tsx
index 1b97ffd8..0bf35730 100644
--- a/src/react/TouchControls.tsx
+++ b/src/react/TouchControls.tsx
@@ -49,9 +49,9 @@ export default () => {
   const usingTouch = useUsingTouch()
   const { usingGamepadInput } = useSnapshot(miscUiState)
   const modals = useSnapshot(activeModalStack)
-  const { touchControlsType } = useSnapshot(options)
+  const { touchMovementType } = useSnapshot(options)
 
-  if (!usingTouch || usingGamepadInput || touchControlsType !== 'classic') return null
+  if (!usingTouch || usingGamepadInput || touchMovementType !== 'classic') return null
   return (
     <div
       style={{ zIndex: modals.length ? 7 : 8 }}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index b432c58d..aa2f8fe4 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -46,6 +46,7 @@ import BookProvider from './react/BookProvider'
 import { options } from './optionsStorage'
 import BossBarOverlayProvider from './react/BossBarOverlayProvider'
 import DebugEdges from './react/DebugEdges'
+import GameInteractionOverlay from './react/GameInteractionOverlay'
 
 const RobustPortal = ({ children, to }) => {
   return createPortal(<PerComponentErrorBoundary>{children}</PerComponentErrorBoundary>, to)
@@ -116,6 +117,7 @@ const InGameUi = () => {
     <RobustPortal to={document.querySelector('#ui-root')}>
       {/* apply scaling */}
       <div style={{ display: showUI ? 'block' : 'none' }}>
+        <GameInteractionOverlay zIndex={7} />
         {!disabledUiParts.includes('death-screen') && <DeathScreenProvider />}
         {!disabledUiParts.includes('debug-overlay') && <DebugOverlay />}
         {!disabledUiParts.includes('mobile-top-buttons') && <MobileTopButtons />}

From 297d94d419983d09840104604e021a80f274c7a9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 03:20:13 +0300
Subject: [PATCH 167/753] fix sounds enabling in dockerfile

---
 Dockerfile                    | 4 +++-
 scripts/downloadSoundsMap.mjs | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index aacbec19..466c09c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,9 @@ RUN if [ "$DOWNLOAD_SOUNDS" = "true" ] ; then node scripts/downloadSoundsMap.mjs
 # ENTRYPOINT ["pnpm", "run", "run-all"]
 
 # only for prod
-RUN GITHUB_REPOSITORY=zardoy/minecraft-web-client DISABLE_SERVICE_WORKER=$DISABLE_SERVICE_WORKER pnpm run build
+RUN GITHUB_REPOSITORY=zardoy/minecraft-web-client \
+    DISABLE_SERVICE_WORKER=$DISABLE_SERVICE_WORKER \
+    pnpm run build
 
 # ---- Run Stage ----
 FROM node:18-alpine
diff --git a/scripts/downloadSoundsMap.mjs b/scripts/downloadSoundsMap.mjs
index 1e56131c..f5791768 100644
--- a/scripts/downloadSoundsMap.mjs
+++ b/scripts/downloadSoundsMap.mjs
@@ -1,9 +1,12 @@
 import fs from 'fs'
 
 const url = 'https://github.com/zardoy/minecraft-web-client/raw/sounds-generated/sounds-v2.js'
-const savePath = 'dist/sounds.js'
 fetch(url).then(res => res.text()).then(data => {
-  fs.writeFileSync(savePath, data, 'utf8')
+  if (fs.existsSync('./dist')) {
+    fs.writeFileSync('./dist/sounds.js', data, 'utf8')
+  }
+  fs.mkdirSync('./generated', { recursive: true })
+  fs.writeFileSync('./generated/sounds.js', data, 'utf8')
   if (fs.existsSync('.vercel/output/static/')) {
     fs.writeFileSync('.vercel/output/static/sounds.js', data, 'utf8')
   }

From 4cc6767c7807d36800c2b235f261ef860fae1b03 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 04:23:32 +0300
Subject: [PATCH 168/753] docker: fix volume path to use with public

---
 Dockerfile |  2 +-
 server.js  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 466c09c7..be9d7815 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,5 +38,5 @@ RUN npm i -g pnpm@9.0.4
 RUN npm init -yp
 RUN pnpm i express github:zardoy/prismarinejs-net-browserify compression cors
 EXPOSE 8080
-VOLUME /app/dist
+VOLUME /app/public
 ENTRYPOINT ["node", "server.js", "--prod"]
diff --git a/server.js b/server.js
index 4e541486..72430b20 100644
--- a/server.js
+++ b/server.js
@@ -30,8 +30,12 @@ app.get('/config.json', (req, res, next) => {
     config = require('./config.json')
   } catch {
     try {
-      config = require('./dist/config.json')
-    } catch { }
+      config = require('./public/config.json')
+    } catch {
+      try {
+        config = require('./dist/config.json')
+      } catch { }
+    }
   }
   res.json({
     ...config,
@@ -45,6 +49,11 @@ if (isProd) {
     res.setHeader('Cross-Origin-Embedder-Policy', 'require-corp')
     next()
   })
+
+  // First serve from the override directory (volume mount)
+  app.use(express.static(path.join(__dirname, './public')))
+
+  // Then fallback to the original dist directory
   app.use(express.static(path.join(__dirname, './dist')))
 }
 

From 5bc55c1bdf852fffa95bfdb88035a8f1165e43ff Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 04:30:20 +0300
Subject: [PATCH 169/753] adjust config merging

---
 server.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/server.js b/server.js
index 72430b20..2dbb05b3 100644
--- a/server.js
+++ b/server.js
@@ -26,20 +26,21 @@ if (!isProd) {
 app.get('/config.json', (req, res, next) => {
   // read original file config
   let config = {}
+  let publicConfig = {}
   try {
     config = require('./config.json')
   } catch {
     try {
-      config = require('./public/config.json')
-    } catch {
-      try {
-        config = require('./dist/config.json')
-      } catch { }
-    }
+      config = require('./dist/config.json')
+    } catch { }
   }
+  try {
+    publicConfig = require('./public/config.json')
+  } catch { }
   res.json({
     ...config,
     'defaultProxy': '', // use current url (this server)
+    ...publicConfig,
   })
 })
 if (isProd) {

From b35685fc1390f051e5644e4c768ebb6767e276b5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 1 Feb 2025 05:03:13 +0300
Subject: [PATCH 170/753] fix lint

---
 src/index.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 8cf07b1e..f2dde4b2 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -7,7 +7,7 @@ import './entities'
 import './globalDomListeners'
 import './mineflayer/maps'
 import './mineflayer/cameraShake'
-import './inventoryWindows'
+import { onGameLoad } from './inventoryWindows'
 import initCollisionShapes from './getCollisionInteractionShapes'
 import protocolMicrosoftAuth from 'minecraft-protocol/src/client/microsoftAuth'
 import microsoftAuthflow from './microsoftAuthflow'
@@ -98,7 +98,6 @@ import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
 import { getViewerVersionData, getWsProtocolStream } from './viewerConnector'
 import { updateCursor } from './cameraRotationControls'
-import { onGameLoad } from './inventoryWindows'
 
 window.debug = debug
 window.THREE = THREE

From 6ad1a4d63b05021c338a38a4dfdeff2f7f4ca6fc Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Sat, 1 Feb 2025 03:46:05 +0100
Subject: [PATCH 171/753] feat: item & maps in frame rendering (#243)

Co-authored-by: Vitaly Turovsky <vital2580@icloud.com>
---
 prismarine-viewer/viewer/lib/entities.ts      | 168 ++++++++++++++----
 .../viewer/lib/entity/EntityMesh.js           |  67 +++++--
 .../viewer/lib/entity/entities.json           |  50 +++++-
 prismarine-viewer/viewer/lib/viewer.ts        |   2 +-
 .../viewer/lib/worldDataEmitter.ts            |   4 +
 src/mineflayer/maps.ts                        |   3 +
 src/react/HeldMapUi.tsx                       |   2 +-
 7 files changed, 239 insertions(+), 57 deletions(-)

diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index 5e7a96bf..f5f4b21f 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -20,6 +20,7 @@ import { getMesh } from './entity/EntityMesh'
 import { WalkingGeneralSwing } from './entity/animations'
 import { disposeObject } from './threeJsUtils'
 import { armorModels } from './entity/objModels'
+import { Viewer } from './viewer'
 const { loadTexture } = globalThis.isElectron ? require('./utils.electron.js') : require('./utils')
 
 export const TWEEN_DURATION = 120
@@ -163,12 +164,12 @@ const nametags = {}
 
 const isFirstUpperCase = (str) => str.charAt(0) === str.charAt(0).toUpperCase()
 
-function getEntityMesh (entity, scene, options, overrides) {
+function getEntityMesh (entity, world, options, overrides) {
   if (entity.name) {
     try {
       // https://github.com/PrismarineJS/prismarine-viewer/pull/410
       const entityName = (isFirstUpperCase(entity.name) ? snakeCase(entity.name) : entity.name).toLowerCase()
-      const e = new Entity.EntityMesh('1.16.4', entityName, scene, overrides)
+      const e = new Entity.EntityMesh('1.16.4', entityName, world, overrides)
 
       if (e.mesh) {
         addNametag(entity, options, e.mesh)
@@ -211,6 +212,8 @@ export class Entities extends EventEmitter {
   clock = new THREE.Clock()
   rendering = true
   itemsTexture: THREE.Texture | null = null
+  cachedMapsImages = {} as Record<number, string>
+  itemFrameMaps = {} as Record<number, Array<THREE.Mesh<THREE.PlaneGeometry, THREE.MeshLambertMaterial>>>
   getItemUv: undefined | ((idOrName: number | string) => {
     texture: THREE.Texture;
     u: number;
@@ -220,7 +223,7 @@ export class Entities extends EventEmitter {
     size?: number;
   })
 
-  constructor (public scene: THREE.Scene) {
+  constructor (public viewer: Viewer) {
     super()
     this.entitiesOptions = {}
     this.debugMode = 'none'
@@ -229,7 +232,7 @@ export class Entities extends EventEmitter {
 
   clear () {
     for (const mesh of Object.values(this.entities)) {
-      this.scene.remove(mesh)
+      this.viewer.scene.remove(mesh)
       disposeObject(mesh)
     }
     this.entities = {}
@@ -251,9 +254,9 @@ export class Entities extends EventEmitter {
     this.rendering = rendering
     for (const ent of entity ? [entity] : Object.values(this.entities)) {
       if (rendering) {
-        if (!this.scene.children.includes(ent)) this.scene.add(ent)
+        if (!this.viewer.scene.children.includes(ent)) this.viewer.scene.add(ent)
       } else {
-        this.scene.remove(ent)
+        this.viewer.scene.remove(ent)
       }
     }
   }
@@ -417,6 +420,7 @@ export class Entities extends EventEmitter {
   }
 
   getItemMesh (item) {
+    // TODO: Render proper model (especially for blocks) instead of flat texture
     const textureUv = this.getItemUv?.(item.itemId ?? item.blockId)
     if (textureUv) {
       // todo use geometry buffer uv instead!
@@ -470,9 +474,13 @@ export class Entities extends EventEmitter {
 
   update (entity: import('prismarine-entity').Entity & { delete?; pos, name }, overrides) {
     const isPlayerModel = entity.name === 'player'
-    if (entity.name === 'zombie' || entity.name === 'zombie_villager' || entity.name === 'husk') {
+    if (entity.name === 'zombie_villager' || entity.name === 'husk') {
       overrides.texture = `textures/1.16.4/entity/${entity.name === 'zombie_villager' ? 'zombie_villager/zombie_villager.png' : `zombie/${entity.name}.png`}`
     }
+    if (entity.name === 'glow_item_frame') {
+      if (!overrides.textures) overrides.textures = []
+      overrides.textures['background'] = 'block:glow_item_frame'
+    }
     // this can be undefined in case where packet entity_destroy was sent twice (so it was already deleted)
     let e = this.entities[entity.id]
 
@@ -480,7 +488,7 @@ export class Entities extends EventEmitter {
       if (!e) return
       if (e.additionalCleanup) e.additionalCleanup()
       this.emit('remove', entity)
-      this.scene.remove(e)
+      this.viewer.scene.remove(e)
       disposeObject(e)
       // todo dispose textures as well ?
       delete this.entities[entity.id]
@@ -551,7 +559,7 @@ export class Entities extends EventEmitter {
         //@ts-expect-error
         playerObject.animation.isMoving = false
       } else {
-        mesh = getEntityMesh(entity, this.scene, this.entitiesOptions, overrides)
+        mesh = getEntityMesh(entity, this.viewer.world, this.entitiesOptions, overrides)
       }
       if (!mesh) return
       mesh.name = 'mesh'
@@ -570,7 +578,7 @@ export class Entities extends EventEmitter {
       group.add(mesh)
       group.add(boxHelper)
       boxHelper.visible = false
-      this.scene.add(group)
+      this.viewer.scene.add(group)
 
       e = group
       this.entities[entity.id] = e
@@ -694,31 +702,51 @@ export class Entities extends EventEmitter {
     }
 
     // todo handle map, map_chunks events
-    // if (entity.name === 'item_frame' || entity.name === 'glow_item_frame') {
-    //   const example = {
-    //     "present": true,
-    //     "itemId": 847,
-    //     "itemCount": 1,
-    //     "nbtData": {
-    //         "type": "compound",
-    //         "name": "",
-    //         "value": {
-    //             "map": {
-    //                 "type": "int",
-    //                 "value": 2146483444
-    //             },
-    //             "interactiveboard": {
-    //                 "type": "byte",
-    //                 "value": 1
-    //             }
-    //         }
-    //     }
-    // }
-    //   const item = entity.metadata?.[8]
-    //   if (item.nbtData) {
-    //     const nbt = nbt.simplify(item.nbtData)
-    //   }
-    // }
+    let itemFrameMeta = getSpecificEntityMetadata('item_frame', entity)
+    if (!itemFrameMeta) {
+      itemFrameMeta = getSpecificEntityMetadata('glow_item_frame', entity)
+    }
+    if (itemFrameMeta) {
+      // TODO: fix type
+      // todo! fix errors in mc-data (no entities data prior 1.18.2)
+      const item = (itemFrameMeta?.item ?? entity.metadata?.[8]) as any as { itemId, blockId, components, nbtData: { value: { map: { value: number } } } }
+      mesh.scale.set(1, 1, 1)
+      e.rotation.x = -entity.pitch
+      e.children.find(c => {
+        if (c.name.startsWith('map_')) {
+          disposeObject(c)
+          const existingMapNumber = parseInt(c.name.split('_')[1], 10)
+          this.itemFrameMaps[existingMapNumber] = this.itemFrameMaps[existingMapNumber]?.filter(mesh => mesh !== c)
+          if (c instanceof THREE.Mesh) {
+            c.material?.map?.dispose()
+          }
+          return true
+        } else if (c.name === 'item') {
+          disposeObject(c)
+          return true
+        }
+        return false
+      })?.removeFromParent()
+      if (item && (item.itemId ?? item.blockId ?? 0) !== 0) {
+        const rotation = (itemFrameMeta.rotation as any as number) ?? 0
+        const mapNumber = item.nbtData?.value?.map?.value ?? item.components?.find(x => x.type === 'map_id')?.data
+        if (mapNumber) {
+          // TODO: Use proper larger item frame model when a map exists
+          mesh.scale.set(16 / 12, 16 / 12, 1)
+          this.addMapModel(e, mapNumber, rotation)
+        } else {
+          const itemMesh = this.getItemMesh(item)
+          if (itemMesh) {
+            itemMesh.mesh.position.set(0, 0, 0.43)
+            itemMesh.mesh.scale.set(0.5, 0.5, 0.5)
+            itemMesh.mesh.rotateY(Math.PI)
+            itemMesh.mesh.rotateZ(rotation * Math.PI / 4)
+            itemMesh.mesh.name = 'item'
+            e.add(itemMesh.mesh)
+          }
+        }
+      }
+    }
 
     if (entity.username) {
       e.username = entity.username
@@ -741,6 +769,74 @@ export class Entities extends EventEmitter {
     }
   }
 
+  updateMap (mapNumber: string | number, data: string) {
+    this.cachedMapsImages[mapNumber] = data
+    let itemFrameMeshes = this.itemFrameMaps[mapNumber]
+    if (!itemFrameMeshes) return
+    itemFrameMeshes = itemFrameMeshes.filter(mesh => mesh.parent)
+    this.itemFrameMaps[mapNumber] = itemFrameMeshes
+    if (itemFrameMeshes) {
+      for (const mesh of itemFrameMeshes) {
+        mesh.material.map = this.loadMap(data)
+        mesh.material.needsUpdate = true
+        mesh.visible = true
+      }
+    }
+  }
+
+  addMapModel (entityMesh: THREE.Object3D, mapNumber: number, rotation: number) {
+    const imageData = this.cachedMapsImages?.[mapNumber]
+    let texture: THREE.Texture | null = null
+    if (imageData) {
+      texture = this.loadMap(imageData)
+    }
+    const parameters = {
+      transparent: true,
+      alphaTest: 0.1,
+    }
+    if (texture) {
+      parameters['map'] = texture
+    }
+    const material = new THREE.MeshLambertMaterial(parameters)
+
+    const mapMesh = new THREE.Mesh(new THREE.PlaneGeometry(1, 1), material)
+
+    mapMesh.rotation.set(0, Math.PI, 0)
+    entityMesh.add(mapMesh)
+    let isInvisible = false
+    entityMesh.traverseVisible(c => {
+      if (c.name === 'geometry_frame') {
+        isInvisible = false
+      }
+    })
+    if (isInvisible) {
+      mapMesh.position.set(0, 0, 0.499)
+    } else {
+      mapMesh.position.set(0, 0, 0.437)
+    }
+    mapMesh.rotateZ(Math.PI * 2 - rotation * Math.PI / 2)
+    mapMesh.name = `map_${mapNumber}`
+
+    if (!texture) {
+      mapMesh.visible = false
+    }
+
+    if (!this.itemFrameMaps[mapNumber]) {
+      this.itemFrameMaps[mapNumber] = []
+    }
+    this.itemFrameMaps[mapNumber].push(mapMesh)
+  }
+
+  loadMap (data: any) {
+    const texture = new THREE.TextureLoader().load(data)
+    if (texture) {
+      texture.magFilter = THREE.NearestFilter
+      texture.minFilter = THREE.NearestFilter
+      texture.needsUpdate = true
+    }
+    return texture
+  }
+
   handleDamageEvent (entityId, damageAmount) {
     const entityMesh = this.entities[entityId]?.children.find(c => c.name === 'mesh')
     if (entityMesh) {
@@ -808,7 +904,7 @@ function addArmorModel (entityMesh: THREE.Object3D, slotType: string, item: Item
       material.map = texture
     })
   } else {
-    mesh = getMesh(texturePath, armorModels.armorModel[slotType])
+    mesh = getMesh(viewer.world, texturePath, armorModels.armorModel[slotType])
     mesh.name = meshName
     material = mesh.material
     material.side = THREE.DoubleSide
diff --git a/prismarine-viewer/viewer/lib/entity/EntityMesh.js b/prismarine-viewer/viewer/lib/entity/EntityMesh.js
index 69dd95d6..9033489a 100644
--- a/prismarine-viewer/viewer/lib/entity/EntityMesh.js
+++ b/prismarine-viewer/viewer/lib/entity/EntityMesh.js
@@ -94,7 +94,7 @@ function dot(a, b) {
   return a[0] * b[0] + a[1] * b[1] + a[2] * b[2]
 }
 
-function addCube(attr, boneId, bone, cube, texWidth = 64, texHeight = 64, mirror = false) {
+function addCube(attr, boneId, bone, cube, sameTextureForAllFaces = false, texWidth = 64, texHeight = 64, mirror = false) {
   const cubeRotation = new THREE.Euler(0, 0, 0)
   if (cube.rotation) {
     cubeRotation.x = -cube.rotation[0] * Math.PI / 180
@@ -107,8 +107,15 @@ function addCube(attr, boneId, bone, cube, texWidth = 64, texHeight = 64, mirror
     const eastOrWest = dir[0] !== 0
     const faceUvs = []
     for (const pos of corners) {
-      const u = (cube.uv[0] + dot(pos[3] ? u1 : u0, cube.size)) / texWidth
-      const v = (cube.uv[1] + dot(pos[4] ? v1 : v0, cube.size)) / texHeight
+      let u
+      let v
+      if (sameTextureForAllFaces) {
+        u = (cube.uv[0] + pos[3] * cube.size[0]) / texWidth
+        v = (cube.uv[1] + pos[4] * cube.size[1]) / texHeight
+      } else {
+        u = (cube.uv[0] + dot(pos[3] ? u1 : u0, cube.size)) / texWidth
+        v = (cube.uv[1] + dot(pos[4] ? v1 : v0, cube.size)) / texHeight
+      }
 
       const posX = eastOrWest && mirror ? pos[0] ^ 1 : pos[0]
       const posY = pos[1]
@@ -148,7 +155,23 @@ function addCube(attr, boneId, bone, cube, texWidth = 64, texHeight = 64, mirror
   }
 }
 
-export function getMesh(texture, jsonModel, overrides = {}) {
+export function getMesh(worldRenderer, texture, jsonModel, overrides = {}) {
+  let textureWidth = jsonModel.texturewidth ?? 64
+  let textureHeight = jsonModel.textureheight ?? 64
+  let textureOffset
+  const useBlockTexture = texture.startsWith('block:')
+  if (useBlockTexture) {
+    const blockName = texture.slice(6)
+    const textureInfo = worldRenderer.blocksAtlasParser.getTextureInfo(blockName)
+    if (textureInfo) {
+      textureWidth = worldRenderer.material.map.image.width
+      textureHeight = worldRenderer.material.map.image.height
+      textureOffset = [textureInfo.u, textureInfo.v]
+    } else {
+      console.error(`Unknown block ${blockName}`)
+    }
+  }
+
   const bones = {}
 
   const geoData = {
@@ -186,7 +209,7 @@ export function getMesh(texture, jsonModel, overrides = {}) {
 
     if (jsonBone.cubes) {
       for (const cube of jsonBone.cubes) {
-        addCube(geoData, i, bone, cube, jsonModel.texturewidth, jsonModel.textureheight, jsonBone.mirror)
+        addCube(geoData, i, bone, cube, useBlockTexture, textureWidth, textureHeight, jsonBone.mirror)
       }
     }
     i++
@@ -215,18 +238,25 @@ export function getMesh(texture, jsonModel, overrides = {}) {
   mesh.bind(skeleton)
   mesh.scale.set(1 / 16, 1 / 16, 1 / 16)
 
-  loadTexture(texture, texture => {
-    if (material.map) {
-      // texture is already loaded
-      return
-    }
-    texture.magFilter = THREE.NearestFilter
-    texture.minFilter = THREE.NearestFilter
-    texture.flipY = false
-    texture.wrapS = THREE.RepeatWrapping
-    texture.wrapT = THREE.RepeatWrapping
+  if (textureOffset) {
+    texture = worldRenderer.material.map.clone()
+    texture.offset.set(textureOffset[0], textureOffset[1])
+    texture.needsUpdate = true
     material.map = texture
-  })
+  } else {
+    loadTexture(texture.endsWith('.png') || texture.startsWith('data:image/') ? texture : texture + '.png', texture => {
+      if (material.map) {
+        // texture is already loaded
+        return
+      }
+      texture.magFilter = THREE.NearestFilter
+      texture.minFilter = THREE.NearestFilter
+      texture.flipY = false
+      texture.wrapS = THREE.RepeatWrapping
+      texture.wrapT = THREE.RepeatWrapping
+      material.map = texture
+    })
+  }
 
   return mesh
 }
@@ -252,6 +282,7 @@ export const temporaryMap = {
   'hopper_minecart': 'minecart',
   'command_block_minecart': 'minecart',
   'tnt_minecart': 'minecart',
+  'glow_item_frame': 'item_frame',
   'glow_squid': 'squid',
   'trader_llama': 'llama',
   'chest_boat': 'boat',
@@ -321,7 +352,7 @@ const offsetEntity = {
 
 // eslint-disable-next-line @typescript-eslint/no-extraneous-class
 export class EntityMesh {
-  constructor(version, type, scene, /** @type {{textures?, rotation?: Record<string, {x,y,z}>}} */overrides = {}) {
+  constructor(version, type, worldRenderer, /** @type {{textures?, rotation?: Record<string, {x,y,z}>}} */overrides = {}) {
     const originalType = type
     const mappedValue = temporaryMap[type]
     if (mappedValue) type = mappedValue
@@ -388,7 +419,7 @@ export class EntityMesh {
       const texture = overrides.textures?.[name] ?? e.textures[name]
       if (!texture) continue
       // console.log(JSON.stringify(jsonModel, null, 2))
-      const mesh = getMesh(texture + '.png', jsonModel, overrides)
+      const mesh = getMesh(worldRenderer, texture, jsonModel, overrides)
       mesh.name = `geometry_${name}`
       this.mesh.add(mesh)
 
diff --git a/prismarine-viewer/viewer/lib/entity/entities.json b/prismarine-viewer/viewer/lib/entity/entities.json
index 9824d418..4436a44b 100644
--- a/prismarine-viewer/viewer/lib/entity/entities.json
+++ b/prismarine-viewer/viewer/lib/entity/entities.json
@@ -7838,6 +7838,53 @@
       }
     }
   },
+  "item_frame": {
+    "identifier": "minecraft:item_frame",
+    "materials": {"default": "item_frame"},
+    "textures": {
+      "background": "block:item_frame",
+      "frame": "block:oak_planks"
+    },
+    "geometry": {
+      "background": {
+        "bones": [
+          {
+            "name": "base"
+          },
+          {
+            "name": "background",
+            "parent": "base",
+            "rotation": [0, 180, 0],
+            "pivot": [0, 0, 0],
+            "cubes": [
+              {"origin": [-5, -5, -8], "size": [10, 10, 0.5], "uv": [3, 3]}
+            ]
+          }
+        ],
+        "texturewidth": 16,
+        "textureheight": 16
+      },
+      "frame": {
+        "bones": [
+          {
+            "name": "frame",
+            "parent": "base",
+            "rotation": [0, 180, 0],
+            "pivot": [0, 0, 0],
+            "cubes": [
+              {"origin": [-6, -6, -8], "size": [12, 1, 1], "uv": [2, 2]},
+              {"origin": [-6, 5, -8], "size": [12, 1, 1], "uv": [2, 13]},
+              {"origin": [-6, -5, -8], "size": [1, 10, 1], "uv": [2, 3]},
+              {"origin": [5, -5, -8], "size": [1, 10, 1], "uv": [13, 3]}
+            ]
+          }
+        ],
+        "texturewidth": 16,
+        "textureheight": 16
+      }
+    },
+    "render_controllers": ["controller.render.item_frame"]
+  },
   "leash_knot": {
     "identifier": "minecraft:leash_knot",
     "materials": {"default": "leash_knot"},
@@ -7847,7 +7894,8 @@
         "bones": [
           {
             "name": "knot",
-            "cubes": [{"origin": [-3, 2, -3], "size": [6, 8, 6]}]
+            "rotation": [0, 180, 0],
+            "cubes": [{"origin": [5, 6, 5], "size": [6, 8, 6], "uv": [0, 0]}]
           }
         ],
         "texturewidth": 32,
diff --git a/prismarine-viewer/viewer/lib/viewer.ts b/prismarine-viewer/viewer/lib/viewer.ts
index c7dd7fe5..82c3e661 100644
--- a/prismarine-viewer/viewer/lib/viewer.ts
+++ b/prismarine-viewer/viewer/lib/viewer.ts
@@ -48,7 +48,7 @@ export class Viewer {
     this.threeJsWorld = new WorldRendererThree(this.scene, this.renderer, worldConfig)
     this.setWorld()
     this.resetScene()
-    this.entities = new Entities(this.scene)
+    this.entities = new Entities(this)
     // this.primitives = new Primitives(this.scene, this.camera)
 
     this.domElement = renderer.domElement
diff --git a/prismarine-viewer/viewer/lib/worldDataEmitter.ts b/prismarine-viewer/viewer/lib/worldDataEmitter.ts
index 61d5a503..e556f7a3 100644
--- a/prismarine-viewer/viewer/lib/worldDataEmitter.ts
+++ b/prismarine-viewer/viewer/lib/worldDataEmitter.ts
@@ -75,6 +75,10 @@ export class WorldDataEmitter extends EventEmitter {
     this.eventListeners = {
       // 'move': botPosition,
       entitySpawn (e: any) {
+        if (e.name === 'item_frame' || e.name === 'glow_item_frame') {
+          // Item frames use block positions in the protocol, not their center. Fix that.
+          e.position.translate(0.5, 0.5, 0.5)
+        }
         emitEntity(e)
       },
       entityUpdate (e: any) {
diff --git a/src/mineflayer/maps.ts b/src/mineflayer/maps.ts
index 75169a9f..c5d4f716 100644
--- a/src/mineflayer/maps.ts
+++ b/src/mineflayer/maps.ts
@@ -16,5 +16,8 @@ setImageConverter((buf: Uint8Array) => {
 customEvents.on('mineflayerBotCreated', () => {
   bot.on('login', () => {
     bot.loadPlugin(mapDownloader)
+    bot.mapDownloader.on('new_map', ({ png, id }) => {
+      viewer.entities.updateMap(id, png)
+    })
   })
 })
diff --git a/src/react/HeldMapUi.tsx b/src/react/HeldMapUi.tsx
index b4eaea60..4fadf64f 100644
--- a/src/react/HeldMapUi.tsx
+++ b/src/react/HeldMapUi.tsx
@@ -19,7 +19,7 @@ export default () => {
       updateHeldMap()
     })
 
-    bot.on('new_map', () => {
+    bot.on('new_map', ({ id }) => {
       // total maps: Object.keys(bot.mapDownloader.maps).length
       updateHeldMap()
     })

From d4e93d4d39dd9c2652bf5ad1536075721572db3f Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Sat, 1 Feb 2025 04:24:04 +0100
Subject: [PATCH 172/753] fix: kick screen would allow going back with
 lockConnect parameter (#253)

refactor qs getters in codebase
Co-authored-by: Vitaly <vital2580@icloud.com>
---
 src/appParams.ts                  | 78 +++++++++++++++++++++++++++++++
 src/downloadAndOpenFile.ts        | 12 ++---
 src/googledrive.ts                |  3 +-
 src/index.ts                      | 55 ++++++++++------------
 src/loadSave.ts                   |  4 +-
 src/optionsStorage.ts             |  4 +-
 src/react/AddServerOrConnect.tsx  | 23 ++++-----
 src/react/AppStatus.tsx           |  4 +-
 src/react/PauseScreen.tsx         |  6 +--
 src/react/ServersListProvider.tsx |  5 +-
 10 files changed, 136 insertions(+), 58 deletions(-)
 create mode 100644 src/appParams.ts

diff --git a/src/appParams.ts b/src/appParams.ts
new file mode 100644
index 00000000..e862e301
--- /dev/null
+++ b/src/appParams.ts
@@ -0,0 +1,78 @@
+const qsParams = new URLSearchParams(window.location.search)
+
+export type AppQsParams = {
+  // AddServerOrConnect.tsx params
+  ip?: string
+  name?: string
+  version?: string
+  proxy?: string
+  username?: string
+  lockConnect?: string
+  autoConnect?: string
+  // googledrive.ts params
+  state?: string
+  // ServersListProvider.tsx params
+  serversList?: string
+  // Map and texture params
+  texturepack?: string
+  map?: string
+  mapDirBaseUrl?: string
+  mapDirGuess?: string
+  // Singleplayer params
+  singleplayer?: string
+  sp?: string
+  loadSave?: string
+  // Server params
+  reconnect?: string
+  server?: string
+  // Peer connection params
+  connectPeer?: string
+  peerVersion?: string
+  // UI params
+  modal?: string
+  viewerConnect?: string
+  // Map version param
+  mapVersion?: string
+  // Command params
+  command?: string
+  // Misc params
+  suggest_save?: string
+  scene?: string
+}
+
+export type AppQsParamsArray = {
+  mapDir?: string[]
+  setting?: string[]
+  serverSetting?: string[]
+  command?: string[]
+}
+
+type AppQsParamsArrayTransformed = {
+  [k in keyof AppQsParamsArray]: string[]
+}
+
+export const appQueryParams = new Proxy<AppQsParams>({} as AppQsParams, {
+  get (target, property) {
+    if (typeof property !== 'string') {
+      return null
+    }
+    return qsParams.get(property)
+  },
+})
+
+export const appQueryParamsArray = new Proxy({} as AppQsParamsArrayTransformed, {
+  get (target, property) {
+    if (typeof property !== 'string') {
+      return null
+    }
+    return qsParams.getAll(property)
+  },
+})
+
+// Helper function to check if a specific query parameter exists
+export const hasQueryParam = (param: keyof AppQsParams) => qsParams.has(param)
+
+// Helper function to get all query parameters as a URLSearchParams object
+export const getRawQueryParams = () => qsParams;
+
+(globalThis as any).debugQueryParams = Object.fromEntries(qsParams.entries())
diff --git a/src/downloadAndOpenFile.ts b/src/downloadAndOpenFile.ts
index 6e59ea02..d4356ca2 100644
--- a/src/downloadAndOpenFile.ts
+++ b/src/downloadAndOpenFile.ts
@@ -2,16 +2,16 @@ import prettyBytes from 'pretty-bytes'
 import { openWorldFromHttpDir, openWorldZip } from './browserfs'
 import { getResourcePackNames, installTexturePack, resourcePackState, updateTexturePackInstalledState } from './resourcePack'
 import { setLoadingScreenStatus } from './utils'
+import { appQueryParams, appQueryParamsArray } from './appParams'
 
 export const getFixedFilesize = (bytes: number) => {
   return prettyBytes(bytes, { minimumFractionDigits: 2, maximumFractionDigits: 2 })
 }
 
 const inner = async () => {
-  const qs = new URLSearchParams(window.location.search)
-  const mapUrlDir = qs.getAll('mapDir')
-  const mapUrlDirGuess = qs.get('mapDirGuess')
-  const mapUrlDirBaseUrl = qs.get('mapDirBaseUrl')
+  const mapUrlDir = appQueryParamsArray.mapDir ?? []
+  const mapUrlDirGuess = appQueryParams.mapDirGuess
+  const mapUrlDirBaseUrl = appQueryParams.mapDirBaseUrl
   if (mapUrlDir.length) {
     await openWorldFromHttpDir(mapUrlDir, mapUrlDirBaseUrl ?? undefined)
     return true
@@ -20,8 +20,8 @@ const inner = async () => {
     // await openWorldFromHttpDir(undefined, mapUrlDirGuess)
     return true
   }
-  let mapUrl = qs.get('map')
-  const texturepack = qs.get('texturepack')
+  let mapUrl = appQueryParams.map
+  const { texturepack } = appQueryParams
   // fixme
   if (texturepack) mapUrl = texturepack
   if (!mapUrl) return false
diff --git a/src/googledrive.ts b/src/googledrive.ts
index 3846add3..578ecb00 100644
--- a/src/googledrive.ts
+++ b/src/googledrive.ts
@@ -6,6 +6,7 @@ import { loadGoogleDriveApi, loadInMemorySave } from './react/SingleplayerProvid
 import { setLoadingScreenStatus } from './utils'
 import { mountGoogleDriveFolder } from './browserfs'
 import { showOptionsModal } from './react/SelectOption'
+import { appQueryParams } from './appParams'
 
 const CLIENT_ID = '137156026346-igv2gkjsj2hlid92rs3q7cjjnc77s132.apps.googleusercontent.com'
 // const CLIENT_ID = process.env.GOOGLE_CLIENT_ID
@@ -45,7 +46,7 @@ export const useGoogleLogIn = () => {
 }
 
 export const possiblyHandleStateVariable = async () => {
-  const stateParam = new URLSearchParams(window.location.search).get('state')
+  const stateParam = appQueryParams.state
   if (!stateParam) return
   setLoadingScreenStatus('Opening world in read only mode, waiting for login...')
   await loadGoogleDriveApi()
diff --git a/src/index.ts b/src/index.ts
index f2dde4b2..36ced199 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -97,6 +97,7 @@ import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
 import { getViewerVersionData, getWsProtocolStream } from './viewerConnector'
+import { appQueryParams, appQueryParamsArray } from './appParams'
 import { updateCursor } from './cameraRotationControls'
 
 window.debug = debug
@@ -199,7 +200,7 @@ function hideCurrentScreens () {
 }
 
 const loadSingleplayer = (serverOverrides = {}, flattenedServerOverrides = {}) => {
-  const serverSettingsQsRaw = new URLSearchParams(window.location.search).getAll('serverSetting')
+  const serverSettingsQsRaw = appQueryParamsArray.serverSetting ?? []
   const serverSettingsQs = serverSettingsQsRaw.map(x => x.split(':')).reduce<Record<string, string>>((acc, [key, value]) => {
     acc[key] = JSON.parse(value)
     return acc
@@ -667,7 +668,7 @@ export async function connect (connectOptions: ConnectOptions) {
     setLoadingScreenStatus('Placing blocks (starting viewer)')
     localStorage.lastConnectOptions = JSON.stringify(connectOptions)
     connectOptions.onSuccessfulPlay?.()
-    if (process.env.NODE_ENV === 'development' && !localStorage.lockUrl && new URLSearchParams(location.search).size === 0) {
+    if (process.env.NODE_ENV === 'development' && !localStorage.lockUrl && !Object.keys(window.debugQueryParams).length) {
       lockUrl()
     }
     updateDataAfterJoin()
@@ -715,9 +716,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
     if (appStatusState.isError) return
     setTimeout(() => {
-      // todo
-      const qs = new URLSearchParams(window.location.search)
-      if (qs.get('suggest_save')) {
+      if (appQueryParams.suggest_save) {
         showNotification('Suggestion', 'Save the world to keep your progress!', false, undefined, async () => {
           const savePath = await saveToBrowserMemory()
           if (!savePath) return
@@ -749,8 +748,8 @@ export async function connect (connectOptions: ConnectOptions) {
   if (!connectOptions.ignoreQs) {
     // todo cleanup
     customEvents.on('gameLoaded', () => {
-      const qs = new URLSearchParams(window.location.search)
-      for (let command of qs.getAll('command')) {
+      const commands = appQueryParamsArray.command ?? []
+      for (let command of commands) {
         if (!command.startsWith('/')) command = `/${command}`
         bot.chat(command)
       }
@@ -761,17 +760,14 @@ export async function connect (connectOptions: ConnectOptions) {
 listenGlobalEvents()
 watchValue(miscUiState, async s => {
   if (s.appLoaded) { // fs ready
-    const qs = new URLSearchParams(window.location.search)
-    const moreServerOptions = {} as Record<string, any>
-    if (qs.has('version')) moreServerOptions.version = qs.get('version')
-    if (qs.get('singleplayer') === '1' || qs.get('sp') === '1') {
+    if (appQueryParams.singleplayer === '1' || appQueryParams.sp === '1') {
       loadSingleplayer({}, {
         worldFolder: undefined,
-        ...moreServerOptions
+        ...appQueryParams.version ? { version: appQueryParams.version } : {}
       })
     }
-    if (qs.get('loadSave')) {
-      const savePath = `/data/worlds/${qs.get('loadSave')}`
+    if (appQueryParams.loadSave) {
+      const savePath = `/data/worlds/${appQueryParams.loadSave}`
       try {
         await fs.promises.stat(savePath)
       } catch (err) {
@@ -827,22 +823,19 @@ void window.fetch('config.json').then(async res => res.json()).then(c => c, (err
 // qs open actions
 downloadAndOpenFile().then((downloadAction) => {
   if (downloadAction) return
-  const qs = new URLSearchParams(window.location.search)
-  if (qs.get('reconnect') && process.env.NODE_ENV === 'development') {
-    const ip = qs.get('ip')
+  if (appQueryParams.reconnect && process.env.NODE_ENV === 'development') {
     const lastConnect = JSON.parse(localStorage.lastConnectOptions ?? {})
     void connect({
-      botVersion: qs.get('version') ?? undefined,
-      ...lastConnect, // todo mixing is not good idea
-      ip: ip || undefined
+      botVersion: appQueryParams.version ?? undefined,
+      ...lastConnect,
+      ip: appQueryParams.ip || undefined
     })
     return
   }
-  if (qs.get('ip') || qs.get('proxy')) {
-    const waitAppConfigLoad = !qs.get('proxy')
+  if (appQueryParams.ip || appQueryParams.proxy) {
+    const waitAppConfigLoad = !appQueryParams.proxy
     const openServerEditor = () => {
       hideModal()
-      // show server editor for connect or save
       showModal({ reactType: 'editServer' })
     }
     showModal({ reactType: 'empty' })
@@ -864,12 +857,12 @@ downloadAndOpenFile().then((downloadAction) => {
 
   void Promise.resolve().then(() => {
     // try to connect to peer
-    const peerId = qs.get('connectPeer')
+    const peerId = appQueryParams.connectPeer
     const peerOptions = {} as ConnectPeerOptions
-    if (qs.get('server')) {
-      peerOptions.server = qs.get('server')!
+    if (appQueryParams.server) {
+      peerOptions.server = appQueryParams.server
     }
-    const version = qs.get('peerVersion')
+    const version = appQueryParams.peerVersion
     if (peerId) {
       let username: string | null = options.guestUsername
       if (options.askGuestName) username = prompt('Enter your username', username)
@@ -884,11 +877,11 @@ downloadAndOpenFile().then((downloadAction) => {
     }
   })
 
-  if (qs.get('serversList')) {
+  if (appQueryParams.serversList) {
     showModal({ reactType: 'serversList' })
   }
 
-  const viewerWsConnect = qs.get('viewerConnect')
+  const viewerWsConnect = appQueryParams.viewerConnect
   if (viewerWsConnect) {
     void connect({
       username: `viewer-${Math.random().toString(36).slice(2, 10)}`,
@@ -896,8 +889,8 @@ downloadAndOpenFile().then((downloadAction) => {
     })
   }
 
-  if (qs.get('modal')) {
-    const modals = qs.get('modal')!.split(',')
+  if (appQueryParams.modal) {
+    const modals = appQueryParams.modal.split(',')
     for (const modal of modals) {
       showModal({ reactType: modal })
     }
diff --git a/src/loadSave.ts b/src/loadSave.ts
index 6c7da6bb..1f683775 100644
--- a/src/loadSave.ts
+++ b/src/loadSave.ts
@@ -11,6 +11,7 @@ import { isMajorVersionGreater } from './utils'
 
 import { activeModalStacks, insertActiveModalStack, miscUiState } from './globalState'
 import supportedVersions from './supportedVersions.mjs'
+import { appQueryParams } from './appParams'
 
 // todo include name of opened handle (zip)!
 // additional fs metadata
@@ -84,8 +85,7 @@ export const loadSave = async (root = '/world') => {
   let version: string | undefined | null
   let isFlat = false
   if (levelDat) {
-    const qs = new URLSearchParams(window.location.search)
-    version = qs.get('mapVersion') ?? levelDat.Version?.Name
+    version = appQueryParams.mapVersion ?? levelDat.Version?.Name
     if (!version) {
       // const newVersion = disablePrompts ? '1.8.8' : prompt(`In 1.8 and before world save doesn't contain version info, please enter version you want to use to load the world.\nSupported versions ${supportedVersions.join(', ')}`, '1.8.8')
       // if (!newVersion) return
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 267a7e5f..24aaff41 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -4,6 +4,7 @@ import { proxy, subscribe } from 'valtio/vanilla'
 // weird webpack configuration bug: it cant import valtio/utils in this file
 import { subscribeKey } from 'valtio/utils'
 import { omitObj } from '@zardoy/utils'
+import { appQueryParamsArray } from './appParams'
 
 const isDev = process.env.NODE_ENV === 'development'
 const defaultOptions = {
@@ -121,7 +122,8 @@ function getDefaultTouchControlsPositions () {
   } as Record<string, [number, number]>
 }
 
-const qsOptionsRaw = new URLSearchParams(location.search).getAll('setting')
+// const qsOptionsRaw = new URLSearchParams(location.search).getAll('setting')
+const qsOptionsRaw = appQueryParamsArray.setting ?? []
 export const qsOptions = Object.fromEntries(qsOptionsRaw.map(o => {
   const [key, value] = o.split(':')
   return [key, JSON.parse(value)]
diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index 76a1e42c..0d318350 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -1,4 +1,5 @@
 import React, { useEffect } from 'react'
+import { appQueryParams } from '../appParams'
 import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
 import Screen from './Screen'
 import Input from './Input'
@@ -34,13 +35,12 @@ const ELEMENTS_WIDTH = 190
 
 export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions, allowAutoConnect }: Props) => {
   const isSmallHeight = !usePassesWindowDimensions(null, 350)
-  const qsParams = parseQs ? new URLSearchParams(window.location.search) : undefined
-  const qsParamName = qsParams?.get('name')
-  const qsParamIp = qsParams?.get('ip')
-  const qsParamVersion = qsParams?.get('version')
-  const qsParamProxy = qsParams?.get('proxy')
-  const qsParamUsername = qsParams?.get('username')
-  const qsParamLockConnect = qsParams?.get('lockConnect')
+  const qsParamName = parseQs ? appQueryParams.name : undefined
+  const qsParamIp = parseQs ? appQueryParams.ip : undefined
+  const qsParamVersion = parseQs ? appQueryParams.version : undefined
+  const qsParamProxy = parseQs ? appQueryParams.proxy : undefined
+  const qsParamUsername = parseQs ? appQueryParams.username : undefined
+  const qsParamLockConnect = parseQs ? appQueryParams.lockConnect : undefined
 
   const qsIpParts = qsParamIp?.split(':')
   const ipParts = initialData?.ip ? initialData?.ip.split(':') : undefined
@@ -120,7 +120,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   }
 
   useEffect(() => {
-    if (qsParams?.get('autoConnect') === 'true' && qsParams?.get('ip') && allowAutoConnect) {
+    if (qsParamIp && qsParamVersion && allowAutoConnect) {
       onQsConnect?.(commonUseOptions)
     }
   }, [])
@@ -173,15 +173,15 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
               setVersionOverride(value)
             }}
             placeholder="Optional, but recommended to specify"
-            disabled={lockConnect && qsParamVersion !== null}
+            disabled={lockConnect}
           />
         </div>
 
-        <InputWithLabel label="Proxy Override" value={proxyOverride} disabled={lockConnect && qsParamProxy !== null} onChange={({ target: { value } }) => setProxyOverride(value)} placeholder={placeholders?.proxyOverride} />
+        <InputWithLabel label="Proxy Override" value={proxyOverride} disabled={lockConnect && (qsParamProxy !== null || !!placeholders?.proxyOverride)} onChange={({ target: { value } }) => setProxyOverride(value)} placeholder={placeholders?.proxyOverride} />
         <InputWithLabel
           label="Username Override"
           value={usernameOverride}
-          disabled={!noAccountSelected || lockConnect && qsParamUsername !== null}
+          disabled={!noAccountSelected || (lockConnect && qsParamUsername !== null)}
           onChange={({ target: { value } }) => setUsernameOverride(value)}
           placeholder={placeholders?.usernameOverride}
           validateInput={!serverOnline || fetchedServerInfoIp !== serverIp ? undefined : validateUsername}
@@ -201,6 +201,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
               fontSize: 13,
             }}
             defaultValue={initialAccount === true ? -2 : initialAccount === undefined ? -1 : (fallbackIfNotFound((accounts ?? []).indexOf(initialAccount)) ?? -2)}
+            disabled={lockConnect && qsParamUsername !== null}
           >
             <option value={-1}>Offline Account (Username)</option>
             {accounts?.map((account, i) => <option key={i} value={i}>{account} (Logged In)</option>)}
diff --git a/src/react/AppStatus.tsx b/src/react/AppStatus.tsx
index 2c24b153..3be5b522 100644
--- a/src/react/AppStatus.tsx
+++ b/src/react/AppStatus.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react'
+import { appQueryParams } from '../appParams'
 import styles from './appStatus.module.css'
 import Button from './Button'
 import Screen from './Screen'
@@ -15,6 +16,7 @@ export default ({
   children
 }) => {
   const [loadingDotIndex, setLoadingDotIndex] = useState(0)
+  const lockConnect = appQueryParams.lockConnect === 'true'
 
   useEffect(() => {
     const statusRunner = async () => {
@@ -65,7 +67,7 @@ export default ({
     >
       {isError && (
         <>
-          {backAction && <Button label="Back" onClick={backAction} />}
+          {!lockConnect && backAction && <Button label="Back" onClick={backAction} />}
           {actionsSlot}
           <Button onClick={() => window.location.reload()} label="Reset App (recommended)" />
         </>
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 75b94872..29fb9604 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -19,6 +19,7 @@ import { disconnect } from '../flyingSquidUtils'
 import { pointerLock, setLoadingScreenStatus } from '../utils'
 import { closeWan, openToWanAndCopyJoinLink, getJoinLink } from '../localServerMultiplayer'
 import { collectFilesToCopy, fileExistsAsyncOptimized, mkdirRecursive, uniqueFileNameFromWorldName } from '../browserfs'
+import { appQueryParams } from '../appParams'
 import { useIsModalActive } from './utilsApp'
 import { showOptionsModal } from './SelectOption'
 import Button from './Button'
@@ -86,7 +87,7 @@ export const saveToBrowserMemory = async () => {
           const srcPath = join(worldFolder, copyPath)
           const savePath = join(saveRootPath, copyPath)
           await mkdirRecursive(savePath)
-          await fs.promises.writeFile(savePath, await fs.promises.readFile(srcPath))
+          await fs.promises.writeFile(savePath, await fs.promises.readFile(srcPath) as any)
           upProgress(totalSIze)
           if (isRegionFiles) {
             const regionFile = copyPath.split('/').at(-1)!
@@ -146,8 +147,7 @@ const splitByCopySize = (files: string[], copySize = 15) => {
 }
 
 export default () => {
-  const qsParams = new URLSearchParams(window.location.search)
-  const lockConnect = qsParams?.get('lockConnect') === 'true'
+  const lockConnect = appQueryParams.lockConnect === 'true'
   const isModalActive = useIsModalActive('pause-screen')
   const fsStateSnap = useSnapshot(fsState)
   const activeModalStackSnap = useSnapshot(activeModalStack)
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 16ce2c92..01af0bb0 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -4,6 +4,7 @@ import { useSnapshot } from 'valtio'
 import { ConnectOptions } from '../connect'
 import { activeModalStack, hideCurrentModal, miscUiState, showModal } from '../globalState'
 import supportedVersions from '../supportedVersions.mjs'
+import { appQueryParams } from '../appParams'
 import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
 import ServersList from './ServersList'
 import AddServerOrConnect, { BaseServerInfo } from './AddServerOrConnect'
@@ -70,8 +71,8 @@ const getInitialServersList = () => {
   return servers
 }
 
-const serversListQs = new URLSearchParams(window.location.search).get('serversList')
-const proxyQs = new URLSearchParams(window.location.search).get('proxy')
+const serversListQs = appQueryParams.serversList
+const proxyQs = appQueryParams.proxy
 
 const setNewServersList = (serversList: StoreServerItem[], force = false) => {
   if (serversListQs && !force) return

From 84d38ba21cf6a7761af3df49a3d6f313ac0ce0f5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 3 Feb 2025 04:10:45 +0300
Subject: [PATCH 173/753] feat: now keyboard arrows control camera rotation

---
 src/cameraRotationControls.ts | 32 +++++++------
 src/controls.ts               | 89 ++++++++++++++++++++++++++++++++++-
 2 files changed, 104 insertions(+), 17 deletions(-)

diff --git a/src/cameraRotationControls.ts b/src/cameraRotationControls.ts
index aebca338..151bb841 100644
--- a/src/cameraRotationControls.ts
+++ b/src/cameraRotationControls.ts
@@ -20,7 +20,7 @@ export type CameraMoveEvent = {
 
 export function onCameraMove (e: MouseEvent | CameraMoveEvent) {
   if (!isGameActive(true)) return
-  if (e.type !== 'touchmove' && !document.pointerLockElement) return
+  if (e.type === 'mousemove' && !document.pointerLockElement) return
   e.stopPropagation?.()
   const now = performance.now()
   // todo: limit camera movement for now to avoid unexpected jumps
@@ -50,20 +50,22 @@ window.addEventListener('mousemove', (e: MouseEvent) => {
   onCameraMove(e)
 }, { capture: true })
 
-contro.on('stickMovement', ({ stick, vector }) => {
-  if (!isGameActive(true)) return
-  if (stick !== 'right') return
-  let { x, z } = vector
-  if (Math.abs(x) < 0.18) x = 0
-  if (Math.abs(z) < 0.18) z = 0
-  onCameraMove({
-    movementX: x * 10,
-    movementY: z * 10,
-    type: 'stickMovement',
-    stopPropagation () {}
-  } as CameraMoveEvent)
-  miscUiState.usingGamepadInput = true
-})
+export const onControInit = () => {
+  contro.on('stickMovement', ({ stick, vector }) => {
+    if (!isGameActive(true)) return
+    if (stick !== 'right') return
+    let { x, z } = vector
+    if (Math.abs(x) < 0.18) x = 0
+    if (Math.abs(z) < 0.18) z = 0
+    onCameraMove({
+      movementX: x * 10,
+      movementY: z * 10,
+      type: 'stickMovement',
+      stopPropagation () {}
+    } as CameraMoveEvent)
+    miscUiState.usingGamepadInput = true
+  })
+}
 
 function pointerLockChangeCallback () {
   if (notificationProxy.id === 'pointerlockchange') {
diff --git a/src/controls.ts b/src/controls.ts
index c15a09f3..0352a7e5 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -22,6 +22,7 @@ import { gamepadUiCursorState, moveGamepadCursorByPx } from './react/GamepadUiCu
 import { completeTexturePackInstall, copyServerResourcePackToRegular, resourcePackState } from './resourcePack'
 import { showNotification } from './react/NotificationProvider'
 import { lastConnectOptions } from './react/AppStatusProvider'
+import { onCameraMove, onControInit } from './cameraRotationControls'
 
 
 export const customKeymaps = proxy(JSON.parse(localStorage.keymap || '{}')) as UserOverridesConfig
@@ -50,7 +51,11 @@ export const contro = new ControMax({
       command: ['Slash'],
       swapHands: ['KeyF'],
       zoom: ['KeyC'],
-      selectItem: ['KeyH'] // default will be removed
+      selectItem: ['KeyH'], // default will be removed
+      rotateCameraLeft: ['ArrowLeft'],
+      rotateCameraRight: ['ArrowRight'],
+      rotateCameraUp: ['ArrowUp'],
+      rotateCameraDown: ['ArrowDown']
     },
     ui: {
       toggleFullscreen: ['F11'],
@@ -92,6 +97,8 @@ export const contro = new ControMax({
 window.controMax = contro
 export type Command = CommandEventArgument<typeof contro['_commandsRaw']>['command']
 
+onControInit()
+
 updateBinds(customKeymaps)
 
 const updateDoPreventDefault = () => {
@@ -245,6 +252,73 @@ const inModalCommand = (command: Command, pressed: boolean) => {
   }
 }
 
+// Camera rotation controls
+const cameraRotationControls = {
+  activeDirections: new Set<'left' | 'right' | 'up' | 'down'>(),
+  interval: null as ReturnType<typeof setInterval> | null,
+  config: {
+    speed: 1, // movement per interval
+    interval: 5 // ms between movements
+  },
+  movements: {
+    left: { movementX: -0.5, movementY: 0 },
+    right: { movementX: 0.5, movementY: 0 },
+    up: { movementX: 0, movementY: -0.5 },
+    down: { movementX: 0, movementY: 0.5 }
+  },
+  updateMovement () {
+    if (cameraRotationControls.activeDirections.size === 0) {
+      if (cameraRotationControls.interval) {
+        clearInterval(cameraRotationControls.interval)
+        cameraRotationControls.interval = null
+      }
+      return
+    }
+
+    if (!cameraRotationControls.interval) {
+      cameraRotationControls.interval = setInterval(() => {
+        // Combine all active movements
+        const movement = { movementX: 0, movementY: 0 }
+        for (const direction of cameraRotationControls.activeDirections) {
+          movement.movementX += cameraRotationControls.movements[direction].movementX
+          movement.movementY += cameraRotationControls.movements[direction].movementY
+        }
+
+        onCameraMove({
+          ...movement,
+          type: 'keyboardRotation',
+          stopPropagation () {}
+        })
+      }, cameraRotationControls.config.interval)
+    }
+  },
+  start (direction: 'left' | 'right' | 'up' | 'down') {
+    cameraRotationControls.activeDirections.add(direction)
+    cameraRotationControls.updateMovement()
+  },
+  stop (direction: 'left' | 'right' | 'up' | 'down') {
+    cameraRotationControls.activeDirections.delete(direction)
+    cameraRotationControls.updateMovement()
+  },
+  handleCommand (command: string, pressed: boolean) {
+    const directionMap = {
+      'general.rotateCameraLeft': 'left',
+      'general.rotateCameraRight': 'right',
+      'general.rotateCameraUp': 'up',
+      'general.rotateCameraDown': 'down'
+    } as const
+
+    const direction = directionMap[command]
+    if (direction) {
+      if (pressed) cameraRotationControls.start(direction)
+      else cameraRotationControls.stop(direction)
+      return true
+    }
+    return false
+  }
+}
+window.cameraRotationControls = cameraRotationControls
+
 const setSneaking = (state: boolean) => {
   gameAdditionalState.isSneaking = state
   bot.setControlState('sneak', state)
@@ -275,7 +349,6 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
         } else if (pressed) {
           setSneaking(!gameAdditionalState.isSneaking)
         }
-
         break
       case 'general.attackDestroy':
         document.dispatchEvent(new MouseEvent(pressed ? 'mousedown' : 'mouseup', { button: 0 }))
@@ -286,6 +359,12 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
       case 'general.zoom':
         gameAdditionalState.isZooming = pressed
         break
+      case 'general.rotateCameraLeft':
+      case 'general.rotateCameraRight':
+      case 'general.rotateCameraUp':
+      case 'general.rotateCameraDown':
+        cameraRotationControls.handleCommand(command, pressed)
+        break
     }
   }
 }
@@ -370,6 +449,12 @@ contro.on('trigger', ({ command }) => {
       case 'general.toggleSneakOrDown':
       case 'general.sprint':
       case 'general.attackDestroy':
+      case 'general.rotateCameraLeft':
+      case 'general.rotateCameraRight':
+      case 'general.rotateCameraUp':
+      case 'general.rotateCameraDown':
+        // no-op
+        break
       case 'general.swapHands': {
         bot._client.write('entity_action', {
           entityId: bot.entity.id,

From 4a77ba15b6f5ac51a77c2f8e4223e32c883d410e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 3 Feb 2025 05:16:46 +0300
Subject: [PATCH 174/753] disable dedupe check until usability and performanse
 problemas are fixed in pnpm

---
 .github/workflows/ci.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0551b541..ce88481a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,25 +40,25 @@ jobs:
       #   if: ${{ github.event.pull_request.base.ref == 'release' }}
       #   env:
       #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  dedupe-check:
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.head.ref == 'next'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
+  # dedupe-check:
+  #   runs-on: ubuntu-latest
+  #   if: github.event.pull_request.head.ref == 'next'
+  #   steps:
+  #     - name: Checkout repository
+  #       uses: actions/checkout@v2
 
-      - name: Install pnpm
-        run: npm install -g pnpm@9.0.4
+  #     - name: Install pnpm
+  #       run: npm install -g pnpm@9.0.4
 
-      - name: Run pnpm dedupe
-        run: pnpm dedupe
+  #     - name: Run pnpm dedupe
+  #       run: pnpm dedupe
 
-      - name: Check for changes
-        run: |
-          if ! git diff --exit-code --quiet pnpm-lock.yaml; then
-            echo "pnpm dedupe introduced changes:"
-            git diff --color=always pnpm-lock.yaml
-            exit 1
-          else
-            echo "No changes detected after pnpm dedupe in pnpm-lock.yaml"
-          fi
+  #     - name: Check for changes
+  #       run: |
+  #         if ! git diff --exit-code --quiet pnpm-lock.yaml; then
+  #           echo "pnpm dedupe introduced changes:"
+  #           git diff --color=always pnpm-lock.yaml
+  #           exit 1
+  #         else
+  #           echo "No changes detected after pnpm dedupe in pnpm-lock.yaml"
+  #         fi

From 72058f14f2b3b7a4a80edbd52b52e9e3be713d6e Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Mon, 3 Feb 2025 10:19:59 +0300
Subject: [PATCH 175/753] feat: reimplement auto version - fix bugs, +config,
 make faster!! (#262)

---
 patches/minecraft-protocol@1.53.0.patch    | 188 ---------------------
 patches/minecraft-protocol@1.54.0.patch    |  42 -----
 pnpm-lock.yaml                             |  12 +-
 scripts/makeOptimizedMcData.mjs            |   2 +-
 src/appParams.ts                           |   4 +-
 src/connect.ts                             |  48 ++++--
 src/importsWorkaround.js                   |   2 +
 src/index.ts                               |  41 +++--
 src/mineflayer/mc-protocol.ts              |  15 ++
 src/mineflayer/minecraft-protocol-extra.ts |  81 +++++++++
 src/optionsGuiScheme.tsx                   |  30 ++++
 src/optionsStorage.ts                      |   2 +-
 src/shims/minecraftData.ts                 |   8 +-
 src/shims/patchShims.ts                    |  10 ++
 14 files changed, 217 insertions(+), 268 deletions(-)
 delete mode 100644 patches/minecraft-protocol@1.53.0.patch
 create mode 100644 src/mineflayer/mc-protocol.ts
 create mode 100644 src/mineflayer/minecraft-protocol-extra.ts
 create mode 100644 src/shims/patchShims.ts

diff --git a/patches/minecraft-protocol@1.53.0.patch b/patches/minecraft-protocol@1.53.0.patch
deleted file mode 100644
index 243e0bd7..00000000
--- a/patches/minecraft-protocol@1.53.0.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-diff --git a/src/client/autoVersion.js b/src/client/autoVersion.js
-index c437ecf3a0e4ab5758a48538c714b7e9651bb5da..d9c9895ae8614550aa09ad60a396ac32ffdf1287 100644
---- a/src/client/autoVersion.js
-+++ b/src/client/autoVersion.js
-@@ -9,7 +9,7 @@ module.exports = function (client, options) {
-   client.wait_connect = true // don't let src/client/setProtocol proceed on socket 'connect' until 'connect_allowed'
-   debug('pinging', options.host)
-   // TODO: use 0xfe ping instead for better compatibility/performance? https://github.com/deathcap/node-minecraft-ping
--  ping(options, function (err, response) {
-+  ping(options, async function (err, response) {
-     if (err) { return client.emit('error', err) }
-     debug('ping response', response)
-     // TODO: could also use ping pre-connect to save description, type, max players, etc.
-@@ -40,6 +40,7 @@ module.exports = function (client, options) {
- 
-     // Reinitialize client object with new version TODO: move out of its constructor?
-     client.version = minecraftVersion
-+    await options.versionSelectedHook?.(client)
-     client.state = states.HANDSHAKING
- 
-     // Let other plugins such as Forge/FML (modinfo) respond to the ping response
-diff --git a/src/client/chat.js b/src/client/chat.js
-index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aae0d1d337 100644
---- a/src/client/chat.js
-+++ b/src/client/chat.js
-@@ -111,7 +111,7 @@ module.exports = function (client, options) {
-         for (const player of packet.data) {
-           if (!player.chatSession) continue
-           client._players[player.UUID] = {
--            publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
-+            // publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
-             publicKeyDER: player.chatSession.publicKey.keyBytes,
-             sessionUuid: player.chatSession.uuid
-           }
-@@ -127,7 +127,7 @@ module.exports = function (client, options) {
-       for (const player of packet.data) {
-         if (player.crypto) {
-           client._players[player.UUID] = {
--            publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
-+            // publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
-             publicKeyDER: player.crypto.publicKey,
-             signature: player.crypto.signature,
-             displayName: player.displayName || player.name
-@@ -198,7 +198,7 @@ module.exports = function (client, options) {
-     if (mcData.supportFeature('useChatSessions')) {
-       const tsDelta = BigInt(Date.now()) - packet.timestamp
-       const expired = !packet.timestamp || tsDelta > messageExpireTime || tsDelta < 0
--      const verified = !packet.unsignedChatContent && updateAndValidateSession(packet.senderUuid, packet.plainMessage, packet.signature, packet.index, packet.previousMessages, packet.salt, packet.timestamp) && !expired
-+      const verified = false && !packet.unsignedChatContent && updateAndValidateSession(packet.senderUuid, packet.plainMessage, packet.signature, packet.index, packet.previousMessages, packet.salt, packet.timestamp) && !expired
-       if (verified) client._signatureCache.push(packet.signature)
-       client.emit('playerChat', {
-         plainMessage: packet.plainMessage,
-@@ -363,7 +363,7 @@ module.exports = function (client, options) {
-     }
-   }
- 
--  client._signedChat = (message, options = {}) => {
-+  client._signedChat = async (message, options = {}) => {
-     options.timestamp = options.timestamp || BigInt(Date.now())
-     options.salt = options.salt || 1n
- 
-@@ -405,7 +405,7 @@ module.exports = function (client, options) {
-         message,
-         timestamp: options.timestamp,
-         salt: options.salt,
--        signature: (client.profileKeys && client._session) ? client.signMessage(message, options.timestamp, options.salt, undefined, acknowledgements) : undefined,
-+        signature: (client.profileKeys && client._session) ? await client.signMessage(message, options.timestamp, options.salt, undefined, acknowledgements) : undefined,
-         offset: client._lastSeenMessages.pending,
-         acknowledged
-       })
-@@ -419,7 +419,7 @@ module.exports = function (client, options) {
-         message,
-         timestamp: options.timestamp,
-         salt: options.salt,
--        signature: client.profileKeys ? client.signMessage(message, options.timestamp, options.salt, options.preview) : Buffer.alloc(0),
-+        signature: client.profileKeys ? await client.signMessage(message, options.timestamp, options.salt, options.preview) : Buffer.alloc(0),
-         signedPreview: options.didPreview,
-         previousMessages: client._lastSeenMessages.map((e) => ({
-           messageSender: e.sender,
-diff --git a/src/client/encrypt.js b/src/client/encrypt.js
-index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108f4c63536 100644
---- a/src/client/encrypt.js
-+++ b/src/client/encrypt.js
-@@ -25,7 +25,11 @@ module.exports = function (client, options) {
-         if (packet.serverId !== '-') {
-           debug('This server appears to be an online server and you are providing no password, the authentication will probably fail')
-         }
--        sendEncryptionKeyResponse()
-+        client.end('This server appears to be an online server and you are providing no authentication. Try authenticating first.')
-+        // sendEncryptionKeyResponse()
-+        // client.once('set_compression', () => {
-+        //   clearTimeout(loginTimeout)
-+        // })
-       }
- 
-       function onJoinServerResponse (err) {
-diff --git a/src/client.js b/src/client.js
-index 74749698f8cee05b5dc749c271544f78d06645b0..e77e0a3f41c1ee780c3abbd54b0801d248c2a07c 100644
---- a/src/client.js
-+++ b/src/client.js
-@@ -89,10 +89,12 @@ class Client extends EventEmitter {
-       parsed.metadata.name = parsed.data.name
-       parsed.data = parsed.data.params
-       parsed.metadata.state = state
--      debug('read packet ' + state + '.' + parsed.metadata.name)
--      if (debug.enabled) {
--        const s = JSON.stringify(parsed.data, null, 2)
--        debug(s && s.length > 10000 ? parsed.data : s)
-+      if (!globalThis.excludeCommunicationDebugEvents?.includes(parsed.metadata.name)) {
-+        debug('read packet ' + state + '.' + parsed.metadata.name)
-+        if (debug.enabled) {
-+          const s = JSON.stringify(parsed.data, null, 2)
-+          debug(s && s.length > 10000 ? parsed.data : s)
-+        }
-       }
-       if (this._hasBundlePacket && parsed.metadata.name === 'bundle_delimiter') {
-         if (this._mcBundle.length) { // End bundle
-@@ -110,7 +112,13 @@ class Client extends EventEmitter {
-           this._hasBundlePacket = false
-         }
-       } else {
--        emitPacket(parsed)
-+        try {
-+          emitPacket(parsed)
-+        } catch (err) {
-+          console.log('Client incorrectly handled packet ' + parsed.metadata.name)
-+          console.error(err)
-+          // todo investigate why it doesn't close the stream even if unhandled there
-+        }
-       }
-     })
-   }
-@@ -168,7 +176,10 @@ class Client extends EventEmitter {
-     }
- 
-     const onFatalError = (err) => {
--      this.emit('error', err)
-+      // todo find out what is trying to write after client disconnect
-+      if(err.code !== 'ECONNABORTED') {
-+        this.emit('error', err)
-+      }
-       endSocket()
-     }
- 
-@@ -197,6 +208,8 @@ class Client extends EventEmitter {
-     serializer -> framer -> socket -> splitter -> deserializer */
-     if (this.serializer) {
-       this.serializer.end()
-+      this.socket?.end()
-+      this.socket?.emit('end')
-     } else {
-       if (this.socket) this.socket.end()
-     }
-@@ -238,8 +251,11 @@ class Client extends EventEmitter {
- 
-   write (name, params) {
-     if (!this.serializer.writable) { return }
--    debug('writing packet ' + this.state + '.' + name)
--    debug(params)
-+    if (!globalThis.excludeCommunicationDebugEvents?.includes(name)) {
-+      debug(`[${this.state}] from ${this.isServer ? 'server' : 'client'}: ` + name)
-+      debug(params)
-+    }
-+    this.emit('writePacket', name, params)
-     this.serializer.write({ name, params })
-   }
- 
-diff --git a/src/index.d.ts b/src/index.d.ts
-index e61d5403bab46251d35b22a2ea30eb09b2746a26..84f597427893671eeac231b11e6e42aa815601df 100644
---- a/src/index.d.ts
-+++ b/src/index.d.ts
-@@ -135,6 +135,7 @@ declare module 'minecraft-protocol' {
- 		sessionServer?: string
- 		keepAlive?: boolean
- 		closeTimeout?: number
-+		closeTimeout?: number
- 		noPongTimeout?: number
- 		checkTimeoutInterval?: number
- 		version?: string
-@@ -155,6 +156,8 @@ declare module 'minecraft-protocol' {
- 		disableChatSigning?: boolean
- 		/** Pass custom client implementation if needed. */
- 		Client?: Client
-+		/** Can be used to prepare mc data on autoVersion (client.version has selected version) */
-+		versionSelectedHook?: (client: Client) => Promise<void> | void
- 	}
- 
- 	export class Server extends EventEmitter {
diff --git a/patches/minecraft-protocol@1.54.0.patch b/patches/minecraft-protocol@1.54.0.patch
index 32371450..29111f69 100644
--- a/patches/minecraft-protocol@1.54.0.patch
+++ b/patches/minecraft-protocol@1.54.0.patch
@@ -1,24 +1,3 @@
-diff --git a/src/client/autoVersion.js b/src/client/autoVersion.js
-index 3fe1552672e4c0dd1b14b3b56950c3d7eaf3537b..6eb615e5827279c328d5547b5911626693252da4 100644
---- a/src/client/autoVersion.js
-+++ b/src/client/autoVersion.js
-@@ -9,7 +9,7 @@ module.exports = function (client, options) {
-   client.wait_connect = true // don't let src/client/setProtocol proceed on socket 'connect' until 'connect_allowed'
-   debug('pinging', options.host)
-   // TODO: use 0xfe ping instead for better compatibility/performance? https://github.com/deathcap/node-minecraft-ping
--  ping(options, function (err, response) {
-+  ping(options, async function (err, response) {
-     if (err) { return client.emit('error', err) }
-     debug('ping response', response)
-     // TODO: could also use ping pre-connect to save description, type, max players, etc.
-@@ -40,6 +40,7 @@ module.exports = function (client, options) {
- 
-     // Reinitialize client object with new version TODO: move out of its constructor?
-     client.version = minecraftVersion
-+    await options.versionSelectedHook?.(client)
-     client.state = states.HANDSHAKING
- 
-     // Let other plugins such as Forge/FML (modinfo) respond to the ping response
 diff --git a/src/client/chat.js b/src/client/chat.js
 index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aae0d1d337 100644
 --- a/src/client/chat.js
@@ -165,24 +144,3 @@ index 74749698f8cee05b5dc749c271544f78d06645b0..e77e0a3f41c1ee780c3abbd54b0801d2
      this.serializer.write({ name, params })
    }
  
-diff --git a/src/index.d.ts b/src/index.d.ts
-index e61d5403bab46251d35b22a2ea30eb09b2746a26..84f597427893671eeac231b11e6e42aa815601df 100644
---- a/src/index.d.ts
-+++ b/src/index.d.ts
-@@ -135,6 +135,7 @@ declare module 'minecraft-protocol' {
- 		sessionServer?: string
- 		keepAlive?: boolean
- 		closeTimeout?: number
-+		closeTimeout?: number
- 		noPongTimeout?: number
- 		checkTimeoutInterval?: number
- 		version?: string
-@@ -155,6 +156,8 @@ declare module 'minecraft-protocol' {
- 		disableChatSigning?: boolean
- 		/** Pass custom client implementation if needed. */
- 		Client?: Client
-+		/** Can be used to prepare mc data on autoVersion (client.version has selected version) */
-+		versionSelectedHook?: (client: Client) => Promise<void> | void
- 	}
- 
- 	export class Server extends EventEmitter {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f278cf2d..b6d75211 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,7 +21,7 @@ overrides:
 
 patchedDependencies:
   minecraft-protocol@1.54.0:
-    hash: 3wm2z233n46lqi64rbxem4nyv4
+    hash: dkeyukcqlupmk563gwxsmjr3yu
     path: patches/minecraft-protocol@1.54.0.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: bck55yjvd4wrgz46x7o4vfur5q
@@ -138,7 +138,7 @@ importers:
         version: 3.83.1
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13)
@@ -12780,7 +12780,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.2.3
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -16937,7 +16937,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.12
@@ -17007,7 +17007,7 @@ snapshots:
   mineflayer@4.25.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.10.1
@@ -17030,7 +17030,7 @@ snapshots:
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=3wm2z233n46lqi64rbxem4nyv4)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.10.1
diff --git a/scripts/makeOptimizedMcData.mjs b/scripts/makeOptimizedMcData.mjs
index 74477d7f..ebc97b59 100644
--- a/scripts/makeOptimizedMcData.mjs
+++ b/scripts/makeOptimizedMcData.mjs
@@ -242,4 +242,4 @@ const initialMcData = {
   }
 }
 
-fs.writeFileSync('./generated/minecraft-initial-data.json', JSON.stringify(initialMcData), 'utf8')
+// fs.writeFileSync('./generated/minecraft-initial-data.json', JSON.stringify(initialMcData), 'utf8')
diff --git a/src/appParams.ts b/src/appParams.ts
index e862e301..0b6bd6d8 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -1,4 +1,4 @@
-const qsParams = new URLSearchParams(window.location.search)
+const qsParams = new URLSearchParams(window.location?.search ?? '')
 
 export type AppQsParams = {
   // AddServerOrConnect.tsx params
@@ -37,7 +37,7 @@ export type AppQsParams = {
   command?: string
   // Misc params
   suggest_save?: string
-  scene?: string
+  noPacketsValidation?: string
 }
 
 export type AppQsParamsArray = {
diff --git a/src/connect.ts b/src/connect.ts
index e45769f7..7dd94795 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -1,9 +1,11 @@
-import { versionsByMinecraftVersion } from 'minecraft-data'
-import minecraftInitialDataJson from '../generated/minecraft-initial-data.json'
+// import { versionsByMinecraftVersion } from 'minecraft-data'
+// import minecraftInitialDataJson from '../generated/minecraft-initial-data.json'
 import { AuthenticatedAccount } from './react/ServersListProvider'
 import { setLoadingScreenStatus } from './utils'
 import { downloadSoundsIfNeeded } from './sounds/botSoundSystem'
 import { miscUiState } from './globalState'
+import { options } from './optionsStorage'
+import supportedVersions from './supportedVersions.mjs'
 
 export type ConnectOptions = {
   server?: string
@@ -24,21 +26,39 @@ export type ConnectOptions = {
   viewerWsConnect?: string
 }
 
-export const downloadNeededDataOnConnect = async (version: string) => {
-  // todo expose cache
-  const initialDataVersion = Object.keys(minecraftInitialDataJson)[0]!
-  if (version === initialDataVersion) {
-    // ignore cache hit
-    versionsByMinecraftVersion.pc[initialDataVersion]!.dataVersion!++
+export const getVersionAutoSelect = (autoVersionSelect = options.serversAutoVersionSelect) => {
+  if (autoVersionSelect === 'auto') {
+    return '1.20.4'
   }
-  setLoadingScreenStatus(`Loading data for ${version}`)
-  if (!document.fonts.check('1em mojangles')) {
+  if (autoVersionSelect === 'latest') {
+    return supportedVersions.at(-1)!
+  }
+  return autoVersionSelect
+}
+
+export const downloadMcDataOnConnect = async (version: string) => {
+  // setLoadingScreenStatus(`Loading data for ${version}`)
+  // // todo expose cache
+  // // const initialDataVersion = Object.keys(minecraftInitialDataJson)[0]!
+  // // if (version === initialDataVersion) {
+  // //   // ignore cache hit
+  // //   versionsByMinecraftVersion.pc[initialDataVersion]!.dataVersion!++
+  // // }
+
+  // await window._MC_DATA_RESOLVER.promise // ensure data is loaded
+  // miscUiState.loadedDataVersion = version
+}
+
+const loadFonts = async () => {
+  const FONT_FAMILY = 'mojangles'
+  if (!document.fonts.check(`1em ${FONT_FAMILY}`)) {
     // todo instead re-render signs on load
-    await document.fonts.load('1em mojangles').catch(() => {
+    await document.fonts.load(`1em ${FONT_FAMILY}`).catch(() => {
       console.error('Failed to load font, signs wont be rendered correctly')
     })
   }
-  await window._MC_DATA_RESOLVER.promise // ensure data is loaded
-  await downloadSoundsIfNeeded()
-  miscUiState.loadedDataVersion = version
+}
+
+export const downloadOtherGameData = async () => {
+  await Promise.all([loadFonts(), downloadSoundsIfNeeded()])
 }
diff --git a/src/importsWorkaround.js b/src/importsWorkaround.js
index 21bc4585..231654ca 100644
--- a/src/importsWorkaround.js
+++ b/src/importsWorkaround.js
@@ -1,4 +1,6 @@
 // workaround for mineflayer
+globalThis.window ??= globalThis
+globalThis.localStorage ??= {}
 process.versions.node = '18.0.0'
 
 if (!navigator.getGamepads) {
diff --git a/src/index.ts b/src/index.ts
index 36ced199..4a788b37 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,8 +5,10 @@ import './globals'
 import './devtools'
 import './entities'
 import './globalDomListeners'
+import './mineflayer/mc-protocol'
 import './mineflayer/maps'
 import './mineflayer/cameraShake'
+import './shims/patchShims'
 import { onGameLoad } from './inventoryWindows'
 import initCollisionShapes from './getCollisionInteractionShapes'
 import protocolMicrosoftAuth from 'minecraft-protocol/src/client/microsoftAuth'
@@ -86,7 +88,7 @@ import { saveToBrowserMemory } from './react/PauseScreen'
 import { ViewerWrapper } from 'prismarine-viewer/viewer/lib/viewerWrapper'
 import './devReload'
 import './water'
-import { ConnectOptions, downloadNeededDataOnConnect } from './connect'
+import { ConnectOptions, downloadMcDataOnConnect, getVersionAutoSelect, downloadOtherGameData } from './connect'
 import { ref, subscribe } from 'valtio'
 import { signInMessageState } from './react/SignInMessageProvider'
 import { updateAuthenticatedAccountData, updateLoadedServerData } from './react/ServersListProvider'
@@ -99,6 +101,7 @@ import { parseFormattedMessagePacket } from './botUtils'
 import { getViewerVersionData, getWsProtocolStream } from './viewerConnector'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 import { updateCursor } from './cameraRotationControls'
+import { pingServerVersion } from './mineflayer/minecraft-protocol-extra'
 
 window.debug = debug
 window.THREE = THREE
@@ -270,10 +273,14 @@ export async function connect (connectOptions: ConnectOptions) {
   const proxy = cleanConnectIp(connectOptions.proxy, undefined)
   let { username } = connectOptions
 
-  console.log(`connecting to ${server.host}:${server.port} with ${username}`)
+  if (connectOptions.server) {
+    console.log(`connecting to ${server.host}:${server.port}`)
+  }
+  console.log('using player username', username)
 
   hideCurrentScreens()
-  setLoadingScreenStatus('Logging in')
+  const loggingInMsg = connectOptions.server ? 'Connecting to server' : 'Logging in'
+  setLoadingScreenStatus(loggingInMsg)
 
   let ended = false
   let bot!: typeof __type_bot
@@ -357,14 +364,19 @@ export async function connect (connectOptions: ConnectOptions) {
   try {
     const serverOptions = defaultsDeep({}, connectOptions.serverOverrides ?? {}, options.localServerOptions, defaultServerOptions)
     Object.assign(serverOptions, connectOptions.serverOverridesFlat ?? {})
-    window._LOAD_MC_DATA() // start loading data (if not loaded yet)
+    setLoadingScreenStatus('Downloading minecraft data')
+    await Promise.all([
+      window._LOAD_MC_DATA(), // download mc data before we can use minecraft-data at all
+      downloadOtherGameData()
+    ])
+    setLoadingScreenStatus(loggingInMsg)
     const downloadMcData = async (version: string) => {
       if (connectOptions.authenticatedAccount && (versionToNumber(version) < versionToNumber('1.19.4') || versionToNumber(version) >= versionToNumber('1.21'))) {
         // todo support it (just need to fix .export crash)
         throw new Error('Microsoft authentication is only supported on 1.19.4 - 1.20.6 (at least for now)')
       }
 
-      await downloadNeededDataOnConnect(version)
+      await downloadMcDataOnConnect(version)
       try {
         await resourcepackReload(version)
       } catch (err) {
@@ -421,8 +433,14 @@ export async function connect (connectOptions: ConnectOptions) {
       initialLoadingText = 'Local server is still starting'
     } else if (p2pMultiplayer) {
       initialLoadingText = 'Connecting to peer'
+    } else if (connectOptions.server) {
+      const versionAutoSelect = getVersionAutoSelect()
+      setLoadingScreenStatus(`Fetching server version. Preffered: ${versionAutoSelect}`)
+      const autoVersionSelect = await pingServerVersion(server.host!, server.port ? Number(server.port) : undefined, versionAutoSelect)
+      initialLoadingText = `Connecting to server ${server.host} with version ${autoVersionSelect.version}`
+      connectOptions.botVersion = autoVersionSelect.version
     } else {
-      initialLoadingText = 'Connecting to server'
+      initialLoadingText = 'We have no idea what to do'
     }
     setLoadingScreenStatus(initialLoadingText)
 
@@ -454,6 +472,10 @@ export async function connect (connectOptions: ConnectOptions) {
       clientDataStream = await getWsProtocolStream(connectOptions.viewerWsConnect)
     }
 
+    if (connectOptions.botVersion) {
+      miscUiState.loadedDataVersion = connectOptions.botVersion
+    }
+
     bot = mineflayer.createBot({
       host: server.host,
       port: server.port ? +server.port : undefined,
@@ -523,10 +545,6 @@ export async function connect (connectOptions: ConnectOptions) {
       closeTimeout: 240 * 1000,
       respawn: options.autoRespawn,
       maxCatchupTicks: 0,
-      async versionSelectedHook (client) {
-        await downloadMcData(client.version)
-        setLoadingScreenStatus(initialLoadingText)
-      },
       'mapDownloader-saveToFile': false,
       // "mapDownloader-saveInternal": false, // do not save into memory, todo must be implemeneted as we do really care of ram
     }) as unknown as typeof __type_bot
@@ -634,6 +652,9 @@ export async function connect (connectOptions: ConnectOptions) {
   bot.on('end', (endReason) => {
     if (ended) return
     console.log('disconnected for', endReason)
+    if (endReason === 'socketClosed') {
+      endReason = 'Connection with server lost'
+    }
     setLoadingScreenStatus(`You have been disconnected from the server. End reason: ${endReason}`, true)
     onPossibleErrorDisconnect()
     destroyAll()
diff --git a/src/mineflayer/mc-protocol.ts b/src/mineflayer/mc-protocol.ts
new file mode 100644
index 00000000..583a98bb
--- /dev/null
+++ b/src/mineflayer/mc-protocol.ts
@@ -0,0 +1,15 @@
+import { Client } from 'minecraft-protocol'
+import { appQueryParams } from '../appParams'
+import { validatePacket } from './minecraft-protocol-extra'
+
+customEvents.on('mineflayerBotCreated', () => {
+  // todo move more code here
+  if (!appQueryParams.noPacketsValidation) {
+    (bot._client as unknown as Client).on('packet', (data, packetMeta, buffer, fullBuffer) => {
+      validatePacket(packetMeta.name, data, fullBuffer, true)
+    });
+    (bot._client as unknown as Client).on('writePacket', (name, params) => {
+      validatePacket(name, params, Buffer.alloc(0), false)
+    })
+  }
+})
diff --git a/src/mineflayer/minecraft-protocol-extra.ts b/src/mineflayer/minecraft-protocol-extra.ts
new file mode 100644
index 00000000..65ed6031
--- /dev/null
+++ b/src/mineflayer/minecraft-protocol-extra.ts
@@ -0,0 +1,81 @@
+import EventEmitter from 'events'
+import clientAutoVersion from 'minecraft-protocol/src/client/autoVersion'
+
+export const pingServerVersion = async (ip: string, port?: number, preferredVersion?: string) => {
+  const fakeClient = new EventEmitter() as any
+  fakeClient.on('error', (err) => {
+    throw new Error(err.message ?? err)
+  })
+  const options = {
+    host: ip,
+    port,
+    version: preferredVersion,
+    noPongTimeout: Infinity // disable timeout
+  }
+  // let latency = 0
+  // fakeClient.autoVersionHooks = [(res) => {
+  //   latency = res.latency
+  // }]
+
+  // TODO! use client.socket.destroy() instead of client.end() for faster cleanup
+  await clientAutoVersion(fakeClient, options)
+
+  await new Promise<void>((resolve, reject) => {
+    fakeClient.once('connect_allowed', resolve)
+  })
+  return {
+    version: fakeClient.version,
+    // latency,
+  }
+}
+
+const MAX_PACKET_SIZE = 2_097_152 // 2mb
+const MAX_PACKET_DEPTH = 20
+
+export const validatePacket = (name: string, data: any, fullBuffer: Buffer, isFromServer: boolean) => {
+  // todo find out why chat is so slow with react
+  if (!isFromServer) return
+
+  if (fullBuffer.length > MAX_PACKET_SIZE) {
+    console.groupCollapsed(`Packet ${name} is too large: ${fullBuffer.length} bytes`)
+    console.log(data)
+    console.groupEnd()
+    throw new Error(`Packet ${name} is too large: ${fullBuffer.length} bytes`)
+  }
+
+  // todo count total number of objects instead of max depth
+  const maxDepth = getObjectMaxDepth(data)
+  if (maxDepth > MAX_PACKET_DEPTH) {
+    console.groupCollapsed(`Packet ${name} have too many nested objects: ${maxDepth}`)
+    console.log(data)
+    console.groupEnd()
+    throw new Error(`Packet ${name} have too many nested objects: ${maxDepth}`)
+  }
+}
+
+function getObjectMaxDepth (obj: unknown, currentDepth = 0): number {
+  // Base case: null or primitive types have depth 0
+  if (obj === null || typeof obj !== 'object' || obj instanceof Buffer) {
+    return currentDepth
+  }
+
+  // Handle arrays and objects
+  let maxDepth = currentDepth
+
+  if (Array.isArray(obj)) {
+    // For arrays, check each element
+    for (const item of obj) {
+      const depth = getObjectMaxDepth(item, currentDepth + 1)
+      maxDepth = Math.max(maxDepth, depth)
+    }
+  } else {
+    // For objects, check each value
+    // eslint-disable-next-line guard-for-in
+    for (const key in obj) {
+      const depth = getObjectMaxDepth(obj[key], currentDepth + 1)
+      maxDepth = Math.max(maxDepth, depth)
+    }
+  }
+
+  return maxDepth
+}
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 2ee07d5c..c3ede407 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -12,6 +12,8 @@ import { openFilePicker, resetLocalStorageWithoutWorld } from './browserfs'
 import { completeTexturePackInstall, getResourcePackNames, resourcePackState, uninstallTexturePack } from './resourcePack'
 import { downloadPacketsReplay, packetsReplaceSessionState } from './packetsReplay'
 import { showOptionsModal } from './react/SelectOption'
+import supportedVersions from './supportedVersions.mjs'
+import { getVersionAutoSelect } from './connect'
 
 export const guiOptionsScheme: {
   [t in OptionsGroupType]: Array<{ [K in keyof AppOptions]?: Partial<OptionMeta<AppOptions[K]>> } & { custom? }>
@@ -480,6 +482,34 @@ export const guiOptionsScheme: {
         ],
       },
     },
+    {
+      custom () {
+        const { serversAutoVersionSelect } = useSnapshot(options)
+        const allVersions = [...supportedVersions, 'latest', 'auto']
+        const currentIndex = allVersions.indexOf(serversAutoVersionSelect)
+
+        const getDisplayValue = (version: string) => {
+          const versionAutoSelect = getVersionAutoSelect(version)
+          if (version === 'latest') return `latest (${versionAutoSelect})`
+          if (version === 'auto') return `auto (${versionAutoSelect})`
+          return version
+        }
+
+        return <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+          <Slider
+            style={{ width: 150 }}
+            label='Server Version'
+            value={currentIndex}
+            min={0}
+            max={allVersions.length - 1}
+            valueDisplay={getDisplayValue(serversAutoVersionSelect)}
+            updateValue={(newVal) => {
+              options.serversAutoVersionSelect = allVersions[newVal]
+            }}
+          />
+        </div>
+      },
+    },
   ],
 }
 export type OptionsGroupType = 'main' | 'render' | 'interface' | 'controls' | 'sound' | 'advanced' | 'VR'
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 24aaff41..12188a17 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -53,6 +53,7 @@ const defaultOptions = {
   serverResourcePacks: 'prompt' as 'prompt' | 'always' | 'never',
   handDisplay: false,
   packetsLoggerPreset: 'all' as 'all' | 'no-buffers',
+  serversAutoVersionSelect: 'auto' as 'auto' | 'latest' | '1.20.4' | string,
 
   // antiAliasing: false,
 
@@ -84,7 +85,6 @@ const defaultOptions = {
   autoParkour: false,
   vrSupport: true, // doesn't directly affect the VR mode, should only disable the button which is annoying to android users
   renderDebug: (isDev ? 'advanced' : 'basic') as 'none' | 'advanced' | 'basic',
-  autoVersionSelect: '1.20.4',
 
   // advanced bot options
   autoRespawn: false,
diff --git a/src/shims/minecraftData.ts b/src/shims/minecraftData.ts
index 6edb5f48..09124771 100644
--- a/src/shims/minecraftData.ts
+++ b/src/shims/minecraftData.ts
@@ -1,6 +1,6 @@
 import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
 import JsonOptimizer from '../optimizeJson'
-import minecraftInitialDataJson from '../../generated/minecraft-initial-data.json'
+// import minecraftInitialDataJson from '../../generated/minecraft-initial-data.json'
 import { toMajorVersion } from '../utils'
 
 const customResolver = () => {
@@ -30,9 +30,9 @@ const cacheTtl = 30 * 1000
 const cache = new Map<string, any>()
 const cacheTime = new Map<string, number>()
 const possiblyGetFromCache = (version: string) => {
-  if (minecraftInitialDataJson[version] && !optimizedDataResolver.resolvedData) {
-    return minecraftInitialDataJson[version]
-  }
+  // if (minecraftInitialDataJson[version] && !optimizedDataResolver.resolvedData) {
+  //   return minecraftInitialDataJson[version]
+  // }
   if (cache.has(version)) {
     return cache.get(version)
   }
diff --git a/src/shims/patchShims.ts b/src/shims/patchShims.ts
new file mode 100644
index 00000000..1890edf6
--- /dev/null
+++ b/src/shims/patchShims.ts
@@ -0,0 +1,10 @@
+import { EventEmitter } from 'events'
+
+const oldEmit = EventEmitter.prototype.emit
+EventEmitter.prototype.emit = function (...args) {
+  if (args[0] === 'error' && !this._events.error) {
+    console.log('Unhandled error event', args.slice(1))
+    args[1] = { message: String(args[1]) }
+  }
+  return oldEmit.apply(this, args)
+}

From 41489130d6cbee2cb461ef01b0173a92109a6c54 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 3 Feb 2025 11:02:12 +0300
Subject: [PATCH 176/753] feat: wait for resource pack install before
 displaying world to avoid chunks reloading

---
 src/index.ts                               | 14 ++++++--
 src/mineflayer/minecraft-protocol-extra.ts | 37 +++++++++++++++++-----
 src/resourcePack.ts                        | 27 +++++++++++-----
 3 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 4a788b37..dd64f0e4 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -70,7 +70,7 @@ import { startLocalServer, unsupportedLocalServerFeatures } from './createLocalS
 import defaultServerOptions from './defaultLocalServerOptions'
 import dayCycle from './dayCycle'
 
-import { onAppLoad, resourcepackReload } from './resourcePack'
+import { onAppLoad, resourcepackReload, resourcePackState } from './resourcePack'
 import { ConnectPeerOptions, connectToPeer } from './localServerMultiplayer'
 import CustomChannelClient from './customClient'
 import { registerServiceWorker } from './serviceWorker'
@@ -671,7 +671,17 @@ export async function connect (connectOptions: ConnectOptions) {
 
   const spawnEarlier = !singleplayer && !p2pMultiplayer
   // don't use spawn event, player can be dead
-  bot.once(spawnEarlier ? 'forcedMove' : 'health', () => {
+  bot.once(spawnEarlier ? 'forcedMove' : 'health', async () => {
+    if (resourcePackState.isServerInstalling) {
+      showNotification('Resource pack is being installed, please wait...')
+      await new Promise<void>(resolve => {
+        subscribe(resourcePackState, () => {
+          if (!resourcePackState.isServerInstalling) {
+            resolve()
+          }
+        })
+      })
+    }
     window.focus?.()
     errorAbortController.abort()
     const mcData = MinecraftData(bot.version)
diff --git a/src/mineflayer/minecraft-protocol-extra.ts b/src/mineflayer/minecraft-protocol-extra.ts
index 65ed6031..ce3caf8a 100644
--- a/src/mineflayer/minecraft-protocol-extra.ts
+++ b/src/mineflayer/minecraft-protocol-extra.ts
@@ -30,7 +30,26 @@ export const pingServerVersion = async (ip: string, port?: number, preferredVers
 }
 
 const MAX_PACKET_SIZE = 2_097_152 // 2mb
-const MAX_PACKET_DEPTH = 20
+const CHAT_MAX_PACKET_DEPTH = 30
+
+const CHAT_VALIDATE_PACKETS = new Set([
+  'chat',
+  'system_chat',
+  'player_chat',
+  'profileless_chat',
+  'kick_disconnect',
+  'resource_pack_send',
+  'action_bar',
+  'set_title_text',
+  'set_title_subtitle',
+  'title',
+  'death_combat_event',
+  'server_data',
+  'scoreboard_objective',
+  'scoreboard_team',
+  'playerlist_header',
+  'boss_bar'
+])
 
 export const validatePacket = (name: string, data: any, fullBuffer: Buffer, isFromServer: boolean) => {
   // todo find out why chat is so slow with react
@@ -43,13 +62,15 @@ export const validatePacket = (name: string, data: any, fullBuffer: Buffer, isFr
     throw new Error(`Packet ${name} is too large: ${fullBuffer.length} bytes`)
   }
 
-  // todo count total number of objects instead of max depth
-  const maxDepth = getObjectMaxDepth(data)
-  if (maxDepth > MAX_PACKET_DEPTH) {
-    console.groupCollapsed(`Packet ${name} have too many nested objects: ${maxDepth}`)
-    console.log(data)
-    console.groupEnd()
-    throw new Error(`Packet ${name} have too many nested objects: ${maxDepth}`)
+  if (CHAT_VALIDATE_PACKETS.has(name)) {
+    // todo count total number of objects instead of max depth
+    const maxDepth = getObjectMaxDepth(data)
+    if (maxDepth > CHAT_MAX_PACKET_DEPTH) {
+      console.groupCollapsed(`Packet ${name} have too many nested objects: ${maxDepth}`)
+      console.log(data)
+      console.groupEnd()
+      throw new Error(`Packet ${name} have too many nested objects: ${maxDepth}`)
+    }
   }
 }
 
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index e6c835e7..7f6730da 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -16,6 +16,7 @@ import { watchUnloadForCleanup } from './gameUnload'
 
 export const resourcePackState = proxy({
   resourcePackInstalled: false,
+  isServerInstalling: false
 })
 
 const getLoadedImage = async (url: string) => {
@@ -336,14 +337,24 @@ const prepareBlockstatesAndModels = async () => {
 }
 
 const downloadAndUseResourcePack = async (url: string): Promise<void> => {
-  console.log('Downloading server resource pack', url)
-  const response = await fetch(url)
-  const resourcePackData = await response.arrayBuffer()
-  showNotification('Installing resource pack...')
-  installTexturePack(resourcePackData, undefined, undefined, true).catch((err) => {
-    console.error(err)
-    showNotification('Failed to install resource pack: ' + err.message)
-  })
+  try {
+    resourcePackState.isServerInstalling = true
+    console.log('Downloading server resource pack', url)
+    const response = await fetch(url).catch((err) => {
+      console.log(`Ensure server on ${url} support CORS which is not required for regular client, but is required for the web client`)
+      console.error(err)
+      showNotification('Failed to download resource pack: ' + err.message)
+    })
+    if (!response) return
+    const resourcePackData = await response.arrayBuffer()
+    showNotification('Installing resource pack...')
+    await installTexturePack(resourcePackData, undefined, undefined, true).catch((err) => {
+      console.error(err)
+      showNotification('Failed to install resource pack: ' + err.message)
+    })
+  } finally {
+    resourcePackState.isServerInstalling = false
+  }
 }
 
 const waitForGameEvent = async () => {

From 32acb5552692c6ef788563ef6f6fb315673e6439 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 3 Feb 2025 11:04:35 +0300
Subject: [PATCH 177/753] better loading msg

---
 src/index.ts        | 5 ++++-
 src/resourcePack.ts | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/index.ts b/src/index.ts
index dd64f0e4..df430286 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -673,9 +673,12 @@ export async function connect (connectOptions: ConnectOptions) {
   // don't use spawn event, player can be dead
   bot.once(spawnEarlier ? 'forcedMove' : 'health', async () => {
     if (resourcePackState.isServerInstalling) {
-      showNotification('Resource pack is being installed, please wait...')
+      setLoadingScreenStatus('Downloading resource pack')
       await new Promise<void>(resolve => {
         subscribe(resourcePackState, () => {
+          if (!resourcePackState.isServerDownloading) {
+            setLoadingScreenStatus('Installing resource pack')
+          }
           if (!resourcePackState.isServerInstalling) {
             resolve()
           }
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 7f6730da..7adcdb99 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -16,6 +16,7 @@ import { watchUnloadForCleanup } from './gameUnload'
 
 export const resourcePackState = proxy({
   resourcePackInstalled: false,
+  isServerDownloading: false,
   isServerInstalling: false
 })
 
@@ -339,6 +340,7 @@ const prepareBlockstatesAndModels = async () => {
 const downloadAndUseResourcePack = async (url: string): Promise<void> => {
   try {
     resourcePackState.isServerInstalling = true
+    resourcePackState.isServerDownloading = true
     console.log('Downloading server resource pack', url)
     const response = await fetch(url).catch((err) => {
       console.log(`Ensure server on ${url} support CORS which is not required for regular client, but is required for the web client`)
@@ -346,6 +348,7 @@ const downloadAndUseResourcePack = async (url: string): Promise<void> => {
       showNotification('Failed to download resource pack: ' + err.message)
     })
     if (!response) return
+    resourcePackState.isServerDownloading = false
     const resourcePackData = await response.arrayBuffer()
     showNotification('Installing resource pack...')
     await installTexturePack(resourcePackData, undefined, undefined, true).catch((err) => {
@@ -354,6 +357,7 @@ const downloadAndUseResourcePack = async (url: string): Promise<void> => {
     })
   } finally {
     resourcePackState.isServerInstalling = false
+    resourcePackState.isServerDownloading = false
   }
 }
 

From b5a16d520af12d6d26a54603c3b495f189cf2077 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 4 Feb 2025 04:56:37 +0300
Subject: [PATCH 178/753] feat: Add WebSocket server support for direct
 connections! (no proxy url is used then)

---
 config.json                                |  3 ++
 src/connect.ts                             |  6 ++-
 src/globalState.ts                         | 15 +------
 src/index.ts                               | 31 +++++++++----
 src/mineflayer/mc-protocol.ts              | 19 +++++++-
 src/mineflayer/minecraft-protocol-extra.ts | 19 ++++----
 src/mineflayer/websocket-core.ts           | 52 ++++++++++++++++++++++
 src/react/AddServerOrConnect.tsx           |  8 +++-
 src/react/AppStatusProvider.tsx            |  2 +-
 src/react/GameInteractionOverlay.tsx       | 13 +++++-
 src/react/ServersListProvider.tsx          | 17 ++++++-
 src/react/Singleplayer.tsx                 |  5 +++
 12 files changed, 151 insertions(+), 39 deletions(-)
 create mode 100644 src/mineflayer/websocket-core.ts

diff --git a/config.json b/config.json
index b1103ed8..58b35a75 100644
--- a/config.json
+++ b/config.json
@@ -6,6 +6,9 @@
   "peerJsServer": "",
   "peerJsServerFallback": "https://p2p.mcraft.fun",
   "promoteServers": [
+    {
+      "ip": "ws://play.mcraft.fun"
+    },
     {
       "ip": "kaboom.pw",
       "version": "1.20.3",
diff --git a/src/connect.ts b/src/connect.ts
index 7dd94795..a7313f36 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -1,9 +1,7 @@
 // import { versionsByMinecraftVersion } from 'minecraft-data'
 // import minecraftInitialDataJson from '../generated/minecraft-initial-data.json'
 import { AuthenticatedAccount } from './react/ServersListProvider'
-import { setLoadingScreenStatus } from './utils'
 import { downloadSoundsIfNeeded } from './sounds/botSoundSystem'
-import { miscUiState } from './globalState'
 import { options } from './optionsStorage'
 import supportedVersions from './supportedVersions.mjs'
 
@@ -49,6 +47,10 @@ export const downloadMcDataOnConnect = async (version: string) => {
   // miscUiState.loadedDataVersion = version
 }
 
+export const downloadAllMinecraftData = async () => {
+  await window._LOAD_MC_DATA()
+}
+
 const loadFonts = async () => {
   const FONT_FAMILY = 'mojangles'
   if (!document.fonts.check(`1em ${FONT_FAMILY}`)) {
diff --git a/src/globalState.ts b/src/globalState.ts
index fa76db75..f5596308 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -1,8 +1,7 @@
 //@ts-check
 
 import { proxy, ref, subscribe } from 'valtio'
-import { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
-import { pointerLock } from './utils'
+import type { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
 import type { OptionsGroupType } from './optionsGuiScheme'
 
 // todo: refactor structure with support of hideNext=false
@@ -26,16 +25,6 @@ export const activeModalStacks: Record<string, Modal[]> = {}
 
 window.activeModalStack = activeModalStack
 
-subscribe(activeModalStack, () => {
-  if (activeModalStack.length === 0) {
-    if (isGameActive(false)) {
-      void pointerLock.requestPointerLock()
-    }
-  } else {
-    document.exitPointerLock?.()
-  }
-})
-
 /**
  * @returns true if operation was successful
  */
@@ -169,5 +158,3 @@ export const gameAdditionalState = proxy({
 })
 
 window.gameAdditionalState = gameAdditionalState
-
-// todo restore auto-save on interval for player data! (or implement it in flying squid since there is already auto-save for world)
diff --git a/src/index.ts b/src/index.ts
index df430286..059db0a8 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -88,7 +88,7 @@ import { saveToBrowserMemory } from './react/PauseScreen'
 import { ViewerWrapper } from 'prismarine-viewer/viewer/lib/viewerWrapper'
 import './devReload'
 import './water'
-import { ConnectOptions, downloadMcDataOnConnect, getVersionAutoSelect, downloadOtherGameData } from './connect'
+import { ConnectOptions, downloadMcDataOnConnect, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData } from './connect'
 import { ref, subscribe } from 'valtio'
 import { signInMessageState } from './react/SignInMessageProvider'
 import { updateAuthenticatedAccountData, updateLoadedServerData } from './react/ServersListProvider'
@@ -99,9 +99,11 @@ import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
 import { getViewerVersionData, getWsProtocolStream } from './viewerConnector'
+import { getWebsocketStream } from './mineflayer/websocket-core'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 import { updateCursor } from './cameraRotationControls'
 import { pingServerVersion } from './mineflayer/minecraft-protocol-extra'
+import { getServerInfo } from './mineflayer/mc-protocol'
 
 window.debug = debug
 window.THREE = THREE
@@ -262,7 +264,8 @@ export async function connect (connectOptions: ConnectOptions) {
   miscUiState.singleplayer = singleplayer
   miscUiState.flyingSquid = singleplayer || p2pMultiplayer
   const { renderDistance: renderDistanceSingleplayer, multiplayerRenderDistance } = options
-  const server = cleanConnectIp(connectOptions.server, '25565')
+  const isWebSocket = connectOptions.server?.startsWith('ws://') || connectOptions.server?.startsWith('wss://')
+  const server = isWebSocket ? { host: connectOptions.server, port: undefined } : cleanConnectIp(connectOptions.server, '25565')
   if (connectOptions.proxy?.startsWith(':')) {
     connectOptions.proxy = `${location.protocol}//${location.hostname}${connectOptions.proxy}`
   }
@@ -352,9 +355,10 @@ export async function connect (connectOptions: ConnectOptions) {
     signal: errorAbortController.signal
   })
 
-  if (proxy && !connectOptions.viewerWsConnect) {
-    console.log(`using proxy ${proxy.host}:${proxy.port || location.port}`)
+  let clientDataStream
 
+  if (proxy && !connectOptions.viewerWsConnect && !isWebSocket) {
+    console.log(`using proxy ${proxy.host}:${proxy.port || location.port}`)
     net['setProxy']({ hostname: proxy.host, port: proxy.port })
   }
 
@@ -366,11 +370,14 @@ export async function connect (connectOptions: ConnectOptions) {
     Object.assign(serverOptions, connectOptions.serverOverridesFlat ?? {})
     setLoadingScreenStatus('Downloading minecraft data')
     await Promise.all([
-      window._LOAD_MC_DATA(), // download mc data before we can use minecraft-data at all
+      downloadAllMinecraftData(), // download mc data before we can use minecraft-data at all
       downloadOtherGameData()
     ])
     setLoadingScreenStatus(loggingInMsg)
+    let dataDownloaded = false
     const downloadMcData = async (version: string) => {
+      if (dataDownloaded) return
+      dataDownloaded = true
       if (connectOptions.authenticatedAccount && (versionToNumber(version) < versionToNumber('1.19.4') || versionToNumber(version) >= versionToNumber('1.21'))) {
         // todo support it (just need to fix .export crash)
         throw new Error('Microsoft authentication is only supported on 1.19.4 - 1.20.6 (at least for now)')
@@ -378,6 +385,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
       await downloadMcDataOnConnect(version)
       try {
+        // TODO! reload only after login packet (delay viewer display) so no unecessary reload after server one is isntalled
         await resourcepackReload(version)
       } catch (err) {
         console.error(err)
@@ -386,8 +394,10 @@ export async function connect (connectOptions: ConnectOptions) {
           throw err
         }
       }
+      setLoadingScreenStatus('Loading minecraft assets')
       viewer.world.blockstatesModels = await import('mc-assets/dist/blockStatesModels.json')
       void viewer.setVersion(version, options.useVersionsTextures === 'latest' ? version : options.useVersionsTextures)
+      miscUiState.loadedDataVersion = version
     }
 
     const downloadVersion = connectOptions.botVersion || (singleplayer ? serverOptions.version : undefined)
@@ -436,7 +446,7 @@ export async function connect (connectOptions: ConnectOptions) {
     } else if (connectOptions.server) {
       const versionAutoSelect = getVersionAutoSelect()
       setLoadingScreenStatus(`Fetching server version. Preffered: ${versionAutoSelect}`)
-      const autoVersionSelect = await pingServerVersion(server.host!, server.port ? Number(server.port) : undefined, versionAutoSelect)
+      const autoVersionSelect = await getServerInfo(server.host!, server.port ? Number(server.port) : undefined, versionAutoSelect)
       initialLoadingText = `Connecting to server ${server.host} with version ${autoVersionSelect.version}`
       connectOptions.botVersion = autoVersionSelect.version
     } else {
@@ -444,6 +454,10 @@ export async function connect (connectOptions: ConnectOptions) {
     }
     setLoadingScreenStatus(initialLoadingText)
 
+    if (isWebSocket) {
+      clientDataStream = (await getWebsocketStream(server.host!)).mineflayerStream
+    }
+
     let newTokensCacheResult = null as any
     const cachedTokens = typeof connectOptions.authenticatedAccount === 'object' ? connectOptions.authenticatedAccount.cachedTokens : {}
     const authData = connectOptions.authenticatedAccount ? await microsoftAuthflow({
@@ -458,7 +472,6 @@ export async function connect (connectOptions: ConnectOptions) {
       connectingServer: server.host
     }) : undefined
 
-    let clientDataStream
     if (p2pMultiplayer) {
       clientDataStream = await connectToPeer(connectOptions.peerId!, connectOptions.peerOptions)
     }
@@ -473,7 +486,7 @@ export async function connect (connectOptions: ConnectOptions) {
     }
 
     if (connectOptions.botVersion) {
-      miscUiState.loadedDataVersion = connectOptions.botVersion
+      await downloadMcData(connectOptions.botVersion)
     }
 
     bot = mineflayer.createBot({
@@ -562,7 +575,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
       bot.emit('inject_allowed')
       bot._client.emit('connect')
-    } else if (connectOptions.viewerWsConnect) {
+    } else if (clientDataStream) {
       // bot.emit('inject_allowed')
       bot._client.emit('connect')
     } else {
diff --git a/src/mineflayer/mc-protocol.ts b/src/mineflayer/mc-protocol.ts
index 583a98bb..0fc09470 100644
--- a/src/mineflayer/mc-protocol.ts
+++ b/src/mineflayer/mc-protocol.ts
@@ -1,6 +1,8 @@
 import { Client } from 'minecraft-protocol'
 import { appQueryParams } from '../appParams'
-import { validatePacket } from './minecraft-protocol-extra'
+import { downloadAllMinecraftData, getVersionAutoSelect } from '../connect'
+import { pingServerVersion, validatePacket } from './minecraft-protocol-extra'
+import { getWebsocketStream } from './websocket-core'
 
 customEvents.on('mineflayerBotCreated', () => {
   // todo move more code here
@@ -13,3 +15,18 @@ customEvents.on('mineflayerBotCreated', () => {
     })
   }
 })
+
+
+export const getServerInfo = async (ip: string, port?: number, preferredVersion = getVersionAutoSelect(), ping = false) => {
+  await downloadAllMinecraftData()
+  const isWebSocket = ip.startsWith('ws://') || ip.startsWith('wss://')
+  let stream
+  if (isWebSocket) {
+    stream = (await getWebsocketStream(ip)).mineflayerStream
+  }
+  return pingServerVersion(ip, port, {
+    ...(stream ? { stream } : {}),
+    ...(ping ? { noPongTimeout: 3000 } : {}),
+    ...(preferredVersion ? { version: preferredVersion } : {}),
+  })
+}
diff --git a/src/mineflayer/minecraft-protocol-extra.ts b/src/mineflayer/minecraft-protocol-extra.ts
index ce3caf8a..8cc26078 100644
--- a/src/mineflayer/minecraft-protocol-extra.ts
+++ b/src/mineflayer/minecraft-protocol-extra.ts
@@ -1,7 +1,7 @@
 import EventEmitter from 'events'
 import clientAutoVersion from 'minecraft-protocol/src/client/autoVersion'
 
-export const pingServerVersion = async (ip: string, port?: number, preferredVersion?: string) => {
+export const pingServerVersion = async (ip: string, port?: number, mergeOptions: Record<string, any> = {}) => {
   const fakeClient = new EventEmitter() as any
   fakeClient.on('error', (err) => {
     throw new Error(err.message ?? err)
@@ -9,13 +9,15 @@ export const pingServerVersion = async (ip: string, port?: number, preferredVers
   const options = {
     host: ip,
     port,
-    version: preferredVersion,
-    noPongTimeout: Infinity // disable timeout
+    noPongTimeout: Infinity, // disable timeout
+    ...mergeOptions,
   }
-  // let latency = 0
-  // fakeClient.autoVersionHooks = [(res) => {
-  //   latency = res.latency
-  // }]
+  let latency = 0
+  let fullInfo = null
+  fakeClient.autoVersionHooks = [(res) => {
+    latency = res.latency
+    fullInfo = res
+  }]
 
   // TODO! use client.socket.destroy() instead of client.end() for faster cleanup
   await clientAutoVersion(fakeClient, options)
@@ -25,7 +27,8 @@ export const pingServerVersion = async (ip: string, port?: number, preferredVers
   })
   return {
     version: fakeClient.version,
-    // latency,
+    latency,
+    fullInfo,
   }
 }
 
diff --git a/src/mineflayer/websocket-core.ts b/src/mineflayer/websocket-core.ts
new file mode 100644
index 00000000..5271e765
--- /dev/null
+++ b/src/mineflayer/websocket-core.ts
@@ -0,0 +1,52 @@
+import { Duplex } from 'stream'
+
+class CustomDuplex extends Duplex {
+  constructor (options, public writeAction) {
+    super(options)
+  }
+
+  override _read () {}
+
+  override _write (chunk, encoding, callback) {
+    this.writeAction(chunk)
+    callback()
+  }
+}
+
+export const getWebsocketStream = async (host: string) => {
+  host = host.replace('ws://', '').replace('wss://', '')
+  const ws = new WebSocket(`ws://${host}`)
+  const clientDuplex = new CustomDuplex(undefined, data => {
+    ws.send(data)
+  })
+
+  ws.addEventListener('message', async message => {
+    let { data } = message
+    if (data instanceof Blob) {
+      data = await data.arrayBuffer()
+    }
+    clientDuplex.push(Buffer.from(data))
+  })
+
+  ws.addEventListener('close', () => {
+    console.log('ws closed')
+    clientDuplex.end()
+  })
+
+  ws.addEventListener('error', err => {
+    console.log('ws error', err)
+  })
+
+  await new Promise((resolve, reject) => {
+    ws.addEventListener('open', resolve)
+    ws.addEventListener('error', err => {
+      console.log('ws error', err)
+      reject(err)
+    })
+  })
+
+  return {
+    mineflayerStream: clientDuplex,
+    ws,
+  }
+}
diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index 0d318350..c6ba7eba 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -177,7 +177,13 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
           />
         </div>
 
-        <InputWithLabel label="Proxy Override" value={proxyOverride} disabled={lockConnect && (qsParamProxy !== null || !!placeholders?.proxyOverride)} onChange={({ target: { value } }) => setProxyOverride(value)} placeholder={placeholders?.proxyOverride} />
+        <InputWithLabel
+          label="Proxy Override"
+          value={proxyOverride}
+          disabled={lockConnect && (qsParamProxy !== null || !!placeholders?.proxyOverride) || serverIp.startsWith('ws://') || serverIp.startsWith('wss://')}
+          onChange={({ target: { value } }) => setProxyOverride(value)}
+          placeholder={serverIp.startsWith('ws://') || serverIp.startsWith('wss://') ? 'Not needed for websocket servers' : placeholders?.proxyOverride}
+        />
         <InputWithLabel
           label="Username Override"
           value={usernameOverride}
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index 84d30c4a..b0705241 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -4,7 +4,7 @@ import { activeModalStack, activeModalStacks, hideModal, insertActiveModalStack,
 import { resetLocalStorageWorld } from '../browserfs'
 import { fsState } from '../loadSave'
 import { guessProblem } from '../errorLoadingScreenHelpers'
-import { ConnectOptions } from '../connect'
+import type { ConnectOptions } from '../connect'
 import { downloadPacketsReplay, packetsReplaceSessionState, replayLogger } from '../packetsReplay'
 import { getProxyDetails } from '../microsoftAuthflow'
 import AppStatus from './AppStatus'
diff --git a/src/react/GameInteractionOverlay.tsx b/src/react/GameInteractionOverlay.tsx
index f6522e62..9aa15025 100644
--- a/src/react/GameInteractionOverlay.tsx
+++ b/src/react/GameInteractionOverlay.tsx
@@ -1,10 +1,11 @@
 import { useRef } from 'react'
-import { useSnapshot } from 'valtio'
+import { subscribe, useSnapshot } from 'valtio'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { options } from '../optionsStorage'
 import { activeModalStack, isGameActive, miscUiState } from '../globalState'
 import worldInteractions from '../worldInteractions'
 import { onCameraMove, CameraMoveEvent } from '../cameraRotationControls'
+import { pointerLock } from '../utils'
 import { handleMovementStickDelta, joystickPointer } from './TouchAreasControls'
 
 /** after what time of holding the finger start breaking the block */
@@ -185,3 +186,13 @@ export default function GameInteractionOverlay ({ zIndex }: { zIndex: number })
   if (modalStack.length > 0 || !currentTouch) return null
   return <GameInteractionOverlayInner zIndex={zIndex} />
 }
+
+subscribe(activeModalStack, () => {
+  if (activeModalStack.length === 0) {
+    if (isGameActive(false)) {
+      void pointerLock.requestPointerLock()
+    }
+  } else {
+    document.exitPointerLock?.()
+  }
+})
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 01af0bb0..916ec0af 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -1,11 +1,13 @@
 import { useEffect, useMemo, useState } from 'react'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { useSnapshot } from 'valtio'
-import { ConnectOptions } from '../connect'
+import { ConnectOptions, downloadAllMinecraftData, getVersionAutoSelect } from '../connect'
 import { activeModalStack, hideCurrentModal, miscUiState, showModal } from '../globalState'
 import supportedVersions from '../supportedVersions.mjs'
 import { appQueryParams } from '../appParams'
 import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
+import { pingServerVersion } from '../mineflayer/minecraft-protocol-extra'
+import { getServerInfo } from '../mineflayer/mc-protocol'
 import ServersList from './ServersList'
 import AddServerOrConnect, { BaseServerInfo } from './AddServerOrConnect'
 import { useDidUpdateEffect } from './utils'
@@ -207,7 +209,18 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
             try {
               lastRequestStart = Date.now()
               if (signal.aborted) return
-              const data = await fetchServerStatus(server.ip/* , signal */) // DONT ADD SIGNAL IT WILL CRUSH JS RUNTIME
+              const isWebSocket = server.ip.startsWith('ws://') || server.ip.startsWith('wss://')
+              let data
+              if (isWebSocket) {
+                const pingResult = await getServerInfo(server.ip, undefined, undefined, true)
+                data = {
+                  formattedText: `${pingResult.version} server with a direct websocket connection`,
+                  textNameRight: `ws ${pingResult.latency}ms`,
+                  offline: false
+                }
+              } else {
+                data = await fetchServerStatus(server.ip/* , signal */) // DONT ADD SIGNAL IT WILL CRUSH JS RUNTIME
+              }
               if (data) {
                 setAdditionalData(old => ({
                   ...old,
diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index d8291d90..5effc269 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -68,6 +68,11 @@ const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus,
               <PixelartIcon iconName="signal-off" width={12} />
               Offline
             </span>
+          ) : worldNameRight?.startsWith('ws') ? (
+            <span style={{ display: 'flex', alignItems: 'center', gap: 4 }}>
+              <PixelartIcon iconName="cellular-signal-3" width={12} />
+              {worldNameRight.slice(3)}
+            </span>
           ) : worldNameRight}
         </div>
       </div>

From d4345b19f11a50a433d934f5bab2765d2accc67e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 4 Feb 2025 05:15:41 +0300
Subject: [PATCH 179/753] linting

---
 src/index.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 059db0a8..edc44220 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,7 +5,7 @@ import './globals'
 import './devtools'
 import './entities'
 import './globalDomListeners'
-import './mineflayer/mc-protocol'
+import { getServerInfo } from './mineflayer/mc-protocol'
 import './mineflayer/maps'
 import './mineflayer/cameraShake'
 import './shims/patchShims'
@@ -103,7 +103,6 @@ import { getWebsocketStream } from './mineflayer/websocket-core'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 import { updateCursor } from './cameraRotationControls'
 import { pingServerVersion } from './mineflayer/minecraft-protocol-extra'
-import { getServerInfo } from './mineflayer/mc-protocol'
 
 window.debug = debug
 window.THREE = THREE

From 0d778dad80bc1b9f5c9638e3cdd4d2f5b6ef5dbf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 4 Feb 2025 05:22:22 +0300
Subject: [PATCH 180/753] fix auto wss

---
 src/mineflayer/websocket-core.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mineflayer/websocket-core.ts b/src/mineflayer/websocket-core.ts
index 5271e765..69886897 100644
--- a/src/mineflayer/websocket-core.ts
+++ b/src/mineflayer/websocket-core.ts
@@ -14,8 +14,9 @@ class CustomDuplex extends Duplex {
 }
 
 export const getWebsocketStream = async (host: string) => {
-  host = host.replace('ws://', '').replace('wss://', '')
-  const ws = new WebSocket(`ws://${host}`)
+  const baseProtocol = location.protocol === 'https:' ? 'wss' : host.startsWith('ws://') ? 'ws' : 'wss'
+  const hostClean = host.replace('ws://', '').replace('wss://', '')
+  const ws = new WebSocket(`${baseProtocol}://${hostClean}`)
   const clientDuplex = new CustomDuplex(undefined, data => {
     ws.send(data)
   })

From 50baabad909656fe5b34ff0eccc06936dd27c246 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 4 Feb 2025 07:04:34 +0300
Subject: [PATCH 181/753] dont ignore version override!

---
 src/index.ts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index edc44220..496ccd36 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -399,10 +399,7 @@ export async function connect (connectOptions: ConnectOptions) {
       miscUiState.loadedDataVersion = version
     }
 
-    const downloadVersion = connectOptions.botVersion || (singleplayer ? serverOptions.version : undefined)
-    if (downloadVersion) {
-      await downloadMcData(downloadVersion)
-    }
+    let finalVersion = connectOptions.botVersion || (singleplayer ? serverOptions.version : undefined)
 
     if (singleplayer) {
       // SINGLEPLAYER EXPLAINER:
@@ -443,11 +440,13 @@ export async function connect (connectOptions: ConnectOptions) {
     } else if (p2pMultiplayer) {
       initialLoadingText = 'Connecting to peer'
     } else if (connectOptions.server) {
-      const versionAutoSelect = getVersionAutoSelect()
-      setLoadingScreenStatus(`Fetching server version. Preffered: ${versionAutoSelect}`)
-      const autoVersionSelect = await getServerInfo(server.host!, server.port ? Number(server.port) : undefined, versionAutoSelect)
-      initialLoadingText = `Connecting to server ${server.host} with version ${autoVersionSelect.version}`
-      connectOptions.botVersion = autoVersionSelect.version
+      if (!finalVersion) {
+        const versionAutoSelect = getVersionAutoSelect()
+        setLoadingScreenStatus(`Fetching server version. Preffered: ${versionAutoSelect}`)
+        const autoVersionSelect = await getServerInfo(server.host!, server.port ? Number(server.port) : undefined, versionAutoSelect)
+        finalVersion = autoVersionSelect.version
+      }
+      initialLoadingText = `Connecting to server ${server.host} with version ${finalVersion}`
     } else {
       initialLoadingText = 'We have no idea what to do'
     }
@@ -478,20 +477,21 @@ export async function connect (connectOptions: ConnectOptions) {
       const { version, time } = await getViewerVersionData(connectOptions.viewerWsConnect)
       console.log('Latency:', Date.now() - time, 'ms')
       // const version = '1.21.1'
-      connectOptions.botVersion = version
+      finalVersion = version
       await downloadMcData(version)
       setLoadingScreenStatus(`Connecting to WebSocket server ${connectOptions.viewerWsConnect}`)
       clientDataStream = await getWsProtocolStream(connectOptions.viewerWsConnect)
     }
 
-    if (connectOptions.botVersion) {
-      await downloadMcData(connectOptions.botVersion)
+    if (finalVersion) {
+      // ensure data is downloaded
+      await downloadMcData(finalVersion)
     }
 
     bot = mineflayer.createBot({
       host: server.host,
       port: server.port ? +server.port : undefined,
-      version: connectOptions.botVersion || false,
+      version: finalVersion || false,
       ...clientDataStream ? {
         stream: clientDataStream,
       } : {},

From e2a093baf1867df653a45f2ed70231ef2152954e Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Tue, 4 Feb 2025 06:11:11 +0100
Subject: [PATCH 182/753] feat: enable bossbar by default & support for custom
 title texts (#259)

---
 src/optionsStorage.ts                |  2 +-
 src/react/BossBarOverlay.css         | 16 +++++++++++++---
 src/react/BossBarOverlay.tsx         | 12 ++++--------
 src/react/BossBarOverlayProvider.tsx | 25 +++++++++++++++++++------
 4 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 12188a17..2228993f 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -95,7 +95,7 @@ const defaultOptions = {
   wysiwygSignEditor: 'auto' as 'auto' | 'always' | 'never',
   showMinimap: 'never' as 'always' | 'singleplayer' | 'never',
   minimapOptimizations: true,
-  displayBossBars: false, // boss bar overlay was removed for some reason, enable safely
+  displayBossBars: true,
   disabledUiParts: [] as string[],
   neighborChunkUpdates: true,
   highlightBlockColor: 'auto' as 'auto' | 'blue' | 'classic',
diff --git a/src/react/BossBarOverlay.css b/src/react/BossBarOverlay.css
index 4d75a5b1..ce4d8fbd 100644
--- a/src/react/BossBarOverlay.css
+++ b/src/react/BossBarOverlay.css
@@ -1,11 +1,17 @@
 .bossBars {
   display: flex;
   flex-direction: column;
-  gap: 5px;
+  gap: 3px;
   position: absolute;
-  top: 9px;
+  width: 100%;
+  top: 1px;
   left: 50%;
   transform: translate(-50%);
+  pointer-events: none;
+}
+
+.bossBars.mobile {
+  top: 18px;
 }
 
 .bossbar-container {
@@ -14,8 +20,12 @@
   align-items: center;
 }
 .bossbar-title {
-  font-size: 7px;
+  font-size: 10px;
+  text-align: center;
   color: #fff;
+  margin-bottom: -1px;
+  white-space: nowrap;
+  overflow: hidden;
 }
 .bossbar {
   background-image: var(--bars-gui-atlas);
diff --git a/src/react/BossBarOverlay.tsx b/src/react/BossBarOverlay.tsx
index 6236283f..b5e058b8 100644
--- a/src/react/BossBarOverlay.tsx
+++ b/src/react/BossBarOverlay.tsx
@@ -5,29 +5,25 @@ import './BossBarOverlay.css'
 
 const colors = ['pink', 'blue', 'red', 'green', 'yellow', 'purple', 'white']
 const divs = [0, 6, 10, 12, 20]
-const translations = {
-  'entity.minecraft.ender_dragon': 'Ender Dragon',
-  'entity.minecraft.wither': 'Wither'
-}
 
 export type BossBarType = BossBarTypeRaw & {
   // todo why not use public properties?
-  title: { text: string, translate: string },
-  _title: { text: string, translate: string },
+  title: string | Record<string, any> | null,
+  _title: string | Record<string, any> | null,
   _color: string,
   _dividers: number,
   _health: number
 }
 
 export default ({ bar }: { bar: BossBarType }) => {
-  const [title, setTitle] = useState('')
+  const [title, setTitle] = useState({})
   const [bossBarStyles, setBossBarStyles] = useState<{ [key: string]: string | number }>({})
   const [fillStyles, setFillStyles] = useState<{ [key: string]: string | number }>({})
   const [div1Styles, setDiv1Styles] = useState<{ [key: string]: string | number }>({})
   const [div2Styles, setDiv2Styles] = useState<{ [key: string]: string | number }>({})
 
   useEffect(() => {
-    setTitle(bar._title.text ? bar.title.text : translations[bar.title.translate] || 'Unknown Entity')
+    setTitle(bar._title ?? bar.title)
     setBossBarStyles(prevStyles => ({
       ...prevStyles,
       backgroundPositionY: `-${colors.indexOf(bar._color) * 10}px`
diff --git a/src/react/BossBarOverlayProvider.tsx b/src/react/BossBarOverlayProvider.tsx
index 5cac3c8a..8c96b35e 100644
--- a/src/react/BossBarOverlayProvider.tsx
+++ b/src/react/BossBarOverlayProvider.tsx
@@ -1,27 +1,40 @@
 import { useState, useEffect } from 'react'
 import BossBar, { BossBarType } from './BossBarOverlay'
 import './BossBarOverlay.css'
+import { useSnapshot } from 'valtio'
+import { miscUiState } from '../globalState'
 
 
 export default () => {
+  const { currentTouch } = useSnapshot(miscUiState)
   const [bossBars, setBossBars] = useState(new Map<string, BossBarType>())
+  const addBossBar = (bossBar: BossBarType) => {
+    setBossBars(prevBossBars => new Map(prevBossBars.set(bossBar.entityUUID, bossBar)))
+  }
+
+  const removeBossBar = (bossBar: BossBarType) => {
+    setBossBars(prevBossBars => {
+      const newBossBars = new Map(prevBossBars)
+      newBossBars.delete(bossBar.entityUUID)
+      return newBossBars
+    })
+  }
 
   useEffect(() => {
     bot.on('bossBarCreated', (bossBar) => {
-      setBossBars(prevBossBars => new Map(prevBossBars.set(bossBar.entityUUID, bossBar as any)))
+      addBossBar(bossBar as BossBarType)
     })
     bot.on('bossBarUpdated', (bossBar) => {
-      setBossBars(prevBossBars => new Map(prevBossBars.set(bossBar.entityUUID, bossBar as BossBarType)))
+      removeBossBar(bossBar as BossBarType)
+      setTimeout(() => addBossBar(bossBar as BossBarType), 1)
     })
     bot.on('bossBarDeleted', (bossBar) => {
-      const newBossBars = new Map(bossBars)
-      newBossBars.delete(bossBar.entityUUID)
-      setBossBars(newBossBars)
+      removeBossBar(bossBar as BossBarType)
     })
   }, [])
 
   return (
-    <div className="bossBars" id="bossBars">
+    <div className={`bossBars ${currentTouch ? 'mobile' : ''}`} id="bossBars">
       {[...bossBars.values()].map(bar => (
         <BossBar key={bar.entityUUID} bar={bar} />
       ))}

From 2ccc46267927a7eea756e6930f356d7c43967cd2 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 4 Feb 2025 08:42:31 +0300
Subject: [PATCH 183/753] fix eslint

---
 src/react/BossBarOverlayProvider.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/react/BossBarOverlayProvider.tsx b/src/react/BossBarOverlayProvider.tsx
index 8c96b35e..d67a4af6 100644
--- a/src/react/BossBarOverlayProvider.tsx
+++ b/src/react/BossBarOverlayProvider.tsx
@@ -1,8 +1,8 @@
 import { useState, useEffect } from 'react'
-import BossBar, { BossBarType } from './BossBarOverlay'
-import './BossBarOverlay.css'
 import { useSnapshot } from 'valtio'
 import { miscUiState } from '../globalState'
+import './BossBarOverlay.css'
+import BossBar, { BossBarType } from './BossBarOverlay'
 
 
 export default () => {

From 97e13954643b0833c1d5282a61ce71834ae9c626 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 4 Feb 2025 16:46:23 +0300
Subject: [PATCH 184/753] up tech

---
 TECH.md | 60 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/TECH.md b/TECH.md
index 3ea76719..c7f4ef4e 100644
--- a/TECH.md
+++ b/TECH.md
@@ -3,35 +3,35 @@
 This project uses proxies so you can connect to almost any vanilla server. Though proxies have some limitations such as increased latency and servers will complain about using VPN (though we have a workaround for that, but ping will be much higher).
 This client generally has better performance but some features reproduction might be inaccurate eg its less stable and more buggy in some cases.
 
-| Feature                           | This project | Eaglercraft | Description                                                                                                                                                                                                              |
-| --------------------------------- | ------------ | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| General                           |              |             |                                                                                                                                                                                                                          |
-| Mobile Support (touch)            | ✅(+)         | ✅           |                                                                                                                                                                                                                          |
-| Gamepad Support                   | ✅            | ❌           |                                                                                                                                                                                                                          |
-| A11Y                              | ✅            | ❌           | We have DOM for almost all UI so your extensions and other browser features will work natively like on any other web page (but maybe it's not needed)                                                                    |
-| Game Features                     |              |             |                                                                                                                                                                                                                          |
-| Servers Support (quality)         | ❌            | ✅           | Eaglercraft is vanilla Minecraft, while this project tries to emulate original game behavior at protocol level (Mineflayer is used)                                                                                      |
-| Servers Support (any version, ip)     | ✅            | ❌           | We support almost all Minecraft versions, only important if you connect to a server where you need new content like blocks or if you play with friends. And you can connect to almost any server using proxy servers!                                                                   |
-| Singleplayer Survival Features    | ❌            | ✅           | Just like Eaglercraft this project can generate and save worlds, but generator is simple and only a few survival features are supported (look here for [supported features list](https://github.com/zardoy/space-squid)) |
-| Singleplayer Maps                 | ✅            | ✅           | We support any version, but adventure maps won't work, but simple parkour and build maps might be interesting to explore...                                                                                              |
-| Singleplayer Maps World Streaming | ✅            | ❌           | Thanks to Browserfs, saves can be loaded to local singleplayer server using multiple ways: from local folder, server directory (not zip), dropbox or other cloud *backend* etc...                                        |
-| P2P Multiplayer                   | ✅            | ✅           | A way to connect to other browser running the project. But it's almost useless here since many survival features are not implemented. Maybe only to build / explore maps together...                                     |
-| Voice Chat                        | ❌            | ✅           | Eaglercraft has custom WebRTC voice chat implementation, though it could also be easily implemented there                                                                                                                |
-| Online Servers                    | ✅            | ❌           | We have custom implementation (including integration on proxy side) for joining to servers                                                                                                                               |
-| Plugin Features                   | ✅            | ❌           | We have Mineflayer plugins support, like Auto Jump & Auto Parkour was added here that way                                                                                                                                |
-| Direct Connection                 | ❌            | ✅           | We have DOM for almost all UI so your extensions and other browser features will work natively like on any other web page                                                                                                |
-| Mods                              | ❌(roadmap)   | ❌           | This project will support mods for singleplayer. In theory its possible to implement support for modded servers on protocol level (including all needed mods)                                                            |
-| Video Recording                   | ❌            | ✅           | Don't feel needed                                                                                                                                                                                                        |
-| Metaverse Features                | ❌(roadmap)   | ❌           | Iframes, video streams inside of game world (custom protocol channel)                                                                                                                                                    |
-| Sounds                            | ✅            | ✅       |                                                                                                                                                |
-| Resource Packs                    | ✅(--)        | ✅        | This project has very limited support for them (only textures images are loadable for now)                                                                 |
-| Assets Compressing & Splitting                | ✅            | ❌          | We have advanced Minecraft data processing and good code chunk splitting so the web app will open much faster and use less memory                                                                                             |
-| Graphics                          |              |             |                                                                                                                                                                                                                          |
-| Fancy Graphics                    | ❌            | ✅           | While Eaglercraft has top-level shaders we don't even support lighting                                                                                                                                                   |
-| Fast & Efficient Graphics         | ❌(+)         | ❌           | Feels like no one needs to have 64 rendering distance work smoothly                                                                                                                                                      |
-| VR                                | ✅            | ❌           | Feels like not needed feature. UI is missing in this project since DOM can't be rendered in VR so Eaglercraft could be better in that aspect                                                                             |
-| AR                                | ❌            | ❌           | Would be the most useless feature                                                                                                                                                                                        |
-| Minimap & Waypoints               | ✅(-)         | ❌           | We have buggy minimap, which can be enabled in settings and full map is opened by pressing `M` key                                                                                                                       |
+| Feature                           | This project            | Eaglercraft | Description                                                                                                                                                                                                              |
+| --------------------------------- | ----------------------- | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| General                           |                         |             |                                                                                                                                                                                                                          |
+| Mobile Support (touch)            | ✅(+)                    | ✅           |                                                                                                                                                                                                                          |
+| Gamepad Support                   | ✅                       | ❌           |                                                                                                                                                                                                                          |
+| A11Y                              | ✅                       | ❌           | We have DOM for almost all UI so your extensions and other browser features will work natively like on any other web page (but maybe it's not needed)                                                                    |
+| Game Features                     |                         |             |                                                                                                                                                                                                                          |
+| Servers Support (quality)         | ❌                       | ✅           | Eaglercraft is vanilla Minecraft, while this project tries to emulate original game behavior at protocol level (Mineflayer is used)                                                                                      |
+| Servers Support (any version, ip) | ✅                       | ❌           | We support almost all Minecraft versions, only important if you connect to a server where you need new content like blocks or if you play with friends. And you can connect to almost any server using proxy servers!    |
+| Singleplayer Survival Features    | ❌                       | ✅           | Just like Eaglercraft this project can generate and save worlds, but generator is simple and only a few survival features are supported (look here for [supported features list](https://github.com/zardoy/space-squid)) |
+| Singleplayer Maps                 | ✅                       | ✅           | We support any version, but adventure maps won't work, but simple parkour and build maps might be interesting to explore...                                                                                              |
+| Singleplayer Maps World Streaming | ✅                       | ❌           | Thanks to Browserfs, saves can be loaded to local singleplayer server using multiple ways: from local folder, server directory (not zip), dropbox or other cloud *backend* etc...                                        |
+| P2P Multiplayer                   | ✅                       | ✅           | A way to connect to other browser running the project. But it's almost useless here since many survival features are not implemented. Maybe only to build / explore maps together...                                     |
+| Voice Chat                        | ❌                       | ✅           | Eaglercraft has custom WebRTC voice chat implementation, though it could also be easily implemented there                                                                                                                |
+| Online Servers                    | ✅                       | ❌           | We have custom implementation (including integration on proxy side) for joining to servers                                                                                                                               |
+| Plugin Features                   | ✅                       | ❌           | We have Mineflayer plugins support, like Auto Jump & Auto Parkour was added here that way                                                                                                                                |
+| Direct Connection                 | ✅                       | ✅           | We have DOM for almost all UI so your extensions and other browser features will work natively like on any other web page                                                                                                |
+| Moding                            | ❌(roadmap, client-side) | ❌           | This project will support mods for singleplayer. In theory its possible to implement support for modded servers on protocol level (including all needed mods)                                                            |
+| Video Recording                   | ❌                       | ✅           | Don't feel needed                                                                                                                                                                                                        |
+| Metaverse Features                | ❌(roadmap)              | ❌           | Iframes, video streams inside of game world (custom protocol channel)                                                                                                                                                    |
+| Sounds                            | ✅                       | ✅           |                                                                                                                                                                                                                          |
+| Resource Packs                    | ✅(+extras)              | ✅           | This project has very limited support for them (only textures images are loadable for now)                                                                                                                               |
+| Assets Compressing & Splitting    | ✅                       | ❌           | We have advanced Minecraft data processing and good code chunk splitting so the web app will open much faster and use less memory                                                                                        |
+| Graphics                          |                         |             |                                                                                                                                                                                                                          |
+| Fancy Graphics                    | ❌                       | ✅           | While Eaglercraft has top-level shaders we don't even support lighting                                                                                                                                                   |
+| Fast & Efficient Graphics         | ❌(+)                    | ❌           | Feels like no one needs to have 64 rendering distance work smoothly                                                                                                                                                      |
+| VR                                | ✅                       | ❌           | Feels like not needed feature. UI is missing in this project since DOM can't be rendered in VR so Eaglercraft could be better in that aspect                                                                             |
+| AR                                | ❌                       | ❌           | Would be the most useless feature                                                                                                                                                                                        |
+| Minimap & Waypoints               | ✅(-)                    | ❌           | We have buggy minimap, which can be enabled in settings and full map is opened by pressing `M` key                                                                                                                       |
 
 Features available to only this project:
 
@@ -52,6 +52,6 @@ TODO
 | API                                                    | Usage & Description                                                                                                                           |
 | ------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------- |
 | `Crypto` API                                           | Used to make chat features work when joining online servers with authentication.                                                              |
-| `requestPointerLock({ unadjustedMovement: true })` API | Required for games. Disables system mouse acceleration (important for Mac users). Aka mouse raw input                                                              |
+| `requestPointerLock({ unadjustedMovement: true })` API | Required for games. Disables system mouse acceleration (important for Mac users). Aka mouse raw input                                         |
 | `navigator.keyboard.lock()`                            | (only in Chromium browsers) When entering fullscreen it allows to use any key combination like ctrl+w in the game                             |
 | `navigator.keyboard.getLayoutMap()`                    | (only in Chromium browsers) To display the right keyboard symbol for the key keybinding on different keyboard layouts (e.g. QWERTY vs AZERTY) |

From 6bf4a4f2a306de4b61e31bbb0cde26025d8ee540 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 5 Feb 2025 07:21:42 +0300
Subject: [PATCH 185/753] hotfix: allow complex messages to be displayed in
 chat

---
 src/mineflayer/minecraft-protocol-extra.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mineflayer/minecraft-protocol-extra.ts b/src/mineflayer/minecraft-protocol-extra.ts
index 8cc26078..ef1bfbf2 100644
--- a/src/mineflayer/minecraft-protocol-extra.ts
+++ b/src/mineflayer/minecraft-protocol-extra.ts
@@ -33,7 +33,7 @@ export const pingServerVersion = async (ip: string, port?: number, mergeOptions:
 }
 
 const MAX_PACKET_SIZE = 2_097_152 // 2mb
-const CHAT_MAX_PACKET_DEPTH = 30
+const CHAT_MAX_PACKET_DEPTH = 200 // todo improve perf
 
 const CHAT_VALIDATE_PACKETS = new Set([
   'chat',

From 20830bc257a62af434e3676b2386ed5aa559e5b2 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 5 Feb 2025 14:05:23 +0300
Subject: [PATCH 186/753] fix(resourcepack): fix custom items textures feat:
 implement support for custom models tags - new minecraft feature for
 resourcepack for items feat: dropped blocks rendered as blocks feat: add
 support for new

---
 README.MD                                     |  2 +-
 prismarine-viewer/viewer/lib/entities.ts      | 29 ++++++-
 prismarine-viewer/viewer/lib/holdingBlock.ts  | 18 ++--
 .../viewer/lib/worldDataEmitter.ts            |  8 +-
 .../viewer/lib/worldrendererCommon.ts         |  6 ++
 src/index.ts                                  | 53 +++++++-----
 src/inventoryWindows.ts                       | 72 ++++++----------
 src/mineflayer/items.ts                       | 84 +++++++++++++++++++
 src/mineflayer/java-tester/commands.ts        | 54 ++++++++++++
 src/mineflayer/java-tester/index.ts           |  6 ++
 src/react/HotbarRenderApp.tsx                 | 23 +++--
 src/resourcePack.ts                           | 70 +++++++++-------
 12 files changed, 301 insertions(+), 124 deletions(-)
 create mode 100644 src/mineflayer/items.ts
 create mode 100644 src/mineflayer/java-tester/commands.ts
 create mode 100644 src/mineflayer/java-tester/index.ts

diff --git a/README.MD b/README.MD
index b7494cdb..339af958 100644
--- a/README.MD
+++ b/README.MD
@@ -19,7 +19,7 @@ For building the project yourself / contributing, see [Development, Debugging &
 - Works offline
 - First-class touch (mobile) & controller support
 - First-class keybindings configuration
-- Basic Resource pack support: Custom GUI, all textures. Server resource packs are not supported yet.
+- Advanced Resource pack support: Custom GUI, all textures. Server resource packs are supported with proper CORS configuration.
 - Builtin JEI with recipes & descriptions for every item (JEI is creative inventory replacement)
 - Play with friends over internet! (P2P is powered by Peer.js discovery servers)
 - ~~Google Drive support for reading / saving worlds back to the cloud~~
diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index f5f4b21f..fb0b5ed8 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -21,6 +21,7 @@ import { WalkingGeneralSwing } from './entity/animations'
 import { disposeObject } from './threeJsUtils'
 import { armorModels } from './entity/objModels'
 import { Viewer } from './viewer'
+import { getBlockMesh } from './holdingBlock'
 const { loadTexture } = globalThis.isElectron ? require('./utils.electron.js') : require('./utils')
 
 export const TWEEN_DURATION = 120
@@ -214,7 +215,7 @@ export class Entities extends EventEmitter {
   itemsTexture: THREE.Texture | null = null
   cachedMapsImages = {} as Record<number, string>
   itemFrameMaps = {} as Record<number, Array<THREE.Mesh<THREE.PlaneGeometry, THREE.MeshLambertMaterial>>>
-  getItemUv: undefined | ((idOrName: number | string) => {
+  getItemUv: undefined | ((item: Record<string, any>) => {
     texture: THREE.Texture;
     u: number;
     v: number;
@@ -419,9 +420,29 @@ export class Entities extends EventEmitter {
     return typeof component === 'string' ? component : component.text ?? ''
   }
 
+  isBlock (itemId) {
+    const item = loadedData.items[itemId]
+    return !!loadedData.blocksByName[item.name]
+  }
+
   getItemMesh (item) {
+    if (item.blockId || this.isBlock(item.itemId)) {
+      const block = loadedData.blocks[item.blockId ?? item.itemId]
+      const mesh = getBlockMesh(this.viewer.world.material, block.name, {})
+      const SCALE = 0.5
+      mesh.scale.set(SCALE, SCALE, SCALE)
+      mesh.position.set(0, 0.2, 0)
+      const outerGroup = new THREE.Group()
+      outerGroup.add(mesh)
+      return {
+        mesh: outerGroup,
+        itemsTexture: null,
+        itemsTextureFlipped: null,
+      }
+    }
+
     // TODO: Render proper model (especially for blocks) instead of flat texture
-    const textureUv = this.getItemUv?.(item.itemId ?? item.blockId)
+    const textureUv = this.getItemUv?.(item)
     if (textureUv) {
       // todo use geometry buffer uv instead!
       const { u, v, size, su, sv, texture } = textureUv
@@ -517,8 +538,8 @@ export class Entities extends EventEmitter {
             //@ts-expect-error
             group.additionalCleanup = () => {
               // important: avoid texture memory leak and gpu slowdown
-              object.itemsTexture.dispose()
-              object.itemsTextureFlipped.dispose()
+              object.itemsTexture?.dispose()
+              object.itemsTextureFlipped?.dispose()
             }
           }
         }
diff --git a/prismarine-viewer/viewer/lib/holdingBlock.ts b/prismarine-viewer/viewer/lib/holdingBlock.ts
index 5fc3e03c..7b95f747 100644
--- a/prismarine-viewer/viewer/lib/holdingBlock.ts
+++ b/prismarine-viewer/viewer/lib/holdingBlock.ts
@@ -8,6 +8,7 @@ import { getMyHand } from './hand'
 export type HandItemBlock = {
   name?
   properties?
+  fullItem?
   type: 'block' | 'item' | 'hand'
   id?: number
 }
@@ -263,16 +264,12 @@ export default class HoldingBlock {
       this.blockSwapAnimation = undefined
       return
     }
-    const blockProvider = worldBlockProvider(blockstatesModels, blocksAtlases, 'latest')
     let blockInner
     if (handItem.type === 'block') {
-      const models = blockProvider.getAllResolvedModels0_1({
-        name: handItem.name,
-        properties: handItem.properties ?? {}
-      }, true)
-      blockInner = getThreeBlockModelGroup(material, models, undefined, 'plains', loadedData)
+      blockInner = getBlockMesh(material, handItem.name, handItem.properties ?? {})
     } else if (handItem.type === 'item') {
       const { mesh: itemMesh } = viewer.entities.getItemMesh({
+        ...handItem.fullItem,
         itemId: handItem.id,
       })!
       itemMesh.position.set(0.5, 0.5, 0.5)
@@ -410,3 +407,12 @@ export default class HoldingBlock {
     }
   }
 }
+
+export const getBlockMesh = (material: THREE.Material, name: string, properties: Record<string, any>) => {
+  const blockProvider = worldBlockProvider(viewer.world.blockstatesModels, viewer.world.blocksAtlases, 'latest')
+  const models = blockProvider.getAllResolvedModels0_1({
+    name,
+    properties
+  }, true)
+  return getThreeBlockModelGroup(material, models, undefined, 'plains', loadedData)
+}
diff --git a/prismarine-viewer/viewer/lib/worldDataEmitter.ts b/prismarine-viewer/viewer/lib/worldDataEmitter.ts
index e556f7a3..76efe98c 100644
--- a/prismarine-viewer/viewer/lib/worldDataEmitter.ts
+++ b/prismarine-viewer/viewer/lib/worldDataEmitter.ts
@@ -117,7 +117,13 @@ export class WorldDataEmitter extends EventEmitter {
       // todo clean types
       const blockProperties = block ? new window.PrismarineBlock(block.id, 'void', newItem.metadata).getProperties() : {}
       // todo item props
-      viewer.world.onHandItemSwitch({ name: newItem.name, properties: blockProperties, id: newItem.type, type: block ? 'block' : 'item', }, isLeftHand)
+      viewer.world.onHandItemSwitch({
+        name: newItem.name,
+        properties: blockProperties,
+        id: newItem.type,
+        type: block ? 'block' : 'item',
+        fullItem: newItem,
+      }, isLeftHand)
     }
     bot.inventory.on('updateSlot', (index) => {
       if (index === 45) {
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
index b456b27a..59d22dd9 100644
--- a/prismarine-viewer/viewer/lib/worldrendererCommon.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -13,6 +13,7 @@ import { AtlasParser } from 'mc-assets'
 import TypedEmitter from 'typed-emitter'
 import { LineMaterial } from 'three-stdlib'
 import christmasPack from 'mc-assets/dist/textureReplacements/christmas'
+import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
 import { toMajorVersion } from '../../../src/utils'
 import { buildCleanupDecorator } from './cleanupDecorator'
@@ -139,6 +140,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   lastChunkDistance = 0
   debugStopGeometryUpdate = false
 
+  @worldCleanup()
+  itemsRenderer: ItemsRenderer | undefined
+
   abstract outputFormat: 'threeJs' | 'webgpu'
 
   abstract changeBackgroundColor (color: [number, number, number]): void
@@ -338,6 +342,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.blocksAtlasParser = new AtlasParser({ latest: blocksAtlas }, blocksCanvas.toDataURL())
     this.itemsAtlasParser = new AtlasParser({ latest: itemsAtlas }, itemsCanvas.toDataURL())
 
+    this.itemsRenderer = new ItemsRenderer(this.version!, this.blockstatesModels, this.itemsAtlasParser, this.blocksAtlasParser)
+
     const texture = await new THREE.TextureLoader().loadAsync(this.blocksAtlasParser.latestImage)
     texture.magFilter = THREE.NearestFilter
     texture.minFilter = THREE.NearestFilter
diff --git a/src/index.ts b/src/index.ts
index 496ccd36..3c0b3b50 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,11 +5,13 @@ import './globals'
 import './devtools'
 import './entities'
 import './globalDomListeners'
-import { getServerInfo } from './mineflayer/mc-protocol'
 import './mineflayer/maps'
 import './mineflayer/cameraShake'
 import './shims/patchShims'
-import { onGameLoad } from './inventoryWindows'
+import './mineflayer/java-tester/index'
+import { getServerInfo } from './mineflayer/mc-protocol'
+import { onGameLoad, renderSlot } from './inventoryWindows'
+import { RenderItem } from './mineflayer/items'
 import initCollisionShapes from './getCollisionInteractionShapes'
 import protocolMicrosoftAuth from 'minecraft-protocol/src/client/microsoftAuth'
 import microsoftAuthflow from './microsoftAuthflow'
@@ -159,35 +161,42 @@ const viewer: import('prismarine-viewer/viewer/lib/viewer').Viewer = new Viewer(
 window.viewer = viewer
 viewer.getMineflayerBot = () => bot
 // todo unify
-viewer.entities.getItemUv = (idOrName: number | string) => {
+viewer.entities.getItemUv = (item) => {
+  const idOrName = item.itemId ?? item.blockId
   try {
     const name = typeof idOrName === 'number' ? loadedData.items[idOrName]?.name : idOrName
-    // TODO
-    if (!viewer.world.itemsAtlasParser) throw new Error('itemsAtlasParser not loaded yet')
-    const itemsRenderer = new ItemsRenderer('latest', viewer.world.blockstatesModels, viewer.world.itemsAtlasParser, viewer.world.blocksAtlasParser)
-    const textureInfo = itemsRenderer.getItemTexture(name)
-    if (!textureInfo) throw new Error(`Texture not found for item ${name}`)
-    const tex = 'type' in textureInfo ? textureInfo : textureInfo.left
-    const [x, y, w, h] = tex.slice
-    const textureThree = tex.type === 'blocks' ? viewer.world.material.map! : viewer.entities.itemsTexture!
+    if (!name) throw new Error(`Item not found: ${idOrName}`)
+
+    const renderInfo = renderSlot({
+      name,
+      nbt: null,
+      ...item
+    })
+
+    if (!renderInfo) throw new Error(`Failed to get render info for item ${name}`)
+
+    const textureThree = renderInfo.texture === 'blocks' ? viewer.world.material.map! : viewer.entities.itemsTexture!
     const img = textureThree.image
-    const [u, v, su, sv] = [x / img.width, y / img.height, (w / img.width), (h / img.height)]
-    const uvInfo = {
-      u,
-      v,
-      su,
-      sv
-    }
-    return {
-      ...uvInfo,
-      texture: textureThree
+
+    if (renderInfo.blockData || renderInfo.slice) {
+      // Get slice coordinates from either block or item texture
+      const [x, y, w, h] = renderInfo.blockData ? renderInfo.blockData.left.slice : renderInfo.slice
+      const [u, v, su, sv] = [x / img.width, y / img.height, (w / img.width), (h / img.height)]
+      return {
+        u, v, su, sv,
+        texture: textureThree
+      }
     }
+
+    throw new Error(`Invalid render info for item ${name}`)
   } catch (err) {
     reportError?.(err)
+    // Return default UV coordinates for missing texture
     return {
       u: 0,
       v: 0,
-      size: 16 / viewer.world.material.map!.image.width,
+      su: 16 / viewer.world.material.map!.image.width,
+      sv: 16 / viewer.world.material.map!.image.width,
       texture: viewer.world.material.map!
     }
   }
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index bfa5b65f..f2810df8 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -4,11 +4,8 @@ import { showInventory } from 'minecraft-inventory-gui/web/ext.mjs'
 // import Dirt from 'mc-assets/dist/other-textures/latest/blocks/dirt.png'
 import { RecipeItem } from 'minecraft-data'
 import { flat, fromFormattedString } from '@xmcl/text-component'
-import mojangson from 'mojangson'
-import nbt from 'prismarine-nbt'
 import { splitEvery, equals } from 'rambda'
 import PItem, { Item } from 'prismarine-item'
-import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
 import { getRenamedData } from 'flying-squid/dist/blockRenames'
 import PrismarineChatLoader from 'prismarine-chat'
@@ -21,6 +18,7 @@ import { displayClientChat } from './botUtils'
 import { currentScaling } from './scaleInterface'
 import { getItemDescription } from './itemsDescriptions'
 import { MessageFormatPart } from './chatUtils'
+import { GeneralInputItem, getItemMetadata, getItemNameRaw, RenderItem } from './mineflayer/items'
 
 const loadedImagesCache = new Map<string, HTMLImageElement>()
 const cleanLoadedImagesCache = () => {
@@ -36,15 +34,12 @@ export const allImagesLoadedState = proxy({
   value: false
 })
 
-let itemsRenderer: ItemsRenderer
 export const onGameLoad = (onLoad) => {
   allImagesLoadedState.value = false
   version = bot.version
 
   const checkIfLoaded = () => {
     if (!viewer.world.itemsAtlasParser) return
-    itemsRenderer = new ItemsRenderer(bot.version, viewer.world.blockstatesModels, viewer.world.itemsAtlasParser, viewer.world.blocksAtlasParser)
-    globalThis.itemsRenderer = itemsRenderer
     if (!allImagesLoadedState.value) {
       onLoad?.()
     }
@@ -178,23 +173,33 @@ const getImage = ({ path = undefined as string | undefined, texture = undefined
   return loadedImagesCache.get(loadPath)
 }
 
-type RenderSlot = Pick<import('prismarine-item').Item, 'name' | 'displayName' | 'durabilityUsed' | 'maxDurability' | 'enchants'>
-const renderSlot = (slot: RenderSlot, skipBlock = false): {
+export const renderSlot = (slot: GeneralInputItem, debugIsQuickbar = false): {
   texture: string,
   blockData?: Record<string, { slice, path }>,
   scale?: number,
-  slice?: number[]
+  slice?: number[],
 } | undefined => {
-  let itemName = slot.name
-  const isItem = loadedData.itemsByName[itemName]
+  let itemModelName = slot.name
+  const originalItemName = itemModelName
+  const isItem = loadedData.itemsByName[itemModelName]
+
+  // #region normalize item name
+  if (versionToNumber(bot.version) < versionToNumber('1.13')) itemModelName = getRenamedData(isItem ? 'items' : 'blocks', itemModelName, bot.version, '1.13.1') as string
+  // #endregion
+
+
+  const { customModel } = getItemMetadata(slot)
+  if (customModel) {
+    itemModelName = customModel
+  }
 
   let itemTexture
   try {
-    if (versionToNumber(bot.version) < versionToNumber('1.13')) itemName = getRenamedData(isItem ? 'items' : 'blocks', itemName, bot.version, '1.13.1') as string
-    itemTexture = itemsRenderer.getItemTexture(itemName) ?? itemsRenderer.getItemTexture('item/missing_texture')!
+    assertDefined(viewer.world.itemsRenderer)
+    itemTexture = viewer.world.itemsRenderer.getItemTexture(itemModelName) ?? viewer.world.itemsRenderer.getItemTexture('item/missing_texture')!
   } catch (err) {
-    itemTexture = itemsRenderer.getItemTexture('block/errored')!
-    inGameError(`Failed to render item ${itemName} on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
+    inGameError(`Failed to render item ${itemModelName} (original: ${originalItemName}) on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
+    itemTexture = viewer.world.itemsRenderer!.getItemTexture('block/errored')!
   }
   if ('type' in itemTexture) {
     // is item
@@ -211,31 +216,7 @@ const renderSlot = (slot: RenderSlot, skipBlock = false): {
   }
 }
 
-type JsonString = string
-type PossibleItemProps = {
-  Damage?: number
-  display?: { Name?: JsonString } // {"text":"Knife","color":"white","italic":"true"}
-}
-export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'> | null) => {
-  if (!item?.nbt) return
-  const itemNbt: PossibleItemProps = nbt.simplify(item.nbt)
-  const customName = itemNbt.display?.Name
-  if (!customName) return
-  try {
-    const parsed = customName.startsWith('{') && customName.endsWith('}') ? mojangson.simplify(mojangson.parse(customName)) : fromFormattedString(customName)
-    if (parsed.extra) {
-      return parsed as Record<string, any>
-    } else {
-      return parsed as MessageFormatPart
-    }
-  } catch (err) {
-    return {
-      text: customName
-    }
-  }
-}
-
-const getItemName = (slot: Item | null) => {
+const getItemName = (slot: Item | RenderItem | null) => {
   const parsed = getItemNameRaw(slot)
   if (!parsed) return
   // todo display full text renderer from sign renderer
@@ -244,7 +225,7 @@ const getItemName = (slot: Item | null) => {
 }
 
 export const renderSlotExternal = (slot) => {
-  const data = renderSlot(slot, true)
+  const data = renderSlot(slot)
   if (!data) return
   return {
     imageDataUrl: data.texture === 'invsprite' ? undefined : getImage({ path: data.texture })?.src,
@@ -253,14 +234,15 @@ export const renderSlotExternal = (slot) => {
   }
 }
 
-const mapSlots = (slots: Array<RenderSlot | Item | null>) => {
-  return slots.map(slot => {
+const mapSlots = (slots: Array<RenderItem | Item | null>) => {
+  return slots.map((slot, i) => {
     // todo stateid
     if (!slot) return
 
     try {
-      const slotCustomProps = renderSlot(slot)
-      Object.assign(slot, { ...slotCustomProps, displayName: ('nbt' in slot ? getItemName(slot) : undefined) ?? slot.displayName })
+      const slotCustomProps = renderSlot(slot, i === bot.inventory.hotbarStart + bot.quickBarSlot)
+      const itemCustomName = getItemName(slot)
+      Object.assign(slot, { ...slotCustomProps, displayName: itemCustomName ?? slot.displayName })
       //@ts-expect-error
       slot.toJSON = () => {
         // Allow to serialize slot to JSON as minecraft-inventory-gui creates icon property as cache (recursively)
diff --git a/src/mineflayer/items.ts b/src/mineflayer/items.ts
new file mode 100644
index 00000000..f7f78c31
--- /dev/null
+++ b/src/mineflayer/items.ts
@@ -0,0 +1,84 @@
+import mojangson from 'mojangson'
+import nbt from 'prismarine-nbt'
+import { fromFormattedString } from '@xmcl/text-component'
+import { MessageFormatPart } from '../chatUtils'
+
+type RenderSlotComponent = {
+  type: string,
+  data: any
+  // example
+  // {
+  //   "type": "item_model",
+  //   "data": "aa:ss"
+  // }
+}
+export type RenderItem = Pick<import('prismarine-item').Item, 'name' | 'displayName' | 'durabilityUsed' | 'maxDurability' | 'enchants' | 'nbt'> & {
+  components?: RenderSlotComponent[],
+  // componentMap?: Map<string, RenderSlotComponent>
+}
+export type GeneralInputItem = Pick<import('prismarine-item').Item, 'name' | 'nbt'> & {
+  components?: RenderSlotComponent[],
+  displayName?: string
+}
+
+type JsonString = string
+type PossibleItemProps = {
+  Damage?: number
+  display?: { Name?: JsonString } // {"text":"Knife","color":"white","italic":"true"}
+}
+
+export const getItemMetadata = (item: GeneralInputItem) => {
+  let customText = undefined as string | any | undefined
+  let customModel = undefined as string | undefined
+  if (item.components) {
+    const componentMap = new Map<string, RenderSlotComponent>()
+    for (const component of item.components) {
+      componentMap.set(component.type, component)
+    }
+
+    const customTextComponent = componentMap.get('custom_name') || componentMap.get('item_name')
+    if (customTextComponent) {
+      customText = customTextComponent.data.value
+    }
+    const customModelComponent = componentMap.get('item_model')
+    if (customModelComponent) {
+      customModel = customModelComponent.data
+    }
+    const loreComponent = componentMap.get('lore')
+    if (loreComponent) {
+      customText ??= item.displayName ?? item.name
+      // todo test
+      customText += `\n${JSON.stringify(loreComponent.data)}`
+    }
+  }
+  if (item.nbt) {
+    const itemNbt: PossibleItemProps = nbt.simplify(item.nbt)
+    const customName = itemNbt.display?.Name
+    if (customName) {
+      customText = customName
+    }
+  }
+
+  return {
+    customText,
+    customModel
+  }
+}
+
+
+export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'> | null) => {
+  const { customText } = getItemMetadata(item as any)
+  if (!customText) return
+  try {
+    const parsed = customText.startsWith('{') && customText.endsWith('}') ? mojangson.simplify(mojangson.parse(customText)) : fromFormattedString(customText)
+    if (parsed.extra) {
+      return parsed as Record<string, any>
+    } else {
+      return parsed as MessageFormatPart
+    }
+  } catch (err) {
+    return {
+      text: customText
+    }
+  }
+}
diff --git a/src/mineflayer/java-tester/commands.ts b/src/mineflayer/java-tester/commands.ts
new file mode 100644
index 00000000..c3166870
--- /dev/null
+++ b/src/mineflayer/java-tester/commands.ts
@@ -0,0 +1,54 @@
+import { versionToNumber } from 'flying-squid/dist/utils'
+
+const customStickNbt = (tags: Record<string, any>) => {
+  let cmd = '/give @p stick'
+  const wrapIntoQuotes = versionToNumber(bot.version) < versionToNumber('1.21.5')
+  cmd += `[${Object.entries(tags).map(([key, value]) => {
+    if (typeof value === 'object') {
+      value = JSON.stringify(value)
+    }
+    return `${key}=${wrapIntoQuotes ? `'${value}'` : value}`
+  }).join(',')}]`
+  return cmd
+}
+
+const writeCmd = (cmd: string) => {
+  if (!cmd.startsWith('/')) cmd = `/${cmd}`
+  console.log('Executing', cmd)
+  bot.chat(cmd)
+}
+
+export const javaServerTester = {
+  itemCustomLore () {
+    const cmd = customStickNbt({
+      lore: [{ text: 'This Stick is very sticky.' }]
+    })
+    writeCmd(cmd)
+  },
+
+  itemCustomModel () {
+    const cmd = customStickNbt({
+      item_model: 'minecraft:diamond'
+    })
+    writeCmd(cmd)
+  },
+  itemCustomModel2 () {
+    const cmd = customStickNbt({
+      item_model: 'diamond'
+    })
+    writeCmd(cmd)
+  },
+
+  itemCustomName () {
+    const cmd = customStickNbt({
+      custom_name: [{ text: 'diamond' }]
+    })
+    writeCmd(cmd)
+  },
+  itemCustomName2 () {
+    const cmd = customStickNbt({
+      custom_name: [{ translate: 'item.diamond.name' }]
+    })
+    writeCmd(cmd)
+  }
+}
diff --git a/src/mineflayer/java-tester/index.ts b/src/mineflayer/java-tester/index.ts
new file mode 100644
index 00000000..d395b8f3
--- /dev/null
+++ b/src/mineflayer/java-tester/index.ts
@@ -0,0 +1,6 @@
+import { javaServerTester } from './commands'
+
+window.javaServerTester = javaServerTester
+customEvents.on('mineflayerBotCreated', () => {
+  //
+})
diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index 1c94905f..2f581f9a 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -2,10 +2,11 @@ import { useEffect, useRef, useState } from 'react'
 import { Transition } from 'react-transition-group'
 import { createPortal } from 'react-dom'
 import { subscribe, useSnapshot } from 'valtio'
-import { allImagesLoadedState, getItemNameRaw, openItemsCanvas, openPlayerInventory, upInventoryItems } from '../inventoryWindows'
+import { allImagesLoadedState, openItemsCanvas, openPlayerInventory, upInventoryItems } from '../inventoryWindows'
 import { activeModalStack, isGameActive, miscUiState } from '../globalState'
 import { currentScaling } from '../scaleInterface'
 import { watchUnloadForCleanup } from '../gameUnload'
+import { getItemNameRaw } from '../mineflayer/items'
 import MessageFormattedString from './MessageFormattedString'
 import SharedHudVars from './SharedHudVars'
 
@@ -37,20 +38,16 @@ const ItemName = ({ itemKey }: { itemKey: string }) => {
   }
 
   useEffect(() => {
-    const itemData = itemKey.split('_split_')
-    if (!itemKey) {
-      setItemName('')
-    } else if (itemData[3]) {
-      const customDisplay = getItemNameRaw({
-        nbt: JSON.parse(itemData[3])
-      })
+    const item = bot.heldItem
+    if (item) {
+      const customDisplay = getItemNameRaw(item)
       if (customDisplay) {
         setItemName(customDisplay)
       } else {
-        setItemName(itemData[0])
+        setItemName(item.displayName)
       }
     } else {
-      setItemName(itemData[0])
+      setItemName('')
     }
     setShow(true)
     const id = setTimeout(() => {
@@ -73,7 +70,7 @@ const ItemName = ({ itemKey }: { itemKey: string }) => {
   </Transition>
 }
 
-const Inner = () => {
+const HotbarInner = () => {
   const container = useRef<HTMLDivElement>(null!)
   const [itemKey, setItemKey] = useState('')
   const hasModals = useSnapshot(activeModalStack).length
@@ -144,7 +141,7 @@ const Inner = () => {
       }
       const item = bot.inventory.slots[bot.quickBarSlot + 36]!
       const itemNbt = item.nbt ? JSON.stringify(item.nbt) : ''
-      setItemKey(`${item.displayName}_split_${item.type}_split_${item.metadata}_split_${itemNbt}`)
+      setItemKey(`${item.name}_split_${item.type}_split_${item.metadata}_split_${itemNbt}_split_${JSON.stringify(item['components'] ?? [])}`)
     }
     heldItemChanged()
     bot.on('heldItemChanged' as any, heldItemChanged)
@@ -229,7 +226,7 @@ export default () => {
     })
   }, [])
 
-  return gameMode === 'spectator' ? null : <Inner />
+  return gameMode === 'spectator' ? null : <HotbarInner />
 }
 
 const Portal = ({ children, to = document.body }) => {
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 7adcdb99..f8c92277 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -289,41 +289,47 @@ const prepareBlockstatesAndModels = async () => {
   if (appStatusState.status) {
     setLoadingScreenStatus('Reading resource pack blockstates and models')
   }
-  const readData = async (namespaceDir: string) => {
-    const blockstatesPath = `${basePath}/assets/${namespaceDir}/blockstates`
-    const modelsPath = `${basePath}/assets/${namespaceDir}/models/block` // todo also models/item
-    const getAllJson = async (path: string, type: 'models' | 'blockstates') => {
-      if (!(await existsAsync(path))) return
-      const files = await fs.promises.readdir(path)
-      const jsons = {} as Record<string, any>
-      await Promise.all(files.map(async (file) => {
-        const filePath = `${path}/${file}`
-        if (file.endsWith('.json')) {
-          const contents = await fs.promises.readFile(filePath, 'utf8')
-          let name = file.replace('.json', '')
-          if (type === 'models') {
-            name = `block/${name}`
-          }
-          const parsed = JSON.parse(contents)
-          if (namespaceDir === 'minecraft') {
-            jsons[name] = parsed
-          }
-          jsons[`${namespaceDir}:${name}`] = parsed
-          if (type === 'models') {
-            for (let texturePath of Object.values(parsed.textures ?? {})) {
-              if (typeof texturePath !== 'string') continue
-              if (texturePath.startsWith('#')) continue
-              if (!texturePath.includes(':')) texturePath = `minecraft:${texturePath}`
-              usedTextures.add(texturePath as string)
-            }
+
+  const readModelData = async (path: string, type: 'models' | 'blockstates', namespaceDir: string) => {
+    if (!(await existsAsync(path))) return
+    const files = await fs.promises.readdir(path)
+    const jsons = {} as Record<string, any>
+    await Promise.all(files.map(async (file) => {
+      const filePath = `${path}/${file}`
+      if (file.endsWith('.json')) {
+        const contents = await fs.promises.readFile(filePath, 'utf8')
+        let name = file.replace('.json', '')
+        if (type === 'models') {
+          name = `${path.endsWith('block') ? 'block' : 'item'}/${name}`
+        }
+        const parsed = JSON.parse(contents)
+        if (namespaceDir === 'minecraft') {
+          jsons[name] = parsed
+        }
+        jsons[`${namespaceDir}:${name}`] = parsed
+        if (type === 'models') {
+          for (let texturePath of Object.values(parsed.textures ?? {})) {
+            if (typeof texturePath !== 'string') continue
+            if (texturePath.startsWith('#')) continue
+            if (!texturePath.includes(':')) texturePath = `minecraft:${texturePath}`
+            usedTextures.add(texturePath as string)
           }
         }
-      }))
-      return jsons
-    }
-    Object.assign(viewer.world.customBlockStates!, await getAllJson(blockstatesPath, 'blockstates'))
-    Object.assign(viewer.world.customModels!, await getAllJson(modelsPath, 'models'))
+      }
+    }))
+    return jsons
   }
+
+  const readData = async (namespaceDir: string) => {
+    const blockstatesPath = `${basePath}/assets/${namespaceDir}/blockstates`
+    const blockModelsPath = `${basePath}/assets/${namespaceDir}/models/block`
+    const itemModelsPath = `${basePath}/assets/${namespaceDir}/models/item`
+
+    Object.assign(viewer.world.customBlockStates!, await readModelData(blockstatesPath, 'blockstates', namespaceDir))
+    Object.assign(viewer.world.customModels!, await readModelData(blockModelsPath, 'models', namespaceDir))
+    Object.assign(viewer.world.customModels!, await readModelData(itemModelsPath, 'models', namespaceDir))
+  }
+
   try {
     const assetsDirs = await fs.promises.readdir(join(basePath, 'assets'))
     for (const assetsDir of assetsDirs) {

From e54c2629729ae1e698dd74b47500fb8319e040da Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 5 Feb 2025 14:38:18 +0300
Subject: [PATCH 187/753] fix dropped blocks rendering

---
 prismarine-viewer/viewer/lib/entities.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index fb0b5ed8..e95b212d 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -427,7 +427,9 @@ export class Entities extends EventEmitter {
 
   getItemMesh (item) {
     if (item.blockId || this.isBlock(item.itemId)) {
-      const block = loadedData.blocks[item.blockId ?? item.itemId]
+      const block = item.blockId
+        ? loadedData.blocks[item.blockId]
+        : loadedData.blocksByName[loadedData.items[item.itemId].name]
       const mesh = getBlockMesh(this.viewer.world.material, block.name, {})
       const SCALE = 0.5
       mesh.scale.set(SCALE, SCALE, SCALE)

From 42275df14d7ebb4ceb3c79abbe95f38747ef17cb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 5 Feb 2025 14:51:44 +0300
Subject: [PATCH 188/753] feedback: remove setting default keybindings to
 arrows to avoid confusion on accidental arrow keys pressing which might
 happen in super comfy gamer setups like boxes falling on right part of
 keyboard which is never used

---
 src/controls.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/controls.ts b/src/controls.ts
index 0352a7e5..b55bf9f7 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -52,10 +52,10 @@ export const contro = new ControMax({
       swapHands: ['KeyF'],
       zoom: ['KeyC'],
       selectItem: ['KeyH'], // default will be removed
-      rotateCameraLeft: ['ArrowLeft'],
-      rotateCameraRight: ['ArrowRight'],
-      rotateCameraUp: ['ArrowUp'],
-      rotateCameraDown: ['ArrowDown']
+      rotateCameraLeft: [null],
+      rotateCameraRight: [null],
+      rotateCameraUp: [null],
+      rotateCameraDown: [null]
     },
     ui: {
       toggleFullscreen: ['F11'],

From 09f91d149135f75de693f7e0d66ad304a07287c2 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 6 Feb 2025 08:40:24 +0300
Subject: [PATCH 189/753] try to use pnpm action setup and recommend usign
 corepack

---
 .github/workflows/ci.yml | 6 +++---
 CONTRIBUTING.md          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce88481a..bc54da4e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,12 +13,12 @@ jobs:
         with:
           java-version: 17
           java-package: jre
-      - name: Install pnpm
-        run: npm i -g pnpm@9.0.4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           # cache: "pnpm"
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
       - run: pnpm install
       - run: pnpm check-build
       - run: pnpm build-playground
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 532c7f31..f30f2762 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 After forking the repository, run the following commands to get started:
 
-0. Ensure you have [Node.js](https://nodejs.org) and `pnpm` installed. To install pnpm run `npm i -g pnpm@9.0.4`.
+0. Ensure you have [Node.js](https://nodejs.org) installed. Enable corepack with `corepack enable`.
 1. Install dependencies: `pnpm i`
 2. Start the project in development mode: `pnpm start`
 3. Read the [Tasks Categories](#tasks-categories) and [Workflow](#workflow) sections below

From 3bfaa2980c0c0204177aa6d2b5b2339fbe369699 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 6 Feb 2025 08:45:05 +0300
Subject: [PATCH 190/753] up mc-assets to resolve issues with some items custom
 texture rendering

---
 package.json   |  2 +-
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 1d2eb062..38ede60b 100644
--- a/package.json
+++ b/package.json
@@ -143,7 +143,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.28",
+    "mc-assets": "^0.2.29",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b6d75211..f5d395fa 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -346,8 +346,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.28
-        version: 0.2.28
+        specifier: ^0.2.29
+        version: 0.2.29
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -6256,8 +6256,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.28:
-    resolution: {integrity: sha512-NwUpKFExg/xs5YguFMeGa7Zie2yoJh2EcUSV4n46q4OF60AmgoEj0OSOS2xnZF2BL17JJ3Y97V6quAR9NCKLeQ==}
+  mc-assets@0.2.29:
+    resolution: {integrity: sha512-HghleUJBVQsjNx/qxuj62iCTsNzo9eTrIL0mfTOKy8kmmyhsECe7ohCW+iJ/4lYNf2BdlMVxy/uBZ1eZQNxlhQ==}
     engines: {node: '>=18.0.0'}
 
   md5-file@4.0.0:
@@ -16642,7 +16642,7 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.28: {}
+  mc-assets@0.2.29: {}
 
   md5-file@4.0.0: {}
 

From 1b7ccbd77f4068ff6116088e5a4ec71064688c86 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 6 Feb 2025 08:47:12 +0300
Subject: [PATCH 191/753] up workflows

---
 .github/workflows/fix-lint.yml    | 6 ++++++
 .github/workflows/next-deploy.yml | 7 ++++++-
 .github/workflows/preview.yml     | 7 ++++---
 .github/workflows/publish.yml     | 7 ++++++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/fix-lint.yml b/.github/workflows/fix-lint.yml
index 990de3fa..da2cf87d 100644
--- a/.github/workflows/fix-lint.yml
+++ b/.github/workflows/fix-lint.yml
@@ -16,6 +16,12 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: refs/pull/${{ github.event.issue.number }}/head
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+      - run: pnpm install
       - run: pnpm lint --fix
       - name: Push Changes
         uses: ad-m/github-push-action@master
diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml
index 55fb8746..2fd3be09 100644
--- a/.github/workflows/next-deploy.yml
+++ b/.github/workflows/next-deploy.yml
@@ -16,8 +16,13 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
       - name: Install Global Dependencies
-        run: npm install --global vercel pnpm@9.0.4
+        run: pnpm add -g vercel
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
       - name: Write Release Info
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index f03b80f8..331ce62e 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -46,13 +46,14 @@ jobs:
         with:
           ref: refs/pull/${{ github.event.pull_request.number }}/head
 
-      - run: npm i -g pnpm@9.0.4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: "pnpm"
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
       - name: Install Global Dependencies
-        run: npm install --global vercel
+        run: pnpm add -g vercel
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
       - name: Write Release Info
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7f14a1d1..94c3c8f3 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -13,8 +13,13 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@master
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
       - name: Install pnpm
-        run: npm i -g vercel pnpm@9.0.4
+        uses: pnpm/action-setup@v4
+      - name: Install Global Dependencies
+        run: pnpm add -g vercel
       # - run: pnpm install
       # - run: pnpm build
       - run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}

From 3e00dcb3e94a453644abc2f7997b9b13b4ded667 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 7 Feb 2025 06:58:33 +0300
Subject: [PATCH 192/753] fix: one of the biggest ios fixes yet: reset viewport
 state (scale) on unexpected vieport changes and fix possible touch camera
 movement misaldment

---
 src/react/GameInteractionOverlay.tsx | 118 +++++++++++++++++++++------
 src/react/MainMenu.tsx               |  33 +++++++-
 2 files changed, 122 insertions(+), 29 deletions(-)

diff --git a/src/react/GameInteractionOverlay.tsx b/src/react/GameInteractionOverlay.tsx
index 9aa15025..c3126f8e 100644
--- a/src/react/GameInteractionOverlay.tsx
+++ b/src/react/GameInteractionOverlay.tsx
@@ -21,15 +21,17 @@ function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
     let virtualClickActive = false
     let virtualClickTimeout: NodeJS.Timeout | undefined
     let screenTouches = 0
-    let capturedPointer: {
-      id: number;
-      x: number;
-      y: number;
-      sourceX: number;
-      sourceY: number;
-      activateCameraMove: boolean;
-      time: number
-    } | undefined
+    const capturedPointer = {
+      active: null as {
+        id: number;
+        x: number;
+        y: number;
+        sourceX: number;
+        sourceY: number;
+        activateCameraMove: boolean;
+        time: number
+      } | null
+    }
 
     const pointerDownHandler = (e: PointerEvent) => {
       const clickedEl = e.composedPath()[0]
@@ -52,11 +54,11 @@ function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
           return
         }
       }
-      if (capturedPointer) {
+      if (capturedPointer.active) {
         return
       }
       cameraControlEl.setPointerCapture(e.pointerId)
-      capturedPointer = {
+      capturedPointer.active = {
         id: e.pointerId,
         x: e.clientX,
         y: e.clientY,
@@ -75,6 +77,8 @@ function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
 
     const pointerMoveHandler = (e: PointerEvent) => {
       if (e.pointerId === undefined) return
+      const scale = window.visualViewport?.scale || 1
+
       const supportsPressure = (e as any).pressure !== undefined &&
         (e as any).pressure !== 0 &&
         (e as any).pressure !== 0.5 &&
@@ -88,7 +92,7 @@ function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
         }
         return
       }
-      if (e.pointerId !== capturedPointer?.id) return
+      if (e.pointerId !== capturedPointer.active?.id) return
       // window.scrollTo(0, 0)
       e.preventDefault()
       e.stopPropagation()
@@ -97,23 +101,34 @@ function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
       if (supportsPressure) {
         bot.setControlState('jump', (e as any).pressure > 0.5)
       }
-      const xDiff = Math.abs(e.pageX - capturedPointer.sourceX) > allowedJitter
-      const yDiff = Math.abs(e.pageY - capturedPointer.sourceY) > allowedJitter
-      if (!capturedPointer.activateCameraMove && (xDiff || yDiff)) {
-        capturedPointer.activateCameraMove = true
+
+      // Adjust coordinates for scale
+      const currentX = e.clientX / scale
+      const currentY = e.clientY / scale
+      const sourceX = capturedPointer.active.sourceX / scale
+      const sourceY = capturedPointer.active.sourceY / scale
+      const lastX = capturedPointer.active.x / scale
+      const lastY = capturedPointer.active.y / scale
+
+      const xDiff = Math.abs(currentX - sourceX) > allowedJitter
+      const yDiff = Math.abs(currentY - sourceY) > allowedJitter
+
+      if (!capturedPointer.active.activateCameraMove && (xDiff || yDiff)) {
+        capturedPointer.active.activateCameraMove = true
       }
-      if (capturedPointer.activateCameraMove) {
+      if (capturedPointer.active.activateCameraMove) {
         clearTimeout(virtualClickTimeout)
       }
 
       onCameraMove({
-        movementX: e.pageX - capturedPointer.x,
-        movementY: e.pageY - capturedPointer.y,
+        movementX: (currentX - lastX),
+        movementY: (currentY - lastY),
         type: 'touchmove',
         stopPropagation: () => e.stopPropagation()
       } as CameraMoveEvent)
-      capturedPointer.x = e.pageX
-      capturedPointer.y = e.pageY
+
+      capturedPointer.active.x = e.clientX
+      capturedPointer.active.y = e.clientY
     }
 
     const pointerUpHandler = (e: PointerEvent) => {
@@ -123,7 +138,7 @@ function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
         joystickPointer.pointer = null
         return
       }
-      if (e.pointerId !== capturedPointer?.id) return
+      if (e.pointerId !== capturedPointer.active?.id) return
       clearTimeout(virtualClickTimeout)
       virtualClickTimeout = undefined
 
@@ -131,14 +146,16 @@ function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
         // button 0 is left click
         document.dispatchEvent(new MouseEvent('mouseup', { button: 0 }))
         virtualClickActive = false
-      } else if (!capturedPointer.activateCameraMove && (Date.now() - capturedPointer.time < touchStartBreakingBlockMs)) {
+      } else if (!capturedPointer.active.activateCameraMove && (Date.now() - capturedPointer.active.time < touchStartBreakingBlockMs)) {
         document.dispatchEvent(new MouseEvent('mousedown', { button: 2 }))
         worldInteractions.update()
         document.dispatchEvent(new MouseEvent('mouseup', { button: 2 }))
       }
 
-      capturedPointer = undefined
-      screenTouches--
+      if (screenTouches > 0) {
+        screenTouches--
+      }
+      capturedPointer.active = null
     }
 
     const contextMenuHandler = (e: Event) => {
@@ -156,6 +173,57 @@ function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
     cameraControlEl.addEventListener('lostpointercapture', pointerUpHandler, { signal })
     cameraControlEl.addEventListener('contextmenu', contextMenuHandler, { signal })
     window.addEventListener('blur', blurHandler, { signal })
+
+    // Add zoom detection and reset
+    const detectAndResetZoom = () => {
+      const { visualViewport } = window
+      if (!visualViewport) return
+
+      if (visualViewport.scale !== 1) {
+        // Reset zoom by updating viewport meta tag
+        const viewport = document.querySelector('meta[name=viewport]')
+        if (viewport) {
+          viewport.setAttribute('content', 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no')
+          // Force re-layout
+          setTimeout(() => {
+            viewport.setAttribute('content', 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no')
+          }, 300)
+        }
+      }
+    }
+
+    // Listen for zoom changes
+    window.visualViewport?.addEventListener('resize', detectAndResetZoom, { signal })
+    detectAndResetZoom()
+
+    // Prevent zoom gestures
+    document.addEventListener('gesturestart', (e) => e.preventDefault(), { signal })
+    document.addEventListener('gesturechange', (e) => e.preventDefault(), { signal })
+    document.addEventListener('gestureend', (e) => e.preventDefault(), { signal })
+
+
+    // Debug method to simulate zoom
+    window.debugSimulateZoom = (scale = 1.1, x = 0, y = 0) => {
+      const viewport = document.querySelector('meta[name=viewport]')
+      if (viewport) {
+        viewport.setAttribute('content', `width=device-width, initial-scale=${scale}, user-scalable=no, viewport-fit=cover, transform-origin: ${x}px ${y}px`)
+      }
+      // This will trigger the visualViewport resize event
+      setTimeout(() => {
+        window.visualViewport?.dispatchEvent(new Event('resize'))
+      }, 100)
+    }
+
+    // Debug method to reset zoom
+    window.debugResetZoom = () => {
+      const viewport = document.querySelector('meta[name=viewport]')
+      if (viewport) {
+        viewport.setAttribute('content', 'width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no')
+      }
+      setTimeout(() => {
+        window.visualViewport?.dispatchEvent(new Event('resize'))
+      }, 100)
+    }
   }, [])
 
   return (
diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 0c5b4007..349d9a43 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -1,11 +1,12 @@
-import React, { useEffect, useState } from 'react'
+import React from 'react'
 import { openURL } from 'prismarine-viewer/viewer/lib/simpleUtils'
 import { haveDirectoryPicker } from '../utils'
-import { activeModalStack } from '../globalState'
+import { ConnectOptions } from '../connect'
 import styles from './mainMenu.module.css'
 import Button from './Button'
 import ButtonWithTooltip from './ButtonWithTooltip'
 import { pixelartIcons } from './PixelartIcon'
+import useLongPress from './useLongPress'
 
 type Action = (e: React.MouseEvent<HTMLButtonElement>) => void
 
@@ -49,6 +50,30 @@ export default ({
     return [parts[0], parts.slice(1).join(':')]
   }) as Array<[string, string]> | undefined
 
+  const singleplayerLongPress = useLongPress(
+    () => {
+      window.location.href = window.location.pathname + '?sp=1'
+    },
+    () => singleplayerAction?.(null as any),
+    { delay: 500 }
+  )
+
+  const connectToServerLongPress = useLongPress(
+    () => {
+      if (process.env.NODE_ENV === 'development') {
+      // Connect to <origin>:25565
+        const origin = window.location.hostname
+        const connectOptions: ConnectOptions = {
+          server: `${origin}:25565`,
+          username: 'test',
+        }
+        dispatchEvent(new CustomEvent('connect', { detail: connectOptions }))
+      }
+    },
+    () => connectToServerAction?.(null as any),
+    { delay: 500 }
+  )
+
   return (
     <div className={styles.root}>
       <div className={styles['game-title']}>
@@ -64,7 +89,7 @@ export default ({
             content: 'Connect to Java servers!',
             placement: 'top',
           }}
-          onClick={connectToServerAction}
+          {...connectToServerLongPress}
           data-test-id='servers-screen-button'
         >
           Connect to server
@@ -72,7 +97,7 @@ export default ({
         <div style={{ display: 'flex', justifyContent: 'space-between' }}>
           <ButtonWithTooltip
             style={{ width: 150 }}
-            onClick={singleplayerAction}
+            {...singleplayerLongPress}
             data-test-id='singleplayer-button'
             initialTooltip={{
               content: 'Create worlds and play offline',

From c81da88eb7d45a1503713c65f8aea054f9a8760f Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 7 Feb 2025 10:00:30 +0000
Subject: [PATCH 193/753] up guide!!! add what many didnt know

---
 CONTRIBUTING.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f30f2762..02f6957e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,12 +2,16 @@
 
 After forking the repository, run the following commands to get started:
 
-0. Ensure you have [Node.js](https://nodejs.org) installed. Enable corepack with `corepack enable`.
+0. Ensure you have [Node.js](https://nodejs.org) installed. Enable corepack with `corepack enable` *(1).
 1. Install dependencies: `pnpm i`
-2. Start the project in development mode: `pnpm start`
+2. Start the project in development mode: `pnpm start` or build the project for production: `pnpm build`
 3. Read the [Tasks Categories](#tasks-categories) and [Workflow](#workflow) sections below
 4. Let us know if you are working on something and be sure to open a PR if you got any changes. Happy coding!
 
+*(1): If you are getting `Cannot find matching keyid` update corepack to the latest version with `npm i -g corepack`.
+*(2): If still something doesn't work ensure you have the right nodejs version with `node -v` (tested on 22.x)
+*(3): For GitHub codespaces (cloud ide): Run `pnpm i @rsbuild/core@1.2.4 @rsbuild/plugin-node-polyfill@1.3.0 @rsbuild/plugin-react@1.1.0 @rsbuild/plugin-typed-css-modules@1.0.2` command to avoid crashes because of limited ram
+
 ## Project Structure
 
 There are 3 main parts of the project:

From 9be595076074709370a465b11bef7ae2fb4b53fd Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 7 Feb 2025 13:01:22 +0300
Subject: [PATCH 194/753] feat: Connections issues icon & reconnect button
 (#268)

---
 cypress/e2e/index.spec.ts              |   4 +-
 cypress/minecraft-server.mjs           |   2 +-
 src/globalState.ts                     |   2 +
 src/index.ts                           | 190 +++++++++++++------------
 src/mineflayer/mc-protocol.ts          |  17 +++
 src/mineflayer/websocket-core.ts       |   2 +-
 src/react/AppStatus.tsx                |   5 +-
 src/react/AppStatusProvider.tsx        |  21 ++-
 src/react/IndicatorEffects.css         |   2 +-
 src/react/IndicatorEffects.tsx         |  32 +++--
 src/react/IndicatorEffectsProvider.tsx |   4 +-
 src/react/ServersListProvider.tsx      |   2 +
 12 files changed, 178 insertions(+), 105 deletions(-)

diff --git a/cypress/e2e/index.spec.ts b/cypress/e2e/index.spec.ts
index fc67ad21..ae110155 100644
--- a/cypress/e2e/index.spec.ts
+++ b/cypress/e2e/index.spec.ts
@@ -38,14 +38,14 @@ it('Loads & renders singleplayer', () => {
   testWorldLoad()
 })
 
-it('Joins to local flying-squid server', () => {
+it.skip('Joins to local flying-squid server', () => {
   visit('/?ip=localhost&version=1.16.1')
   window.localStorage.version = ''
   // todo replace with data-test
   // cy.get('[data-test-id="servers-screen-button"]').click()
   // cy.get('[data-test-id="server-ip"]').clear().focus().type('localhost')
   // cy.get('[data-test-id="version"]').clear().focus().type('1.16.1') // todo needs to fix autoversion
-  cy.get('[data-test-id="connect-qs"]').click()
+  cy.get('[data-test-id="connect-qs"]').click() // todo! cypress sometimes doesn't click
   testWorldLoad()
 })
 
diff --git a/cypress/minecraft-server.mjs b/cypress/minecraft-server.mjs
index 32be0c9d..ea7bbcd1 100644
--- a/cypress/minecraft-server.mjs
+++ b/cypress/minecraft-server.mjs
@@ -1,6 +1,6 @@
 //@ts-check
 import mcServer from 'flying-squid'
-import defaultOptions from 'flying-squid/config/default-settings.json' assert { type: 'json' }
+import defaultOptions from 'flying-squid/config/default-settings.json' with { type: 'json' }
 
 /** @type {Options} */
 const serverOptions = {
diff --git a/src/globalState.ts b/src/globalState.ts
index f5596308..e1416415 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -153,6 +153,8 @@ export const gameAdditionalState = proxy({
   isSneaking: false,
   isZooming: false,
   warps: [] as WorldWarp[],
+  noConnection: false,
+  poorConnection: false,
 
   usingServerResourcePack: false,
 })
diff --git a/src/index.ts b/src/index.ts
index 3c0b3b50..f9d90aac 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -677,6 +677,7 @@ export async function connect (connectOptions: ConnectOptions) {
       endReason = 'Connection with server lost'
     }
     setLoadingScreenStatus(`You have been disconnected from the server. End reason: ${endReason}`, true)
+    appStatusState.showReconnect = true
     onPossibleErrorDisconnect()
     destroyAll()
     if (isCypress()) throw new Error(`disconnected: ${endReason}`)
@@ -812,24 +813,33 @@ export async function connect (connectOptions: ConnectOptions) {
   }
 }
 
+const reconnectOptions = sessionStorage.getItem('reconnectOptions') ? JSON.parse(sessionStorage.getItem('reconnectOptions')!) : undefined
+
 listenGlobalEvents()
 watchValue(miscUiState, async s => {
   if (s.appLoaded) { // fs ready
-    if (appQueryParams.singleplayer === '1' || appQueryParams.sp === '1') {
-      loadSingleplayer({}, {
-        worldFolder: undefined,
-        ...appQueryParams.version ? { version: appQueryParams.version } : {}
-      })
-    }
-    if (appQueryParams.loadSave) {
-      const savePath = `/data/worlds/${appQueryParams.loadSave}`
-      try {
-        await fs.promises.stat(savePath)
-      } catch (err) {
-        alert(`Save ${savePath} not found`)
-        return
+    if (reconnectOptions) {
+      sessionStorage.removeItem('reconnectOptions')
+      if (Date.now() - reconnectOptions.timestamp < 1000 * 60 * 2) {
+        void connect(reconnectOptions.value)
+      }
+    } else {
+      if (appQueryParams.singleplayer === '1' || appQueryParams.sp === '1') {
+        loadSingleplayer({}, {
+          worldFolder: undefined,
+          ...appQueryParams.version ? { version: appQueryParams.version } : {}
+        })
+      }
+      if (appQueryParams.loadSave) {
+        const savePath = `/data/worlds/${appQueryParams.loadSave}`
+        try {
+          await fs.promises.stat(savePath)
+        } catch (err) {
+          alert(`Save ${savePath} not found`)
+          return
+        }
+        await loadInMemorySave(savePath)
       }
-      await loadInMemorySave(savePath)
     }
   }
 })
@@ -876,84 +886,86 @@ void window.fetch('config.json').then(async res => res.json()).then(c => c, (err
 })
 
 // qs open actions
-downloadAndOpenFile().then((downloadAction) => {
-  if (downloadAction) return
-  if (appQueryParams.reconnect && process.env.NODE_ENV === 'development') {
-    const lastConnect = JSON.parse(localStorage.lastConnectOptions ?? {})
-    void connect({
-      botVersion: appQueryParams.version ?? undefined,
-      ...lastConnect,
-      ip: appQueryParams.ip || undefined
-    })
-    return
-  }
-  if (appQueryParams.ip || appQueryParams.proxy) {
-    const waitAppConfigLoad = !appQueryParams.proxy
-    const openServerEditor = () => {
-      hideModal()
-      showModal({ reactType: 'editServer' })
-    }
-    showModal({ reactType: 'empty' })
-    if (waitAppConfigLoad) {
-      const unsubscribe = subscribe(miscUiState, checkCanDisplay)
-      checkCanDisplay()
-      // eslint-disable-next-line no-inner-declarations
-      function checkCanDisplay () {
-        if (miscUiState.appConfig) {
-          unsubscribe()
-          openServerEditor()
-          return true
-        }
-      }
-    } else {
-      openServerEditor()
-    }
-  }
-
-  void Promise.resolve().then(() => {
-    // try to connect to peer
-    const peerId = appQueryParams.connectPeer
-    const peerOptions = {} as ConnectPeerOptions
-    if (appQueryParams.server) {
-      peerOptions.server = appQueryParams.server
-    }
-    const version = appQueryParams.peerVersion
-    if (peerId) {
-      let username: string | null = options.guestUsername
-      if (options.askGuestName) username = prompt('Enter your username', username)
-      if (!username) return
-      options.guestUsername = username
+if (!reconnectOptions) {
+  downloadAndOpenFile().then((downloadAction) => {
+    if (downloadAction) return
+    if (appQueryParams.reconnect && process.env.NODE_ENV === 'development') {
+      const lastConnect = JSON.parse(localStorage.lastConnectOptions ?? {})
       void connect({
-        username,
-        botVersion: version || undefined,
-        peerId,
-        peerOptions
+        botVersion: appQueryParams.version ?? undefined,
+        ...lastConnect,
+        ip: appQueryParams.ip || undefined
+      })
+      return
+    }
+    if (appQueryParams.ip || appQueryParams.proxy) {
+      const waitAppConfigLoad = !appQueryParams.proxy
+      const openServerEditor = () => {
+        hideModal()
+        showModal({ reactType: 'editServer' })
+      }
+      showModal({ reactType: 'empty' })
+      if (waitAppConfigLoad) {
+        const unsubscribe = subscribe(miscUiState, checkCanDisplay)
+        checkCanDisplay()
+        // eslint-disable-next-line no-inner-declarations
+        function checkCanDisplay () {
+          if (miscUiState.appConfig) {
+            unsubscribe()
+            openServerEditor()
+            return true
+          }
+        }
+      } else {
+        openServerEditor()
+      }
+    }
+
+    void Promise.resolve().then(() => {
+      // try to connect to peer
+      const peerId = appQueryParams.connectPeer
+      const peerOptions = {} as ConnectPeerOptions
+      if (appQueryParams.server) {
+        peerOptions.server = appQueryParams.server
+      }
+      const version = appQueryParams.peerVersion
+      if (peerId) {
+        let username: string | null = options.guestUsername
+        if (options.askGuestName) username = prompt('Enter your username', username)
+        if (!username) return
+        options.guestUsername = username
+        void connect({
+          username,
+          botVersion: version || undefined,
+          peerId,
+          peerOptions
+        })
+      }
+    })
+
+    if (appQueryParams.serversList) {
+      showModal({ reactType: 'serversList' })
+    }
+
+    const viewerWsConnect = appQueryParams.viewerConnect
+    if (viewerWsConnect) {
+      void connect({
+        username: `viewer-${Math.random().toString(36).slice(2, 10)}`,
+        viewerWsConnect,
       })
     }
-  })
 
-  if (appQueryParams.serversList) {
-    showModal({ reactType: 'serversList' })
-  }
-
-  const viewerWsConnect = appQueryParams.viewerConnect
-  if (viewerWsConnect) {
-    void connect({
-      username: `viewer-${Math.random().toString(36).slice(2, 10)}`,
-      viewerWsConnect,
-    })
-  }
-
-  if (appQueryParams.modal) {
-    const modals = appQueryParams.modal.split(',')
-    for (const modal of modals) {
-      showModal({ reactType: modal })
+    if (appQueryParams.modal) {
+      const modals = appQueryParams.modal.split(',')
+      for (const modal of modals) {
+        showModal({ reactType: modal })
+      }
     }
-  }
-}, (err) => {
-  console.error(err)
-  alert(`Failed to download file: ${err}`)
-})
+  }, (err) => {
+    console.error(err)
+    alert(`Failed to download file: ${err}`)
+  })
+}
 
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
 const initialLoader = document.querySelector('.initial-loader') as HTMLElement | null
@@ -963,4 +975,6 @@ if (initialLoader) {
 }
 window.pageLoaded = true
 
-void possiblyHandleStateVariable()
+if (!reconnectOptions) {
+  void possiblyHandleStateVariable()
+}
diff --git a/src/mineflayer/mc-protocol.ts b/src/mineflayer/mc-protocol.ts
index 0fc09470..c92fcaed 100644
--- a/src/mineflayer/mc-protocol.ts
+++ b/src/mineflayer/mc-protocol.ts
@@ -1,14 +1,17 @@
 import { Client } from 'minecraft-protocol'
 import { appQueryParams } from '../appParams'
 import { downloadAllMinecraftData, getVersionAutoSelect } from '../connect'
+import { gameAdditionalState } from '../globalState'
 import { pingServerVersion, validatePacket } from './minecraft-protocol-extra'
 import { getWebsocketStream } from './websocket-core'
 
+let lastPacketTime = 0
 customEvents.on('mineflayerBotCreated', () => {
   // todo move more code here
   if (!appQueryParams.noPacketsValidation) {
     (bot._client as unknown as Client).on('packet', (data, packetMeta, buffer, fullBuffer) => {
       validatePacket(packetMeta.name, data, fullBuffer, true)
+      lastPacketTime = performance.now()
     });
     (bot._client as unknown as Client).on('writePacket', (name, params) => {
       validatePacket(name, params, Buffer.alloc(0), false)
@@ -16,6 +19,20 @@ customEvents.on('mineflayerBotCreated', () => {
   }
 })
 
+setInterval(() => {
+  if (!bot || !lastPacketTime) return
+  if (bot.player?.ping > 500) { // TODO: we cant rely on server ping 1. weird calculations 2. available with delays instead patch minecraft-protocol to get latency of keep_alive packet
+    gameAdditionalState.poorConnection = true
+  } else {
+    gameAdditionalState.poorConnection = false
+  }
+  if (performance.now() - lastPacketTime < 1000) {
+    gameAdditionalState.noConnection = false
+    return
+  }
+  gameAdditionalState.noConnection = true
+}, 1000)
+
 
 export const getServerInfo = async (ip: string, port?: number, preferredVersion = getVersionAutoSelect(), ping = false) => {
   await downloadAllMinecraftData()
diff --git a/src/mineflayer/websocket-core.ts b/src/mineflayer/websocket-core.ts
index 69886897..3896b797 100644
--- a/src/mineflayer/websocket-core.ts
+++ b/src/mineflayer/websocket-core.ts
@@ -42,7 +42,7 @@ export const getWebsocketStream = async (host: string) => {
     ws.addEventListener('open', resolve)
     ws.addEventListener('error', err => {
       console.log('ws error', err)
-      reject(err)
+      reject(new Error('Failed to open websocket connection'))
     })
   })
 
diff --git a/src/react/AppStatus.tsx b/src/react/AppStatus.tsx
index 3be5b522..4f981ade 100644
--- a/src/react/AppStatus.tsx
+++ b/src/react/AppStatus.tsx
@@ -13,6 +13,8 @@ export default ({
   backAction = undefined as undefined | (() => void),
   description = '' as string | JSX.Element,
   actionsSlot = null as React.ReactNode | null,
+  showReconnect = false,
+  onReconnect = undefined as undefined | (() => void),
   children
 }) => {
   const [loadingDotIndex, setLoadingDotIndex] = useState(0)
@@ -67,9 +69,10 @@ export default ({
     >
       {isError && (
         <>
-          {!lockConnect && backAction && <Button label="Back" onClick={backAction} />}
+          {showReconnect && onReconnect && <Button label="Reconnect" onClick={onReconnect} />}
           {actionsSlot}
           <Button onClick={() => window.location.reload()} label="Reset App (recommended)" />
+          {!lockConnect && backAction && <Button label="Back" onClick={backAction} />}
         </>
       )}
       {children}
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index b0705241..ffbc593c 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -28,7 +28,8 @@ const initialState = {
   loadingChunksData: null as null | Record<string, string>,
   loadingChunksDataPlayerChunk: null as null | { x: number, z: number },
   isDisplaying: false,
-  minecraftJsonMessage: null as null | Record<string, any>
+  minecraftJsonMessage: null as null | Record<string, any>,
+  showReconnect: false
 }
 export const appStatusState = proxy(initialState)
 export const resetAppStatusState = () => {
@@ -39,8 +40,15 @@ export const lastConnectOptions = {
   value: null as ConnectOptions | null
 }
 
+const saveReconnectOptions = (options: ConnectOptions) => {
+  sessionStorage.setItem('reconnectOptions', JSON.stringify({
+    value: options,
+    timestamp: Date.now()
+  }))
+}
+
 export default () => {
-  const { isError, lastStatus, maybeRecoverable, status, hideDots, descriptionHint, loadingChunksData, loadingChunksDataPlayerChunk, minecraftJsonMessage } = useSnapshot(appStatusState)
+  const { isError, lastStatus, maybeRecoverable, status, hideDots, descriptionHint, loadingChunksData, loadingChunksDataPlayerChunk, minecraftJsonMessage, showReconnect } = useSnapshot(appStatusState)
   const { active: replayActive } = useSnapshot(packetsReplaceSessionState)
 
   const isOpen = useIsModalActive('app-status')
@@ -65,6 +73,13 @@ export default () => {
     }))
   }
 
+  const reconnectReload = () => {
+    if (lastConnectOptions.value) {
+      saveReconnectOptions(lastConnectOptions.value)
+      window.location.reload()
+    }
+  }
+
   useEffect(() => {
     const controller = new AbortController()
     window.addEventListener('keyup', (e) => {
@@ -98,6 +113,8 @@ export default () => {
       isError={isError || appStatusState.status === ''} // display back button if status is empty as probably our app is errored
       hideDots={hideDots}
       lastStatus={lastStatus}
+      showReconnect={showReconnect}
+      onReconnect={reconnectReload}
       description={<>{
         displayAuthButton ? '' : (isError ? guessProblem(status) : '') || descriptionHint
       }{
diff --git a/src/react/IndicatorEffects.css b/src/react/IndicatorEffects.css
index dda3e87e..6b178c58 100644
--- a/src/react/IndicatorEffects.css
+++ b/src/react/IndicatorEffects.css
@@ -8,7 +8,7 @@
 
 .indicators-container {
   display: flex;
-  font-size: 0.7em;
+  font-size: 0.8em;
 }
 
 .effects-container {
diff --git a/src/react/IndicatorEffects.tsx b/src/react/IndicatorEffects.tsx
index a8a53e03..18ab0785 100644
--- a/src/react/IndicatorEffects.tsx
+++ b/src/react/IndicatorEffects.tsx
@@ -1,5 +1,5 @@
 import { useMemo, useEffect, useRef } from 'react'
-import PixelartIcon from './PixelartIcon'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import './IndicatorEffects.css'
 
 
@@ -46,6 +46,7 @@ export const defaultIndicatorsState = {
   readonlyFiles: false,
   writingFiles: false, // saving
   appHasErrors: false,
+  connectionIssues: 0
 }
 
 const indicatorIcons: Record<keyof typeof defaultIndicatorsState, string> = {
@@ -54,6 +55,15 @@ const indicatorIcons: Record<keyof typeof defaultIndicatorsState, string> = {
   writingFiles: 'arrow-bar-up',
   appHasErrors: 'alert',
   readonlyFiles: 'file-off',
+  connectionIssues: pixelartIcons['cellular-signal-off'],
+}
+
+const colorOverrides = {
+  connectionIssues: {
+    0: false,
+    1: 'orange',
+    2: 'red'
+  }
 }
 
 export default ({ indicators, effects }: { indicators: typeof defaultIndicatorsState, effects: readonly EffectType[] }) => {
@@ -79,18 +89,24 @@ export default ({ indicators, effects }: { indicators: typeof defaultIndicatorsS
     }
   }, [])
 
-  const indicatorsMapped = Object.entries(defaultIndicatorsState).map(([key, state]) => ({
-    icon: indicatorIcons[key],
-    // preserve order
-    state: indicators[key],
-  }))
+  const indicatorsMapped = Object.entries(defaultIndicatorsState).map(([key]) => {
+    const state = indicators[key]
+    return {
+      icon: indicatorIcons[key],
+      // preserve order
+      state,
+      key
+    }
+  })
   return <div className='effectsScreen-container'>
     <div className='indicators-container'>
       {
         indicatorsMapped.map((indicator) => <div
-          key={indicator.icon} style={{
+          key={indicator.icon}
+          style={{
             opacity: indicator.state ? 1 : 0,
-            transition: 'opacity 0.1s',
+            transition: 'opacity color 0.1s',
+            color: colorOverrides[indicator.key]?.[indicator.state]
           }}
         >
           <PixelartIcon iconName={indicator.icon} />
diff --git a/src/react/IndicatorEffectsProvider.tsx b/src/react/IndicatorEffectsProvider.tsx
index b82782e6..d1e9fdd0 100644
--- a/src/react/IndicatorEffectsProvider.tsx
+++ b/src/react/IndicatorEffectsProvider.tsx
@@ -2,7 +2,7 @@ import { proxy, useSnapshot } from 'valtio'
 import { useEffect, useMemo } from 'react'
 import { inGameError } from '../utils'
 import { fsState } from '../loadSave'
-import { miscUiState } from '../globalState'
+import { gameAdditionalState, miscUiState } from '../globalState'
 import { options } from '../optionsStorage'
 import IndicatorEffects, { EffectType, defaultIndicatorsState } from './IndicatorEffects'
 import { images } from './effectsImages'
@@ -55,11 +55,13 @@ export default () => {
   const { hasErrors } = useSnapshot(miscUiState)
   const { disabledUiParts } = useSnapshot(options)
   const { isReadonly, openReadOperations, openWriteOperations } = useSnapshot(fsState)
+  const { noConnection, poorConnection } = useSnapshot(gameAdditionalState)
   const allIndicators: typeof defaultIndicatorsState = {
     readonlyFiles: isReadonly,
     writingFiles: openWriteOperations > 0,
     readingFiles: openReadOperations > 0,
     appHasErrors: hasErrors,
+    connectionIssues: poorConnection ? 1 : noConnection ? 2 : 0,
     ...stateIndicators,
   }
 
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 916ec0af..6d6b2eb6 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -227,6 +227,8 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
                   [server.ip]: data
                 }))
               }
+            } catch (err) {
+              console.warn('Failed to fetch server status', err)
             } finally {
               activeRequests.delete(request)
               resolve()

From c5a895a18e58f57949deffd25a2e376594a16be0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 7 Feb 2025 13:54:38 +0300
Subject: [PATCH 195/753] feat: revamp dropped items & holding blocks/items
 display! now using flexible item definition resolution

---
 package.json                                  |  4 ++-
 pnpm-lock.yaml                                | 10 +++---
 prismarine-viewer/viewer/lib/entities.ts      | 33 +++++++++----------
 prismarine-viewer/viewer/lib/holdingBlock.ts  | 27 ++++++++-------
 .../viewer/lib/mesher/standaloneRenderer.ts   |  4 ++-
 src/browserfs.ts                              |  4 +--
 src/downloadAndOpenFile.ts                    |  4 +--
 src/index.ts                                  |  9 +++--
 src/inventoryWindows.ts                       |  3 +-
 src/optionsGuiScheme.tsx                      |  4 +--
 src/react/Chat.tsx                            |  2 +-
 src/react/useLongPress.ts                     | 16 ++++++---
 src/resourcePack.ts                           | 16 ++++++---
 13 files changed, 82 insertions(+), 54 deletions(-)

diff --git a/package.json b/package.json
index 38ede60b..0da2d7d9 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,8 @@
     "build-analyze": "BUNDLE_ANALYZE=true rsbuild build && pnpm build-other-workers",
     "check-build": "tsx scripts/genShims.ts && tsc && pnpm build",
     "test:cypress": "cypress run",
+    "test:cypress:open": "cypress open",
+    "test:cypress:open": "cypress open",
     "test-unit": "vitest",
     "test:e2e": "start-test http-get://localhost:8080 test:cypress",
     "prod-start": "node server.js --prod",
@@ -143,7 +145,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.29",
+    "mc-assets": "^0.2.30",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f5d395fa..ceea217a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -346,8 +346,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.29
-        version: 0.2.29
+        specifier: ^0.2.30
+        version: 0.2.30
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -6256,8 +6256,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.29:
-    resolution: {integrity: sha512-HghleUJBVQsjNx/qxuj62iCTsNzo9eTrIL0mfTOKy8kmmyhsECe7ohCW+iJ/4lYNf2BdlMVxy/uBZ1eZQNxlhQ==}
+  mc-assets@0.2.30:
+    resolution: {integrity: sha512-ZIpaQpbUJGDXPCdAUuwaGxC0Lmu8tdZTatQG0FnDq3ti2gf2fx28E6EI/+dYvdTnWYoKCl+5sEUe0Na/kavHcg==}
     engines: {node: '>=18.0.0'}
 
   md5-file@4.0.0:
@@ -16642,7 +16642,7 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.29: {}
+  mc-assets@0.2.30: {}
 
   md5-file@4.0.0: {}
 
diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index e95b212d..48efb577 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -14,6 +14,7 @@ import { flat, fromFormattedString } from '@xmcl/text-component'
 import mojangson from 'mojangson'
 import { snakeCase } from 'change-case'
 import { Item } from 'prismarine-item'
+import { BlockModel } from 'mc-assets'
 import { EntityMetadataVersions } from '../../../src/mcDataTypes'
 import * as Entity from './entity/EntityMesh'
 import { getMesh } from './entity/EntityMesh'
@@ -21,7 +22,7 @@ import { WalkingGeneralSwing } from './entity/animations'
 import { disposeObject } from './threeJsUtils'
 import { armorModels } from './entity/objModels'
 import { Viewer } from './viewer'
-import { getBlockMesh } from './holdingBlock'
+import { getBlockMeshFromModel } from './holdingBlock'
 const { loadTexture } = globalThis.isElectron ? require('./utils.electron.js') : require('./utils')
 
 export const TWEEN_DURATION = 120
@@ -222,6 +223,8 @@ export class Entities extends EventEmitter {
     su?: number;
     sv?: number;
     size?: number;
+  } | {
+    resolvedModel: BlockModel
   })
 
   constructor (public viewer: Viewer) {
@@ -420,31 +423,26 @@ export class Entities extends EventEmitter {
     return typeof component === 'string' ? component : component.text ?? ''
   }
 
-  isBlock (itemId) {
-    const item = loadedData.items[itemId]
-    return !!loadedData.blocksByName[item.name]
-  }
-
-  getItemMesh (item) {
-    if (item.blockId || this.isBlock(item.itemId)) {
-      const block = item.blockId
-        ? loadedData.blocks[item.blockId]
-        : loadedData.blocksByName[loadedData.items[item.itemId].name]
-      const mesh = getBlockMesh(this.viewer.world.material, block.name, {})
-      const SCALE = 0.5
-      mesh.scale.set(SCALE, SCALE, SCALE)
-      mesh.position.set(0, 0.2, 0)
+  getItemMesh (item, isDropped = false) {
+    const textureUv = this.getItemUv?.(item)
+    if (textureUv && 'resolvedModel' in textureUv) {
+      const mesh = getBlockMeshFromModel(this.viewer.world.material, textureUv.resolvedModel, item.name ?? item.itemId)
+      if (isDropped) {
+        const SCALE = 0.5
+        mesh.scale.set(SCALE, SCALE, SCALE)
+        mesh.position.set(0, 0.2, 0)
+      }
       const outerGroup = new THREE.Group()
       outerGroup.add(mesh)
       return {
         mesh: outerGroup,
+        isBlock: true,
         itemsTexture: null,
         itemsTextureFlipped: null,
       }
     }
 
     // TODO: Render proper model (especially for blocks) instead of flat texture
-    const textureUv = this.getItemUv?.(item)
     if (textureUv) {
       // todo use geometry buffer uv instead!
       const { u, v, size, su, sv, texture } = textureUv
@@ -479,6 +477,7 @@ export class Entities extends EventEmitter {
       ])
       return {
         mesh,
+        isBlock: false,
         itemsTexture,
         itemsTextureFlipped,
       }
@@ -524,7 +523,7 @@ export class Entities extends EventEmitter {
       if (entity.name === 'item') {
         const item = entity.metadata?.find((m: any) => typeof m === 'object' && m?.itemCount)
         if (item) {
-          const object = this.getItemMesh(item)
+          const object = this.getItemMesh(item, true)
           if (object) {
             mesh = object.mesh
             mesh.scale.set(0.5, 0.5, 0.5)
diff --git a/prismarine-viewer/viewer/lib/holdingBlock.ts b/prismarine-viewer/viewer/lib/holdingBlock.ts
index 7b95f747..42581e81 100644
--- a/prismarine-viewer/viewer/lib/holdingBlock.ts
+++ b/prismarine-viewer/viewer/lib/holdingBlock.ts
@@ -2,6 +2,7 @@ import * as THREE from 'three'
 import * as tweenJs from '@tweenjs/tween.js'
 import worldBlockProvider from 'mc-assets/dist/worldBlockProvider'
 import { GUI } from 'lil-gui'
+import { BlockModel } from 'mc-assets'
 import { getThreeBlockModelGroup, renderBlockThree, setBlockPosition } from './mesher/standaloneRenderer'
 import { getMyHand } from './hand'
 
@@ -265,15 +266,19 @@ export default class HoldingBlock {
       return
     }
     let blockInner
-    if (handItem.type === 'block') {
-      blockInner = getBlockMesh(material, handItem.name, handItem.properties ?? {})
-    } else if (handItem.type === 'item') {
-      const { mesh: itemMesh } = viewer.entities.getItemMesh({
+    if (handItem.type === 'item' || handItem.type === 'block') {
+      const { mesh: itemMesh, isBlock } = viewer.entities.getItemMesh({
         ...handItem.fullItem,
         itemId: handItem.id,
       })!
-      itemMesh.position.set(0.5, 0.5, 0.5)
-      blockInner = itemMesh
+      if (isBlock) {
+        blockInner = itemMesh
+        handItem.type = 'block'
+      } else {
+        itemMesh.position.set(0.5, 0.5, 0.5)
+        blockInner = itemMesh
+        handItem.type = 'item'
+      }
     } else {
       blockInner = await getMyHand()
     }
@@ -408,11 +413,11 @@ export default class HoldingBlock {
   }
 }
 
-export const getBlockMesh = (material: THREE.Material, name: string, properties: Record<string, any>) => {
+export const getBlockMeshFromModel = (material: THREE.Material, model: BlockModel, name: string) => {
   const blockProvider = worldBlockProvider(viewer.world.blockstatesModels, viewer.world.blocksAtlases, 'latest')
-  const models = blockProvider.getAllResolvedModels0_1({
+  const worldRenderModel = blockProvider.transformModel(model, {
     name,
-    properties
-  }, true)
-  return getThreeBlockModelGroup(material, models, undefined, 'plains', loadedData)
+    properties: {}
+  })
+  return getThreeBlockModelGroup(material, [[worldRenderModel]], undefined, 'plains', loadedData)
 }
diff --git a/prismarine-viewer/viewer/lib/mesher/standaloneRenderer.ts b/prismarine-viewer/viewer/lib/mesher/standaloneRenderer.ts
index e01dd669..3d468dce 100644
--- a/prismarine-viewer/viewer/lib/mesher/standaloneRenderer.ts
+++ b/prismarine-viewer/viewer/lib/mesher/standaloneRenderer.ts
@@ -48,7 +48,7 @@ function renderElement (element: BlockElement, doAO: boolean, attr, globalMatrix
 
     const ndx = Math.floor(attr.positions.length / 3)
 
-    const tint = [1, 1, 1]
+    let tint = [1, 1, 1]
     if (eFace.tintindex !== undefined) {
       if (eFace.tintindex === 0) {
         // TODO
@@ -63,6 +63,8 @@ function renderElement (element: BlockElement, doAO: boolean, attr, globalMatrix
         // } else {
         //   tint = tints.grass[biome]
         // }
+        const grassTint = [145 / 255, 189 / 255, 89 / 255]
+        tint = grassTint
       }
     }
 
diff --git a/src/browserfs.ts b/src/browserfs.ts
index 7e66dfe0..a1f00bfb 100644
--- a/src/browserfs.ts
+++ b/src/browserfs.ts
@@ -7,7 +7,7 @@ import * as browserfs from 'browserfs'
 import { options, resetOptions } from './optionsStorage'
 
 import { fsState, loadSave } from './loadSave'
-import { installTexturePack, installTexturePackFromHandle, updateTexturePackInstalledState } from './resourcePack'
+import { installResourcepackPack, installTexturePackFromHandle, updateTexturePackInstalledState } from './resourcePack'
 import { miscUiState } from './globalState'
 import { setLoadingScreenStatus } from './utils'
 const { GoogleDriveFileSystem } = require('google-drive-browserfs/src/backends/GoogleDrive') // disable type checking
@@ -632,7 +632,7 @@ export const openFilePicker = (specificCase?: 'resourcepack') => {
         if (!doContinue) return
       }
       if (specificCase === 'resourcepack') {
-        void installTexturePack(file).catch((err) => {
+        void installResourcepackPack(file).catch((err) => {
           setLoadingScreenStatus(err.message, true)
         })
       } else {
diff --git a/src/downloadAndOpenFile.ts b/src/downloadAndOpenFile.ts
index d4356ca2..9f757796 100644
--- a/src/downloadAndOpenFile.ts
+++ b/src/downloadAndOpenFile.ts
@@ -1,6 +1,6 @@
 import prettyBytes from 'pretty-bytes'
 import { openWorldFromHttpDir, openWorldZip } from './browserfs'
-import { getResourcePackNames, installTexturePack, resourcePackState, updateTexturePackInstalledState } from './resourcePack'
+import { getResourcePackNames, installResourcepackPack, resourcePackState, updateTexturePackInstalledState } from './resourcePack'
 import { setLoadingScreenStatus } from './utils'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 
@@ -74,7 +74,7 @@ const inner = async () => {
   })).arrayBuffer()
   if (texturepack) {
     const name = mapUrl.slice(mapUrl.lastIndexOf('/') + 1).slice(-30)
-    await installTexturePack(buffer, name)
+    await installResourcepackPack(buffer, name)
   } else {
     await openWorldZip(buffer)
   }
diff --git a/src/index.ts b/src/index.ts
index f9d90aac..2fc886d5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -178,9 +178,14 @@ viewer.entities.getItemUv = (item) => {
     const textureThree = renderInfo.texture === 'blocks' ? viewer.world.material.map! : viewer.entities.itemsTexture!
     const img = textureThree.image
 
-    if (renderInfo.blockData || renderInfo.slice) {
+    if (renderInfo.blockData) {
+      return {
+        resolvedModel: renderInfo.blockData.resolvedModel,
+      }
+    }
+    if (renderInfo.slice) {
       // Get slice coordinates from either block or item texture
-      const [x, y, w, h] = renderInfo.blockData ? renderInfo.blockData.left.slice : renderInfo.slice
+      const [x, y, w, h] = renderInfo.slice
       const [u, v, su, sv] = [x / img.width, y / img.height, (w / img.width), (h / img.height)]
       return {
         u, v, su, sv,
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index f2810df8..bfe96739 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -9,6 +9,7 @@ import PItem, { Item } from 'prismarine-item'
 import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
 import { getRenamedData } from 'flying-squid/dist/blockRenames'
 import PrismarineChatLoader from 'prismarine-chat'
+import { BlockModel } from 'mc-assets'
 import Generic95 from '../assets/generic_95.png'
 import { appReplacableResources } from './generated/resources'
 import { activeModalStack, hideCurrentModal, hideModal, miscUiState, showModal } from './globalState'
@@ -175,7 +176,7 @@ const getImage = ({ path = undefined as string | undefined, texture = undefined
 
 export const renderSlot = (slot: GeneralInputItem, debugIsQuickbar = false): {
   texture: string,
-  blockData?: Record<string, { slice, path }>,
+  blockData?: Record<string, { slice, path }> & { resolvedModel: BlockModel },
   scale?: number,
   slice?: number[],
 } | undefined => {
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index c3ede407..dfb195fa 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -9,7 +9,7 @@ import { OptionMeta, OptionSlider } from './react/OptionsItems'
 import Slider from './react/Slider'
 import { getScreenRefreshRate, setLoadingScreenStatus } from './utils'
 import { openFilePicker, resetLocalStorageWithoutWorld } from './browserfs'
-import { completeTexturePackInstall, getResourcePackNames, resourcePackState, uninstallTexturePack } from './resourcePack'
+import { completeTexturePackInstall, getResourcePackNames, resourcePackState, uninstallResourcePack } from './resourcePack'
 import { downloadPacketsReplay, packetsReplaceSessionState } from './packetsReplay'
 import { showOptionsModal } from './react/SelectOption'
 import supportedVersions from './supportedVersions.mjs'
@@ -184,7 +184,7 @@ export const guiOptionsScheme: {
               if (choice === 'Uninstall') {
               // todo make hidable
                 setLoadingScreenStatus('Uninstalling texturepack')
-                await uninstallTexturePack()
+                await uninstallResourcePack()
                 setLoadingScreenStatus(undefined)
               }
             } else {
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 106b0a2f..54a06c25 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -184,7 +184,7 @@ export default ({
   const updateFilteredCompleteItems = (sourceItems: string[]) => {
     const newCompleteItems = sourceItems.filter(item => {
       // this regex is imporatnt is it controls the word matching
-      const compareableParts = item.split(/[_:]/)
+      const compareableParts = item.split(/[[\]{},_:]/)
       const lastWord = chatInput.current.value.slice(0, chatInput.current.selectionEnd ?? chatInput.current.value.length).split(' ').at(-1)!
       return [item, ...compareableParts].some(compareablePart => compareablePart.startsWith(lastWord))
     })
diff --git a/src/react/useLongPress.ts b/src/react/useLongPress.ts
index 49a1dec6..89ced2e0 100644
--- a/src/react/useLongPress.ts
+++ b/src/react/useLongPress.ts
@@ -8,7 +8,7 @@ interface LongPressOptions {
 const useLongPress = (
   onLongPress: () => void,
   onClick: () => void,
-  { shouldPreventDefault = true, delay = 300 }: LongPressOptions = {}
+  { shouldPreventDefault = false, delay = 300 }: LongPressOptions = {}
 ) => {
   const [longPressTriggered, setLongPressTriggered] = useState(false)
   const timeout = useRef<number | undefined>()
@@ -32,11 +32,16 @@ const useLongPress = (
 
   const clear = useCallback(
     (event: React.MouseEvent | React.TouchEvent) => {
-      if (timeout.current) clearTimeout(timeout.current)
-      if (!longPressTriggered) onClick()
+      if (timeout.current) {
+        clearTimeout(timeout.current)
+        timeout.current = undefined
+      }
+
       setLongPressTriggered(false)
+
       if (shouldPreventDefault && target.current) {
         target.current.removeEventListener('touchend', preventDefault)
+        target.current = null
       }
     },
     [shouldPreventDefault, onClick, longPressTriggered]
@@ -47,7 +52,10 @@ const useLongPress = (
     onTouchStart: (e: React.TouchEvent) => start(e),
     onMouseUp: (e: React.MouseEvent) => clear(e),
     onMouseLeave: (e: React.MouseEvent) => clear(e),
-    onTouchEnd: (e: React.TouchEvent) => clear(e)
+    onTouchEnd: (e: React.TouchEvent) => clear(e),
+    onClick (e: React.MouseEvent) {
+      onClick()
+    }
   }
 }
 
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index f8c92277..06bc2ce6 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -31,7 +31,7 @@ const getLoadedImage = async (url: string) => {
 }
 
 const texturePackBasePath = '/data/resourcePacks/'
-export const uninstallTexturePack = async (name = 'default') => {
+export const uninstallResourcePack = async (name = 'default') => {
   if (await existsAsync('/resourcepack/pack.mcmeta')) {
     await removeFileRecursiveAsync('/resourcepack')
     gameAdditionalState.usingServerResourcePack = false
@@ -69,10 +69,11 @@ export const installTexturePackFromHandle = async () => {
   // await completeTexturePackInstall()
 }
 
-export const installTexturePack = async (file: File | ArrayBuffer, displayName = file['name'], name = 'default', isServer = false) => {
+export const installResourcepackPack = async (file: File | ArrayBuffer, displayName = file['name'], name = 'default', isServer = false) => {
+  console.time('processResourcePack')
   const installPath = isServer ? '/resourcepack/' : texturePackBasePath + name
   try {
-    await uninstallTexturePack(name)
+    await uninstallResourcePack(name)
   } catch (err) {
   }
   const showLoader = !isServer
@@ -97,6 +98,7 @@ export const installTexturePack = async (file: File | ArrayBuffer, displayName =
   }
   const createdDirs = new Set<string>()
   const copyTasks = [] as Array<Promise<void>>
+  console.time('resourcePackCopy')
   await Promise.all(allFilesArr.map(async ([path, file]) => {
     const writePath = join(installPath, path)
     if (path.endsWith('/')) return
@@ -115,8 +117,10 @@ export const installTexturePack = async (file: File | ArrayBuffer, displayName =
     done++
     upStatus()
   }))
-  console.log('resource pack install done')
+  console.timeEnd('resourcePackCopy')
   await completeTexturePackInstall(displayName, name, isServer)
+  console.log('resource pack install done')
+  console.timeEnd('processResourcePack')
 }
 
 // or enablement
@@ -348,16 +352,18 @@ const downloadAndUseResourcePack = async (url: string): Promise<void> => {
     resourcePackState.isServerInstalling = true
     resourcePackState.isServerDownloading = true
     console.log('Downloading server resource pack', url)
+    console.time('downloadServerResourcePack')
     const response = await fetch(url).catch((err) => {
       console.log(`Ensure server on ${url} support CORS which is not required for regular client, but is required for the web client`)
       console.error(err)
       showNotification('Failed to download resource pack: ' + err.message)
     })
+    console.timeEnd('downloadServerResourcePack')
     if (!response) return
     resourcePackState.isServerDownloading = false
     const resourcePackData = await response.arrayBuffer()
     showNotification('Installing resource pack...')
-    await installTexturePack(resourcePackData, undefined, undefined, true).catch((err) => {
+    await installResourcepackPack(resourcePackData, undefined, undefined, true).catch((err) => {
       console.error(err)
       showNotification('Failed to install resource pack: ' + err.message)
     })

From 2993bd2e45cdd72bf728c4d465444f880f410041 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 7 Feb 2025 14:16:01 +0300
Subject: [PATCH 196/753] fix bugs with blocks models atlas usage

---
 prismarine-viewer/viewer/lib/entities.ts      |  3 +-
 prismarine-viewer/viewer/lib/holdingBlock.ts  |  4 +-
 .../viewer/lib/worldrendererCommon.ts         | 10 ++--
 .../viewer/lib/worldrendererThree.ts          |  2 +-
 src/index.ts                                  |  1 +
 src/inventoryWindows.ts                       |  4 +-
 src/resourcePack.ts                           |  8 ++--
 src/resourcePackItemDefinitions.ts            | 48 +++++++++++++++++++
 8 files changed, 67 insertions(+), 13 deletions(-)
 create mode 100644 src/resourcePackItemDefinitions.ts

diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index 48efb577..2a0ddeee 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -225,6 +225,7 @@ export class Entities extends EventEmitter {
     size?: number;
   } | {
     resolvedModel: BlockModel
+    modelName: string
   })
 
   constructor (public viewer: Viewer) {
@@ -426,7 +427,7 @@ export class Entities extends EventEmitter {
   getItemMesh (item, isDropped = false) {
     const textureUv = this.getItemUv?.(item)
     if (textureUv && 'resolvedModel' in textureUv) {
-      const mesh = getBlockMeshFromModel(this.viewer.world.material, textureUv.resolvedModel, item.name ?? item.itemId)
+      const mesh = getBlockMeshFromModel(this.viewer.world.material, textureUv.resolvedModel, textureUv.modelName)
       if (isDropped) {
         const SCALE = 0.5
         mesh.scale.set(SCALE, SCALE, SCALE)
diff --git a/prismarine-viewer/viewer/lib/holdingBlock.ts b/prismarine-viewer/viewer/lib/holdingBlock.ts
index 42581e81..641a2813 100644
--- a/prismarine-viewer/viewer/lib/holdingBlock.ts
+++ b/prismarine-viewer/viewer/lib/holdingBlock.ts
@@ -249,7 +249,7 @@ export default class HoldingBlock {
     this.objectOuterGroup.scale.set(scale, scale, scale)
   }
 
-  async initHandObject (material: THREE.Material, blockstatesModels: any, blocksAtlases: any, handItem?: HandItemBlock) {
+  async initHandObject (handItem?: HandItemBlock) {
     let animatingCurrent = false
     if (!this.swingAnimation && !this.blockSwapAnimation && this.isDifferentItem(handItem)) {
       animatingCurrent = true
@@ -414,7 +414,7 @@ export default class HoldingBlock {
 }
 
 export const getBlockMeshFromModel = (material: THREE.Material, model: BlockModel, name: string) => {
-  const blockProvider = worldBlockProvider(viewer.world.blockstatesModels, viewer.world.blocksAtlases, 'latest')
+  const blockProvider = worldBlockProvider(viewer.world.blockstatesModels, viewer.world.blocksAtlasParser!.atlas, 'latest')
   const worldRenderModel = blockProvider.transformModel(model, {
     name,
     properties: {}
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
index 59d22dd9..327298af 100644
--- a/prismarine-viewer/viewer/lib/worldrendererCommon.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererCommon.ts
@@ -117,8 +117,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   itemsAtlasParser: AtlasParser | undefined
   blocksAtlasParser: AtlasParser | undefined
 
-  blocksAtlases = blocksAtlases
-  itemsAtlases = itemsAtlases
+  sourceData = {
+    blocksAtlases,
+    itemsAtlases
+  }
   customTextures: {
     items?: CustomTexturesData
     blocks?: CustomTexturesData
@@ -320,8 +322,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   async updateTexturesData (resourcePackUpdate = false, prioritizeBlockTextures?: string[]) {
-    const blocksAssetsParser = new AtlasParser(this.blocksAtlases, blocksAtlasLatest, blocksAtlasLegacy)
-    const itemsAssetsParser = new AtlasParser(this.itemsAtlases, itemsAtlasLatest, itemsAtlasLegacy)
+    const blocksAssetsParser = new AtlasParser(this.sourceData.blocksAtlases, blocksAtlasLatest, blocksAtlasLegacy)
+    const itemsAssetsParser = new AtlasParser(this.sourceData.itemsAtlases, itemsAtlasLatest, itemsAtlasLegacy)
 
     const blockTexturesChanges = {} as Record<string, string>
     const date = new Date()
diff --git a/prismarine-viewer/viewer/lib/worldrendererThree.ts b/prismarine-viewer/viewer/lib/worldrendererThree.ts
index 1845c98c..cab84b7b 100644
--- a/prismarine-viewer/viewer/lib/worldrendererThree.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererThree.ts
@@ -67,7 +67,7 @@ export class WorldRendererThree extends WorldRendererCommon {
       holdingBlock.toBeRenderedItem = item
       return
     }
-    void holdingBlock.initHandObject(this.material, this.blockstatesModels, this.blocksAtlases, item)
+    void holdingBlock.initHandObject(item)
   }
 
   changeHandSwingingState (isAnimationPlaying: boolean, isLeft = false) {
diff --git a/src/index.ts b/src/index.ts
index 2fc886d5..77db040e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -181,6 +181,7 @@ viewer.entities.getItemUv = (item) => {
     if (renderInfo.blockData) {
       return {
         resolvedModel: renderInfo.blockData.resolvedModel,
+        modelName: renderInfo.modelName!
       }
     }
     if (renderInfo.slice) {
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index bfe96739..931348b5 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -179,6 +179,7 @@ export const renderSlot = (slot: GeneralInputItem, debugIsQuickbar = false): {
   blockData?: Record<string, { slice, path }> & { resolvedModel: BlockModel },
   scale?: number,
   slice?: number[],
+  modelName?: string
 } | undefined => {
   let itemModelName = slot.name
   const originalItemName = itemModelName
@@ -212,7 +213,8 @@ export const renderSlot = (slot: GeneralInputItem, debugIsQuickbar = false): {
     // is block
     return {
       texture: 'blocks',
-      blockData: itemTexture
+      blockData: itemTexture,
+      modelName: itemModelName
     }
   }
 }
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 06bc2ce6..faea8ff7 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -460,11 +460,11 @@ const updateAllReplacableTextures = async () => {
 const repeatArr = (arr, i) => Array.from({ length: i }, () => arr)
 
 const updateTextures = async () => {
-  const blocksFiles = Object.keys(viewer.world.blocksAtlases.latest.textures)
-  const itemsFiles = Object.keys(viewer.world.itemsAtlases.latest.textures)
+  const origBlocksFiles = Object.keys(viewer.world.sourceData.blocksAtlases.latest.textures)
+  const origItemsFiles = Object.keys(viewer.world.sourceData.itemsAtlases.latest.textures)
   const { usedTextures: extraBlockTextures = new Set<string>() } = await prepareBlockstatesAndModels() ?? {}
-  const blocksData = await getResourcepackTiles('blocks', [...blocksFiles, ...extraBlockTextures])
-  const itemsData = await getResourcepackTiles('items', itemsFiles)
+  const blocksData = await getResourcepackTiles('blocks', [...origBlocksFiles, ...extraBlockTextures])
+  const itemsData = await getResourcepackTiles('items', origItemsFiles)
   await updateAllReplacableTextures()
   viewer.world.customTextures = {}
   if (blocksData) {
diff --git a/src/resourcePackItemDefinitions.ts b/src/resourcePackItemDefinitions.ts
new file mode 100644
index 00000000..9ec0b430
--- /dev/null
+++ b/src/resourcePackItemDefinitions.ts
@@ -0,0 +1,48 @@
+import fs from 'fs'
+
+export type ResourcePackItemDefinition = {
+  model: {
+    type: 'minecraft:model'
+    model: string
+    tints?: Array<{
+      type: 'minecraft:constant'
+      value: number // eg 12596533
+    }>
+  } | {
+    type: 'minecraft:empty'
+  }
+}
+
+export type ItemDefinitions = Record<string, ResourcePackItemDefinition>
+
+export type ItemRenderDefinitionInput = {
+  item: string
+}
+
+const readFilesSafe = async (path: string) => {
+  try {
+    return await fs.promises.readdir(path)
+  } catch (error) {
+    return null
+  }
+}
+
+export const readResourcePackItemDefinitions = async (assetsPath: string) => {
+  const namespaces = fs.readdirSync(assetsPath)
+
+  const itemDefinitions: ItemDefinitions = {}
+  for (const namespace of namespaces) {
+    // eslint-disable-next-line no-await-in-loop
+    const items = await readFilesSafe(`${assetsPath}/${namespace}/items`)
+    if (!items) continue
+    for (const item of items) {
+      if (!item.endsWith('.json')) continue
+      const file = fs.readFileSync(`${assetsPath}/${namespace}/items/${item}`, 'utf8')
+      const json = JSON.parse(file)
+      itemDefinitions[`${namespace}:${item}`] = json
+    }
+  }
+  return itemDefinitions
+}
+
+export const itemsDefaultNamespace = 'minecraft'

From d7374a52065a9b2c687b34a381a071159a0bb1cb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 7 Feb 2025 14:23:47 +0300
Subject: [PATCH 197/753] fix tsc

---
 package.json                           |  2 +-
 pnpm-lock.yaml                         | 10 +++++-----
 prismarine-viewer/viewer/lib/viewer.ts |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 0da2d7d9..e91b7ed4 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.30",
+    "mc-assets": "^0.2.31",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ceea217a..0d98ea63 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -346,8 +346,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.30
-        version: 0.2.30
+        specifier: ^0.2.31
+        version: 0.2.31
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -6256,8 +6256,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.30:
-    resolution: {integrity: sha512-ZIpaQpbUJGDXPCdAUuwaGxC0Lmu8tdZTatQG0FnDq3ti2gf2fx28E6EI/+dYvdTnWYoKCl+5sEUe0Na/kavHcg==}
+  mc-assets@0.2.31:
+    resolution: {integrity: sha512-+WAU9+iRbBgWWgsrQ52j0Xqq+Qs7UbjlVtZq1NCTqpIAvaEKNCwM7u2qFV5hoj4RpBAsVmkgLissdjLddE8WaA==}
     engines: {node: '>=18.0.0'}
 
   md5-file@4.0.0:
@@ -16642,7 +16642,7 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.30: {}
+  mc-assets@0.2.31: {}
 
   md5-file@4.0.0: {}
 
diff --git a/prismarine-viewer/viewer/lib/viewer.ts b/prismarine-viewer/viewer/lib/viewer.ts
index 82c3e661..76745284 100644
--- a/prismarine-viewer/viewer/lib/viewer.ts
+++ b/prismarine-viewer/viewer/lib/viewer.ts
@@ -124,7 +124,7 @@ export class Viewer {
   async demoModel () {
     //@ts-expect-error
     const pos = cursorBlockRel(0, 1, 0).position
-    const blockProvider = worldBlockProvider(this.world.blockstatesModels, this.world.blocksAtlases, 'latest')
+    const blockProvider = worldBlockProvider(this.world.blockstatesModels, this.world.blocksAtlasParser!.atlas, 'latest')
 
     const mesh = await getMyHand()
     // mesh.rotation.y = THREE.MathUtils.degToRad(90)

From d295100f3457ccfb027d6addf518985ea8a1e739 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Sat, 8 Feb 2025 08:33:44 +0100
Subject: [PATCH 198/753] fix: skins of NPCs would not get applied properly
 (#265)

feat: heads render texture from properties
---
 prismarine-viewer/examples/scenes/main.ts     |  2 +-
 prismarine-viewer/viewer/lib/entities.ts      | 58 ++++++++++++++-----
 .../viewer/lib/entity/EntityMesh.js           | 36 ++++++++----
 .../viewer/lib/entity/armorModels.json        | 46 +++++++++++++++
 prismarine-viewer/viewer/lib/mesher/models.ts | 15 +++++
 prismarine-viewer/viewer/lib/mesher/shared.ts |  1 +
 .../viewer/lib/worldrendererThree.ts          | 43 +++++++++++++-
 src/entities.ts                               | 14 +++--
 8 files changed, 180 insertions(+), 35 deletions(-)

diff --git a/prismarine-viewer/examples/scenes/main.ts b/prismarine-viewer/examples/scenes/main.ts
index d7d2f8e0..0aca157e 100644
--- a/prismarine-viewer/examples/scenes/main.ts
+++ b/prismarine-viewer/examples/scenes/main.ts
@@ -112,7 +112,7 @@ class MainScene extends BasePlaygroundScene {
       this.entityUpdateShared()
       if (!this.params.entity) return
       if (this.params.entity === 'player') {
-        viewer.entities.updatePlayerSkin('id', viewer.entities.entities.id.username, true, true)
+        viewer.entities.updatePlayerSkin('id', viewer.entities.entities.id.username, undefined, true, true)
         viewer.entities.playAnimation('id', 'running')
       }
       // let prev = false
diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index 2a0ddeee..f1e47d24 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -201,6 +201,7 @@ export type SceneEntity = THREE.Object3D & {
     animation?: PlayerAnimation
   }
   username?: string
+  uuid?: string
   additionalCleanup?: () => void
 }
 
@@ -284,18 +285,18 @@ export class Entities extends EventEmitter {
   // fixme workaround
   defaultSteveTexture
 
-  usernamePerSkinUrlsCache = {} as Record<string, { skinUrl?: string, capeUrl?: string }>
+  uuidPerSkinUrlsCache = {} as Record<string, { skinUrl?: string, capeUrl?: string }>
 
   // true means use default skin url
-  updatePlayerSkin (entityId: string | number, username: string | undefined, skinUrl: string | true, capeUrl: string | true | undefined = undefined) {
-    if (username) {
-      if (typeof skinUrl === 'string' || typeof capeUrl === 'string') this.usernamePerSkinUrlsCache[username] = {}
-      if (typeof skinUrl === 'string') this.usernamePerSkinUrlsCache[username].skinUrl = skinUrl
-      if (typeof capeUrl === 'string') this.usernamePerSkinUrlsCache[username].capeUrl = capeUrl
+  updatePlayerSkin (entityId: string | number, username: string | undefined, uuid: string | undefined, skinUrl: string | true, capeUrl: string | true | undefined = undefined) {
+    if (uuid) {
+      if (typeof skinUrl === 'string' || typeof capeUrl === 'string') this.uuidPerSkinUrlsCache[uuid] = {}
+      if (typeof skinUrl === 'string') this.uuidPerSkinUrlsCache[uuid].skinUrl = skinUrl
+      if (typeof capeUrl === 'string') this.uuidPerSkinUrlsCache[uuid].capeUrl = capeUrl
       if (skinUrl === true) {
-        skinUrl = this.usernamePerSkinUrlsCache[username]?.skinUrl ?? skinUrl
+        skinUrl = this.uuidPerSkinUrlsCache[uuid]?.skinUrl ?? skinUrl
       }
-      capeUrl ??= this.usernamePerSkinUrlsCache[username]?.capeUrl
+      capeUrl ??= this.uuidPerSkinUrlsCache[uuid]?.capeUrl
     }
 
     let playerObject = this.getPlayerObject(entityId)
@@ -609,7 +610,7 @@ export class Entities extends EventEmitter {
       this.emit('add', entity)
 
       if (isPlayerModel) {
-        this.updatePlayerSkin(entity.id, '', overrides?.texture || stevePng)
+        this.updatePlayerSkin(entity.id, entity.username, entity.uuid, overrides?.texture || stevePng)
       }
       this.setDebugMode(this.debugMode, group)
       this.setRendering(this.rendering, group)
@@ -901,15 +902,38 @@ function addArmorModel (entityMesh: THREE.Object3D, slotType: string, item: Item
     return
   }
   const itemParts = item.name.split('_')
-  const armorMaterial = itemParts[0]
-  if (!armorMaterial) {
+  let texturePath
+  const isPlayerHead = slotType === 'head' && item.name === 'player_head'
+  if (isPlayerHead) {
     removeArmorModel(entityMesh, slotType)
-    return
+    if (item.nbt) {
+      const itemNbt = nbt.simplify(item.nbt)
+      try {
+        let textureData
+        if (itemNbt.SkullOwner) {
+          textureData = itemNbt.SkullOwner.Properties.textures[0]?.Value
+        } else {
+          textureData = itemNbt['minecraft:profile']?.Properties?.find(p => p.name === 'textures')?.value
+        }
+        if (textureData) {
+          const decodedData = JSON.parse(Buffer.from(textureData, 'base64').toString())
+          texturePath = decodedData.textures?.SKIN?.url
+        }
+      } catch (err) {
+        console.error('Error decoding player head texture:', err)
+      }
+    } else {
+      texturePath = stevePng
+    }
+  }
+  const armorMaterial = itemParts[0]
+  if (!texturePath) {
+    // TODO: Support resource pack
+    // TODO: Support mirroring on certain parts of the model
+    texturePath = armorModels[`${armorMaterial}Layer${layer}${overlay ? 'Overlay' : ''}`]
   }
-  // TODO: Support resource pack
-  // TODO: Support mirroring on certain parts of the model
-  const texturePath = armorModels[`${armorMaterial}Layer${layer}${overlay ? 'Overlay' : ''}`]
   if (!texturePath || !armorModels.armorModel[slotType]) {
+    removeArmorModel(entityMesh, slotType)
     return
   }
 
@@ -930,7 +954,9 @@ function addArmorModel (entityMesh: THREE.Object3D, slotType: string, item: Item
     mesh = getMesh(viewer.world, texturePath, armorModels.armorModel[slotType])
     mesh.name = meshName
     material = mesh.material
-    material.side = THREE.DoubleSide
+    if (!isPlayerHead) {
+      material.side = THREE.DoubleSide
+    }
   }
   if (armorMaterial === 'leather' && !overlay) {
     const color = (item.nbt?.value as any)?.display?.value?.color?.value
diff --git a/prismarine-viewer/viewer/lib/entity/EntityMesh.js b/prismarine-viewer/viewer/lib/entity/EntityMesh.js
index 9033489a..141e25c2 100644
--- a/prismarine-viewer/viewer/lib/entity/EntityMesh.js
+++ b/prismarine-viewer/viewer/lib/entity/EntityMesh.js
@@ -239,22 +239,30 @@ export function getMesh(worldRenderer, texture, jsonModel, overrides = {}) {
   mesh.scale.set(1 / 16, 1 / 16, 1 / 16)
 
   if (textureOffset) {
-    texture = worldRenderer.material.map.clone()
-    texture.offset.set(textureOffset[0], textureOffset[1])
-    texture.needsUpdate = true
-    material.map = texture
+    const loadedTexture = worldRenderer.material.map.clone()
+    loadedTexture.offset.set(textureOffset[0], textureOffset[1])
+    loadedTexture.needsUpdate = true
+    material.map = loadedTexture
   } else {
-    loadTexture(texture.endsWith('.png') || texture.startsWith('data:image/') ? texture : texture + '.png', texture => {
+    loadTexture(texture, loadedTexture => {
       if (material.map) {
         // texture is already loaded
         return
       }
-      texture.magFilter = THREE.NearestFilter
-      texture.minFilter = THREE.NearestFilter
-      texture.flipY = false
-      texture.wrapS = THREE.RepeatWrapping
-      texture.wrapT = THREE.RepeatWrapping
-      material.map = texture
+      loadedTexture.magFilter = THREE.NearestFilter
+      loadedTexture.minFilter = THREE.NearestFilter
+      loadedTexture.flipY = false
+      loadedTexture.wrapS = THREE.RepeatWrapping
+      loadedTexture.wrapT = THREE.RepeatWrapping
+      material.map = loadedTexture
+      const actualWidth = loadedTexture.image?.width
+      if (actualWidth && textureWidth !== actualWidth) {
+        loadedTexture.repeat.x = textureWidth / actualWidth
+      }
+      const actualHeight = loadedTexture.image?.height
+      if (actualHeight && textureHeight !== actualHeight) {
+        loadedTexture.repeat.y = textureHeight / actualHeight
+      }
     })
   }
 
@@ -419,7 +427,11 @@ export class EntityMesh {
       const texture = overrides.textures?.[name] ?? e.textures[name]
       if (!texture) continue
       // console.log(JSON.stringify(jsonModel, null, 2))
-      const mesh = getMesh(worldRenderer, texture, jsonModel, overrides)
+      const mesh = getMesh(worldRenderer,
+        texture.endsWith('.png') || texture.startsWith('data:image/') || texture.startsWith('block:')
+          ? texture : texture + '.png',
+        jsonModel,
+        overrides)
       mesh.name = `geometry_${name}`
       this.mesh.add(mesh)
 
diff --git a/prismarine-viewer/viewer/lib/entity/armorModels.json b/prismarine-viewer/viewer/lib/entity/armorModels.json
index 3632bad1..a9737725 100644
--- a/prismarine-viewer/viewer/lib/entity/armorModels.json
+++ b/prismarine-viewer/viewer/lib/entity/armorModels.json
@@ -1,4 +1,37 @@
 {
+  "skull": {
+    "bones": [
+      {
+        "name": "head",
+        "pivot": [0, 12, 0],
+        "cubes": [
+          {
+            "origin": [-4, 0, -4],
+            "size": [8, 8, 8],
+            "uv": [0, 0],
+            "inflate": 1
+          }
+        ]
+      },
+      {
+        "name": "overlay",
+        "parent": "head",
+        "pivot": [0, 12, 0],
+        "cubes": [
+          {
+            "origin": [-4, 0, -4],
+            "size": [8, 8, 8],
+            "uv": [32, 0],
+            "inflate": 1.2
+          }
+        ]
+      }
+    ],
+    "visible_bounds_width": 1.5,
+    "visible_bounds_offset": [0, 0.5, 0],
+    "texturewidth": 64,
+    "textureheight": 32
+  },
   "head": {
     "bones": [
       {"name": "armor", "pivot": [0, 12, 0]},
@@ -14,6 +47,19 @@
             "inflate": 1
           }
         ]
+      },
+      {
+        "name": "overlay",
+        "parent": "head",
+        "pivot": [0, 12, 0],
+        "cubes": [
+          {
+            "origin": [-4, 23, -4],
+            "size": [8, 8, 8],
+            "uv": [32, 0],
+            "inflate": 1.2
+          }
+        ]
       }
     ],
     "visible_bounds_width": 1.5,
diff --git a/prismarine-viewer/viewer/lib/mesher/models.ts b/prismarine-viewer/viewer/lib/mesher/models.ts
index 84c591a1..80fff2a0 100644
--- a/prismarine-viewer/viewer/lib/mesher/models.ts
+++ b/prismarine-viewer/viewer/lib/mesher/models.ts
@@ -460,6 +460,7 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
     indices: [],
     tiles: {},
     // todo this can be removed here
+    heads: {},
     signs: {},
     // isFull: true,
     highestBlocks: new Map<string, HighestBlockInfo>([]),
@@ -495,6 +496,20 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
             isHanging,
             rotation: isWall ? facingRotationMap[props.facing] : +props.rotation
           }
+        } else if (block.name === 'player_head' || block.name === 'player_wall_head') {
+          const key = `${cursor.x},${cursor.y},${cursor.z}`
+          const props: any = block.getProperties()
+          const facingRotationMap = {
+            'north': 0,
+            'south': 2,
+            'west': 3,
+            'east': 1
+          }
+          const isWall = block.name === 'player_wall_head'
+          attr.heads[key] = {
+            isWall,
+            rotation: isWall ? facingRotationMap[props.facing] : +props.rotation
+          }
         }
         const biome = block.biome.name
 
diff --git a/prismarine-viewer/viewer/lib/mesher/shared.ts b/prismarine-viewer/viewer/lib/mesher/shared.ts
index 57d7d6a4..f3f5c2cc 100644
--- a/prismarine-viewer/viewer/lib/mesher/shared.ts
+++ b/prismarine-viewer/viewer/lib/mesher/shared.ts
@@ -30,6 +30,7 @@ export type MesherGeometryOutput = {
 
   indices: number[],
   tiles: Record<string, BlockType>,
+  heads: Record<string, any>,
   signs: Record<string, any>,
   // isFull: boolean
   highestBlocks: Map<string, HighestBlockInfo>
diff --git a/prismarine-viewer/viewer/lib/worldrendererThree.ts b/prismarine-viewer/viewer/lib/worldrendererThree.ts
index cab84b7b..b0efca7d 100644
--- a/prismarine-viewer/viewer/lib/worldrendererThree.ts
+++ b/prismarine-viewer/viewer/lib/worldrendererThree.ts
@@ -12,6 +12,8 @@ import { disposeObject } from './threeJsUtils'
 import HoldingBlock, { HandItemBlock } from './holdingBlock'
 import { addNewStat } from './ui/newStats'
 import { MesherGeometryOutput } from './mesher/shared'
+import { getMesh } from './entity/EntityMesh'
+import { armorModel } from './entity/armorModels'
 
 export class WorldRendererThree extends WorldRendererCommon {
   interactionLines: null | { blockPos; mesh } = null
@@ -188,14 +190,24 @@ export class WorldRendererThree extends WorldRendererCommon {
     // should not compute it once
     if (Object.keys(data.geometry.signs).length) {
       for (const [posKey, { isWall, isHanging, rotation }] of Object.entries(data.geometry.signs)) {
-        const [x, y, z] = posKey.split(',')
         const signBlockEntity = this.blockEntities[posKey]
         if (!signBlockEntity) continue
+        const [x, y, z] = posKey.split(',')
         const sign = this.renderSign(new Vec3(+x, +y, +z), rotation, isWall, isHanging, nbt.simplify(signBlockEntity))
         if (!sign) continue
         object.add(sign)
       }
     }
+    if (Object.keys(data.geometry.heads).length) {
+      for (const [posKey, { isWall, rotation }] of Object.entries(data.geometry.heads)) {
+        const headBlockEntity = this.blockEntities[posKey]
+        if (!headBlockEntity) continue
+        const [x, y, z] = posKey.split(',')
+        const head = this.renderHead(new Vec3(+x, +y, +z), rotation, isWall, nbt.simplify(headBlockEntity))
+        if (!head) continue
+        object.add(head)
+      }
+    }
     this.sectionObjects[data.key] = object
     this.updatePosDataChunk(data.key)
     object.matrixAutoUpdate = false
@@ -246,6 +258,35 @@ export class WorldRendererThree extends WorldRendererCommon {
     }
   }
 
+  renderHead (position: Vec3, rotation: number, isWall: boolean, blockEntity) {
+    const textures = blockEntity.SkullOwner?.Properties?.textures[0]
+    if (!textures) return
+
+    try {
+      const textureData = JSON.parse(Buffer.from(textures.Value, 'base64').toString())
+      const skinUrl = textureData.textures?.SKIN?.url
+
+      const mesh = getMesh(this, skinUrl, armorModel.head)
+      const group = new THREE.Group()
+      if (isWall) {
+        mesh.position.set(0, 0.3125, 0.3125)
+      }
+      // move head model down as armor have a different offset than blocks
+      mesh.position.y -= 23 / 16
+      group.add(mesh)
+      group.position.set(position.x + 0.5, position.y + 0.045, position.z + 0.5)
+      group.rotation.set(
+        0,
+        -THREE.MathUtils.degToRad(rotation * (isWall ? 90 : 45 / 2)),
+        0
+      )
+      group.scale.set(0.8, 0.8, 0.8)
+      return group
+    } catch (err) {
+      console.error('Error decoding player texture:', err)
+    }
+  }
+
   renderSign (position: Vec3, rotation: number, isWall: boolean, isHanging: boolean, blockEntity) {
     const tex = this.getSignTexture(position, blockEntity)
 
diff --git a/src/entities.ts b/src/entities.ts
index 4e3a73fb..c4713a92 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -115,7 +115,7 @@ customEvents.on('gameLoaded', () => {
       if (viewer.entities.entities[e.id]) {
         if (loadedSkinEntityIds.has(e.id)) return
         loadedSkinEntityIds.add(e.id)
-        viewer.entities.updatePlayerSkin(e.id, e.username, true, true)
+        viewer.entities.updatePlayerSkin(e.id, e.username, e.uuid, true, true)
       }
     }
   }
@@ -156,8 +156,12 @@ customEvents.on('gameLoaded', () => {
 
   // Texture override from packet properties
   bot._client.on('player_info', (packet) => {
-    for (const player of packet.data) {
-      const textureProperty = player.properties?.find(prop => prop.name === 'textures')
+    for (const playerEntry of packet.data) {
+      if (!playerEntry.player && !playerEntry.properties) continue
+      let textureProperty = playerEntry.properties?.find(prop => prop?.name === 'textures')
+      if (!textureProperty) {
+        textureProperty = playerEntry.player?.properties?.find(prop => prop?.key === 'textures')
+      }
       if (textureProperty) {
         try {
           const textureData = JSON.parse(Buffer.from(textureProperty.value, 'base64').toString())
@@ -167,13 +171,13 @@ customEvents.on('gameLoaded', () => {
           // Find entity with matching UUID and update skin
           let entityId = ''
           for (const [entId, entity] of Object.entries(bot.entities)) {
-            if (entity.uuid === player.UUID) {
+            if (entity.uuid === playerEntry.uuid) {
               entityId = entId
               break
             }
           }
           // even if not found, still record to cache
-          viewer.entities.updatePlayerSkin(entityId, player.name, skinUrl, capeUrl)
+          viewer.entities.updatePlayerSkin(entityId, playerEntry.player?.name, playerEntry.uuid, skinUrl, capeUrl)
         } catch (err) {
           console.error('Error decoding player texture:', err)
         }

From a0bf1e6a71e4097fb200e2840c0dc41d52685842 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 8 Feb 2025 11:43:08 +0300
Subject: [PATCH 199/753] fix: fix critical bug with joystick when opening
 other ui feat: add history tracking of ever connected servers

- Implement server connection history tracking in localStorage
- Update server connection UI with autocomplete and history suggestions
- Refactor connection logic to use new server address parsing
- Improve touch joystick handling with more robust state management
---
 package.json                         |  1 -
 src/index.ts                         | 43 ++++++++++-----------
 src/react/AddServerOrConnect.tsx     |  2 +-
 src/react/GameInteractionOverlay.tsx | 58 ++++++++++++++++++++++------
 src/react/ServersList.tsx            | 47 +++++++++++++++++-----
 src/react/ServersListProvider.tsx    | 46 ++++++++++++++++++++--
 src/utils.ts                         | 52 +++++++++++++++++++++++++
 7 files changed, 199 insertions(+), 50 deletions(-)

diff --git a/package.json b/package.json
index e91b7ed4..869ecbec 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
     "check-build": "tsx scripts/genShims.ts && tsc && pnpm build",
     "test:cypress": "cypress run",
     "test:cypress:open": "cypress open",
-    "test:cypress:open": "cypress open",
     "test-unit": "vitest",
     "test:e2e": "start-test http-get://localhost:8080 test:cypress",
     "prod-start": "node server.js --prod",
diff --git a/src/index.ts b/src/index.ts
index 77db040e..3e5c4bed 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -60,7 +60,7 @@ import {
 } from './globalState'
 
 import {
-  pointerLock, setLoadingScreenStatus
+  pointerLock, setLoadingScreenStatus, parseServerAddress
 } from './utils'
 import { isCypress } from './standaloneUtils'
 
@@ -93,7 +93,7 @@ import './water'
 import { ConnectOptions, downloadMcDataOnConnect, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData } from './connect'
 import { ref, subscribe } from 'valtio'
 import { signInMessageState } from './react/SignInMessageProvider'
-import { updateAuthenticatedAccountData, updateLoadedServerData } from './react/ServersListProvider'
+import { updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/ServersListProvider'
 import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
 import packetsPatcher from './packetsPatcher'
 import { mainMenuState } from './react/MainMenuRenderApp'
@@ -105,6 +105,7 @@ import { getWebsocketStream } from './mineflayer/websocket-core'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 import { updateCursor } from './cameraRotationControls'
 import { pingServerVersion } from './mineflayer/minecraft-protocol-extra'
+import { states } from 'minecraft-protocol'
 
 window.debug = debug
 window.THREE = THREE
@@ -255,18 +256,6 @@ const removeAllListeners = () => {
   listeners = []
 }
 
-const cleanConnectIp = (host: string | undefined, defaultPort: string | undefined) => {
-  const hostPort = host && /:\d+$/.exec(host)
-  if (hostPort) {
-    return {
-      host: host.slice(0, -hostPort[0].length),
-      port: hostPort[0].slice(1)
-    }
-  } else {
-    return { host, port: defaultPort }
-  }
-}
-
 export async function connect (connectOptions: ConnectOptions) {
   if (miscUiState.gameLoaded) return
   miscUiState.hasErrors = false
@@ -277,9 +266,17 @@ export async function connect (connectOptions: ConnectOptions) {
   const p2pMultiplayer = !!connectOptions.peerId
   miscUiState.singleplayer = singleplayer
   miscUiState.flyingSquid = singleplayer || p2pMultiplayer
+
+  // Track server connection in history
+  if (!singleplayer && !p2pMultiplayer && connectOptions.server) {
+    const parsedServer = parseServerAddress(connectOptions.server)
+    updateServerConnectionHistory(parsedServer.host, connectOptions.botVersion)
+  }
+
   const { renderDistance: renderDistanceSingleplayer, multiplayerRenderDistance } = options
-  const isWebSocket = connectOptions.server?.startsWith('ws://') || connectOptions.server?.startsWith('wss://')
-  const server = isWebSocket ? { host: connectOptions.server, port: undefined } : cleanConnectIp(connectOptions.server, '25565')
+
+  const parsedServer = parseServerAddress(connectOptions.server)
+  const server = { host: parsedServer.host, port: parsedServer.port }
   if (connectOptions.proxy?.startsWith(':')) {
     connectOptions.proxy = `${location.protocol}//${location.hostname}${connectOptions.proxy}`
   }
@@ -287,7 +284,8 @@ export async function connect (connectOptions: ConnectOptions) {
     const https = connectOptions.proxy.startsWith('https://') || location.protocol === 'https:'
     connectOptions.proxy = `${connectOptions.proxy}:${https ? 443 : 80}`
   }
-  const proxy = cleanConnectIp(connectOptions.proxy, undefined)
+  const parsedProxy = parseServerAddress(connectOptions.proxy)
+  const proxy = { host: parsedProxy.host, port: parsedProxy.port }
   let { username } = connectOptions
 
   if (connectOptions.server) {
@@ -332,8 +330,7 @@ export async function connect (connectOptions: ConnectOptions) {
   }
   let lastPacket = undefined as string | undefined
   const onPossibleErrorDisconnect = () => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
-    if (lastPacket && bot?._client && bot._client.state !== 'play') {
+    if (lastPacket && bot?._client && bot._client.state !== states.PLAY) {
       appStatusState.descriptionHint = `Last Server Packet: ${lastPacket}`
     }
   }
@@ -371,7 +368,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
   let clientDataStream
 
-  if (proxy && !connectOptions.viewerWsConnect && !isWebSocket) {
+  if (proxy && !connectOptions.viewerWsConnect && !parsedServer.isWebSocket) {
     console.log(`using proxy ${proxy.host}:${proxy.port || location.port}`)
     net['setProxy']({ hostname: proxy.host, port: proxy.port })
   }
@@ -458,7 +455,7 @@ export async function connect (connectOptions: ConnectOptions) {
       if (!finalVersion) {
         const versionAutoSelect = getVersionAutoSelect()
         setLoadingScreenStatus(`Fetching server version. Preffered: ${versionAutoSelect}`)
-        const autoVersionSelect = await getServerInfo(server.host!, server.port ? Number(server.port) : undefined, versionAutoSelect)
+        const autoVersionSelect = await getServerInfo(server.host, server.port ? Number(server.port) : undefined, versionAutoSelect)
         finalVersion = autoVersionSelect.version
       }
       initialLoadingText = `Connecting to server ${server.host} with version ${finalVersion}`
@@ -467,8 +464,8 @@ export async function connect (connectOptions: ConnectOptions) {
     }
     setLoadingScreenStatus(initialLoadingText)
 
-    if (isWebSocket) {
-      clientDataStream = (await getWebsocketStream(server.host!)).mineflayerStream
+    if (parsedServer.isWebSocket) {
+      clientDataStream = (await getWebsocketStream(server.host)).mineflayerStream
     }
 
     let newTokensCacheResult = null as any
diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index c6ba7eba..a9415204 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -227,7 +227,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
             onClick={() => {
               onQsConnect?.(commonUseOptions)
             }}
-          >Connect</ButtonWrapper>
+          ><strong>Connect</strong></ButtonWrapper>
         </div>}
       </div>
     </form>
diff --git a/src/react/GameInteractionOverlay.tsx b/src/react/GameInteractionOverlay.tsx
index c3126f8e..02c2e3b4 100644
--- a/src/react/GameInteractionOverlay.tsx
+++ b/src/react/GameInteractionOverlay.tsx
@@ -1,4 +1,4 @@
-import { useRef } from 'react'
+import { useRef, useEffect } from 'react'
 import { subscribe, useSnapshot } from 'valtio'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { options } from '../optionsStorage'
@@ -11,9 +11,18 @@ import { handleMovementStickDelta, joystickPointer } from './TouchAreasControls'
 /** after what time of holding the finger start breaking the block */
 const touchStartBreakingBlockMs = 500
 
-function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
+function GameInteractionOverlayInner ({
+  zIndex,
+  setJoystickOrigin,
+  updateJoystick
+}: {
+  zIndex: number,
+  setJoystickOrigin: (e: PointerEvent | null) => void
+  updateJoystick: (e: PointerEvent) => void
+}) {
   const overlayRef = useRef<HTMLDivElement>(null)
 
+
   useUtilsEffect(({ signal }) => {
     if (!overlayRef.current) return
 
@@ -46,11 +55,7 @@ function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
       if (usingModernMovement) {
         if (!joystickPointer.pointer && e.clientX < window.innerWidth / 2) {
           cameraControlEl.setPointerCapture(e.pointerId)
-          joystickPointer.pointer = {
-            pointerId: e.pointerId,
-            x: e.clientX,
-            y: e.clientY
-          }
+          setJoystickOrigin(e)
           return
         }
       }
@@ -86,7 +91,7 @@ function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
         (e.pointerType === 'touch' || e.pointerType === 'pen')
 
       if (e.pointerId === joystickPointer.pointer?.pointerId) {
-        handleMovementStickDelta(e)
+        updateJoystick(e)
         if (supportsPressure && (e as any).pressure > 0.5) {
           bot.setControlState('sprint', true)
         }
@@ -134,8 +139,7 @@ function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
     const pointerUpHandler = (e: PointerEvent) => {
       if (e.pointerId === undefined) return
       if (e.pointerId === joystickPointer.pointer?.pointerId) {
-        handleMovementStickDelta()
-        joystickPointer.pointer = null
+        setJoystickOrigin(null)
         return
       }
       if (e.pointerId !== capturedPointer.active?.id) return
@@ -224,11 +228,17 @@ function GameInteractionOverlayInner ({ zIndex }: { zIndex: number }) {
         window.visualViewport?.dispatchEvent(new Event('resize'))
       }, 100)
     }
-  }, [])
+
+    signal.addEventListener('abort', () => {
+      setJoystickOrigin(null)
+    })
+  }, [setJoystickOrigin])
 
   return (
     <OverlayElement divRef={overlayRef} zIndex={zIndex} />
   )
+
+
 }
 
 const OverlayElement = ({ divRef, zIndex }: { divRef: React.RefObject<HTMLDivElement>, zIndex: number }) => {
@@ -251,8 +261,32 @@ const OverlayElement = ({ divRef, zIndex }: { divRef: React.RefObject<HTMLDivEle
 export default function GameInteractionOverlay ({ zIndex }: { zIndex: number }) {
   const modalStack = useSnapshot(activeModalStack)
   const { currentTouch } = useSnapshot(miscUiState)
+
+  const setJoystickOrigin = useRef((e: PointerEvent | null) => {
+    if (!e) {
+      handleMovementStickDelta()
+      joystickPointer.pointer = null
+      return
+    }
+
+    joystickPointer.pointer = {
+      pointerId: e.pointerId,
+      x: e.clientX,
+      y: e.clientY
+    }
+  }).current
+
+  const updateJoystick = useRef((e: PointerEvent) => {
+    handleMovementStickDelta(e)
+  }).current
+
   if (modalStack.length > 0 || !currentTouch) return null
-  return <GameInteractionOverlayInner zIndex={zIndex} />
+  return <GameInteractionOverlayInner
+    zIndex={zIndex}
+    setJoystickOrigin={setJoystickOrigin}
+    updateJoystick={updateJoystick}
+  />
+
 }
 
 subscribe(activeModalStack, () => {
diff --git a/src/react/ServersList.tsx b/src/react/ServersList.tsx
index cc75e037..cc721f79 100644
--- a/src/react/ServersList.tsx
+++ b/src/react/ServersList.tsx
@@ -1,8 +1,11 @@
 import React from 'react'
+import { parseServerAddress } from '../utils'
+import { getServerConnectionHistory } from './ServersListProvider'
 import Singleplayer from './Singleplayer'
 import Input from './Input'
 import Button from './Button'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+
 import Select from './Select'
 import { BaseServerInfo } from './AddServerOrConnect'
 import { useIsSmallWidth } from './simpleHooks'
@@ -18,6 +21,11 @@ interface Props extends React.ComponentProps<typeof Singleplayer> {
   setUsername: (username: string) => void
   onProfileClick?: () => void
   setQuickConnectIp?: (ip: string) => void
+  serverHistory?: Array<{
+    ip: string
+    versionOverride?: string
+    numConnects: number
+  }>
 }
 
 export interface SavedProxiesLocalStorage {
@@ -33,6 +41,13 @@ type ProxyStatusResult = {
 
 export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer, username, setUsername, onProfileClick, setQuickConnectIp, ...props }: Props) => {
   const [proxies, setProxies] = React.useState(initialProxies)
+  const [connectionHistory] = React.useState(() => getServerConnectionHistory()
+    .sort((a, b) => b.numConnects - a.numConnects)
+    .map(server => ({
+      ip: server.ip,
+      versionOverride: server.version,
+      numConnects: server.numConnects
+    })))
 
   const updateProxies = (newData: SavedProxiesLocalStorage) => {
     setProxies(newData)
@@ -60,21 +75,18 @@ export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer,
     firstRowChildrenOverride={<form
       style={{ width: '100%', display: 'flex', justifyContent: 'center' }} onSubmit={(e) => {
         e.preventDefault()
-        let ip = serverIp
-        let version
+        const ip = serverIp
         let msAuth = false
         const parts = ip.split(':')
         if (parts.at(-1) === 'ms') {
           msAuth = true
           parts.pop()
         }
-        if (parts.length > 1 && parts.at(-1)!.includes('.')) {
-          version = parts.at(-1)!
-          ip = parts.slice(0, -1).join(':')
-        }
+
+        const parsed = parseServerAddress(parts.join(':'))
         joinServer({
-          ip,
-          versionOverride: version,
+          ip: parsed.host,
+          versionOverride: parsed.version,
           authenticatedAccountOverride: msAuth ? true : undefined, // todo popup selector
         }, {
           shouldSave: save,
@@ -97,7 +109,17 @@ export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer,
             setServerIp(value)
           }}
           width={isSmallWidth ? 120 : 180}
+          list="server-history"
+          autoComplete="on"
+          autoCorrect="off"
+          autoCapitalize="off"
+          spellCheck="false"
         />
+        <datalist id="server-history">
+          {connectionHistory.map((server) => (
+            <option key={server.ip} value={`${server.ip}${server.versionOverride ? `:${server.versionOverride}` : ''}`} />
+          ))}
+        </datalist>
         <label style={{ fontSize: 10, display: 'flex', alignItems: 'center', gap: 5, height: '100%', marginTop: '-1px' }}>
           <input
             type='checkbox' checked={save}
@@ -128,7 +150,14 @@ export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer,
             }}
           />
           <PixelartIcon iconName='user' styles={{ fontSize: 14, color: 'lightgray', marginLeft: 2 }} onClick={onProfileClick} />
-          <Input rootStyles={{ width: 80 }} value={username} onChange={({ target: { value } }) => setUsername(value)} />
+          <Input
+            rootStyles={{ width: 80 }}
+            value={username}
+            onChange={({ target: { value } }) => setUsername(value)}
+            autoCorrect="off"
+            autoCapitalize="off"
+            spellCheck="false"
+          />
         </div>
       </div>
     }
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 6d6b2eb6..74ea0cf1 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -20,6 +20,7 @@ export interface StoreServerItem extends BaseServerInfo {
   description?: string
   optionsOverride?: Record<string, any>
   autoLogin?: Record<string, string>
+  numConnects?: number // Track number of connections
 }
 
 type AdditionalDisplayData = {
@@ -115,6 +116,43 @@ export const updateAuthenticatedAccountData = (callback: (data: AuthenticatedAcc
   localStorage['authenticatedAccounts'] = JSON.stringify(newAccounts)
 }
 
+interface ServerConnectionHistory {
+  ip: string
+  numConnects: number
+  lastConnected: number
+  version?: string
+}
+
+export function updateServerConnectionHistory (ip: string, version?: string) {
+  try {
+    const history: ServerConnectionHistory[] = JSON.parse(localStorage.getItem('serverConnectionHistory') || '[]')
+    const existingServer = history.find(s => s.ip === ip)
+    if (existingServer) {
+      existingServer.numConnects++
+      existingServer.lastConnected = Date.now()
+      if (version) existingServer.version = version
+    } else {
+      history.push({
+        ip,
+        numConnects: 1,
+        lastConnected: Date.now(),
+        version
+      })
+    }
+    localStorage.setItem('serverConnectionHistory', JSON.stringify(history))
+  } catch (err) {
+    console.error('Failed to update server connection history:', err)
+  }
+}
+
+export function getServerConnectionHistory (): ServerConnectionHistory[] {
+  try {
+    return JSON.parse(localStorage.getItem('serverConnectionHistory') || '[]')
+  } catch {
+    return []
+  }
+}
+
 // todo move to base
 const normalizeIp = (ip: string) => ip.replace(/https?:\/\//, '').replace(/\/(:|$)/, '')
 
@@ -351,9 +389,9 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
               ip,
               lastJoined: Date.now(),
               versionOverride: overrides.versionOverride,
+              numConnects: 1
             }]
-            // setServersList(newServersList)
-            setNewServersList(newServersList) // component is not mounted
+            setNewServersList(newServersList)
             miscUiState.loadedServerIndex = (newServersList.length - 1).toString()
           }
 
@@ -362,8 +400,8 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
             const server = serversList.find(s => s.ip === ip)
             if (server) {
               server.lastJoined = Date.now()
-              // setServersList([...serversList])
-              setNewServersList(serversList) // component is not mounted
+              server.numConnects = (server.numConnects || 0) + 1
+              setNewServersList(serversList)
             }
           }
 
diff --git a/src/utils.ts b/src/utils.ts
index f0d04b55..09facf93 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -214,3 +214,55 @@ export const reportWarningOnce = (id: string, message: string) => {
   reportedWarnings.add(id)
   console.warn(message)
 }
+
+export interface ParsedServerAddress {
+  host: string
+  port?: string
+  version?: string
+  isWebSocket: boolean
+}
+
+export const parseServerAddress = (address: string | undefined): ParsedServerAddress => {
+  if (!address) {
+    return { host: '', isWebSocket: false }
+  }
+
+  const isWebSocket = address.startsWith('ws://') || address.startsWith('wss://')
+  if (isWebSocket) {
+    return { host: address, isWebSocket: true }
+  }
+
+  // Check for version in format host:version or host:port:version
+  const parts = address.split(':')
+  if (parts.length === 2 && parts[1].includes('.')) {
+    return {
+      host: parts[0],
+      version: parts[1],
+      isWebSocket: false
+    }
+  }
+
+  if (parts.length === 3) {
+    return {
+      host: parts[0],
+      port: parts[1],
+      version: parts[2],
+      isWebSocket: false
+    }
+  }
+
+  // Standard host:port format
+  const hostPort = /:\d+$/.exec(address)
+  if (hostPort) {
+    return {
+      host: address.slice(0, -hostPort[0].length),
+      port: hostPort[0].slice(1),
+      isWebSocket: false
+    }
+  }
+
+  return {
+    host: address,
+    isWebSocket: false
+  }
+}

From c0dc516a2dd5e3a2315ce33f5e77fa22987cfd85 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 8 Feb 2025 11:45:08 +0300
Subject: [PATCH 200/753] improve button hover ui on mobile

---
 src/react/button.module.css | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/react/button.module.css b/src/react/button.module.css
index 98997ab4..ae32ee5f 100644
--- a/src/react/button.module.css
+++ b/src/react/button.module.css
@@ -16,9 +16,19 @@
   align-items: center;
 }
 
-.button:hover,
-.button:focus-visible {
-  --txrV: 86px;
+/* Only apply hover on devices that support it */
+@media (hover: hover) {
+  .button:hover,
+  .button:focus-visible {
+    --txrV: 86px;
+  }
+}
+
+/* For touch devices, use active state */
+@media (hover: none) {
+  .button:active {
+    --txrV: 86px;
+  }
 }
 
 .button:disabled {

From 17dc564ef1a9a1a19918b880571190e8d7e7394f Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 8 Feb 2025 11:54:41 +0300
Subject: [PATCH 201/753] fix playground crash, fix entities crash

---
 prismarine-viewer/viewer/lib/entities.ts |  2 +-
 src/appStatus.ts                         | 35 +++++++++++++++++++++++
 src/browserfs.ts                         |  2 +-
 src/builtinCommands.ts                   |  2 +-
 src/downloadAndOpenFile.ts               |  2 +-
 src/googledrive.ts                       |  2 +-
 src/index.ts                             |  3 +-
 src/localServerMultiplayer.ts            |  3 +-
 src/optionsGuiScheme.tsx                 |  3 +-
 src/react/MainMenuRenderApp.tsx          |  3 +-
 src/react/PauseScreen.tsx                |  3 +-
 src/react/SingleplayerProvider.tsx       |  3 +-
 src/resourcePack.ts                      |  2 +-
 src/utils.ts                             | 36 +-----------------------
 14 files changed, 54 insertions(+), 47 deletions(-)
 create mode 100644 src/appStatus.ts

diff --git a/prismarine-viewer/viewer/lib/entities.ts b/prismarine-viewer/viewer/lib/entities.ts
index f1e47d24..8b72fe2c 100644
--- a/prismarine-viewer/viewer/lib/entities.ts
+++ b/prismarine-viewer/viewer/lib/entities.ts
@@ -886,7 +886,7 @@ function getGeneralEntitiesMetadata (entity: { name; metadata }): Partial<UnionT
     get (target, p, receiver) {
       if (typeof p !== 'string' || !entityData) return
       const index = entityData.metadataKeys?.indexOf(p)
-      return entity.metadata[index ?? -1]
+      return entity.metadata?.[index ?? -1]
     },
   })
 }
diff --git a/src/appStatus.ts b/src/appStatus.ts
new file mode 100644
index 00000000..4c82973a
--- /dev/null
+++ b/src/appStatus.ts
@@ -0,0 +1,35 @@
+import { hideModal, activeModalStack, showModal, miscUiState } from './globalState'
+import { appStatusState, resetAppStatusState } from './react/AppStatusProvider'
+
+let ourLastStatus: string | undefined = ''
+export const setLoadingScreenStatus = function (status: string | undefined | null, isError = false, hideDots = false, fromFlyingSquid = false, minecraftJsonMessage?: Record<string, any>) {
+  // null can come from flying squid, should restore our last status
+  if (status === null) {
+    status = ourLastStatus
+  } else if (!fromFlyingSquid) {
+    ourLastStatus = status
+  }
+  fromFlyingSquid = false
+
+  if (status === undefined) {
+    appStatusState.status = ''
+
+    hideModal({ reactType: 'app-status' }, {}, { force: true })
+    return
+  }
+
+  if (!activeModalStack.some(x => x.reactType === 'app-status')) {
+    // just showing app status
+    resetAppStatusState()
+  }
+  showModal({ reactType: 'app-status' })
+  if (appStatusState.isError) {
+    miscUiState.gameLoaded = false
+    return
+  }
+  appStatusState.hideDots = hideDots
+  appStatusState.isError = isError
+  appStatusState.lastStatus = isError ? appStatusState.status : ''
+  appStatusState.status = status
+  appStatusState.minecraftJsonMessage = minecraftJsonMessage ?? null
+}
diff --git a/src/browserfs.ts b/src/browserfs.ts
index a1f00bfb..bd862ae0 100644
--- a/src/browserfs.ts
+++ b/src/browserfs.ts
@@ -9,7 +9,7 @@ import { options, resetOptions } from './optionsStorage'
 import { fsState, loadSave } from './loadSave'
 import { installResourcepackPack, installTexturePackFromHandle, updateTexturePackInstalledState } from './resourcePack'
 import { miscUiState } from './globalState'
-import { setLoadingScreenStatus } from './utils'
+import { setLoadingScreenStatus } from './appStatus'
 const { GoogleDriveFileSystem } = require('google-drive-browserfs/src/backends/GoogleDrive') // disable type checking
 
 browserfs.install(window)
diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts
index 51c98f2a..772b3745 100644
--- a/src/builtinCommands.ts
+++ b/src/builtinCommands.ts
@@ -5,7 +5,7 @@ import { readLevelDat } from './loadSave'
 import { closeWan, openToWanAndCopyJoinLink } from './localServerMultiplayer'
 import { copyFilesAsync, uniqueFileNameFromWorldName } from './browserfs'
 import { saveServer } from './flyingSquidUtils'
-import { setLoadingScreenStatus } from './utils'
+import { setLoadingScreenStatus } from './appStatus'
 import { displayClientChat } from './botUtils'
 
 const notImplemented = () => {
diff --git a/src/downloadAndOpenFile.ts b/src/downloadAndOpenFile.ts
index 9f757796..b1cf6859 100644
--- a/src/downloadAndOpenFile.ts
+++ b/src/downloadAndOpenFile.ts
@@ -1,7 +1,7 @@
 import prettyBytes from 'pretty-bytes'
 import { openWorldFromHttpDir, openWorldZip } from './browserfs'
 import { getResourcePackNames, installResourcepackPack, resourcePackState, updateTexturePackInstalledState } from './resourcePack'
-import { setLoadingScreenStatus } from './utils'
+import { setLoadingScreenStatus } from './appStatus'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 
 export const getFixedFilesize = (bytes: number) => {
diff --git a/src/googledrive.ts b/src/googledrive.ts
index 578ecb00..c1007bd5 100644
--- a/src/googledrive.ts
+++ b/src/googledrive.ts
@@ -3,7 +3,7 @@ import { proxy, ref, subscribe } from 'valtio'
 import React from 'react'
 import { loadScript } from 'prismarine-viewer/viewer/lib/utils'
 import { loadGoogleDriveApi, loadInMemorySave } from './react/SingleplayerProvider'
-import { setLoadingScreenStatus } from './utils'
+import { setLoadingScreenStatus } from './appStatus'
 import { mountGoogleDriveFolder } from './browserfs'
 import { showOptionsModal } from './react/SelectOption'
 import { appQueryParams } from './appParams'
diff --git a/src/index.ts b/src/index.ts
index 3e5c4bed..1104d65d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -60,8 +60,9 @@ import {
 } from './globalState'
 
 import {
-  pointerLock, setLoadingScreenStatus, parseServerAddress
+  pointerLock, parseServerAddress
 } from './utils'
+import { setLoadingScreenStatus } from './appStatus'
 import { isCypress } from './standaloneUtils'
 
 import {
diff --git a/src/localServerMultiplayer.ts b/src/localServerMultiplayer.ts
index 7d147d0d..de49ffd6 100644
--- a/src/localServerMultiplayer.ts
+++ b/src/localServerMultiplayer.ts
@@ -1,7 +1,8 @@
 import { Duplex } from 'stream'
 import Peer, { DataConnection } from 'peerjs'
 import Client from 'minecraft-protocol/src/client'
-import { resolveTimeout, setLoadingScreenStatus } from './utils'
+import { resolveTimeout } from './utils'
+import { setLoadingScreenStatus } from './appStatus'
 import { miscUiState } from './globalState'
 
 class CustomDuplex extends Duplex {
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index dfb195fa..a56e5200 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -7,7 +7,8 @@ import { AppOptions, options } from './optionsStorage'
 import Button from './react/Button'
 import { OptionMeta, OptionSlider } from './react/OptionsItems'
 import Slider from './react/Slider'
-import { getScreenRefreshRate, setLoadingScreenStatus } from './utils'
+import { getScreenRefreshRate } from './utils'
+import { setLoadingScreenStatus } from './appStatus'
 import { openFilePicker, resetLocalStorageWithoutWorld } from './browserfs'
 import { completeTexturePackInstall, getResourcePackNames, resourcePackState, uninstallResourcePack } from './resourcePack'
 import { downloadPacketsReplay, packetsReplaceSessionState } from './packetsReplay'
diff --git a/src/react/MainMenuRenderApp.tsx b/src/react/MainMenuRenderApp.tsx
index f62cf165..c7bc99e5 100644
--- a/src/react/MainMenuRenderApp.tsx
+++ b/src/react/MainMenuRenderApp.tsx
@@ -3,7 +3,8 @@ import { Transition } from 'react-transition-group'
 import { proxy, subscribe, useSnapshot } from 'valtio'
 import { useEffect, useState } from 'react'
 import { activeModalStack, miscUiState, openOptionsMenu, showModal } from '../globalState'
-import { openGithub, setLoadingScreenStatus } from '../utils'
+import { openGithub } from '../utils'
+import { setLoadingScreenStatus } from '../appStatus'
 import { openFilePicker, copyFilesAsync, mkdirRecursive, openWorldDirectory, removeFileRecursiveAsync } from '../browserfs'
 
 import MainMenu from './MainMenu'
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 29fb9604..5cc0c432 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -16,7 +16,8 @@ import {
 } from '../globalState'
 import { fsState } from '../loadSave'
 import { disconnect } from '../flyingSquidUtils'
-import { pointerLock, setLoadingScreenStatus } from '../utils'
+import { pointerLock } from '../utils'
+import { setLoadingScreenStatus } from '../appStatus'
 import { closeWan, openToWanAndCopyJoinLink, getJoinLink } from '../localServerMultiplayer'
 import { collectFilesToCopy, fileExistsAsyncOptimized, mkdirRecursive, uniqueFileNameFromWorldName } from '../browserfs'
 import { appQueryParams } from '../appParams'
diff --git a/src/react/SingleplayerProvider.tsx b/src/react/SingleplayerProvider.tsx
index 16cf8f65..c328813e 100644
--- a/src/react/SingleplayerProvider.tsx
+++ b/src/react/SingleplayerProvider.tsx
@@ -5,7 +5,8 @@ import { loadScript } from 'prismarine-viewer/viewer/lib/utils'
 import { fsState, loadSave, longArrayToNumber, readLevelDat } from '../loadSave'
 import { googleDriveGetFileIdFromPath, mountExportFolder, mountGoogleDriveFolder, removeFileRecursiveAsync } from '../browserfs'
 import { hideCurrentModal, showModal } from '../globalState'
-import { haveDirectoryPicker, setLoadingScreenStatus } from '../utils'
+import { haveDirectoryPicker } from '../utils'
+import { setLoadingScreenStatus } from '../appStatus'
 import { exportWorld } from '../builtinCommands'
 import { googleProviderState, useGoogleLogIn, GoogleDriveProvider, isGoogleDriveAvailable, APP_ID } from '../googledrive'
 import Singleplayer, { WorldProps } from './Singleplayer'
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index faea8ff7..66c8a656 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -5,7 +5,7 @@ import JSZip from 'jszip'
 import { proxy, subscribe } from 'valtio'
 import { WorldRendererThree } from 'prismarine-viewer/viewer/lib/worldrendererThree'
 import { collectFilesToCopy, copyFilesAsyncWithProgress, mkdirRecursive, removeFileRecursiveAsync } from './browserfs'
-import { setLoadingScreenStatus } from './utils'
+import { setLoadingScreenStatus } from './appStatus'
 import { showNotification } from './react/NotificationProvider'
 import { options } from './optionsStorage'
 import { showOptionsModal } from './react/SelectOption'
diff --git a/src/utils.ts b/src/utils.ts
index 09facf93..3a928583 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,6 +1,5 @@
-import { activeModalStack, hideModal, isGameActive, miscUiState, showModal } from './globalState'
+import { isGameActive, miscUiState } from './globalState'
 import { options } from './optionsStorage'
-import { appStatusState, resetAppStatusState } from './react/AppStatusProvider'
 import { notificationProxy, showNotification } from './react/NotificationProvider'
 
 export const goFullscreen = async (doToggle = false) => {
@@ -122,39 +121,6 @@ export const isMajorVersionGreater = (ver1: string, ver2: string) => {
   return +a1 > +a2 || (+a1 === +a2 && +b1 > +b2)
 }
 
-let ourLastStatus: string | undefined = ''
-export const setLoadingScreenStatus = function (status: string | undefined | null, isError = false, hideDots = false, fromFlyingSquid = false, minecraftJsonMessage?: Record<string, any>) {
-  // null can come from flying squid, should restore our last status
-  if (status === null) {
-    status = ourLastStatus
-  } else if (!fromFlyingSquid) {
-    ourLastStatus = status
-  }
-  fromFlyingSquid = false
-
-  if (status === undefined) {
-    appStatusState.status = ''
-
-    hideModal({ reactType: 'app-status' }, {}, { force: true })
-    return
-  }
-
-  if (!activeModalStack.some(x => x.reactType === 'app-status')) {
-    // just showing app status
-    resetAppStatusState()
-  }
-  showModal({ reactType: 'app-status' })
-  if (appStatusState.isError) {
-    miscUiState.gameLoaded = false
-    return
-  }
-  appStatusState.hideDots = hideDots
-  appStatusState.isError = isError
-  appStatusState.lastStatus = isError ? appStatusState.status : ''
-  appStatusState.status = status
-  appStatusState.minecraftJsonMessage = minecraftJsonMessage ?? null
-}
-
 // doesn't support snapshots
 export const toMajorVersion = version => {
   const [a, b] = (String(version)).split('.')

From 43580511e202baf62725337cef64fc57f856e49b Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 8 Feb 2025 12:05:15 +0300
Subject: [PATCH 202/753] refactor entitymesh to ts

---
 .../entity/{EntityMesh.js => EntityMesh.ts}   | 170 +++++++++++-------
 1 file changed, 105 insertions(+), 65 deletions(-)
 rename prismarine-viewer/viewer/lib/entity/{EntityMesh.js => EntityMesh.ts} (80%)

diff --git a/prismarine-viewer/viewer/lib/entity/EntityMesh.js b/prismarine-viewer/viewer/lib/entity/EntityMesh.ts
similarity index 80%
rename from prismarine-viewer/viewer/lib/entity/EntityMesh.js
rename to prismarine-viewer/viewer/lib/entity/EntityMesh.ts
index 141e25c2..1db6d4c3 100644
--- a/prismarine-viewer/viewer/lib/entity/EntityMesh.js
+++ b/prismarine-viewer/viewer/lib/entity/EntityMesh.ts
@@ -1,15 +1,63 @@
-//@ts-check
 import * as THREE from 'three'
 import { OBJLoader } from 'three-stdlib'
 import huskPng from 'mc-assets/dist/other-textures/latest/entity/zombie/husk.png'
 import { Vec3 } from 'vec3'
+import { WorldRendererCommon } from '../worldrendererCommon'
 import entities from './entities.json'
 import { externalModels } from './objModels'
 import externalTexturesJson from './externalTextures.json'
 // import { loadTexture } from globalThis.isElectron ? '../utils.electron.js' : '../utils';
+
 const { loadTexture } = globalThis.isElectron ? require('../utils.electron.js') : require('../utils')
 
-const elemFaces = {
+interface ElemFace {
+  dir: [number, number, number]
+  u0: [number, number, number]
+  v0: [number, number, number]
+  u1: [number, number, number]
+  v1: [number, number, number]
+  corners: Array<[number, number, number, number, number]>
+}
+
+interface GeoData {
+  positions: number[]
+  normals: number[]
+  uvs: number[]
+  indices: number[]
+  skinIndices: number[]
+  skinWeights: number[]
+}
+
+interface JsonBone {
+  name: string
+  pivot?: [number, number, number]
+  bind_pose_rotation?: [number, number, number]
+  rotation?: [number, number, number]
+  parent?: string
+  cubes?: JsonCube[]
+  mirror?: boolean
+}
+
+interface JsonCube {
+  origin: [number, number, number]
+  size: [number, number, number]
+  uv: [number, number]
+  inflate?: number
+  rotation?: [number, number, number]
+}
+
+interface JsonModel {
+  texturewidth?: number
+  textureheight?: number
+  bones: JsonBone[]
+}
+
+interface EntityOverrides {
+  textures?: Record<string, string>
+  rotation?: Record<string, { x?: number; y?: number; z?: number }>
+}
+
+const elemFaces: Record<string, ElemFace> = {
   up: {
     dir: [0, 1, 0],
     u0: [0, 0, 1],
@@ -90,11 +138,20 @@ const elemFaces = {
   }
 }
 
-function dot(a, b) {
+function dot (a: number[], b: number[]): number {
   return a[0] * b[0] + a[1] * b[1] + a[2] * b[2]
 }
 
-function addCube(attr, boneId, bone, cube, sameTextureForAllFaces = false, texWidth = 64, texHeight = 64, mirror = false) {
+function addCube (
+  attr: GeoData,
+  boneId: number,
+  bone: THREE.Bone,
+  cube: JsonCube,
+  sameTextureForAllFaces = false,
+  texWidth = 64,
+  texHeight = 64,
+  mirror = false
+): void {
   const cubeRotation = new THREE.Euler(0, 0, 0)
   if (cube.rotation) {
     cubeRotation.x = -cube.rotation[0] * Math.PI / 180
@@ -105,10 +162,10 @@ function addCube(attr, boneId, bone, cube, sameTextureForAllFaces = false, texWi
     const ndx = Math.floor(attr.positions.length / 3)
 
     const eastOrWest = dir[0] !== 0
-    const faceUvs = []
+    const faceUvs: number[] = []
     for (const pos of corners) {
-      let u
-      let v
+      let u: number
+      let v: number
       if (sameTextureForAllFaces) {
         u = (cube.uv[0] + pos[3] * cube.size[0]) / texWidth
         v = (cube.uv[1] + pos[4] * cube.size[1]) / texHeight
@@ -133,7 +190,7 @@ function addCube(attr, boneId, bone, cube, sameTextureForAllFaces = false, texWi
       vecPos = vecPos.add(bone.position)
 
       attr.positions.push(vecPos.x, vecPos.y, vecPos.z)
-      attr.normals.push(...dir)
+      attr.normals.push(dir[0], dir[1], dir[2])
       faceUvs.push(u, v)
       attr.skinIndices.push(boneId, 0, 0, 0)
       attr.skinWeights.push(1, 0, 0, 0)
@@ -155,26 +212,32 @@ function addCube(attr, boneId, bone, cube, sameTextureForAllFaces = false, texWi
   }
 }
 
-export function getMesh(worldRenderer, texture, jsonModel, overrides = {}) {
+export function getMesh (
+  worldRenderer: WorldRendererCommon,
+  texture: string,
+  jsonModel: JsonModel,
+  overrides: EntityOverrides = {}
+): THREE.SkinnedMesh {
   let textureWidth = jsonModel.texturewidth ?? 64
   let textureHeight = jsonModel.textureheight ?? 64
   let textureOffset
   const useBlockTexture = texture.startsWith('block:')
+  const blocksTexture = worldRenderer.material.map!
   if (useBlockTexture) {
     const blockName = texture.slice(6)
-    const textureInfo = worldRenderer.blocksAtlasParser.getTextureInfo(blockName)
+    const textureInfo = worldRenderer.blocksAtlasParser!.getTextureInfo(blockName)
     if (textureInfo) {
-      textureWidth = worldRenderer.material.map.image.width
-      textureHeight = worldRenderer.material.map.image.height
+      textureWidth = blocksTexture.image.width
+      textureHeight = blocksTexture.image.height
       textureOffset = [textureInfo.u, textureInfo.v]
     } else {
       console.error(`Unknown block ${blockName}`)
     }
   }
 
-  const bones = {}
+  const bones: Record<string, THREE.Bone> = {}
 
-  const geoData = {
+  const geoData: GeoData = {
     positions: [],
     normals: [],
     uvs: [],
@@ -215,9 +278,11 @@ export function getMesh(worldRenderer, texture, jsonModel, overrides = {}) {
     i++
   }
 
-  const rootBones = []
+  const rootBones: THREE.Object3D[] = []
   for (const jsonBone of jsonModel.bones) {
-    if (jsonBone.parent && bones[jsonBone.parent]) { bones[jsonBone.parent].add(bones[jsonBone.name]) } else {
+    if (jsonBone.parent && bones[jsonBone.parent]) {
+      bones[jsonBone.parent].add(bones[jsonBone.name])
+    } else {
       rootBones.push(bones[jsonBone.name])
     }
   }
@@ -239,7 +304,7 @@ export function getMesh(worldRenderer, texture, jsonModel, overrides = {}) {
   mesh.scale.set(1 / 16, 1 / 16, 1 / 16)
 
   if (textureOffset) {
-    const loadedTexture = worldRenderer.material.map.clone()
+    const loadedTexture = blocksTexture.clone()
     loadedTexture.offset.set(textureOffset[0], textureOffset[1])
     loadedTexture.needsUpdate = true
     material.map = loadedTexture
@@ -269,7 +334,7 @@ export function getMesh(worldRenderer, texture, jsonModel, overrides = {}) {
   return mesh
 }
 
-export const knownNotHandled = [
+export const knownNotHandled: string[] = [
   'area_effect_cloud', 'block_display',
   'chest_boat', 'end_crystal',
   'falling_block', 'furnace_minecart',
@@ -283,7 +348,7 @@ export const knownNotHandled = [
   'trader_llama', 'zombie_horse'
 ]
 
-export const temporaryMap = {
+export const temporaryMap: Record<string, string> = {
   'furnace_minecart': 'minecart',
   'spawner_minecart': 'minecart',
   'chest_minecart': 'minecart',
@@ -305,62 +370,37 @@ export const temporaryMap = {
   // 'lightning_bolt': 'lightning',
 }
 
-const getEntity = (name) => {
+const getEntity = (name: string) => {
   return entities[name]
 }
 
-// const externalModelsTextures = {
-//   allay: 'allay/allay',
-//   axolotl: 'axolotl/axolotl_blue',
-//   blaze: 'blaze',
-//   camel: 'camel/camel',
-//   cat: 'cat/black',
-//   chicken: 'chicken',
-//   cod: 'fish/cod',
-//   creeper: 'creeper/creeper',
-//   dolphin: 'dolphin',
-//   ender_dragon: 'enderdragon/dragon',
-//   enderman: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAABGdBTUEAALGPC/xhBQAAAY5JREFUaN7lWNESgzAI8yv8/z/tXjZPHSShYitb73rXedo1AQJ0WchY17WhudQZ7TS18Qb5AXtY/yUBO8tXIaCRqRNwXlcgwDJgmAALfBUP8AjYEdHnAZUIAGdvPy+CnobJIVw9DVIPEABawuEyyvYx1sMIMP8fAbUO7ukBImZmCCEP2AhglnRip8vio7MIxYEsaVkdeYNjYfbN/BBA1twP9AxpB0qlMwj48gBP5Ji1rXc8nfBImk6A5+KqShNwdTwgKy0xYRzdS4yoY651W8EDRwGVJEDVITGtjiEAaEBq3o4SwGqRVAKsdVYIsAzDCACV6VwCFMBCpqLvgudzQ6CnjL5afmeX4pdE0LIQuYCBzZbQfT4rC6COUQGn9B3MQ28pSIxDSDdNrKdQSZJ7lDurMeZm6iEjKVENh8cQgBowBFK5gEHhsO3xFA/oKXp6vg8RoHaD2QRkiaDnAYcZAcB+E6GTRVAhQCVJyVImKOUiBLW3KL4jzU2POHp64RIQ/ADO6D6Ry1gl9tlN1Xm+AK8s2jHadDijAAAAAElFTkSuQmCC',
-//   endermite: 'endermite',
-//   fox: 'fox/fox',
-//   frog: 'frog/cold_frog',
-//   ghast: 'ghast/ghast',
-//   goat: 'goat/goat',
-//   guardian: 'guardian',
-//   horse: 'horse/horse_brown',
-//   llama: 'llama/creamy',
-//   minecart: 'minecart',
-//   parrot: 'parrot/parrot_grey',
-//   piglin: 'piglin/piglin',
-//   pillager: 'illager/pillager',
-//   rabbit: 'rabbit/brown',
-//   sheep: 'sheep/sheep',
-//   shulker: 'shulker/shulker',
-//   sniffer: 'sniffer/sniffer',
-//   spider: 'spider/spider',
-//   tadpole: 'tadpole/tadpole',
-//   turtle: 'turtle/big_sea_turtle',
-//   vex: 'illager/vex',
-//   villager: 'villager/villager',
-//   warden: 'warden/warden',
-//   witch: 'witch',
-//   wolf: 'wolf/wolf',
-//   zombie_villager: 'zombie_villager/zombie_villager'
-// }
-
-const scaleEntity = {
+const scaleEntity: Record<string, number> = {
   zombie: 1.85,
   husk: 1.85
 }
-const offsetEntity = {
+
+const offsetEntity: Record<string, Vec3> = {
   zombie: new Vec3(0, 1, 0),
   husk: new Vec3(0, 1, 0),
   boat: new Vec3(0, -1, 0),
 }
 
-// eslint-disable-next-line @typescript-eslint/no-extraneous-class
+interface EntityGeometry {
+  geometry: Array<{
+    name: string;
+    [key: string]: any;
+  }>;
+}
+
 export class EntityMesh {
-  constructor(version, type, worldRenderer, /** @type {{textures?, rotation?: Record<string, {x,y,z}>}} */overrides = {}) {
+  mesh: THREE.Object3D
+
+  constructor (
+    version: string,
+    type: string,
+    worldRenderer: WorldRendererCommon,
+    overrides: EntityOverrides = {}
+  ) {
     const originalType = type
     const mappedValue = temporaryMap[type]
     if (mappedValue) type = mappedValue
@@ -443,14 +483,14 @@ export class EntityMesh {
     }
   }
 
-  static getStaticData(name) {
+  static getStaticData (name: string): { boneNames: string[] } {
     name = temporaryMap[name] || name
     if (externalModels[name]) {
       return {
         boneNames: [] // todo
       }
     }
-    const e = getEntity(name)
+    const e = getEntity(name) as EntityGeometry
     if (!e) throw new Error(`Unknown entity ${name}`)
     return {
       boneNames: Object.values(e.geometry).flatMap(x => x.name)

From b196ea59555641cb468a2668c653e0dfcad77be1 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 8 Feb 2025 12:15:14 +0300
Subject: [PATCH 203/753] should fix storybook build

---
 src/connect.ts                    |  1 +
 src/index.ts                      |  2 +-
 src/react/ServersList.tsx         | 42 +++++++++++--------------------
 src/react/ServersListProvider.tsx | 29 ++++++++++++++++++++-
 4 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/src/connect.ts b/src/connect.ts
index a7313f36..0dd6c8fd 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -22,6 +22,7 @@ export type ConnectOptions = {
   authenticatedAccount?: AuthenticatedAccount | true
   peerOptions?: any
   viewerWsConnect?: string
+  saveServerToHistory?: boolean
 }
 
 export const getVersionAutoSelect = (autoVersionSelect = options.serversAutoVersionSelect) => {
diff --git a/src/index.ts b/src/index.ts
index 1104d65d..437fb15b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -269,7 +269,7 @@ export async function connect (connectOptions: ConnectOptions) {
   miscUiState.flyingSquid = singleplayer || p2pMultiplayer
 
   // Track server connection in history
-  if (!singleplayer && !p2pMultiplayer && connectOptions.server) {
+  if (!singleplayer && !p2pMultiplayer && connectOptions.server && connectOptions.saveServerToHistory !== false) {
     const parsedServer = parseServerAddress(connectOptions.server)
     updateServerConnectionHistory(parsedServer.host, connectOptions.botVersion)
   }
diff --git a/src/react/ServersList.tsx b/src/react/ServersList.tsx
index cc721f79..46541af6 100644
--- a/src/react/ServersList.tsx
+++ b/src/react/ServersList.tsx
@@ -1,6 +1,4 @@
 import React from 'react'
-import { parseServerAddress } from '../utils'
-import { getServerConnectionHistory } from './ServersListProvider'
 import Singleplayer from './Singleplayer'
 import Input from './Input'
 import Button from './Button'
@@ -11,7 +9,7 @@ import { BaseServerInfo } from './AddServerOrConnect'
 import { useIsSmallWidth } from './simpleHooks'
 
 interface Props extends React.ComponentProps<typeof Singleplayer> {
-  joinServer: (info: BaseServerInfo, additional: {
+  joinServer: (info: BaseServerInfo | string, additional: {
     shouldSave?: boolean
     index?: number
   }) => void
@@ -39,15 +37,18 @@ type ProxyStatusResult = {
   status: 'success' | 'error' | 'unknown'
 }
 
-export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer, username, setUsername, onProfileClick, setQuickConnectIp, ...props }: Props) => {
+export default ({
+  initialProxies,
+  updateProxies: updateProxiesProp,
+  joinServer,
+  username,
+  setUsername,
+  onProfileClick,
+  setQuickConnectIp,
+  serverHistory,
+  ...props
+}: Props) => {
   const [proxies, setProxies] = React.useState(initialProxies)
-  const [connectionHistory] = React.useState(() => getServerConnectionHistory()
-    .sort((a, b) => b.numConnects - a.numConnects)
-    .map(server => ({
-      ip: server.ip,
-      versionOverride: server.version,
-      numConnects: server.numConnects
-    })))
 
   const updateProxies = (newData: SavedProxiesLocalStorage) => {
     setProxies(newData)
@@ -75,22 +76,7 @@ export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer,
     firstRowChildrenOverride={<form
       style={{ width: '100%', display: 'flex', justifyContent: 'center' }} onSubmit={(e) => {
         e.preventDefault()
-        const ip = serverIp
-        let msAuth = false
-        const parts = ip.split(':')
-        if (parts.at(-1) === 'ms') {
-          msAuth = true
-          parts.pop()
-        }
-
-        const parsed = parseServerAddress(parts.join(':'))
-        joinServer({
-          ip: parsed.host,
-          versionOverride: parsed.version,
-          authenticatedAccountOverride: msAuth ? true : undefined, // todo popup selector
-        }, {
-          shouldSave: save,
-        })
+        joinServer(serverIp, { shouldSave: save })
       }}
     >
       <div
@@ -116,7 +102,7 @@ export default ({ initialProxies, updateProxies: updateProxiesProp, joinServer,
           spellCheck="false"
         />
         <datalist id="server-history">
-          {connectionHistory.map((server) => (
+          {serverHistory?.map((server) => (
             <option key={server.ip} value={`${server.ip}${server.versionOverride ? `:${server.versionOverride}` : ''}`} />
           ))}
         </datalist>
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 74ea0cf1..308ee1ff 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -8,6 +8,7 @@ import { appQueryParams } from '../appParams'
 import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
 import { pingServerVersion } from '../mineflayer/minecraft-protocol-extra'
 import { getServerInfo } from '../mineflayer/mc-protocol'
+import { parseServerAddress } from '../utils'
 import ServersList from './ServersList'
 import AddServerOrConnect, { BaseServerInfo } from './AddServerOrConnect'
 import { useDidUpdateEffect } from './utils'
@@ -349,7 +350,25 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
   /> : null
 
   const serversListJsx = <ServersList
-    joinServer={(overrides, { shouldSave }) => {
+    joinServer={(overridesOrIp, { shouldSave }) => {
+      let overrides: BaseServerInfo
+      if (typeof overridesOrIp === 'string') {
+        let msAuth = false
+        const parts = overridesOrIp.split(':')
+        if (parts.at(-1) === 'ms') {
+          msAuth = true
+          parts.pop()
+        }
+        const parsed = parseServerAddress(parts.join(':'))
+        overrides = {
+          ip: parsed.host,
+          versionOverride: parsed.version,
+          authenticatedAccountOverride: msAuth ? true : undefined, // todo popup selector
+        }
+      } else {
+        overrides = overridesOrIp
+      }
+
       const indexOrIp = overrides.ip
       let ip = indexOrIp
       let server: StoreServerItem | undefined
@@ -383,6 +402,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         ignoreQs: true,
         autoLoginPassword: server?.autoLogin?.[username],
         authenticatedAccount,
+        saveServerToHistory: shouldSave,
         onSuccessfulPlay () {
           if (shouldSave && !serversList.some(s => s.ip === ip)) {
             const newServersList: StoreServerItem[] = [...serversList, {
@@ -471,6 +491,13 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
       setSelectedIndex(i)
     }}
     selectedRow={selectedIndex}
+    serverHistory={getServerConnectionHistory()
+      .sort((a, b) => b.numConnects - a.numConnects)
+      .map(server => ({
+        ip: server.ip,
+        versionOverride: server.version,
+        numConnects: server.numConnects
+      }))}
   />
   return <>
     {serversListJsx}

From f96673bc1789068d4bbbeb7cf6dbc406045171f1 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 8 Feb 2025 14:17:27 +0300
Subject: [PATCH 204/753] rename prismarine-viewer dir to renderer to avoid
 confusion (#269)

---
 .github/workflows/next-deploy.yml             |  18 ++-
 .github/workflows/preview.yml                 |   2 +-
 .github/workflows/publish.yml                 |   2 +-
 CONTRIBUTING.md                               |  14 +-
 Dockerfile                                    |   2 +-
 cypress/e2e/{index.spec.ts => smoke.spec.ts}  |   0
 package.json                                  |  10 +-
 pnpm-lock.yaml                                |  16 +--
 pnpm-workspace.yaml                           |   4 +-
 prismarine-viewer/README.MD                   |   5 +
 {prismarine-viewer => renderer}/.npmrc        |   0
 .../buildMesherConfig.mjs                     |   0
 .../buildMesherWorker.mjs                     |   0
 {prismarine-viewer => renderer}/package.json  |   4 +-
 .../playground.html                           |   0
 .../playground}/baseScene.ts                  |  11 ++
 .../playground}/playground.ts                 |   0
 .../playground}/playgroundUi.tsx              |   0
 .../playground}/scenes/entities.ts            |   0
 .../playground}/scenes/floorRandom.ts         |   0
 .../playground}/scenes/frequentUpdates.ts     |   0
 .../playground}/scenes/index.ts               |   0
 .../playground}/scenes/lightingStarfield.ts   |   0
 .../playground}/scenes/main.ts                |   2 +-
 .../playground}/scenes/railsCobweb.ts         |   0
 .../playground}/scenes/rotationIssue.ts       |   0
 .../playground}/scenes/slabsOptimization.ts   |   0
 .../playground}/scenes/transparencyIssue.ts   |   0
 .../playground}/shared.ts                     |   0
 .../rsbuild.config.ts                         |   2 +-
 .../rsbuildSharedConfig.ts                    |   0
 .../viewer/.gitignore                         |   0
 .../viewer/index.js                           |   0
 .../viewer/lib/cleanupDecorator.ts            |   0
 .../viewer/lib/entities.ts                    |   0
 .../viewer/lib/entity/EntityMesh.ts           |   1 +
 .../viewer/lib/entity/animations.js           |   0
 .../viewer/lib/entity/armorModels.json        |   0
 .../viewer/lib/entity/armorModels.ts          |   0
 .../viewer/lib/entity/entities.json           |   0
 .../viewer/lib/entity/exportedModels.js       |   0
 .../viewer/lib/entity/externalTextures.json   |   0
 .../viewer/lib/entity/models/allay.obj        |   0
 .../viewer/lib/entity/models/axolotl.obj      |   0
 .../viewer/lib/entity/models/blaze.obj        |   0
 .../viewer/lib/entity/models/boat.obj         |   0
 .../viewer/lib/entity/models/camel.obj        |   0
 .../viewer/lib/entity/models/cat.obj          |   0
 .../viewer/lib/entity/models/chicken.obj      |   0
 .../viewer/lib/entity/models/cod.obj          |   0
 .../viewer/lib/entity/models/creeper.obj      |   0
 .../viewer/lib/entity/models/dolphin.obj      |   0
 .../viewer/lib/entity/models/ender_dragon.obj |   0
 .../viewer/lib/entity/models/enderman.obj     |   0
 .../viewer/lib/entity/models/endermite.obj    |   0
 .../viewer/lib/entity/models/fox.obj          |   0
 .../viewer/lib/entity/models/frog.obj         |   0
 .../viewer/lib/entity/models/ghast.obj        |   0
 .../viewer/lib/entity/models/goat.obj         |   0
 .../viewer/lib/entity/models/guardian.obj     |   0
 .../viewer/lib/entity/models/horse.obj        |   0
 .../viewer/lib/entity/models/llama.obj        |   0
 .../viewer/lib/entity/models/minecart.obj     |   0
 .../viewer/lib/entity/models/parrot.obj       |   0
 .../viewer/lib/entity/models/piglin.obj       |   0
 .../viewer/lib/entity/models/pillager.obj     |   0
 .../viewer/lib/entity/models/rabbit.obj       |   0
 .../viewer/lib/entity/models/sheep.obj        |   0
 .../viewer/lib/entity/models/shulker.obj      |   0
 .../viewer/lib/entity/models/sniffer.obj      |   0
 .../viewer/lib/entity/models/spider.obj       |   0
 .../viewer/lib/entity/models/tadpole.obj      |   0
 .../viewer/lib/entity/models/turtle.obj       |   0
 .../viewer/lib/entity/models/vex.obj          |   0
 .../viewer/lib/entity/models/villager.obj     |   0
 .../viewer/lib/entity/models/warden.obj       |   0
 .../viewer/lib/entity/models/witch.obj        |   0
 .../viewer/lib/entity/models/wolf.obj         |   0
 .../viewer/lib/entity/models/zombie.obj       |   0
 .../lib/entity/models/zombie_villager.obj     |   0
 .../viewer/lib/entity/objModels.js            |   0
 .../viewer/lib/hand.ts                        |   0
 .../viewer/lib/holdingBlock.ts                |   0
 .../viewer/lib/mesher/mesher.ts               |   0
 .../viewer/lib/mesher/models.ts               |   2 +-
 .../viewer/lib/mesher/modelsGeometryCommon.ts |   0
 .../viewer/lib/mesher/shared.ts               |   2 +-
 .../viewer/lib/mesher/standaloneRenderer.ts   |   0
 .../viewer/lib/mesher/test/mesherTester.ts    |   0
 .../viewer/lib/mesher/test/playground.ts      |   0
 .../viewer/lib/mesher/test/tests.test.ts      |   0
 .../viewer/lib/mesher/world.ts                |   0
 .../viewer/lib/mesher/worldConstants.ts       |   0
 .../viewer/lib/moreBlockDataGenerated.json    |   0
 .../viewer/lib/primitives.js                  |   0
 .../viewer/lib/renderUtils.js                 |   0
 .../viewer/lib/simpleUtils.ts                 |   0
 .../viewer/lib/threeJsUtils.ts                |   0
 .../viewer/lib/ui/newStats.ts                 |   0
 .../viewer/lib/utils.electron.js              |   0
 .../viewer/lib/utils.js                       |   0
 .../viewer/lib/utils.web.js                   |   0
 .../viewer/lib/viewer.ts                      |   0
 .../viewer/lib/viewerWrapper.ts               |   0
 .../viewer/lib/workerProxy.ts                 |   0
 .../viewer/lib/worldDataEmitter.ts            |   2 +-
 .../viewer/lib/worldrendererCommon.ts         |   0
 .../viewer/lib/worldrendererThree.ts          |   0
 .../viewer/prepare/utils.ts                   |   0
 .../viewer/sign-renderer/index.html           |   0
 .../viewer/sign-renderer/index.ts             |   0
 .../viewer/sign-renderer/noop.js              |   0
 .../viewer/sign-renderer/package.json         |   0
 .../viewer/sign-renderer/playground.ts        |   0
 .../viewer/sign-renderer/tests.test.ts        |   0
 .../viewer/sign-renderer/vite.config.ts       |   0
 rsbuild.config.ts                             |  10 +-
 scripts/build.js                              |   2 +-
 scripts/buildNpmReact.ts                      |   2 +-
 scripts/dockerPrepare.mjs                     |   4 +-
 src/botUtils.ts                               |   2 +-
 src/chatUtils.ts                              |   4 +-
 src/connect.ts                                |   2 +-
 src/devReload.ts                              |   4 +-
 src/devtools.ts                               |   2 +-
 src/entities.ts                               |   2 +-
 src/globals.d.ts                              |   4 +-
 src/googledrive.ts                            |   2 +-
 src/index.ts                                  |  10 +-
 src/inventoryWindows.ts                       |   2 +-
 src/loadSave.ts                               |   2 +-
 src/optimizeJson.ts                           |   2 +-
 src/optionsGuiScheme.tsx                      |   2 +-
 src/panorama.ts                               |   4 +-
 src/react/AppStatusProvider.tsx               |   9 +-
 src/react/BookProvider.tsx                    |   2 +-
 src/react/ChatProvider.tsx                    |   2 +-
 src/react/DiscordButton.tsx                   |   2 +-
 src/react/Input.tsx                           |   2 +-
 src/react/MainMenu.tsx                        |   2 +-
 src/react/MessageFormatted.tsx                |   2 +-
 src/react/MinimapProvider.tsx                 |   6 +-
 src/react/ModuleSignsViewer.tsx               |   2 +-
 src/react/PauseScreen.tsx                     |   2 +-
 src/react/ServersListProvider.tsx             | 120 +-----------------
 src/react/SingleplayerProvider.tsx            |   2 +-
 src/react/serversStorage.ts                   | 115 +++++++++++++++++
 src/resourcePack.ts                           |   2 +-
 src/shims/minecraftData.ts                    |   2 +-
 src/sounds/botSoundSystem.ts                  |   4 +-
 src/sounds/soundsMap.ts                       |   2 +-
 src/watchOptions.ts                           |   4 +-
 tsconfig.json                                 |   4 +-
 vitest.config.ts                              |   2 +-
 154 files changed, 239 insertions(+), 210 deletions(-)
 rename cypress/e2e/{index.spec.ts => smoke.spec.ts} (100%)
 create mode 100644 prismarine-viewer/README.MD
 rename {prismarine-viewer => renderer}/.npmrc (100%)
 rename {prismarine-viewer => renderer}/buildMesherConfig.mjs (100%)
 rename {prismarine-viewer => renderer}/buildMesherWorker.mjs (100%)
 rename {prismarine-viewer => renderer}/package.json (93%)
 rename {prismarine-viewer => renderer}/playground.html (100%)
 rename {prismarine-viewer/examples => renderer/playground}/baseScene.ts (97%)
 rename {prismarine-viewer/examples => renderer/playground}/playground.ts (100%)
 rename {prismarine-viewer/examples => renderer/playground}/playgroundUi.tsx (100%)
 rename {prismarine-viewer/examples => renderer/playground}/scenes/entities.ts (100%)
 rename {prismarine-viewer/examples => renderer/playground}/scenes/floorRandom.ts (100%)
 rename {prismarine-viewer/examples => renderer/playground}/scenes/frequentUpdates.ts (100%)
 rename {prismarine-viewer/examples => renderer/playground}/scenes/index.ts (100%)
 rename {prismarine-viewer/examples => renderer/playground}/scenes/lightingStarfield.ts (100%)
 rename {prismarine-viewer/examples => renderer/playground}/scenes/main.ts (99%)
 rename {prismarine-viewer/examples => renderer/playground}/scenes/railsCobweb.ts (100%)
 rename {prismarine-viewer/examples => renderer/playground}/scenes/rotationIssue.ts (100%)
 rename {prismarine-viewer/examples => renderer/playground}/scenes/slabsOptimization.ts (100%)
 rename {prismarine-viewer/examples => renderer/playground}/scenes/transparencyIssue.ts (100%)
 rename {prismarine-viewer/examples => renderer/playground}/shared.ts (100%)
 rename {prismarine-viewer => renderer}/rsbuild.config.ts (94%)
 rename {prismarine-viewer => renderer}/rsbuildSharedConfig.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/.gitignore (100%)
 rename {prismarine-viewer => renderer}/viewer/index.js (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/cleanupDecorator.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entities.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/EntityMesh.ts (99%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/animations.js (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/armorModels.json (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/armorModels.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/entities.json (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/exportedModels.js (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/externalTextures.json (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/allay.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/axolotl.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/blaze.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/boat.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/camel.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/cat.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/chicken.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/cod.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/creeper.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/dolphin.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/ender_dragon.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/enderman.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/endermite.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/fox.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/frog.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/ghast.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/goat.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/guardian.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/horse.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/llama.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/minecart.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/parrot.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/piglin.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/pillager.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/rabbit.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/sheep.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/shulker.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/sniffer.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/spider.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/tadpole.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/turtle.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/vex.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/villager.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/warden.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/witch.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/wolf.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/zombie.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/models/zombie_villager.obj (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/entity/objModels.js (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/hand.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/holdingBlock.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/mesher/mesher.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/mesher/models.ts (99%)
 rename {prismarine-viewer => renderer}/viewer/lib/mesher/modelsGeometryCommon.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/mesher/shared.ts (94%)
 rename {prismarine-viewer => renderer}/viewer/lib/mesher/standaloneRenderer.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/mesher/test/mesherTester.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/mesher/test/playground.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/mesher/test/tests.test.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/mesher/world.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/mesher/worldConstants.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/moreBlockDataGenerated.json (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/primitives.js (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/renderUtils.js (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/simpleUtils.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/threeJsUtils.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/ui/newStats.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/utils.electron.js (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/utils.js (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/utils.web.js (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/viewer.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/viewerWrapper.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/workerProxy.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/worldDataEmitter.ts (99%)
 rename {prismarine-viewer => renderer}/viewer/lib/worldrendererCommon.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/lib/worldrendererThree.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/prepare/utils.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/sign-renderer/index.html (100%)
 rename {prismarine-viewer => renderer}/viewer/sign-renderer/index.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/sign-renderer/noop.js (100%)
 rename {prismarine-viewer => renderer}/viewer/sign-renderer/package.json (100%)
 rename {prismarine-viewer => renderer}/viewer/sign-renderer/playground.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/sign-renderer/tests.test.ts (100%)
 rename {prismarine-viewer => renderer}/viewer/sign-renderer/vite.config.ts (100%)
 create mode 100644 src/react/serversStorage.ts

diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml
index 2fd3be09..0856285c 100644
--- a/.github/workflows/next-deploy.yml
+++ b/.github/workflows/next-deploy.yml
@@ -23,6 +23,8 @@ jobs:
         uses: pnpm/action-setup@v4
       - name: Install Global Dependencies
         run: pnpm add -g vercel
+      - name: Install Dependencies
+        run: pnpm install
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
       - name: Write Release Info
@@ -35,7 +37,7 @@ jobs:
         run: |
           mkdir -p .vercel/output/static/playground
           pnpm build-playground
-          cp -r prismarine-viewer/dist/* .vercel/output/static/playground/
+          cp -r renderer/dist/* .vercel/output/static/playground/
       - name: Download Generated Sounds map
         run: node scripts/downloadSoundsMap.mjs
       - name: Deploy Project Artifacts to Vercel
@@ -43,6 +45,20 @@ jobs:
         with:
           run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
         id: deploy
+      - name: Start servers for testing
+        run: |
+          nohup pnpm prod-start &
+          nohup pnpm test-mc-server &
+      - name: Run Cypress smoke tests
+        uses: cypress-io/github-action@v5
+        with:
+          install: false
+          spec: cypress/e2e/smoke.spec.ts
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: cypress-smoke-test-screenshots
+          path: cypress/screenshots/
       - name: Set deployment aliases
         run: |
           for alias in $(echo ${{ secrets.TEST_PREVIEW_DOMAIN }} | tr "," "\n"); do
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 331ce62e..9386276f 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -66,7 +66,7 @@ jobs:
         run: |
           mkdir -p .vercel/output/static/playground
           pnpm build-playground
-          cp -r prismarine-viewer/dist/* .vercel/output/static/playground/
+          cp -r renderer/dist/* .vercel/output/static/playground/
       - name: Write pr redirect index.html
         run: |
           mkdir -p .vercel/output/static/pr
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 94c3c8f3..ce7f56b9 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -35,7 +35,7 @@ jobs:
         run: |
           mkdir -p .vercel/output/static/playground
           pnpm build-playground
-          cp -r prismarine-viewer/dist/* .vercel/output/static/playground/
+          cp -r renderer/dist/* .vercel/output/static/playground/
       - name: Download Generated Sounds map
         run: node scripts/downloadSoundsMap.mjs
       - name: Deploy Project to Vercel
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 02f6957e..fb0ae55e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,11 +31,11 @@ Paths:
 - `src` - main app source code
 - `src/react` - React components - almost all UI is in this folder. Almost every component has its base (reused in app and storybook) and `Provider` - which is a component that provides context to its children. Consider looking at DeathScreen component to see how it's used.
 
-### Renderer: Playground & Mesher (`prismarine-viewer`)
+### Renderer: Playground & Mesher (`renderer`)
 
 - Playground Scripts:
   - Start: `pnpm run-playground` (playground, mesher + server) or `pnpm watch-playground`
-  - Build: `pnpm build-playground` or `node prismarine-viewer/esbuild.mjs`
+  - Build: `pnpm build-playground` or `node renderer/esbuild.mjs`
 
 - Mesher Scripts:
   - Start: `pnpm watch-mesher`
@@ -43,10 +43,10 @@ Paths:
 
 Paths:
 
-- `prismarine-viewer` - Improved and refactored version of <https://github.com/prismarineJS/prismarine-viewer>. Here is everything related to rendering the game world itself (no ui at all). Two most important parts here are:
-- `prismarine-viewer/viewer/lib/worldrenderer.ts` - adding new objects to three.js happens here (sections)
-- `prismarine-viewer/viewer/lib/models.ts` - preparing data for rendering (blocks) - happens in worker: out file - `worker.js`, building - `prismarine-viewer/buildWorker.mjs`
-- `prismarine-viewer/examples/playground.ts` - Playground (source of <mcraft.fun/playground.html>) Use this for testing any rendering changes. You can also modify the playground code.
+- `renderer` - Improved and refactored version of <https://github.com/PrismarineJS/prismarine-viewer>. Here is everything related to rendering the game world itself (no ui at all). Two most important parts here are:
+- `renderer/viewer/lib/worldrenderer.ts` - adding new objects to three.js happens here (sections)
+- `renderer/viewer/lib/models.ts` - preparing data for rendering (blocks) - happens in worker: out file - `worker.js`, building - `renderer/buildWorker.mjs`
+- `renderer/playground/playground.ts` - Playground (source of <mcraft.fun/playground.html>) Use this for testing any rendering changes. You can also modify the playground code.
 
 ### Storybook (`.storybook`)
 
@@ -74,7 +74,7 @@ Cypress tests are located in `cypress` folder. To run them, run `pnpm test-mc-se
 ## Unit Tests
 
 There are not many unit tests for now (which we are trying to improve).
-Location of unit tests: `**/*.test.ts` files in `src` folder and `prismarine-viewer` folder.
+Location of unit tests: `**/*.test.ts` files in `src` folder and `renderer` folder.
 Start them with `pnpm test-unit`.
 
 ## Making protocol-related changes
diff --git a/Dockerfile b/Dockerfile
index be9d7815..4769141f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ RUN if [ "$DOWNLOAD_SOUNDS" = "true" ] ; then node scripts/downloadSoundsMap.mjs
 # TODO for development
 # EXPOSE 9090
 # VOLUME /app/src
-# VOLUME /app/prismarine-viewer
+# VOLUME /app/renderer
 # ENTRYPOINT ["pnpm", "run", "run-all"]
 
 # only for prod
diff --git a/cypress/e2e/index.spec.ts b/cypress/e2e/smoke.spec.ts
similarity index 100%
rename from cypress/e2e/index.spec.ts
rename to cypress/e2e/smoke.spec.ts
diff --git a/package.json b/package.json
index 869ecbec..9c68b14c 100644
--- a/package.json
+++ b/package.json
@@ -16,19 +16,19 @@
     "test:e2e": "start-test http-get://localhost:8080 test:cypress",
     "prod-start": "node server.js --prod",
     "test-mc-server": "tsx cypress/minecraft-server.mjs",
-    "lint": "eslint \"{src,cypress,prismarine-viewer}/**/*.{ts,js,jsx,tsx}\"",
+    "lint": "eslint \"{src,cypress,renderer}/**/*.{ts,js,jsx,tsx}\"",
     "lint-fix": "pnpm lint --fix",
     "storybook": "storybook dev -p 6006",
     "build-storybook": "storybook build && node scripts/build.js moveStorybookFiles",
     "start-experiments": "vite --config experiments/vite.config.ts --host",
     "watch-other-workers": "echo NOT IMPLEMENTED",
     "build-other-workers": "echo NOT IMPLEMENTED",
-    "build-mesher": "node prismarine-viewer/buildMesherWorker.mjs",
+    "build-mesher": "node renderer/buildMesherWorker.mjs",
     "watch-mesher": "pnpm build-mesher -w",
     "run-playground": "run-p watch-mesher watch-other-workers watch-playground",
     "run-all": "run-p start run-playground",
-    "build-playground": "rsbuild build --config prismarine-viewer/rsbuild.config.ts",
-    "watch-playground": "rsbuild dev --config prismarine-viewer/rsbuild.config.ts"
+    "build-playground": "rsbuild build --config renderer/rsbuild.config.ts",
+    "watch-playground": "rsbuild dev --config renderer/rsbuild.config.ts"
   },
   "keywords": [
     "prismarine",
@@ -152,7 +152,7 @@
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
     "path-exists-cli": "^2.0.0",
-    "prismarine-viewer": "link:prismarine-viewer",
+    "renderer": "link:renderer",
     "process": "github:PrismarineJS/node-process",
     "rimraf": "^5.0.1",
     "storybook": "^7.4.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0d98ea63..214de75b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -369,12 +369,12 @@ importers:
       path-exists-cli:
         specifier: ^2.0.0
         version: 2.0.0
-      prismarine-viewer:
-        specifier: link:prismarine-viewer
-        version: link:prismarine-viewer
       process:
         specifier: github:PrismarineJS/node-process
         version: https://codeload.github.com/PrismarineJS/node-process/tar.gz/380d0b4f4c86f1b65b216c311bf00431f314e88e
+      renderer:
+        specifier: link:renderer
+        version: link:renderer
       rimraf:
         specifier: ^5.0.1
         version: 5.0.1
@@ -400,7 +400,7 @@ importers:
         specifier: ^2.3.2
         version: 2.4.1
 
-  prismarine-viewer:
+  renderer:
     dependencies:
       '@tweenjs/tween.js':
         specifier: ^20.0.3
@@ -435,12 +435,12 @@ importers:
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
-      prismarine-viewer:
-        specifier: link:./
-        version: 'link:'
       process:
         specifier: ^0.11.10
         version: 0.11.10
+      renderer:
+        specifier: link:./
+        version: 'link:'
       socket.io:
         specifier: ^4.0.0
         version: 4.7.2
@@ -471,7 +471,7 @@ importers:
         specifier: ^1.2.2
         version: 1.2.2
 
-  prismarine-viewer/viewer/sign-renderer:
+  renderer/viewer/sign-renderer:
     dependencies:
       vite:
         specifier: ^4.4.9
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 131aadfe..5de14962 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,4 +1,4 @@
 packages:
   - "."
-  - "prismarine-viewer"
-  - "prismarine-viewer/viewer/sign-renderer/"
+  - "renderer"
+  - "renderer/viewer/sign-renderer/"
diff --git a/prismarine-viewer/README.MD b/prismarine-viewer/README.MD
new file mode 100644
index 00000000..7273a338
--- /dev/null
+++ b/prismarine-viewer/README.MD
@@ -0,0 +1,5 @@
+# Prismarine Viewer
+
+Renamed to `renderer`.
+
+For more info see [CONTRIBUTING.md](../CONTRIBUTING.md).
diff --git a/prismarine-viewer/.npmrc b/renderer/.npmrc
similarity index 100%
rename from prismarine-viewer/.npmrc
rename to renderer/.npmrc
diff --git a/prismarine-viewer/buildMesherConfig.mjs b/renderer/buildMesherConfig.mjs
similarity index 100%
rename from prismarine-viewer/buildMesherConfig.mjs
rename to renderer/buildMesherConfig.mjs
diff --git a/prismarine-viewer/buildMesherWorker.mjs b/renderer/buildMesherWorker.mjs
similarity index 100%
rename from prismarine-viewer/buildMesherWorker.mjs
rename to renderer/buildMesherWorker.mjs
diff --git a/prismarine-viewer/package.json b/renderer/package.json
similarity index 93%
rename from prismarine-viewer/package.json
rename to renderer/package.json
index 02b0a304..10049f4f 100644
--- a/prismarine-viewer/package.json
+++ b/renderer/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "prismarine-viewer",
+  "name": "renderer",
   "version": "1.25.0",
   "description": "Web based viewer",
   "main": "index.js",
@@ -26,7 +26,7 @@
     "prismarine-block": "^1.7.3",
     "prismarine-chunk": "^1.22.0",
     "prismarine-schematic": "^1.2.0",
-    "prismarine-viewer": "link:./",
+    "renderer": "link:./",
     "process": "^0.11.10",
     "socket.io": "^4.0.0",
     "socket.io-client": "^4.0.0",
diff --git a/prismarine-viewer/playground.html b/renderer/playground.html
similarity index 100%
rename from prismarine-viewer/playground.html
rename to renderer/playground.html
diff --git a/prismarine-viewer/examples/baseScene.ts b/renderer/playground/baseScene.ts
similarity index 97%
rename from prismarine-viewer/examples/baseScene.ts
rename to renderer/playground/baseScene.ts
index daa56fcc..02a6432f 100644
--- a/prismarine-viewer/examples/baseScene.ts
+++ b/renderer/playground/baseScene.ts
@@ -104,6 +104,17 @@ export class BasePlaygroundScene {
     }
     if (window.innerHeight < 700) {
       this.gui.open(false)
+    } else {
+      // const observer = new MutationObserver(() => {
+      //   this.gui.domElement.classList.remove('transition')
+      // })
+      // observer.observe(this.gui.domElement, {
+      //   attributes: true,
+      //   attributeFilter: ['class'],
+      // })
+      setTimeout(() => {
+        this.gui.domElement.classList.remove('transition')
+      }, 500)
     }
 
     this.gui.onChange(({ property, object }) => {
diff --git a/prismarine-viewer/examples/playground.ts b/renderer/playground/playground.ts
similarity index 100%
rename from prismarine-viewer/examples/playground.ts
rename to renderer/playground/playground.ts
diff --git a/prismarine-viewer/examples/playgroundUi.tsx b/renderer/playground/playgroundUi.tsx
similarity index 100%
rename from prismarine-viewer/examples/playgroundUi.tsx
rename to renderer/playground/playgroundUi.tsx
diff --git a/prismarine-viewer/examples/scenes/entities.ts b/renderer/playground/scenes/entities.ts
similarity index 100%
rename from prismarine-viewer/examples/scenes/entities.ts
rename to renderer/playground/scenes/entities.ts
diff --git a/prismarine-viewer/examples/scenes/floorRandom.ts b/renderer/playground/scenes/floorRandom.ts
similarity index 100%
rename from prismarine-viewer/examples/scenes/floorRandom.ts
rename to renderer/playground/scenes/floorRandom.ts
diff --git a/prismarine-viewer/examples/scenes/frequentUpdates.ts b/renderer/playground/scenes/frequentUpdates.ts
similarity index 100%
rename from prismarine-viewer/examples/scenes/frequentUpdates.ts
rename to renderer/playground/scenes/frequentUpdates.ts
diff --git a/prismarine-viewer/examples/scenes/index.ts b/renderer/playground/scenes/index.ts
similarity index 100%
rename from prismarine-viewer/examples/scenes/index.ts
rename to renderer/playground/scenes/index.ts
diff --git a/prismarine-viewer/examples/scenes/lightingStarfield.ts b/renderer/playground/scenes/lightingStarfield.ts
similarity index 100%
rename from prismarine-viewer/examples/scenes/lightingStarfield.ts
rename to renderer/playground/scenes/lightingStarfield.ts
diff --git a/prismarine-viewer/examples/scenes/main.ts b/renderer/playground/scenes/main.ts
similarity index 99%
rename from prismarine-viewer/examples/scenes/main.ts
rename to renderer/playground/scenes/main.ts
index 0aca157e..33fe2528 100644
--- a/prismarine-viewer/examples/scenes/main.ts
+++ b/renderer/playground/scenes/main.ts
@@ -222,7 +222,7 @@ class MainScene extends BasePlaygroundScene {
     })
 
     const zip = new JSZip()
-    zip.file('description.txt', 'Generated with prismarine-viewer')
+    zip.file('description.txt', 'Generated with mcraft.fun/playground')
 
     const end = async () => {
       // download zip file
diff --git a/prismarine-viewer/examples/scenes/railsCobweb.ts b/renderer/playground/scenes/railsCobweb.ts
similarity index 100%
rename from prismarine-viewer/examples/scenes/railsCobweb.ts
rename to renderer/playground/scenes/railsCobweb.ts
diff --git a/prismarine-viewer/examples/scenes/rotationIssue.ts b/renderer/playground/scenes/rotationIssue.ts
similarity index 100%
rename from prismarine-viewer/examples/scenes/rotationIssue.ts
rename to renderer/playground/scenes/rotationIssue.ts
diff --git a/prismarine-viewer/examples/scenes/slabsOptimization.ts b/renderer/playground/scenes/slabsOptimization.ts
similarity index 100%
rename from prismarine-viewer/examples/scenes/slabsOptimization.ts
rename to renderer/playground/scenes/slabsOptimization.ts
diff --git a/prismarine-viewer/examples/scenes/transparencyIssue.ts b/renderer/playground/scenes/transparencyIssue.ts
similarity index 100%
rename from prismarine-viewer/examples/scenes/transparencyIssue.ts
rename to renderer/playground/scenes/transparencyIssue.ts
diff --git a/prismarine-viewer/examples/shared.ts b/renderer/playground/shared.ts
similarity index 100%
rename from prismarine-viewer/examples/shared.ts
rename to renderer/playground/shared.ts
diff --git a/prismarine-viewer/rsbuild.config.ts b/renderer/rsbuild.config.ts
similarity index 94%
rename from prismarine-viewer/rsbuild.config.ts
rename to renderer/rsbuild.config.ts
index cea001db..d1cd681c 100644
--- a/prismarine-viewer/rsbuild.config.ts
+++ b/renderer/rsbuild.config.ts
@@ -30,7 +30,7 @@ export default mergeRsbuildConfig(
         },
         source: {
             entry: {
-                index: join(__dirname, './examples/playground.ts')
+                index: join(__dirname, './playground/playground.ts')
             },
             define: {
                 'globalThis.includedVersions': JSON.stringify(supportedVersions),
diff --git a/prismarine-viewer/rsbuildSharedConfig.ts b/renderer/rsbuildSharedConfig.ts
similarity index 100%
rename from prismarine-viewer/rsbuildSharedConfig.ts
rename to renderer/rsbuildSharedConfig.ts
diff --git a/prismarine-viewer/viewer/.gitignore b/renderer/viewer/.gitignore
similarity index 100%
rename from prismarine-viewer/viewer/.gitignore
rename to renderer/viewer/.gitignore
diff --git a/prismarine-viewer/viewer/index.js b/renderer/viewer/index.js
similarity index 100%
rename from prismarine-viewer/viewer/index.js
rename to renderer/viewer/index.js
diff --git a/prismarine-viewer/viewer/lib/cleanupDecorator.ts b/renderer/viewer/lib/cleanupDecorator.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/cleanupDecorator.ts
rename to renderer/viewer/lib/cleanupDecorator.ts
diff --git a/prismarine-viewer/viewer/lib/entities.ts b/renderer/viewer/lib/entities.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/entities.ts
rename to renderer/viewer/lib/entities.ts
diff --git a/prismarine-viewer/viewer/lib/entity/EntityMesh.ts b/renderer/viewer/lib/entity/EntityMesh.ts
similarity index 99%
rename from prismarine-viewer/viewer/lib/entity/EntityMesh.ts
rename to renderer/viewer/lib/entity/EntityMesh.ts
index 1db6d4c3..37a77e3d 100644
--- a/prismarine-viewer/viewer/lib/entity/EntityMesh.ts
+++ b/renderer/viewer/lib/entity/EntityMesh.ts
@@ -304,6 +304,7 @@ export function getMesh (
   mesh.scale.set(1 / 16, 1 / 16, 1 / 16)
 
   if (textureOffset) {
+    // todo(memory) dont clone
     const loadedTexture = blocksTexture.clone()
     loadedTexture.offset.set(textureOffset[0], textureOffset[1])
     loadedTexture.needsUpdate = true
diff --git a/prismarine-viewer/viewer/lib/entity/animations.js b/renderer/viewer/lib/entity/animations.js
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/animations.js
rename to renderer/viewer/lib/entity/animations.js
diff --git a/prismarine-viewer/viewer/lib/entity/armorModels.json b/renderer/viewer/lib/entity/armorModels.json
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/armorModels.json
rename to renderer/viewer/lib/entity/armorModels.json
diff --git a/prismarine-viewer/viewer/lib/entity/armorModels.ts b/renderer/viewer/lib/entity/armorModels.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/armorModels.ts
rename to renderer/viewer/lib/entity/armorModels.ts
diff --git a/prismarine-viewer/viewer/lib/entity/entities.json b/renderer/viewer/lib/entity/entities.json
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/entities.json
rename to renderer/viewer/lib/entity/entities.json
diff --git a/prismarine-viewer/viewer/lib/entity/exportedModels.js b/renderer/viewer/lib/entity/exportedModels.js
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/exportedModels.js
rename to renderer/viewer/lib/entity/exportedModels.js
diff --git a/prismarine-viewer/viewer/lib/entity/externalTextures.json b/renderer/viewer/lib/entity/externalTextures.json
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/externalTextures.json
rename to renderer/viewer/lib/entity/externalTextures.json
diff --git a/prismarine-viewer/viewer/lib/entity/models/allay.obj b/renderer/viewer/lib/entity/models/allay.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/allay.obj
rename to renderer/viewer/lib/entity/models/allay.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/axolotl.obj b/renderer/viewer/lib/entity/models/axolotl.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/axolotl.obj
rename to renderer/viewer/lib/entity/models/axolotl.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/blaze.obj b/renderer/viewer/lib/entity/models/blaze.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/blaze.obj
rename to renderer/viewer/lib/entity/models/blaze.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/boat.obj b/renderer/viewer/lib/entity/models/boat.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/boat.obj
rename to renderer/viewer/lib/entity/models/boat.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/camel.obj b/renderer/viewer/lib/entity/models/camel.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/camel.obj
rename to renderer/viewer/lib/entity/models/camel.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/cat.obj b/renderer/viewer/lib/entity/models/cat.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/cat.obj
rename to renderer/viewer/lib/entity/models/cat.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/chicken.obj b/renderer/viewer/lib/entity/models/chicken.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/chicken.obj
rename to renderer/viewer/lib/entity/models/chicken.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/cod.obj b/renderer/viewer/lib/entity/models/cod.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/cod.obj
rename to renderer/viewer/lib/entity/models/cod.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/creeper.obj b/renderer/viewer/lib/entity/models/creeper.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/creeper.obj
rename to renderer/viewer/lib/entity/models/creeper.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/dolphin.obj b/renderer/viewer/lib/entity/models/dolphin.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/dolphin.obj
rename to renderer/viewer/lib/entity/models/dolphin.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/ender_dragon.obj b/renderer/viewer/lib/entity/models/ender_dragon.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/ender_dragon.obj
rename to renderer/viewer/lib/entity/models/ender_dragon.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/enderman.obj b/renderer/viewer/lib/entity/models/enderman.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/enderman.obj
rename to renderer/viewer/lib/entity/models/enderman.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/endermite.obj b/renderer/viewer/lib/entity/models/endermite.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/endermite.obj
rename to renderer/viewer/lib/entity/models/endermite.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/fox.obj b/renderer/viewer/lib/entity/models/fox.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/fox.obj
rename to renderer/viewer/lib/entity/models/fox.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/frog.obj b/renderer/viewer/lib/entity/models/frog.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/frog.obj
rename to renderer/viewer/lib/entity/models/frog.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/ghast.obj b/renderer/viewer/lib/entity/models/ghast.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/ghast.obj
rename to renderer/viewer/lib/entity/models/ghast.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/goat.obj b/renderer/viewer/lib/entity/models/goat.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/goat.obj
rename to renderer/viewer/lib/entity/models/goat.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/guardian.obj b/renderer/viewer/lib/entity/models/guardian.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/guardian.obj
rename to renderer/viewer/lib/entity/models/guardian.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/horse.obj b/renderer/viewer/lib/entity/models/horse.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/horse.obj
rename to renderer/viewer/lib/entity/models/horse.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/llama.obj b/renderer/viewer/lib/entity/models/llama.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/llama.obj
rename to renderer/viewer/lib/entity/models/llama.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/minecart.obj b/renderer/viewer/lib/entity/models/minecart.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/minecart.obj
rename to renderer/viewer/lib/entity/models/minecart.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/parrot.obj b/renderer/viewer/lib/entity/models/parrot.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/parrot.obj
rename to renderer/viewer/lib/entity/models/parrot.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/piglin.obj b/renderer/viewer/lib/entity/models/piglin.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/piglin.obj
rename to renderer/viewer/lib/entity/models/piglin.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/pillager.obj b/renderer/viewer/lib/entity/models/pillager.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/pillager.obj
rename to renderer/viewer/lib/entity/models/pillager.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/rabbit.obj b/renderer/viewer/lib/entity/models/rabbit.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/rabbit.obj
rename to renderer/viewer/lib/entity/models/rabbit.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/sheep.obj b/renderer/viewer/lib/entity/models/sheep.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/sheep.obj
rename to renderer/viewer/lib/entity/models/sheep.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/shulker.obj b/renderer/viewer/lib/entity/models/shulker.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/shulker.obj
rename to renderer/viewer/lib/entity/models/shulker.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/sniffer.obj b/renderer/viewer/lib/entity/models/sniffer.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/sniffer.obj
rename to renderer/viewer/lib/entity/models/sniffer.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/spider.obj b/renderer/viewer/lib/entity/models/spider.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/spider.obj
rename to renderer/viewer/lib/entity/models/spider.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/tadpole.obj b/renderer/viewer/lib/entity/models/tadpole.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/tadpole.obj
rename to renderer/viewer/lib/entity/models/tadpole.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/turtle.obj b/renderer/viewer/lib/entity/models/turtle.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/turtle.obj
rename to renderer/viewer/lib/entity/models/turtle.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/vex.obj b/renderer/viewer/lib/entity/models/vex.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/vex.obj
rename to renderer/viewer/lib/entity/models/vex.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/villager.obj b/renderer/viewer/lib/entity/models/villager.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/villager.obj
rename to renderer/viewer/lib/entity/models/villager.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/warden.obj b/renderer/viewer/lib/entity/models/warden.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/warden.obj
rename to renderer/viewer/lib/entity/models/warden.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/witch.obj b/renderer/viewer/lib/entity/models/witch.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/witch.obj
rename to renderer/viewer/lib/entity/models/witch.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/wolf.obj b/renderer/viewer/lib/entity/models/wolf.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/wolf.obj
rename to renderer/viewer/lib/entity/models/wolf.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/zombie.obj b/renderer/viewer/lib/entity/models/zombie.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/zombie.obj
rename to renderer/viewer/lib/entity/models/zombie.obj
diff --git a/prismarine-viewer/viewer/lib/entity/models/zombie_villager.obj b/renderer/viewer/lib/entity/models/zombie_villager.obj
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/models/zombie_villager.obj
rename to renderer/viewer/lib/entity/models/zombie_villager.obj
diff --git a/prismarine-viewer/viewer/lib/entity/objModels.js b/renderer/viewer/lib/entity/objModels.js
similarity index 100%
rename from prismarine-viewer/viewer/lib/entity/objModels.js
rename to renderer/viewer/lib/entity/objModels.js
diff --git a/prismarine-viewer/viewer/lib/hand.ts b/renderer/viewer/lib/hand.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/hand.ts
rename to renderer/viewer/lib/hand.ts
diff --git a/prismarine-viewer/viewer/lib/holdingBlock.ts b/renderer/viewer/lib/holdingBlock.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/holdingBlock.ts
rename to renderer/viewer/lib/holdingBlock.ts
diff --git a/prismarine-viewer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/mesher/mesher.ts
rename to renderer/viewer/lib/mesher/mesher.ts
diff --git a/prismarine-viewer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
similarity index 99%
rename from prismarine-viewer/viewer/lib/mesher/models.ts
rename to renderer/viewer/lib/mesher/models.ts
index 80fff2a0..0dec4015 100644
--- a/prismarine-viewer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -1,7 +1,7 @@
 import { Vec3 } from 'vec3'
 import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import legacyJson from '../../../../src/preflatMap.json'
-import { BlockType } from '../../../examples/shared'
+import { BlockType } from '../../../playground/shared'
 import { World, BlockModelPartsResolved, WorldBlock as Block } from './world'
 import { BlockElement, buildRotationMatrix, elemFaces, matmul3, matmulmat3, vecadd3, vecsub3 } from './modelsGeometryCommon'
 import { INVISIBLE_BLOCKS } from './worldConstants'
diff --git a/prismarine-viewer/viewer/lib/mesher/modelsGeometryCommon.ts b/renderer/viewer/lib/mesher/modelsGeometryCommon.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/mesher/modelsGeometryCommon.ts
rename to renderer/viewer/lib/mesher/modelsGeometryCommon.ts
diff --git a/prismarine-viewer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
similarity index 94%
rename from prismarine-viewer/viewer/lib/mesher/shared.ts
rename to renderer/viewer/lib/mesher/shared.ts
index f3f5c2cc..9f88d2af 100644
--- a/prismarine-viewer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -1,4 +1,4 @@
-import { BlockType } from '../../../examples/shared'
+import { BlockType } from '../../../playground/shared'
 
 export const defaultMesherConfig = {
   version: '',
diff --git a/prismarine-viewer/viewer/lib/mesher/standaloneRenderer.ts b/renderer/viewer/lib/mesher/standaloneRenderer.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/mesher/standaloneRenderer.ts
rename to renderer/viewer/lib/mesher/standaloneRenderer.ts
diff --git a/prismarine-viewer/viewer/lib/mesher/test/mesherTester.ts b/renderer/viewer/lib/mesher/test/mesherTester.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/mesher/test/mesherTester.ts
rename to renderer/viewer/lib/mesher/test/mesherTester.ts
diff --git a/prismarine-viewer/viewer/lib/mesher/test/playground.ts b/renderer/viewer/lib/mesher/test/playground.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/mesher/test/playground.ts
rename to renderer/viewer/lib/mesher/test/playground.ts
diff --git a/prismarine-viewer/viewer/lib/mesher/test/tests.test.ts b/renderer/viewer/lib/mesher/test/tests.test.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/mesher/test/tests.test.ts
rename to renderer/viewer/lib/mesher/test/tests.test.ts
diff --git a/prismarine-viewer/viewer/lib/mesher/world.ts b/renderer/viewer/lib/mesher/world.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/mesher/world.ts
rename to renderer/viewer/lib/mesher/world.ts
diff --git a/prismarine-viewer/viewer/lib/mesher/worldConstants.ts b/renderer/viewer/lib/mesher/worldConstants.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/mesher/worldConstants.ts
rename to renderer/viewer/lib/mesher/worldConstants.ts
diff --git a/prismarine-viewer/viewer/lib/moreBlockDataGenerated.json b/renderer/viewer/lib/moreBlockDataGenerated.json
similarity index 100%
rename from prismarine-viewer/viewer/lib/moreBlockDataGenerated.json
rename to renderer/viewer/lib/moreBlockDataGenerated.json
diff --git a/prismarine-viewer/viewer/lib/primitives.js b/renderer/viewer/lib/primitives.js
similarity index 100%
rename from prismarine-viewer/viewer/lib/primitives.js
rename to renderer/viewer/lib/primitives.js
diff --git a/prismarine-viewer/viewer/lib/renderUtils.js b/renderer/viewer/lib/renderUtils.js
similarity index 100%
rename from prismarine-viewer/viewer/lib/renderUtils.js
rename to renderer/viewer/lib/renderUtils.js
diff --git a/prismarine-viewer/viewer/lib/simpleUtils.ts b/renderer/viewer/lib/simpleUtils.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/simpleUtils.ts
rename to renderer/viewer/lib/simpleUtils.ts
diff --git a/prismarine-viewer/viewer/lib/threeJsUtils.ts b/renderer/viewer/lib/threeJsUtils.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/threeJsUtils.ts
rename to renderer/viewer/lib/threeJsUtils.ts
diff --git a/prismarine-viewer/viewer/lib/ui/newStats.ts b/renderer/viewer/lib/ui/newStats.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/ui/newStats.ts
rename to renderer/viewer/lib/ui/newStats.ts
diff --git a/prismarine-viewer/viewer/lib/utils.electron.js b/renderer/viewer/lib/utils.electron.js
similarity index 100%
rename from prismarine-viewer/viewer/lib/utils.electron.js
rename to renderer/viewer/lib/utils.electron.js
diff --git a/prismarine-viewer/viewer/lib/utils.js b/renderer/viewer/lib/utils.js
similarity index 100%
rename from prismarine-viewer/viewer/lib/utils.js
rename to renderer/viewer/lib/utils.js
diff --git a/prismarine-viewer/viewer/lib/utils.web.js b/renderer/viewer/lib/utils.web.js
similarity index 100%
rename from prismarine-viewer/viewer/lib/utils.web.js
rename to renderer/viewer/lib/utils.web.js
diff --git a/prismarine-viewer/viewer/lib/viewer.ts b/renderer/viewer/lib/viewer.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/viewer.ts
rename to renderer/viewer/lib/viewer.ts
diff --git a/prismarine-viewer/viewer/lib/viewerWrapper.ts b/renderer/viewer/lib/viewerWrapper.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/viewerWrapper.ts
rename to renderer/viewer/lib/viewerWrapper.ts
diff --git a/prismarine-viewer/viewer/lib/workerProxy.ts b/renderer/viewer/lib/workerProxy.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/workerProxy.ts
rename to renderer/viewer/lib/workerProxy.ts
diff --git a/prismarine-viewer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
similarity index 99%
rename from prismarine-viewer/viewer/lib/worldDataEmitter.ts
rename to renderer/viewer/lib/worldDataEmitter.ts
index 76efe98c..fee47de2 100644
--- a/prismarine-viewer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -6,7 +6,7 @@ import { generateSpiralMatrix, ViewRect } from 'flying-squid/dist/utils'
 import { Vec3 } from 'vec3'
 import { BotEvents } from 'mineflayer'
 import { getItemFromBlock } from '../../../src/chatUtils'
-import { delayedIterator } from '../../examples/shared'
+import { delayedIterator } from '../../playground/shared'
 import { chunkPos } from './simpleUtils'
 
 export type ChunkPosKey = string
diff --git a/prismarine-viewer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/worldrendererCommon.ts
rename to renderer/viewer/lib/worldrendererCommon.ts
diff --git a/prismarine-viewer/viewer/lib/worldrendererThree.ts b/renderer/viewer/lib/worldrendererThree.ts
similarity index 100%
rename from prismarine-viewer/viewer/lib/worldrendererThree.ts
rename to renderer/viewer/lib/worldrendererThree.ts
diff --git a/prismarine-viewer/viewer/prepare/utils.ts b/renderer/viewer/prepare/utils.ts
similarity index 100%
rename from prismarine-viewer/viewer/prepare/utils.ts
rename to renderer/viewer/prepare/utils.ts
diff --git a/prismarine-viewer/viewer/sign-renderer/index.html b/renderer/viewer/sign-renderer/index.html
similarity index 100%
rename from prismarine-viewer/viewer/sign-renderer/index.html
rename to renderer/viewer/sign-renderer/index.html
diff --git a/prismarine-viewer/viewer/sign-renderer/index.ts b/renderer/viewer/sign-renderer/index.ts
similarity index 100%
rename from prismarine-viewer/viewer/sign-renderer/index.ts
rename to renderer/viewer/sign-renderer/index.ts
diff --git a/prismarine-viewer/viewer/sign-renderer/noop.js b/renderer/viewer/sign-renderer/noop.js
similarity index 100%
rename from prismarine-viewer/viewer/sign-renderer/noop.js
rename to renderer/viewer/sign-renderer/noop.js
diff --git a/prismarine-viewer/viewer/sign-renderer/package.json b/renderer/viewer/sign-renderer/package.json
similarity index 100%
rename from prismarine-viewer/viewer/sign-renderer/package.json
rename to renderer/viewer/sign-renderer/package.json
diff --git a/prismarine-viewer/viewer/sign-renderer/playground.ts b/renderer/viewer/sign-renderer/playground.ts
similarity index 100%
rename from prismarine-viewer/viewer/sign-renderer/playground.ts
rename to renderer/viewer/sign-renderer/playground.ts
diff --git a/prismarine-viewer/viewer/sign-renderer/tests.test.ts b/renderer/viewer/sign-renderer/tests.test.ts
similarity index 100%
rename from prismarine-viewer/viewer/sign-renderer/tests.test.ts
rename to renderer/viewer/sign-renderer/tests.test.ts
diff --git a/prismarine-viewer/viewer/sign-renderer/vite.config.ts b/renderer/viewer/sign-renderer/vite.config.ts
similarity index 100%
rename from prismarine-viewer/viewer/sign-renderer/vite.config.ts
rename to renderer/viewer/sign-renderer/vite.config.ts
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index c84c3c92..04edd23d 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -10,7 +10,7 @@ import fsExtra from 'fs-extra'
 import { promisify } from 'util'
 import { generateSW } from 'workbox-build'
 import { getSwAdditionalEntries } from './scripts/build'
-import { appAndRendererSharedConfig } from './prismarine-viewer/rsbuildSharedConfig'
+import { appAndRendererSharedConfig } from './renderer/rsbuildSharedConfig'
 
 //@ts-ignore
 try { require('./localSettings.js') } catch { }
@@ -31,7 +31,7 @@ if (fs.existsSync('./assets/release.json')) {
     releaseChangelog = releaseJson.changelog?.replace(/<!-- bump-type:[\w]+ -->/, '')
 }
 
-// base options are in ./prismarine-viewer/rsbuildSharedConfig.ts
+// base options are in ./renderer/rsbuildSharedConfig.ts
 const appConfig = defineConfig({
     html: {
         template: './index.html',
@@ -111,10 +111,10 @@ const appConfig = defineConfig({
                     // childProcess.execSync('./scripts/prepareSounds.mjs', { stdio: 'inherit' })
                     // childProcess.execSync('tsx ./scripts/genMcDataTypes.ts', { stdio: 'inherit' })
                     // childProcess.execSync('tsx ./scripts/genPixelartTypes.ts', { stdio: 'inherit' })
-                    if (fs.existsSync('./prismarine-viewer/dist/mesher.js') && dev) {
+                    if (fs.existsSync('./renderer/dist/mesher.js') && dev) {
                         // copy mesher
-                        fs.copyFileSync('./prismarine-viewer/dist/mesher.js', './dist/mesher.js')
-                        fs.copyFileSync('./prismarine-viewer/dist/mesher.js.map', './dist/mesher.js.map')
+                        fs.copyFileSync('./renderer/dist/mesher.js', './dist/mesher.js')
+                        fs.copyFileSync('./renderer/dist/mesher.js.map', './dist/mesher.js.map')
                     } else if (!dev) {
                         await execAsync('pnpm run build-mesher')
                     }
diff --git a/scripts/build.js b/scripts/build.js
index d3703eea..028a9fdc 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -6,7 +6,7 @@ const fs = require('fs')
 const crypto = require('crypto')
 const path = require('path')
 
-const prismarineViewerBase = "./node_modules/prismarine-viewer"
+const prismarineViewerBase = "./node_modules/renderer"
 
 // these files could be copied at build time eg with copy plugin, but copy plugin slows down the config so we copy them there, alternative we could inline it in esbuild config
 const filesToCopy = [
diff --git a/scripts/buildNpmReact.ts b/scripts/buildNpmReact.ts
index 9d0b3484..f4f00e4d 100644
--- a/scripts/buildNpmReact.ts
+++ b/scripts/buildNpmReact.ts
@@ -39,7 +39,7 @@ fs.promises.readdir(path.resolve(__dirname, '../src/react')).then(async (files)
     version = version.replace(/^v/, '')
     packageJson.version = version
 
-    const externalize = ['prismarine-viewer', 'mc-assets']
+    const externalize = ['renderer', 'mc-assets']
     const { metafile } = await build({
         entryPoints: [path.resolve(__dirname, '../src/react/npmReactComponents.ts')],
         bundle: true,
diff --git a/scripts/dockerPrepare.mjs b/scripts/dockerPrepare.mjs
index ff009168..37e57d01 100644
--- a/scripts/dockerPrepare.mjs
+++ b/scripts/dockerPrepare.mjs
@@ -12,6 +12,6 @@ const packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'))
 delete packageJson.optionalDependencies
 fs.writeFileSync('./package.json', JSON.stringify(packageJson, null, 2), 'utf8')
 
-const packageJsonViewer = JSON.parse(fs.readFileSync('./prismarine-viewer/package.json', 'utf8'))
+const packageJsonViewer = JSON.parse(fs.readFileSync('./renderer/package.json', 'utf8'))
 delete packageJsonViewer.optionalDependencies
-fs.writeFileSync('./prismarine-viewer/package.json', JSON.stringify(packageJsonViewer, null, 2), 'utf8')
+fs.writeFileSync('./renderer/package.json', JSON.stringify(packageJsonViewer, null, 2), 'utf8')
diff --git a/src/botUtils.ts b/src/botUtils.ts
index 4e803de2..ac2deb02 100644
--- a/src/botUtils.ts
+++ b/src/botUtils.ts
@@ -1,4 +1,4 @@
-import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/prepare/utils'
 import * as nbt from 'prismarine-nbt'
 
 export const displayClientChat = (text: string) => {
diff --git a/src/chatUtils.ts b/src/chatUtils.ts
index e1cd7df2..a5e9e0f8 100644
--- a/src/chatUtils.ts
+++ b/src/chatUtils.ts
@@ -1,8 +1,8 @@
-// this should actually be moved to mineflayer / prismarine-viewer
+// this should actually be moved to mineflayer / renderer
 
 import { fromFormattedString, TextComponent } from '@xmcl/text-component'
 import type { IndexedData } from 'minecraft-data'
-import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/prepare/utils'
 
 export type MessageFormatPart = Pick<TextComponent, 'hoverEvent' | 'clickEvent'> & {
   text: string
diff --git a/src/connect.ts b/src/connect.ts
index 0dd6c8fd..9ada9b8a 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -1,6 +1,6 @@
 // import { versionsByMinecraftVersion } from 'minecraft-data'
 // import minecraftInitialDataJson from '../generated/minecraft-initial-data.json'
-import { AuthenticatedAccount } from './react/ServersListProvider'
+import { AuthenticatedAccount } from './react/serversStorage'
 import { downloadSoundsIfNeeded } from './sounds/botSoundSystem'
 import { options } from './optionsStorage'
 import supportedVersions from './supportedVersions.mjs'
diff --git a/src/devReload.ts b/src/devReload.ts
index f30624e8..5be5f2f6 100644
--- a/src/devReload.ts
+++ b/src/devReload.ts
@@ -1,5 +1,5 @@
-import { isMobile } from 'prismarine-viewer/viewer/lib/simpleUtils'
-import { WorldRendererThree } from 'prismarine-viewer/viewer/lib/worldrendererThree'
+import { isMobile } from 'renderer/viewer/lib/simpleUtils'
+import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
 
 if (process.env.NODE_ENV === 'development') {
   // mobile devtools
diff --git a/src/devtools.ts b/src/devtools.ts
index 9aec8b77..223c950d 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -1,7 +1,7 @@
 // global variables useful for debugging
 
 import fs from 'fs'
-import { WorldRendererThree } from 'prismarine-viewer/viewer/lib/worldrendererThree'
+import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
 import { getEntityCursor } from './worldInteractions'
 
 window.cursorBlockRel = (x = 0, y = 0, z = 0) => {
diff --git a/src/entities.ts b/src/entities.ts
index c4713a92..774ce32e 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -1,5 +1,5 @@
 import { Entity } from 'prismarine-entity'
-import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/prepare/utils'
 import tracker from '@nxg-org/mineflayer-tracker'
 import { loader as autoJumpPlugin } from '@nxg-org/mineflayer-auto-jump'
 import { subscribeKey } from 'valtio/utils'
diff --git a/src/globals.d.ts b/src/globals.d.ts
index 10d05fa0..96b32916 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -11,8 +11,8 @@ declare const bot: Omit<import('mineflayer').Bot, 'world' | '_client'> & {
   }
 }
 declare const __type_bot: typeof bot
-declare const viewer: import('prismarine-viewer/viewer/lib/viewer').Viewer
-declare const worldView: import('prismarine-viewer/viewer/lib/worldDataEmitter').WorldDataEmitter | undefined
+declare const viewer: import('renderer/viewer/lib/viewer').Viewer
+declare const worldView: import('renderer/viewer/lib/worldDataEmitter').WorldDataEmitter | undefined
 declare const addStatPerSec: (name: string) => void
 declare const localServer: import('flying-squid/dist/index').FullServer & { options } | undefined
 /** all currently loaded mc data */
diff --git a/src/googledrive.ts b/src/googledrive.ts
index c1007bd5..76fa1ce2 100644
--- a/src/googledrive.ts
+++ b/src/googledrive.ts
@@ -1,7 +1,7 @@
 import { GoogleOAuthProvider, useGoogleLogin } from '@react-oauth/google'
 import { proxy, ref, subscribe } from 'valtio'
 import React from 'react'
-import { loadScript } from 'prismarine-viewer/viewer/lib/utils'
+import { loadScript } from 'renderer/viewer/lib/utils'
 import { loadGoogleDriveApi, loadInMemorySave } from './react/SingleplayerProvider'
 import { setLoadingScreenStatus } from './appStatus'
 import { mountGoogleDriveFolder } from './browserfs'
diff --git a/src/index.ts b/src/index.ts
index 437fb15b..99efa5f8 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -35,7 +35,7 @@ import downloadAndOpenFile from './downloadAndOpenFile'
 import fs from 'fs'
 import net from 'net'
 import mineflayer from 'mineflayer'
-import { WorldDataEmitter, Viewer } from 'prismarine-viewer/viewer'
+import { WorldDataEmitter, Viewer } from 'renderer/viewer'
 import pathfinder from 'mineflayer-pathfinder'
 import { Vec3 } from 'vec3'
 
@@ -88,14 +88,14 @@ import { possiblyHandleStateVariable } from './googledrive'
 import flyingSquidEvents from './flyingSquidEvents'
 import { hideNotification, notificationProxy, showNotification } from './react/NotificationProvider'
 import { saveToBrowserMemory } from './react/PauseScreen'
-import { ViewerWrapper } from 'prismarine-viewer/viewer/lib/viewerWrapper'
+import { ViewerWrapper } from 'renderer/viewer/lib/viewerWrapper'
 import './devReload'
 import './water'
 import { ConnectOptions, downloadMcDataOnConnect, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData } from './connect'
 import { ref, subscribe } from 'valtio'
 import { signInMessageState } from './react/SignInMessageProvider'
-import { updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/ServersListProvider'
-import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+import { updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/serversStorage'
+import { versionToNumber } from 'renderer/viewer/prepare/utils'
 import packetsPatcher from './packetsPatcher'
 import { mainMenuState } from './react/MainMenuRenderApp'
 import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
@@ -159,7 +159,7 @@ if (isIphone) {
 }
 
 // Create viewer
-const viewer: import('prismarine-viewer/viewer/lib/viewer').Viewer = new Viewer(renderer)
+const viewer: import('renderer/viewer/lib/viewer').Viewer = new Viewer(renderer)
 window.viewer = viewer
 viewer.getMineflayerBot = () => bot
 // todo unify
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 931348b5..efda5392 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -6,7 +6,7 @@ import { RecipeItem } from 'minecraft-data'
 import { flat, fromFormattedString } from '@xmcl/text-component'
 import { splitEvery, equals } from 'rambda'
 import PItem, { Item } from 'prismarine-item'
-import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/prepare/utils'
 import { getRenamedData } from 'flying-squid/dist/blockRenames'
 import PrismarineChatLoader from 'prismarine-chat'
 import { BlockModel } from 'mc-assets'
diff --git a/src/loadSave.ts b/src/loadSave.ts
index 1f683775..861cc212 100644
--- a/src/loadSave.ts
+++ b/src/loadSave.ts
@@ -3,7 +3,7 @@ import path from 'path'
 import * as nbt from 'prismarine-nbt'
 import { proxy } from 'valtio'
 import { gzip } from 'node-gzip'
-import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/prepare/utils'
 import { options } from './optionsStorage'
 import { nameToMcOfflineUUID, disconnect } from './flyingSquidUtils'
 import { existsViaStats, forceCachedDataPaths, forceRedirectPaths, mkdirRecursive } from './browserfs'
diff --git a/src/optimizeJson.ts b/src/optimizeJson.ts
index 491c8301..d19d25d5 100644
--- a/src/optimizeJson.ts
+++ b/src/optimizeJson.ts
@@ -1,4 +1,4 @@
-import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/prepare/utils'
 
 type IdMap = Record<string, number>
 
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index a56e5200..9ea25920 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -1,6 +1,6 @@
 import { useRef, useState } from 'react'
 import { useSnapshot } from 'valtio'
-import { openURL } from 'prismarine-viewer/viewer/lib/simpleUtils'
+import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { noCase } from 'change-case'
 import { gameAdditionalState, miscUiState, openOptionsMenu, showModal } from './globalState'
 import { AppOptions, options } from './optionsStorage'
diff --git a/src/panorama.ts b/src/panorama.ts
index 226acf4b..efc06e16 100644
--- a/src/panorama.ts
+++ b/src/panorama.ts
@@ -4,7 +4,7 @@ import { join } from 'path'
 import fs from 'fs'
 import * as THREE from 'three'
 import { subscribeKey } from 'valtio/utils'
-import { EntityMesh } from 'prismarine-viewer/viewer/lib/entity/EntityMesh'
+import { EntityMesh } from 'renderer/viewer/lib/entity/EntityMesh'
 import { fromTexturePackPath, resourcePackState } from './resourcePack'
 import { options, watchValue } from './optionsStorage'
 import { miscUiState } from './globalState'
@@ -105,7 +105,7 @@ export async function addPanoramaCubeMap () {
 
   // should be rewritten entirely
   for (let i = 0; i < 20; i++) {
-    const m = new EntityMesh('1.16.4', 'squid').mesh!
+    const m = new EntityMesh('1.16.4', 'squid', viewer.world).mesh
     m.position.set(Math.random() * 30 - 15, Math.random() * 20 - 10, Math.random() * 10 - 17)
     m.rotation.set(0, Math.PI + Math.random(), -Math.PI / 4, 'ZYX')
     const v = Math.random() * 0.01
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index ffbc593c..e0c620a7 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -1,8 +1,6 @@
 import { proxy, useSnapshot } from 'valtio'
-import { useEffect, useRef, useState } from 'react'
-import { activeModalStack, activeModalStacks, hideModal, insertActiveModalStack, miscUiState, showModal } from '../globalState'
-import { resetLocalStorageWorld } from '../browserfs'
-import { fsState } from '../loadSave'
+import { useEffect, useState } from 'react'
+import { activeModalStack, activeModalStacks, hideModal, insertActiveModalStack, miscUiState } from '../globalState'
 import { guessProblem } from '../errorLoadingScreenHelpers'
 import type { ConnectOptions } from '../connect'
 import { downloadPacketsReplay, packetsReplaceSessionState, replayLogger } from '../packetsReplay'
@@ -12,10 +10,9 @@ import DiveTransition from './DiveTransition'
 import { useDidUpdateEffect } from './utils'
 import { useIsModalActive } from './utilsApp'
 import Button from './Button'
-import { AuthenticatedAccount, updateAuthenticatedAccountData, updateLoadedServerData } from './ServersListProvider'
+import { updateAuthenticatedAccountData, updateLoadedServerData, AuthenticatedAccount } from './serversStorage'
 import { showOptionsModal } from './SelectOption'
 import LoadingChunks from './LoadingChunks'
-import MessageFormatted from './MessageFormatted'
 import MessageFormattedString from './MessageFormattedString'
 
 const initialState = {
diff --git a/src/react/BookProvider.tsx b/src/react/BookProvider.tsx
index db68d95a..056377cc 100644
--- a/src/react/BookProvider.tsx
+++ b/src/react/BookProvider.tsx
@@ -1,4 +1,4 @@
-import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/prepare/utils'
 import nbt from 'prismarine-nbt'
 import { useEffect, useState } from 'react'
 import { useSnapshot } from 'valtio'
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 7caf6955..85f3b6e0 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -7,7 +7,7 @@ import { options } from '../optionsStorage'
 import Chat, { Message, fadeMessage } from './Chat'
 import { useIsModalActive } from './utilsApp'
 import { hideNotification, showNotification } from './NotificationProvider'
-import { updateLoadedServerData } from './ServersListProvider'
+import { updateLoadedServerData } from './serversStorage'
 import { lastConnectOptions } from './AppStatusProvider'
 
 export default () => {
diff --git a/src/react/DiscordButton.tsx b/src/react/DiscordButton.tsx
index 99208c45..3824c4c1 100644
--- a/src/react/DiscordButton.tsx
+++ b/src/react/DiscordButton.tsx
@@ -1,5 +1,5 @@
 import { useFloating, arrow, FloatingArrow, offset as offsetMiddleware, Placement, autoPlacement } from '@floating-ui/react'
-import { openURL } from 'prismarine-viewer/viewer/lib/simpleUtils'
+import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { CSSProperties, useState } from 'react'
 import Button from './Button'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
diff --git a/src/react/Input.tsx b/src/react/Input.tsx
index f265eb5f..790d6c8d 100644
--- a/src/react/Input.tsx
+++ b/src/react/Input.tsx
@@ -1,5 +1,5 @@
 import React, { CSSProperties, useEffect, useMemo, useRef, useState } from 'react'
-import { isMobile } from 'prismarine-viewer/viewer/lib/simpleUtils'
+import { isMobile } from 'renderer/viewer/lib/simpleUtils'
 import styles from './input.module.css'
 
 interface Props extends Omit<React.ComponentProps<'input'>, 'width'> {
diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 349d9a43..ff0ab4bd 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { openURL } from 'prismarine-viewer/viewer/lib/simpleUtils'
+import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { haveDirectoryPicker } from '../utils'
 import { ConnectOptions } from '../connect'
 import styles from './mainMenu.module.css'
diff --git a/src/react/MessageFormatted.tsx b/src/react/MessageFormatted.tsx
index 3b727fc8..95204b26 100644
--- a/src/react/MessageFormatted.tsx
+++ b/src/react/MessageFormatted.tsx
@@ -2,7 +2,7 @@ import { ComponentProps } from 'react'
 import { render } from '@xmcl/text-component'
 import { noCase } from 'change-case'
 import mojangson from 'mojangson'
-import { openURL } from 'prismarine-viewer/viewer/lib/simpleUtils'
+import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { MessageFormatPart } from '../chatUtils'
 import { chatInputValueGlobal } from './Chat'
 import './MessageFormatted.css'
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
index 44ee57b8..4d673a2f 100644
--- a/src/react/MinimapProvider.tsx
+++ b/src/react/MinimapProvider.tsx
@@ -3,16 +3,16 @@ import { versions } from 'minecraft-data'
 import { simplify } from 'prismarine-nbt'
 import RegionFile from 'prismarine-provider-anvil/src/region'
 import { Vec3 } from 'vec3'
-import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/prepare/utils'
 import { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
 import { TypedEventEmitter } from 'contro-max/build/typedEventEmitter'
 import { PCChunk } from 'prismarine-chunk'
 import { Chunk } from 'prismarine-world/types/world'
 import { Block } from 'prismarine-block'
-import { INVISIBLE_BLOCKS } from 'prismarine-viewer/viewer/lib/mesher/worldConstants'
+import { INVISIBLE_BLOCKS } from 'renderer/viewer/lib/mesher/worldConstants'
 import { getRenamedData } from 'flying-squid/dist/blockRenames'
 import { useSnapshot } from 'valtio'
-import BlockData from '../../prismarine-viewer/viewer/lib/moreBlockDataGenerated.json'
+import BlockData from '../../renderer/viewer/lib/moreBlockDataGenerated.json'
 import preflatMap from '../preflatMap.json'
 import { contro } from '../controls'
 import { gameAdditionalState, showModal, hideModal, miscUiState, activeModalStack } from '../globalState'
diff --git a/src/react/ModuleSignsViewer.tsx b/src/react/ModuleSignsViewer.tsx
index 2115c352..70b42ba0 100644
--- a/src/react/ModuleSignsViewer.tsx
+++ b/src/react/ModuleSignsViewer.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from 'react'
-import { WorldRendererThree } from 'prismarine-viewer/viewer/lib/worldrendererThree'
+import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
 import FullScreenWidget from './FullScreenWidget'
 
 export const name = 'loaded world signs'
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 5cc0c432..01edaa13 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -3,7 +3,7 @@ import fs from 'fs'
 import { useEffect } from 'react'
 import { subscribe, useSnapshot } from 'valtio'
 import { usedServerPathsV1 } from 'flying-squid/dist/lib/modules/world'
-import { openURL } from 'prismarine-viewer/viewer/lib/simpleUtils'
+import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { Vec3 } from 'vec3'
 import { generateSpiralMatrix } from 'flying-squid/dist/utils'
 import { subscribeKey } from 'valtio/utils'
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 308ee1ff..b7c19936 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -1,12 +1,11 @@
 import { useEffect, useMemo, useState } from 'react'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { useSnapshot } from 'valtio'
-import { ConnectOptions, downloadAllMinecraftData, getVersionAutoSelect } from '../connect'
+import { ConnectOptions } from '../connect'
 import { activeModalStack, hideCurrentModal, miscUiState, showModal } from '../globalState'
 import supportedVersions from '../supportedVersions.mjs'
 import { appQueryParams } from '../appParams'
 import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
-import { pingServerVersion } from '../mineflayer/minecraft-protocol-extra'
 import { getServerInfo } from '../mineflayer/mc-protocol'
 import { parseServerAddress } from '../utils'
 import ServersList from './ServersList'
@@ -15,14 +14,7 @@ import { useDidUpdateEffect } from './utils'
 import { useIsModalActive } from './utilsApp'
 import { showOptionsModal } from './SelectOption'
 import { useCopyKeybinding } from './simpleHooks'
-
-export interface StoreServerItem extends BaseServerInfo {
-  lastJoined?: number
-  description?: string
-  optionsOverride?: Record<string, any>
-  autoLogin?: Record<string, string>
-  numConnects?: number // Track number of connections
-}
+import { AuthenticatedAccount, getInitialServersList, getServerConnectionHistory, setNewServersList, StoreServerItem } from './serversStorage'
 
 type AdditionalDisplayData = {
   formattedText: string
@@ -31,64 +23,9 @@ type AdditionalDisplayData = {
   offline?: boolean
 }
 
-export interface AuthenticatedAccount {
-  // type: 'microsoft'
-  username: string
-  cachedTokens?: {
-    data: any
-    expiresOn: number
-  }
-}
-
-const getInitialServersList = () => {
-  if (localStorage['serversList']) return JSON.parse(localStorage['serversList']) as StoreServerItem[]
-
-  const servers = [] as StoreServerItem[]
-
-  const legacyServersList = localStorage['serverHistory'] ? JSON.parse(localStorage['serverHistory']) as string[] : null
-  if (legacyServersList) {
-    for (const server of legacyServersList) {
-      if (!server || localStorage['server'] === server) continue
-      servers.push({ ip: server, lastJoined: Date.now() })
-    }
-  }
-
-  if (localStorage['server']) {
-    const legacyLastJoinedServer: StoreServerItem = {
-      ip: localStorage['server'],
-      versionOverride: localStorage['version'],
-      lastJoined: Date.now()
-    }
-    servers.push(legacyLastJoinedServer)
-  }
-
-  if (servers.length === 0) { // server list is empty, let's suggest some
-    for (const server of miscUiState.appConfig?.promoteServers ?? []) {
-      servers.push({
-        ip: server.ip,
-        description: server.description,
-        versionOverride: server.version,
-      })
-    }
-  }
-
-  return servers
-}
-
 const serversListQs = appQueryParams.serversList
 const proxyQs = appQueryParams.proxy
 
-const setNewServersList = (serversList: StoreServerItem[], force = false) => {
-  if (serversListQs && !force) return
-  localStorage['serversList'] = JSON.stringify(serversList)
-
-  // cleanup legacy
-  localStorage.removeItem('serverHistory')
-  localStorage.removeItem('server')
-  localStorage.removeItem('password')
-  localStorage.removeItem('version')
-}
-
 const getInitialProxies = () => {
   const proxies = [] as string[]
   if (miscUiState.appConfig?.defaultProxy) {
@@ -101,59 +38,6 @@ const getInitialProxies = () => {
   return proxies
 }
 
-export const updateLoadedServerData = (callback: (data: StoreServerItem) => StoreServerItem, index = miscUiState.loadedServerIndex) => {
-  if (!index) index = miscUiState.loadedServerIndex
-  if (!index) return
-  // function assumes component is not mounted to avoid sync issues after save
-  const servers = getInitialServersList()
-  const server = servers[index]
-  servers[index] = callback(server)
-  setNewServersList(servers)
-}
-
-export const updateAuthenticatedAccountData = (callback: (data: AuthenticatedAccount[]) => AuthenticatedAccount[]) => {
-  const accounts = JSON.parse(localStorage['authenticatedAccounts'] || '[]') as AuthenticatedAccount[]
-  const newAccounts = callback(accounts)
-  localStorage['authenticatedAccounts'] = JSON.stringify(newAccounts)
-}
-
-interface ServerConnectionHistory {
-  ip: string
-  numConnects: number
-  lastConnected: number
-  version?: string
-}
-
-export function updateServerConnectionHistory (ip: string, version?: string) {
-  try {
-    const history: ServerConnectionHistory[] = JSON.parse(localStorage.getItem('serverConnectionHistory') || '[]')
-    const existingServer = history.find(s => s.ip === ip)
-    if (existingServer) {
-      existingServer.numConnects++
-      existingServer.lastConnected = Date.now()
-      if (version) existingServer.version = version
-    } else {
-      history.push({
-        ip,
-        numConnects: 1,
-        lastConnected: Date.now(),
-        version
-      })
-    }
-    localStorage.setItem('serverConnectionHistory', JSON.stringify(history))
-  } catch (err) {
-    console.error('Failed to update server connection history:', err)
-  }
-}
-
-export function getServerConnectionHistory (): ServerConnectionHistory[] {
-  try {
-    return JSON.parse(localStorage.getItem('serverConnectionHistory') || '[]')
-  } catch {
-    return []
-  }
-}
-
 // todo move to base
 const normalizeIp = (ip: string) => ip.replace(/https?:\/\//, '').replace(/\/(:|$)/, '')
 
diff --git a/src/react/SingleplayerProvider.tsx b/src/react/SingleplayerProvider.tsx
index c328813e..6672de6e 100644
--- a/src/react/SingleplayerProvider.tsx
+++ b/src/react/SingleplayerProvider.tsx
@@ -1,7 +1,7 @@
 import fs from 'fs'
 import { proxy, subscribe, useSnapshot } from 'valtio'
 import { useEffect, useRef, useState } from 'react'
-import { loadScript } from 'prismarine-viewer/viewer/lib/utils'
+import { loadScript } from 'renderer/viewer/lib/utils'
 import { fsState, loadSave, longArrayToNumber, readLevelDat } from '../loadSave'
 import { googleDriveGetFileIdFromPath, mountExportFolder, mountGoogleDriveFolder, removeFileRecursiveAsync } from '../browserfs'
 import { hideCurrentModal, showModal } from '../globalState'
diff --git a/src/react/serversStorage.ts b/src/react/serversStorage.ts
new file mode 100644
index 00000000..74f51a8d
--- /dev/null
+++ b/src/react/serversStorage.ts
@@ -0,0 +1,115 @@
+import { appQueryParams } from '../appParams'
+import { miscUiState } from '../globalState'
+import { BaseServerInfo } from './AddServerOrConnect'
+
+const serversListQs = appQueryParams.serversList
+
+export interface StoreServerItem extends BaseServerInfo {
+  lastJoined?: number
+  description?: string
+  optionsOverride?: Record<string, any>
+  autoLogin?: Record<string, string>
+  numConnects?: number // Track number of connections
+}
+export interface AuthenticatedAccount {
+  // type: 'microsoft'
+  username: string
+  cachedTokens?: {
+    data: any
+    expiresOn: number
+  }
+}
+export interface ServerConnectionHistory {
+  ip: string
+  numConnects: number
+  lastConnected: number
+  version?: string
+}
+
+export function updateServerConnectionHistory (ip: string, version?: string) {
+  try {
+    const history: ServerConnectionHistory[] = JSON.parse(localStorage.getItem('serverConnectionHistory') || '[]')
+    const existingServer = history.find(s => s.ip === ip)
+    if (existingServer) {
+      existingServer.numConnects++
+      existingServer.lastConnected = Date.now()
+      if (version) existingServer.version = version
+    } else {
+      history.push({
+        ip,
+        numConnects: 1,
+        lastConnected: Date.now(),
+        version
+      })
+    }
+    localStorage.setItem('serverConnectionHistory', JSON.stringify(history))
+  } catch (err) {
+    console.error('Failed to update server connection history:', err)
+  }
+}
+export const updateLoadedServerData = (callback: (data: StoreServerItem) => StoreServerItem, index = miscUiState.loadedServerIndex) => {
+  if (!index) index = miscUiState.loadedServerIndex
+  if (!index) return
+  // function assumes component is not mounted to avoid sync issues after save
+  const servers = getInitialServersList()
+  const server = servers[index]
+  servers[index] = callback(server)
+  setNewServersList(servers)
+}
+export const setNewServersList = (serversList: StoreServerItem[], force = false) => {
+  if (serversListQs && !force) return
+  localStorage['serversList'] = JSON.stringify(serversList)
+
+  // cleanup legacy
+  localStorage.removeItem('serverHistory')
+  localStorage.removeItem('server')
+  localStorage.removeItem('password')
+  localStorage.removeItem('version')
+}
+export const getInitialServersList = () => {
+  if (localStorage['serversList']) return JSON.parse(localStorage['serversList']) as StoreServerItem[]
+
+  const servers = [] as StoreServerItem[]
+
+  const legacyServersList = localStorage['serverHistory'] ? JSON.parse(localStorage['serverHistory']) as string[] : null
+  if (legacyServersList) {
+    for (const server of legacyServersList) {
+      if (!server || localStorage['server'] === server) continue
+      servers.push({ ip: server, lastJoined: Date.now() })
+    }
+  }
+
+  if (localStorage['server']) {
+    const legacyLastJoinedServer: StoreServerItem = {
+      ip: localStorage['server'],
+      versionOverride: localStorage['version'],
+      lastJoined: Date.now()
+    }
+    servers.push(legacyLastJoinedServer)
+  }
+
+  if (servers.length === 0) { // server list is empty, let's suggest some
+    for (const server of miscUiState.appConfig?.promoteServers ?? []) {
+      servers.push({
+        ip: server.ip,
+        description: server.description,
+        versionOverride: server.version,
+      })
+    }
+  }
+
+  return servers
+}
+export const updateAuthenticatedAccountData = (callback: (data: AuthenticatedAccount[]) => AuthenticatedAccount[]) => {
+  const accounts = JSON.parse(localStorage['authenticatedAccounts'] || '[]') as AuthenticatedAccount[]
+  const newAccounts = callback(accounts)
+  localStorage['authenticatedAccounts'] = JSON.stringify(newAccounts)
+}
+
+export function getServerConnectionHistory (): ServerConnectionHistory[] {
+  try {
+    return JSON.parse(localStorage.getItem('serverConnectionHistory') || '[]')
+  } catch {
+    return []
+  }
+}
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 66c8a656..c65f44d6 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -3,7 +3,7 @@ import { join, dirname, basename } from 'path'
 import fs from 'fs'
 import JSZip from 'jszip'
 import { proxy, subscribe } from 'valtio'
-import { WorldRendererThree } from 'prismarine-viewer/viewer/lib/worldrendererThree'
+import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
 import { collectFilesToCopy, copyFilesAsyncWithProgress, mkdirRecursive, removeFileRecursiveAsync } from './browserfs'
 import { setLoadingScreenStatus } from './appStatus'
 import { showNotification } from './react/NotificationProvider'
diff --git a/src/shims/minecraftData.ts b/src/shims/minecraftData.ts
index 09124771..c25bcfb0 100644
--- a/src/shims/minecraftData.ts
+++ b/src/shims/minecraftData.ts
@@ -1,4 +1,4 @@
-import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/prepare/utils'
 import JsonOptimizer from '../optimizeJson'
 // import minecraftInitialDataJson from '../../generated/minecraft-initial-data.json'
 import { toMajorVersion } from '../utils'
diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 4bf014ac..01cef0c5 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -1,6 +1,6 @@
 import { Vec3 } from 'vec3'
-import { versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
-import { loadScript } from 'prismarine-viewer/viewer/lib/utils'
+import { versionToNumber } from 'renderer/viewer/prepare/utils'
+import { loadScript } from 'renderer/viewer/lib/utils'
 import type { Block } from 'prismarine-block'
 import { subscribeKey } from 'valtio/utils'
 import { miscUiState } from '../globalState'
diff --git a/src/sounds/soundsMap.ts b/src/sounds/soundsMap.ts
index 94c5a4d8..c53be871 100644
--- a/src/sounds/soundsMap.ts
+++ b/src/sounds/soundsMap.ts
@@ -1,6 +1,6 @@
 import fs from 'fs'
 import path from 'path'
-import { versionsMapToMajor, versionToMajor, versionToNumber } from 'prismarine-viewer/viewer/prepare/utils'
+import { versionsMapToMajor, versionToMajor, versionToNumber } from 'renderer/viewer/prepare/utils'
 
 import { stopAllSounds } from '../basicSounds'
 import { musicSystem } from './musicSystem'
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 84092de2..e248c459 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -1,8 +1,8 @@
 // not all options are watched here
 
 import { subscribeKey } from 'valtio/utils'
-import { WorldRendererThree } from 'prismarine-viewer/viewer/lib/worldrendererThree'
-import { isMobile } from 'prismarine-viewer/viewer/lib/simpleUtils'
+import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
+import { isMobile } from 'renderer/viewer/lib/simpleUtils'
 import { options, watchValue } from './optionsStorage'
 import { reloadChunks } from './utils'
 import { miscUiState } from './globalState'
diff --git a/tsconfig.json b/tsconfig.json
index addc64f1..24926180 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -25,8 +25,8 @@
     "include": [
         "src",
         "cypress",
-        "prismarine-viewer/viewer",
-        "prismarine-viewer/examples"
+        "renderer/viewer",
+        "renderer/playground"
     ],
     "exclude": [
         "node_modules"
diff --git a/vitest.config.ts b/vitest.config.ts
index c27621d5..ea875183 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -1,7 +1,7 @@
 import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
-  root: 'prismarine-viewer/viewer',
+  root: 'renderer/viewer',
   test: {
     include: [
       '../../src/botUtils.test.ts',

From c063ff7244118bca537a70364474d112d59b00ff Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 9 Feb 2025 13:58:43 +0300
Subject: [PATCH 205/753] regression fixes

- Modify proxy connection logic to check for server configuration
- Enhance resource pack handling to deny pack if not accepted
- Improve server address parsing by stripping http/https protocols
---
 src/index.ts        | 4 ++--
 src/resourcePack.ts | 5 ++++-
 src/utils.ts        | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 99efa5f8..6088735d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -290,7 +290,7 @@ export async function connect (connectOptions: ConnectOptions) {
   let { username } = connectOptions
 
   if (connectOptions.server) {
-    console.log(`connecting to ${server.host}:${server.port}`)
+    console.log(`connecting to ${server.host}:${server.port ?? 25_565}`)
   }
   console.log('using player username', username)
 
@@ -369,7 +369,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
   let clientDataStream
 
-  if (proxy && !connectOptions.viewerWsConnect && !parsedServer.isWebSocket) {
+  if (connectOptions.server && !connectOptions.viewerWsConnect && !parsedServer.isWebSocket) {
     console.log(`using proxy ${proxy.host}:${proxy.port || location.port}`)
     net['setProxy']({ hostname: proxy.host, port: proxy.port })
   }
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index c65f44d6..60e92b40 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -401,7 +401,10 @@ export const onAppLoad = () => {
           cancel: !forced,
           minecraftJsonMessage: promptMessagePacket,
         })
-      if (!choice) return
+      if (!choice) {
+        bot.denyResourcePack()
+        return
+      }
       await new Promise(resolve => {
         setTimeout(resolve, 500)
       })
diff --git a/src/utils.ts b/src/utils.ts
index 3a928583..bfdef5e0 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -193,6 +193,8 @@ export const parseServerAddress = (address: string | undefined): ParsedServerAdd
     return { host: '', isWebSocket: false }
   }
 
+  address = address.replace(/^https?:\/\//, '')
+
   const isWebSocket = address.startsWith('ws://') || address.startsWith('wss://')
   if (isWebSocket) {
     return { host: address, isWebSocket: true }

From f560e952d30444c6e68688a337fd2111c96cf4f9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 9 Feb 2025 19:09:13 +0300
Subject: [PATCH 206/753] add debugToggle

---
 src/devtools.ts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/devtools.ts b/src/devtools.ts
index 223c950d..27faaad5 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -2,6 +2,7 @@
 
 import fs from 'fs'
 import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
+import { enable, disable, enabled } from 'debug'
 import { getEntityCursor } from './worldInteractions'
 
 window.cursorBlockRel = (x = 0, y = 0, z = 0) => {
@@ -72,3 +73,21 @@ window.downloadFile = async (path: string) => {
   a.click()
   URL.revokeObjectURL(url)
 }
+
+Object.defineProperty(window, 'debugToggle', {
+  get () {
+    localStorage.debug = localStorage.debug === '*' ? '' : '*'
+    if (enabled('*')) {
+      disable()
+      return 'disabled debug'
+    } else {
+      enable('*')
+      return 'enabled debug'
+    }
+  },
+  set (v) {
+    enable(v)
+    localStorage.debug = v
+    console.log('Enabled debug for', v)
+  }
+})

From 7ab03e3245edad595aa24005870a36ff046f6c99 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 9 Feb 2025 22:12:30 +0300
Subject: [PATCH 207/753] ci: fix crash no deploy

---
 .github/workflows/preview.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 9386276f..7ad16c2e 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -46,12 +46,12 @@ jobs:
         with:
           ref: refs/pull/${{ github.event.pull_request.number }}/head
 
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 22
           cache: "pnpm"
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
       - name: Install Global Dependencies
         run: pnpm add -g vercel
       - name: Pull Vercel Environment Information

From 82693ac80c62cfffe8e39ae09e8df95540dbac22 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 9 Feb 2025 22:12:44 +0300
Subject: [PATCH 208/753] feat: add fov animation that should have added from
 first release

---
 src/rendererUtils.ts | 45 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/rendererUtils.ts b/src/rendererUtils.ts
index 63f80492..0b78835e 100644
--- a/src/rendererUtils.ts
+++ b/src/rendererUtils.ts
@@ -2,21 +2,60 @@ import { subscribeKey } from 'valtio/utils'
 import { gameAdditionalState } from './globalState'
 import { options } from './optionsStorage'
 
+let currentFov = 0
+let targetFov = 0
+let lastUpdateTime = 0
+const FOV_TRANSITION_DURATION = 200 // milliseconds
+
+const updateFovAnimation = () => {
+  if (currentFov === targetFov) return
+
+  const now = performance.now()
+  const elapsed = now - lastUpdateTime
+  const progress = Math.min(elapsed / FOV_TRANSITION_DURATION, 1)
+
+  // Smooth easing function
+  const easeOutCubic = (t: number) => 1 - (1 - t) ** 3
+
+  currentFov += (targetFov - currentFov) * easeOutCubic(progress)
+
+  if (Math.abs(currentFov - targetFov) < 0.01) {
+    currentFov = targetFov
+  }
+
+  viewer.camera.fov = currentFov
+  viewer.camera.updateProjectionMatrix()
+}
+
 export const watchFov = () => {
   const updateFov = () => {
     if (!bot) return
     let fov = gameAdditionalState.isZooming ? 30 : options.fov
-    // todo check values and add transition
+
     if (bot.controlState.sprint && !bot.controlState.sneak) {
       fov += 5
     }
     if (gameAdditionalState.isFlying) {
       fov += 5
     }
-    viewer.camera.fov = fov
-    viewer.camera.updateProjectionMatrix()
+
+    if (targetFov !== fov) {
+      targetFov = fov
+      lastUpdateTime = performance.now()
+    }
   }
+
+  customEvents.on('gameLoaded', () => {
+    updateFov()
+  })
+
   updateFov()
+
+  // Add FOV animation to render loop
+  if (!beforeRenderFrame.includes(updateFovAnimation)) {
+    beforeRenderFrame.push(updateFovAnimation)
+  }
+
   subscribeKey(options, 'fov', updateFov)
   subscribeKey(gameAdditionalState, 'isFlying', updateFov)
   subscribeKey(gameAdditionalState, 'isSprinting', updateFov)

From dcbeed42ade37f3b123d741a1efed5fdb8ae291e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 9 Feb 2025 23:36:30 +0300
Subject: [PATCH 209/753] fix regression https parsing, improve/fix http, ws
 parsing in all places of app. finally we parsing a single string in a decent
 way

---
 src/cameraRotationControls.ts     |   2 +-
 src/index.ts                      |   6 +-
 src/parseServerAddress.ts         |  43 +++++++++++++
 src/react/AddServerOrConnect.tsx  |  15 ++---
 src/react/ServersListProvider.tsx |   2 +-
 src/utils.test.ts                 | 101 ++++++++++++++++++++++++++++++
 src/utils.ts                      |  47 --------------
 vitest.config.ts                  |   3 +-
 8 files changed, 159 insertions(+), 60 deletions(-)
 create mode 100644 src/parseServerAddress.ts
 create mode 100644 src/utils.test.ts

diff --git a/src/cameraRotationControls.ts b/src/cameraRotationControls.ts
index 151bb841..ff7c347f 100644
--- a/src/cameraRotationControls.ts
+++ b/src/cameraRotationControls.ts
@@ -72,7 +72,7 @@ function pointerLockChangeCallback () {
     hideNotification()
   }
   if (viewer.renderer.xr.isPresenting) return // todo
-  if (!pointerLock.hasPointerLock && activeModalStack.length === 0) {
+  if (!pointerLock.hasPointerLock && activeModalStack.length === 0 && miscUiState.gameLoaded) {
     showModal({ reactType: 'pause-screen' })
   }
 }
diff --git a/src/index.ts b/src/index.ts
index 6088735d..1f2d681c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -60,8 +60,8 @@ import {
 } from './globalState'
 
 import {
-  pointerLock, parseServerAddress
-} from './utils'
+  pointerLock } from './utils'
+import { parseServerAddress } from './parseServerAddress'
 import { setLoadingScreenStatus } from './appStatus'
 import { isCypress } from './standaloneUtils'
 
@@ -285,7 +285,7 @@ export async function connect (connectOptions: ConnectOptions) {
     const https = connectOptions.proxy.startsWith('https://') || location.protocol === 'https:'
     connectOptions.proxy = `${connectOptions.proxy}:${https ? 443 : 80}`
   }
-  const parsedProxy = parseServerAddress(connectOptions.proxy)
+  const parsedProxy = parseServerAddress(connectOptions.proxy, false)
   const proxy = { host: parsedProxy.host, port: parsedProxy.port }
   let { username } = connectOptions
 
diff --git a/src/parseServerAddress.ts b/src/parseServerAddress.ts
new file mode 100644
index 00000000..dec89c00
--- /dev/null
+++ b/src/parseServerAddress.ts
@@ -0,0 +1,43 @@
+import { ParsedServerAddress } from './utils'
+
+
+export const parseServerAddress = (address: string | undefined, removeHttp = true): ParsedServerAddress => {
+  if (!address) {
+    return { host: '', isWebSocket: false }
+  }
+
+  const isWebSocket = address.startsWith('ws://') || address.startsWith('wss://')
+  if (isWebSocket) {
+    return { host: address, isWebSocket: true }
+  }
+
+  if (removeHttp) {
+    address = address.replace(/^https?:\/\//, '')
+  }
+
+  const parts = address.split(':')
+
+  let version: string | null = null
+  let port: string | null = null
+
+  for (let i = 0; i < parts.length; i++) {
+    const part = parts[i]
+    if (/^\d+\.\d+(\.\d+)?$/.test(part)) {
+      version = part
+      parts.splice(i, 1)
+      i--
+    }
+    if (/^\d+$/.test(part)) {
+      port = part
+      parts.splice(i, 1)
+      i--
+    }
+  }
+
+  return {
+    host: parts.join(':'),
+    ...(port ? { port } : {}),
+    ...(version ? { version } : {}),
+    isWebSocket: false
+  }
+}
diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index a9415204..46964a90 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect } from 'react'
 import { appQueryParams } from '../appParams'
 import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
+import { parseServerAddress } from '../parseServerAddress'
 import Screen from './Screen'
 import Input from './Input'
 import Button from './Button'
@@ -42,12 +43,12 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   const qsParamUsername = parseQs ? appQueryParams.username : undefined
   const qsParamLockConnect = parseQs ? appQueryParams.lockConnect : undefined
 
-  const qsIpParts = qsParamIp?.split(':')
-  const ipParts = initialData?.ip ? initialData?.ip.split(':') : undefined
+  const parsedQsIp = parseServerAddress(qsParamIp)
+  const parsedInitialIp = parseServerAddress(initialData?.ip)
 
   const [serverName, setServerName] = React.useState(initialData?.name ?? qsParamName ?? '')
-  const [serverIp, setServerIp] = React.useState(ipParts?.[0] ?? qsIpParts?.[0] ?? '')
-  const [serverPort, setServerPort] = React.useState(ipParts?.[1] ?? qsIpParts?.[1] ?? '')
+  const [serverIp, setServerIp] = React.useState(parsedQsIp.host || parsedInitialIp.host || '')
+  const [serverPort, setServerPort] = React.useState(parsedQsIp.port || parsedInitialIp.port || '')
   const [versionOverride, setVersionOverride] = React.useState(initialData?.versionOverride ?? /* legacy */ initialData?.['version'] ?? qsParamVersion ?? '')
   const [proxyOverride, setProxyOverride] = React.useState(initialData?.proxyOverride ?? qsParamProxy ?? '')
   const [usernameOverride, setUsernameOverride] = React.useState(initialData?.usernameOverride ?? qsParamUsername ?? '')
@@ -61,7 +62,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   const noAccountSelected = accountIndex === -1
   const authenticatedAccountOverride = noAccountSelected ? undefined : freshAccount ? true : accounts?.[accountIndex]
 
-  let ipFinal = serverIp.includes(':') ? serverIp : `${serverIp}:${serverPort}`
+  let ipFinal = serverIp.includes(':') ? serverIp : `${serverIp}${serverPort ? `:${serverPort}` : ''}`
   ipFinal = ipFinal.replace(/:$/, '')
   const commonUseOptions: BaseServerInfo = {
     name: serverName,
@@ -152,14 +153,14 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
           required
           label="Server IP"
           value={serverIp}
-          disabled={lockConnect && qsIpParts?.[0] !== null}
+          disabled={lockConnect && parsedQsIp.host !== null}
           onChange={({ target: { value } }) => {
             setServerIp(value)
             setServerOnline(false)
           }}
           validateInput={serverOnline === null || fetchedServerInfoIp !== serverIp ? undefined : validateServerIp}
         />
-        <InputWithLabel label="Server Port" value={serverPort} disabled={lockConnect && qsIpParts?.[1] !== null} onChange={({ target: { value } }) => setServerPort(value)} placeholder='25565' />
+        <InputWithLabel label="Server Port" value={serverPort} disabled={lockConnect && parsedQsIp.port !== null} onChange={({ target: { value } }) => setServerPort(value)} placeholder={serverIp.startsWith('ws://') || serverIp.startsWith('wss://') ? '' : '25565'} />
         {isSmallHeight ? <div style={{ gridColumn: 'span 2', marginTop: 10, }} /> : <div style={{ gridColumn: smallWidth ? '' : 'span 2' }}>Overrides:</div>}
         <div style={{
           display: 'flex',
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index b7c19936..704c77e6 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -7,7 +7,7 @@ import supportedVersions from '../supportedVersions.mjs'
 import { appQueryParams } from '../appParams'
 import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
 import { getServerInfo } from '../mineflayer/mc-protocol'
-import { parseServerAddress } from '../utils'
+import { parseServerAddress } from '../parseServerAddress'
 import ServersList from './ServersList'
 import AddServerOrConnect, { BaseServerInfo } from './AddServerOrConnect'
 import { useDidUpdateEffect } from './utils'
diff --git a/src/utils.test.ts b/src/utils.test.ts
new file mode 100644
index 00000000..14505ae2
--- /dev/null
+++ b/src/utils.test.ts
@@ -0,0 +1,101 @@
+import { describe, expect, it } from 'vitest'
+import { parseServerAddress } from './parseServerAddress'
+
+describe('parseServerAddress', () => {
+  it('should handle undefined input', () => {
+    expect(parseServerAddress(undefined)).toEqual({
+      host: '',
+      isWebSocket: false
+    })
+  })
+
+  it('should handle empty string input', () => {
+    expect(parseServerAddress('')).toEqual({
+      host: '',
+      isWebSocket: false
+    })
+  })
+
+  it('should parse basic hostname', () => {
+    expect(parseServerAddress('example.com')).toEqual({
+      host: 'example.com',
+      isWebSocket: false
+    })
+  })
+
+  it('should parse hostname with port', () => {
+    expect(parseServerAddress('example.com:25565')).toEqual({
+      host: 'example.com',
+      port: '25565',
+      isWebSocket: false
+    })
+  })
+
+  it('should parse hostname with version', () => {
+    expect(parseServerAddress('example.com:1.20.4')).toEqual({
+      host: 'example.com',
+      version: '1.20.4',
+      isWebSocket: false
+    })
+  })
+
+  it('should parse hostname with port and version', () => {
+    expect(parseServerAddress('example.com:25565:1.20.4')).toEqual({
+      host: 'example.com',
+      port: '25565',
+      version: '1.20.4',
+      isWebSocket: false
+    })
+    expect(parseServerAddress('example.com:1.20.4:25565')).toEqual({
+      host: 'example.com',
+      version: '1.20.4',
+      port: '25565',
+      isWebSocket: false
+    })
+  })
+
+  it('should handle WebSocket URLs', () => {
+    expect(parseServerAddress('ws://example.com')).toEqual({
+      host: 'ws://example.com',
+      isWebSocket: true
+    })
+    expect(parseServerAddress('wss://example.com')).toEqual({
+      host: 'wss://example.com',
+      isWebSocket: true
+    })
+  })
+
+  it('should handle http/https URLs with removeHttp=true', () => {
+    expect(parseServerAddress('http://example.com')).toEqual({
+      host: 'example.com',
+      isWebSocket: false
+    })
+    expect(parseServerAddress('https://example.com')).toEqual({
+      host: 'example.com',
+      isWebSocket: false
+    })
+  })
+
+  it('should handle http/https URLs with removeHttp=false', () => {
+    expect(parseServerAddress('http://example.com', false)).toEqual({
+      host: 'http://example.com',
+      isWebSocket: false
+    })
+    expect(parseServerAddress('https://example.com', false)).toEqual({
+      host: 'https://example.com',
+      isWebSocket: false
+    })
+  })
+
+  it('should handle IP addresses', () => {
+    expect(parseServerAddress('127.0.0.1')).toEqual({
+      host: '127.0.0.1',
+      isWebSocket: false
+    })
+    expect(parseServerAddress('127.0.0.1:25565')).toEqual({
+      host: '127.0.0.1',
+      port: '25565',
+      isWebSocket: false
+    })
+  })
+})
diff --git a/src/utils.ts b/src/utils.ts
index bfdef5e0..6c0110fb 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -187,50 +187,3 @@ export interface ParsedServerAddress {
   version?: string
   isWebSocket: boolean
 }
-
-export const parseServerAddress = (address: string | undefined): ParsedServerAddress => {
-  if (!address) {
-    return { host: '', isWebSocket: false }
-  }
-
-  address = address.replace(/^https?:\/\//, '')
-
-  const isWebSocket = address.startsWith('ws://') || address.startsWith('wss://')
-  if (isWebSocket) {
-    return { host: address, isWebSocket: true }
-  }
-
-  // Check for version in format host:version or host:port:version
-  const parts = address.split(':')
-  if (parts.length === 2 && parts[1].includes('.')) {
-    return {
-      host: parts[0],
-      version: parts[1],
-      isWebSocket: false
-    }
-  }
-
-  if (parts.length === 3) {
-    return {
-      host: parts[0],
-      port: parts[1],
-      version: parts[2],
-      isWebSocket: false
-    }
-  }
-
-  // Standard host:port format
-  const hostPort = /:\d+$/.exec(address)
-  if (hostPort) {
-    return {
-      host: address.slice(0, -hostPort[0].length),
-      port: hostPort[0].slice(1),
-      isWebSocket: false
-    }
-  }
-
-  return {
-    host: address,
-    isWebSocket: false
-  }
-}
diff --git a/vitest.config.ts b/vitest.config.ts
index ea875183..1d1588e4 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -8,7 +8,8 @@ export default defineConfig({
       '../../src/markdownToFormattedText.test.ts',
       '../../src/react/parseKeybindingName.test.ts',
       'lib/mesher/test/tests.test.ts',
-      'sign-renderer/tests.test.ts'
+      'sign-renderer/tests.test.ts',
+      '../../src/utils.test.ts'
     ],
   },
 })

From cea4d7f277ec28c9b88f957e890efc9cf1f8fd14 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 10 Feb 2025 19:54:38 +0300
Subject: [PATCH 210/753] feat: implement full support for new mineflayer
 plugin! add UI customization, motion effect, JS repl console and more!

---
 README.MD                             |   7 +
 package.json                          |   2 +-
 pnpm-lock.yaml                        | 151 +++++++++++---------
 src/cameraRotationControls.ts         |   9 +-
 src/controls.ts                       |   9 +-
 src/devtools.ts                       |  41 +++++-
 src/globalState.ts                    |   1 +
 src/index.ts                          |  44 ++++--
 src/mineflayer/userError.ts           |   6 +
 src/mineflayer/websocket-core.ts      |   3 +-
 src/react/Chat.tsx                    |   6 +-
 src/react/ChatProvider.tsx            |   7 +-
 src/react/GameInteractionOverlay.tsx  |   4 +-
 src/react/MineflayerPluginConsole.css | 108 ++++++++++++++
 src/react/MineflayerPluginConsole.tsx | 103 ++++++++++++++
 src/react/MineflayerPluginHud.tsx     |  70 +++++++++
 src/react/uiMotion.ts                 |  89 ++++++++++++
 src/reactUi.tsx                       |   4 +
 src/styles.css                        |   4 +
 src/viewerConnector.ts                | 195 +++++++++++++++++++++++++-
 src/worldInteractions.ts              |  72 ++++++++--
 21 files changed, 823 insertions(+), 112 deletions(-)
 create mode 100644 src/mineflayer/userError.ts
 create mode 100644 src/react/MineflayerPluginConsole.css
 create mode 100644 src/react/MineflayerPluginConsole.tsx
 create mode 100644 src/react/MineflayerPluginHud.tsx
 create mode 100644 src/react/uiMotion.ts

diff --git a/README.MD b/README.MD
index 339af958..d384d228 100644
--- a/README.MD
+++ b/README.MD
@@ -34,6 +34,13 @@ All components that are in [Storybook](https://mcraft.fun/storybook) are publish
 - Controls -> **Raw Input** -> **On** - This will make the controls more precise (UPD: already enabled by default)
 - Interface -> **Chat Select** -> **On** - To select chat messages (UPD: already enabled by default)
 
+### Browser Notes
+
+These browsers have issues with capturing pointer:
+
+**Opera Mini**: Disable *mouse gestures* in browsre settings to avoid opening new tab on right click hold
+**Vivaldi**: Disable Controls -> *Raw Input* in game settings if experiencing issues
+
 ### World Loading
 
 Zip files and folders are supported. Just drag and drop them into the browser window. You can open folders in readonly and read-write mode. New chunks may be generated incorrectly for now.
diff --git a/package.json b/package.json
index 9c68b14c..3084d5dd 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,6 @@
   "dependencies": {
     "@dimaka/interface": "0.0.3-alpha.0",
     "@floating-ui/react": "^0.26.1",
-    "@mui/base": "5.0.0-beta.40",
     "@nxg-org/mineflayer-auto-jump": "^0.7.12",
     "@nxg-org/mineflayer-tracker": "1.2.1",
     "@react-oauth/google": "^0.12.1",
@@ -81,6 +80,7 @@
     "mojangson": "^2.0.4",
     "net-browserify": "github:zardoy/prismarinejs-net-browserify",
     "node-gzip": "^1.1.2",
+    "mcraft-fun-mineflayer": "0.0.3",
     "peerjs": "^1.5.0",
     "pixelarticons": "^1.8.1",
     "pretty-bytes": "^6.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 214de75b..a49ff0cb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -43,9 +43,6 @@ importers:
       '@floating-ui/react':
         specifier: ^0.26.1
         version: 0.26.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@mui/base':
-        specifier: 5.0.0-beta.40
-        version: 5.0.0-beta.40(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@nxg-org/mineflayer-auto-jump':
         specifier: ^0.7.12
         version: 0.7.12
@@ -133,6 +130,9 @@ importers:
       lodash-es:
         specifier: ^4.17.21
         version: 4.17.21
+      mcraft-fun-mineflayer:
+        specifier: 0.0.3
+        version: 0.0.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -1843,35 +1843,6 @@ packages:
     resolution: {integrity: sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==}
     engines: {node: '>= 10'}
 
-  '@mui/base@5.0.0-beta.40':
-    resolution: {integrity: sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==}
-    engines: {node: '>=12.0.0'}
-    peerDependencies:
-      '@types/react': ^17.0.0 || ^18.0.0
-      react: ^18.2.0
-      react-dom: ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@mui/types@7.2.14':
-    resolution: {integrity: sha512-MZsBZ4q4HfzBsywtXgM1Ksj6HDThtiwmOKUXH1pKYISI9gAVXCNHNpo7TlGoGrBaYWZTdNoirIN7JsQcQUjmQQ==}
-    peerDependencies:
-      '@types/react': ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
-  '@mui/utils@5.15.14':
-    resolution: {integrity: sha512-0lF/7Hh/ezDv5X7Pry6enMsbYyGKjADzvHyo3Qrc/SSlTsQ1VkbDMbH0m2t3OR5iIVLwMoxwM7yGd+6FCMtTFA==}
-    engines: {node: '>=12.0.0'}
-    peerDependencies:
-      '@types/react': ^17.0.0 || ^18.0.0
-      react: ^18.2.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
   '@ndelangen/get-tarball@3.0.9':
     resolution: {integrity: sha512-9JKTEik4vq+yGosHYhZ1tiH/3WpUS0Nh0kej4Agndhox8pAdWhEx5knFVRcb/ya9knCRCs1rPxNrSXTDdfVqpA==}
 
@@ -3167,6 +3138,11 @@ packages:
     resolution: {integrity: sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==}
     engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'}
 
+  '@zardoy/flying-squid@0.0.49':
+    resolution: {integrity: sha512-Kt4wr5/R+44tcLU9gjuNG2an9weWeKEpIoKXfsgJN2GGQqdnbd5nBpxfGDdgZ9aMdFugsVW8BsyPZNhj9vbMXA==}
+    engines: {node: '>=8'}
+    hasBin: true
+
   '@zardoy/flying-squid@0.0.51':
     resolution: {integrity: sha512-HHZ79H9NkS44lL9vk6gVEuJDJqj88gpiBt9Ihh5p4rHXTVbRid95riiNK5dD0kHI94P5/DXdtNalvmJDPU86oQ==}
     engines: {node: '>=8'}
@@ -3897,10 +3873,6 @@ packages:
     resolution: {integrity: sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==}
     engines: {node: '>=6'}
 
-  clsx@2.1.1:
-    resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
-    engines: {node: '>=6'}
-
   collection-visit@1.0.0:
     resolution: {integrity: sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==}
     engines: {node: '>=0.10.0'}
@@ -6260,6 +6232,17 @@ packages:
     resolution: {integrity: sha512-+WAU9+iRbBgWWgsrQ52j0Xqq+Qs7UbjlVtZq1NCTqpIAvaEKNCwM7u2qFV5hoj4RpBAsVmkgLissdjLddE8WaA==}
     engines: {node: '>=18.0.0'}
 
+  mcraft-fun-mineflayer@0.0.3:
+    resolution: {integrity: sha512-IqYXHk5ihQOF9FzEpMWsFwgilTySklYVj3AODK7sdgaSe+pU9wZllJjVvsYdc/F3uLMgogkyTLuVoEVMD+UiSA==}
+    version: 0.0.3
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    peerDependencies:
+      '@roamhq/wrtc': '*'
+      mineflayer: '>=4.x'
+    peerDependenciesMeta:
+      '@roamhq/wrtc':
+        optional: true
+
   md5-file@4.0.0:
     resolution: {integrity: sha512-UC0qFwyAjn4YdPpKaDNw6gNxRf7Mcx7jC1UGCY4boCzgvU2Aoc1mOGzTtrjjLKhM5ivsnhoKpQVxKPp+1j1qwg==}
     engines: {node: '>=6.0'}
@@ -9182,6 +9165,18 @@ packages:
       utf-8-validate:
         optional: true
 
+  ws@8.18.0:
+    resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
   xhr@2.6.0:
     resolution: {integrity: sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==}
 
@@ -10866,34 +10861,6 @@ snapshots:
 
   '@msgpack/msgpack@2.8.0': {}
 
-  '@mui/base@5.0.0-beta.40(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.24.5
-      '@floating-ui/react-dom': 2.0.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@mui/types': 7.2.14(@types/react@18.2.20)
-      '@mui/utils': 5.15.14(@types/react@18.2.20)(react@18.2.0)
-      '@popperjs/core': 2.11.8
-      clsx: 2.1.1
-      prop-types: 15.8.1
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-    optionalDependencies:
-      '@types/react': 18.2.20
-
-  '@mui/types@7.2.14(@types/react@18.2.20)':
-    optionalDependencies:
-      '@types/react': 18.2.20
-
-  '@mui/utils@5.15.14(@types/react@18.2.20)(react@18.2.0)':
-    dependencies:
-      '@babel/runtime': 7.24.5
-      '@types/prop-types': 15.7.12
-      prop-types: 15.8.1
-      react: 18.2.0
-      react-is: 18.2.0
-    optionalDependencies:
-      '@types/react': 18.2.20
-
   '@ndelangen/get-tarball@3.0.9':
     dependencies:
       gunzip-maybe: 1.4.2
@@ -11907,7 +11874,7 @@ snapshots:
       util: 0.12.5
       util-deprecate: 1.0.2
       watchpack: 2.4.1
-      ws: 8.11.0
+      ws: 8.18.0
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -12769,6 +12736,42 @@ snapshots:
       '@types/emscripten': 1.39.8
       tslib: 1.14.1
 
+  '@zardoy/flying-squid@0.0.49(encoding@0.1.13)':
+    dependencies:
+      '@tootallnate/once': 2.0.0
+      chalk: 5.3.0
+      change-case: 4.1.2
+      diamond-square: https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71
+      emit-then: 2.0.0
+      exit-hook: 2.2.1
+      flatmap: 0.0.3
+      long: 5.2.3
+      minecraft-data: 3.83.1
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+      mkdirp: 2.1.6
+      node-gzip: 1.1.2
+      node-rsa: 1.1.1
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
+      prismarine-entity: 2.3.1
+      prismarine-item: 1.16.0
+      prismarine-nbt: 2.5.0
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1)
+      prismarine-windows: 2.9.0
+      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
+      rambda: 9.2.0
+      random-seed: 0.3.0
+      range: 0.0.3
+      readline: 1.3.0
+      sanitize-filename: 1.6.3
+      typed-emitter: 1.4.0
+      uuid-1345: 1.0.2
+      vec3: 0.1.8
+      yaml: 2.4.1
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
   '@zardoy/flying-squid@0.0.51(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
@@ -13706,8 +13709,6 @@ snapshots:
 
   clsx@1.1.1: {}
 
-  clsx@2.1.1: {}
-
   collection-visit@1.0.0:
     dependencies:
       map-visit: 1.0.0
@@ -16644,6 +16645,20 @@ snapshots:
 
   mc-assets@0.2.31: {}
 
+  mcraft-fun-mineflayer@0.0.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13)):
+    dependencies:
+      '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
+      exit-hook: 2.2.1
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13)
+      prismarine-item: 1.16.0
+      ws: 8.18.0
+    transitivePeerDependencies:
+      - bufferutil
+      - encoding
+      - supports-color
+      - utf-8-validate
+
   md5-file@4.0.0: {}
 
   md5.js@1.3.5:
@@ -20308,6 +20323,8 @@ snapshots:
 
   ws@8.11.0: {}
 
+  ws@8.18.0: {}
+
   xhr@2.6.0:
     dependencies:
       global: 4.4.0
diff --git a/src/cameraRotationControls.ts b/src/cameraRotationControls.ts
index ff7c347f..31c20654 100644
--- a/src/cameraRotationControls.ts
+++ b/src/cameraRotationControls.ts
@@ -4,9 +4,15 @@ import { options } from './optionsStorage'
 import { hideNotification, notificationProxy } from './react/NotificationProvider'
 import { pointerLock } from './utils'
 import worldInteractions from './worldInteractions'
+import { updateMotion, initMotionTracking } from './react/uiMotion'
 
 let lastMouseMove: number
 
+const MOTION_DAMPING = 0.92
+const MAX_MOTION_OFFSET = 30
+const motionVelocity = { x: 0, y: 0 }
+const lastUpdate = performance.now()
+
 export const updateCursor = () => {
   worldInteractions.update()
 }
@@ -33,8 +39,10 @@ export function onCameraMove (e: MouseEvent | CameraMoveEvent) {
     y: e.movementY * mouseSensY * 0.0001
   })
   updateCursor()
+  updateMotion()
 }
 
+
 export const moveCameraRawHandler = ({ x, y }: { x: number; y: number }) => {
   const maxPitch = 0.5 * Math.PI
   const minPitch = -0.5 * Math.PI
@@ -45,7 +53,6 @@ export const moveCameraRawHandler = ({ x, y }: { x: number; y: number }) => {
   void bot.look(bot.entity.yaw - x, Math.max(minPitch, Math.min(maxPitch, pitch)), true)
 }
 
-
 window.addEventListener('mousemove', (e: MouseEvent) => {
   onCameraMove(e)
 }, { capture: true })
diff --git a/src/controls.ts b/src/controls.ts
index b55bf9f7..deee9c68 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -55,7 +55,8 @@ export const contro = new ControMax({
       rotateCameraLeft: [null],
       rotateCameraRight: [null],
       rotateCameraUp: [null],
-      rotateCameraDown: [null]
+      rotateCameraDown: [null],
+      viewerConsole: ['Backquote']
     },
     ui: {
       toggleFullscreen: ['F11'],
@@ -508,6 +509,11 @@ contro.on('trigger', ({ command }) => {
         break
       case 'general.zoom':
         break
+      case 'general.viewerConsole':
+        if (lastConnectOptions.value?.viewerWsConnect) {
+          showModal({ reactType: 'console' })
+        }
+        break
     }
   }
 
@@ -824,6 +830,7 @@ const selectItem = async () => {
 
 addEventListener('mousedown', async (e) => {
   if ((e.target as HTMLElement).matches?.('#VRButton')) return
+  if (gameAdditionalState.viewerConnection && !(e.target as HTMLElement).id.includes('ui-root')) return
   void pointerLock.requestPointerLock()
   if (!bot) return
   // wheel click
diff --git a/src/devtools.ts b/src/devtools.ts
index 27faaad5..4aa10b11 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -44,17 +44,50 @@ customEvents.on('gameLoaded', () => {
   })
 })
 
-window.inspectPacket = (packetName, fullOrListener: boolean | ((...args) => void) = false) => {
-  const listener = typeof fullOrListener === 'function' ? fullOrListener : (...args) => console.log('packet', packetName, fullOrListener ? args : args[0])
+window.inspectPacket = (packetName, isFromClient = false, fullOrListener: boolean | ((...args) => void) = false) => {
+  const listener = typeof fullOrListener === 'function'
+    ? (name, ...args) => fullOrListener(name, ...args)
+    : (name, ...args) => {
+      const displayName = name === packetName ? name : `${name} (${packetName})`
+      console.log('packet', displayName, fullOrListener ? args : args[0])
+    }
+
+  // Pre-compile regex if using wildcards
+  const pattern = typeof packetName === 'string' && packetName.includes('*')
+    ? new RegExp('^' + packetName.replaceAll('*', '.*') + '$')
+    : null
+
+  const packetsListener = (name, data) => {
+    if (pattern) {
+      if (pattern.test(name)) {
+        listener(name, data)
+      }
+    } else if (name === packetName) {
+      listener(name, data)
+    }
+  }
+
   const attach = () => {
-    bot?._client.prependListener(packetName, listener)
+    if (isFromClient) {
+      bot?._client.prependListener('writePacket', packetsListener)
+    } else {
+      bot?._client.prependListener('packet_name', packetsListener)
+    }
+  }
+  const detach = () => {
+    if (isFromClient) {
+      bot?._client.removeListener('writePacket', packetsListener)
+    } else {
+      bot?._client.removeListener('packet_name', packetsListener)
+    }
   }
   attach()
   customEvents.on('mineflayerBotCreated', attach)
+
   const returnobj = {}
   Object.defineProperty(returnobj, 'detach', {
     get () {
-      bot?.removeListener(packetName, listener)
+      detach()
       customEvents.removeListener('mineflayerBotCreated', attach)
       return true
     },
diff --git a/src/globalState.ts b/src/globalState.ts
index e1416415..0fb1dc69 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -155,6 +155,7 @@ export const gameAdditionalState = proxy({
   warps: [] as WorldWarp[],
   noConnection: false,
   poorConnection: false,
+  viewerConnection: false,
 
   usingServerResourcePack: false,
 })
diff --git a/src/index.ts b/src/index.ts
index 1f2d681c..199a4083 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -15,6 +15,7 @@ import { RenderItem } from './mineflayer/items'
 import initCollisionShapes from './getCollisionInteractionShapes'
 import protocolMicrosoftAuth from 'minecraft-protocol/src/client/microsoftAuth'
 import microsoftAuthflow from './microsoftAuthflow'
+import { Duplex } from 'stream'
 
 import 'core-js/features/array/at'
 import 'core-js/features/promise/with-resolvers'
@@ -56,11 +57,10 @@ import {
   insertActiveModalStack,
   isGameActive,
   miscUiState,
-  showModal
+  showModal,
+  gameAdditionalState
 } from './globalState'
 
-import {
-  pointerLock } from './utils'
 import { parseServerAddress } from './parseServerAddress'
 import { setLoadingScreenStatus } from './appStatus'
 import { isCypress } from './standaloneUtils'
@@ -101,12 +101,14 @@ import { mainMenuState } from './react/MainMenuRenderApp'
 import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
-import { getViewerVersionData, getWsProtocolStream } from './viewerConnector'
+import { getViewerVersionData, getWsProtocolStream, handleCustomChannel } from './viewerConnector'
 import { getWebsocketStream } from './mineflayer/websocket-core'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 import { updateCursor } from './cameraRotationControls'
 import { pingServerVersion } from './mineflayer/minecraft-protocol-extra'
 import { states } from 'minecraft-protocol'
+import { initMotionTracking } from './react/uiMotion'
+import { UserError } from './mineflayer/userError'
 
 window.debug = debug
 window.THREE = THREE
@@ -305,6 +307,7 @@ export async function connect (connectOptions: ConnectOptions) {
     ended = true
     viewer.resetAll()
     localServer = window.localServer = window.server = undefined
+    gameAdditionalState.viewerConnection = false
 
     renderWrapper.postRender = () => { }
     if (bot) {
@@ -367,7 +370,7 @@ export async function connect (connectOptions: ConnectOptions) {
     signal: errorAbortController.signal
   })
 
-  let clientDataStream
+  let clientDataStream: Duplex | undefined
 
   if (connectOptions.server && !connectOptions.viewerWsConnect && !parsedServer.isWebSocket) {
     console.log(`using proxy ${proxy.host}:${proxy.port || location.port}`)
@@ -392,7 +395,7 @@ export async function connect (connectOptions: ConnectOptions) {
       dataDownloaded = true
       if (connectOptions.authenticatedAccount && (versionToNumber(version) < versionToNumber('1.19.4') || versionToNumber(version) >= versionToNumber('1.21'))) {
         // todo support it (just need to fix .export crash)
-        throw new Error('Microsoft authentication is only supported on 1.19.4 - 1.20.6 (at least for now)')
+        throw new UserError('Microsoft authentication is only supported on 1.19.4 - 1.20.6 (at least for now)')
       }
 
       await downloadMcDataOnConnect(version)
@@ -460,6 +463,8 @@ export async function connect (connectOptions: ConnectOptions) {
         finalVersion = autoVersionSelect.version
       }
       initialLoadingText = `Connecting to server ${server.host} with version ${finalVersion}`
+    } else if (connectOptions.viewerWsConnect) {
+      initialLoadingText = `Connecting to Mineflayer WebSocket server ${connectOptions.viewerWsConnect}`
     } else {
       initialLoadingText = 'We have no idea what to do'
     }
@@ -487,13 +492,24 @@ export async function connect (connectOptions: ConnectOptions) {
       clientDataStream = await connectToPeer(connectOptions.peerId!, connectOptions.peerOptions)
     }
     if (connectOptions.viewerWsConnect) {
-      const { version, time } = await getViewerVersionData(connectOptions.viewerWsConnect)
+      const { version, time, requiresPass } = await getViewerVersionData(connectOptions.viewerWsConnect)
+      let password
+      if (requiresPass) {
+        password = prompt('Enter password')
+        if (!password) {
+          throw new UserError('Password is required')
+        }
+      }
       console.log('Latency:', Date.now() - time, 'ms')
       // const version = '1.21.1'
       finalVersion = version
       await downloadMcData(version)
       setLoadingScreenStatus(`Connecting to WebSocket server ${connectOptions.viewerWsConnect}`)
-      clientDataStream = await getWsProtocolStream(connectOptions.viewerWsConnect)
+      clientDataStream = (await getWsProtocolStream(connectOptions.viewerWsConnect)).clientDuplex
+      if (password) {
+        clientDataStream.write(password)
+      }
+      gameAdditionalState.viewerConnection = true
     }
 
     if (finalVersion) {
@@ -506,7 +522,7 @@ export async function connect (connectOptions: ConnectOptions) {
       port: server.port ? +server.port : undefined,
       version: finalVersion || false,
       ...clientDataStream ? {
-        stream: clientDataStream,
+        stream: clientDataStream as any,
       } : {},
       ...singleplayer || p2pMultiplayer ? {
         keepAlive: false,
@@ -533,7 +549,7 @@ export async function connect (connectOptions: ConnectOptions) {
             protocolMicrosoftAuth.authenticate(client, options),
             new Promise((_r, reject) => {
               signInMessageState.abortController.signal.addEventListener('abort', () => {
-                reject(new Error('Aborted by user'))
+                reject(new UserError('Aborted by user'))
               })
             })
           ])
@@ -574,6 +590,9 @@ export async function connect (connectOptions: ConnectOptions) {
       // "mapDownloader-saveInternal": false, // do not save into memory, todo must be implemeneted as we do really care of ram
     }) as unknown as typeof __type_bot
     window.bot = bot
+    if (connectOptions.viewerWsConnect) {
+      void handleCustomChannel()
+    }
     customEvents.emit('mineflayerBotCreated')
     if (singleplayer || p2pMultiplayer) {
       // in case of p2pMultiplayer there is still flying-squid on the host side
@@ -646,7 +665,7 @@ export async function connect (connectOptions: ConnectOptions) {
   }
   if (!bot) return
 
-  const p2pConnectTimeout = p2pMultiplayer ? setTimeout(() => { throw new Error('Spawn timeout. There might be error on the other side, check console.') }, 20_000) : undefined
+  const p2pConnectTimeout = p2pMultiplayer ? setTimeout(() => { throw new UserError('Spawn timeout. There might be error on the other side, check console.') }, 20_000) : undefined
 
   // bot.on('inject_allowed', () => {
   //   loadingScreen.maybeRecoverable = false
@@ -745,14 +764,13 @@ export async function connect (connectOptions: ConnectOptions) {
 
     bot.on('physicsTick', () => updateCursor())
 
-
     void initVR()
+    initMotionTracking()
 
     renderWrapper.postRender = () => {
       viewer.setFirstPersonCamera(null, bot.entity.yaw, bot.entity.pitch)
     }
 
-
     // Link WorldDataEmitter and Viewer
     viewer.connect(worldView)
     worldView.listenToBot(bot)
diff --git a/src/mineflayer/userError.ts b/src/mineflayer/userError.ts
new file mode 100644
index 00000000..9d3e08a7
--- /dev/null
+++ b/src/mineflayer/userError.ts
@@ -0,0 +1,6 @@
+export class UserError extends Error {
+  constructor (message: string) {
+    super(message)
+    this.name = 'UserError'
+  }
+}
diff --git a/src/mineflayer/websocket-core.ts b/src/mineflayer/websocket-core.ts
index 3896b797..482f0def 100644
--- a/src/mineflayer/websocket-core.ts
+++ b/src/mineflayer/websocket-core.ts
@@ -1,4 +1,5 @@
 import { Duplex } from 'stream'
+import { UserError } from './userError'
 
 class CustomDuplex extends Duplex {
   constructor (options, public writeAction) {
@@ -42,7 +43,7 @@ export const getWebsocketStream = async (host: string) => {
     ws.addEventListener('open', resolve)
     ws.addEventListener('error', err => {
       console.log('ws error', err)
-      reject(new Error('Failed to open websocket connection'))
+      reject(new UserError('Failed to open websocket connection'))
     })
   })
 
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 54a06c25..26a87e11 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -38,6 +38,7 @@ type Props = {
   // width?: number
   allowSelection?: boolean
   inputDisabled?: string
+  placeholder?: string
 }
 
 export const chatInputValueGlobal = proxy({
@@ -64,7 +65,8 @@ export default ({
   onClose,
   usingTouch,
   allowSelection,
-  inputDisabled
+  inputDisabled,
+  placeholder
 }: Props) => {
   const sendHistoryRef = useRef(JSON.parse(window.sessionStorage.chatHistory || '[]'))
 
@@ -271,7 +273,7 @@ export default ({
               aria-autocomplete="both"
               onChange={onMainInputChange}
               disabled={!!inputDisabled}
-              placeholder={inputDisabled}
+              placeholder={inputDisabled || placeholder}
               onKeyDown={(e) => {
                 if (e.code === 'ArrowUp') {
                   if (chatHistoryPos.current === 0) return
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 85f3b6e0..ded46b45 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -2,8 +2,9 @@ import { useEffect, useMemo, useRef, useState } from 'react'
 import { useSnapshot } from 'valtio'
 import { formatMessage } from '../chatUtils'
 import { getBuiltinCommandsList, tryHandleBuiltinCommand } from '../builtinCommands'
-import { hideCurrentModal, miscUiState } from '../globalState'
+import { gameAdditionalState, hideCurrentModal, miscUiState } from '../globalState'
 import { options } from '../optionsStorage'
+import { viewerVersionState } from '../viewerConnector'
 import Chat, { Message, fadeMessage } from './Chat'
 import { useIsModalActive } from './utilsApp'
 import { hideNotification, showNotification } from './NotificationProvider'
@@ -18,6 +19,8 @@ export default () => {
   const usingTouch = useSnapshot(miscUiState).currentTouch
   const { chatSelect } = useSnapshot(options)
   const isUsingMicrosoftAuth = useMemo(() => !!lastConnectOptions.value?.authenticatedAccount, [])
+  const { forwardChat } = useSnapshot(viewerVersionState)
+  const { viewerConnection } = useSnapshot(gameAdditionalState)
 
   useEffect(() => {
     bot.addListener('message', (jsonMsg, position) => {
@@ -46,7 +49,7 @@ export default () => {
     opacity={(isChatActive ? chatOpacityOpened : chatOpacity) / 100}
     messages={messages}
     opened={isChatActive}
-    // inputDisabled={isUsingMicrosoftAuth ? 'Chat signing is not supported with Microsoft auth yet' : ''}
+    placeholder={forwardChat && viewerConnection ? undefined : 'Chat forwarding is not enabled in the plugin settings'}
     sendMessage={(message) => {
       const builtinHandled = tryHandleBuiltinCommand(message)
       if (miscUiState.loadedServerIndex && (message.startsWith('/login') || message.startsWith('/register'))) {
diff --git a/src/react/GameInteractionOverlay.tsx b/src/react/GameInteractionOverlay.tsx
index 02c2e3b4..bdfdb859 100644
--- a/src/react/GameInteractionOverlay.tsx
+++ b/src/react/GameInteractionOverlay.tsx
@@ -2,7 +2,7 @@ import { useRef, useEffect } from 'react'
 import { subscribe, useSnapshot } from 'valtio'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { options } from '../optionsStorage'
-import { activeModalStack, isGameActive, miscUiState } from '../globalState'
+import { activeModalStack, gameAdditionalState, isGameActive, miscUiState } from '../globalState'
 import worldInteractions from '../worldInteractions'
 import { onCameraMove, CameraMoveEvent } from '../cameraRotationControls'
 import { pointerLock } from '../utils'
@@ -291,7 +291,7 @@ export default function GameInteractionOverlay ({ zIndex }: { zIndex: number })
 
 subscribe(activeModalStack, () => {
   if (activeModalStack.length === 0) {
-    if (isGameActive(false)) {
+    if (isGameActive(false) && !gameAdditionalState.viewerConnection) {
       void pointerLock.requestPointerLock()
     }
   } else {
diff --git a/src/react/MineflayerPluginConsole.css b/src/react/MineflayerPluginConsole.css
new file mode 100644
index 00000000..0a462a42
--- /dev/null
+++ b/src/react/MineflayerPluginConsole.css
@@ -0,0 +1,108 @@
+.console-wrapper {
+  position: fixed;
+  left: 0;
+  right: 0;
+  pointer-events: none;
+  z-index: 1000;
+}
+
+.console-messages-wrapper {
+  bottom: 45px;
+  max-height: 180px;
+}
+
+.console-input-wrapper {
+  bottom: 0;
+}
+
+.console-input-wrapper.input-mobile {
+  top: 0;
+  bottom: auto;
+}
+
+.console-messages-wrapper.display-mobile {
+  bottom: 0;
+  top: 45px;
+}
+
+.console {
+  margin: 0;
+  padding: 4px;
+  background-color: rgba(0, 0, 0, 0.5);
+  pointer-events: all;
+  overflow-y: auto;
+  max-height: inherit;
+  display: none;
+  user-select: text;
+}
+
+.console.opened {
+  display: block;
+}
+
+.console-message {
+  color: white;
+  font-family: monospace;
+  white-space: pre-wrap;
+  list-style: none;
+  margin: 2px 0;
+}
+
+.console-message-prefix {
+  color: dodgerblue;
+  margin-right: 8px;
+}
+
+.console-message-repl {
+  color: purple;
+}
+
+.console-message-error {
+  color: #ff4444;
+}
+
+.console-message-warn {
+  color: #ffbb33;
+}
+
+.console-input {
+  background-color: rgba(0, 0, 0, 0.5);
+  padding: 8px;
+  pointer-events: all;
+}
+
+.console-input-container {
+  display: flex;
+  align-items: center;
+}
+
+.console-input-prefix {
+  color: dodgerblue;
+  font-family: monospace;
+  margin-right: 8px;
+}
+
+.console-input-field {
+  flex: 1;
+  background: transparent;
+  border: none;
+  color: dodgerblue;
+  font-family: monospace;
+  outline: none;
+  padding: 0;
+}
+
+.console-input-field:focus {
+  border: 1px solid rgba(255, 255, 255, 0.2);
+  background: rgba(0, 0, 0, 0.3);
+}
+
+.console-input-field::placeholder {
+  color: rgba(30, 144, 255, 0.5);
+}
+
+.console-mobile-hidden {
+  position: absolute;
+  opacity: 0;
+  pointer-events: none;
+}
diff --git a/src/react/MineflayerPluginConsole.tsx b/src/react/MineflayerPluginConsole.tsx
new file mode 100644
index 00000000..d8bf86f9
--- /dev/null
+++ b/src/react/MineflayerPluginConsole.tsx
@@ -0,0 +1,103 @@
+import { proxy, subscribe, useSnapshot } from 'valtio'
+import { useEffect, useRef, useState } from 'react'
+import './MineflayerPluginConsole.css'
+import { miscUiState } from '../globalState'
+import { useIsModalActive } from './utilsApp'
+
+export type ConsoleMessage = {
+  text: string
+  isRepl?: boolean
+  level?: 'log' | 'warn' | 'error'
+  id: number
+}
+
+export const mineflayerConsoleState = proxy({
+  onExecute: null as ((code: string) => void) | null,
+  messages: [] as ConsoleMessage[],
+  replEnabled: false,
+  consoleEnabled: false,
+})
+
+const MessageLine = ({ message }: { message: ConsoleMessage }) => {
+  const messageClass = message.isRepl ? 'console-message-repl' : message.level ? `console-message-${message.level}` : ''
+  return (
+    <li className={`console-message ${messageClass}`}>
+      <span className="console-message-prefix">&gt;</span>
+      {message.text}
+    </li>
+  )
+}
+
+export default () => {
+  const opened = useIsModalActive('console')
+  const usingTouch = useSnapshot(miscUiState).currentTouch
+  const { messages, replEnabled, consoleEnabled, onExecute } = useSnapshot(mineflayerConsoleState)
+
+  const consoleInput = useRef<HTMLInputElement>(null!)
+  const consoleMessages = useRef<HTMLDivElement>(null)
+
+  useEffect(() => {
+    if (consoleMessages.current) {
+      consoleMessages.current.scrollTop = consoleMessages.current.scrollHeight
+    }
+  }, [messages])
+
+  const updateInputValue = (newValue: string) => {
+    consoleInput.current.value = newValue
+    setTimeout(() => {
+      consoleInput.current.setSelectionRange(newValue.length, newValue.length)
+    }, 0)
+  }
+
+  return (
+    <>
+      <div className={`console-wrapper console-messages-wrapper ${usingTouch ? 'display-mobile' : ''}`}>
+        <div ref={consoleMessages} className={`console ${opened ? 'opened' : ''}`} id="console-messages">
+          {!consoleEnabled && (
+            <MessageLine
+              key="console-disabled"
+              message={{
+                id: -1,
+                text: 'Console is not enabled. Enable it in the plugin initialization settings.',
+                level: 'error'
+              }}
+            />
+          )}
+          {messages.map((m) => (
+            <MessageLine key={m.id} message={m} />
+          ))}
+        </div>
+      </div>
+
+      <div className={`console-wrapper console-input-wrapper ${usingTouch ? 'input-mobile' : ''}`} hidden={!opened}>
+        <form
+          className='console-input'
+          onSubmit={(e) => {
+            e.preventDefault()
+            const code = consoleInput.current.value
+            if (code) {
+              onExecute?.(code)
+              updateInputValue('')
+            }
+          }}
+        >
+          <div className="console-input-container">
+            <span className="console-input-prefix">&gt;</span>
+            <input
+              defaultValue=''
+              ref={consoleInput}
+              type="text"
+              className="console-input-field"
+              id="consoleinput"
+              spellCheck={false}
+              autoComplete="off"
+              disabled={!replEnabled}
+              placeholder={replEnabled ? 'Enter JavaScript code (bot variable is available)' : 'REPL is not enabled'}
+            />
+          </div>
+          <button type='submit' style={{ visibility: 'hidden', position: 'absolute' }} />
+        </form>
+      </div>
+    </>
+  )
+}
diff --git a/src/react/MineflayerPluginHud.tsx b/src/react/MineflayerPluginHud.tsx
new file mode 100644
index 00000000..108b8c37
--- /dev/null
+++ b/src/react/MineflayerPluginHud.tsx
@@ -0,0 +1,70 @@
+import { proxy, useSnapshot } from 'valtio'
+import { useEffect, useRef } from 'react'
+import type { UIDefinition } from 'mcraft-fun-mineflayer/build/customChannel'
+import MessageFormattedString from './MessageFormattedString'
+import { useUiMotion } from './uiMotion'
+
+export const mineflayerPluginHudState = proxy({
+  ui: [] as Array<UIDefinition & { id: string }>,
+})
+
+const TextElement = ({ text, x, y, motion = true, formatted = true, css = '', onTab = false }: UIDefinition & { type: 'text' }) => {
+  const motionRef = useRef<HTMLDivElement>(null)
+  const innerRef = useRef<HTMLDivElement>(null)
+
+  useUiMotion(motionRef, motion)
+
+  useEffect(() => {
+    if (!css) return
+    innerRef.current!.style.cssText = css
+  }, [css])
+
+  if (onTab && !document.hidden) return null
+
+  return (
+    <div
+      ref={motionRef}
+      style={{
+        position: 'absolute',
+        left: x,
+        top: y,
+        transition: motion ? 'transform 0.1s ease-out' : 'none',
+      }}
+    >
+      <div ref={innerRef}>
+        {formatted ? <MessageFormattedString message={text} /> : text}
+      </div>
+    </div>
+  )
+}
+
+const ImageElement = ({ url, x, y, width, height }: UIDefinition & { type: 'image' }) => {
+  return (
+    <img
+      src={url}
+      style={{
+        position: 'absolute',
+        left: x,
+        top: y,
+        width,
+        height
+      }}
+      alt=""
+    />
+  )
+}
+
+export default () => {
+  const { ui } = useSnapshot(mineflayerPluginHudState)
+
+  return (
+    <div style={{ position: 'absolute', top: 0, left: 0, width: '100%', height: '100%', pointerEvents: 'none' }}>
+      {ui.map((element, index) => {
+        if (element.type === 'lil') return null // Handled elsewhere
+        if (element.type === 'text') return <TextElement key={index} {...element} />
+        if (element.type === 'image') return <ImageElement key={index} {...element} />
+        return null
+      })}
+    </div>
+  )
+}
diff --git a/src/react/uiMotion.ts b/src/react/uiMotion.ts
new file mode 100644
index 00000000..1d1bb7e1
--- /dev/null
+++ b/src/react/uiMotion.ts
@@ -0,0 +1,89 @@
+import { proxy, subscribe } from 'valtio'
+import * as THREE from 'three'
+import { useEffect } from 'react'
+
+export const motionState = proxy({
+  offset: { x: 0, y: 0 }
+})
+
+const MOTION_DAMPING = 0.92
+// const MAX_MOTION_OFFSET = 30
+const MAX_MOTION_OFFSET = 350
+const motionVelocity = { x: 0, y: 0 }
+let lastUpdate = performance.now()
+let lastYaw = 0
+let lastPitch = 0
+
+export function updateMotion () {
+  if (!bot?.entity) return
+  const now = performance.now()
+  const deltaTime = (now - lastUpdate) / 1000 // Convert to seconds
+  lastUpdate = now
+
+  // Get camera movement contribution
+  const yawDiff = (bot.entity.yaw - lastYaw)
+  const pitchDiff = (bot.entity.pitch - lastPitch)
+  lastYaw = bot.entity.yaw
+  lastPitch = bot.entity.pitch
+
+  // Create a vector for velocity in world space
+  const { velocity } = bot.entity
+  const velocityVector = new THREE.Vector3(velocity.x, 0, velocity.z)
+
+  // Get camera's forward direction
+  const cameraQuat = new THREE.Quaternion()
+  cameraQuat.setFromEuler(new THREE.Euler(0, -bot.entity.yaw, 0))
+
+  // Transform velocity to camera space
+  velocityVector.applyQuaternion(cameraQuat)
+
+  // Calculate motion contribution
+  const velocityContribution = {
+    x: -velocityVector.x * 200,
+    y: -velocityVector.z * 200
+  }
+
+  // Combine camera and velocity effects
+  motionVelocity.x += (yawDiff * 400 + velocityContribution.x) * deltaTime
+  motionVelocity.y += (pitchDiff * 400 + velocityContribution.y) * deltaTime
+
+  // Apply damping
+  motionVelocity.x *= MOTION_DAMPING
+  motionVelocity.y *= MOTION_DAMPING
+
+  // Clamp values
+  motionVelocity.x = Math.max(-MAX_MOTION_OFFSET, Math.min(MAX_MOTION_OFFSET, motionVelocity.x))
+  motionVelocity.y = Math.max(-MAX_MOTION_OFFSET, Math.min(MAX_MOTION_OFFSET, motionVelocity.y))
+
+  // Update the motion state
+  motionState.offset = {
+    x: motionVelocity.x,
+    y: motionVelocity.y
+  }
+}
+
+let motionEnabled = false
+export function initMotionTracking () {
+  if (motionEnabled) return
+  motionEnabled = true
+
+  function animate () {
+    updateMotion()
+    requestAnimationFrame(animate)
+  }
+  animate()
+}
+
+export function useUiMotion (ref: React.RefObject<HTMLElement>, enabled = true) {
+  useEffect(() => {
+    if (!enabled || !ref.current) return
+
+    const unsubscribe = subscribe(motionState, () => {
+      const el = ref.current
+      if (!el) return
+      el.style.transform = `translate(${motionState.offset.x.toFixed(2)}px, ${motionState.offset.y.toFixed(2)}px)`
+    })
+
+    return () => unsubscribe()
+  }, [enabled, ref])
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index aa2f8fe4..0592d20d 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -47,6 +47,8 @@ import { options } from './optionsStorage'
 import BossBarOverlayProvider from './react/BossBarOverlayProvider'
 import DebugEdges from './react/DebugEdges'
 import GameInteractionOverlay from './react/GameInteractionOverlay'
+import MineflayerPluginHud from './react/MineflayerPluginHud'
+import MineflayerPluginConsole from './react/MineflayerPluginConsole'
 
 const RobustPortal = ({ children, to }) => {
   return createPortal(<PerComponentErrorBoundary>{children}</PerComponentErrorBoundary>, to)
@@ -134,6 +136,8 @@ const InGameUi = () => {
       </div>
 
       <PauseScreen />
+      <MineflayerPluginHud />
+      <MineflayerPluginConsole />
       <div style={{ display: showUI ? 'block' : 'none' }}>
         {!disabledUiParts.includes('xp-bar') && <XPBarProvider />}
         {!disabledUiParts.includes('hud-bars') && <HudBarsProvider />}
diff --git a/src/styles.css b/src/styles.css
index 2c645ae9..9e97ee31 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -15,6 +15,10 @@
   box-sizing: border-box;
 }
 
+.lil-gui {
+  top: 20px !important;
+}
+
 a {
   color: white;
 }
diff --git a/src/viewerConnector.ts b/src/viewerConnector.ts
index 45d85bb0..148f352f 100644
--- a/src/viewerConnector.ts
+++ b/src/viewerConnector.ts
@@ -2,6 +2,22 @@ import { EventEmitter } from 'events'
 import { Duplex } from 'stream'
 import states from 'minecraft-protocol/src/states'
 import { createClient } from 'minecraft-protocol'
+import { proxy, subscribe } from 'valtio'
+import * as Gui from 'lil-gui'
+import { CustomChannelPacketFromClient, CustomChannelPacketFromServer, UIDefinition } from 'mcraft-fun-mineflayer/build/customChannel'
+import { activeModalStack } from './globalState'
+import { mineflayerPluginHudState } from './react/MineflayerPluginHud'
+import { mineflayerConsoleState } from './react/MineflayerPluginConsole'
+
+export const viewerVersionState = proxy({
+  forwardChat: true,
+  version: '',
+  time: 0,
+  replEnabled: false,
+  consoleEnabled: false,
+  requiresPass: false,
+  clientIgnoredPackets: [] as string[]
+})
 
 class CustomDuplex extends Duplex {
   constructor (options, public writeAction) {
@@ -19,9 +35,13 @@ class CustomDuplex extends Duplex {
 export const getViewerVersionData = async (url: string) => {
   const ws = await openWebsocket(url)
   ws.send('version')
-  return new Promise<{
+  const result = await new Promise<{
     version: string
     time: number,
+    replEnabled: boolean,
+    consoleEnabled: boolean,
+    requiresPass: boolean,
+    forwardChat: boolean,
     clientIgnoredPackets?: string[]
   }>((resolve, reject) => {
     ws.addEventListener('message', async (message) => {
@@ -29,6 +49,8 @@ export const getViewerVersionData = async (url: string) => {
       const parsed = JSON.parse(data.toString())
       resolve(parsed)
       ws.close()
+      // Update viewer version state
+      Object.assign(viewerVersionState, parsed)
       // todo
       customEvents.on('mineflayerBotCreated', () => {
         const client = bot._client as any
@@ -43,6 +65,9 @@ export const getViewerVersionData = async (url: string) => {
       })
     })
   })
+  mineflayerConsoleState.consoleEnabled = result.consoleEnabled
+  mineflayerConsoleState.replEnabled = result.replEnabled
+  return result
 }
 
 const openWebsocket = async (url: string) => {
@@ -84,12 +109,176 @@ export const getWsProtocolStream = async (url: string) => {
   ws.addEventListener('close', () => {
     console.log('ws closed')
     clientDuplex.end()
-    // bot.emit('end', 'Disconnected.')
+    setTimeout(() => {
+      bot?.emit('end', 'Connection lost')
+    }, 500)
   })
 
   ws.addEventListener('error', err => {
     console.log('ws error', err)
   })
 
-  return clientDuplex
+  return {
+    clientDuplex
+  }
+}
+
+const CHANNEL_NAME = 'minecraft-web-client:data'
+
+export const handleCustomChannel = async () => {
+  // await new Promise(resolve => {
+  //   bot._client.once('login', resolve)
+  // })
+
+  bot._client.registerChannel(CHANNEL_NAME, ['string', []], true)
+  const toCleanup = [] as Array<() => void>
+  subscribe(activeModalStack, () => {
+    if (activeModalStack.length === 1 && activeModalStack[0].reactType === 'main-menu') {
+      for (const fn of toCleanup) fn()
+      toCleanup.length = 0
+      // Clear console state when disconnecting
+      mineflayerConsoleState.messages = []
+      mineflayerConsoleState.replEnabled = false
+      mineflayerConsoleState.consoleEnabled = false
+    }
+  })
+
+  const send = (data: CustomChannelPacketFromClient) => {
+    bot._client.writeChannel(CHANNEL_NAME, JSON.stringify(data))
+  }
+
+  // Set up console execution handler
+  mineflayerConsoleState.onExecute = (code) => {
+    send({
+      type: 'eval',
+      code
+    })
+  }
+
+  const on = (callback: (data: CustomChannelPacketFromServer) => void) => {
+    bot._client.on(CHANNEL_NAME as any, (data) => {
+      const parsed = JSON.parse(data.toString())
+      callback(parsed)
+    })
+  }
+
+  const lils = {} as Record<string, Gui.GUI>
+
+  on((data) => {
+    switch (data.type) {
+      case 'eval': {
+        // Handle eval results
+        mineflayerConsoleState.messages.push({
+          id: Date.now(),
+          text: data.isError ? `${data.result}` : JSON.stringify(data.result),
+          isRepl: true,
+          level: data.isError ? 'error' : undefined
+        })
+
+        break
+      }
+      case 'console': {
+        // Handle console messages
+        mineflayerConsoleState.messages.push({
+          id: Date.now(),
+          text: data.message,
+          level: data.level
+        })
+
+        break
+      }
+      case 'ui': {
+        const { update } = data
+        if (update.data === null) {
+          // Remove UI element
+          mineflayerPluginHudState.ui = mineflayerPluginHudState.ui.filter(ui => ui.id !== update.id)
+
+          const gui = lils[update.id]
+          if (gui) {
+            gui.destroy()
+            delete lils[update.id]
+          }
+        } else {
+        // Add or update UI element
+          const existingIndex = mineflayerPluginHudState.ui.findIndex(ui => ui.id === update.id)
+          if (existingIndex === -1) {
+            mineflayerPluginHudState.ui.push({ ...update.data, id: update.id })
+          } else {
+            mineflayerPluginHudState.ui[existingIndex] = { ...update.data, id: update.id }
+          }
+
+          if (update.data.type === 'lil') {
+            let gui = lils[update.id]
+            if (!gui) {
+              gui = new Gui.GUI({
+                title: update.data.title,
+              })
+              lils[update.id] = gui
+            }
+
+            // Update or add controllers
+            const { params, buttons } = update.data
+            for (const button of buttons ?? []) {
+              params[button] = (() => {
+                send({
+                  type: 'ui',
+                  id: update.id,
+                  param: button,
+                  value: true
+                })
+              }) as any
+            }
+            // eslint-disable-next-line guard-for-in
+            for (const paramName in params) {
+              const value = params[paramName]
+              const controller = gui.controllers.find(c => c.property === paramName)
+
+              if (controller) {
+                // Update existing controller value
+                controller.object[paramName] = value
+                controller.updateDisplay()
+              } else {
+                // Add new controller if doesn't exist
+                const obj = { [paramName]: value }
+                const controller = gui.add(obj, paramName)
+                if (!buttons?.includes(paramName)) {
+                  controller.onChange((value) => {
+                    send({
+                      type: 'ui',
+                      id: update.id,
+                      param: paramName,
+                      value
+                    })
+                  })
+                }
+              }
+            }
+
+            // Remove controllers that are no longer in params
+            const paramNames = Object.keys(params)
+            gui.controllers = gui.controllers.filter(c => {
+              if (!paramNames.includes(c.property)) {
+                c.destroy()
+                return false
+              }
+              return true
+            })
+          }
+        }
+
+        break
+      }
+
+      case 'stats': {
+        globalThis.botStats = data
+        break
+      }
+
+      case 'method': {
+        console.log('Method result', data.result)
+        break
+      }
+      // No default
+    }
+  })
 }
diff --git a/src/worldInteractions.ts b/src/worldInteractions.ts
index b1811569..0586d65b 100644
--- a/src/worldInteractions.ts
+++ b/src/worldInteractions.ts
@@ -6,6 +6,7 @@ import * as THREE from 'three'
 import { Vec3 } from 'vec3'
 import { LineMaterial } from 'three-stdlib'
 import { Entity } from 'prismarine-entity'
+import { Block } from 'prismarine-block'
 import { subscribeKey } from 'valtio/utils'
 import destroyStage0 from '../assets/destroy_stage_0.png'
 import destroyStage1 from '../assets/destroy_stage_1.png'
@@ -35,9 +36,10 @@ function getViewDirection (pitch, yaw) {
 
 class WorldInteraction {
   ready = false
-  prevBreakState
-  currentDigTime
-  prevOnGround
+  cursorBlock: Block | null = null
+  prevBreakState: number | null = null
+  currentDigTime: number | null = null
+  prevOnGround: boolean | null = null
   lastBlockPlaced: number
   lastSwing = 0
   buttons = [false, false, false]
@@ -48,6 +50,8 @@ class WorldInteraction {
   breakTextures: THREE.Texture[]
   lastDigged: number
   debugDigStatus: string
+  currentBreakBlock: { block: any, stage: number } | null = null
+  swingTimeout: any = null
 
   oneTimeInit () {
     const loader = new THREE.TextureLoader()
@@ -129,11 +133,11 @@ class WorldInteraction {
       // TODO: Any blocks with a breaking time of 0.05
       this.lastDigged = Date.now()
       this.debugDigStatus = 'done'
+      this.stopBreakAnimation()
     })
     bot.on('diggingAborted', (block) => {
       if (!viewer.world.cursorBlock?.equals(block.position)) return
       this.debugDigStatus = 'aborted'
-      // if (this.lastDugBlock)
       this.breakStartTime = undefined
       if (this.buttons[0]) {
         this.buttons[0] = false
@@ -141,11 +145,38 @@ class WorldInteraction {
         this.buttons[0] = true // trigger again
       }
       this.lastDugBlock = null
+      this.stopBreakAnimation()
     })
     bot.on('heldItemChanged' as any, () => {
       itemBeingUsed.name = null
     })
 
+    // Add new event listeners for block breaking and swinging
+    bot.on('entitySwingArm', (entity: Entity) => {
+      if (entity.id === bot.entity.id) {
+        if (this.swingTimeout) {
+          clearTimeout(this.swingTimeout)
+        }
+        viewer.world.changeHandSwingingState(true, false)
+        this.swingTimeout = setTimeout(() => {
+          viewer.world.changeHandSwingingState(false, false)
+          this.swingTimeout = null
+        }, 250)
+      }
+    })
+
+    bot.on('blockBreakProgressObserved', (block: Block, destroyStage: number) => {
+      if (this.cursorBlock?.position.equals(block.position)) {
+        this.setBreakState(block, destroyStage)
+      }
+    })
+
+    bot.on('blockBreakProgressEnd', (block: Block) => {
+      if (this.currentBreakBlock?.block.position.equals(block.position)) {
+        this.stopBreakAnimation()
+      }
+    })
+
     const upLineMaterial = () => {
       const inCreative = bot.game.gameMode === 'creative'
       const pixelRatio = viewer.renderer.getPixelRatio()
@@ -214,10 +245,12 @@ class WorldInteraction {
     const inSpectator = bot.game.gameMode === 'spectator'
     const inAdventure = bot.game.gameMode === 'adventure'
     const entity = getEntityCursor()
-    let cursorBlock = inSpectator && !options.showCursorBlockInSpectator ? null : bot.blockAtCursor(5)
+    let _cursorBlock = inSpectator && !options.showCursorBlockInSpectator ? null : bot.blockAtCursor(5)
     if (entity) {
-      cursorBlock = null
+      _cursorBlock = null
     }
+    this.cursorBlock = _cursorBlock
+    const { cursorBlock } = this
 
     let cursorBlockDiggable = cursorBlock
     if (cursorBlock && (!bot.canDigBlock(cursorBlock) || inAdventure) && bot.game.gameMode !== 'creative') cursorBlockDiggable = null
@@ -312,6 +345,7 @@ class WorldInteraction {
       this.lastDugBlock = null
       this.breakStartTime = undefined
       this.debugDigStatus = 'cancelled'
+      this.stopBreakAnimation()
     }
 
     const onGround = bot.entity.onGround || bot.game.gameMode === 'creative'
@@ -379,14 +413,10 @@ class WorldInteraction {
         try { bot.stopDigging() } catch { }
       }
       const state = Math.floor((elapsed / time) * 10)
-      //@ts-expect-error
-      this.blockBreakMesh.material.map = this.breakTextures[state] ?? this.breakTextures.at(-1)
       if (state !== this.prevBreakState) {
-        //@ts-expect-error
-        this.blockBreakMesh.material.needsUpdate = true
+        this.setBreakState(cursorBlockDiggable, Math.min(state, 9))
       }
       this.prevBreakState = state
-      this.blockBreakMesh.visible = true
     } else {
       this.blockBreakMesh.visible = false
     }
@@ -401,6 +431,20 @@ class WorldInteraction {
     this.lastButtons[1] = this.buttons[1]
     this.lastButtons[2] = this.buttons[2]
   }
+
+  setBreakState (block: Block, stage: number) {
+    this.currentBreakBlock = { block, stage }
+    this.blockBreakMesh.visible = true
+    //@ts-expect-error
+    this.blockBreakMesh.material.map = this.breakTextures[stage] ?? this.breakTextures.at(-1)
+    //@ts-expect-error
+    this.blockBreakMesh.material.needsUpdate = true
+  }
+
+  stopBreakAnimation () {
+    this.currentBreakBlock = null
+    this.blockBreakMesh.visible = false
+  }
 }
 
 const getDataFromShape = (shape) => {
@@ -445,10 +489,8 @@ function isBlockActivatable (blockName: string) {
   return activatableBlockPatterns.some(pattern => pattern.test(blockName))
 }
 
-function isLookingAtActivatableBlock () {
-  const cursorBlock = bot.blockAtCursor(5)
-  if (!cursorBlock) return false
-  return isBlockActivatable(cursorBlock.name)
+function isLookingAtActivatableBlock (block: Block) {
+  return isBlockActivatable(block.name)
 }
 
 export const getEntityCursor = () => {

From e9e8641f109debd8f31da9bc0457c29927ac5a50 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 10 Feb 2025 20:04:04 +0300
Subject: [PATCH 211/753] should fix build error, fix viewer memory leak

---
 src/parseServerAddress.ts |  8 +++++++-
 src/utils.ts              |  7 -------
 src/viewerConnector.ts    | 10 ++++++++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/parseServerAddress.ts b/src/parseServerAddress.ts
index dec89c00..4068c3af 100644
--- a/src/parseServerAddress.ts
+++ b/src/parseServerAddress.ts
@@ -1,4 +1,3 @@
-import { ParsedServerAddress } from './utils'
 
 
 export const parseServerAddress = (address: string | undefined, removeHttp = true): ParsedServerAddress => {
@@ -41,3 +40,10 @@ export const parseServerAddress = (address: string | undefined, removeHttp = tru
     isWebSocket: false
   }
 }
+
+export interface ParsedServerAddress {
+  host: string
+  port?: string
+  version?: string
+  isWebSocket: boolean
+}
diff --git a/src/utils.ts b/src/utils.ts
index 6c0110fb..a5867a41 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -180,10 +180,3 @@ export const reportWarningOnce = (id: string, message: string) => {
   reportedWarnings.add(id)
   console.warn(message)
 }
-
-export interface ParsedServerAddress {
-  host: string
-  port?: string
-  version?: string
-  isWebSocket: boolean
-}
diff --git a/src/viewerConnector.ts b/src/viewerConnector.ts
index 148f352f..692056e3 100644
--- a/src/viewerConnector.ts
+++ b/src/viewerConnector.ts
@@ -174,7 +174,10 @@ export const handleCustomChannel = async () => {
           isRepl: true,
           level: data.isError ? 'error' : undefined
         })
-
+        // Limit to 500 messages by removing oldest ones
+        if (mineflayerConsoleState.messages.length > 500) {
+          mineflayerConsoleState.messages = mineflayerConsoleState.messages.slice(-500)
+        }
         break
       }
       case 'console': {
@@ -184,7 +187,10 @@ export const handleCustomChannel = async () => {
           text: data.message,
           level: data.level
         })
-
+        // Limit to 500 messages by removing oldest ones
+        if (mineflayerConsoleState.messages.length > 500) {
+          mineflayerConsoleState.messages = mineflayerConsoleState.messages.slice(-500)
+        }
         break
       }
       case 'ui': {

From d27f2b4a61d4db3c59e9ca9a991caa837ad9367b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 10 Feb 2025 21:04:33 +0300
Subject: [PATCH 212/753] fix(big-perf): do not render entities in not loaded
 chunks that are far away

---
 renderer/viewer/lib/entities.ts | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/entities.ts b/renderer/viewer/lib/entities.ts
index 8b72fe2c..0dcd8ec1 100644
--- a/renderer/viewer/lib/entities.ts
+++ b/renderer/viewer/lib/entities.ts
@@ -269,11 +269,33 @@ export class Entities extends EventEmitter {
 
   render () {
     const dt = this.clock.getDelta()
+    const botPos = this.viewer.world.viewerPosition
+    const VISIBLE_DISTANCE = 8 * 8
+
     for (const entityId of Object.keys(this.entities)) {
-      const playerObject = this.getPlayerObject(entityId)
+      const entity = this.entities[entityId]
+      const playerObject = entity.playerObject as PlayerObjectType | undefined
+
+      // Update animations
       if (playerObject?.animation) {
         playerObject.animation.update(playerObject, dt)
       }
+
+      // Update visibility based on distance and chunk load status
+      if (botPos && entity.position) {
+        const dx = entity.position.x - botPos.x
+        const dy = entity.position.y - botPos.y
+        const dz = entity.position.z - botPos.z
+        const distanceSquared = dx * dx + dy * dy + dz * dz
+
+        // Get chunk coordinates
+        const chunkX = Math.floor(entity.position.x / 16)
+        const chunkZ = Math.floor(entity.position.z / 16)
+        const chunkKey = `${chunkX},${chunkZ}`
+
+        // Entity is visible if within 16 blocks OR in a finished chunk
+        entity.visible = distanceSquared < VISIBLE_DISTANCE || this.viewer.world.finishedChunks[chunkKey]
+      }
     }
   }
 

From 208f5b7e0dbbfbd20b43f295bb2711ef01f013ae Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 10 Feb 2025 21:04:40 +0300
Subject: [PATCH 213/753] fix chat placeholder

---
 src/react/ChatProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index ded46b45..90bc9c6d 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -49,7 +49,7 @@ export default () => {
     opacity={(isChatActive ? chatOpacityOpened : chatOpacity) / 100}
     messages={messages}
     opened={isChatActive}
-    placeholder={forwardChat && viewerConnection ? undefined : 'Chat forwarding is not enabled in the plugin settings'}
+    placeholder={forwardChat || !viewerConnection ? undefined : 'Chat forwarding is not enabled in the plugin settings'}
     sendMessage={(message) => {
       const builtinHandled = tryHandleBuiltinCommand(message)
       if (miscUiState.loadedServerIndex && (message.startsWith('/login') || message.startsWith('/register'))) {

From f03046573d171ec082951e2cf2d4c7ecbcbeb025 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 10 Feb 2025 22:47:43 +0300
Subject: [PATCH 214/753] hotfix: workaround hotbar crash on 1.21.1

---
 src/chatUtils.test.ts                | 18 ++++++++++++++++++
 src/react/MessageFormattedString.tsx | 19 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/chatUtils.test.ts b/src/chatUtils.test.ts
index e717da28..3fc563fd 100644
--- a/src/chatUtils.test.ts
+++ b/src/chatUtils.test.ts
@@ -11,6 +11,24 @@ const mapIncludeDefined = (props) => {
   }
 }
 
+/*
+TODO (nbt)
+{
+    "extra": [
+        {
+            "italic": 0,
+            "underlined": 0,
+            "bold": 0,
+            "color": "aqua",
+            "obfuscated": 0,
+            "strikethrough": 0,
+            "text": "minecraft:lift"
+        }
+    ],
+    "text": ""
+}
+*/
+
 test('formatMessage', () => {
   const result = formatMessage({
     'json': {
diff --git a/src/react/MessageFormattedString.tsx b/src/react/MessageFormattedString.tsx
index ac261889..97cef89c 100644
--- a/src/react/MessageFormattedString.tsx
+++ b/src/react/MessageFormattedString.tsx
@@ -1,5 +1,7 @@
 import { useMemo } from 'react'
 import { fromFormattedString } from '@xmcl/text-component'
+import nbt from 'prismarine-nbt'
+import { ErrorBoundary } from '@zardoy/react-util'
 import { formatMessage } from '../chatUtils'
 import MessageFormatted from './MessageFormatted'
 
@@ -11,6 +13,16 @@ export default ({ message, fallbackColor, className }: {
 }) => {
   const messageJson = useMemo(() => {
     if (!message) return null
+    const transformIfNbt = (x) => {
+      if (typeof x === 'object' && x?.type) return nbt.simplify(x) as Record<string, any>
+      // if (Array.isArray(x)) return x.map(transformIfNbt)
+      // if (typeof x === 'object') return Object.fromEntries(Object.entries(x).map(([k, v]) => [k, transformIfNbt(v)]))
+      return x
+    }
+    if (typeof message === 'object' && message.text?.text?.type) {
+      message.text.text = transformIfNbt(message.text.text)
+      message.text.extra = transformIfNbt(message.text.extra)
+    }
     try {
       const texts = formatMessage(typeof message === 'string' ? fromFormattedString(message) : message)
       return texts.map(text => {
@@ -25,5 +37,10 @@ export default ({ message, fallbackColor, className }: {
     }
   }, [message])
 
-  return messageJson ? <MessageFormatted parts={messageJson} className={className} /> : null
+  return messageJson ? <ErrorBoundary renderError={(error) => {
+    console.error(error)
+    return <div>[text component crashed]</div>
+  }}>
+    <MessageFormatted parts={messageJson} className={className} />
+  </ErrorBoundary> : null
 }

From 0dd7b4d802c26d98aebb9a9e3e8ae17136f5be97 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Feb 2025 00:40:52 +0300
Subject: [PATCH 215/753] plugin: register custom channel later

---
 src/viewerConnector.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/viewerConnector.ts b/src/viewerConnector.ts
index 692056e3..5096ba4d 100644
--- a/src/viewerConnector.ts
+++ b/src/viewerConnector.ts
@@ -126,9 +126,9 @@ export const getWsProtocolStream = async (url: string) => {
 const CHANNEL_NAME = 'minecraft-web-client:data'
 
 export const handleCustomChannel = async () => {
-  // await new Promise(resolve => {
-  //   bot._client.once('login', resolve)
-  // })
+  await new Promise(resolve => {
+    bot._client.once('login', resolve)
+  })
 
   bot._client.registerChannel(CHANNEL_NAME, ['string', []], true)
   const toCleanup = [] as Array<() => void>

From 85fbe0cec077fbff035d3f1373f40f28901d00b6 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Feb 2025 01:08:41 +0300
Subject: [PATCH 216/753] seems all versions auth is supported, remove
 restriction

---
 src/devtools.ts | 27 +++++++++++++++++++++------
 src/index.ts    |  8 ++++----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/devtools.ts b/src/devtools.ts
index 4aa10b11..6da89f20 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -45,8 +45,12 @@ customEvents.on('gameLoaded', () => {
 })
 
 window.inspectPacket = (packetName, isFromClient = false, fullOrListener: boolean | ((...args) => void) = false) => {
+  if (typeof isFromClient === 'function') {
+    fullOrListener = isFromClient
+    isFromClient = false
+  }
   const listener = typeof fullOrListener === 'function'
-    ? (name, ...args) => fullOrListener(name, ...args)
+    ? (name, ...args) => fullOrListener(...args, name)
     : (name, ...args) => {
       const displayName = name === packetName ? name : `${name} (${packetName})`
       console.log('packet', displayName, fullOrListener ? args : args[0])
@@ -57,7 +61,16 @@ window.inspectPacket = (packetName, isFromClient = false, fullOrListener: boolea
     ? new RegExp('^' + packetName.replaceAll('*', '.*') + '$')
     : null
 
-  const packetsListener = (name, data) => {
+  const packetNameListener = (name, data) => {
+    if (pattern) {
+      if (pattern.test(name)) {
+        listener(name, data)
+      }
+    } else if (name === packetName) {
+      listener(name, data)
+    }
+  }
+  const packetListener = (data, { name }) => {
     if (pattern) {
       if (pattern.test(name)) {
         listener(name, data)
@@ -69,16 +82,18 @@ window.inspectPacket = (packetName, isFromClient = false, fullOrListener: boolea
 
   const attach = () => {
     if (isFromClient) {
-      bot?._client.prependListener('writePacket', packetsListener)
+      bot?._client.prependListener('writePacket', packetNameListener)
     } else {
-      bot?._client.prependListener('packet_name', packetsListener)
+      bot?._client.prependListener('packet_name', packetNameListener)
+      bot?._client.prependListener('packet', packetListener)
     }
   }
   const detach = () => {
     if (isFromClient) {
-      bot?._client.removeListener('writePacket', packetsListener)
+      bot?._client.removeListener('writePacket', packetNameListener)
     } else {
-      bot?._client.removeListener('packet_name', packetsListener)
+      bot?._client.removeListener('packet_name', packetNameListener)
+      bot?._client.removeListener('packet', packetListener)
     }
   }
   attach()
diff --git a/src/index.ts b/src/index.ts
index 199a4083..7547c453 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -393,10 +393,10 @@ export async function connect (connectOptions: ConnectOptions) {
     const downloadMcData = async (version: string) => {
       if (dataDownloaded) return
       dataDownloaded = true
-      if (connectOptions.authenticatedAccount && (versionToNumber(version) < versionToNumber('1.19.4') || versionToNumber(version) >= versionToNumber('1.21'))) {
-        // todo support it (just need to fix .export crash)
-        throw new UserError('Microsoft authentication is only supported on 1.19.4 - 1.20.6 (at least for now)')
-      }
+      // if (connectOptions.authenticatedAccount && (versionToNumber(version) < versionToNumber('1.19.4') || versionToNumber(version) >= versionToNumber('1.21'))) {
+      //   // todo support it (just need to fix .export crash)
+      //   throw new UserError('Microsoft authentication is only supported on 1.19.4 - 1.20.6 (at least for now)')
+      // }
 
       await downloadMcDataOnConnect(version)
       try {

From d05898ab1cdb393e2120c51fd8d78fdc23948738 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Feb 2025 15:51:56 +0300
Subject: [PATCH 217/753] display stack on app crash, more advanced logic on
 app refresh

---
 index.html                      | 43 +++++++++++++++++---
 src/appParams.ts                |  1 +
 src/index.ts                    |  3 ++
 src/react/MainMenuRenderApp.tsx | 69 +++++++++++++++++++++++++--------
 src/testCrasher.ts              |  5 +++
 5 files changed, 100 insertions(+), 21 deletions(-)
 create mode 100644 src/testCrasher.ts

diff --git a/index.html b/index.html
index d662cbb6..8e85c039 100644
--- a/index.html
+++ b/index.html
@@ -25,6 +25,8 @@
     <div>
         <div style="font-size: calc(var(--font-size) * 1.8);color: lightgray;" class="title">Loading...</div>
         <div style="font-size: var(--font-size);color: rgb(176, 176, 176);margin-top: 3px;text-align: center" class="subtitle">A true Minecraft client in your browser!</div>
+        <!-- small text pre -->
+        <div style="font-size: calc(var(--font-size) * 0.6);color: rgb(150, 150, 150);margin-top: 3px;text-align: center;white-space: pre-line;" class="advanced-info"></div>
     </div>
 </div>
 `
@@ -35,16 +37,28 @@
             document.documentElement.appendChild(loadingDivElem)
           }
           // load error handling
-          const onError = (message) => {
-            console.log(message)
+          const onError = (errorOrMessage, log = false) => {
+            const message = errorOrMessage instanceof Error ? (errorOrMessage.stack ?? errorOrMessage.message) : errorOrMessage
+            if (log) console.log(message)
             if (document.querySelector('.initial-loader') && document.querySelector('.initial-loader').querySelector('.title').textContent !== 'Error') {
               document.querySelector('.initial-loader').querySelector('.title').textContent = 'Error'
-              document.querySelector('.initial-loader').querySelector('.subtitle').textContent = message
+              const [errorMessage, ...errorStack] = message.split('\n')
+              document.querySelector('.initial-loader').querySelector('.subtitle').textContent = errorMessage
+              document.querySelector('.initial-loader').querySelector('.advanced-info').textContent = errorStack.join('\n')
               if (window.navigator.maxTouchPoints > 1) window.location.hash = '#dev' // show eruda
+              // unregister all sw
+              if (window.navigator.serviceWorker) {
+                window.navigator.serviceWorker.getRegistrations().then(registrations => {
+                  registrations.forEach(registration => {
+                    registration.unregister()
+                  })
+                })
+              }
             }
+            window.lastError = errorOrMessage instanceof Error ? errorOrMessage : new Error(errorOrMessage)
           }
-          window.addEventListener('unhandledrejection', (e) => onError(e.reason))
-          window.addEventListener('error', (e) => onError(e.message))
+          window.addEventListener('unhandledrejection', (e) => onError(e.reason, true))
+          window.addEventListener('error', (e) => onError(e.error ?? e.message))
         }
         insertLoadingDiv()
         document.addEventListener('DOMContentLoaded', () => {
@@ -61,6 +75,25 @@
           import('https://cdn.skypack.dev/eruda').then(({ default: eruda }) => {
             eruda.init()
           })
+          Promise.all([import('https://cdn.skypack.dev/stacktrace-gps'), import('https://cdn.skypack.dev/error-stack-parser')]).then(async ([{ default: StackTraceGPS }, { default: ErrorStackParser }]) => {
+            if (!window.lastError) return
+
+            let stackFrames = [];
+            if (window.lastError instanceof Error) {
+              stackFrames = ErrorStackParser.parse(window.lastError);
+            }
+            console.log('stackFrames', stackFrames)
+            const gps = new StackTraceGPS()
+            const mappedFrames = await Promise.all(
+              stackFrames.map(frame => gps.pinpoint(frame))
+            );
+            console.log('mappedFrames', mappedFrames)
+
+            const stackTrace = mappedFrames
+              .map(frame => `at ${frame.functionName} (${frame.fileName}:${frame.lineNumber}:${frame.columnNumber})`)
+              .join('\n');
+            console.log('stackTrace', stackTrace)
+          })
         }
       }
       checkLoadEruda()
diff --git a/src/appParams.ts b/src/appParams.ts
index 0b6bd6d8..61ee9e07 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -38,6 +38,7 @@ export type AppQsParams = {
   // Misc params
   suggest_save?: string
   noPacketsValidation?: string
+  testCrashApp?: string
 }
 
 export type AppQsParamsArray = {
diff --git a/src/index.ts b/src/index.ts
index 7547c453..c075e6c4 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,6 +1,7 @@
 /* eslint-disable import/order */
 import './importsWorkaround'
 import './styles.css'
+import './testCrasher'
 import './globals'
 import './devtools'
 import './entities'
@@ -160,6 +161,8 @@ if (isIphone) {
   document.documentElement.style.setProperty('--hud-bottom-max', '21px') // env-safe-aria-inset-bottom
 }
 
+if (appQueryParams.testCrashApp === '2') throw new Error('test')
+
 // Create viewer
 const viewer: import('renderer/viewer/lib/viewer').Viewer = new Viewer(renderer)
 window.viewer = viewer
diff --git a/src/react/MainMenuRenderApp.tsx b/src/react/MainMenuRenderApp.tsx
index c7bc99e5..c72b89e0 100644
--- a/src/react/MainMenuRenderApp.tsx
+++ b/src/react/MainMenuRenderApp.tsx
@@ -10,23 +10,60 @@ import { openFilePicker, copyFilesAsync, mkdirRecursive, openWorldDirectory, rem
 import MainMenu from './MainMenu'
 import { DiscordButton } from './DiscordButton'
 
+const isMainMenu = () => {
+  return activeModalStack.length === 0 && !miscUiState.gameLoaded
+}
+
 const refreshApp = async (failedUpdate = false) => {
-  const registration = await navigator.serviceWorker.getRegistration()
-  await registration?.unregister()
-  if (failedUpdate) {
-    await new Promise(resolve => {
-      setTimeout(resolve, 2000)
-    })
-  }
-  if (activeModalStack.length !== 0) return
-  if (failedUpdate) {
-    sessionStorage.justReloaded = false
-    // try to force bypass cache
-    location.search = '?update=true'
-  } else {
-    window.justReloaded = true
-    sessionStorage.justReloaded = true
-    window.location.reload()
+  try {
+    const registration = await navigator.serviceWorker.getRegistration()
+    if (registration) {
+      // First, disconnect all clients
+      const clients = await window.clients?.matchAll() || []
+      await Promise.all(clients.map(client => client.postMessage('SKIP_WAITING')))
+
+      // Force the waiting service worker to become active
+      if (registration.waiting) {
+        registration.waiting.postMessage('SKIP_WAITING')
+      }
+
+      // Add timeout to prevent infinite waiting
+      const unregisterPromise = registration.unregister()
+      const timeoutPromise = new Promise((_, reject) => {
+        setTimeout(() => reject(new Error('SW unregister timeout')), 3000)
+      })
+
+      await Promise.race([unregisterPromise, timeoutPromise])
+        .catch(err => {
+          console.warn('SW unregister error:', err)
+          if (isMainMenu()) {
+            alert('Failed to unregister SW: ' + err)
+          }
+        })
+    }
+
+    if (failedUpdate) {
+      await new Promise(resolve => { setTimeout(resolve, 2000) })
+    }
+
+    if (!isMainMenu()) return
+
+    if (failedUpdate) {
+      sessionStorage.justReloaded = false
+      // try to force bypass cache
+      location.search = '?update=true'
+    } else {
+      window.justReloaded = true
+      sessionStorage.justReloaded = true
+      window.location.reload()
+    }
+  } catch (err) {
+    console.error('Failed to refresh app:', err)
+    if (!isMainMenu()) {
+      alert('Critical error on refreshApp: ' + err)
+      // Fallback to force reload if something goes wrong
+      window.location.reload()
+    }
   }
 }
 
diff --git a/src/testCrasher.ts b/src/testCrasher.ts
new file mode 100644
index 00000000..0383c2a6
--- /dev/null
+++ b/src/testCrasher.ts
@@ -0,0 +1,5 @@
+import { appQueryParams } from './appParams'
+
+if (appQueryParams.testCrashApp === '1') {
+  throw new Error('test error')
+}

From 946fc26d86612a198d17f011dcff7f5d7572539c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Feb 2025 16:26:17 +0300
Subject: [PATCH 218/753] correctly open release link, show build info

---
 .github/workflows/next-deploy.yml |  2 +-
 .github/workflows/preview.yml     |  2 +-
 rsbuild.config.ts                 |  3 +++
 src/react/MainMenu.tsx            | 10 +++++++++-
 src/react/MainMenuRenderApp.tsx   |  2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml
index 0856285c..665abb30 100644
--- a/.github/workflows/next-deploy.yml
+++ b/.github/workflows/next-deploy.yml
@@ -29,7 +29,7 @@ jobs:
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
       - name: Write Release Info
         run: |
-          echo "{\"latestTag\": \"$(git rev-parse --short $GITHUB_SHA)\"}" > assets/release.json
+          echo "{\"latestTag\": \"$(git rev-parse --short $GITHUB_SHA)\", \"isCommit\": true}" > assets/release.json
       - name: Build Project Artifacts
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
       - run: pnpm build-storybook
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 7ad16c2e..18c80e8c 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -58,7 +58,7 @@ jobs:
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
       - name: Write Release Info
         run: |
-          echo "{\"latestTag\": \"$(git rev-parse --short ${{ github.event.pull_request.head.sha }})\"}" > assets/release.json
+          echo "{\"latestTag\": \"$(git rev-parse --short ${{ github.event.pull_request.head.sha }})\", \"isCommit\": true}" > assets/release.json
       - name: Build Project Artifacts
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
       - run: pnpm build-storybook
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 04edd23d..a93e2c84 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -23,11 +23,13 @@ const dev = process.env.NODE_ENV === 'development'
 const disableServiceWorker = process.env.DISABLE_SERVICE_WORKER === 'true'
 
 let releaseTag
+let releaseLink
 let releaseChangelog
 
 if (fs.existsSync('./assets/release.json')) {
     const releaseJson = JSON.parse(fs.readFileSync('./assets/release.json', 'utf8'))
     releaseTag = releaseJson.latestTag
+    releaseLink = releaseJson.isCommit ? `/commit/${releaseJson.latestTag}` : `/releases/${releaseJson.latestTag}`
     releaseChangelog = releaseJson.changelog?.replace(/<!-- bump-type:[\w]+ -->/, '')
 }
 
@@ -59,6 +61,7 @@ const appConfig = defineConfig({
                 JSON.stringify(`https://github.com/${process.env.GITHUB_REPOSITORY || `${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}`}`),
             'process.env.DEPS_VERSIONS': JSON.stringify({}),
             'process.env.RELEASE_TAG': JSON.stringify(releaseTag),
+            'process.env.RELEASE_LINK': JSON.stringify(releaseLink),
             'process.env.RELEASE_CHANGELOG': JSON.stringify(releaseChangelog),
             'process.env.DISABLE_SERVICE_WORKER': JSON.stringify(disableServiceWorker),
         },
diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index ff0ab4bd..fc770ad1 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -58,6 +58,14 @@ export default ({
     { delay: 500 }
   )
 
+  const versionLongPress = useLongPress(
+    () => {
+      const buildDate = process.env.BUILD_VERSION ? new Date(process.env.BUILD_VERSION) : null
+      alert(`BUILD INFO:\n${buildDate?.toLocaleString() || 'Development build'}`)
+    },
+    () => onVersionTextClick?.(),
+  )
+
   const connectToServerLongPress = useLongPress(
     () => {
       if (process.env.NODE_ENV === 'development') {
@@ -147,7 +155,7 @@ export default ({
 
       <div className={styles['bottom-info']}>
         <div style={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
-          <span style={{ fontSize: 10, color: 'gray' }} onClick={onVersionTextClick}>{versionText}</span>
+          <span style={{ fontSize: 10, color: 'gray' }} {...versionLongPress}>{versionText}</span>
           <span
             title={`${versionTitle} (click to reload)`}
             onClick={onVersionStatusClick}
diff --git a/src/react/MainMenuRenderApp.tsx b/src/react/MainMenuRenderApp.tsx
index c72b89e0..b12d9ba8 100644
--- a/src/react/MainMenuRenderApp.tsx
+++ b/src/react/MainMenuRenderApp.tsx
@@ -159,7 +159,7 @@ export default () => {
           await refreshApp()
         }}
         onVersionTextClick={async () => {
-          openGithub('/releases')
+          openGithub(process.env.RELEASE_LINK)
         }}
         versionText={process.env.RELEASE_TAG}
       />

From cf8d8e51fc834f654ff7be757e6a03ec97a05b18 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Feb 2025 16:54:58 +0300
Subject: [PATCH 219/753] fix quickconnect port ignored regression

---
 src/parseServerAddress.ts         | 11 +++++++----
 src/react/ServersListProvider.tsx |  2 +-
 src/utils.test.ts                 |  7 ++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/parseServerAddress.ts b/src/parseServerAddress.ts
index 4068c3af..17331252 100644
--- a/src/parseServerAddress.ts
+++ b/src/parseServerAddress.ts
@@ -2,12 +2,12 @@
 
 export const parseServerAddress = (address: string | undefined, removeHttp = true): ParsedServerAddress => {
   if (!address) {
-    return { host: '', isWebSocket: false }
+    return { host: '', isWebSocket: false, serverIpFull: '' }
   }
 
   const isWebSocket = address.startsWith('ws://') || address.startsWith('wss://')
   if (isWebSocket) {
-    return { host: address, isWebSocket: true }
+    return { host: address, isWebSocket: true, serverIpFull: address }
   }
 
   if (removeHttp) {
@@ -33,11 +33,13 @@ export const parseServerAddress = (address: string | undefined, removeHttp = tru
     }
   }
 
+  const host = parts.join(':')
   return {
-    host: parts.join(':'),
+    host,
     ...(port ? { port } : {}),
     ...(version ? { version } : {}),
-    isWebSocket: false
+    isWebSocket: false,
+    serverIpFull: port ? `${host}:${port}` : host
   }
 }
 
@@ -46,4 +48,5 @@ export interface ParsedServerAddress {
   port?: string
   version?: string
   isWebSocket: boolean
+  serverIpFull: string
 }
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 704c77e6..e0147a33 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -245,7 +245,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         }
         const parsed = parseServerAddress(parts.join(':'))
         overrides = {
-          ip: parsed.host,
+          ip: parsed.serverIpFull,
           versionOverride: parsed.version,
           authenticatedAccountOverride: msAuth ? true : undefined, // todo popup selector
         }
diff --git a/src/utils.test.ts b/src/utils.test.ts
index 14505ae2..00569bf4 100644
--- a/src/utils.test.ts
+++ b/src/utils.test.ts
@@ -1,5 +1,10 @@
 import { describe, expect, it } from 'vitest'
-import { parseServerAddress } from './parseServerAddress'
+import { parseServerAddress as parseServerAddressOriginal } from './parseServerAddress'
+
+const parseServerAddress = (address: string | undefined, removeHttp = true) => {
+  const { serverIpFull, ...result } = parseServerAddressOriginal(address, removeHttp)
+  return result
+}
 
 describe('parseServerAddress', () => {
   it('should handle undefined input', () => {

From 8595d545a53cb71108d143e054b6f79698dd2b7a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Feb 2025 17:11:36 +0300
Subject: [PATCH 220/753] Restore support for old browsers! Restore and revisit
 browserslist

---
 package.json | 9 +++++++++
 src/index.ts | 3 ---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 3084d5dd..171da2f3 100644
--- a/package.json
+++ b/package.json
@@ -168,6 +168,15 @@
     "cypress-plugin-snapshots": "^1.4.4",
     "systeminformation": "^5.21.22"
   },
+  "browserslist": [
+    "iOS >= 14",
+    "Android >= 13",
+    "Chrome >= 103",
+    "not dead",
+    "not ie <= 11",
+    "not op_mini all",
+    "> 0.5%"
+  ],
   "pnpm": {
     "overrides": {
       "buffer": "^6.0.3",
diff --git a/src/index.ts b/src/index.ts
index c075e6c4..778cb026 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -18,9 +18,6 @@ import protocolMicrosoftAuth from 'minecraft-protocol/src/client/microsoftAuth'
 import microsoftAuthflow from './microsoftAuthflow'
 import { Duplex } from 'stream'
 
-import 'core-js/features/array/at'
-import 'core-js/features/promise/with-resolvers'
-
 import './scaleInterface'
 import { initWithRenderer } from './topRightStats'
 import PrismarineBlock from 'prismarine-block'

From 90e002a3a180a82cd94f91f72a131bec173394e9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Feb 2025 17:12:39 +0300
Subject: [PATCH 221/753] fix lint

---
 src/devtools.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/devtools.ts b/src/devtools.ts
index 6da89f20..6f54eaf1 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -71,13 +71,7 @@ window.inspectPacket = (packetName, isFromClient = false, fullOrListener: boolea
     }
   }
   const packetListener = (data, { name }) => {
-    if (pattern) {
-      if (pattern.test(name)) {
-        listener(name, data)
-      }
-    } else if (name === packetName) {
-      listener(name, data)
-    }
+    packetNameListener(name, data)
   }
 
   const attach = () => {

From 193616b14705825c4c3ef0405844ee0595bbff1f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Feb 2025 17:19:42 +0300
Subject: [PATCH 222/753] fix npm lib building

---
 src/react/MessageFormattedString.tsx | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/react/MessageFormattedString.tsx b/src/react/MessageFormattedString.tsx
index 97cef89c..09797076 100644
--- a/src/react/MessageFormattedString.tsx
+++ b/src/react/MessageFormattedString.tsx
@@ -1,6 +1,5 @@
 import { useMemo } from 'react'
 import { fromFormattedString } from '@xmcl/text-component'
-import nbt from 'prismarine-nbt'
 import { ErrorBoundary } from '@zardoy/react-util'
 import { formatMessage } from '../chatUtils'
 import MessageFormatted from './MessageFormatted'
@@ -13,16 +12,16 @@ export default ({ message, fallbackColor, className }: {
 }) => {
   const messageJson = useMemo(() => {
     if (!message) return null
-    const transformIfNbt = (x) => {
-      if (typeof x === 'object' && x?.type) return nbt.simplify(x) as Record<string, any>
-      // if (Array.isArray(x)) return x.map(transformIfNbt)
-      // if (typeof x === 'object') return Object.fromEntries(Object.entries(x).map(([k, v]) => [k, transformIfNbt(v)]))
-      return x
-    }
-    if (typeof message === 'object' && message.text?.text?.type) {
-      message.text.text = transformIfNbt(message.text.text)
-      message.text.extra = transformIfNbt(message.text.extra)
-    }
+    // const transformIfNbt = (x) => {
+    //   if (typeof x === 'object' && x?.type) return nbt.simplify(x) as Record<string, any>
+    //   // if (Array.isArray(x)) return x.map(transformIfNbt)
+    //   // if (typeof x === 'object') return Object.fromEntries(Object.entries(x).map(([k, v]) => [k, transformIfNbt(v)]))
+    //   return x
+    // }
+    // if (typeof message === 'object' && message.text?.text?.type) {
+    //   message.text.text = transformIfNbt(message.text.text)
+    //   message.text.extra = transformIfNbt(message.text.extra)
+    // }
     try {
       const texts = formatMessage(typeof message === 'string' ? fromFormattedString(message) : message)
       return texts.map(text => {

From e2ee1ff13331af19390894128c744d4b33673db3 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 12 Feb 2025 16:06:43 +0300
Subject: [PATCH 223/753] Fix setting of lastError to avoid false spam into
 console

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 8e85c039..f168b6e4 100644
--- a/index.html
+++ b/index.html
@@ -54,8 +54,8 @@
                   })
                 })
               }
+              window.lastError = errorOrMessage instanceof Error ? errorOrMessage : new Error(errorOrMessage)
             }
-            window.lastError = errorOrMessage instanceof Error ? errorOrMessage : new Error(errorOrMessage)
           }
           window.addEventListener('unhandledrejection', (e) => onError(e.reason, true))
           window.addEventListener('error', (e) => onError(e.error ?? e.message))

From cab9eed5e77cd1c4c3ac337b3ca47988f05a0997 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 12 Feb 2025 19:26:23 +0100
Subject: [PATCH 224/753] fix: resource pack armor textures and leather armor
 color bleed (#274)

---
 renderer/viewer/lib/entities.ts            | 12 ++--
 renderer/viewer/lib/entity/armorModels.ts  | 67 +++++++++++-----------
 renderer/viewer/lib/entity/objModels.js    |  1 -
 renderer/viewer/lib/worldrendererCommon.ts |  1 +
 src/resourcePack.ts                        | 29 +++++++++-
 5 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/renderer/viewer/lib/entities.ts b/renderer/viewer/lib/entities.ts
index 0dcd8ec1..72969840 100644
--- a/renderer/viewer/lib/entities.ts
+++ b/renderer/viewer/lib/entities.ts
@@ -20,7 +20,7 @@ import * as Entity from './entity/EntityMesh'
 import { getMesh } from './entity/EntityMesh'
 import { WalkingGeneralSwing } from './entity/animations'
 import { disposeObject } from './threeJsUtils'
-import { armorModels } from './entity/objModels'
+import { armorModel, armorTextures } from './entity/armorModels'
 import { Viewer } from './viewer'
 import { getBlockMeshFromModel } from './holdingBlock'
 const { loadTexture } = globalThis.isElectron ? require('./utils.electron.js') : require('./utils')
@@ -950,11 +950,11 @@ function addArmorModel (entityMesh: THREE.Object3D, slotType: string, item: Item
   }
   const armorMaterial = itemParts[0]
   if (!texturePath) {
-    // TODO: Support resource pack
     // TODO: Support mirroring on certain parts of the model
-    texturePath = armorModels[`${armorMaterial}Layer${layer}${overlay ? 'Overlay' : ''}`]
+    const armorTextureName = `${armorMaterial}_layer_${layer}${overlay ? '_overlay' : ''}`
+    texturePath = viewer.world.customTextures.armor?.textures[armorTextureName]?.src ?? armorTextures[armorTextureName]
   }
-  if (!texturePath || !armorModels.armorModel[slotType]) {
+  if (!texturePath || !armorModel[slotType]) {
     removeArmorModel(entityMesh, slotType)
     return
   }
@@ -973,7 +973,7 @@ function addArmorModel (entityMesh: THREE.Object3D, slotType: string, item: Item
       material.map = texture
     })
   } else {
-    mesh = getMesh(viewer.world, texturePath, armorModels.armorModel[slotType])
+    mesh = getMesh(viewer.world, texturePath, armorModel[slotType])
     mesh.name = meshName
     material = mesh.material
     if (!isPlayerHead) {
@@ -991,6 +991,8 @@ function addArmorModel (entityMesh: THREE.Object3D, slotType: string, item: Item
       material.color.setHex(0xB5_6D_51) // default brown color
     }
     addArmorModel(entityMesh, slotType, item, layer, true)
+  } else {
+    material.color.setHex(0xFF_FF_FF)
   }
   const group = new THREE.Object3D()
   group.name = `armor_${slotType}${overlay ? '_overlay' : ''}`
diff --git a/renderer/viewer/lib/entity/armorModels.ts b/renderer/viewer/lib/entity/armorModels.ts
index e1d3f87b..3a87f8db 100644
--- a/renderer/viewer/lib/entity/armorModels.ts
+++ b/renderer/viewer/lib/entity/armorModels.ts
@@ -1,36 +1,35 @@
-/*
- * prismarine-web-client - prismarine-web-client
- * Copyright (C) 2024 Max Lee aka Phoenix616 (mail@moep.tv)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-// TODO: replace with load from resource pack
-export { default as chainmailLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/chainmail_layer_1.png'
-export { default as chainmailLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/chainmail_layer_2.png'
-export { default as diamondLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/diamond_layer_1.png'
-export { default as diamondLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/diamond_layer_2.png'
-export { default as goldenLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/gold_layer_1.png'
-export { default as goldenLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/gold_layer_2.png'
-export { default as ironLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/iron_layer_1.png'
-export { default as ironLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/iron_layer_2.png'
-export { default as leatherLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/leather_layer_1.png'
-export { default as leatherLayer1Overlay } from 'mc-assets/dist/other-textures/latest/models/armor/leather_layer_1_overlay.png'
-export { default as leatherLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/leather_layer_2.png'
-export { default as leatherLayer2Overlay } from 'mc-assets/dist/other-textures/latest/models/armor/leather_layer_2_overlay.png'
-export { default as netheriteLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/netherite_layer_1.png'
-export { default as netheriteLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/netherite_layer_2.png'
-export { default as turtleLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/turtle_layer_1.png'
+import { default as chainmailLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/chainmail_layer_1.png'
+import { default as chainmailLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/chainmail_layer_2.png'
+import { default as diamondLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/diamond_layer_1.png'
+import { default as diamondLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/diamond_layer_2.png'
+import { default as goldenLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/gold_layer_1.png'
+import { default as goldenLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/gold_layer_2.png'
+import { default as ironLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/iron_layer_1.png'
+import { default as ironLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/iron_layer_2.png'
+import { default as leatherLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/leather_layer_1.png'
+import { default as leatherLayer1Overlay } from 'mc-assets/dist/other-textures/latest/models/armor/leather_layer_1_overlay.png'
+import { default as leatherLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/leather_layer_2.png'
+import { default as leatherLayer2Overlay } from 'mc-assets/dist/other-textures/latest/models/armor/leather_layer_2_overlay.png'
+import { default as netheriteLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/netherite_layer_1.png'
+import { default as netheriteLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/netherite_layer_2.png'
+import { default as turtleLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/turtle_layer_1.png'
 
 export { default as armorModel } from './armorModels.json'
+
+export const armorTextures = {
+  'leather_layer_1': leatherLayer1,
+  'leather_layer_1_overlay': leatherLayer1Overlay,
+  'leather_layer_2': leatherLayer2,
+  'leather_layer_2_overlay': leatherLayer2Overlay,
+  'chainmail_layer_1': chainmailLayer1,
+  'chainmail_layer_2': chainmailLayer2,
+  'iron_layer_1': ironLayer1,
+  'iron_layer_2': ironLayer2,
+  'diamond_layer_1': diamondLayer1,
+  'diamond_layer_2': diamondLayer2,
+  'golden_layer_1': goldenLayer1,
+  'golden_layer_2': goldenLayer2,
+  'netherite_layer_1': netheriteLayer1,
+  'netherite_layer_2': netheriteLayer2,
+  'turtle_layer_1': turtleLayer1
+}
diff --git a/renderer/viewer/lib/entity/objModels.js b/renderer/viewer/lib/entity/objModels.js
index 5af29606..edff440b 100644
--- a/renderer/viewer/lib/entity/objModels.js
+++ b/renderer/viewer/lib/entity/objModels.js
@@ -1,2 +1 @@
 export * as externalModels from './exportedModels'
-export * as armorModels from './armorModels'
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 327298af..bdc2e128 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -124,6 +124,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   customTextures: {
     items?: CustomTexturesData
     blocks?: CustomTexturesData
+    armor?: CustomTexturesData
   } = {}
   workersProcessAverageTime = 0
   workersProcessAverageTimeCount = 0
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 60e92b40..3ad1b2e9 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -4,6 +4,7 @@ import fs from 'fs'
 import JSZip from 'jszip'
 import { proxy, subscribe } from 'valtio'
 import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
+import { armorTextures } from 'renderer/viewer/lib/entity/armorModels'
 import { collectFilesToCopy, copyFilesAsyncWithProgress, mkdirRecursive, removeFileRecursiveAsync } from './browserfs'
 import { setLoadingScreenStatus } from './appStatus'
 import { showNotification } from './react/NotificationProvider'
@@ -203,7 +204,7 @@ const getFilesMapFromDir = async (dir: string) => {
   return files
 }
 
-export const getResourcepackTiles = async (type: 'blocks' | 'items', existingTextures: string[]) => {
+export const getResourcepackTiles = async (type: 'blocks' | 'items' | 'armor', existingTextures: string[]) => {
   const basePath = await getActiveResourcepackBasePath()
   if (!basePath) return
   let firstTextureSize: number | undefined
@@ -212,11 +213,25 @@ export const getResourcepackTiles = async (type: 'blocks' | 'items', existingTex
     setLoadingScreenStatus(`Generating atlas texture for ${type}`)
   }
   const textures = {} as Record<string, HTMLImageElement>
+  let path
+  switch (type) {
+    case 'blocks':
+      path = 'block'
+      break
+    case 'items':
+      path = 'item'
+      break
+    case 'armor':
+      path = 'models/armor'
+      break
+    default:
+      throw new Error('Invalid type')
+  }
   for (const namespace of namespaces) {
     const texturesCommonBasePath = `${basePath}/assets/${namespace}/textures`
     const isMinecraftNamespace = namespace === 'minecraft'
-    let texturesBasePath = `${texturesCommonBasePath}/${type === 'blocks' ? 'block' : 'item'}`
-    const texturesBasePathAlt = `${texturesCommonBasePath}/${type === 'blocks' ? 'blocks' : 'items'}`
+    let texturesBasePath = `${texturesCommonBasePath}/${path}`
+    const texturesBasePathAlt = `${texturesCommonBasePath}/${path}s`
     if (!(await existsAsync(texturesBasePath))) {
       if (await existsAsync(texturesBasePathAlt)) {
         texturesBasePath = texturesBasePathAlt
@@ -465,9 +480,11 @@ const repeatArr = (arr, i) => Array.from({ length: i }, () => arr)
 const updateTextures = async () => {
   const origBlocksFiles = Object.keys(viewer.world.sourceData.blocksAtlases.latest.textures)
   const origItemsFiles = Object.keys(viewer.world.sourceData.itemsAtlases.latest.textures)
+  const origArmorFiles = Object.keys(armorTextures)
   const { usedTextures: extraBlockTextures = new Set<string>() } = await prepareBlockstatesAndModels() ?? {}
   const blocksData = await getResourcepackTiles('blocks', [...origBlocksFiles, ...extraBlockTextures])
   const itemsData = await getResourcepackTiles('items', origItemsFiles)
+  const armorData = await getResourcepackTiles('armor', origArmorFiles)
   await updateAllReplacableTextures()
   viewer.world.customTextures = {}
   if (blocksData) {
@@ -482,6 +499,12 @@ const updateTextures = async () => {
       textures: itemsData.textures
     }
   }
+  if (armorData) {
+    viewer.world.customTextures.armor = {
+      tileSize: armorData.firstTextureSize,
+      textures: armorData.textures
+    }
+  }
   if (viewer.world.active) {
     await viewer.world.updateTexturesData()
     if (viewer.world instanceof WorldRendererThree) {

From 25c07b14a91ee98e621a3c0069566cebf24495eb Mon Sep 17 00:00:00 2001
From: gguio <109200692+gguio@users.noreply.github.com>
Date: Thu, 13 Feb 2025 06:07:19 +0400
Subject: [PATCH 225/753] feat: some minimap fixes (#249)

---
 renderer/playground/scenes/main.ts         |   2 +-
 renderer/viewer/lib/worldrendererCommon.ts |  15 +-
 src/controls.ts                            |  17 +-
 src/globalState.ts                         |   1 +
 src/react/Fullmap.tsx                      |  98 +++------
 src/react/Minimap.stories.tsx              |  74 -------
 src/react/Minimap.tsx                      | 103 ++-------
 src/react/MinimapDrawer.ts                 |  46 ++--
 src/react/MinimapProvider.tsx              | 245 +++++++++------------
 src/reactUi.tsx                            |  13 +-
 10 files changed, 210 insertions(+), 404 deletions(-)
 delete mode 100644 src/react/Minimap.stories.tsx

diff --git a/renderer/playground/scenes/main.ts b/renderer/playground/scenes/main.ts
index 33fe2528..73a36762 100644
--- a/renderer/playground/scenes/main.ts
+++ b/renderer/playground/scenes/main.ts
@@ -295,7 +295,7 @@ class MainScene extends BasePlaygroundScene {
       }
     }
 
-    worldView!.setBlockStateId(this.targetPos, block.stateId)
+    worldView!.setBlockStateId(this.targetPos, block.stateId ?? 0)
     console.log('up stateId', block.stateId)
     this.params.metadata = block.metadata
     this.metadataGui.updateDisplay()
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index bdc2e128..b276241a 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -180,12 +180,18 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
           this.geometryReceiveCount[data.workerIndex] ??= 0
           this.geometryReceiveCount[data.workerIndex]++
           const geometry = data.geometry as MesherGeometryOutput
-          for (const key in geometry.highestBlocks) {
-            const highest = geometry.highestBlocks[key]
-            if (!this.highestBlocks[key] || this.highestBlocks[key].y < highest.y) {
-              this.highestBlocks[key] = highest
+          for (const [key, highest] of geometry.highestBlocks.entries()) {
+            const currHighest = this.highestBlocks.get(key)
+            if (!currHighest || currHighest.y < highest.y) {
+              this.highestBlocks.set(key, highest)
             }
           }
+          // for (const key in geometry.highestBlocks) {
+          //   const highest = geometry.highestBlocks[key]
+          //   if (!this.highestBlocks[key] || this.highestBlocks[key].y < highest.y) {
+          //     this.highestBlocks[key] = highest
+          //   }
+          // }
           const chunkCoords = data.key.split(',').map(Number)
           this.lastChunkDistance = Math.max(...this.getDistance(new Vec3(chunkCoords[0], 0, chunkCoords[2])))
         }
@@ -205,6 +211,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
               return x === chunkCoords[0] && z === chunkCoords[2]
             })) {
               this.finishedChunks[`${chunkCoords[0]},${chunkCoords[2]}`] = true
+              this.renderUpdateEmitter.emit(`chunkFinished`, `${chunkCoords[0] / 16},${chunkCoords[2] / 16}`)
             }
           }
           this.checkAllFinished()
diff --git a/src/controls.ts b/src/controls.ts
index deee9c68..b0add043 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -524,13 +524,18 @@ contro.on('trigger', ({ command }) => {
   if (command === 'ui.toggleFullscreen') {
     void goFullscreen(true)
   }
+})
 
-  if (command === 'ui.toggleMap') {
-    if (activeModalStack.at(-1)?.reactType === 'full-map') {
-      hideModal({ reactType: 'full-map' })
-    } else {
-      showModal({ reactType: 'full-map' })
-    }
+// show-hide Fullmap
+contro.on('trigger', ({ command }) => {
+  if (command !== 'ui.toggleMap') return
+  const isActive = isGameActive(true)
+  if (activeModalStack.at(-1)?.reactType === 'full-map') {
+    miscUiState.displayFullmap = false
+    hideModal({ reactType: 'full-map' })
+  } else if (isActive && !activeModalStack.length) {
+    miscUiState.displayFullmap = true
+    showModal({ reactType: 'full-map' })
   }
 })
 
diff --git a/src/globalState.ts b/src/globalState.ts
index 0fb1dc69..992503ef 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -137,6 +137,7 @@ export const miscUiState = proxy({
   usingGamepadInput: false,
   appConfig: null as AppConfig | null,
   displaySearchInput: false,
+  displayFullmap: false
 })
 
 export const isGameActive = (foregroundCheck: boolean) => {
diff --git a/src/react/Fullmap.tsx b/src/react/Fullmap.tsx
index 69a2c514..39c5e954 100644
--- a/src/react/Fullmap.tsx
+++ b/src/react/Fullmap.tsx
@@ -2,23 +2,21 @@ import { Vec3 } from 'vec3'
 import { useRef, useEffect, useState, CSSProperties, Dispatch, SetStateAction } from 'react'
 import { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
 import { TransformWrapper, TransformComponent, ReactZoomPanPinchRef } from 'react-zoom-pan-pinch'
-import { MinimapDrawer, DrawerAdapter, ChunkInfo } from './MinimapDrawer'
+import { DrawerAdapter } from './MinimapDrawer'
 import Button from './Button'
 import Input from './Input'
 import './Fullmap.css'
 
 
 type FullmapProps = {
-  toggleFullMap: () => void,
   adapter: DrawerAdapter,
-  drawer: MinimapDrawer | null,
-  canvasRef: any
+  toggleFullMap?: () => void,
 }
 
-export default ({ toggleFullMap, adapter }: FullmapProps) => {
+export default ({ adapter, toggleFullMap }: FullmapProps) => {
   const [grid, setGrid] = useState(() => new Set<string>())
   const zoomRef = useRef<ReactZoomPanPinchRef>(null)
-  const redrawCell = useRef(false)
+  const [redraw, setRedraw] = useState<Set<string> | null>(null)
   const [lastWarpPos, setLastWarpPos] = useState({ x: 0, y: 0, z: 0 })
   const stateRef = useRef({ scale: 1, positionX: 0, positionY: 0 })
   const cells = useRef({ columns: 0, rows: 0 })
@@ -73,7 +71,7 @@ export default ({ toggleFullMap, adapter }: FullmapProps) => {
         zIndex: '-1'
       }}
       onClick={toggleFullMap}
-    />
+    > </div>
       : <Button
         icon="close-box"
         onClick={toggleFullMap}
@@ -129,7 +127,7 @@ export default ({ toggleFullMap, adapter }: FullmapProps) => {
             worldZ={playerChunkTop + y / 4 - offsetY}
             setIsWarpInfoOpened={setIsWarpInfoOpened}
             setLastWarpPos={setLastWarpPos}
-            redraw={redrawCell.current}
+            redraw={redraw}
             setInitWarp={setInitWarp}
             setWarpPreview={setWarpPreview}
           />
@@ -156,9 +154,7 @@ export default ({ toggleFullMap, adapter }: FullmapProps) => {
         adapter={adapter}
         warpPos={lastWarpPos}
         setIsWarpInfoOpened={setIsWarpInfoOpened}
-        afterWarpIsSet={() => {
-          redrawCell.current = !redrawCell.current
-        }}
+        setRedraw={setRedraw}
         initWarp={initWarp}
         setInitWarp={setInitWarp}
         toggleFullMap={toggleFullMap}
@@ -179,16 +175,14 @@ const MapChunk = (
     worldZ: number,
     setIsWarpInfoOpened: (x: boolean) => void,
     setLastWarpPos: (obj: { x: number, y: number, z: number }) => void,
-    redraw?: boolean
+    redraw?: Set<string> | null
     setInitWarp?: (warp: WorldWarp | undefined) => void
     setWarpPreview?: (warpInfo) => void
   }
 ) => {
   const containerRef = useRef(null)
-  const drawerRef = useRef<MinimapDrawer | null>(null)
   const touchTimer = useRef<ReturnType<typeof setTimeout> | null>(null)
   const canvasRef = useRef<HTMLCanvasElement>(null)
-  const [isCanvas, setIsCanvas] = useState(false)
 
   const longPress = (e) => {
     touchTimer.current = setTimeout(() => {
@@ -202,8 +196,8 @@ const MapChunk = (
   }
 
   const handleClick = (e: MouseEvent | TouchEvent) => {
-    // console.log('click:', e)
-    if (!drawerRef.current) return
+    if (!adapter.mapDrawer) return
+    console.log('click:', e)
     let clientX: number
     let clientY: number
     if ('buttons' in e && e.button === 2) {
@@ -217,9 +211,9 @@ const MapChunk = (
     const mapX = Math.floor(x + worldX)
     const mapZ = Math.floor(z + worldZ)
     const y = adapter.getHighestBlockY(mapX, mapZ)
-    drawerRef.current.setWarpPosOnClick(new Vec3(mapX, y, mapZ))
-    setLastWarpPos(drawerRef.current.lastWarpPos)
-    const { lastWarpPos } = drawerRef.current
+    adapter.mapDrawer.setWarpPosOnClick(new Vec3(mapX, y, mapZ))
+    setLastWarpPos(adapter.mapDrawer.lastWarpPos)
+    const { lastWarpPos } = adapter.mapDrawer
     const initWarp = adapter.warps.find(warp => Math.hypot(lastWarpPos.x - warp.x, lastWarpPos.z - warp.z) < 2)
     setInitWarp?.(initWarp)
     setIsWarpInfoOpened(true)
@@ -227,7 +221,7 @@ const MapChunk = (
 
   const getXZ = (clientX: number, clientY: number) => {
     const rect = canvasRef.current!.getBoundingClientRect()
-    const factor = scale * (drawerRef.current?.mapPixel ?? 1)
+    const factor = scale * (adapter.mapDrawer.mapPixel ?? 1)
     const x = (clientX - rect.left) / factor
     const y = (clientY - rect.top) / factor
     return [x, y]
@@ -241,34 +235,18 @@ const MapChunk = (
     )
   }
 
-  const handleRedraw = (key?: string, chunk?: ChunkInfo) => {
+  const handleRedraw = (key?: string) => {
     if (key !== `${worldX / 16},${worldZ / 16}`) return
     adapter.mapDrawer.canvas = canvasRef.current!
     adapter.mapDrawer.full = true
-    // console.log('handle redraw:', key)
-    // if (chunk) {
-    //   drawerRef.current?.chunksStore.set(key, chunk)
-    // }
-    if (!adapter.chunksStore.has(key)) {
-      adapter.chunksStore.set(key, 'requested')
-      void adapter.loadChunk(key)
-      return
-    }
+    console.log('[mapChunk] update', key, `${worldX / 16},${worldZ / 16}`)
     const timeout = setTimeout(() => {
-      const center = new Vec3(worldX + 8, 0, worldZ + 8)
-      drawerRef.current!.lastBotPos = center
-      drawerRef.current?.drawChunk(key)
-      // drawerRef.current?.drawWarps(center)
-      // drawerRef.current?.drawPlayerPos(center.x, center.z)
+      if (canvasRef.current) void adapter.drawChunkOnCanvas(`${worldX / 16},${worldZ / 16}`, canvasRef.current)
       clearTimeout(timeout)
     }, 100)
   }
 
   useEffect(() => {
-    // if (canvasRef.current && !drawerRef.current) {
-    //   drawerRef.current = adapter.mapDrawer
-    // } else if (canvasRef.current && drawerRef.current) {
-    // }
     if (canvasRef.current) void adapter.drawChunkOnCanvas(`${worldX / 16},${worldZ / 16}`, canvasRef.current)
   }, [canvasRef.current])
 
@@ -286,29 +264,15 @@ const MapChunk = (
       canvasRef.current?.removeEventListener('touchmove', cancel)
       canvasRef.current?.removeEventListener('mousemove', handleMouseMove)
     }
-  }, [canvasRef.current, scale])
+  }, [canvasRef.current])
 
   useEffect(() => {
-    // handleRedraw()
-  }, [drawerRef.current, redraw])
-
-  useEffect(() => {
-    const intersectionObserver = new IntersectionObserver((entries) => {
-      for (const entry of entries) {
-        if (entry.isIntersecting) {
-          setIsCanvas(true)
-        }
+    if (redraw) {
+      for (const key of redraw) {
+        handleRedraw(key)
       }
-    })
-    intersectionObserver.observe(containerRef.current!)
-
-    // adapter.on('chunkReady', handleRedraw)
-
-    return () => {
-      intersectionObserver.disconnect()
-      // adapter.off('chunkReady', handleRedraw)
     }
-  }, [])
+  }, [redraw])
 
   return <div
     ref={containerRef}
@@ -334,7 +298,7 @@ const MapChunk = (
 }
 
 const WarpInfo = (
-  { adapter, warpPos, setIsWarpInfoOpened, afterWarpIsSet, initWarp, toggleFullMap }:
+  { adapter, warpPos, setIsWarpInfoOpened, afterWarpIsSet, initWarp, toggleFullMap, setRedraw }:
   {
     adapter: DrawerAdapter,
     warpPos: { x: number, y: number, z: number },
@@ -342,7 +306,8 @@ const WarpInfo = (
     afterWarpIsSet?: () => void
     initWarp?: WorldWarp,
     setInitWarp?: React.Dispatch<React.SetStateAction<WorldWarp | undefined>>,
-    toggleFullMap?: ({ command }: { command: string }) => void
+    toggleFullMap?: () => void,
+    setRedraw?: React.Dispatch<React.SetStateAction<Set<string> | null>>
   }
 ) => {
   const [warp, setWarp] = useState<WorldWarp>(initWarp ?? {
@@ -365,14 +330,14 @@ const WarpInfo = (
   }
 
   const updateChunk = () => {
+    const redraw = new Set<string>()
     for (let i = -1; i < 2; i += 1) {
       for (let j = -1; j < 2; j += 1) {
-        adapter.emit(
-          'chunkReady',
-          `${Math.floor(warp.x / 16) + j},${Math.floor(warp.z / 16) + i}`
-        )
+        redraw.add(`${Math.floor(warp.x / 16) + j},${Math.floor(warp.z / 16) + i}`)
       }
     }
+    setRedraw?.(redraw)
+    console.log('[warpInfo] update', redraw)
   }
 
   const tpNow = () => {
@@ -380,7 +345,7 @@ const WarpInfo = (
   }
 
   const quickTp = () => {
-    toggleFullMap?.({ command: 'ui.toggleMap' })
+    toggleFullMap?.()
     adapter.quickTp?.(warp.x, warp.z)
   }
 
@@ -486,7 +451,8 @@ const WarpInfo = (
           }}
         >Cancel</Button>
         <Button
-          onClick={() => {
+          onClick={(e) => {
+            e.preventDefault()
             adapter.setWarp({ ...warp })
             console.log(adapter.warps)
             setIsWarpInfoOpened(false)
diff --git a/src/react/Minimap.stories.tsx b/src/react/Minimap.stories.tsx
deleted file mode 100644
index 5b28a5b9..00000000
--- a/src/react/Minimap.stories.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { Vec3 } from 'vec3'
-import type { Meta, StoryObj } from '@storybook/react'
-import { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
-import { TypedEventEmitter } from 'contro-max/build/typedEventEmitter'
-import { useEffect } from 'react'
-
-import Minimap from './Minimap'
-import { DrawerAdapter, MapUpdates } from './MinimapDrawer'
-
-const meta: Meta<typeof Minimap> = {
-  component: Minimap,
-  decorators: [
-    (Story, context) => {
-
-      useEffect(() => {
-        console.log('map updated')
-        adapter.emit('updateMap')
-
-      }, [context.args['fullMap']])
-
-      return <div> <Story /> </div>
-    }
-  ]
-}
-
-export default meta
-type Story = StoryObj<typeof Minimap>
-
-
-class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> {
-  playerPosition: Vec3
-  yaw: number
-  warps: WorldWarp[]
-  chunksStore: any = {}
-  full: boolean
-
-  constructor (pos?: Vec3, warps?: WorldWarp[]) {
-    super()
-    this.playerPosition = pos ?? new Vec3(0, 0, 0)
-    this.warps = warps ?? [] as WorldWarp[]
-  }
-
-  async getHighestBlockColor (x: number, z: number) {
-    console.log('got color')
-    return 'green'
-  }
-
-  getHighestBlockY (x: number, z: number) {
-    return 0
-  }
-
-  setWarp (warp: WorldWarp, remove?: boolean): void {
-    const index = this.warps.findIndex(w => w.name === warp.name)
-    if (index === -1) {
-      this.warps.push(warp)
-    } else {
-      this.warps[index] = warp
-    }
-    this.emit('updateWarps')
-  }
-
-  clearChunksStore (x: number, z: number) { }
-
-  async loadChunk (key: string) {}
-}
-
-const adapter = new DrawerAdapterImpl() as any
-
-export const Primary: Story = {
-  args: {
-    adapter,
-    fullMap: false
-  },
-}
diff --git a/src/react/Minimap.tsx b/src/react/Minimap.tsx
index 1dae0344..10c2b666 100644
--- a/src/react/Minimap.tsx
+++ b/src/react/Minimap.tsx
@@ -1,5 +1,6 @@
 import { useRef, useEffect, useState } from 'react'
-import { MinimapDrawer, DrawerAdapter, ChunkInfo } from './MinimapDrawer'
+import { miscUiState } from '../globalState'
+import { DrawerAdapter } from './MinimapDrawer'
 import Fullmap from './Fullmap'
 
 
@@ -13,36 +14,31 @@ export default (
     showFullmap: string,
     singleplayer: boolean,
     fullMap?: boolean,
-    toggleFullMap?: ({ command }: { command: string }) => void
+    toggleFullMap?: () => void
     displayMode?: DisplayMode
   }
 ) => {
   const full = useRef(false)
   const canvasTick = useRef(0)
   const canvasRef = useRef<HTMLCanvasElement>(null)
-  const warpsAndPartsCanvasRef = useRef<HTMLCanvasElement>(null)
-  const playerPosCanvasRef = useRef<HTMLCanvasElement>(null)
-  const warpsDrawerRef = useRef<MinimapDrawer | null>(null)
-  const drawerRef = useRef<MinimapDrawer | null>(null)
-  const playerPosDrawerRef = useRef<MinimapDrawer | null>(null)
   const [position, setPosition] = useState({ x: 0, y: 0, z: 0 })
 
   const updateMap = () => {
     setPosition({ x: adapter.playerPosition.x, y: adapter.playerPosition.y, z: adapter.playerPosition.z })
-    if (drawerRef.current) {
+    if (adapter.mapDrawer) {
       if (!full.current) {
         rotateMap()
-        drawerRef.current.draw(adapter.playerPosition)
-        drawerRef.current.drawPlayerPos()
-        drawerRef.current.drawWarps()
+        adapter.mapDrawer.draw(adapter.playerPosition)
+        adapter.mapDrawer.drawPlayerPos()
+        adapter.mapDrawer.drawWarps()
       }
       if (canvasTick.current % 300 === 0 && !fullMap) {
         if ('requestIdleCallback' in window) {
           requestIdleCallback(() => {
-            drawerRef.current?.clearChunksStore()
+            adapter.mapDrawer?.clearChunksStore()
           })
         } else {
-          drawerRef.current.clearChunksStore()
+          adapter.mapDrawer.clearChunksStore()
         }
         canvasTick.current = 0
       }
@@ -53,42 +49,17 @@ export default (
   const updateWarps = () => { }
 
   const rotateMap = () => {
-    if (!drawerRef.current) return
-    drawerRef.current.canvas.style.transform = `rotate(${adapter.yaw}rad)`
-    if (!warpsDrawerRef.current) return
-    warpsDrawerRef.current.canvas.style.transform = `rotate(${adapter.yaw}rad)`
-  }
-
-  const updateChunkOnMap = (key: string, chunk: ChunkInfo) => {
-    adapter.chunksStore.set(key, chunk)
+    if (!adapter.mapDrawer) return
+    adapter.mapDrawer.canvas.style.transform = `rotate(${adapter.yaw}rad)`
+    adapter.mapDrawer.yaw = adapter.yaw
   }
 
   useEffect(() => {
-    if (canvasRef.current && !drawerRef.current) {
-      drawerRef.current = adapter.mapDrawer
-      drawerRef.current.canvas = canvasRef.current
-      // drawerRef.current.adapter.on('chunkReady', updateChunkOnMap)
-    } else if (canvasRef.current && drawerRef.current) {
-      drawerRef.current.canvas = canvasRef.current
+    if (canvasRef.current && adapter.mapDrawer && !miscUiState.displayFullmap) {
+      adapter.mapDrawer.canvas = canvasRef.current
+      adapter.mapDrawer.full = false
     }
-
-  }, [canvasRef.current])
-
-  // useEffect(() => {
-  //   if (warpsAndPartsCanvasRef.current && !warpsDrawerRef.current) {
-  //     warpsDrawerRef.current = new MinimapDrawer(warpsAndPartsCanvasRef.current, adapter)
-  //   } else if (warpsAndPartsCanvasRef.current && warpsDrawerRef.current) {
-  //     warpsDrawerRef.current.canvas = warpsAndPartsCanvasRef.current
-  //   }
-  // }, [warpsAndPartsCanvasRef.current])
-
-  // useEffect(() => {
-  //   if (playerPosCanvasRef.current && !playerPosDrawerRef.current) {
-  //     playerPosDrawerRef.current = new MinimapDrawer(playerPosCanvasRef.current, adapter)
-  //   } else if (playerPosCanvasRef.current && playerPosDrawerRef.current) {
-  //     playerPosDrawerRef.current.canvas = playerPosCanvasRef.current
-  //   }
-  // }, [playerPosCanvasRef.current])
+  }, [canvasRef.current, miscUiState.displayFullmap])
 
   useEffect(() => {
     adapter.on('updateMap', updateMap)
@@ -100,24 +71,12 @@ export default (
     }
   }, [adapter])
 
-  useEffect(() => {
-    return () => {
-      // if (drawerRef.current) drawerRef.current.adapter.off('chunkReady', updateChunkOnMap)
-    }
-  }, [])
-
-  const displayFullmap = fullMap && displayMode !== 'minimapOnly' && (showFullmap === 'singleplayer' && singleplayer || showFullmap === 'always')
-  const displayMini = displayMode !== 'fullmapOnly' && (showMinimap === 'singleplayer' && singleplayer || showMinimap === 'always')
-  return displayFullmap
+  return fullMap && displayMode !== 'minimapOnly' && (showFullmap === 'singleplayer' && singleplayer || showFullmap === 'always')
     ? <Fullmap
-      toggleFullMap={() => {
-        toggleFullMap?.({ command: 'ui.toggleMap' })
-      }}
+      toggleFullMap={toggleFullMap}
       adapter={adapter}
-      drawer={drawerRef.current}
-      canvasRef={canvasRef}
     />
-    : displayMini
+    : displayMode !== 'fullmapOnly' && (showMinimap === 'singleplayer' && singleplayer || showMinimap === 'always')
       ? <div
         className='minimap'
         style={{
@@ -128,7 +87,7 @@ export default (
           textAlign: 'center',
         }}
         onClick={() => {
-          toggleFullMap?.({ command: 'ui.toggleMap' })
+          toggleFullMap?.()
         }}
       >
         <canvas
@@ -141,28 +100,6 @@ export default (
           height={80}
           ref={canvasRef}
         />
-        <canvas
-          style={{
-            transition: '0.5s',
-            transitionTimingFunction: 'ease-out',
-            position: 'absolute',
-            left: '0px'
-          }}
-          width={80}
-          height={80}
-          ref={warpsAndPartsCanvasRef}
-        />
-        <canvas
-          style={{
-            transition: '0.5s',
-            transitionTimingFunction: 'ease-out',
-            position: 'absolute',
-            left: '0px'
-          }}
-          width={80}
-          height={80}
-          ref={playerPosCanvasRef}
-        />
         <div
           style={{
             fontSize: '0.5em',
diff --git a/src/react/MinimapDrawer.ts b/src/react/MinimapDrawer.ts
index 935bdd4b..113954da 100644
--- a/src/react/MinimapDrawer.ts
+++ b/src/react/MinimapDrawer.ts
@@ -43,12 +43,20 @@ export class MinimapDrawer {
   lastWarpPos: Vec3
   mapPixel: number
   yaw: number
-  chunksStore = new Map<string, undefined | null | 'requested' | ChunkInfo >()
-  loadingChunksQueue: undefined | Set<string>
-  warps: WorldWarp[]
-  loadChunk: undefined | ((key: string) => Promise<void>)
   _full = false
 
+  constructor (
+    public loadChunk: undefined | ((key: string) => Promise<void>),
+    public warps: WorldWarp[],
+    public loadingChunksQueue: undefined | Set<string>,
+    public chunksStore: Map<string, undefined | null | 'requested' | ChunkInfo >
+  ) {
+    this.loadChunk = loadChunk
+    this.warps = warps
+    this.loadingChunksQueue = loadingChunksQueue
+    this.chunksStore = chunksStore
+  }
+
   setMapPixel () {
     if (this.full) {
       this.radius = Math.floor(Math.min(this.canvas.width, this.canvas.height) / 2)
@@ -101,6 +109,7 @@ export class MinimapDrawer {
       if (!this.chunksStore.has(key) && !this.loadingChunksQueue?.has(key)) {
         void this.loadChunk?.(key)
       }
+      // case when chunk is not present is handled in drawChunk
       this.drawChunk(key)
     }
     if (!this.full) this.drawPartsOfWorld()
@@ -131,6 +140,7 @@ export class MinimapDrawer {
     const chunkCanvasX = Math.floor((chunkWorldX - this.lastBotPos.x) * this.mapPixel + this.canvasWidthCenterX)
     const chunkCanvasY = Math.floor((chunkWorldZ - this.lastBotPos.z) * this.mapPixel + this.canvasWidthCenterY)
     const chunk = chunkInfo ?? this.chunksStore.get(key)
+    // if chunk is not ready then draw waiting color (grey) or none (half transparent black)
     if (typeof chunk !== 'object') {
       const chunkSize = this.mapPixel * 16
       this.ctx.fillStyle = chunk === 'requested' ? 'rgb(200, 200, 200)' : 'rgba(0, 0, 0, 0.5)'
@@ -149,10 +159,10 @@ export class MinimapDrawer {
   }
 
   drawPixel (pixelX: number, pixelY: number, color: string) {
-    // if (!this.full && Math.hypot(pixelX - this.canvasWidthCenterX, pixelY - this.canvasWidthCenterY) > this.radius) {
-    //   this.ctx.clearRect(pixelX, pixelY, this.mapPixel, this.mapPixel)
-    //   return
-    // }
+    if (!this.full && Math.hypot(pixelX - this.canvasWidthCenterX, pixelY - this.canvasWidthCenterY) > this.radius) {
+      this.ctx.clearRect(pixelX, pixelY, this.mapPixel, this.mapPixel)
+      return
+    }
     this.ctx.fillStyle = color
     this.ctx.fillRect(
       pixelX,
@@ -177,15 +187,13 @@ export class MinimapDrawer {
 
   drawWarps (centerPos?: Vec3) {
     for (const warp of this.warps) {
-      // if (!full) {
-      //   const distance = this.getDistance(
-      //     centerPos?.x ?? this.adapter.playerPosition.x,
-      //     centerPos?.z ?? this.adapter.playerPosition.z,
-      //     warp.x,
-      //     warp.z
-      //   )
-      //   if (distance > this.mapSize) continue
-      // }
+      if (!this.full) {
+        const distance = Math.hypot(
+          centerPos?.x ?? this.lastBotPos.x - warp.x,
+          centerPos?.z ?? this.lastBotPos.z - warp.z
+        )
+        if (distance > this.mapSize) continue
+      }
       const offset = this.full ? 0 : this.radius * 0.1
       const z = Math.floor(
         (this.mapSize / 2 - (centerPos?.z ?? this.lastBotPos.z) + warp.z) * this.mapPixel
@@ -288,8 +296,8 @@ export class MinimapDrawer {
   drawPlayerPos (canvasWorldCenterX?: number, canvasWorldCenterZ?: number, disableTurn?: boolean) {
     this.ctx.setTransform(1, 0, 0, 1, 0, 0)
 
-    const x = (this.lastBotPos.x - (canvasWorldCenterX ?? this.lastBotPos.x)) * this.mapPixel
-    const z = (this.lastBotPos.z - (canvasWorldCenterZ ?? this.lastBotPos.z)) * this.mapPixel
+    const x = (this.lastBotPos.x - (canvasWorldCenterX ?? this.lastBotPos.x)) * this.mapPixel - (this.full ? 30 : 0)
+    const z = (this.lastBotPos.z - (canvasWorldCenterZ ?? this.lastBotPos.z)) * this.mapPixel - (this.full ? 30 : 0)
     const center = this.mapSize / 2 * this.mapPixel + (this.full ? 0 : this.radius * 0.1)
     this.ctx.translate(center + x, center + z)
     if (!disableTurn) this.ctx.rotate(-this.yaw)
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
index 4d673a2f..25df83aa 100644
--- a/src/react/MinimapProvider.tsx
+++ b/src/react/MinimapProvider.tsx
@@ -1,5 +1,4 @@
-import { useEffect, useState } from 'react'
-import { versions } from 'minecraft-data'
+import { useEffect } from 'react'
 import { simplify } from 'prismarine-nbt'
 import RegionFile from 'prismarine-provider-anvil/src/region'
 import { Vec3 } from 'vec3'
@@ -15,17 +14,13 @@ import { useSnapshot } from 'valtio'
 import BlockData from '../../renderer/viewer/lib/moreBlockDataGenerated.json'
 import preflatMap from '../preflatMap.json'
 import { contro } from '../controls'
-import { gameAdditionalState, showModal, hideModal, miscUiState, activeModalStack } from '../globalState'
+import { gameAdditionalState, miscUiState } from '../globalState'
 import { options } from '../optionsStorage'
 import Minimap, { DisplayMode } from './Minimap'
 import { ChunkInfo, DrawerAdapter, MapUpdates, MinimapDrawer } from './MinimapDrawer'
 import { useIsModalActive } from './utilsApp'
 import { lastConnectOptions } from './AppStatusProvider'
 
-const getBlockKey = (x: number, z: number) => {
-  return `${x},${z}`
-}
-
 const findHeightMap = (obj: PCChunk): number[] | undefined => {
   function search (obj: any): any | undefined {
     for (const key in obj) {
@@ -43,49 +38,45 @@ const findHeightMap = (obj: PCChunk): number[] | undefined => {
 export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements DrawerAdapter {
   playerPosition: Vec3
   yaw: number
-  mapDrawer = new MinimapDrawer()
-  warps: WorldWarp[]
   world: string
+  warps: WorldWarp[] = gameAdditionalState.warps
   chunksStore = new Map<string, undefined | null | 'requested' | ChunkInfo >()
   loadingChunksQueue = new Set<string>()
+  loadChunk: (key: string) => Promise<void> = this.loadChunkMinimap
+  mapDrawer = new MinimapDrawer(this.loadChunk, this.warps, this.loadingChunksQueue, this.chunksStore)
   currChunk: PCChunk | undefined
   currChunkPos: { x: number, z: number } = { x: 0, z: 0 }
   isOldVersion: boolean
-  blockData: any
+  blockData: Map<string | string[], string>
   heightMap: Record<string, number> = {}
   regions = new Map<string, RegionFile>()
   chunksHeightmaps: Record<string, any> = {}
-  loadChunk: (key: string) => Promise<void>
-  loadChunkFullmap: ((key: string) => Promise<ChunkInfo | null | undefined>) | undefined
-  _full: boolean
+  loadChunkFullmap: (key: string) => Promise<ChunkInfo | null | undefined>
+  _full = false
   isBuiltinHeightmapAvailable = false
 
   constructor (pos?: Vec3) {
     super()
-    this.full = false
     this.playerPosition = pos ?? new Vec3(0, 0, 0)
-    this.warps = gameAdditionalState.warps
-    this.mapDrawer.warps = this.warps
-    this.mapDrawer.loadChunk = this.loadChunk
-    this.mapDrawer.loadingChunksQueue = this.loadingChunksQueue
-    this.mapDrawer.chunksStore = this.chunksStore
 
-    // check if should use heightmap
+    // check if should use heightmap.
+    // As there is no simple way to check if heightmap is present in region file, making an attempt to load one
     if (localServer) {
       const chunkX = Math.floor(this.playerPosition.x / 16)
       const chunkZ = Math.floor(this.playerPosition.z / 16)
       const regionX = Math.floor(chunkX / 32)
       const regionZ = Math.floor(chunkZ / 32)
       const regionKey = `${regionX},${regionZ}`
-      const worldFolder = this.getSingleplayerRootPath()
-      if (worldFolder && options.minimapOptimizations) {
+      const { worldFolder } = localServer.options
+      if (worldFolder) {
         const path = `${worldFolder}/region/r.${regionX}.${regionZ}.mca`
         const region = new RegionFile(path)
         void region.initialize()
         this.regions.set(regionKey, region)
-        const readX = chunkX % 32
-        const readZ = chunkZ % 32
-        void this.regions.get(regionKey)!.read(readX, readZ).then((rawChunk) => {
+        const readX = chunkX % 32 < 0 ? 32 + chunkX % 32 : chunkX % 32
+        const readZ = chunkZ % 32 < 0 ? 32 + chunkZ % 32 : chunkZ % 32
+        console.log('heightmap check begun', readX, readZ)
+        void this.regions.get(regionKey)?.read(readX, readZ)?.then((rawChunk) => {
           const chunk = simplify(rawChunk as any)
           const heightmap = findHeightMap(chunk)
           if (heightmap) {
@@ -95,44 +86,35 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
           } else {
             this.isBuiltinHeightmapAvailable = false
             this.loadChunkFullmap = this.loadChunkNoRegion
-            console.log('[minimap] not using heightmap')
+            console.log('dont use heightmap')
           }
-        }).catch(err => {
-          console.error(err)
-          this.isBuiltinHeightmapAvailable = false
-          this.loadChunkFullmap = this.loadChunkFromViewer
         })
       } else {
         this.isBuiltinHeightmapAvailable = false
-        this.loadChunkFullmap = this.loadChunkFromViewer
+        this.loadChunkFullmap = this.loadChunkNoRegion
+        console.log('dont use heightmap')
       }
     } else {
       this.isBuiltinHeightmapAvailable = false
       this.loadChunkFullmap = this.loadChunkFromViewer
     }
-    // if (localServer) {
-    //   this.overwriteWarps(localServer.warps)
-    //   this.on('cellReady', (key: string) => {
-    //     if (this.loadingChunksQueue.size === 0) return
-    //     const [x, z] = this.loadingChunksQueue.values().next().value.split(',').map(Number)
-    //     this.loadChunk(x, z)
-    //     this.loadingChunksQueue.delete(`${x},${z}`)
-    //   })
-    // } else {
-    //   const storageWarps = localStorage.getItem(`warps: ${loadedGameState.username} ${loadedGameState.serverIp ?? ''}`)
-    //   this.overwriteWarps(JSON.parse(storageWarps ?? '[]'))
-    // }
+    if (localServer) {
+      this.overwriteWarps(localServer.warps)
+    } else {
+      const storageWarps = localStorage.getItem(`warps: ${lastConnectOptions.value?.server ?? 'server'} ${lastConnectOptions.value?.username ?? 'username'}`)
+      this.overwriteWarps(JSON.parse(storageWarps ?? '[]'))
+    }
     this.isOldVersion = versionToNumber(bot.version) < versionToNumber('1.13')
-    this.blockData = {}
+    this.blockData = new Map<string, string>()
     for (const blockKey of Object.keys(BlockData.colors)) {
       const renamedKey = getRenamedData('blocks', blockKey, '1.20.2', bot.version)
-      this.blockData[renamedKey as string] = BlockData.colors[blockKey]
+      this.blockData.set(renamedKey, BlockData.colors[blockKey])
     }
 
     viewer.world?.renderUpdateEmitter.on('chunkFinished', (key) => {
       if (!this.loadingChunksQueue.has(key)) return
-      void this.loadChunk(key)
       this.loadingChunksQueue.delete(key)
+      void this.loadChunk(key)
     })
   }
 
@@ -141,9 +123,11 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
   }
 
   set full (full: boolean) {
-    console.log('this is minimap')
-    this.loadChunk = this.loadChunkMinimap
-    this.mapDrawer.loadChunk = this.loadChunk
+    if (!full) {
+      console.log('this is minimap')
+      this.loadChunk = this.loadChunkMinimap
+      this.mapDrawer.loadChunk = this.loadChunk
+    }
     this._full = full
   }
 
@@ -157,7 +141,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
   setWarp (warp: WorldWarp, remove?: boolean): void {
     this.world = bot.game.dimension
     const index = this.warps.findIndex(w => w.name === warp.name)
-    if (index === -1) {
+    if (!remove && index === -1) {
       this.warps.push(warp)
     } else if (remove && index !== -1) {
       this.warps.splice(index, 1)
@@ -207,29 +191,29 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     if (viewer.world.finishedChunks[`${chunkWorldX},${chunkWorldZ}`]) {
       const heightmap = new Uint8Array(256)
       const colors = Array.from({ length: 256 }).fill('') as string[]
+      // avoid creating new object every time
+      const blockPos = new Vec3(0, 0, 0)
+      // filling up colors and heightmap
       for (let z = 0; z < 16; z += 1) {
         for (let x = 0; x < 16; x += 1) {
           const blockX = chunkWorldX + x
           const blockZ = chunkWorldZ + z
           const hBlock = viewer.world.highestBlocks.get(`${blockX},${blockZ}`)
-          const block = bot.world.getBlock(new Vec3(blockX, hBlock?.y ?? 0, blockZ))
-          // const block = Block.fromStateId(hBlock?.stateId ?? -1, hBlock?.biomeId ?? -1)
+          blockPos.x = blockX; blockPos.z = blockZ; blockPos.y = hBlock?.y ?? 0
+          let block = bot.world.getBlock(blockPos)
+          while (block?.name.includes('air')) {
+            blockPos.y -= 1
+            block = bot.world.getBlock(blockPos)
+          }
           const index = z * 16 + x
+          // blocks which are not set are shown as half transparent
           if (!block || !hBlock) {
-            console.warn(`[loadChunk] ${chunkX}, ${chunkZ}, ${chunkWorldX + x}, ${chunkWorldZ + z}`)
             heightmap[index] = 0
             colors[index] = 'rgba(0, 0, 0, 0.5)'
             continue
           }
-          heightmap[index] = hBlock.y
-          let color: string
-          if (this.isOldVersion) {
-            color = BlockData.colors[preflatMap.blocks[`${block.type}:${block.metadata}`]?.replaceAll(/\[.*?]/g, '')]
-            ?? 'rgb(0, 0, 255)'
-          } else {
-            color = this.blockData[block.name] ?? 'rgb(0, 255, 0)'
-          }
-          colors[index] = color
+          heightmap[index] = block.position.y
+          colors[index] = this.setColor(block)
         }
       }
       const chunk = { heightmap, colors }
@@ -255,15 +239,19 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
         const blockX = chunkWorldX + x
         const blockZ = chunkWorldZ + z
         const blockY = this.getHighestBlockY(blockX, blockZ, chunkInfo)
-        const block = chunkInfo.getBlock(new Vec3(blockX & 15, blockY, blockZ & 15))
+        const blockPos = new Vec3(blockX & 15, blockY, blockZ & 15)
+        let block = chunkInfo.getBlock(blockPos)
+        while (block?.name.includes('air')) {
+          blockPos.y -= 1
+          block = chunkInfo.getBlock(blockPos)
+        }
         if (!block) {
           console.warn(`[cannot get the block] ${chunkX}, ${chunkZ}, ${chunkWorldX + x}, ${chunkWorldZ + z}`)
           return null
         }
         const index = z * 16 + x
-        heightmap[index] = blockY
-        const color = this.isOldVersion ? BlockData.colors[preflatMap.blocks[`${block.type}:${block.metadata}`]?.replaceAll(/\[.*?]/g, '')] ?? 'rgb(0, 0, 255)' : this.blockData[block.name] ?? 'rgb(0, 255, 0)'
-        colors[index] = color
+        heightmap[index] = blockPos.y
+        colors[index] = this.setColor(block)
       }
     }
     const chunk: ChunkInfo = { heightmap, colors }
@@ -288,13 +276,17 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
         heightmap[index] -= 1
         if (heightmap[index] < 0) heightmap[index] = 0
         const blockY = heightmap[index]
-        const block = chunkInfo.getBlock(new Vec3(blockX & 15, blockY, blockZ & 15))
+        const blockPos = new Vec3(blockX & 15, blockY, blockZ & 15)
+        let block = chunkInfo.getBlock(blockPos)
+        while (block?.name.includes('air')) {
+          blockPos.y -= 1
+          block = chunkInfo.getBlock(blockPos)
+        }
         if (!block) {
           console.warn(`[cannot get the block] ${chunkX}, ${chunkZ}, ${chunkWorldX + x}, ${chunkWorldZ + z}`)
           return null
         }
-        const color = this.isOldVersion ? BlockData.colors[preflatMap.blocks[`${block.type}:${block.metadata}`]?.replaceAll(/\[.*?]/g, '')] ?? 'rgb(0, 0, 255)' : this.blockData[block.name] ?? 'rgb(0, 255, 0)'
-        colors[index] = color
+        colors[index] = this.setColor(block)
       }
     }
     const chunk: ChunkInfo = { heightmap, colors }
@@ -302,17 +294,12 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     return chunk
   }
 
-  getSingleplayerRootPath (): string | undefined {
-    return localServer!.options.worldFolder
-  }
-
   async getChunkHeightMapFromRegion (chunkX: number, chunkZ: number, cb?: (hm: number[]) => void) {
     const regionX = Math.floor(chunkX / 32)
     const regionZ = Math.floor(chunkZ / 32)
     const regionKey = `${regionX},${regionZ}`
     if (!this.regions.has(regionKey)) {
-      const worldFolder = this.getSingleplayerRootPath()
-      if (!worldFolder) return
+      const { worldFolder } = localServer!.options
       const path = `${worldFolder}/region/r.${regionX}.${regionZ}.mca`
       const region = new RegionFile(path)
       await region.initialize()
@@ -350,8 +337,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
             continue
           }
           heightmap[index] = hBlock.y
-          const color = this.isOldVersion ? BlockData.colors[preflatMap.blocks[`${block.type}:${block.metadata}`]?.replaceAll(/\[.*?]/g, '')] ?? 'rgb(0, 0, 255)' : this.blockData[block.name] ?? 'rgb(0, 255, 0)'
-          colors[index] = color
+          colors[index] = this.setColor(block)
         }
       }
       const chunk = { heightmap, colors }
@@ -456,6 +442,32 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     }
   }
 
+  setColor (block: Block) {
+    let color: string
+    if (this.isOldVersion) {
+      color = BlockData.colors[preflatMap.blocks[`${block.type}:${block.metadata}`]?.replaceAll(/\[.*?]/g, '')]
+      ?? 'rgb(0, 0, 255)'
+    } else {
+      color = this.blockData.get(block.name) ?? 'rgb(0, 255, 0)'
+    }
+    if (color === 'rgb(0, 255, 0)' || color === 'rgb(0, 0, 255)') {
+      // this should never happen
+      // console.warn('[MinimapProvider] did not find block name,', block.name)
+      // hack to find close color. Problem with colors should be fixed differently in the future
+      const blockNamePieces = block.name.split('_')
+      const keys = [...this.blockData.keys()]
+      for (const piece of blockNamePieces) {
+        const match = keys.find(x => x.includes(piece))
+        if (match) {
+          color = this.blockData.get(match) ?? 'rgb(255, 0, 0)'
+          break
+        }
+      }
+    }
+
+    return color
+  }
+
   quickTp (x: number, z: number) {
     const y = this.getHighestBlockY(x, z)
     bot.chat(`/tp ${x} ${y + 20} ${z}`)
@@ -467,25 +479,6 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
   }
 
   async drawChunkOnCanvas (key: string, canvas: HTMLCanvasElement) {
-    // console.log('chunk', key, 'on canvas')
-    if (!this.loadChunkFullmap) {
-      // wait for it to be available
-      await new Promise(resolve => {
-        const interval = setInterval(() => {
-          if (this.loadChunkFullmap) {
-            clearInterval(interval)
-            resolve(undefined)
-          }
-        }, 100)
-        setTimeout(() => {
-          clearInterval(interval)
-          resolve(undefined)
-        }, 10_000)
-      })
-      if (!this.loadChunkFullmap) {
-        throw new Error('loadChunkFullmap not available')
-      }
-    }
     const chunk = await this.loadChunkFullmap(key)
     const [worldX, worldZ] = key.split(',').map(x => Number(x) * 16)
     const center = new Vec3(worldX + 8, 0, worldZ + 8)
@@ -493,6 +486,10 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     this.mapDrawer.canvas = canvas
     this.mapDrawer.full = true
     this.mapDrawer.drawChunk(key, chunk)
+    this.mapDrawer.drawWarps(center)
+    this.mapDrawer.lastBotPos = this.playerPosition
+    this.mapDrawer.yaw = this.yaw
+    this.mapDrawer.drawPlayerPos(worldX, worldZ)
   }
 }
 
@@ -501,7 +498,7 @@ const Inner = (
   {
     adapter: DrawerAdapterImpl
     displayMode?: DisplayMode,
-    toggleFullMap?: ({ command }: { command?: string }) => void
+    toggleFullMap?: () => void
   }
 ) => {
 
@@ -515,7 +512,7 @@ const Inner = (
   }
 
   const updateMap = () => {
-    if (!adapter) return
+    if (!adapter || miscUiState.displayFullmap) return
     adapter.playerPosition = bot.entity.position
     adapter.yaw = bot.entity.yaw
     adapter.emit('updateMap')
@@ -544,51 +541,13 @@ const Inner = (
   </div>
 }
 
-export default ({ displayMode }: { displayMode?: DisplayMode }) => {
-  const [adapter] = useState(() => new DrawerAdapterImpl(bot.entity.position))
+export default ({ adapter, displayMode }: { adapter: DrawerAdapterImpl, displayMode?: DisplayMode }) => {
 
   const { showMinimap } = useSnapshot(options)
   const fullMapOpened = useIsModalActive('full-map')
 
-
-  const readChunksHeightMaps = async () => {
-    const { worldFolder } = localServer!.options
-    const path = `${worldFolder}/region/r.0.0.mca`
-    const region = new RegionFile(path)
-    await region.initialize()
-    const chunks: Record<string, any> = {}
-    console.log('Reading chunks...')
-    console.log(chunks)
-    let versionDetected = false
-    for (const [i, _] of Array.from({ length: 32 }).entries()) {
-      for (const [k, _] of Array.from({ length: 32 }).entries()) {
-        // todo, may use faster reading, but features is not commonly used
-        // eslint-disable-next-line no-await-in-loop
-        const nbt = await region.read(i, k)
-        chunks[`${i},${k}`] = nbt
-        if (nbt && !versionDetected) {
-          const simplified = simplify(nbt)
-          const version = versions.pc.find(x => x['dataVersion'] === simplified.DataVersion)?.minecraftVersion
-          console.log('Detected version', version ?? 'unknown')
-          versionDetected = true
-        }
-      }
-    }
-    Object.defineProperty(chunks, 'simplified', {
-      get () {
-        const mapped = {}
-        for (const [i, _] of Array.from({ length: 32 }).entries()) {
-          for (const [k, _] of Array.from({ length: 32 }).entries()) {
-            const key = `${i},${k}`
-            const chunk = chunks[key]
-            if (!chunk) continue
-            mapped[key] = simplify(chunk)
-          }
-        }
-        return mapped
-      },
-    })
-    console.log('Done!', chunks)
+  const toggleFullMap = () => {
+    void contro.emit('trigger', { command: 'ui.toggleMap', schema: null as any })
   }
 
   if (
@@ -599,13 +558,5 @@ export default ({ displayMode }: { displayMode?: DisplayMode }) => {
     return null
   }
 
-  const toggleFullMap = () => {
-    if (activeModalStack.at(-1)?.reactType === 'full-map') {
-      hideModal({ reactType: 'full-map' })
-    } else {
-      showModal({ reactType: 'full-map' })
-    }
-  }
-
   return <Inner adapter={adapter} displayMode={displayMode} toggleFullMap={toggleFullMap} />
 }
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 0592d20d..46a7ad81 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -19,7 +19,7 @@ import ScoreboardProvider from './react/ScoreboardProvider'
 import SignEditorProvider from './react/SignEditorProvider'
 import IndicatorEffectsProvider from './react/IndicatorEffectsProvider'
 import PlayerListOverlayProvider from './react/PlayerListOverlayProvider'
-import MinimapProvider from './react/MinimapProvider'
+import MinimapProvider, { DrawerAdapterImpl } from './react/MinimapProvider'
 import HudBarsProvider from './react/HudBarsProvider'
 import XPBarProvider from './react/XPBarProvider'
 import DebugOverlay from './react/DebugOverlay'
@@ -104,17 +104,22 @@ const InGameComponent = ({ children }) => {
   return children
 }
 
+// for Fullmap and Minimap in InGameUi
+let adapter: DrawerAdapterImpl
+
 const InGameUi = () => {
   const { gameLoaded, showUI: showUIRaw } = useSnapshot(miscUiState)
   const { disabledUiParts, displayBossBars, showMinimap } = useSnapshot(options)
   const modalsSnapshot = useSnapshot(activeModalStack)
   const hasModals = modalsSnapshot.length > 0
   const showUI = showUIRaw || hasModals
-  const displayFullmap = modalsSnapshot.some(modal => modal.reactType === 'full-map')
+  const displayFullmap = modalsSnapshot.some(modal => modal.reactType === 'full-map') || true
   // bot can't be used here
 
   if (!gameLoaded || !bot || disabledUiParts.includes('*')) return
 
+  if (!adapter) adapter = new DrawerAdapterImpl(bot.entity.position)
+
   return <>
     <RobustPortal to={document.querySelector('#ui-root')}>
       {/* apply scaling */}
@@ -126,7 +131,7 @@ const InGameUi = () => {
         {!disabledUiParts.includes('players-list') && <PlayerListOverlayProvider />}
         {!disabledUiParts.includes('chat') && <ChatProvider />}
         <SoundMuffler />
-        {showMinimap !== 'never' && <MinimapProvider displayMode='minimapOnly' />}
+        {showMinimap !== 'never' && <MinimapProvider adapter={adapter} displayMode='minimapOnly' />}
         {!disabledUiParts.includes('title') && <TitleProvider />}
         {!disabledUiParts.includes('scoreboard') && <ScoreboardProvider />}
         {!disabledUiParts.includes('effects-indicators') && <IndicatorEffectsProvider />}
@@ -150,7 +155,7 @@ const InGameUi = () => {
       <DisplayQr />
     </PerComponentErrorBoundary>
     <RobustPortal to={document.body}>
-      {displayFullmap && <MinimapProvider displayMode='fullmapOnly' />}
+      {displayFullmap && <MinimapProvider adapter={adapter} displayMode='fullmapOnly' />}
       {/* because of z-index */}
       {showUI && <TouchControls />}
       <GlobalSearchInput />

From 2f70575534e96818b42b93377c1895cd3284fb62 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 13 Feb 2025 21:31:55 +0300
Subject: [PATCH 226/753] finishing support for mcraft viewer plugin:(

---
 renderer/viewer/lib/mesher/mesher.ts   |  1 +
 renderer/viewer/lib/viewer.ts          |  2 +-
 src/mineflayer/java-tester/commands.ts | 10 ++++
 src/react/Chat.tsx                     | 45 +++++++++++++---
 src/react/MineflayerPluginConsole.tsx  | 12 +++--
 src/react/MineflayerPluginHud.tsx      | 56 +++++++++++++++++--
 src/react/hooks/useScrollBehavior.ts   | 74 ++++++++++++++++++++++++++
 src/react/uiMotion.ts                  | 11 ++--
 src/viewerConnector.ts                 | 11 ++--
 src/worldInteractions.ts               | 24 ++++++---
 10 files changed, 216 insertions(+), 30 deletions(-)
 create mode 100644 src/react/hooks/useScrollBehavior.ts

diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index 7c120abc..ac9e69e8 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -85,6 +85,7 @@ const handleMessage = data => {
     world ??= new World(data.config.version)
     world.config = { ...world.config, ...data.config }
     globalThis.world = world
+    globalThis.Vec3 = Vec3
   }
 
   switch (data.type) {
diff --git a/renderer/viewer/lib/viewer.ts b/renderer/viewer/lib/viewer.ts
index 76745284..0f7b4850 100644
--- a/renderer/viewer/lib/viewer.ts
+++ b/renderer/viewer/lib/viewer.ts
@@ -114,7 +114,7 @@ export class Viewer {
         })
       }
       if (!this.world.loadedChunks[`${sectionX},${sectionZ}`]) {
-        console.debug('[should be unreachable] setBlockStateId called for unloaded chunk', pos)
+        // console.debug('[should be unreachable] setBlockStateId called for unloaded chunk', pos)
       }
       this.world.setBlockStateId(pos, stateId)
     }
diff --git a/src/mineflayer/java-tester/commands.ts b/src/mineflayer/java-tester/commands.ts
index c3166870..94e9bf81 100644
--- a/src/mineflayer/java-tester/commands.ts
+++ b/src/mineflayer/java-tester/commands.ts
@@ -50,5 +50,15 @@ export const javaServerTester = {
       custom_name: [{ translate: 'item.diamond.name' }]
     })
     writeCmd(cmd)
+  },
+  spamChat () {
+    for (let i = 0; i < 100; i++) {
+      bot.chat('Hello, world, ' + i)
+    }
+  },
+  spamChatComplexMessage () {
+    for (let i = 0; i < 100; i++) {
+      bot.chat('/tell @a ')
+    }
   }
 }
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 26a87e11..dde8ee62 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -78,9 +78,22 @@ export default ({
   const chatInput = useRef<HTMLInputElement>(null!)
   const chatMessages = useRef<HTMLDivElement>(null)
   const openedChatWasAtBottom = useRef(false)
+  const wasAtBottomBeforeOpen = useRef(false)
   const chatHistoryPos = useRef(sendHistoryRef.current.length)
   const inputCurrentlyEnteredValue = useRef('')
 
+  const isAtBottom = () => {
+    if (!chatMessages.current) return true
+    const { scrollTop, scrollHeight, clientHeight } = chatMessages.current
+    return Math.abs(scrollHeight - clientHeight - scrollTop) < 1
+  }
+
+  const scrollToBottom = () => {
+    if (chatMessages.current) {
+      chatMessages.current.scrollTop = chatMessages.current.scrollHeight
+    }
+  }
+
   const setSendHistory = (newHistory: string[]) => {
     sendHistoryRef.current = newHistory
     window.sessionStorage.chatHistory = JSON.stringify(newHistory)
@@ -120,6 +133,11 @@ export default ({
       if (!usingTouch) {
         chatInput.current.focus()
       }
+      // Check if was at bottom before opening
+      wasAtBottomBeforeOpen.current = isAtBottom()
+      if (wasAtBottomBeforeOpen.current) {
+        scrollToBottom()
+      }
       const unsubscribe = subscribe(chatInputValueGlobal, () => {
         if (!chatInputValueGlobal.value) return
         updateInputValue(chatInputValueGlobal.value)
@@ -129,7 +147,7 @@ export default ({
       return unsubscribe
     }
     if (!opened && chatMessages.current) {
-      chatMessages.current.scrollTop = chatMessages.current.scrollHeight
+      scrollToBottom()
     }
   }, [opened])
 
@@ -143,19 +161,32 @@ export default ({
   useEffect(() => {
     if ((!opened || (opened && openedChatWasAtBottom.current)) && chatMessages.current) {
       openedChatWasAtBottom.current = false
-      // stay at bottom on messages changes
-      chatMessages.current.scrollTop = chatMessages.current.scrollHeight
+      // stay at bottom on messages changes only if we were at bottom
+      if (isAtBottom()) {
+        scrollToBottom()
+      }
     }
   }, [messages])
 
   useMemo(() => {
     if ((opened && chatMessages.current)) {
-      const wasAtBottom = chatMessages.current.scrollTop === chatMessages.current.scrollHeight - chatMessages.current.clientHeight
-      openedChatWasAtBottom.current = wasAtBottom
-      // console.log(wasAtBottom, chatMessages.current.scrollTop, chatMessages.current.scrollHeight - chatMessages.current.clientHeight)
+      openedChatWasAtBottom.current = isAtBottom()
     }
   }, [messages])
 
+  // Add scroll handler to track scroll position
+  useEffect(() => {
+    const messagesEl = chatMessages.current
+    if (!messagesEl) return
+
+    const handleScroll = () => {
+      openedChatWasAtBottom.current = isAtBottom()
+    }
+
+    messagesEl.addEventListener('scroll', handleScroll)
+    return () => messagesEl.removeEventListener('scroll', handleScroll)
+  }, [])
+
   const auxInputFocus = (fireKey: string) => {
     chatInput.current.focus()
     chatInput.current.dispatchEvent(new KeyboardEvent('keydown', { code: fireKey, bubbles: true }))
@@ -249,6 +280,8 @@ export default ({
               if (result !== false) {
                 onClose?.()
               }
+              // Always scroll to bottom after sending a message
+              scrollToBottom()
             }
           }}
           >
diff --git a/src/react/MineflayerPluginConsole.tsx b/src/react/MineflayerPluginConsole.tsx
index d8bf86f9..e681f882 100644
--- a/src/react/MineflayerPluginConsole.tsx
+++ b/src/react/MineflayerPluginConsole.tsx
@@ -3,6 +3,7 @@ import { useEffect, useRef, useState } from 'react'
 import './MineflayerPluginConsole.css'
 import { miscUiState } from '../globalState'
 import { useIsModalActive } from './utilsApp'
+import { useScrollBehavior } from './hooks/useScrollBehavior'
 
 export type ConsoleMessage = {
   text: string
@@ -36,11 +37,14 @@ export default () => {
   const consoleInput = useRef<HTMLInputElement>(null!)
   const consoleMessages = useRef<HTMLDivElement>(null)
 
+  const { scrollToBottom } = useScrollBehavior(consoleMessages, { messages, opened })
+
+  // Add useEffect to focus input when opened
   useEffect(() => {
-    if (consoleMessages.current) {
-      consoleMessages.current.scrollTop = consoleMessages.current.scrollHeight
+    if (opened && replEnabled) {
+      consoleInput.current?.focus()
     }
-  }, [messages])
+  }, [opened, replEnabled])
 
   const updateInputValue = (newValue: string) => {
     consoleInput.current.value = newValue
@@ -78,6 +82,8 @@ export default () => {
             if (code) {
               onExecute?.(code)
               updateInputValue('')
+              // Scroll to bottom after sending command
+              scrollToBottom()
             }
           }}
         >
diff --git a/src/react/MineflayerPluginHud.tsx b/src/react/MineflayerPluginHud.tsx
index 108b8c37..0cb728cb 100644
--- a/src/react/MineflayerPluginHud.tsx
+++ b/src/react/MineflayerPluginHud.tsx
@@ -1,13 +1,50 @@
 import { proxy, useSnapshot } from 'valtio'
-import { useEffect, useRef } from 'react'
+import { useEffect, useRef, Fragment } from 'react'
 import type { UIDefinition } from 'mcraft-fun-mineflayer/build/customChannel'
 import MessageFormattedString from './MessageFormattedString'
 import { useUiMotion } from './uiMotion'
+import PixelartIcon from './PixelartIcon'
 
 export const mineflayerPluginHudState = proxy({
   ui: [] as Array<UIDefinition & { id: string }>,
 })
 
+type TextPart = { type: 'text'; content: string } | { type: 'icon'; iconName: string }
+
+const parseTextWithIcons = (text: string): TextPart[] => {
+  const parts: TextPart[] = []
+  let currentText = ''
+  let i = 0
+
+  while (i < text.length) {
+    if (text[i] === '{' && text.slice(i, i + 6) === '{icon:') {
+      // If we have accumulated text before the icon, add it
+      if (currentText) {
+        parts.push({ type: 'text', content: currentText })
+        currentText = ''
+      }
+
+      // Find the end of the icon placeholder
+      const endBrace = text.indexOf('}', i)
+      if (endBrace !== -1) {
+        const iconName = text.slice(i + 6, endBrace)
+        parts.push({ type: 'icon', iconName })
+        i = endBrace + 1
+        continue
+      }
+    }
+    currentText += text[i]
+    i++
+  }
+
+  // Add any remaining text
+  if (currentText) {
+    parts.push({ type: 'text', content: currentText })
+  }
+
+  return parts
+}
+
 const TextElement = ({ text, x, y, motion = true, formatted = true, css = '', onTab = false }: UIDefinition & { type: 'text' }) => {
   const motionRef = useRef<HTMLDivElement>(null)
   const innerRef = useRef<HTMLDivElement>(null)
@@ -21,6 +58,8 @@ const TextElement = ({ text, x, y, motion = true, formatted = true, css = '', on
 
   if (onTab && !document.hidden) return null
 
+  const parts = parseTextWithIcons(text)
+
   return (
     <div
       ref={motionRef}
@@ -29,10 +68,21 @@ const TextElement = ({ text, x, y, motion = true, formatted = true, css = '', on
         left: x,
         top: y,
         transition: motion ? 'transform 0.1s ease-out' : 'none',
+        display: 'flex',
+        alignItems: 'center',
+        gap: '2px'
       }}
     >
       <div ref={innerRef}>
-        {formatted ? <MessageFormattedString message={text} /> : text}
+        {parts.map((part, index) => (
+          <Fragment key={index}>
+            {part.type === 'text' ? (
+              formatted ? <MessageFormattedString message={part.content} /> : part.content
+            ) : (
+              <PixelartIcon iconName={part.iconName} width={12} styles={{ display: 'inline-block' }} />
+            )}
+          </Fragment>
+        ))}
       </div>
     </div>
   )
@@ -58,7 +108,7 @@ export default () => {
   const { ui } = useSnapshot(mineflayerPluginHudState)
 
   return (
-    <div style={{ position: 'absolute', top: 0, left: 0, width: '100%', height: '100%', pointerEvents: 'none' }}>
+    <div style={{ position: 'absolute', top: 0, left: 0, width: '100%', height: '100%', pointerEvents: 'none' }} className='mineflayer-plugin-hud'>
       {ui.map((element, index) => {
         if (element.type === 'lil') return null // Handled elsewhere
         if (element.type === 'text') return <TextElement key={index} {...element} />
diff --git a/src/react/hooks/useScrollBehavior.ts b/src/react/hooks/useScrollBehavior.ts
new file mode 100644
index 00000000..b877625a
--- /dev/null
+++ b/src/react/hooks/useScrollBehavior.ts
@@ -0,0 +1,74 @@
+import { RefObject, useEffect, useRef } from 'react'
+
+export const useScrollBehavior = (
+  elementRef: RefObject<HTMLElement>,
+  {
+    messages,
+    opened
+  }: {
+    messages: readonly any[],
+    opened?: boolean
+  }
+) => {
+  const wasAtBottomBeforeOpen = useRef(false)
+  const openedWasAtBottom = useRef(false)
+
+  const isAtBottom = () => {
+    if (!elementRef.current) return true
+    const { scrollTop, scrollHeight, clientHeight } = elementRef.current
+    return Math.abs(scrollHeight - clientHeight - scrollTop) < 1
+  }
+
+  const scrollToBottom = () => {
+    if (elementRef.current) {
+      elementRef.current.scrollTop = elementRef.current.scrollHeight
+    }
+  }
+
+  // Handle scroll position tracking
+  useEffect(() => {
+    const element = elementRef.current
+    if (!element) return
+
+    const handleScroll = () => {
+      openedWasAtBottom.current = isAtBottom()
+    }
+
+    element.addEventListener('scroll', handleScroll)
+    return () => element.removeEventListener('scroll', handleScroll)
+  }, [])
+
+  // Handle opened state changes
+  useEffect(() => {
+    if (opened) {
+      wasAtBottomBeforeOpen.current = isAtBottom()
+      if (wasAtBottomBeforeOpen.current) {
+        scrollToBottom()
+      }
+    } else if (elementRef.current) {
+      scrollToBottom()
+    }
+  }, [opened])
+
+  // Handle messages changes
+  useEffect(() => {
+    if ((!opened || (opened && openedWasAtBottom.current)) && elementRef.current) {
+      openedWasAtBottom.current = false
+      if (isAtBottom()) {
+        scrollToBottom()
+      }
+    }
+  }, [messages])
+
+  // Update bottom state when messages change
+  useEffect(() => {
+    if (opened && elementRef.current) {
+      openedWasAtBottom.current = isAtBottom()
+    }
+  }, [messages])
+
+  return {
+    scrollToBottom,
+    isAtBottom
+  }
+}
diff --git a/src/react/uiMotion.ts b/src/react/uiMotion.ts
index 1d1bb7e1..51e9a9f1 100644
--- a/src/react/uiMotion.ts
+++ b/src/react/uiMotion.ts
@@ -7,8 +7,7 @@ export const motionState = proxy({
 })
 
 const MOTION_DAMPING = 0.92
-// const MAX_MOTION_OFFSET = 30
-const MAX_MOTION_OFFSET = 350
+const MAX_MOTION_OFFSET = 100
 const motionVelocity = { x: 0, y: 0 }
 let lastUpdate = performance.now()
 let lastYaw = 0
@@ -39,13 +38,13 @@ export function updateMotion () {
 
   // Calculate motion contribution
   const velocityContribution = {
-    x: -velocityVector.x * 200,
-    y: -velocityVector.z * 200
+    x: -velocityVector.x * 150,
+    y: -velocityVector.z * 150
   }
 
   // Combine camera and velocity effects
-  motionVelocity.x += (yawDiff * 400 + velocityContribution.x) * deltaTime
-  motionVelocity.y += (pitchDiff * 400 + velocityContribution.y) * deltaTime
+  motionVelocity.x += (yawDiff * 300 + velocityContribution.x) * deltaTime
+  motionVelocity.y += (pitchDiff * 300 + velocityContribution.y) * deltaTime
 
   // Apply damping
   motionVelocity.x *= MOTION_DAMPING
diff --git a/src/viewerConnector.ts b/src/viewerConnector.ts
index 5096ba4d..69e2115a 100644
--- a/src/viewerConnector.ts
+++ b/src/viewerConnector.ts
@@ -126,11 +126,7 @@ export const getWsProtocolStream = async (url: string) => {
 const CHANNEL_NAME = 'minecraft-web-client:data'
 
 export const handleCustomChannel = async () => {
-  await new Promise(resolve => {
-    bot._client.once('login', resolve)
-  })
-
-  bot._client.registerChannel(CHANNEL_NAME, ['string', []], true)
+  bot._client.registerChannel(CHANNEL_NAME, ['string', []])
   const toCleanup = [] as Array<() => void>
   subscribe(activeModalStack, () => {
     if (activeModalStack.length === 1 && activeModalStack[0].reactType === 'main-menu') {
@@ -193,6 +189,11 @@ export const handleCustomChannel = async () => {
         }
         break
       }
+      // todo
+      case 'kick' as any: {
+        bot.emit('end', (data as any).reason)
+        break
+      }
       case 'ui': {
         const { update } = data
         if (update.data === null) {
diff --git a/src/worldInteractions.ts b/src/worldInteractions.ts
index 0586d65b..80143303 100644
--- a/src/worldInteractions.ts
+++ b/src/worldInteractions.ts
@@ -165,15 +165,27 @@ class WorldInteraction {
       }
     })
 
-    bot.on('blockBreakProgressObserved', (block: Block, destroyStage: number) => {
-      if (this.cursorBlock?.position.equals(block.position)) {
-        this.setBreakState(block, destroyStage)
+    //@ts-expect-error mineflayer types are wrong
+    bot.on('blockBreakProgressObserved', (block: Block, destroyStage: number, entity: Entity) => {
+      if (this.cursorBlock?.position.equals(block.position) && entity.id === bot.entity.id) {
+        if (!this.buttons[0]) {
+          // Simulate left mouse button press
+          this.buttons[0] = true
+          this.update()
+        }
+        // this.setBreakState(block, destroyStage)
       }
     })
 
-    bot.on('blockBreakProgressEnd', (block: Block) => {
-      if (this.currentBreakBlock?.block.position.equals(block.position)) {
-        this.stopBreakAnimation()
+    //@ts-expect-error mineflayer types are wrong
+    bot.on('blockBreakProgressEnd', (block: Block, entity: Entity) => {
+      if (this.currentBreakBlock?.block.position.equals(block.position) && entity.id === bot.entity.id) {
+        if (!this.buttons[0]) {
+          // Simulate left mouse button press
+          this.buttons[0] = false
+          this.update()
+        }
+        // this.stopBreakAnimation()
       }
     })
 

From df4dd69c80961a786864563cf93f8114c129c53b Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 13 Feb 2025 23:37:34 +0300
Subject: [PATCH 227/753] feat: display reconnect button in pause menu when
 connection seems to be lost

---
 src/react/AppStatusProvider.tsx | 14 +++++++-------
 src/react/PauseScreen.tsx       | 11 +++++++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index e0c620a7..955a2cc5 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -44,6 +44,13 @@ const saveReconnectOptions = (options: ConnectOptions) => {
   }))
 }
 
+export const reconnectReload = () => {
+  if (lastConnectOptions.value) {
+    saveReconnectOptions(lastConnectOptions.value)
+    window.location.reload()
+  }
+}
+
 export default () => {
   const { isError, lastStatus, maybeRecoverable, status, hideDots, descriptionHint, loadingChunksData, loadingChunksDataPlayerChunk, minecraftJsonMessage, showReconnect } = useSnapshot(appStatusState)
   const { active: replayActive } = useSnapshot(packetsReplaceSessionState)
@@ -70,13 +77,6 @@ export default () => {
     }))
   }
 
-  const reconnectReload = () => {
-    if (lastConnectOptions.value) {
-      saveReconnectOptions(lastConnectOptions.value)
-      window.location.reload()
-    }
-  }
-
   useEffect(() => {
     const controller = new AbortController()
     window.addEventListener('keyup', (e) => {
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 01edaa13..0d2f0fab 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -12,7 +12,8 @@ import {
   showModal,
   hideModal,
   miscUiState,
-  openOptionsMenu
+  openOptionsMenu,
+  gameAdditionalState
 } from '../globalState'
 import { fsState } from '../loadSave'
 import { disconnect } from '../flyingSquidUtils'
@@ -28,7 +29,7 @@ import Screen from './Screen'
 import styles from './PauseScreen.module.css'
 import { DiscordButton } from './DiscordButton'
 import { showNotification } from './NotificationProvider'
-import { appStatusState } from './AppStatusProvider'
+import { appStatusState, reconnectReload } from './AppStatusProvider'
 
 const waitForPotentialRender = async () => {
   return new Promise<void>(resolve => {
@@ -153,6 +154,7 @@ export default () => {
   const fsStateSnap = useSnapshot(fsState)
   const activeModalStackSnap = useSnapshot(activeModalStack)
   const { singleplayer, wanOpened, wanOpening } = useSnapshot(miscUiState)
+  const { noConnection } = useSnapshot(gameAdditionalState)
 
   const handlePointerLockChange = () => {
     if (!pointerLock.hasPointerLock && activeModalStack.length === 0) {
@@ -254,6 +256,11 @@ export default () => {
           />
         </div>
       ) : null}
+      {noConnection && (
+        <Button className="button" style={{ width: '204px' }} onClick={reconnectReload}>
+          Reconnect
+        </Button>
+      )}
       {!lockConnect && <>
         <Button className="button" style={{ width: '204px' }} onClick={disconnect}>
           {localServer && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}

From 0f29053ca6a61320ed299e7f96d168407792e379 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 13 Feb 2025 22:40:50 +0300
Subject: [PATCH 228/753] fix(important): save username instantly so it doesn't
 reset when you reload the page if you didn't change it

---
 src/react/ServersListProvider.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index e0147a33..16c5ae8b 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -53,6 +53,13 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
   const [quickConnectIp, setQuickConnectIp] = useState('')
   const [selectedIndex, setSelectedIndex] = useState(0)
 
+  // Save username to localStorage when component mounts if it doesn't exist
+  useEffect(() => {
+    if (!localStorage['username']) {
+      localStorage.setItem('username', defaultUsername)
+    }
+  }, [])
+
   const setAuthenticatedAccounts = (newState: typeof authenticatedAccounts) => {
     _setAuthenticatedAccounts(newState)
     localStorage.setItem('authenticatedAccounts', JSON.stringify(newState))

From 65af9a73c2b743d2958d2583bd509bec97c14897 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 15 Feb 2025 05:14:36 +0300
Subject: [PATCH 229/753] feat: rework hand! enable by default, fix bow anim
 (#261)

* refactor swing animation to controller

* idle animator!!!!

* implelment state switch transition

* a huge fix for UI server edit!

* adjust ui scaling so main menu elements clip less

* view bobbing, new config name, ws:

* EXTREMELY important fixes to entities rendering

* a lot of fixes, add dns resolve fallback

* improve f3 E, fix modal not found edge case

* set correctly target for old browsers, should fix ios 14 crash

* unecessary big refactor, to fix ts err

* fix isWysiwyg check

* fix entities rendering count
---
 package.json                               |  28 +-
 pnpm-lock.yaml                             |  72 +-
 renderer/buildMesherWorker.mjs             |   1 +
 renderer/rsbuild.config.ts                 |  21 +-
 renderer/viewer/lib/DebugGui.ts            | 174 ++++
 renderer/viewer/lib/animationController.ts |  75 ++
 renderer/viewer/lib/basePlayerState.ts     |  94 +++
 renderer/viewer/lib/cameraBobbing.ts       |  94 +++
 renderer/viewer/lib/entities.ts            | 195 +++--
 renderer/viewer/lib/entity/EntityMesh.ts   |   9 +
 renderer/viewer/lib/hand.ts                |  29 +-
 renderer/viewer/lib/holdingBlock.ts        | 940 +++++++++++++++------
 renderer/viewer/lib/mesher/mesher.ts       |   2 +
 renderer/viewer/lib/smoothSwitcher.ts      | 169 ++++
 renderer/viewer/lib/threeJsUtils.ts        |   9 +-
 renderer/viewer/lib/utils/proxy.ts         |  23 +
 renderer/viewer/lib/utils/skins.ts         |  27 +
 renderer/viewer/lib/viewer.ts              |  39 +-
 renderer/viewer/lib/viewerWrapper.ts       |   2 +-
 renderer/viewer/lib/worldDataEmitter.ts    |  31 +-
 renderer/viewer/lib/worldrendererCommon.ts |  11 +-
 renderer/viewer/lib/worldrendererThree.ts  |  38 +-
 src/api/mcStatusApi.ts                     |  10 +
 src/builtinCommands.ts                     |  15 +-
 src/devtools.ts                            |  13 +
 src/globalState.ts                         |   5 +
 src/index.ts                               |  32 +-
 src/inventoryWindows.ts                    |   4 +-
 src/mineflayer/playerState.ts              | 200 +++++
 src/optionsGuiScheme.tsx                   |   7 +-
 src/optionsStorage.ts                      |   3 +-
 src/parseServerAddress.ts                  |   2 +
 src/react/AddServerOrConnect.tsx           |  48 +-
 src/react/DebugOverlay.tsx                 |   4 +-
 src/react/GlobalSearchInput.tsx            |   1 +
 src/react/NoModalFoundProvider.tsx         |  13 +-
 src/react/SignEditorProvider.tsx           |   6 +-
 src/react/UIProvider.tsx                   |  30 +
 src/react/utilsApp.ts                      |  10 +-
 src/reactUi.tsx                            |  82 +-
 src/rendererUtils.ts                       | 113 ++-
 src/scaleInterface.ts                      |  14 +-
 src/shims/dns.js                           |  18 +
 src/watchOptions.ts                        |   3 +-
 src/worldInteractions.ts                   |   3 +
 45 files changed, 2152 insertions(+), 567 deletions(-)
 create mode 100644 renderer/viewer/lib/DebugGui.ts
 create mode 100644 renderer/viewer/lib/animationController.ts
 create mode 100644 renderer/viewer/lib/basePlayerState.ts
 create mode 100644 renderer/viewer/lib/cameraBobbing.ts
 create mode 100644 renderer/viewer/lib/smoothSwitcher.ts
 create mode 100644 renderer/viewer/lib/utils/proxy.ts
 create mode 100644 renderer/viewer/lib/utils/skins.ts
 create mode 100644 src/mineflayer/playerState.ts
 create mode 100644 src/react/UIProvider.tsx

diff --git a/package.json b/package.json
index 171da2f3..79e2a9ba 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,7 @@
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "debug": "^4.3.4",
+    "deepslate": "^0.23.5",
     "diff-match-patch": "^1.0.5",
     "eruda": "^3.0.1",
     "esbuild": "^0.19.3",
@@ -144,7 +145,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.31",
+    "mc-assets": "^0.2.34",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
@@ -168,15 +169,22 @@
     "cypress-plugin-snapshots": "^1.4.4",
     "systeminformation": "^5.21.22"
   },
-  "browserslist": [
-    "iOS >= 14",
-    "Android >= 13",
-    "Chrome >= 103",
-    "not dead",
-    "not ie <= 11",
-    "not op_mini all",
-    "> 0.5%"
-  ],
+  "browserslist": {
+    "production": [
+      "iOS >= 14",
+      "Android >= 13",
+      "Chrome >= 103",
+      "not dead",
+      "not ie <= 11",
+      "not op_mini all",
+      "> 0.5%"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
   "pnpm": {
     "overrides": {
       "buffer": "^6.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a49ff0cb..7540c5bb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -97,6 +97,9 @@ importers:
       debug:
         specifier: ^4.3.4
         version: 4.4.0(supports-color@8.1.1)
+      deepslate:
+        specifier: ^0.23.5
+        version: 0.23.5
       diff-match-patch:
         specifier: ^1.0.5
         version: 1.0.5
@@ -132,7 +135,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: 0.0.3
-        version: 0.0.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13))
+        version: 0.0.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -346,14 +349,14 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.31
-        version: 0.2.31
+        specifier: ^0.2.34
+        version: 0.2.34
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
       mineflayer:
         specifier: github:zardoy/mineflayer
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -3791,6 +3794,9 @@ packages:
   character-entities@2.0.2:
     resolution: {integrity: sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==}
 
+  charenc@0.0.2:
+    resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
+
   check-error@1.0.3:
     resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}
 
@@ -4065,6 +4071,9 @@ packages:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
 
+  crypt@0.0.2:
+    resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
+
   crypto-browserify@3.12.0:
     resolution: {integrity: sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==}
 
@@ -4218,6 +4227,9 @@ packages:
     resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
     engines: {node: '>=0.10.0'}
 
+  deepslate@0.23.5:
+    resolution: {integrity: sha512-FjBBbuPUI1Y/dXtUc4WiCJSA7s7yRAXepD7qWRF6wX5m/q7AVRauMEShu8lphRvqCtJyxcYFZmISwX5OOH/tWw==}
+
   default-browser-id@3.0.0:
     resolution: {integrity: sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==}
     engines: {node: '>=12'}
@@ -5183,6 +5195,9 @@ packages:
   github-slugger@1.5.0:
     resolution: {integrity: sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw==}
 
+  gl-matrix@3.4.3:
+    resolution: {integrity: sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==}
+
   gl@6.0.2:
     resolution: {integrity: sha512-yBbfpChOtFvg5D+KtMaBFvj6yt3vUnheNAH+UrQH2TfDB8kr0tERdL0Tjhe0W7xJ6jR6ftQBluTZR9jXUnKe8g==}
     engines: {node: '>=14.0.0'}
@@ -6228,8 +6243,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.31:
-    resolution: {integrity: sha512-+WAU9+iRbBgWWgsrQ52j0Xqq+Qs7UbjlVtZq1NCTqpIAvaEKNCwM7u2qFV5hoj4RpBAsVmkgLissdjLddE8WaA==}
+  mc-assets@0.2.34:
+    resolution: {integrity: sha512-BvE2mVs9XETLFb+FN1Zbc4mJ+CvZqgxVd3kxhERp1QljudDmMsWsMcK2EUTrevuE6a7L3F2kx8XC1vVA79i/ow==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.0.3:
@@ -6251,6 +6266,9 @@ packages:
   md5.js@1.3.5:
     resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==}
 
+  md5@2.3.0:
+    resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
+
   mdast-util-definitions@4.0.0:
     resolution: {integrity: sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==}
 
@@ -6462,8 +6480,8 @@ packages:
     resolution: {integrity: sha512-q7cmpZFaSI6sodcMJxc2GkV8IO84HbsUP+xNipGKfGg+FMISKabzdJ838Axb60qRtZrp6ny7LluQE7lesHvvxQ==}
     engines: {node: '>=18'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828}
     version: 4.25.0
     engines: {node: '>=18'}
 
@@ -6874,6 +6892,9 @@ packages:
   pako@1.0.11:
     resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
 
+  pako@2.1.0:
+    resolution: {integrity: sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==}
+
   param-case@3.0.4:
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
 
@@ -9258,6 +9279,9 @@ packages:
     resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
     engines: {node: '>=12.20'}
 
+  zod@3.24.1:
+    resolution: {integrity: sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==}
+
   zustand@3.6.5:
     resolution: {integrity: sha512-/WfLJuXiEJimt61KGMHebrFBwckkCHGhAgVXTgPQHl6IMzjqm6MREb1OnDSnCRiSmRdhgdFCctceg6tSm79hiw==}
     engines: {node: '>=12.7.0'}
@@ -13604,6 +13628,8 @@ snapshots:
 
   character-entities@2.0.2: {}
 
+  charenc@0.0.2: {}
+
   check-error@1.0.3:
     dependencies:
       get-func-name: 2.0.2
@@ -13924,6 +13950,8 @@ snapshots:
       shebang-command: 2.0.0
       which: 2.0.2
 
+  crypt@0.0.2: {}
+
   crypto-browserify@3.12.0:
     dependencies:
       browserify-cipher: 1.0.1
@@ -14125,6 +14153,12 @@ snapshots:
 
   deepmerge@4.3.1: {}
 
+  deepslate@0.23.5:
+    dependencies:
+      gl-matrix: 3.4.3
+      md5: 2.3.0
+      pako: 2.1.0
+
   default-browser-id@3.0.0:
     dependencies:
       bplist-parser: 0.2.0
@@ -15462,6 +15496,8 @@ snapshots:
 
   github-slugger@1.5.0: {}
 
+  gl-matrix@3.4.3: {}
+
   gl@6.0.2:
     dependencies:
       bindings: 1.5.0
@@ -16643,14 +16679,16 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.31: {}
+  mc-assets@0.2.34:
+    dependencies:
+      zod: 3.24.1
 
-  mcraft-fun-mineflayer@0.0.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.0.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.0
     transitivePeerDependencies:
@@ -16667,6 +16705,12 @@ snapshots:
       inherits: 2.0.4
       safe-buffer: 5.2.1
 
+  md5@2.3.0:
+    dependencies:
+      charenc: 0.0.2
+      crypt: 0.0.2
+      is-buffer: 1.1.6
+
   mdast-util-definitions@4.0.0:
     dependencies:
       unist-util-visit: 2.0.3
@@ -17042,7 +17086,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/54f8c2282d822ad02967a197bda36302a4e7b4a5(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
@@ -17556,6 +17600,8 @@ snapshots:
 
   pako@1.0.11: {}
 
+  pako@2.1.0: {}
+
   param-case@3.0.4:
     dependencies:
       dot-case: 3.0.4
@@ -20407,6 +20453,8 @@ snapshots:
 
   yocto-queue@1.0.0: {}
 
+  zod@3.24.1: {}
+
   zustand@3.6.5(react@18.2.0):
     optionalDependencies:
       react: 18.2.0
diff --git a/renderer/buildMesherWorker.mjs b/renderer/buildMesherWorker.mjs
index 03b952b4..2f9a4a02 100644
--- a/renderer/buildMesherWorker.mjs
+++ b/renderer/buildMesherWorker.mjs
@@ -28,6 +28,7 @@ const buildOptions = {
     'debugger'
   ] : [],
   sourcemap: 'linked',
+  target: watch ? undefined : ['ios14'],
   write: false,
   metafile: true,
   outdir: path.join(__dirname, './dist'),
diff --git a/renderer/rsbuild.config.ts b/renderer/rsbuild.config.ts
index d1cd681c..2b40e79c 100644
--- a/renderer/rsbuild.config.ts
+++ b/renderer/rsbuild.config.ts
@@ -1,14 +1,19 @@
-import { defineConfig, mergeRsbuildConfig } from '@rsbuild/core';
+import { defineConfig, mergeRsbuildConfig, RsbuildPluginAPI } from '@rsbuild/core';
 import supportedVersions from '../src/supportedVersions.mjs'
 import childProcess from 'child_process'
 import path, { dirname, join } from 'path'
 import { pluginReact } from '@rsbuild/plugin-react';
 import { pluginNodePolyfill } from '@rsbuild/plugin-node-polyfill';
 import fs from 'fs'
+import fsExtra from 'fs-extra'
 import { appAndRendererSharedConfig, rspackViewerConfig } from './rsbuildSharedConfig';
 
 const mcDataPath = join(__dirname, '../generated/minecraft-data-optimized.json')
 
+// if (!fs.existsSync('./playground/textures')) {
+//     fsExtra.copySync('node_modules/mc-assets/dist/other-textures/latest/entity', './playground/textures/entity')
+// }
+
 if (!fs.existsSync(mcDataPath)) {
     childProcess.execSync('tsx ./scripts/makeOptimizedMcData.mjs', { stdio: 'inherit', cwd: path.join(__dirname, '..') })
 }
@@ -36,5 +41,19 @@ export default mergeRsbuildConfig(
                 'globalThis.includedVersions': JSON.stringify(supportedVersions),
             },
         },
+        plugins: [
+            {
+                name: 'test',
+                setup (build: RsbuildPluginAPI) {
+                    const prep = async () => {
+                        fsExtra.copySync(join(__dirname, '../node_modules/mc-assets/dist/other-textures/latest/entity'), join(__dirname, './dist/textures/entity'))
+                    }
+                    build.onBeforeBuild(async () => {
+                        await prep()
+                    })
+                    build.onBeforeStartDevServer(() => prep())
+            },
+            },
+        ],
     })
 )
diff --git a/renderer/viewer/lib/DebugGui.ts b/renderer/viewer/lib/DebugGui.ts
new file mode 100644
index 00000000..f296c873
--- /dev/null
+++ b/renderer/viewer/lib/DebugGui.ts
@@ -0,0 +1,174 @@
+// eslint-disable-next-line import/no-named-as-default
+import GUI from 'lil-gui'
+
+export interface ParamMeta {
+  min?: number
+  max?: number
+  step?: number
+}
+
+export class DebugGui {
+  private gui: GUI
+  private readonly storageKey: string
+  private target: any
+  private readonly params: string[]
+  private readonly paramsMeta: Record<string, ParamMeta>
+  private _visible = false // Default to not visible
+  private readonly initialValues: Record<string, any> = {} // Store initial values
+  private initialized = false
+
+  constructor (id: string, target: any, params?: string[], paramsMeta?: Record<string, ParamMeta>) {
+    this.gui = new GUI()
+    this.storageKey = `debug_params_${id}`
+    this.target = target
+    this.paramsMeta = paramsMeta ?? {}
+    this.params = params ?? Object.keys(target)
+
+    // Store initial values
+    for (const param of this.params) {
+      this.initialValues[param] = target[param]
+    }
+
+    // Hide by default
+    this.gui.domElement.style.display = 'none'
+  }
+
+  // Initialize and show the GUI
+  activate () {
+    if (!this.initialized) {
+      this.loadSavedValues()
+      this.setupControls()
+      this.initialized = true
+    }
+    this.show()
+    return this
+  }
+
+  // Getter for visibility
+  get visible (): boolean {
+    return this._visible
+  }
+
+  // Setter for visibility
+  set visible (value: boolean) {
+    this._visible = value
+    this.gui.domElement.style.display = value ? 'block' : 'none'
+    this.saveVisibility()
+  }
+
+  private loadSavedValues () {
+    try {
+      const saved = localStorage.getItem(this.storageKey)
+      if (saved) {
+        const values = JSON.parse(saved)
+        // Apply saved values to target
+        for (const param of this.params) {
+          if (param in values) {
+            const value = values[param]
+            if (value !== null) {
+              this.target[param] = value
+            }
+          }
+        }
+      }
+    } catch (e) {
+      console.warn('Failed to load debug values:', e)
+    }
+  }
+
+  private saveValues (deleteKey = false) {
+    try {
+      const values = {}
+      for (const param of this.params) {
+        values[param] = this.target[param]
+      }
+      if (deleteKey) {
+        localStorage.removeItem(this.storageKey)
+      } else {
+        localStorage.setItem(this.storageKey, JSON.stringify(values))
+      }
+    } catch (e) {
+      console.warn('Failed to save debug values:', e)
+    }
+  }
+
+  private saveVisibility () {
+    try {
+      localStorage.setItem(`${this.storageKey}_visible`, this._visible.toString())
+    } catch (e) {
+      console.warn('Failed to save debug visibility:', e)
+    }
+  }
+
+  private setupControls () {
+    // Add visibility toggle at the top
+    this.gui.add(this, 'visible').name('Show Controls')
+    this.gui.add({ resetAll: () => {
+      for (const param of this.params) {
+        this.target[param] = this.initialValues[param]
+      }
+      this.saveValues(true)
+      this.gui.destroy()
+      this.gui = new GUI()
+      this.setupControls()
+    } }, 'resetAll').name('Reset All Parameters')
+
+    for (const param of this.params) {
+      const value = this.target[param]
+      const meta = this.paramsMeta[param] ?? {}
+
+      if (typeof value === 'number') {
+        // For numbers, use meta values or calculate reasonable defaults
+        const min = meta.min ?? value - Math.abs(value * 2)
+        const max = meta.max ?? value + Math.abs(value * 2)
+        const step = meta.step ?? Math.abs(value) / 100
+
+        this.gui.add(this.target, param, min, max, step)
+          .onChange(() => this.saveValues())
+      } else if (typeof value === 'boolean') {
+        // For booleans, create a checkbox
+        this.gui.add(this.target, param)
+          .onChange(() => this.saveValues())
+      } else if (typeof value === 'string' && ['x', 'y', 'z'].includes(param)) {
+        // Special case for xyz coordinates
+        const min = meta.min ?? -10
+        const max = meta.max ?? 10
+        const step = meta.step ?? 0.1
+
+        this.gui.add(this.target, param, min, max, step)
+          .onChange(() => this.saveValues())
+      } else if (Array.isArray(value)) {
+        // For arrays, create a dropdown
+        this.gui.add(this.target, param, value)
+          .onChange(() => this.saveValues())
+      }
+    }
+  }
+
+  // Method to manually trigger save
+  save () {
+    this.saveValues()
+    this.saveVisibility()
+  }
+
+  // Method to destroy the GUI and clean up
+  destroy () {
+    this.saveVisibility()
+    this.gui.destroy()
+  }
+
+  // Toggle visibility
+  toggle () {
+    this.visible = !this.visible
+  }
+
+  // Show the GUI
+  show () {
+    this.visible = true
+  }
+
+  // Hide the GUI
+  hide () {
+    this.visible = false
+  }
+}
diff --git a/renderer/viewer/lib/animationController.ts b/renderer/viewer/lib/animationController.ts
new file mode 100644
index 00000000..bfccc72f
--- /dev/null
+++ b/renderer/viewer/lib/animationController.ts
@@ -0,0 +1,75 @@
+import * as tweenJs from '@tweenjs/tween.js'
+
+export class AnimationController {
+  private currentAnimation: tweenJs.Group | null = null
+  private isAnimating = false
+  private cancelRequested = false
+  private completionCallbacks: Array<() => void> = []
+
+  /** Main method */
+  async startAnimation (createAnimation: () => tweenJs.Group): Promise<void> {
+    if (this.isAnimating) {
+      await this.cancelCurrentAnimation()
+    }
+
+    return new Promise((resolve) => {
+      this.isAnimating = true
+      this.cancelRequested = false
+      this.currentAnimation = createAnimation()
+
+      this.completionCallbacks.push(() => {
+        this.isAnimating = false
+        this.currentAnimation = null
+        resolve()
+      })
+    })
+  }
+
+  /** Main method */
+  async cancelCurrentAnimation (): Promise<void> {
+    if (!this.isAnimating) return
+
+    return new Promise((resolve) => {
+      this.cancelRequested = true
+      this.completionCallbacks.push(() => {
+        resolve()
+      })
+    })
+  }
+
+  animationCycleFinish () {
+    if (this.cancelRequested) this.forceFinish()
+  }
+
+  forceFinish () {
+    if (!this.isAnimating) return
+
+    if (this.currentAnimation) {
+      for (const tween of this.currentAnimation.getAll()) tween.stop()
+      this.currentAnimation.removeAll()
+      this.currentAnimation = null
+    }
+
+    this.isAnimating = false
+    this.cancelRequested = false
+
+    const callbacks = [...this.completionCallbacks]
+    this.completionCallbacks = []
+    for (const cb of callbacks) cb()
+  }
+
+  /** Required method */
+  update () {
+    if (this.currentAnimation) {
+      this.currentAnimation.update()
+    }
+  }
+
+  get isActive () {
+    return this.isAnimating
+  }
+
+  get shouldCancel () {
+    return this.cancelRequested
+  }
+}
diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
new file mode 100644
index 00000000..ac36ffec
--- /dev/null
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -0,0 +1,94 @@
+import { EventEmitter } from 'events'
+import { Vec3 } from 'vec3'
+import TypedEmitter from 'typed-emitter'
+import { ItemSelector } from 'mc-assets/dist/itemDefinitions'
+import { proxy } from 'valtio'
+import { HandItemBlock } from './holdingBlock'
+
+export type MovementState = 'NOT_MOVING' | 'WALKING' | 'SPRINTING' | 'SNEAKING'
+export type ItemSpecificContextProperties = Partial<Pick<ItemSelector['properties'], 'minecraft:using_item' | 'minecraft:use_duration' | 'minecraft:use_cycle' | 'minecraft:display_context'>>
+
+
+export type PlayerStateEvents = {
+  heldItemChanged: (item: HandItemBlock | undefined, isLeftHand: boolean) => void
+}
+
+export interface IPlayerState {
+  getEyeHeight(): number
+  getMovementState(): MovementState
+  getVelocity(): Vec3
+  isOnGround(): boolean
+  isSneaking(): boolean
+  isFlying(): boolean
+  isSprinting (): boolean
+  getItemUsageTicks?(): number
+  // isUsingItem?(): boolean
+  getHeldItem?(isLeftHand: boolean): HandItemBlock | undefined
+  username?: string
+  onlineMode?: boolean
+
+  events: TypedEmitter<PlayerStateEvents>
+
+  reactive: {
+    playerSkin: string | undefined
+  }
+}
+
+export class BasePlayerState implements IPlayerState {
+  getItemUsageTicks? (): number {
+    throw new Error('Method not implemented.')
+  }
+  getHeldItem? (isLeftHand: boolean): HandItemBlock | undefined {
+    throw new Error('Method not implemented.')
+  }
+  reactive = proxy({
+    playerSkin: undefined
+  })
+  protected movementState: MovementState = 'NOT_MOVING'
+  protected velocity = new Vec3(0, 0, 0)
+  protected onGround = true
+  protected sneaking = false
+  protected flying = false
+  protected sprinting = false
+  readonly events = new EventEmitter() as TypedEmitter<PlayerStateEvents>
+
+  getEyeHeight (): number {
+    return 1.62
+  }
+
+  getMovementState (): MovementState {
+    return this.movementState
+  }
+
+  getVelocity (): Vec3 {
+    return this.velocity
+  }
+
+  isOnGround (): boolean {
+    return this.onGround
+  }
+
+  isSneaking (): boolean {
+    return this.sneaking
+  }
+
+  isFlying (): boolean {
+    return this.flying
+  }
+
+  isSprinting (): boolean {
+    return this.sprinting
+  }
+
+  // For testing purposes
+  setState (state: Partial<{
+    movementState: MovementState
+    velocity: Vec3
+    onGround: boolean
+    sneaking: boolean
+    flying: boolean
+    sprinting: boolean
+  }>) {
+    Object.assign(this, state)
+  }
+}
diff --git a/renderer/viewer/lib/cameraBobbing.ts b/renderer/viewer/lib/cameraBobbing.ts
new file mode 100644
index 00000000..6bf32c76
--- /dev/null
+++ b/renderer/viewer/lib/cameraBobbing.ts
@@ -0,0 +1,94 @@
+export class CameraBobbing {
+  private walkDistance = 0
+  private prevWalkDistance = 0
+  private bobAmount = 0
+  private prevBobAmount = 0
+  private readonly gameTimer = new GameTimer()
+
+  // eslint-disable-next-line max-params
+  constructor (
+    private readonly BOB_FREQUENCY: number = Math.PI, // How fast the bob cycles
+    private readonly BOB_BASE_AMPLITUDE: number = 0.5, // Base amplitude of the bob
+    private readonly VERTICAL_MULTIPLIER: number = 1, // Vertical movement multiplier
+    private readonly ROTATION_MULTIPLIER_Z: number = 3, // Roll rotation multiplier
+    private readonly ROTATION_MULTIPLIER_X: number = 5 // Pitch rotation multiplier
+  ) {}
+
+  // Call this when player is moving
+  public updateWalkDistance (distance: number): void {
+    this.prevWalkDistance = this.walkDistance
+    this.walkDistance = distance
+  }
+
+  // Call this when player is moving to update bob amount
+  public updateBobAmount (isMoving: boolean): void {
+    const targetBob = isMoving ? 1 : 0
+    this.prevBobAmount = this.bobAmount
+
+    // Update timing
+    const ticks = this.gameTimer.update()
+    const deltaTime = ticks / 20 // Convert ticks to seconds assuming 20 TPS
+
+    // Smooth transition for bob amount
+    const bobDelta = (targetBob - this.bobAmount) * Math.min(1, deltaTime * 10)
+    this.bobAmount += bobDelta
+  }
+
+  // Call this in your render/animation loop
+  public getBobbing (): { position: { x: number, y: number }, rotation: { x: number, z: number } } {
+    // Interpolate walk distance
+    const walkDist = this.prevWalkDistance +
+      (this.walkDistance - this.prevWalkDistance) * this.gameTimer.partialTick
+
+    // Interpolate bob amount
+    const bob = this.prevBobAmount +
+      (this.bobAmount - this.prevBobAmount) * this.gameTimer.partialTick
+
+    // Calculate total distance for bob cycle
+    const totalDist = -(walkDist * this.BOB_FREQUENCY)
+
+    // Calculate offsets
+    const xOffset = Math.sin(totalDist) * bob * this.BOB_BASE_AMPLITUDE
+    const yOffset = -Math.abs(Math.cos(totalDist) * bob) * this.VERTICAL_MULTIPLIER
+
+    // Calculate rotations (in radians)
+    const zRot = (Math.sin(totalDist) * bob * this.ROTATION_MULTIPLIER_Z) * (Math.PI / 180)
+    const xRot = (Math.abs(Math.cos(totalDist - 0.2) * bob) * this.ROTATION_MULTIPLIER_X) * (Math.PI / 180)
+
+    return {
+      position: { x: xOffset, y: yOffset },
+      rotation: { x: xRot, z: zRot }
+    }
+  }
+}
+
+class GameTimer {
+  private readonly msPerTick: number
+  private lastMs: number
+  public partialTick = 0
+
+  constructor (tickRate = 20) {
+    this.msPerTick = 1000 / tickRate
+    this.lastMs = performance.now()
+  }
+
+  update (): number {
+    const currentMs = performance.now()
+    const deltaSinceLastTick = currentMs - this.lastMs
+
+    // Calculate how much of a tick has passed
+    const tickDelta = deltaSinceLastTick / this.msPerTick
+    this.lastMs = currentMs
+
+    // Add to accumulated partial ticks
+    this.partialTick += tickDelta
+
+    // Get whole number of ticks that should occur
+    const wholeTicks = Math.floor(this.partialTick)
+
+    // Keep the remainder as the new partial tick
+    this.partialTick -= wholeTicks
+
+    return wholeTicks
+  }
+}
diff --git a/renderer/viewer/lib/entities.ts b/renderer/viewer/lib/entities.ts
index 72969840..dc918173 100644
--- a/renderer/viewer/lib/entities.ts
+++ b/renderer/viewer/lib/entities.ts
@@ -7,7 +7,6 @@ import * as THREE from 'three'
 import { PlayerObject, PlayerAnimation } from 'skinview3d'
 import { loadSkinToCanvas, loadEarsToCanvasFromSkin, inferModelType, loadCapeToCanvas, loadImage } from 'skinview-utils'
 // todo replace with url
-import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
 import { degreesToRadians } from '@nxg-org/mineflayer-tracker/lib/mathUtils'
 import { NameTagObject } from 'skinview3d/libs/nametag'
 import { flat, fromFormattedString } from '@xmcl/text-component'
@@ -23,6 +22,8 @@ import { disposeObject } from './threeJsUtils'
 import { armorModel, armorTextures } from './entity/armorModels'
 import { Viewer } from './viewer'
 import { getBlockMeshFromModel } from './holdingBlock'
+import { ItemSpecificContextProperties } from './basePlayerState'
+import { loadSkinImage, getLookupUrl, stevePngUrl, steveTexture } from './utils/skins'
 const { loadTexture } = globalThis.isElectron ? require('./utils.electron.js') : require('./utils')
 
 export const TWEEN_DURATION = 120
@@ -217,7 +218,7 @@ export class Entities extends EventEmitter {
   itemsTexture: THREE.Texture | null = null
   cachedMapsImages = {} as Record<number, string>
   itemFrameMaps = {} as Record<number, Array<THREE.Mesh<THREE.PlaneGeometry, THREE.MeshLambertMaterial>>>
-  getItemUv: undefined | ((item: Record<string, any>) => {
+  getItemUv: undefined | ((item: Record<string, any>, specificProps: ItemSpecificContextProperties) => {
     texture: THREE.Texture;
     u: number;
     v: number;
@@ -229,6 +230,20 @@ export class Entities extends EventEmitter {
     modelName: string
   })
 
+  get entitiesByName (): Record<string, SceneEntity[]> {
+    const byName: Record<string, SceneEntity[]> = {}
+    for (const entity of Object.values(this.entities)) {
+      if (!entity['realName']) continue
+      byName[entity['realName']] = byName[entity['realName']] || []
+      byName[entity['realName']].push(entity)
+    }
+    return byName
+  }
+
+  get entitiesRenderingCount (): number {
+    return Object.values(this.entities).filter(entity => entity.visible).length
+  }
+
   constructor (public viewer: Viewer) {
     super()
     this.entitiesOptions = {}
@@ -289,12 +304,12 @@ export class Entities extends EventEmitter {
         const distanceSquared = dx * dx + dy * dy + dz * dz
 
         // Get chunk coordinates
-        const chunkX = Math.floor(entity.position.x / 16)
-        const chunkZ = Math.floor(entity.position.z / 16)
+        const chunkX = Math.floor(entity.position.x / 16) * 16
+        const chunkZ = Math.floor(entity.position.z / 16) * 16
         const chunkKey = `${chunkX},${chunkZ}`
 
         // Entity is visible if within 16 blocks OR in a finished chunk
-        entity.visible = distanceSquared < VISIBLE_DISTANCE || this.viewer.world.finishedChunks[chunkKey]
+        entity.visible = !!(distanceSquared < VISIBLE_DISTANCE || this.viewer.world.finishedChunks[chunkKey])
       }
     }
   }
@@ -304,12 +319,15 @@ export class Entities extends EventEmitter {
     return playerObject
   }
 
-  // fixme workaround
-  defaultSteveTexture
-
   uuidPerSkinUrlsCache = {} as Record<string, { skinUrl?: string, capeUrl?: string }>
 
-  // true means use default skin url
+  private isCanvasBlank (canvas: HTMLCanvasElement): boolean {
+    return !canvas.getContext('2d')
+      ?.getImageData(0, 0, canvas.width, canvas.height).data
+      .some(channel => channel !== 0)
+  }
+
+  // eslint-disable-next-line max-params
   updatePlayerSkin (entityId: string | number, username: string | undefined, uuid: string | undefined, skinUrl: string | true, capeUrl: string | true | undefined = undefined) {
     if (uuid) {
       if (typeof skinUrl === 'string' || typeof capeUrl === 'string') this.uuidPerSkinUrlsCache[uuid] = {}
@@ -321,38 +339,68 @@ export class Entities extends EventEmitter {
       capeUrl ??= this.uuidPerSkinUrlsCache[uuid]?.capeUrl
     }
 
-    let playerObject = this.getPlayerObject(entityId)
+    const playerObject = this.getPlayerObject(entityId)
     if (!playerObject) return
-    // const username = this.entities[entityId].username
-    // or https://mulv.vercel.app/
+
     if (skinUrl === true) {
-      skinUrl = `https://mulv.tycrek.dev/api/lookup?username=${username}&type=skin`
       if (!username) return
+      skinUrl = getLookupUrl(username, 'skin')
     }
-    loadImage(skinUrl).then(image => {
-      playerObject = this.getPlayerObject(entityId)
-      if (!playerObject) return
-      /** @type {THREE.CanvasTexture} */
-      let skinTexture
-      if (skinUrl === stevePng && this.defaultSteveTexture) {
-        skinTexture = this.defaultSteveTexture
-      } else {
-        const skinCanvas = document.createElement('canvas')
-        loadSkinToCanvas(skinCanvas, image)
-        skinTexture = new THREE.CanvasTexture(skinCanvas)
-        if (skinUrl === stevePng) {
-          this.defaultSteveTexture = skinTexture
+
+    if (typeof skinUrl !== 'string') throw new Error('Invalid skin url')
+    void this.loadAndApplySkin(entityId, skinUrl).then(() => {
+      if (capeUrl) {
+        if (capeUrl === true && username) {
+          capeUrl = getLookupUrl(username, 'cape')
+        }
+        if (typeof capeUrl === 'string') {
+          void this.loadAndApplyCape(entityId, capeUrl)
         }
       }
+    })
+
+
+    playerObject.cape.visible = false
+    if (!capeUrl) {
+      playerObject.backEquipment = null
+      playerObject.elytra.map = null
+      if (playerObject.cape.map) {
+        playerObject.cape.map.dispose()
+      }
+      playerObject.cape.map = null
+    }
+  }
+
+  private async loadAndApplySkin (entityId: string | number, skinUrl: string) {
+    let playerObject = this.getPlayerObject(entityId)
+    if (!playerObject) return
+
+    try {
+      let playerCustomSkinImage: HTMLImageElement | undefined
+
+      playerObject = this.getPlayerObject(entityId)
+      if (!playerObject) return
+
+      let skinTexture: THREE.Texture
+      if (skinUrl === stevePngUrl) {
+        skinTexture = await steveTexture
+      } else {
+        const { canvas: skinCanvas, image } = await loadSkinImage(skinUrl)
+        playerCustomSkinImage = image
+        skinTexture = new THREE.CanvasTexture(skinCanvas)
+      }
+
       skinTexture.magFilter = THREE.NearestFilter
       skinTexture.minFilter = THREE.NearestFilter
       skinTexture.needsUpdate = true
-      playerObject.skin.map = skinTexture
+      playerObject.skin.map = skinTexture as any
       playerObject.skin.modelType = inferModelType(skinTexture.image)
 
       const earsCanvas = document.createElement('canvas')
-      loadEarsToCanvasFromSkin(earsCanvas, image)
-      if (isCanvasBlank(earsCanvas)) {
+      if (playerCustomSkinImage) {
+        loadEarsToCanvasFromSkin(earsCanvas, playerCustomSkinImage)
+      }
+      if (this.isCanvasBlank(earsCanvas)) {
         playerObject.ears.map = null
         playerObject.ears.visible = false
       } else {
@@ -365,47 +413,38 @@ export class Entities extends EventEmitter {
         playerObject.ears.visible = true
       }
       this.onSkinUpdate?.()
-      if (capeUrl) {
-        if (capeUrl === true) capeUrl = `https://mulv.tycrek.dev/api/lookup?username=${username}&type=cape`
-        loadImage(capeUrl).then(capeImage => {
-          playerObject = this.getPlayerObject(entityId)
-          if (!playerObject) return
-          const capeCanvas = document.createElement('canvas')
-          loadCapeToCanvas(capeCanvas, capeImage)
-
-          const capeTexture = new THREE.CanvasTexture(capeCanvas)
-          capeTexture.magFilter = THREE.NearestFilter
-          capeTexture.minFilter = THREE.NearestFilter
-          capeTexture.needsUpdate = true
-          //@ts-expect-error
-          playerObject.cape.map = capeTexture
-          playerObject.cape.visible = true
-          //@ts-expect-error
-          playerObject.elytra.map = capeTexture
-          this.onSkinUpdate?.()
-
-          if (!playerObject.backEquipment) {
-            playerObject.backEquipment = 'cape'
-          }
-        }, () => { })
-      }
-    }, () => { })
-
-
-    playerObject.cape.visible = false
-    if (!capeUrl) {
-      playerObject.backEquipment = null
-      playerObject.elytra.map = null
-      if (playerObject.cape.map) {
-        playerObject.cape.map.dispose()
-      }
-      playerObject.cape.map = null
+    } catch (error) {
+      console.error('Error loading skin:', error)
     }
+  }
 
-    function isCanvasBlank (canvas) {
-      return !canvas.getContext('2d')
-        .getImageData(0, 0, canvas.width, canvas.height).data
-        .some(channel => channel !== 0)
+  private async loadAndApplyCape (entityId: string | number, capeUrl: string) {
+    let playerObject = this.getPlayerObject(entityId)
+    if (!playerObject) return
+
+    try {
+      const { canvas: capeCanvas, image: capeImage } = await loadSkinImage(capeUrl)
+
+      playerObject = this.getPlayerObject(entityId)
+      if (!playerObject) return
+
+      loadCapeToCanvas(capeCanvas, capeImage)
+      const capeTexture = new THREE.CanvasTexture(capeCanvas)
+      capeTexture.magFilter = THREE.NearestFilter
+      capeTexture.minFilter = THREE.NearestFilter
+      capeTexture.needsUpdate = true
+      //@ts-expect-error
+      playerObject.cape.map = capeTexture
+      playerObject.cape.visible = true
+      //@ts-expect-error
+      playerObject.elytra.map = capeTexture
+      this.onSkinUpdate?.()
+
+      if (!playerObject.backEquipment) {
+        playerObject.backEquipment = 'cape'
+      }
+    } catch (error) {
+      console.error('Error loading cape:', error)
     }
   }
 
@@ -447,11 +486,11 @@ export class Entities extends EventEmitter {
     return typeof component === 'string' ? component : component.text ?? ''
   }
 
-  getItemMesh (item, isDropped = false) {
-    const textureUv = this.getItemUv?.(item)
+  getItemMesh (item, specificProps: ItemSpecificContextProperties) {
+    const textureUv = this.getItemUv?.(item, specificProps)
     if (textureUv && 'resolvedModel' in textureUv) {
       const mesh = getBlockMeshFromModel(this.viewer.world.material, textureUv.resolvedModel, textureUv.modelName)
-      if (isDropped) {
+      if (specificProps['minecraft:display_context'] === 'ground') {
         const SCALE = 0.5
         mesh.scale.set(SCALE, SCALE, SCALE)
         mesh.position.set(0, 0.2, 0)
@@ -547,7 +586,9 @@ export class Entities extends EventEmitter {
       if (entity.name === 'item') {
         const item = entity.metadata?.find((m: any) => typeof m === 'object' && m?.itemCount)
         if (item) {
-          const object = this.getItemMesh(item, true)
+          const object = this.getItemMesh(item, {
+            'minecraft:display_context': 'ground',
+          })
           if (object) {
             mesh = object.mesh
             mesh.scale.set(0.5, 0.5, 0.5)
@@ -627,12 +668,14 @@ export class Entities extends EventEmitter {
       this.viewer.scene.add(group)
 
       e = group
+      e.name = 'entity'
+      e['realName'] = entity.name
       this.entities[entity.id] = e
 
       this.emit('add', entity)
 
       if (isPlayerModel) {
-        this.updatePlayerSkin(entity.id, entity.username, entity.uuid, overrides?.texture || stevePng)
+        this.updatePlayerSkin(entity.id, entity.username, entity.uuid, overrides?.texture || stevePngUrl)
       }
       this.setDebugMode(this.debugMode, group)
       this.setRendering(this.rendering, group)
@@ -781,7 +824,9 @@ export class Entities extends EventEmitter {
           mesh.scale.set(16 / 12, 16 / 12, 1)
           this.addMapModel(e, mapNumber, rotation)
         } else {
-          const itemMesh = this.getItemMesh(item)
+          const itemMesh = this.getItemMesh(item, {
+            'minecraft:display_context': 'fixed',
+          })
           if (itemMesh) {
             itemMesh.mesh.position.set(0, 0, 0.43)
             itemMesh.mesh.scale.set(0.5, 0.5, 0.5)
@@ -945,7 +990,7 @@ function addArmorModel (entityMesh: THREE.Object3D, slotType: string, item: Item
         console.error('Error decoding player head texture:', err)
       }
     } else {
-      texturePath = stevePng
+      texturePath = stevePngUrl
     }
   }
   const armorMaterial = itemParts[0]
diff --git a/renderer/viewer/lib/entity/EntityMesh.ts b/renderer/viewer/lib/entity/EntityMesh.ts
index 37a77e3d..1f38f471 100644
--- a/renderer/viewer/lib/entity/EntityMesh.ts
+++ b/renderer/viewer/lib/entity/EntityMesh.ts
@@ -2,6 +2,8 @@ import * as THREE from 'three'
 import { OBJLoader } from 'three-stdlib'
 import huskPng from 'mc-assets/dist/other-textures/latest/entity/zombie/husk.png'
 import { Vec3 } from 'vec3'
+import spectralArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/spectral_arrow.png'
+import tippedArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/tipped_arrow.png'
 import { WorldRendererCommon } from '../worldrendererCommon'
 import entities from './entities.json'
 import { externalModels } from './objModels'
@@ -457,6 +459,13 @@ export class EntityMesh {
       return
     }
 
+    // if (originalType === 'arrow') {
+    //   overrides.textures = {
+    //     'default': arrowTexture,
+    //     ...overrides.textures,
+    //   }
+    // }
+
     const e = getEntity(type)
     if (!e) {
       if (knownNotHandled.includes(type)) return
diff --git a/renderer/viewer/lib/hand.ts b/renderer/viewer/lib/hand.ts
index 6c9aacc5..3743aca9 100644
--- a/renderer/viewer/lib/hand.ts
+++ b/renderer/viewer/lib/hand.ts
@@ -1,32 +1,21 @@
 import * as THREE from 'three'
 import { loadSkinToCanvas } from 'skinview-utils'
-import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
+import { getLookupUrl, loadSkinImage, steveTexture } from './utils/skins'
 
-let steveTexture: THREE.Texture
-export const getMyHand = async (image?: string) => {
+export const getMyHand = async (image?: string, userName?: string) => {
   let newMap: THREE.Texture
-  if (!image && steveTexture) {
-    newMap = steveTexture
+  if (!image && !userName) {
+    newMap = await steveTexture
   } else {
-    image ??= stevePng
-    const skinCanvas = document.createElement('canvas')
-    const img = new Image()
-    img.src = image
-    await new Promise<void>(resolve => {
-      img.onload = () => {
-        resolve()
-      }
-    })
-    loadSkinToCanvas(skinCanvas, img)
-    newMap = new THREE.CanvasTexture(skinCanvas)
-    // newMap.flipY = false
-    newMap.magFilter = THREE.NearestFilter
-    newMap.minFilter = THREE.NearestFilter
     if (!image) {
-      steveTexture = newMap
+      image = getLookupUrl(userName!, 'skin')
     }
+    const { canvas } = await loadSkinImage(image)
+    newMap = new THREE.CanvasTexture(canvas)
   }
 
+  newMap.magFilter = THREE.NearestFilter
+  newMap.minFilter = THREE.NearestFilter
   // right arm
   const box = new THREE.BoxGeometry()
   const material = new THREE.MeshStandardMaterial()
diff --git a/renderer/viewer/lib/holdingBlock.ts b/renderer/viewer/lib/holdingBlock.ts
index 641a2813..2acab1a5 100644
--- a/renderer/viewer/lib/holdingBlock.ts
+++ b/renderer/viewer/lib/holdingBlock.ts
@@ -1,10 +1,15 @@
 import * as THREE from 'three'
 import * as tweenJs from '@tweenjs/tween.js'
 import worldBlockProvider from 'mc-assets/dist/worldBlockProvider'
-import { GUI } from 'lil-gui'
 import { BlockModel } from 'mc-assets'
 import { getThreeBlockModelGroup, renderBlockThree, setBlockPosition } from './mesher/standaloneRenderer'
 import { getMyHand } from './hand'
+import { IPlayerState, MovementState } from './basePlayerState'
+import { DebugGui } from './DebugGui'
+import { SmoothSwitcher } from './smoothSwitcher'
+import { watchProperty } from './utils/proxy'
+import { disposeObject } from './threeJsUtils'
+import { WorldRendererConfig } from './worldrendererCommon'
 
 export type HandItemBlock = {
   name?
@@ -14,13 +19,83 @@ export type HandItemBlock = {
   id?: number
 }
 
+const rotationPositionData = {
+  itemRight: {
+    'rotation': [
+      0,
+      -90,
+      25
+    ],
+    'translation': [
+      1.13,
+      3.2,
+      1.13
+    ],
+    'scale': [
+      0.68,
+      0.68,
+      0.68
+    ]
+  },
+  itemLeft: {
+    'rotation': [
+      0,
+      90,
+      -25
+    ],
+    'translation': [
+      1.13,
+      3.2,
+      1.13
+    ],
+    'scale': [
+      0.68,
+      0.68,
+      0.68
+    ]
+  },
+  blockRight: {
+    'rotation': [
+      0,
+      45,
+      0
+    ],
+    'translation': [
+      0,
+      0,
+      0
+    ],
+    'scale': [
+      0.4,
+      0.4,
+      0.4
+    ]
+  },
+  blockLeft: {
+    'rotation': [
+      0,
+      225,
+      0
+    ],
+    'translation': [
+      0,
+      0,
+      0
+    ],
+    'scale': [
+      0.4,
+      0.4,
+      0.4
+    ]
+  }
+}
+
 export default class HoldingBlock {
   // TODO refactor with the tree builder for better visual understanding
   holdingBlock: THREE.Object3D | undefined = undefined
-  swingAnimation: tweenJs.Group | undefined = undefined
   blockSwapAnimation: {
-    tween: tweenJs.Group
-    hidden: boolean
+    switcher: SmoothSwitcher
+    // hidden: boolean
   } | undefined = undefined
   cameraGroup = new THREE.Mesh()
   objectOuterGroup = new THREE.Group() // 3
@@ -29,15 +104,55 @@ export default class HoldingBlock {
   camera = new THREE.PerspectiveCamera(75, 1, 0.1, 100)
   stopUpdate = false
   lastHeldItem: HandItemBlock | undefined
-  toBeRenderedItem: HandItemBlock | undefined
   isSwinging = false
   nextIterStopCallbacks: Array<() => void> | undefined
-  rightSide = true
+  idleAnimator: HandIdleAnimator | undefined
+  ready = false
+  lastUpdate = 0
+  playerHand: THREE.Object3D | undefined
+  offHandDisplay = false
+  offHandModeLegacy = false
 
-  debug = {} as Record<string, any>
+  swingAnimator: HandSwingAnimator | undefined
 
-  constructor () {
+  constructor (public playerState: IPlayerState, public config: WorldRendererConfig, public offHand = false) {
     this.initCameraGroup()
+
+    this.playerState.events.on('heldItemChanged', (_, isOffHand) => {
+      if (this.offHand !== isOffHand) return
+      this.updateItem()
+    })
+
+    this.offHandDisplay = this.offHand
+    // this.offHandDisplay = true
+    if (!this.offHand) {
+      // watch over my hand
+      watchProperty(
+        async () => {
+          return getMyHand(this.playerState.reactive.playerSkin, this.playerState.onlineMode ? this.playerState.username : undefined)
+        },
+        this.playerState.reactive,
+        'playerSkin',
+        (newHand) => {
+          this.playerHand = newHand
+        },
+        (oldHand) => {
+          disposeObject(oldHand, true)
+        }
+      )
+    }
+  }
+
+  updateItem () {
+    if (!this.ready || !this.playerState.getHeldItem) return
+    const item = this.playerState.getHeldItem(this.offHand)
+    if (item) {
+      void this.setNewItem(item)
+    } else if (!this.offHand) {
+      void this.setNewItem({
+        type: 'hand',
+      })
+    }
   }
 
   initCameraGroup () {
@@ -45,117 +160,28 @@ export default class HoldingBlock {
   }
 
   startSwing () {
-    this.nextIterStopCallbacks = undefined // forget about cancelling
-    if (this.isSwinging) return
-    this.swingAnimation = new tweenJs.Group()
-    this.isSwinging = true
-    const cube = this.cameraGroup.children[0]
-    if (cube) {
-      // const DURATION = 1000 * 0.35 / 2
-      const DURATION = 1000 * 0.35 / 3
-      // const DURATION = 1000
-      const { position, rotation, object } = this.getFinalSwingPositionRotation()
-      const initialPos = {
-        x: object.position.x,
-        y: object.position.y,
-        z: object.position.z
-      }
-      const initialRot = {
-        x: object.rotation.x,
-        y: object.rotation.y,
-        z: object.rotation.z
-      }
-      const mainAnim = new tweenJs.Tween(object.position, this.swingAnimation).to(position, DURATION).yoyo(true).repeat(Infinity).start()
-      let i = 0
-      mainAnim.onRepeat(() => {
-        i++
-        if (this.nextIterStopCallbacks && i % 2 === 0) {
-          for (const callback of this.nextIterStopCallbacks) {
-            callback()
-          }
-          this.nextIterStopCallbacks = undefined
-          this.isSwinging = false
-          this.swingAnimation!.removeAll()
-          this.swingAnimation = undefined
-          // todo refactor to be more generic for animations
-          object.position.set(initialPos.x, initialPos.y, initialPos.z)
-          // object.rotation.set(initialRot.x, initialRot.y, initialRot.z)
-          Object.assign(object.rotation, initialRot)
-        }
-      })
-
-      new tweenJs.Tween(object.rotation, this.swingAnimation).to(rotation, DURATION).yoyo(true).repeat(Infinity).start()
-    }
+    this.swingAnimator?.startSwing()
   }
 
-  getFinalSwingPositionRotation (origPosition?: THREE.Vector3) {
-    const object = this.objectInnerGroup
-    if (this.lastHeldItem?.type === 'block') {
-      origPosition ??= object.position
-      return {
-        position: { y: origPosition.y - this.objectInnerGroup.scale.y / 2 },
-        rotation: { z: THREE.MathUtils.degToRad(90), x: -THREE.MathUtils.degToRad(90) },
-        object
-      }
-    }
-    if (this.lastHeldItem?.type === 'item') {
-      const object = this.holdingBlockInnerGroup
-      origPosition ??= object.position
-      return {
-        position: {
-          y: origPosition.y - object.scale.y * 2,
-          // z: origPosition.z - window.zFinal,
-          // x: origPosition.x - window.xFinal,
-        },
-        // rotation: { z: THREE.MathUtils.degToRad(90), x: -THREE.MathUtils.degToRad(90) }
-        rotation: {
-          // z: THREE.MathUtils.degToRad(window.zRotationFinal ?? 0),
-          // x: THREE.MathUtils.degToRad(window.xRotationFinal ?? 0),
-          // y: THREE.MathUtils.degToRad(window.yRotationFinal ?? 0),
-          x: THREE.MathUtils.degToRad(-120)
-        },
-        object
-      }
-    }
-    if (this.lastHeldItem?.type === 'hand') {
-      const object = this.holdingBlockInnerGroup
-      origPosition ??= object.position
-      return {
-        position: {
-          y: origPosition.y - (window.yFinal ?? 0.15),
-          z: origPosition.z - window.zFinal,
-          x: origPosition.x - window.xFinal,
-        },
-        rotation: {
-          x: THREE.MathUtils.degToRad(window.xRotationFinal || -14.7),
-          y: THREE.MathUtils.degToRad(window.yRotationFinal || 33.95),
-          z: THREE.MathUtils.degToRad(window.zRotationFinal || -28),
-        },
-        object
-      }
-    }
-    return {
-      position: {},
-      rotation: {},
-      object
-    }
-  }
-
-  async stopSwing () {
-    if (!this.isSwinging) return
-    // might never resolve!
-    /* return */void new Promise<void>((resolve) => {
-      this.nextIterStopCallbacks ??= []
-      this.nextIterStopCallbacks.push(() => {
-        resolve()
-      })
-    })
+  stopSwing () {
+    this.swingAnimator?.stopSwing()
   }
 
   render (originalCamera: THREE.PerspectiveCamera, renderer: THREE.WebGLRenderer, ambientLight: THREE.AmbientLight, directionalLight: THREE.DirectionalLight) {
     if (!this.lastHeldItem) return
-    this.swingAnimation?.update()
-    this.blockSwapAnimation?.tween.update()
+    const now = performance.now()
+    if (this.lastUpdate && now - this.lastUpdate > 50) { // one tick
+      void this.replaceItemModel(this.lastHeldItem)
+    }
+
+    // Only update idle animation if not swinging
+    if (this.swingAnimator?.isCurrentlySwinging() || this.swingAnimator?.debugParams.animationStage) {
+      this.swingAnimator?.update()
+    } else {
+      this.idleAnimator?.update()
+    }
+
+    this.blockSwapAnimation?.switcher.update()
 
     const scene = new THREE.Scene()
     scene.add(this.cameraGroup)
@@ -169,18 +195,30 @@ export default class HoldingBlock {
 
     const viewerSize = renderer.getSize(new THREE.Vector2())
     const minSize = Math.min(viewerSize.width, viewerSize.height)
+    const x = viewerSize.width - minSize
+
+    // Mirror the scene for offhand by scaling
+    const { offHandDisplay } = this
+    if (offHandDisplay) {
+      this.cameraGroup.scale.x = -1
+    }
 
     renderer.autoClear = false
     renderer.clearDepth()
-    if (this.rightSide) {
+    if (this.offHandDisplay) {
+      renderer.setViewport(0, 0, minSize, minSize)
+    } else {
       const x = viewerSize.width - minSize
       // if (x) x -= x / 4
       renderer.setViewport(x, 0, minSize, minSize)
-    } else {
-      renderer.setViewport(0, 0, minSize, minSize)
     }
     renderer.render(scene, this.camera)
     renderer.setViewport(0, 0, viewerSize.width, viewerSize.height)
+
+    // Reset the mirroring after rendering
+    if (offHandDisplay) {
+      this.cameraGroup.scale.x = 1
+    }
   }
 
   // worldTest () {
@@ -197,30 +235,46 @@ export default class HoldingBlock {
   //   new tweenJs.Tween(group.rotation).to({ z: THREE.MathUtils.degToRad(90) }, 1000).yoyo(true).repeat(Infinity).start()
   // }
 
-  async playBlockSwapAnimation () {
-    // if (this.blockSwapAnimation) return
+  async playBlockSwapAnimation (forceState?: 'appeared' | 'disappeared') {
     this.blockSwapAnimation ??= {
-      tween: new tweenJs.Group(),
-      hidden: false
-    }
-    const DURATION = 1000 * 0.35 / 2
-    const tween = new tweenJs.Tween(this.objectInnerGroup.position, this.blockSwapAnimation.tween).to({
-      y: this.objectInnerGroup.position.y + (this.objectInnerGroup.scale.y * 1.5 * (this.blockSwapAnimation.hidden ? 1 : -1))
-    }, DURATION).start()
-    return new Promise<void>((resolve) => {
-      tween.onComplete(() => {
-        if (this.blockSwapAnimation!.hidden) {
-          this.blockSwapAnimation = undefined
-        } else {
-          this.blockSwapAnimation!.hidden = !this.blockSwapAnimation!.hidden
+      switcher: new SmoothSwitcher(
+        () => ({
+          y: this.objectInnerGroup.position.y
+        }),
+        (property, value) => {
+          if (property === 'y') this.objectInnerGroup.position.y = value
+        },
+        {
+          y: 16 // units per second
         }
-        resolve()
-      })
+      )
+    }
+
+    const newState = this.blockSwapAnimation.switcher.currentStateName === 'disappeared' ? 'appeared' : 'disappeared'
+    if (forceState && newState !== forceState) throw new Error(`forceState does not match current state ${newState} !== ${forceState}`)
+
+    const targetY = this.objectInnerGroup.position.y + (this.objectInnerGroup.scale.y * 1.5 * (newState === 'appeared' ? 1 : -1))
+
+    if (newState === this.blockSwapAnimation.switcher.transitioningToStateName) {
+      return false
+    }
+
+    return new Promise<boolean>((resolve) => {
+      this.blockSwapAnimation!.switcher.transitionTo(
+        { y: targetY },
+        newState,
+        () => {
+          resolve(true)
+        },
+        () => {
+          resolve(false)
+        }
+      )
     })
   }
 
   isDifferentItem (block: HandItemBlock | undefined) {
-    return this.lastHeldItem && (this.lastHeldItem.name !== block?.name || JSON.stringify(this.lastHeldItem.properties) !== JSON.stringify(block?.properties ?? '{}'))
+    return !this.lastHeldItem || (this.lastHeldItem.name !== block?.name || JSON.stringify(this.lastHeldItem.fullItem) !== JSON.stringify(block?.fullItem ?? '{}'))
   }
 
   updateCameraGroup () {
@@ -237,7 +291,7 @@ export default class HoldingBlock {
     // Adjust the position based on the aspect ratio
     const { position, scale: scaleData } = this.getHandHeld3d()
     const distance = -position.z
-    const side = this.rightSide ? 1 : -1
+    const side = this.offHandModeLegacy ? -1 : 1
     this.objectOuterGroup.position.set(
       distance * position.x * aspect * side,
       distance * position.y,
@@ -249,27 +303,19 @@ export default class HoldingBlock {
     this.objectOuterGroup.scale.set(scale, scale, scale)
   }
 
-  async initHandObject (handItem?: HandItemBlock) {
-    let animatingCurrent = false
-    if (!this.swingAnimation && !this.blockSwapAnimation && this.isDifferentItem(handItem)) {
-      animatingCurrent = true
-      await this.playBlockSwapAnimation()
-      this.holdingBlock?.removeFromParent()
-      this.holdingBlock = undefined
-    }
-    this.lastHeldItem = handItem
-    if (!handItem) {
-      this.holdingBlock?.removeFromParent()
-      this.holdingBlock = undefined
-      this.swingAnimation = undefined
-      this.blockSwapAnimation = undefined
-      return
-    }
-    let blockInner
+  private async createItemModel (handItem: HandItemBlock): Promise<{ model: THREE.Object3D; type: 'hand' | 'block' | 'item' } | undefined> {
+    this.lastUpdate = performance.now()
+    if (!handItem || (handItem.type === 'hand' && !this.playerHand)) return undefined
+
+    let blockInner: THREE.Object3D
     if (handItem.type === 'item' || handItem.type === 'block') {
       const { mesh: itemMesh, isBlock } = viewer.entities.getItemMesh({
         ...handItem.fullItem,
         itemId: handItem.id,
+      }, {
+        'minecraft:display_context': 'firstperson',
+        'minecraft:use_duration': this.playerState.getItemUsageTicks?.(),
+        'minecraft:using_item': !!this.playerState.getItemUsageTicks?.(),
       })!
       if (isBlock) {
         blockInner = itemMesh
@@ -280,20 +326,73 @@ export default class HoldingBlock {
         handItem.type = 'item'
       }
     } else {
-      blockInner = await getMyHand()
+      blockInner = this.playerHand!
     }
     blockInner.name = 'holdingBlock'
+
+    const rotationDeg = this.getHandHeld3d().rotation
+    blockInner.rotation.x = THREE.MathUtils.degToRad(rotationDeg.x)
+    blockInner.rotation.y = THREE.MathUtils.degToRad(rotationDeg.y)
+    blockInner.rotation.z = THREE.MathUtils.degToRad(rotationDeg.z)
+
+    return { model: blockInner, type: handItem.type }
+  }
+
+  async replaceItemModel (handItem?: HandItemBlock): Promise<void> {
+    if (!handItem) {
+      this.holdingBlock?.removeFromParent()
+      this.holdingBlock = undefined
+      this.swingAnimator?.stopSwing()
+      this.swingAnimator = undefined
+      this.idleAnimator = undefined
+      return
+    }
+
+    const result = await this.createItemModel(handItem)
+    if (!result) return
+
+    // Update the model without changing the group structure
+    this.holdingBlock?.removeFromParent()
+    this.holdingBlock = result.model
+    this.holdingBlockInnerGroup.add(result.model)
+
+
+  }
+
+  async setNewItem (handItem?: HandItemBlock) {
+    if (!this.isDifferentItem(handItem)) return
+    let playAppearAnimation = false
+    if (this.holdingBlock) {
+      // play disappear animation
+      playAppearAnimation = true
+      const result = await this.playBlockSwapAnimation()
+      if (!result) return
+      this.holdingBlock?.removeFromParent()
+      this.holdingBlock = undefined
+    }
+
+    this.lastHeldItem = handItem
+    if (!handItem) {
+      this.swingAnimator?.stopSwing()
+      this.swingAnimator = undefined
+      this.idleAnimator = undefined
+      this.blockSwapAnimation = undefined
+      return
+    }
+
+    const result = await this.createItemModel(handItem)
+    if (!result) return
+
     const blockOuterGroup = new THREE.Group()
     this.holdingBlockInnerGroup.removeFromParent()
     this.holdingBlockInnerGroup = new THREE.Group()
-    this.holdingBlockInnerGroup.add(blockInner)
+    this.holdingBlockInnerGroup.add(result.model)
     blockOuterGroup.add(this.holdingBlockInnerGroup)
-    this.holdingBlock = blockInner
+    this.holdingBlock = result.model
     this.objectInnerGroup = new THREE.Group()
     this.objectInnerGroup.add(blockOuterGroup)
     this.objectInnerGroup.position.set(-0.5, -0.5, -0.5)
-    // todo cleanup
-    if (animatingCurrent) {
+    if (playAppearAnimation) {
       this.objectInnerGroup.position.y -= this.objectInnerGroup.scale.y * 1.5
     }
     Object.assign(blockOuterGroup.position, { x: 0.5, y: 0.5, z: 0.5 })
@@ -303,116 +402,466 @@ export default class HoldingBlock {
 
     this.cameraGroup.add(this.objectOuterGroup)
     const rotationDeg = this.getHandHeld3d().rotation
-    let origPosition
-    const setRotation = () => {
-      const final = this.getFinalSwingPositionRotation(origPosition)
-      origPosition ??= final.object.position.clone()
-      if (this.debug.displayFinal) {
-        Object.assign(final.object.position, final.position)
-        Object.assign(final.object.rotation, final.rotation)
-      } else if (this.debug.displayFinal === false) {
-        final.object.rotation.set(0, 0, 0)
-      }
+    this.objectOuterGroup.rotation.y = THREE.MathUtils.degToRad(rotationDeg.yOuter)
 
-      this.holdingBlock!.rotation.x = THREE.MathUtils.degToRad(rotationDeg.x)
-      this.holdingBlock!.rotation.y = THREE.MathUtils.degToRad(rotationDeg.y)
-      this.holdingBlock!.rotation.z = THREE.MathUtils.degToRad(rotationDeg.z)
-      this.objectOuterGroup.rotation.y = THREE.MathUtils.degToRad(rotationDeg.yOuter)
+    if (playAppearAnimation) {
+      await this.playBlockSwapAnimation('appeared')
     }
-    // const gui = new GUI()
-    // gui.add(rotationDeg, 'x', -180, 180, 0.1)
-    // gui.add(rotationDeg, 'y', -180, 180, 0.1)
-    // gui.add(rotationDeg, 'z', -180, 180, 0.1)
-    // gui.add(rotationDeg, 'yOuter', -180, 180, 0.1)
-    // Object.assign(window, { xFinal: 0, yFinal: 0, zFinal: 0, xRotationFinal: 0, yRotationFinal: 0, zRotationFinal: 0, displayFinal: true })
-    // gui.add(window, 'xFinal', -10, 10, 0.05)
-    // gui.add(window, 'yFinal', -10, 10, 0.05)
-    // gui.add(window, 'zFinal', -10, 10, 0.05)
-    // gui.add(window, 'xRotationFinal', -180, 180, 0.05)
-    // gui.add(window, 'yRotationFinal', -180, 180, 0.05)
-    // gui.add(window, 'zRotationFinal', -180, 180, 0.05)
-    // gui.add(window, 'displayFinal')
-    // gui.onChange(setRotation)
-    setRotation()
 
-    if (animatingCurrent) {
-      await this.playBlockSwapAnimation()
+    this.swingAnimator = new HandSwingAnimator(this.holdingBlockInnerGroup)
+    this.swingAnimator.type = result.type
+    if (this.config.viewBobbing) {
+      this.idleAnimator = new HandIdleAnimator(this.holdingBlockInnerGroup, this.playerState)
     }
   }
 
   getHandHeld3d () {
     const type = this.lastHeldItem?.type ?? 'hand'
-    const { debug } = this
+    const side = this.offHandModeLegacy ? 'Left' : 'Right'
 
-    let scale = type === 'item' ? 0.68 : 0.45
-
-    const position = {
-      x: debug.x ?? 0.4,
-      y: debug.y ?? -0.7,
+    let scale = 0.8 * 1.15 // default scale for hand
+    let position = {
+      x: 0.4,
+      y: -0.7,
       z: -0.45
     }
+    let rotation = {
+      x: -32.4,
+      y: 42.8,
+      z: -41.3,
+      yOuter: 0
+    }
 
     if (type === 'item') {
-      position.x = -0.05
-      // position.y -= 3.2 / 10
-      // position.z += 1.13 / 10
-    }
-
-    if (type === 'hand') {
-      // position.x = viewer.camera.aspect > 1 ? 0.7 : 1.1
-      position.y = -0.8
-      scale = 0.8
-    }
-
-    const rotations = {
-      block: {
-        x: 0,
-        y: -45 + 90,
-        z: 0,
-        yOuter: 0
-      },
-      // hand: {
-      //   x: 166.7,
-      //   // y: -180,
-      //   y: -165.2,
-      //   // z: -156.3,
-      //   z: -134.2,
-      //   yOuter: -81.1
-      // },
-      hand: {
-        x: -32.4,
-        // y: 25.1
-        y: 42.8,
-        z: -41.3,
-        yOuter: 0
-      },
-      // item: {
-      //   x: -174,
-      //   y: 47.3,
-      //   z: -134.2,
-      //   yOuter: -41.2
-      // }
-      item: {
-        // x: -174,
-        // y: 47.3,
-        // z: -134.2,
-        // yOuter: -41.2
-        x: 0,
-        // y: -90, // todo thats the correct one but we don't make it look too cheap because of no depth
-        y: -70,
-        z: window.z ?? 25,
+      const itemData = rotationPositionData[`item${side}`]
+      position = {
+        x: -0.05,
+        y: -0.7,
+        z: -0.45
+      }
+      rotation = {
+        x: itemData.rotation[0],
+        y: itemData.rotation[1],
+        z: itemData.rotation[2],
         yOuter: 0
       }
+      scale = itemData.scale[0] * 1.15
+    } else if (type === 'block') {
+      const blockData = rotationPositionData[`block${side}`]
+      position = {
+        x: 0.4,
+        y: -0.7,
+        z: -0.45
+      }
+      rotation = {
+        x: blockData.rotation[0],
+        y: blockData.rotation[1],
+        z: blockData.rotation[2],
+        yOuter: 0
+      }
+      scale = blockData.scale[0] * 1.15
     }
 
     return {
-      rotation: rotations[type],
+      rotation,
       position,
       scale
     }
   }
 }
 
+class HandIdleAnimator {
+  globalTime = 0
+  lastTime = 0
+  currentState: MovementState
+  targetState: MovementState
+  defaultPosition: { x: number; y: number; z: number; rotationX: number; rotationY: number; rotationZ: number }
+  private readonly idleOffset = { y: 0, rotationZ: 0 }
+  private readonly tween = new tweenJs.Group()
+  private idleTween: tweenJs.Tween<{ y: number; rotationZ: number }> | null = null
+  private readonly stateSwitcher: SmoothSwitcher
+
+  // Debug parameters
+  private readonly debugParams = {
+    // Transition durations for different state changes
+    walkingSpeed: 8,
+    sprintingSpeed: 16,
+    walkingAmplitude: { x: 1 / 30, y: 1 / 10, rotationZ: 0.25 },
+    sprintingAmplitude: { x: 1 / 30, y: 1 / 10, rotationZ: 0.4 }
+  }
+
+  private readonly debugGui: DebugGui
+
+  constructor (public handMesh: THREE.Object3D, public playerState: IPlayerState) {
+    this.handMesh = handMesh
+    this.globalTime = 0
+    this.currentState = 'NOT_MOVING'
+    this.targetState = 'NOT_MOVING'
+
+    this.defaultPosition = {
+      x: handMesh.position.x,
+      y: handMesh.position.y,
+      z: handMesh.position.z,
+      rotationX: handMesh.rotation.x,
+      rotationY: handMesh.rotation.y,
+      rotationZ: handMesh.rotation.z
+    }
+
+    // Initialize state switcher with appropriate speeds
+    this.stateSwitcher = new SmoothSwitcher(
+      () => {
+        return {
+          x: this.handMesh.position.x,
+          y: this.handMesh.position.y,
+          z: this.handMesh.position.z,
+          rotationX: this.handMesh.rotation.x,
+          rotationY: this.handMesh.rotation.y,
+          rotationZ: this.handMesh.rotation.z
+        }
+      },
+      (property, value) => {
+        switch (property) {
+          case 'x': this.handMesh.position.x = value; break
+          case 'y': this.handMesh.position.y = value; break
+          case 'z': this.handMesh.position.z = value; break
+          case 'rotationX': this.handMesh.rotation.x = value; break
+          case 'rotationY': this.handMesh.rotation.y = value; break
+          case 'rotationZ': this.handMesh.rotation.z = value; break
+        }
+      },
+      {
+        x: 2, // units per second
+        y: 2,
+        z: 2,
+        rotation: Math.PI // radians per second
+      }
+    )
+
+    // Initialize debug GUI
+    this.debugGui = new DebugGui('idle_animator', this.debugParams)
+    // this.debugGui.activate()
+  }
+
+  private startIdleAnimation () {
+    if (this.idleTween) {
+      this.idleTween.stop()
+    }
+
+    // Start from current position for smooth transition
+    this.idleOffset.y = this.handMesh.position.y - this.defaultPosition.y
+    this.idleOffset.rotationZ = this.handMesh.rotation.z - this.defaultPosition.rotationZ
+
+    this.idleTween = new tweenJs.Tween(this.idleOffset, this.tween)
+      .to({
+        y: 0.05,
+        rotationZ: 0.05
+      }, 3000)
+      .easing(tweenJs.Easing.Sinusoidal.InOut)
+      .yoyo(true)
+      .repeat(Infinity)
+      .start()
+  }
+
+  private stopIdleAnimation () {
+    if (this.idleTween) {
+      this.idleTween.stop()
+      this.idleOffset.y = 0
+      this.idleOffset.rotationZ = 0
+    }
+  }
+
+  private getStateTransform (state: MovementState, time: number) {
+    switch (state) {
+      case 'NOT_MOVING':
+      case 'SNEAKING':
+        return {
+          x: this.defaultPosition.x,
+          y: this.defaultPosition.y,
+          z: this.defaultPosition.z,
+          rotationX: this.defaultPosition.rotationX,
+          rotationY: this.defaultPosition.rotationY,
+          rotationZ: this.defaultPosition.rotationZ
+        }
+      case 'WALKING':
+      case 'SPRINTING': {
+        const speed = state === 'SPRINTING' ? this.debugParams.sprintingSpeed : this.debugParams.walkingSpeed
+        const amplitude = state === 'SPRINTING' ? this.debugParams.sprintingAmplitude : this.debugParams.walkingAmplitude
+
+        return {
+          x: this.defaultPosition.x + Math.sin(time * speed) * amplitude.x,
+          y: this.defaultPosition.y - Math.abs(Math.cos(time * speed)) * amplitude.y,
+          z: this.defaultPosition.z,
+          rotationX: this.defaultPosition.rotationX,
+          rotationY: this.defaultPosition.rotationY,
+          // rotationZ: this.defaultPosition.rotationZ + Math.sin(time * speed) * amplitude.rotationZ
+          rotationZ: this.defaultPosition.rotationZ
+        }
+      }
+    }
+  }
+
+  setState (newState: MovementState) {
+    if (newState === this.targetState) return
+
+    this.targetState = newState
+    const noTransition = false
+    if (this.currentState !== newState) {
+      // Stop idle animation during state transitions
+      this.stopIdleAnimation()
+
+      // Calculate new state transform
+      if (!noTransition) {
+        // this.globalTime = 0
+        const stateTransform = this.getStateTransform(newState, this.globalTime)
+
+        // Start transition to new state
+        this.stateSwitcher.transitionTo(stateTransform, newState)
+        // this.updated = false
+      }
+      this.currentState = newState
+    }
+  }
+
+  updated = false
+  update () {
+    this.stateSwitcher.update()
+
+    const now = performance.now()
+    const deltaTime = (now - this.lastTime) / 1000
+    this.lastTime = now
+
+    // Update global time based on current state
+    if (!this.stateSwitcher.isTransitioning) {
+      switch (this.currentState) {
+        case 'NOT_MOVING':
+        case 'SNEAKING':
+          this.globalTime = Math.PI / 4
+          break
+        case 'SPRINTING':
+        case 'WALKING':
+          this.globalTime += deltaTime
+          break
+      }
+    }
+
+    // Check for state changes from player state
+    if (this.playerState) {
+      const newState = this.playerState.getMovementState()
+      if (newState !== this.targetState) {
+        this.setState(newState)
+      }
+    }
+
+    // If we're not transitioning between states and in a stable state that should have idle animation
+    if (!this.stateSwitcher.isTransitioning &&
+      (this.currentState === 'NOT_MOVING' || this.currentState === 'SNEAKING')) {
+      // Start idle animation if not already running
+      if (!this.idleTween?.isPlaying()) {
+        this.startIdleAnimation()
+      }
+      // Update idle animation
+      this.tween.update()
+
+      // Apply idle offsets
+      this.handMesh.position.y = this.defaultPosition.y + this.idleOffset.y
+      this.handMesh.rotation.z = this.defaultPosition.rotationZ + this.idleOffset.rotationZ
+    }
+
+    // If we're in a movement state and not transitioning, update the movement animation
+    if (!this.stateSwitcher.isTransitioning &&
+      (this.currentState === 'WALKING' || this.currentState === 'SPRINTING')) {
+      const stateTransform = this.getStateTransform(this.currentState, this.globalTime)
+      Object.assign(this.handMesh.position, stateTransform)
+      Object.assign(this.handMesh.rotation, {
+        x: stateTransform.rotationX,
+        y: stateTransform.rotationY,
+        z: stateTransform.rotationZ
+      })
+      // this.stateSwitcher.transitionTo(stateTransform, this.currentState)
+    }
+  }
+
+  getCurrentState () {
+    return this.currentState
+  }
+
+  destroy () {
+    this.stopIdleAnimation()
+    this.stateSwitcher.forceFinish()
+  }
+}
+
+class HandSwingAnimator {
+  private readonly PI = Math.PI
+  private animationTimer = 0
+  private lastTime = 0
+  private isAnimating = false
+  private stopRequested = false
+  private readonly originalRotation: THREE.Euler
+  private readonly originalPosition: THREE.Vector3
+  private readonly originalScale: THREE.Vector3
+
+  readonly debugParams = {
+    // Animation timing
+    animationTime: 250,
+    animationStage: 0,
+    useClassicSwing: true,
+
+    // Item/Block animation parameters
+    itemSwingXPosScale: -0.8,
+    itemSwingYPosScale: 0.2,
+    itemSwingZPosScale: -0.2,
+    itemHeightScale: -0.6,
+    itemPreswingRotY: 45,
+    itemSwingXRotAmount: -30,
+    itemSwingYRotAmount: -35,
+    itemSwingZRotAmount: -5,
+
+    // Hand/Arm animation parameters
+    armSwingXPosScale: -0.3,
+    armSwingYPosScale: 0.4,
+    armSwingZPosScale: -0.4,
+    armSwingYRotAmount: 70,
+    armSwingZRotAmount: -20,
+    armHeightScale: -0.6
+  }
+
+  private readonly debugGui: DebugGui
+
+  public type: 'hand' | 'block' | 'item' = 'hand'
+
+  constructor (public handMesh: THREE.Object3D) {
+    this.handMesh = handMesh
+    // Store initial transforms
+    this.originalRotation = handMesh.rotation.clone()
+    this.originalPosition = handMesh.position.clone()
+    this.originalScale = handMesh.scale.clone()
+
+    // Initialize debug GUI
+    this.debugGui = new DebugGui('hand_animator', this.debugParams, undefined, {
+      animationStage: {
+        min: 0,
+        max: 1,
+        step: 0.01
+      },
+      // Add ranges for all animation parameters
+      itemSwingXPosScale: { min: -2, max: 2, step: 0.1 },
+      itemSwingYPosScale: { min: -2, max: 2, step: 0.1 },
+      itemSwingZPosScale: { min: -2, max: 2, step: 0.1 },
+      itemHeightScale: { min: -2, max: 2, step: 0.1 },
+      itemPreswingRotY: { min: -180, max: 180, step: 5 },
+      itemSwingXRotAmount: { min: -180, max: 180, step: 5 },
+      itemSwingYRotAmount: { min: -180, max: 180, step: 5 },
+      itemSwingZRotAmount: { min: -180, max: 180, step: 5 },
+      armSwingXPosScale: { min: -2, max: 2, step: 0.1 },
+      armSwingYPosScale: { min: -2, max: 2, step: 0.1 },
+      armSwingZPosScale: { min: -2, max: 2, step: 0.1 },
+      armSwingYRotAmount: { min: -180, max: 180, step: 5 },
+      armSwingZRotAmount: { min: -180, max: 180, step: 5 },
+      armHeightScale: { min: -2, max: 2, step: 0.1 }
+    })
+    // this.debugGui.activate()
+  }
+
+  update () {
+    if (!this.isAnimating && !this.debugParams.animationStage) {
+      // If not animating, ensure we're at original position
+      this.handMesh.rotation.copy(this.originalRotation)
+      this.handMesh.position.copy(this.originalPosition)
+      this.handMesh.scale.copy(this.originalScale)
+      return
+    }
+
+    const now = performance.now()
+    const deltaTime = (now - this.lastTime) / 1000
+    this.lastTime = now
+
+    // Update animation progress
+    this.animationTimer += deltaTime * 1000 // Convert to ms
+
+    // Calculate animation stage (0 to 1)
+    const stage = this.debugParams.animationStage || Math.min(this.animationTimer / this.debugParams.animationTime, 1)
+
+    if (stage >= 1) {
+      // Animation complete
+      if (this.stopRequested) {
+        // If stop was requested, actually stop now that we've completed a swing
+        this.isAnimating = false
+        this.stopRequested = false
+        this.animationTimer = 0
+        this.handMesh.rotation.copy(this.originalRotation)
+        this.handMesh.position.copy(this.originalPosition)
+        this.handMesh.scale.copy(this.originalScale)
+        return
+      }
+      // Otherwise reset timer and continue
+      this.animationTimer = 0
+      return
+    }
+
+    // Start from original transforms
+    this.handMesh.rotation.copy(this.originalRotation)
+    this.handMesh.position.copy(this.originalPosition)
+    this.handMesh.scale.copy(this.originalScale)
+
+    // Calculate swing progress
+    const swingProgress = stage
+    const sqrtProgress = Math.sqrt(swingProgress)
+    const sinProgress = Math.sin(swingProgress * this.PI)
+    const sinSqrtProgress = Math.sin(sqrtProgress * this.PI)
+
+    if (this.type === 'hand') {
+      // Hand animation
+      const xOffset = this.debugParams.armSwingXPosScale * sinSqrtProgress
+      const yOffset = this.debugParams.armSwingYPosScale * Math.sin(sqrtProgress * this.PI * 2)
+      const zOffset = this.debugParams.armSwingZPosScale * sinProgress
+
+      this.handMesh.position.x += xOffset
+      this.handMesh.position.y += yOffset + this.debugParams.armHeightScale * swingProgress
+      this.handMesh.position.z += zOffset
+
+      // Rotations
+      this.handMesh.rotation.y += THREE.MathUtils.degToRad(this.debugParams.armSwingYRotAmount * sinSqrtProgress)
+      this.handMesh.rotation.z += THREE.MathUtils.degToRad(this.debugParams.armSwingZRotAmount * sinProgress)
+    } else {
+      // Item/Block animation
+      const xOffset = this.debugParams.itemSwingXPosScale * sinSqrtProgress
+      const yOffset = this.debugParams.itemSwingYPosScale * Math.sin(sqrtProgress * this.PI * 2)
+      const zOffset = this.debugParams.itemSwingZPosScale * sinProgress
+
+      this.handMesh.position.x += xOffset
+      this.handMesh.position.y += yOffset + this.debugParams.itemHeightScale * swingProgress
+      this.handMesh.position.z += zOffset
+
+      // Pre-swing rotation
+      this.handMesh.rotation.y += THREE.MathUtils.degToRad(this.debugParams.itemPreswingRotY)
+
+      // Swing rotations
+      this.handMesh.rotation.x += THREE.MathUtils.degToRad(this.debugParams.itemSwingXRotAmount * sinProgress)
+      this.handMesh.rotation.y += THREE.MathUtils.degToRad(this.debugParams.itemSwingYRotAmount * sinSqrtProgress)
+      this.handMesh.rotation.z += THREE.MathUtils.degToRad(this.debugParams.itemSwingZRotAmount * sinProgress)
+    }
+  }
+
+  startSwing () {
+    this.stopRequested = false
+    if (this.isAnimating) return
+
+    this.isAnimating = true
+    this.animationTimer = 0
+    this.lastTime = performance.now()
+  }
+
+  stopSwing () {
+    if (!this.isAnimating) return
+    this.stopRequested = true
+  }
+
+  isCurrentlySwinging () {
+    return this.isAnimating
+  }
+}
+
 export const getBlockMeshFromModel = (material: THREE.Material, model: BlockModel, name: string) => {
   const blockProvider = worldBlockProvider(viewer.world.blockstatesModels, viewer.world.blocksAtlasParser!.atlas, 'latest')
   const worldRenderModel = blockProvider.transformModel(model, {
@@ -421,3 +870,8 @@ export const getBlockMeshFromModel = (material: THREE.Material, model: BlockMode
   })
   return getThreeBlockModelGroup(material, [[worldRenderModel]], undefined, 'plains', loadedData)
 }
+
+setTimeout(() => {
+  //@ts-expect-error
+  window.holdingBlock = viewer.world.holdingBlock
+})
diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index ac9e69e8..ed81bb84 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -2,6 +2,8 @@ import { Vec3 } from 'vec3'
 import { World } from './world'
 import { getSectionGeometry, setBlockStatesData as setMesherData } from './models'
 
+globalThis.structuredClone ??= (value) => JSON.parse(JSON.stringify(value))
+
 if (module.require) {
   // If we are in a node environement, we need to fake some env variables
   const r = module.require
diff --git a/renderer/viewer/lib/smoothSwitcher.ts b/renderer/viewer/lib/smoothSwitcher.ts
new file mode 100644
index 00000000..925affec
--- /dev/null
+++ b/renderer/viewer/lib/smoothSwitcher.ts
@@ -0,0 +1,169 @@
+import * as tweenJs from '@tweenjs/tween.js'
+import { AnimationController } from './animationController'
+
+export type StateProperties = Record<string, number>
+export type StateGetterFn = () => StateProperties
+export type StateSetterFn = (property: string, value: number) => void
+
+// Speed in units per second for each property type
+const DEFAULT_SPEEDS = {
+  x: 3000, // pixels/units per second
+  y: 3000,
+  z: 3000,
+  rotation: Math.PI, // radians per second
+  scale: 1, // scale units per second
+  default: 3000 // default speed for unknown properties
+}
+
+export class SmoothSwitcher {
+  private readonly animationController = new AnimationController()
+  // private readonly currentState: StateProperties = {}
+  private readonly defaultState: StateProperties
+  private readonly speeds: Record<string, number>
+  public currentStateName = ''
+  public transitioningToStateName = ''
+
+  constructor (
+    public getState: StateGetterFn,
+    public setState: StateSetterFn,
+    speeds?: Partial<Record<string, number>>
+  ) {
+
+    // Initialize speeds with defaults and overrides
+    this.speeds = { ...DEFAULT_SPEEDS }
+    if (speeds) {
+      Object.assign(this.speeds, speeds)
+    }
+
+    // Store initial values
+    this.defaultState = this.getState()
+  }
+
+  /**
+   * Calculate transition duration based on the largest property change
+   */
+  private calculateDuration (newState: Partial<StateProperties>): number {
+    let maxDuration = 0
+    const currentState = this.getState()
+
+    for (const [key, targetValue] of Object.entries(newState)) {
+      const currentValue = currentState[key]
+      const diff = Math.abs(targetValue! - currentValue)
+      const speed = this.getPropertySpeed(key)
+      const duration = (diff / speed) * 1000 // Convert to milliseconds
+
+      maxDuration = Math.max(maxDuration, duration)
+    }
+
+    // Ensure minimum duration of 50ms and maximum of 2000ms
+    return Math.min(Math.max(maxDuration, 200), 2000)
+  }
+
+  private getPropertySpeed (property: string): number {
+    // Check for specific property speed
+    if (property in this.speeds) {
+      return this.speeds[property]
+    }
+
+    // Check for property type (rotation, scale, etc.)
+    if (property.toLowerCase().includes('rotation')) return this.speeds.rotation
+    if (property.toLowerCase().includes('scale')) return this.speeds.scale
+    if (property.toLowerCase() === 'x' || property.toLowerCase() === 'y' || property.toLowerCase() === 'z') {
+      return this.speeds[property]
+    }
+
+    return this.speeds.default
+  }
+
+  /**
+   * Start a transition to a new state
+   * @param newState Partial state - only need to specify properties that change
+   * @param easing Easing function to use
+   */
+  startTransition (
+    newState: Partial<StateProperties>,
+    stateName?: string,
+    onEnd?: () => void,
+    easing: (amount: number) => number = tweenJs.Easing.Linear.None,
+    onCancelled?: () => void
+  ): void {
+    if (this.isTransitioning) {
+      onCancelled?.()
+      this.animationController.forceFinish()
+    }
+
+    this.transitioningToStateName = stateName ?? ''
+    const state = this.getState()
+
+    const duration = this.calculateDuration(newState)
+    // console.log('duration', duration, JSON.stringify(state), JSON.stringify(newState))
+
+    void this.animationController.startAnimation(() => {
+      const group = new tweenJs.Group()
+      new tweenJs.Tween(state, group)
+        .to(newState, duration)
+        .easing(easing)
+        .onUpdate((obj) => {
+          for (const key of Object.keys(obj)) {
+            this.setState(key, obj[key])
+          }
+        })
+        .onComplete(() => {
+          this.animationController.forceFinish()
+          this.currentStateName = this.transitioningToStateName
+          this.transitioningToStateName = ''
+          onEnd?.()
+        })
+        .start()
+      return group
+    })
+  }
+
+  /**
+   * Reset to default state
+   */
+  reset (): void {
+    this.startTransition(this.defaultState)
+  }
+
+
+  /**
+   * Update the animation (should be called in your render/update loop)
+   */
+  update (): void {
+    this.animationController.update()
+  }
+
+  /**
+   * Force finish the current transition
+   */
+  forceFinish (): void {
+    this.animationController.forceFinish()
+  }
+
+  /**
+   * Start a new transition to the specified state
+   */
+  transitionTo (
+    newState: Partial<StateProperties>,
+    stateName?: string,
+    onEnd?: () => void,
+    onCancelled?: () => void
+  ): void {
+    this.startTransition(newState, stateName, onEnd, tweenJs.Easing.Linear.None, onCancelled)
+  }
+
+  /**
+   * Get the current value of a property
+   */
+  getCurrentValue (property: string): number {
+    return this.getState()[property]
+  }
+
+  /**
+   * Check if currently transitioning
+   */
+  get isTransitioning (): boolean {
+    return this.animationController.isActive
+  }
+}
diff --git a/renderer/viewer/lib/threeJsUtils.ts b/renderer/viewer/lib/threeJsUtils.ts
index 6ca39d6a..5ae3b24f 100644
--- a/renderer/viewer/lib/threeJsUtils.ts
+++ b/renderer/viewer/lib/threeJsUtils.ts
@@ -1,6 +1,6 @@
 import * as THREE from 'three'
 
-export const disposeObject = (obj: THREE.Object3D) => {
+export const disposeObject = (obj: THREE.Object3D, cleanTextures = false) => {
   // not cleaning texture there as it might be used by other objects, but would be good to also do that
   if (obj instanceof THREE.Mesh) {
     obj.geometry?.dispose?.()
@@ -8,6 +8,11 @@ export const disposeObject = (obj: THREE.Object3D) => {
   }
   if (obj.children) {
     // eslint-disable-next-line unicorn/no-array-for-each
-    obj.children.forEach(disposeObject)
+    obj.children.forEach(child => disposeObject(child, cleanTextures))
+  }
+  if (cleanTextures) {
+    if (obj instanceof THREE.Mesh) {
+      obj.material?.map?.dispose?.()
+    }
   }
 }
diff --git a/renderer/viewer/lib/utils/proxy.ts b/renderer/viewer/lib/utils/proxy.ts
new file mode 100644
index 00000000..d30ceb7e
--- /dev/null
+++ b/renderer/viewer/lib/utils/proxy.ts
@@ -0,0 +1,23 @@
+import { subscribeKey } from 'valtio/utils'
+
+// eslint-disable-next-line max-params
+export function watchProperty<T extends Record<string, any>, K> (asyncGetter: (value: T[keyof T]) => Promise<K>, valtioProxy: T, key: keyof T, readySetter: (res: K) => void, cleanup?: (res: K) => void) {
+  let i = 0
+  let lastRes: K | undefined
+  const request = async () => {
+    const req = ++i
+    const res = await asyncGetter(valtioProxy[key])
+    if (req === i) {
+      if (lastRes) {
+        cleanup?.(lastRes)
+      }
+      readySetter(res)
+      lastRes = res
+    } else {
+      // rejected
+      cleanup?.(res)
+    }
+  }
+  void request()
+  return subscribeKey(valtioProxy, key, request)
+}
diff --git a/renderer/viewer/lib/utils/skins.ts b/renderer/viewer/lib/utils/skins.ts
new file mode 100644
index 00000000..385c16c1
--- /dev/null
+++ b/renderer/viewer/lib/utils/skins.ts
@@ -0,0 +1,27 @@
+import { loadSkinToCanvas } from 'skinview-utils'
+import * as THREE from 'three'
+import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
+
+// eslint-disable-next-line unicorn/prefer-export-from
+export const stevePngUrl = stevePng
+export const steveTexture = new THREE.TextureLoader().loadAsync(stevePng)
+
+export async function loadImageFromUrl (imageUrl: string): Promise<HTMLImageElement> {
+  const img = new Image()
+  img.src = imageUrl
+  await new Promise<void>(resolve => {
+    img.onload = () => resolve()
+  })
+  return img
+}
+
+export function getLookupUrl (username: string, type: 'skin' | 'cape'): string {
+  return `https://mulv.tycrek.dev/api/lookup?username=${username}&type=${type}`
+}
+
+export async function loadSkinImage (skinUrl: string): Promise<{ canvas: HTMLCanvasElement, image: HTMLImageElement }> {
+  const image = await loadImageFromUrl(skinUrl)
+  const skinCanvas = document.createElement('canvas')
+  loadSkinToCanvas(skinCanvas, image)
+  return { canvas: skinCanvas, image }
+}
diff --git a/renderer/viewer/lib/viewer.ts b/renderer/viewer/lib/viewer.ts
index 0f7b4850..beacaf77 100644
--- a/renderer/viewer/lib/viewer.ts
+++ b/renderer/viewer/lib/viewer.ts
@@ -3,7 +3,6 @@ import * as THREE from 'three'
 import { Vec3 } from 'vec3'
 import { generateSpiralMatrix } from 'flying-squid/dist/utils'
 import worldBlockProvider from 'mc-assets/dist/worldBlockProvider'
-import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
 import { Entities } from './entities'
 import { Primitives } from './primitives'
 import { WorldRendererThree } from './worldrendererThree'
@@ -11,6 +10,8 @@ import { WorldRendererCommon, WorldRendererConfig, defaultWorldRendererConfig }
 import { getThreeBlockModelGroup, renderBlockThree, setBlockPosition } from './mesher/standaloneRenderer'
 import { addNewStat } from './ui/newStats'
 import { getMyHand } from './hand'
+import { IPlayerState, BasePlayerState } from './basePlayerState'
+import { CameraBobbing } from './cameraBobbing'
 
 export class Viewer {
   scene: THREE.Scene
@@ -21,14 +22,12 @@ export class Viewer {
   // primitives: Primitives
   domElement: HTMLCanvasElement
   playerHeight = 1.62
-  isSneaking = false
   threeJsWorld: WorldRendererThree
   cameraObjectOverride?: THREE.Object3D // for xr
   audioListener: THREE.AudioListener
   renderingUntilNoUpdates = false
   processEntityOverrides = (e, overrides) => overrides
-
-  getMineflayerBot (): void | Record<string, any> {} // to be overridden
+  private readonly cameraBobbing: CameraBobbing
 
   get camera () {
     return this.world.camera
@@ -38,18 +37,19 @@ export class Viewer {
     this.world.camera = camera
   }
 
-  constructor (public renderer: THREE.WebGLRenderer, worldConfig = defaultWorldRendererConfig) {
+  constructor (public renderer: THREE.WebGLRenderer, worldConfig = defaultWorldRendererConfig, public playerState: IPlayerState = new BasePlayerState()) {
     // https://discourse.threejs.org/t/updates-to-color-management-in-three-js-r152/50791
     THREE.ColorManagement.enabled = false
     renderer.outputColorSpace = THREE.LinearSRGBColorSpace
 
     this.scene = new THREE.Scene()
     this.scene.matrixAutoUpdate = false // for perf
-    this.threeJsWorld = new WorldRendererThree(this.scene, this.renderer, worldConfig)
+    this.threeJsWorld = new WorldRendererThree(this.scene, this.renderer, worldConfig, this.playerState)
     this.setWorld()
     this.resetScene()
     this.entities = new Entities(this)
     // this.primitives = new Primitives(this.scene, this.camera)
+    this.cameraBobbing = new CameraBobbing()
 
     this.domElement = renderer.domElement
   }
@@ -139,7 +139,7 @@ export class Viewer {
     const pos = cursorBlockRel(0, 1, 0).position
     const { mesh } = this.entities.getItemMesh({
       itemId: 541,
-    })!
+    }, {})!
     mesh.position.set(pos.x + 0.5, pos.y + 0.5, pos.z + 0.5)
     // mesh.scale.set(0.5, 0.5, 0.5)
     const helper = new THREE.BoxHelper(mesh, 0xff_ff_00)
@@ -161,12 +161,31 @@ export class Viewer {
 
   setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number) {
     const cam = this.cameraObjectOverride || this.camera
-    let yOffset = this.getMineflayerBot()?.entity?.eyeHeight ?? this.playerHeight
-    if (this.isSneaking) yOffset -= 0.3
+    const yOffset = this.playerState.getEyeHeight()
+    // if (this.playerState.isSneaking()) yOffset -= 0.3
 
     this.world.camera = cam as THREE.PerspectiveCamera
-
     this.world.updateCamera(pos?.offset(0, yOffset, 0) ?? null, yaw, pitch)
+
+    // // Update camera bobbing based on movement state
+    // const velocity = this.playerState.getVelocity()
+    // const movementState = this.playerState.getMovementState()
+    // const isMoving = movementState === 'SPRINTING' || movementState === 'WALKING'
+    // const speed = Math.hypot(velocity.x, velocity.z)
+
+    // // Update bobbing state
+    // this.cameraBobbing.updateWalkDistance(speed)
+    // this.cameraBobbing.updateBobAmount(isMoving)
+
+    // // Get bobbing offsets
+    // const bobbing = isMoving ? this.cameraBobbing.getBobbing() : { position: { x: 0, y: 0 }, rotation: { x: 0, z: 0 } }
+
+    // // Apply camera position with bobbing
+    // const finalPos = pos ? pos.offset(bobbing.position.x, yOffset + bobbing.position.y, 0) : null
+    // this.world.updateCamera(finalPos, yaw + bobbing.rotation.x, pitch)
+
+    // // Apply roll rotation separately since updateCamera doesn't handle it
+    // this.camera.rotation.z = bobbing.rotation.z
   }
 
   playSound (position: Vec3, path: string, volume = 1, pitch = 1) {
diff --git a/renderer/viewer/lib/viewerWrapper.ts b/renderer/viewer/lib/viewerWrapper.ts
index 52e244fe..2e08da1d 100644
--- a/renderer/viewer/lib/viewerWrapper.ts
+++ b/renderer/viewer/lib/viewerWrapper.ts
@@ -79,7 +79,7 @@ export class ViewerWrapper {
     if (this.globalObject.stopLoop) return
     for (const fn of beforeRenderFrame) fn()
     this.globalObject.requestAnimationFrame(this.render.bind(this))
-    if (this.globalObject.stopRender || this.renderer?.xr.isPresenting || (this.stopRenderOnBlur && !this.windowFocused)) return
+    if (!viewer || this.globalObject.stopRender || this.renderer?.xr.isPresenting || (this.stopRenderOnBlur && !this.windowFocused)) return
     const renderInterval = (this.windowFocused ? this.renderInterval : this.renderIntervalUnfocused) ?? this.renderInterval
     if (renderInterval) {
       this.delta += time - this.lastTime
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index fee47de2..7c2be715 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -7,6 +7,7 @@ import { Vec3 } from 'vec3'
 import { BotEvents } from 'mineflayer'
 import { getItemFromBlock } from '../../../src/chatUtils'
 import { delayedIterator } from '../../playground/shared'
+import { playerState } from '../../../src/mineflayer/playerState'
 import { chunkPos } from './simpleUtils'
 
 export type ChunkPosKey = string
@@ -102,36 +103,8 @@ export class WorldDataEmitter extends EventEmitter {
       },
       time: () => {
         this.emitter.emit('time', bot.time.timeOfDay)
-      },
-      heldItemChanged () {
-        handChanged(false)
-      },
+      }
     } satisfies Partial<BotEvents>
-    const handChanged = (isLeftHand: boolean) => {
-      const newItem = isLeftHand ? bot.inventory.slots[45] : bot.heldItem
-      if (!newItem) {
-        viewer.world.onHandItemSwitch(undefined, isLeftHand)
-        return
-      }
-      const block = loadedData.blocksByName[newItem.name]
-      // todo clean types
-      const blockProperties = block ? new window.PrismarineBlock(block.id, 'void', newItem.metadata).getProperties() : {}
-      // todo item props
-      viewer.world.onHandItemSwitch({
-        name: newItem.name,
-        properties: blockProperties,
-        id: newItem.type,
-        type: block ? 'block' : 'item',
-        fullItem: newItem,
-      }, isLeftHand)
-    }
-    bot.inventory.on('updateSlot', (index) => {
-      if (index === 45) {
-        handChanged(true)
-      }
-    })
-    handChanged(false)
-    handChanged(true)
 
 
     bot._client.on('update_light', ({ chunkX, chunkZ }) => {
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index b276241a..7841016d 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -9,11 +9,12 @@ import blocksAtlasLegacy from 'mc-assets/dist/blocksAtlasLegacy.png'
 import itemsAtlases from 'mc-assets/dist/itemsAtlases.json'
 import itemsAtlasLatest from 'mc-assets/dist/itemsAtlasLatest.png'
 import itemsAtlasLegacy from 'mc-assets/dist/itemsAtlasLegacy.png'
-import { AtlasParser } from 'mc-assets'
+import { AtlasParser, getLoadedItemDefinitionsStore } from 'mc-assets'
 import TypedEmitter from 'typed-emitter'
 import { LineMaterial } from 'three-stdlib'
 import christmasPack from 'mc-assets/dist/textureReplacements/christmas'
 import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
+import itemDefinitionsJson from 'mc-assets/dist/itemDefinitions.json'
 import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
 import { toMajorVersion } from '../../../src/utils'
 import { buildCleanupDecorator } from './cleanupDecorator'
@@ -34,7 +35,8 @@ export const defaultWorldRendererConfig = {
   numWorkers: 4,
   isPlayground: false,
   // game renderer setting actually
-  displayHand: false
+  showHand: false,
+  viewBobbing: false
 }
 
 export type WorldRendererConfig = typeof defaultWorldRendererConfig
@@ -119,13 +121,15 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   sourceData = {
     blocksAtlases,
-    itemsAtlases
+    itemsAtlases,
+    itemDefinitionsJson
   }
   customTextures: {
     items?: CustomTexturesData
     blocks?: CustomTexturesData
     armor?: CustomTexturesData
   } = {}
+  itemsDefinitionsStore = getLoadedItemDefinitionsStore(this.sourceData.itemDefinitionsJson)
   workersProcessAverageTime = 0
   workersProcessAverageTimeCount = 0
   maxWorkersProcessTime = 0
@@ -248,7 +252,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
   }
 
-  onHandItemSwitch (item: HandItemBlock | undefined, isLeftHand: boolean): void { }
   changeHandSwingingState (isAnimationPlaying: boolean, isLeftHand: boolean): void { }
 
   abstract handleWorkerMessage (data: WorkerReceive): void
diff --git a/renderer/viewer/lib/worldrendererThree.ts b/renderer/viewer/lib/worldrendererThree.ts
index b0efca7d..4ff56cdb 100644
--- a/renderer/viewer/lib/worldrendererThree.ts
+++ b/renderer/viewer/lib/worldrendererThree.ts
@@ -12,6 +12,7 @@ import { disposeObject } from './threeJsUtils'
 import HoldingBlock, { HandItemBlock } from './holdingBlock'
 import { addNewStat } from './ui/newStats'
 import { MesherGeometryOutput } from './mesher/shared'
+import { IPlayerState } from './basePlayerState'
 import { getMesh } from './entity/EntityMesh'
 import { armorModel } from './entity/armorModels'
 
@@ -36,48 +37,29 @@ export class WorldRendererThree extends WorldRendererCommon {
     return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).blocksCount, 0)
   }
 
-  constructor (public scene: THREE.Scene, public renderer: THREE.WebGLRenderer, public config: WorldRendererConfig) {
+  constructor (public scene: THREE.Scene, public renderer: THREE.WebGLRenderer, public config: WorldRendererConfig, public playerState: IPlayerState) {
     super(config)
     this.rendererDevice = `${WorldRendererThree.getRendererInfo(this.renderer)} powered by three.js r${THREE.REVISION}`
     this.starField = new StarField(scene)
-    this.holdingBlock = new HoldingBlock()
-    this.holdingBlockLeft = new HoldingBlock()
-    this.holdingBlockLeft.rightSide = false
+    this.holdingBlock = new HoldingBlock(playerState, this.config)
+    this.holdingBlockLeft = new HoldingBlock(playerState, this.config, true)
 
     this.renderUpdateEmitter.on('itemsTextureDownloaded', () => {
-      if (this.holdingBlock.toBeRenderedItem) {
-        this.onHandItemSwitch(this.holdingBlock.toBeRenderedItem)
-        this.holdingBlock.toBeRenderedItem = undefined
-      }
-      if (this.holdingBlockLeft.toBeRenderedItem) {
-        this.onHandItemSwitch(this.holdingBlock.toBeRenderedItem, true)
-        this.holdingBlockLeft.toBeRenderedItem = undefined
-      }
+      this.holdingBlock.ready = true
+      this.holdingBlock.updateItem()
+      this.holdingBlockLeft.ready = true
+      this.holdingBlockLeft.updateItem()
     })
 
     this.addDebugOverlay()
   }
 
-  onHandItemSwitch (item: HandItemBlock | undefined, isLeft = false) {
-    if (!isLeft) {
-      item ??= {
-        type: 'hand',
-      }
-    }
-    const holdingBlock = isLeft ? this.holdingBlockLeft : this.holdingBlock
-    if (!this.currentTextureImage) {
-      holdingBlock.toBeRenderedItem = item
-      return
-    }
-    void holdingBlock.initHandObject(item)
-  }
-
   changeHandSwingingState (isAnimationPlaying: boolean, isLeft = false) {
     const holdingBlock = isLeft ? this.holdingBlockLeft : this.holdingBlock
     if (isAnimationPlaying) {
       holdingBlock.startSwing()
     } else {
-      void holdingBlock.stopSwing()
+      holdingBlock.stopSwing()
     }
   }
 
@@ -252,7 +234,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
     const cam = this.camera instanceof THREE.Group ? this.camera.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
-    if (this.config.displayHand) {
+    if (this.config.showHand) {
       this.holdingBlock.render(this.camera, this.renderer, viewer.ambientLight, viewer.directionalLight)
       this.holdingBlockLeft.render(this.camera, this.renderer, viewer.ambientLight, viewer.directionalLight)
     }
diff --git a/src/api/mcStatusApi.ts b/src/api/mcStatusApi.ts
index 2a440f2b..20d27813 100644
--- a/src/api/mcStatusApi.ts
+++ b/src/api/mcStatusApi.ts
@@ -1,3 +1,8 @@
+globalThis.resolveDnsFallback = async (hostname: string) => {
+  const response = await fetchServerStatus(hostname)
+  return response?.raw.srv_record ?? undefined
+}
+
 export const isServerValid = (ip: string) => {
   const isInLocalNetwork = ip.startsWith('192.168.') ||
     ip.startsWith('10.') ||
@@ -51,4 +56,9 @@ export type ServerResponse = {
   // todo display via hammer icon
   software?: string
   plugins?: Array<{ name, version }>
+  // port?: number
+  srv_record?: {
+    host: string
+    port: number
+  }
 }
diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts
index 772b3745..4bc21a73 100644
--- a/src/builtinCommands.ts
+++ b/src/builtinCommands.ts
@@ -112,15 +112,20 @@ const commands: Array<{
   {
     command: ['/pos'],
     async invoke ([type]) {
-      let pos: string | undefined
+      let pos: { x: number, y: number, z: number } | undefined
       if (type === 'block') {
-        pos = window.cursorBlockRel()?.position?.toString().slice(1, -1)
+        const blockPos = window.cursorBlockRel()?.position
+        if (blockPos) {
+          pos = { x: blockPos.x, y: blockPos.y, z: blockPos.z }
+        }
       } else {
-        pos = bot.entity.position.toString().slice(1, -1)
+        const playerPos = bot.entity.position
+        pos = { x: playerPos.x, y: playerPos.y, z: playerPos.z }
       }
       if (!pos) return
-      await navigator.clipboard.writeText(pos)
-      writeText(`Copied position to clipboard: ${pos}`)
+      const formatted = `${pos.x.toFixed(2)} ${pos.y.toFixed(2)} ${pos.z.toFixed(2)}`
+      await navigator.clipboard.writeText(formatted)
+      writeText(`Copied position to clipboard: ${formatted}`)
     }
   }
 ]
diff --git a/src/devtools.ts b/src/devtools.ts
index 6f54eaf1..6624dda8 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -24,6 +24,19 @@ Object.defineProperty(window, 'debugSceneChunks', {
   },
 })
 
+window.chunkKey = (xRel = 0, zRel = 0) => {
+  const pos = bot.entity.position
+  return `${(Math.floor(pos.x / 16) + xRel) * 16},${(Math.floor(pos.z / 16) + zRel) * 16}`
+}
+
+window.sectionKey = (xRel = 0, yRel = 0, zRel = 0) => {
+  const pos = bot.entity.position
+  return `${(Math.floor(pos.x / 16) + xRel) * 16},${(Math.floor(pos.y / 16) + yRel) * 16},${(Math.floor(pos.z / 16) + zRel) * 16}`
+}
+
+window.keys = (obj) => Object.keys(obj)
+window.values = (obj) => Object.values(obj)
+
 window.len = (obj) => Object.keys(obj).length
 
 customEvents.on('gameLoaded', () => {
diff --git a/src/globalState.ts b/src/globalState.ts
index 992503ef..412dd31b 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -3,11 +3,16 @@
 import { proxy, ref, subscribe } from 'valtio'
 import type { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
 import type { OptionsGroupType } from './optionsGuiScheme'
+import { appQueryParams } from './appParams'
 
 // todo: refactor structure with support of hideNext=false
 
 const notHideableModalsWithoutForce = new Set(['app-status'])
 
+if (appQueryParams.lockConnect) {
+  notHideableModalsWithoutForce.add('editServer')
+}
+
 type Modal = ({ elem?: HTMLElement & Record<string, any> } & { reactType: string })
 
 type ContextMenuItem = { callback; label }
diff --git a/src/index.ts b/src/index.ts
index 778cb026..975be6c5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -66,6 +66,7 @@ import { isCypress } from './standaloneUtils'
 import {
   removePanorama
 } from './panorama'
+import { getItemDefinition } from 'mc-assets/dist/itemDefinitions'
 
 import { startLocalServer, unsupportedLocalServerFeatures } from './createLocalServer'
 import defaultServerOptions from './defaultLocalServerOptions'
@@ -104,6 +105,7 @@ import { getWebsocketStream } from './mineflayer/websocket-core'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 import { updateCursor } from './cameraRotationControls'
 import { pingServerVersion } from './mineflayer/minecraft-protocol-extra'
+import { playerState, PlayerStateManager } from './mineflayer/playerState'
 import { states } from 'minecraft-protocol'
 import { initMotionTracking } from './react/uiMotion'
 import { UserError } from './mineflayer/userError'
@@ -161,21 +163,29 @@ if (isIphone) {
 if (appQueryParams.testCrashApp === '2') throw new Error('test')
 
 // Create viewer
-const viewer: import('renderer/viewer/lib/viewer').Viewer = new Viewer(renderer)
+const viewer: import('renderer/viewer/lib/viewer').Viewer = new Viewer(renderer, undefined, playerState)
 window.viewer = viewer
-viewer.getMineflayerBot = () => bot
 // todo unify
-viewer.entities.getItemUv = (item) => {
+viewer.entities.getItemUv = (item, specificProps) => {
   const idOrName = item.itemId ?? item.blockId
   try {
     const name = typeof idOrName === 'number' ? loadedData.items[idOrName]?.name : idOrName
     if (!name) throw new Error(`Item not found: ${idOrName}`)
 
-    const renderInfo = renderSlot({
-      name,
-      nbt: null,
-      ...item
+    const itemSelector = playerState.getItemSelector({
+      ...specificProps
     })
+    const model = getItemDefinition(viewer.world.itemsDefinitionsStore, {
+      name,
+      version: viewer.world.texturesVersion!,
+      properties: itemSelector
+    })?.model ?? name
+
+    const renderInfo = renderSlot({
+      ...item,
+      nbt: null,
+      name: model,
+    }, false, true)
 
     if (!renderInfo) throw new Error(`Failed to get render info for item ${name}`)
 
@@ -409,10 +419,12 @@ export async function connect (connectOptions: ConnectOptions) {
           throw err
         }
       }
+      const oldStatus = appStatusState.status
       setLoadingScreenStatus('Loading minecraft assets')
       viewer.world.blockstatesModels = await import('mc-assets/dist/blockStatesModels.json')
       void viewer.setVersion(version, options.useVersionsTextures === 'latest' ? version : options.useVersionsTextures)
       miscUiState.loadedDataVersion = version
+      setLoadingScreenStatus(oldStatus)
     }
 
     let finalVersion = connectOptions.botVersion || (singleplayer ? serverOptions.version : undefined)
@@ -744,6 +756,8 @@ export async function connect (connectOptions: ConnectOptions) {
     customEvents.emit('gameLoaded')
     if (p2pConnectTimeout) clearTimeout(p2pConnectTimeout)
 
+    playerState.onlineMode = !!connectOptions.authenticatedAccount
+
     setLoadingScreenStatus('Placing blocks (starting viewer)')
     localStorage.lastConnectOptions = JSON.stringify(connectOptions)
     connectOptions.onSuccessfulPlay?.()
@@ -997,6 +1011,4 @@ if (initialLoader) {
 }
 window.pageLoaded = true
 
-if (!reconnectOptions) {
-  void possiblyHandleStateVariable()
-}
+void possiblyHandleStateVariable()
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index efda5392..bdcdef3c 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -174,7 +174,7 @@ const getImage = ({ path = undefined as string | undefined, texture = undefined
   return loadedImagesCache.get(loadPath)
 }
 
-export const renderSlot = (slot: GeneralInputItem, debugIsQuickbar = false): {
+export const renderSlot = (slot: GeneralInputItem, debugIsQuickbar = false, fullBlockModelSupport = false): {
   texture: string,
   blockData?: Record<string, { slice, path }> & { resolvedModel: BlockModel },
   scale?: number,
@@ -198,7 +198,7 @@ export const renderSlot = (slot: GeneralInputItem, debugIsQuickbar = false): {
   let itemTexture
   try {
     assertDefined(viewer.world.itemsRenderer)
-    itemTexture = viewer.world.itemsRenderer.getItemTexture(itemModelName) ?? viewer.world.itemsRenderer.getItemTexture('item/missing_texture')!
+    itemTexture = viewer.world.itemsRenderer.getItemTexture(itemModelName, {}, false, fullBlockModelSupport) ?? viewer.world.itemsRenderer.getItemTexture('item/missing_texture')!
   } catch (err) {
     inGameError(`Failed to render item ${itemModelName} (original: ${originalItemName}) on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
     itemTexture = viewer.world.itemsRenderer!.getItemTexture('block/errored')!
diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
new file mode 100644
index 00000000..793f306f
--- /dev/null
+++ b/src/mineflayer/playerState.ts
@@ -0,0 +1,200 @@
+import { EventEmitter } from 'events'
+import { Vec3 } from 'vec3'
+import { IPlayerState, ItemSpecificContextProperties, MovementState, PlayerStateEvents } from 'renderer/viewer/lib/basePlayerState'
+import { HandItemBlock } from 'renderer/viewer/lib/holdingBlock'
+import TypedEmitter from 'typed-emitter'
+import { ItemSelector } from 'mc-assets/dist/itemDefinitions'
+import { proxy } from 'valtio'
+import { gameAdditionalState } from '../globalState'
+
+export class PlayerStateManager implements IPlayerState {
+  disableStateUpdates = false
+  private static instance: PlayerStateManager
+  readonly events = new EventEmitter() as TypedEmitter<PlayerStateEvents>
+
+  // Movement and physics state
+  private lastVelocity = new Vec3(0, 0, 0)
+  private movementState: MovementState = 'NOT_MOVING'
+  private timeOffGround = 0
+  private lastUpdateTime = performance.now()
+
+  // Held item state
+  private heldItem?: HandItemBlock
+  private offHandItem?: HandItemBlock
+  private itemUsageTicks = 0
+  private isUsingItem = false
+  private ready = false
+  onlineMode = false
+  get username () {
+    return bot.player?.username ?? ''
+  }
+
+  reactive = proxy({
+    playerSkin: undefined as string | undefined,
+  })
+
+  static getInstance (): PlayerStateManager {
+    if (!this.instance) {
+      this.instance = new PlayerStateManager()
+    }
+    return this.instance
+  }
+
+  private constructor () {
+    this.updateState = this.updateState.bind(this)
+    customEvents.on('mineflayerBotCreated', () => {
+      this.ready = false
+      bot.on('inject_allowed', () => {
+        if (this.ready) return
+        this.ready = true
+        this.botCreated()
+      })
+    })
+  }
+
+  private botCreated () {
+    // Movement tracking
+    bot.on('move', this.updateState)
+
+    // Item tracking
+    bot.on('heldItemChanged', () => {
+      return this.updateHeldItem(false)
+    })
+    bot.inventory.on('updateSlot', (index) => {
+      if (index === 45) this.updateHeldItem(true)
+    })
+    bot.on('physicsTick', () => {
+      if (this.isUsingItem) this.itemUsageTicks++
+    })
+
+    // Initial held items setup
+    this.updateHeldItem(false)
+    this.updateHeldItem(true)
+  }
+
+  // #region Movement and Physics State
+  private updateState () {
+    if (!bot.player?.entity || this.disableStateUpdates) return
+
+    const { velocity } = bot.player.entity
+    const isOnGround = bot.entity.onGround
+    const VELOCITY_THRESHOLD = 0.01
+    const SPRINTING_VELOCITY = 0.15
+    const OFF_GROUND_THRESHOLD = 0 // ms before switching to SNEAKING when off ground
+
+    const now = performance.now()
+    const deltaTime = now - this.lastUpdateTime
+    this.lastUpdateTime = now
+
+    this.lastVelocity = velocity
+
+    // Update time off ground
+    if (isOnGround) {
+      this.timeOffGround = 0
+    } else {
+      this.timeOffGround += deltaTime
+    }
+
+    if (this.isSneaking() || this.isFlying() || (this.timeOffGround > OFF_GROUND_THRESHOLD)) {
+      this.movementState = 'SNEAKING'
+    } else if (Math.abs(velocity.x) > VELOCITY_THRESHOLD || Math.abs(velocity.z) > VELOCITY_THRESHOLD) {
+      this.movementState = Math.abs(velocity.x) > SPRINTING_VELOCITY || Math.abs(velocity.z) > SPRINTING_VELOCITY
+        ? 'SPRINTING'
+        : 'WALKING'
+    } else {
+      this.movementState = 'NOT_MOVING'
+    }
+  }
+
+  getMovementState (): MovementState {
+    return this.movementState
+  }
+
+  getVelocity (): Vec3 {
+    return this.lastVelocity
+  }
+
+  getEyeHeight (): number {
+    return bot.controlState.sneak ? 1.27 : bot.entity?.['eyeHeight'] ?? 1.62
+  }
+
+  isOnGround (): boolean {
+    return bot?.entity?.onGround ?? true
+  }
+
+  isSneaking (): boolean {
+    return gameAdditionalState.isSneaking
+  }
+
+  isFlying (): boolean {
+    return gameAdditionalState.isFlying
+  }
+
+  isSprinting (): boolean {
+    return gameAdditionalState.isSprinting
+  }
+  // #endregion
+
+  // #region Held Item State
+  private updateHeldItem (isLeftHand: boolean) {
+    const newItem = isLeftHand ? bot.inventory.slots[45] : bot.heldItem
+    if (!newItem) {
+      if (isLeftHand) {
+        this.offHandItem = undefined
+      } else {
+        this.heldItem = undefined
+      }
+      this.events.emit('heldItemChanged', undefined, isLeftHand)
+      return
+    }
+
+    const block = loadedData.blocksByName[newItem.name]
+    const blockProperties = block ? new window.PrismarineBlock(block.id, 'void', newItem.metadata).getProperties() : {}
+    const item: HandItemBlock = {
+      name: newItem.name,
+      properties: blockProperties,
+      id: newItem.type,
+      type: block ? 'block' : 'item',
+      fullItem: newItem,
+    }
+
+    if (isLeftHand) {
+      this.offHandItem = item
+    } else {
+      this.heldItem = item
+    }
+    this.events.emit('heldItemChanged', item, isLeftHand)
+  }
+
+  startUsingItem () {
+    if (this.isUsingItem) return
+    this.isUsingItem = true
+    this.itemUsageTicks = 0
+  }
+
+  stopUsingItem () {
+    this.isUsingItem = false
+    this.itemUsageTicks = 0
+  }
+
+  getItemUsageTicks (): number {
+    return this.itemUsageTicks
+  }
+
+  getHeldItem (isLeftHand = false): HandItemBlock | undefined {
+    return isLeftHand ? this.offHandItem : this.heldItem
+  }
+
+  getItemSelector (specificProperties: ItemSpecificContextProperties, item?: import('prismarine-item').Item): ItemSelector['properties'] {
+    return {
+      ...specificProperties,
+      'minecraft:date': new Date(),
+      // "minecraft:context_dimension": bot.entityp,
+      'minecraft:time': bot.time.timeOfDay / 24_000,
+    }
+  }
+  // #endregion
+}
+
+export const playerState = PlayerStateManager.getInstance()
+window.playerState = playerState
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 9ea25920..31e84f58 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -91,7 +91,6 @@ export const guiOptionsScheme: {
         unit: '',
         tooltip: 'Additional distance to keep the chunks loading before unloading them by marking them as too far',
       },
-      handDisplay: {},
       renderDebug: {
         values: [
           'advanced',
@@ -248,6 +247,12 @@ export const guiOptionsScheme: {
           ['classic', 'Classic']
         ],
       },
+      showHand: {
+        text: 'Show Hand',
+      },
+      viewBobbing: {
+        text: 'View Bobbing',
+      },
     },
     {
       custom () {
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 2228993f..ff29f981 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -51,7 +51,8 @@ const defaultOptions = {
   enabledResourcepack: null as string | null,
   useVersionsTextures: 'latest',
   serverResourcePacks: 'prompt' as 'prompt' | 'always' | 'never',
-  handDisplay: false,
+  showHand: true,
+  viewBobbing: true,
   packetsLoggerPreset: 'all' as 'all' | 'no-buffers',
   serversAutoVersionSelect: 'auto' as 'auto' | 'latest' | '1.20.4' | string,
 
diff --git a/src/parseServerAddress.ts b/src/parseServerAddress.ts
index 17331252..acedf70a 100644
--- a/src/parseServerAddress.ts
+++ b/src/parseServerAddress.ts
@@ -5,6 +5,8 @@ export const parseServerAddress = (address: string | undefined, removeHttp = tru
     return { host: '', isWebSocket: false, serverIpFull: '' }
   }
 
+  if (/^ws:[^/]/.test(address)) address = address.replace('ws:', 'ws://')
+  if (/^wss:[^/]/.test(address)) address = address.replace('wss:', 'wss://')
   const isWebSocket = address.startsWith('ws://') || address.startsWith('wss://')
   if (isWebSocket) {
     return { host: address, isWebSocket: true, serverIpFull: address }
diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index 46964a90..4e62e31e 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -6,7 +6,7 @@ import Screen from './Screen'
 import Input from './Input'
 import Button from './Button'
 import SelectGameVersion from './SelectGameVersion'
-import { useIsSmallWidth, usePassesWindowDimensions } from './simpleHooks'
+import { usePassesScaledDimensions } from './UIProvider'
 
 export interface BaseServerInfo {
   ip: string
@@ -35,7 +35,7 @@ interface Props {
 const ELEMENTS_WIDTH = 190
 
 export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions, allowAutoConnect }: Props) => {
-  const isSmallHeight = !usePassesWindowDimensions(null, 350)
+  const isSmallHeight = !usePassesScaledDimensions(null, 350)
   const qsParamName = parseQs ? appQueryParams.name : undefined
   const qsParamIp = parseQs ? appQueryParams.ip : undefined
   const qsParamVersion = parseQs ? appQueryParams.version : undefined
@@ -54,7 +54,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   const [usernameOverride, setUsernameOverride] = React.useState(initialData?.usernameOverride ?? qsParamUsername ?? '')
   const lockConnect = qsParamLockConnect === 'true'
 
-  const smallWidth = useIsSmallWidth()
+  const smallWidth = !usePassesScaledDimensions(400)
   const initialAccount = initialData?.authenticatedAccountOverride
   const [accountIndex, setAccountIndex] = React.useState(initialAccount === true ? -2 : initialAccount ? (accounts?.includes(initialAccount) ? accounts.indexOf(initialAccount) : -2) : -1)
 
@@ -126,6 +126,8 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
     }
   }, [])
 
+  const displayConnectButton = qsParamIp
+
   return <Screen title={qsParamIp ? 'Connect to Server' : title} backdrop>
     <form
       style={{
@@ -139,9 +141,13 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
       }}
     >
       <div style={{
-        display: 'grid',
+        display: smallWidth ? 'flex' : 'grid',
         gap: 3,
-        gridTemplateColumns: smallWidth ? '1fr' : '1fr 1fr'
+        ...(smallWidth ? {
+          flexDirection: 'column',
+        } : {
+          gridTemplateColumns: '1fr 1fr'
+        })
       }}
       >
         {!lockConnect && <>
@@ -219,17 +225,29 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
         {!lockConnect && <>
           <ButtonWrapper onClick={() => {
             onBack()
-          }}>Cancel</ButtonWrapper>
-          <ButtonWrapper type='submit'>Save</ButtonWrapper>
+          }}>
+            Cancel
+          </ButtonWrapper>
+          <ButtonWrapper type='submit'>
+            {displayConnectButton ? 'Save' : <strong>Save</strong>}
+          </ButtonWrapper>
         </>}
-        {qsParamIp && <div style={{ gridColumn: smallWidth ? '' : 'span 2', display: 'flex', justifyContent: 'center' }}>
-          <ButtonWrapper
-            data-test-id='connect-qs'
-            onClick={() => {
-              onQsConnect?.(commonUseOptions)
-            }}
-          ><strong>Connect</strong></ButtonWrapper>
-        </div>}
+        {displayConnectButton && (
+          <div style={{
+            gridColumn: smallWidth ? '' : 'span 2',
+            display: 'flex',
+            justifyContent: 'center'
+          }}>
+            <ButtonWrapper
+              data-test-id='connect-qs'
+              onClick={() => {
+                onQsConnect?.(commonUseOptions)
+              }}
+            >
+              <strong>Connect</strong>
+            </ButtonWrapper>
+          </div>
+        )}
       </div>
     </form>
   </Screen>
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index 54d8cb40..61bec590 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -33,7 +33,7 @@ export default () => {
   const [blockL, setBlockL] = useState(0)
   const [biomeId, setBiomeId] = useState(0)
   const [day, setDay] = useState(0)
-  const [entitiesCount, setEntitiesCount] = useState(0)
+  const [entitiesCount, setEntitiesCount] = useState('0')
   const [dimension, setDimension] = useState('')
   const [cursorBlock, setCursorBlock] = useState<Block | null>(null)
   const minecraftYaw = useRef(0)
@@ -106,7 +106,7 @@ export default () => {
       setDimension(bot.game.dimension)
       setDay(bot.time.day)
       setCursorBlock(bot.blockAtCursor(5))
-      setEntitiesCount(Object.values(bot.entities).length)
+      setEntitiesCount(`${viewer.entities.entitiesRenderingCount} (${Object.values(bot.entities).length})`)
     }, 100)
 
     // @ts-expect-error
diff --git a/src/react/GlobalSearchInput.tsx b/src/react/GlobalSearchInput.tsx
index 05b102ac..96ac4e48 100644
--- a/src/react/GlobalSearchInput.tsx
+++ b/src/react/GlobalSearchInput.tsx
@@ -13,6 +13,7 @@ function InnerSearch () {
     margin: 'auto',
     zIndex: 11,
     width: 'min-content',
+    transform: 'scale(1.5)'
   }}
   >
     <Input
diff --git a/src/react/NoModalFoundProvider.tsx b/src/react/NoModalFoundProvider.tsx
index f3a8b1f2..c11b57ca 100644
--- a/src/react/NoModalFoundProvider.tsx
+++ b/src/react/NoModalFoundProvider.tsx
@@ -8,17 +8,24 @@ const componentActive = proxy({
   enabled: false
 })
 
-subscribe(activeModalStack, () => {
+const checkModalAvailability = () => {
   const last = activeModalStack.at(-1)
   let withWildCardModal = false
-  for (const modal of watchedModalsFromHooks) {
+  for (const modal of watchedModalsFromHooks.value) {
     if (modal.endsWith('*') && last?.reactType.startsWith(modal.slice(0, -1))) {
       withWildCardModal = true
       break
     }
   }
 
-  componentActive.enabled = !!last && !hardcodedKnownModals.some(x => last.reactType.startsWith(x)) && !watchedModalsFromHooks.has(last.reactType) && !withWildCardModal
+  componentActive.enabled = !!last && !hardcodedKnownModals.some(x => last.reactType.startsWith(x)) && !watchedModalsFromHooks.value.has(last.reactType) && !withWildCardModal
+}
+
+subscribe(activeModalStack, () => {
+  checkModalAvailability()
+})
+subscribe(watchedModalsFromHooks, () => {
+  checkModalAvailability()
 })
 
 export default () => {
diff --git a/src/react/SignEditorProvider.tsx b/src/react/SignEditorProvider.tsx
index fbf30667..676c7ff5 100644
--- a/src/react/SignEditorProvider.tsx
+++ b/src/react/SignEditorProvider.tsx
@@ -6,10 +6,10 @@ import SignEditor, { ResultType } from './SignEditor'
 
 
 const isWysiwyg = async () => {
-  const items = await bot.tabComplete('/', true, true)
-  const commands = new Set<string>(['data'])
+  const items = await bot.tabComplete('/data ', true, true)
+  const commands = new Set<string>(['merge'])
   for (const item of items) {
-    if (commands.has(item.match as unknown as string)) {
+    if (commands.has((item.match ?? item) as unknown as string)) {
       return true
     }
   }
diff --git a/src/react/UIProvider.tsx b/src/react/UIProvider.tsx
new file mode 100644
index 00000000..31d038a0
--- /dev/null
+++ b/src/react/UIProvider.tsx
@@ -0,0 +1,30 @@
+import { createContext, useContext, useEffect, useState } from 'react'
+import { useMedia } from 'react-use'
+
+export const ScaleContext = createContext<number>(1)
+
+export const useScale = () => useContext(ScaleContext)
+
+export const UIProvider = ({ children, scale = 1 }) => {
+  return (
+    <ScaleContext.Provider value={scale}>
+      {children}
+    </ScaleContext.Provider>
+  )
+}
+
+
+export const usePassesScaledDimensions = (minWidth: number | null = null, minHeight: number | null = null) => {
+  const scale = useScale()
+  const conditions: string[] = []
+
+  if (minWidth !== null) {
+    conditions.push(`(min-width: ${minWidth * scale}px)`)
+  }
+  if (minHeight !== null) {
+    conditions.push(`(min-height: ${minHeight * scale}px)`)
+  }
+
+  const media = conditions.join(' and ') || 'all'
+  return useMedia(media)
+}
diff --git a/src/react/utilsApp.ts b/src/react/utilsApp.ts
index 445007ec..859cd10b 100644
--- a/src/react/utilsApp.ts
+++ b/src/react/utilsApp.ts
@@ -1,9 +1,11 @@
-import { useSnapshot } from 'valtio'
+import { proxy, useSnapshot } from 'valtio'
 import { useEffect, useMemo } from 'react'
 import { useMedia } from 'react-use'
 import { activeModalStack, miscUiState } from '../globalState'
 
-export const watchedModalsFromHooks = new Set<string>()
+export const watchedModalsFromHooks = proxy({
+  value: new Set<string>()
+})
 // todo should not be there
 export const hardcodedKnownModals = [
   'player_win:',
@@ -15,12 +17,12 @@ export const useUsingTouch = () => {
 }
 export const useIsModalActive = (modal: string, useIncludes = false) => {
   useMemo(() => {
-    watchedModalsFromHooks.add(modal)
+    watchedModalsFromHooks.value.add(modal)
   }, [])
   useEffect(() => {
     // watchedModalsFromHooks.add(modal)
     return () => {
-      watchedModalsFromHooks.delete(modal)
+      watchedModalsFromHooks.value.delete(modal)
     }
   }, [])
 
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 46a7ad81..fc508a3a 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -49,6 +49,8 @@ import DebugEdges from './react/DebugEdges'
 import GameInteractionOverlay from './react/GameInteractionOverlay'
 import MineflayerPluginHud from './react/MineflayerPluginHud'
 import MineflayerPluginConsole from './react/MineflayerPluginConsole'
+import { UIProvider } from './react/UIProvider'
+import { useAppScale } from './scaleInterface'
 
 const RobustPortal = ({ children, to }) => {
   return createPortal(<PerComponentErrorBoundary>{children}</PerComponentErrorBoundary>, to)
@@ -175,45 +177,47 @@ const WidgetDisplay = ({ name, Component }) => {
 }
 
 const App = () => {
-  return <div>
-    <ButtonAppProvider>
-      <RobustPortal to={document.body}>
-        <div className='overlay-bottom-scaled'>
-          <InGameComponent>
-            <HeldMapUi />
-          </InGameComponent>
-        </div>
-        <div />
-      </RobustPortal>
-      <EnterFullscreenButton />
-      <InGameUi />
-      <RobustPortal to={document.querySelector('#ui-root')}>
-        <AllWidgets />
-        <SingleplayerProvider />
-        <CreateWorldProvider />
-        <AppStatusProvider />
-        <KeybindingsScreenProvider />
-        <SelectOption />
-        <ServersListProvider />
-        <OptionsRenderApp />
-        <MainMenuRenderApp />
-        <NotificationProvider />
-        <TouchAreasControlsProvider />
-        <SignInMessageProvider />
-        <NoModalFoundProvider />
-        {/* <GameHud>
-        </GameHud> */}
-      </RobustPortal>
-      <RobustPortal to={document.body}>
-        {/* todo correct mounting! */}
-        <div className='overlay-top-scaled'>
-          <GamepadUiCursor />
-        </div>
-        <div />
-        <DebugEdges />
-      </RobustPortal>
-    </ButtonAppProvider>
-  </div>
+  const scale = useAppScale()
+  return (
+    <UIProvider scale={scale}>
+      <div>
+        <ButtonAppProvider>
+          <RobustPortal to={document.body}>
+            <div className='overlay-bottom-scaled'>
+              <InGameComponent>
+                <HeldMapUi />
+              </InGameComponent>
+            </div>
+            <div />
+          </RobustPortal>
+          <EnterFullscreenButton />
+          <InGameUi />
+          <RobustPortal to={document.querySelector('#ui-root')}>
+            <AllWidgets />
+            <SingleplayerProvider />
+            <CreateWorldProvider />
+            <AppStatusProvider />
+            <KeybindingsScreenProvider />
+            <SelectOption />
+            <ServersListProvider />
+            <OptionsRenderApp />
+            <MainMenuRenderApp />
+            <NotificationProvider />
+            <TouchAreasControlsProvider />
+            <SignInMessageProvider />
+            <NoModalFoundProvider />
+          </RobustPortal>
+          <RobustPortal to={document.body}>
+            <div className='overlay-top-scaled'>
+              <GamepadUiCursor />
+            </div>
+            <div />
+            <DebugEdges />
+          </RobustPortal>
+        </ButtonAppProvider>
+      </div>
+    </UIProvider>
+  )
 }
 
 const PerComponentErrorBoundary = ({ children }) => {
diff --git a/src/rendererUtils.ts b/src/rendererUtils.ts
index 0b78835e..12081649 100644
--- a/src/rendererUtils.ts
+++ b/src/rendererUtils.ts
@@ -1,67 +1,96 @@
 import { subscribeKey } from 'valtio/utils'
 import { gameAdditionalState } from './globalState'
 import { options } from './optionsStorage'
+import { playerState } from './mineflayer/playerState'
 
 let currentFov = 0
 let targetFov = 0
 let lastUpdateTime = 0
 const FOV_TRANSITION_DURATION = 200 // milliseconds
 
+// TODO: These should be configured based on your game's settings
+const BASE_MOVEMENT_SPEED = 0.1 // Default walking speed in Minecraft
+const FOV_EFFECT_SCALE = 1 // Equivalent to Minecraft's FOV Effects slider
+
 const updateFovAnimation = () => {
-  if (currentFov === targetFov) return
+  if (!bot) return
 
-  const now = performance.now()
-  const elapsed = now - lastUpdateTime
-  const progress = Math.min(elapsed / FOV_TRANSITION_DURATION, 1)
+  // Calculate base FOV modifier
+  let fovModifier = 1
 
-  // Smooth easing function
-  const easeOutCubic = (t: number) => 1 - (1 - t) ** 3
-
-  currentFov += (targetFov - currentFov) * easeOutCubic(progress)
-
-  if (Math.abs(currentFov - targetFov) < 0.01) {
-    currentFov = targetFov
+  // Flying modifier
+  if (gameAdditionalState.isFlying) {
+    fovModifier *= 1.05
   }
 
-  viewer.camera.fov = currentFov
-  viewer.camera.updateProjectionMatrix()
+  // Movement speed modifier
+  // TODO: Get actual movement speed attribute value
+  const movementSpeedAttr = (bot.entity?.attributes?.['generic.movement_speed'] || bot.entity?.attributes?.['minecraft:movement_speed'] || bot.entity?.attributes?.['movement_speed'] || bot.entity?.attributes?.['minecraft:movementSpeed'])?.value || BASE_MOVEMENT_SPEED
+  let currentSpeed = BASE_MOVEMENT_SPEED
+  // todo
+  if (bot.controlState?.sprint && !bot.controlState?.sneak) {
+    currentSpeed *= 1.3
+  }
+  fovModifier *= (currentSpeed / movementSpeedAttr + 1) / 2
+
+  // Validate fov modifier
+  if (Math.abs(BASE_MOVEMENT_SPEED) < Number.EPSILON || isNaN(fovModifier) || !isFinite(fovModifier)) {
+    fovModifier = 1
+  }
+
+  // Item usage modifier
+  if (playerState.getHeldItem()) {
+    const heldItem = playerState.getHeldItem()
+    if (heldItem?.name === 'bow' && playerState.getItemUsageTicks() > 0) {
+      const ticksUsingItem = playerState.getItemUsageTicks()
+      let usageProgress = ticksUsingItem / 20
+      if (usageProgress > 1) {
+        usageProgress = 1
+      } else {
+        usageProgress *= usageProgress
+      }
+      fovModifier *= 1 - usageProgress * 0.15
+    }
+    // TODO: Add spyglass/scope check here if needed
+  }
+
+  // Apply FOV effect scale
+  fovModifier = 1 + (fovModifier - 1) * FOV_EFFECT_SCALE
+
+  // Calculate target FOV
+  const baseFov = gameAdditionalState.isZooming ? 30 : options.fov
+  targetFov = baseFov * fovModifier
+
+  // Smooth transition
+  const now = performance.now()
+  if (currentFov !== targetFov) {
+    const elapsed = now - lastUpdateTime
+    const progress = Math.min(elapsed / FOV_TRANSITION_DURATION, 1)
+    const easeOutCubic = (t: number) => 1 - (1 - t) ** 3
+
+    currentFov += (targetFov - currentFov) * easeOutCubic(progress)
+
+    if (Math.abs(currentFov - targetFov) < 0.01) {
+      currentFov = targetFov
+    }
+
+    viewer.camera.fov = currentFov
+    viewer.camera.updateProjectionMatrix()
+  }
+  lastUpdateTime = now
 }
 
 export const watchFov = () => {
-  const updateFov = () => {
-    if (!bot) return
-    let fov = gameAdditionalState.isZooming ? 30 : options.fov
-
-    if (bot.controlState.sprint && !bot.controlState.sneak) {
-      fov += 5
-    }
-    if (gameAdditionalState.isFlying) {
-      fov += 5
-    }
-
-    if (targetFov !== fov) {
-      targetFov = fov
-      lastUpdateTime = performance.now()
-    }
-  }
-
-  customEvents.on('gameLoaded', () => {
-    updateFov()
-  })
-
-  updateFov()
-
-  // Add FOV animation to render loop
+  // Initial FOV setup
   if (!beforeRenderFrame.includes(updateFovAnimation)) {
     beforeRenderFrame.push(updateFovAnimation)
   }
 
-  subscribeKey(options, 'fov', updateFov)
-  subscribeKey(gameAdditionalState, 'isFlying', updateFov)
-  subscribeKey(gameAdditionalState, 'isSprinting', updateFov)
-  subscribeKey(gameAdditionalState, 'isZooming', updateFov)
+  customEvents.on('gameLoaded', () => {
+    updateFovAnimation()
+  })
+
   subscribeKey(gameAdditionalState, 'isSneaking', () => {
-    viewer.isSneaking = gameAdditionalState.isSneaking
     viewer.setFirstPersonCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch)
   })
 }
diff --git a/src/scaleInterface.ts b/src/scaleInterface.ts
index c7e08622..28fcc690 100644
--- a/src/scaleInterface.ts
+++ b/src/scaleInterface.ts
@@ -1,6 +1,8 @@
-import { proxy } from 'valtio'
+import { proxy, useSnapshot } from 'valtio'
 import { subscribeKey } from 'valtio/utils'
+import { useMedia } from 'react-use'
 import { options, watchValue } from './optionsStorage'
+import { useScale } from './react/UIProvider'
 
 export const currentScaling = proxy({
   scale: 1,
@@ -9,11 +11,11 @@ window.currentScaling = currentScaling
 
 const setScale = () => {
   const scaleValues = [
-    { maxWidth: 971, maxHeight: null, scale: 2 },
+    { maxWidth: 980, maxHeight: null, scale: 2 },
     { maxWidth: null, maxHeight: 390, scale: 1.5 }, // todo allow to set the scaling at 360-400 (dynamic scaling setting)
-    { maxWidth: 590, maxHeight: null, scale: 1 },
+    { maxWidth: 620, maxHeight: null, scale: 1 },
 
-    { maxWidth: 590, minHeight: 240, scale: 1.4 },
+    { maxWidth: 620, minHeight: 240, scale: 1.4 },
   ]
 
   const { innerWidth, innerHeight } = window
@@ -35,3 +37,7 @@ watchValue(currentScaling, (c) => {
   document.documentElement.style.setProperty('--guiScale', String(c.scale))
 })
 window.addEventListener('resize', setScale)
+
+export const useAppScale = () => {
+  return useSnapshot(currentScaling).scale
+}
diff --git a/src/shims/dns.js b/src/shims/dns.js
index 22160ff3..a2bcc34c 100644
--- a/src/shims/dns.js
+++ b/src/shims/dns.js
@@ -9,6 +9,24 @@ module.exports.resolveSrv = function (hostname, callback) {
   Http.responseType = 'json'
   Http.send()
 
+  const minecraftServerHostname = hostname.startsWith('_minecraft._tcp.') ? hostname.slice('_minecraft._tcp.'.length) : null
+  if (minecraftServerHostname) {
+    Http.onerror = async function () {
+      try {
+        if (!globalThis.resolveDnsFallback) return
+        const result = await globalThis.resolveDnsFallback(minecraftServerHostname)
+        callback(null, result ? [{
+          priority: 0,
+          weight: 0,
+          port: result.port,
+          name: result.host
+        }] : [])
+      } catch (err) {
+        callback(err)
+      }
+    }
+  }
+
   Http.onload = function () {
     const { response } = Http
     if (response.Status === 3) {
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index e248c459..2afb011e 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -96,6 +96,7 @@ export const watchOptionsAfterWorldViewInit = () => {
   watchValue(options, o => {
     if (!worldView) return
     worldView.keepChunksDistance = o.keepChunksDistance
-    viewer.world.config.displayHand = o.handDisplay
+    viewer.world.config.showHand = o.showHand
+    viewer.world.config.viewBobbing = o.viewBobbing
   })
 }
diff --git a/src/worldInteractions.ts b/src/worldInteractions.ts
index 80143303..a3210231 100644
--- a/src/worldInteractions.ts
+++ b/src/worldInteractions.ts
@@ -25,6 +25,7 @@ import { options } from './optionsStorage'
 import { itemBeingUsed } from './react/Crosshair'
 import { isCypress } from './standaloneUtils'
 import { displayClientChat } from './botUtils'
+import { playerState } from './mineflayer/playerState'
 
 function getViewDirection (pitch, yaw) {
   const csPitch = Math.cos(pitch)
@@ -332,6 +333,7 @@ class WorldInteraction {
         if (item) {
           customEvents.emit('activateItem', item, offhand ? 45 : bot.quickBarSlot, offhand)
         }
+        playerState.startUsingItem()
         itemBeingUsed.name = (offhand ? bot.inventory.slots[45]?.name : bot.heldItem?.name) ?? null
         itemBeingUsed.hand = offhand ? 1 : 0
       }
@@ -343,6 +345,7 @@ class WorldInteraction {
       // "only foods and bow can be deactivated" - not true, shields also can be deactivated and client always sends this
       // if (bot.heldItem && (loadedData.foodsArray.map((f) => f.name).includes(bot.heldItem.name) || bot.heldItem.name === 'bow')) {
       bot.deactivateItem()
+      playerState.stopUsingItem()
       // }
     }
 

From 847fed51428205d6470e037f5df8b7523dd8b66a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 15 Feb 2025 21:28:37 +0300
Subject: [PATCH 230/753] fix: handle unsuccessful block breaking packet (eg
 spawn protection)

---
 src/worldInteractions.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/worldInteractions.ts b/src/worldInteractions.ts
index a3210231..e54b0ebe 100644
--- a/src/worldInteractions.ts
+++ b/src/worldInteractions.ts
@@ -190,6 +190,18 @@ class WorldInteraction {
       }
     })
 
+    // Handle acknowledge_player_digging packet
+    bot._client.on('acknowledge_player_digging', (data: { location: { x: number, y: number, z: number }, block: number, status: number, successful: boolean } | { sequenceId: number }) => {
+      if ('location' in data && !data.successful) {
+        const packetPos = new Vec3(data.location.x, data.location.y, data.location.z)
+        if (this.cursorBlock?.position.equals(packetPos)) {
+          this.buttons[0] = false
+          this.update()
+          this.stopBreakAnimation()
+        }
+      }
+    })
+
     const upLineMaterial = () => {
       const inCreative = bot.game.gameMode === 'creative'
       const pixelRatio = viewer.renderer.getPixelRatio()

From 874a3b3ab09cae57b661459f8026e587f8f740aa Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Mon, 17 Feb 2025 14:41:52 +0100
Subject: [PATCH 231/753] feat: option to disable ears on all skins (#275)

---
 renderer/viewer/lib/entities.ts            | 19 +++++++++++--------
 renderer/viewer/lib/worldrendererCommon.ts |  1 +
 src/optionsGuiScheme.tsx                   |  3 +++
 src/optionsStorage.ts                      |  1 +
 src/watchOptions.ts                        |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/renderer/viewer/lib/entities.ts b/renderer/viewer/lib/entities.ts
index dc918173..2cccd8c3 100644
--- a/renderer/viewer/lib/entities.ts
+++ b/renderer/viewer/lib/entities.ts
@@ -348,7 +348,8 @@ export class Entities extends EventEmitter {
     }
 
     if (typeof skinUrl !== 'string') throw new Error('Invalid skin url')
-    void this.loadAndApplySkin(entityId, skinUrl).then(() => {
+    const renderEars = this.viewer.world.config.renderEars || username === 'deadmau5'
+    void this.loadAndApplySkin(entityId, skinUrl, renderEars).then(() => {
       if (capeUrl) {
         if (capeUrl === true && username) {
           capeUrl = getLookupUrl(username, 'cape')
@@ -371,7 +372,7 @@ export class Entities extends EventEmitter {
     }
   }
 
-  private async loadAndApplySkin (entityId: string | number, skinUrl: string) {
+  private async loadAndApplySkin (entityId: string | number, skinUrl: string, renderEars: boolean) {
     let playerObject = this.getPlayerObject(entityId)
     if (!playerObject) return
 
@@ -396,14 +397,13 @@ export class Entities extends EventEmitter {
       playerObject.skin.map = skinTexture as any
       playerObject.skin.modelType = inferModelType(skinTexture.image)
 
-      const earsCanvas = document.createElement('canvas')
-      if (playerCustomSkinImage) {
+      let earsCanvas
+      if (renderEars && playerCustomSkinImage) {
+        earsCanvas = document.createElement('canvas')
         loadEarsToCanvasFromSkin(earsCanvas, playerCustomSkinImage)
+        renderEars = !this.isCanvasBlank(earsCanvas)
       }
-      if (this.isCanvasBlank(earsCanvas)) {
-        playerObject.ears.map = null
-        playerObject.ears.visible = false
-      } else {
+      if (renderEars) {
         const earsTexture = new THREE.CanvasTexture(earsCanvas)
         earsTexture.magFilter = THREE.NearestFilter
         earsTexture.minFilter = THREE.NearestFilter
@@ -411,6 +411,9 @@ export class Entities extends EventEmitter {
         //@ts-expect-error
         playerObject.ears.map = earsTexture
         playerObject.ears.visible = true
+      } else {
+        playerObject.ears.map = null
+        playerObject.ears.visible = false
       }
       this.onSkinUpdate?.()
     } catch (error) {
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 7841016d..1ceef762 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -34,6 +34,7 @@ export const defaultWorldRendererConfig = {
   showChunkBorders: false,
   numWorkers: 4,
   isPlayground: false,
+  renderEars: true,
   // game renderer setting actually
   showHand: false,
   viewBobbing: false
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 31e84f58..bbc04fa6 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -91,6 +91,9 @@ export const guiOptionsScheme: {
         unit: '',
         tooltip: 'Additional distance to keep the chunks loading before unloading them by marking them as too far',
       },
+      renderEars: {
+        tooltip: 'Enable rendering Deadmau5 ears for all players if their skin contains textures for it',
+      },
       renderDebug: {
         values: [
           'advanced',
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index ff29f981..e07cbf55 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -46,6 +46,7 @@ const defaultOptions = {
   unimplementedContainers: false,
   dayCycleAndLighting: true,
   loadPlayerSkins: true,
+  renderEars: true,
   lowMemoryMode: false,
   starfieldRendering: true,
   enabledResourcepack: null as string | null,
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 2afb011e..acedad71 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -96,7 +96,7 @@ export const watchOptionsAfterWorldViewInit = () => {
   watchValue(options, o => {
     if (!worldView) return
     worldView.keepChunksDistance = o.keepChunksDistance
-    viewer.world.config.showHand = o.showHand
+    viewer.world.config.renderEars = o.renderEars
     viewer.world.config.viewBobbing = o.viewBobbing
   })
 }

From a20dca18f862d5375130014cb4615eeaf4b2ee88 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Mon, 17 Feb 2025 14:42:31 +0100
Subject: [PATCH 232/753] fix: autoConnect parameter wouldn't do anything
 (#276)

---
 README.MD                        | 1 +
 src/react/AddServerOrConnect.tsx | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.MD b/README.MD
index d384d228..922984d1 100644
--- a/README.MD
+++ b/README.MD
@@ -152,6 +152,7 @@ Server specific:
 - `?proxy=<proxy_address>` - Set the proxy server address to use for  the server
 - `?username=<username>` - Set the username for the server
 - `?lockConnect=true` - Only works then `ip` parameter is set. Disables cancel/save buttons and all inputs in the connect screen already set as parameters. Useful for integrates iframes.
+- `?autoConnect=true` - Only works then `ip` and `version` parameters are set and `allowAutoConnect` is `true` in config.json! Directly connects to the specified server. Useful for integrates iframes.
 - `?serversList=<list_or_url>` - `<list_or_url>` can be a list of servers in the format `ip:version,ip` or a url to a json file with the same format (array) or a txt file with line-delimited list of server IPs.
 
 Single player specific:
diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index 4e62e31e..1186fd9a 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -42,6 +42,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   const qsParamProxy = parseQs ? appQueryParams.proxy : undefined
   const qsParamUsername = parseQs ? appQueryParams.username : undefined
   const qsParamLockConnect = parseQs ? appQueryParams.lockConnect : undefined
+  const qsParamAutoConnect = parseQs ? appQueryParams.autoConnect : undefined
 
   const parsedQsIp = parseServerAddress(qsParamIp)
   const parsedInitialIp = parseServerAddress(initialData?.ip)
@@ -121,7 +122,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   }
 
   useEffect(() => {
-    if (qsParamIp && qsParamVersion && allowAutoConnect) {
+    if (qsParamAutoConnect && qsParamIp && qsParamVersion && allowAutoConnect) {
       onQsConnect?.(commonUseOptions)
     }
   }, [])

From 5f6ce69b51e9e279e6116c031675aa01a259ee16 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Mon, 17 Feb 2025 19:40:17 +0300
Subject: [PATCH 233/753] feat: custom block models via custom channel (#277)

---
 renderer/viewer/lib/mesher/mesher.ts       | 11 +++-
 renderer/viewer/lib/mesher/shared.ts       |  5 ++
 renderer/viewer/lib/mesher/world.ts        | 19 ++++--
 renderer/viewer/lib/viewer.ts              |  1 -
 renderer/viewer/lib/worldrendererCommon.ts | 35 ++++++++--
 src/customChannels.ts                      | 75 ++++++++++++++++++++++
 src/index.ts                               |  1 +
 src/optionsStorage.ts                      |  1 +
 src/resourcePack.ts                        |  2 +-
 9 files changed, 135 insertions(+), 15 deletions(-)
 create mode 100644 src/customChannels.ts

diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index ed81bb84..132179da 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -106,19 +106,26 @@ const handleMessage = data => {
     }
     case 'chunk': {
       world.addColumn(data.x, data.z, data.chunk)
-
+      if (data.customBlockModels) {
+        const chunkKey = `${data.x},${data.z}`
+        world.customBlockModels.set(chunkKey, data.customBlockModels)
+      }
       break
     }
     case 'unloadChunk': {
       world.removeColumn(data.x, data.z)
+      world.customBlockModels.delete(`${data.x},${data.z}`)
       if (Object.keys(world.columns).length === 0) softCleanup()
-
       break
     }
     case 'blockUpdate': {
       const loc = new Vec3(data.pos.x, data.pos.y, data.pos.z).floored()
       world.setBlockStateId(loc, data.stateId)
 
+      const chunkKey = `${Math.floor(loc.x / 16) * 16},${Math.floor(loc.z / 16) * 16}`
+      if (data.customBlockModels) {
+        world.customBlockModels.set(chunkKey, data.customBlockModels)
+      }
       break
     }
     case 'reset': {
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index 9f88d2af..6da1aed5 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -12,6 +12,10 @@ export const defaultMesherConfig = {
   disableSignsMapsSupport: false
 }
 
+export type CustomBlockModels = {
+  [blockPosKey: string]: string // blockPosKey is "x,y,z" -> model name
+}
+
 export type MesherConfig = typeof defaultMesherConfig
 
 export type MesherGeometryOutput = {
@@ -36,6 +40,7 @@ export type MesherGeometryOutput = {
   highestBlocks: Map<string, HighestBlockInfo>
   hadErrors: boolean
   blocksCount: number
+  customBlockModels?: CustomBlockModels
 }
 
 export type HighestBlockInfo = { y: number, stateId: number | undefined, biomeId: number | undefined }
diff --git a/renderer/viewer/lib/mesher/world.ts b/renderer/viewer/lib/mesher/world.ts
index f6094e2c..c2dd3b7f 100644
--- a/renderer/viewer/lib/mesher/world.ts
+++ b/renderer/viewer/lib/mesher/world.ts
@@ -5,7 +5,7 @@ import { Vec3 } from 'vec3'
 import { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import moreBlockDataGeneratedJson from '../moreBlockDataGenerated.json'
 import legacyJson from '../../../../src/preflatMap.json'
-import { defaultMesherConfig } from './shared'
+import { defaultMesherConfig, CustomBlockModels } from './shared'
 import { INVISIBLE_BLOCKS } from './worldConstants'
 
 const ignoreAoBlocks = Object.keys(moreBlockDataGeneratedJson.noOcclusions)
@@ -48,6 +48,7 @@ export class World {
   biomeCache: { [id: number]: mcData.Biome }
   preflat: boolean
   erroredBlockModel?: BlockModelPartsResolved
+  customBlockModels = new Map<string, CustomBlockModels>() // chunkKey -> blockModels
 
   constructor (version) {
     this.Chunk = Chunks(version) as any
@@ -126,6 +127,8 @@ export class World {
     // for easier testing
     if (!(pos instanceof Vec3)) pos = new Vec3(...pos as [number, number, number])
     const key = columnKey(Math.floor(pos.x / 16) * 16, Math.floor(pos.z / 16) * 16)
+    const blockPosKey = `${pos.x},${pos.y},${pos.z}`
+    const modelOverride = this.customBlockModels.get(key)?.[blockPosKey]
 
     const column = this.columns[key]
     // null column means chunk not loaded
@@ -135,10 +138,15 @@ export class World {
     const locInChunk = posInChunk(loc)
     const stateId = column.getBlockStateId(locInChunk)
 
-    if (!this.blockCache[stateId]) {
+    const cacheKey = modelOverride ? `${stateId}:${modelOverride}` : stateId
+
+    if (!this.blockCache[cacheKey]) {
       const b = column.getBlock(locInChunk) as unknown as WorldBlock
+      if (modelOverride) {
+        b.name = modelOverride
+      }
       b.isCube = isCube(b.shapes)
-      this.blockCache[stateId] = b
+      this.blockCache[cacheKey] = b
       Object.defineProperty(b, 'position', {
         get () {
           throw new Error('position is not reliable, use pos parameter instead of block.position')
@@ -163,7 +171,7 @@ export class World {
       }
     }
 
-    const block = this.blockCache[stateId]
+    const block = this.blockCache[cacheKey]
 
     if (block.models === undefined && blockProvider) {
       if (!attr) throw new Error('attr is required')
@@ -188,10 +196,11 @@ export class World {
           }
         }
 
+        const useFallbackModel = this.preflat || modelOverride
         block.models = blockProvider.getAllResolvedModels0_1({
           name: block.name,
           properties: props,
-        }, this.preflat)! // fixme! this is a hack (also need a setting for all versions)
+        }, useFallbackModel)! // fixme! this is a hack (also need a setting for all versions)
         if (!block.models!.length) {
           if (block.name !== 'water' && block.name !== 'lava' && !INVISIBLE_BLOCKS.has(block.name)) {
             console.debug('[mesher] block to render not found', block.name, props)
diff --git a/renderer/viewer/lib/viewer.ts b/renderer/viewer/lib/viewer.ts
index beacaf77..7b951438 100644
--- a/renderer/viewer/lib/viewer.ts
+++ b/renderer/viewer/lib/viewer.ts
@@ -124,7 +124,6 @@ export class Viewer {
   async demoModel () {
     //@ts-expect-error
     const pos = cursorBlockRel(0, 1, 0).position
-    const blockProvider = worldBlockProvider(this.world.blockstatesModels, this.world.blocksAtlasParser!.atlas, 'latest')
 
     const mesh = await getMyHand()
     // mesh.rotation.y = THREE.MathUtils.degToRad(90)
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 1ceef762..0cd0b955 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -15,10 +15,11 @@ import { LineMaterial } from 'three-stdlib'
 import christmasPack from 'mc-assets/dist/textureReplacements/christmas'
 import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import itemDefinitionsJson from 'mc-assets/dist/itemDefinitions.json'
+import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
 import { toMajorVersion } from '../../../src/utils'
 import { buildCleanupDecorator } from './cleanupDecorator'
-import { defaultMesherConfig, HighestBlockInfo, MesherGeometryOutput } from './mesher/shared'
+import { defaultMesherConfig, HighestBlockInfo, MesherGeometryOutput, CustomBlockModels } from './mesher/shared'
 import { chunkPos } from './simpleUtils'
 import { HandItemBlock } from './holdingBlock'
 import { updateStatText } from './ui/newStats'
@@ -151,7 +152,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   @worldCleanup()
   itemsRenderer: ItemsRenderer | undefined
 
+  customBlockModels = new Map<string, CustomBlockModels>()
+
   abstract outputFormat: 'threeJs' | 'webgpu'
+  worldBlockProvider: WorldBlockProvider
 
   abstract changeBackgroundColor (color: [number, number, number]): void
 
@@ -316,7 +320,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.mesherConfig.version = this.version!
 
     this.sendMesherMcData()
-    await this.updateTexturesData()
+    await this.updateAssetsData()
   }
 
   sendMesherMcData () {
@@ -333,7 +337,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
   }
 
-  async updateTexturesData (resourcePackUpdate = false, prioritizeBlockTextures?: string[]) {
+  async updateAssetsData (resourcePackUpdate = false, prioritizeBlockTextures?: string[]) {
     const blocksAssetsParser = new AtlasParser(this.sourceData.blocksAtlases, blocksAtlasLatest, blocksAtlasLegacy)
     const itemsAssetsParser = new AtlasParser(this.sourceData.itemsAtlases, itemsAtlasLatest, itemsAtlasLegacy)
 
@@ -357,6 +361,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.itemsAtlasParser = new AtlasParser({ latest: itemsAtlas }, itemsCanvas.toDataURL())
 
     this.itemsRenderer = new ItemsRenderer(this.version!, this.blockstatesModels, this.itemsAtlasParser, this.blocksAtlasParser)
+    this.worldBlockProvider = worldBlockProvider(this.blockstatesModels, this.blocksAtlasParser.atlas, 'latest')
 
     const texture = await new THREE.TextureLoader().loadAsync(this.blocksAtlasParser.latestImage)
     texture.magFilter = THREE.NearestFilter
@@ -410,9 +415,18 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.initialChunkLoadWasStartedIn ??= Date.now()
     this.loadedChunks[`${x},${z}`] = true
     this.updateChunksStatsText()
+
+    const chunkKey = `${x},${z}`
+    const customBlockModels = this.customBlockModels.get(chunkKey)
+
     for (const worker of this.workers) {
-      // todo optimize
-      worker.postMessage({ type: 'chunk', x, z, chunk })
+      worker.postMessage({
+        type: 'chunk',
+        x,
+        z,
+        chunk,
+        customBlockModels: customBlockModels || undefined
+      })
     }
     for (let y = this.worldMinYRender; y < this.worldConfig.worldHeight; y += 16) {
       const loc = new Vec3(x, y, z)
@@ -462,8 +476,17 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   setBlockStateId (pos: Vec3, stateId: number) {
     const needAoRecalculation = true
+    const chunkKey = `${Math.floor(pos.x / 16) * 16},${Math.floor(pos.z / 16) * 16}`
+    const blockPosKey = `${pos.x},${pos.y},${pos.z}`
+    const customBlockModels = this.customBlockModels.get(chunkKey) || {}
+
     for (const worker of this.workers) {
-      worker.postMessage({ type: 'blockUpdate', pos, stateId })
+      worker.postMessage({
+        type: 'blockUpdate',
+        pos,
+        stateId,
+        customBlockModels
+      })
     }
     this.setSectionDirty(pos, true, true)
     if (this.neighborChunkUpdates) {
diff --git a/src/customChannels.ts b/src/customChannels.ts
new file mode 100644
index 00000000..075bf23a
--- /dev/null
+++ b/src/customChannels.ts
@@ -0,0 +1,75 @@
+import { Vec3 } from 'vec3'
+import { options } from './optionsStorage'
+
+customEvents.on('mineflayerBotCreated', async () => {
+  if (!options.customChannels) return
+  await new Promise(resolve => {
+    bot.once('login', () => {
+      resolve(true)
+    })
+  })
+
+  const CHANNEL_NAME = 'minecraft-web-client:blockmodels'
+
+  const packetStructure = [
+    'container',
+    [
+      {
+        name: 'worldName', // currently not used
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'x',
+        type: 'i32'
+      },
+      {
+        name: 'y',
+        type: 'i32'
+      },
+      {
+        name: 'z',
+        type: 'i32'
+      },
+      {
+        name: 'model',
+        type: ['pstring', { countType: 'i16' }]
+      }
+    ]
+  ]
+
+  bot._client.registerChannel(CHANNEL_NAME, packetStructure, true)
+
+  bot._client.on(CHANNEL_NAME as any, (data) => {
+    const { worldName, x, y, z, model } = data
+    console.debug('Received model data:', { worldName, x, y, z, model })
+
+    if (viewer?.world) {
+      const chunkX = Math.floor(x / 16) * 16
+      const chunkZ = Math.floor(z / 16) * 16
+      const chunkKey = `${chunkX},${chunkZ}`
+      const blockPosKey = `${x},${y},${z}`
+
+      const chunkModels = viewer.world.customBlockModels.get(chunkKey) || {}
+
+      if (model) {
+        chunkModels[blockPosKey] = model
+      } else {
+        delete chunkModels[blockPosKey]
+      }
+
+      if (Object.keys(chunkModels).length > 0) {
+        viewer.world.customBlockModels.set(chunkKey, chunkModels)
+      } else {
+        viewer.world.customBlockModels.delete(chunkKey)
+      }
+
+      // Trigger update
+      const block = worldView!.world.getBlock(new Vec3(x, y, z))
+      if (block) {
+        worldView!.world.setBlockStateId(new Vec3(x, y, z), block.stateId)
+      }
+    }
+  })
+
+  console.debug(`registered custom channel ${CHANNEL_NAME} channel`)
+})
diff --git a/src/index.ts b/src/index.ts
index 975be6c5..bf41abc9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,6 +5,7 @@ import './testCrasher'
 import './globals'
 import './devtools'
 import './entities'
+import './customChannels'
 import './globalDomListeners'
 import './mineflayer/maps'
 import './mineflayer/cameraShake'
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index e07cbf55..8102ead5 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -56,6 +56,7 @@ const defaultOptions = {
   viewBobbing: true,
   packetsLoggerPreset: 'all' as 'all' | 'no-buffers',
   serversAutoVersionSelect: 'auto' as 'auto' | 'latest' | '1.20.4' | string,
+  customChannels: false,
 
   // antiAliasing: false,
 
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 3ad1b2e9..d17d07b4 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -506,7 +506,7 @@ const updateTextures = async () => {
     }
   }
   if (viewer.world.active) {
-    await viewer.world.updateTexturesData()
+    await viewer.world.updateAssetsData()
     if (viewer.world instanceof WorldRendererThree) {
       viewer.world.rerenderAllChunks?.()
     }

From 4a1138f21c9ec31b7455d608efa5b6be3cb144d8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 18 Feb 2025 02:06:00 +0300
Subject: [PATCH 234/753] fix: fix memory leak with textures when a lot of
 entities are loaded at the same time (eg big servers like hypixel), make
 entities def loader faster

---
 renderer/viewer/lib/entities.ts          |     2 +-
 renderer/viewer/lib/entity/EntityMesh.ts |     8 +-
 renderer/viewer/lib/entity/entities.json | 16387 +--------------------
 renderer/viewer/lib/holdingBlock.ts      |     5 -
 renderer/viewer/lib/utils.electron.js    |    17 -
 renderer/viewer/lib/utils.js             |    57 -
 renderer/viewer/lib/utils.ts             |    55 +
 renderer/viewer/lib/utils.web.js         |    29 -
 src/devtools.ts                          |     2 +
 9 files changed, 77 insertions(+), 16485 deletions(-)
 delete mode 100644 renderer/viewer/lib/utils.electron.js
 delete mode 100644 renderer/viewer/lib/utils.js
 create mode 100644 renderer/viewer/lib/utils.ts
 delete mode 100644 renderer/viewer/lib/utils.web.js

diff --git a/renderer/viewer/lib/entities.ts b/renderer/viewer/lib/entities.ts
index 2cccd8c3..0e5938b2 100644
--- a/renderer/viewer/lib/entities.ts
+++ b/renderer/viewer/lib/entities.ts
@@ -24,7 +24,7 @@ import { Viewer } from './viewer'
 import { getBlockMeshFromModel } from './holdingBlock'
 import { ItemSpecificContextProperties } from './basePlayerState'
 import { loadSkinImage, getLookupUrl, stevePngUrl, steveTexture } from './utils/skins'
-const { loadTexture } = globalThis.isElectron ? require('./utils.electron.js') : require('./utils')
+import { loadTexture } from './utils'
 
 export const TWEEN_DURATION = 120
 
diff --git a/renderer/viewer/lib/entity/EntityMesh.ts b/renderer/viewer/lib/entity/EntityMesh.ts
index 1f38f471..3835ab8a 100644
--- a/renderer/viewer/lib/entity/EntityMesh.ts
+++ b/renderer/viewer/lib/entity/EntityMesh.ts
@@ -5,12 +5,10 @@ import { Vec3 } from 'vec3'
 import spectralArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/spectral_arrow.png'
 import tippedArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/tipped_arrow.png'
 import { WorldRendererCommon } from '../worldrendererCommon'
+import { loadTexture } from '../utils'
 import entities from './entities.json'
 import { externalModels } from './objModels'
 import externalTexturesJson from './externalTextures.json'
-// import { loadTexture } from globalThis.isElectron ? '../utils.electron.js' : '../utils';
-
-const { loadTexture } = globalThis.isElectron ? require('../utils.electron.js') : require('../utils')
 
 interface ElemFace {
   dir: [number, number, number]
@@ -323,11 +321,11 @@ export function getMesh (
       loadedTexture.wrapS = THREE.RepeatWrapping
       loadedTexture.wrapT = THREE.RepeatWrapping
       material.map = loadedTexture
-      const actualWidth = loadedTexture.image?.width
+      const actualWidth = loadedTexture.image.width
       if (actualWidth && textureWidth !== actualWidth) {
         loadedTexture.repeat.x = textureWidth / actualWidth
       }
-      const actualHeight = loadedTexture.image?.height
+      const actualHeight = loadedTexture.image.height
       if (actualHeight && textureHeight !== actualHeight) {
         loadedTexture.repeat.y = textureHeight / actualHeight
       }
diff --git a/renderer/viewer/lib/entity/entities.json b/renderer/viewer/lib/entity/entities.json
index 4436a44b..645635b7 100644
--- a/renderer/viewer/lib/entity/entities.json
+++ b/renderer/viewer/lib/entity/entities.json
@@ -4,183 +4,6 @@
     "min_engine_version": "1.8.0",
     "materials": {"default": "armor_stand"},
     "textures": {"default": "textures/entity/armorstand/wood"},
-    "animations": {
-      "default_pose": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", "-this", "-this"]},
-          "head": {"rotation": ["-this", "-this", "-this"]},
-          "leftarm": {"rotation": ["-this - 10", "-this", "-this - 10"]},
-          "leftleg": {"rotation": ["-this - 1", "-this", "-this - 1"]},
-          "rightarm": {"rotation": ["-this - 15", "-this", "-this + 10"]},
-          "rightitem": {"rotation": ["-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-this + 1", "-this", "-this + 1"]}
-        }
-      },
-      "no_pose": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", "-this", "-this"]},
-          "head": {"rotation": ["-this", "-this", "-this"]},
-          "leftarm": {"rotation": ["-this", "-this", "-this"]},
-          "leftleg": {"rotation": ["-this", "-this", "-this"]},
-          "rightarm": {"rotation": ["-this", "-this", "-this"]},
-          "rightitem": {"rotation": ["-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-this", "-this", "-this"]}
-        }
-      },
-      "solemn_pose": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", "-this", "-this + 2"]},
-          "head": {"rotation": ["-this + 15", "-this", "-this"]},
-          "leftarm": {"rotation": ["-this - 30", "-this + 15", "-this + 15"]},
-          "leftleg": {"rotation": ["-this - 1", "-this", "-this - 1"]},
-          "rightarm": {"rotation": ["-this - 60", "-this - 20", "-this - 10"]},
-          "rightitem": {"rotation": ["-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-this + 1", "-this", "-this + 1"]}
-        }
-      },
-      "athena_pose": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", "-this", "-this + 2"]},
-          "head": {"rotation": ["-this - 5", "-this", "-this"]},
-          "leftarm": {"rotation": ["-this + 10", "-this", "-this - 5"]},
-          "leftleg": {"rotation": ["-this - 3", "-this - 3", "-this - 3"]},
-          "rightarm": {"rotation": ["-this - 60", "-this + 20", "-this - 10"]},
-          "rightitem": {"rotation": ["-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-this + 3", "-this + 3", "-this + 3"]}
-        }
-      },
-      "brandish_pose": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", "-this", "-this - 2"]},
-          "head": {"rotation": ["-this - 15", "-this", "-this"]},
-          "leftarm": {"rotation": ["-this + 20", "-this", "-this - 10"]},
-          "leftleg": {"rotation": ["-this + 5", "-this - 3", "-this - 3"]},
-          "rightarm": {"rotation": ["-this - 110", "-this + 50", "-this"]},
-          "rightitem": {"rotation": ["-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-this - 5", "-this + 3", "-this + 3"]}
-        }
-      },
-      "honor_pose": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", "-this", "-this"]},
-          "head": {"rotation": ["-this - 15", "-this", "-this"]},
-          "leftarm": {"rotation": ["-this - 110", "-this + 35", "-this"]},
-          "leftleg": {"rotation": ["-this + 5", "-this - 3", "-this - 3"]},
-          "rightarm": {"rotation": ["-this - 110", "-this - 35", "-this"]},
-          "rightitem": {"rotation": ["-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-this - 5", "-this + 3", "-this + 3"]}
-        }
-      },
-      "entertain_pose": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", "-this", "-this"]},
-          "head": {"rotation": ["-this - 15", "-this", "-this"]},
-          "leftarm": {"rotation": ["-this - 110", "-this - 35", "-this"]},
-          "leftleg": {"rotation": ["-this + 5", "-this - 3", "-this - 3"]},
-          "rightarm": {"rotation": ["-this - 110", "-this + 35", "-this"]},
-          "rightitem": {"rotation": ["-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-this - 5", "-this + 3", "-this + 3"]}
-        }
-      },
-      "salute_pose": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", "-this", "-this"]},
-          "head": {"rotation": ["-this", "-this", "-this"]},
-          "leftarm": {"rotation": ["-this + 10", "-this", "-this - 5"]},
-          "leftleg": {"rotation": ["-this - 1", "-this", "-this - 1"]},
-          "rightarm": {"rotation": ["-this - 70", "-this - 40", "-this"]},
-          "rightitem": {"rotation": ["-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-this + 1", "-this", "-this + 1"]}
-        }
-      },
-      "riposte_pose": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", "-this", "-this"]},
-          "head": {"rotation": ["-this + 16", "-this + 20", "-this"]},
-          "leftarm": {"rotation": ["-this + 4", "-this + 8", "-this + 237"]},
-          "leftleg": {"rotation": ["-this - 14", "-this - 18", "-this - 16"]},
-          "rightarm": {"rotation": ["-this + 246", "-this", "-this + 89"]},
-          "rightitem": {"rotation": ["-this", "-this + 180", "-this"]},
-          "rightleg": {"rotation": ["-this + 8", "-this + 20", "-this + 4"]}
-        }
-      },
-      "zombie_pose": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", "-this", "-this"]},
-          "head": {"rotation": ["-this - 10", "-this", "-this - 5"]},
-          "leftarm": {"rotation": ["-this - 105", "-this", "-this"]},
-          "leftleg": {"rotation": ["-this + 7", "-this", "-this"]},
-          "rightarm": {"rotation": ["-this - 100", "-this", "-this"]},
-          "rightitem": {"rotation": ["-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-this - 46", "-this", "-this"]}
-        }
-      },
-      "cancan_a_pose": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", "-this + 22", "-this"]},
-          "head": {"rotation": ["-this - 5", "-this + 18", "-this"]},
-          "leftarm": {"rotation": ["-this + 8", "-this", "-this - 114"]},
-          "leftleg": {"rotation": ["-this - 111", "-this + 55", "-this"]},
-          "rightarm": {"rotation": ["-this", "-this + 84", "-this + 111"]},
-          "rightitem": {"rotation": ["-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-this", "-this + 23", "-this - 13"]}
-        }
-      },
-      "cancan_b_pose": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", "-this - 18", "-this"]},
-          "head": {"rotation": ["-this - 10", "-this - 20", "-this"]},
-          "leftarm": {"rotation": ["-this", "-this", "-this - 112"]},
-          "leftleg": {"rotation": ["-this", "-this", "-this + 13"]},
-          "rightarm": {"rotation": ["-this + 8", "-this + 90", "-this + 111"]},
-          "rightitem": {"rotation": ["-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-this - 119", "-this - 42", "-this"]}
-        }
-      },
-      "hero_pose": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", "-this + 8", "-this"]},
-          "head": {"rotation": ["-this - 4", "-this + 67", "-this"]},
-          "leftarm": {"rotation": ["-this + 16", "-this + 32", "-this - 8"]},
-          "leftleg": {"rotation": ["-this", "-this - 75", "-this - 8"]},
-          "rightarm": {"rotation": ["-this - 99", "-this + 63", "-this"]},
-          "rightitem": {"rotation": ["-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-this + 4", "-this + 63", "-this + 8"]}
-        }
-      },
-      "wiggle": {
-        "loop": true,
-        "bones": {
-          "baseplate": {
-            "rotation": [
-              0,
-              "math.sin((variable.armor_stand.hurt_time - query.frame_alpha) * 120) * 3",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {
-      "initialize": [
-        "variable.armor_stand.pose_index = 0;",
-        "variable.armor_stand.hurt_time = 0;"
-      ],
-      "animate": ["controller.pose", "controller.wiggling"]
-    },
     "geometry": {
       "default": {
         "bones": [
@@ -261,281 +84,7 @@
       }
     },
     "render_controllers": ["controller.render.armor_stand"],
-    "enable_attachables": true,
-    "animation_controllers": {
-      "controller.pose": {
-        "initial_state": "default",
-        "states": {
-          "athena": {
-            "animations": ["athena_pose"],
-            "blend_transition": 0.1,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"default": "variable.armor_stand.pose_index == 0"},
-              {"none": "variable.armor_stand.pose_index == 1"},
-              {"solemn": "variable.armor_stand.pose_index == 2"},
-              {"brandish": "variable.armor_stand.pose_index == 4"},
-              {"honor": "variable.armor_stand.pose_index == 5"},
-              {"entertain": "variable.armor_stand.pose_index == 6"},
-              {"salute": "variable.armor_stand.pose_index == 7"},
-              {"riposte": "variable.armor_stand.pose_index == 8"},
-              {"zombie": "variable.armor_stand.pose_index == 9"},
-              {"cancan_a": "variable.armor_stand.pose_index == 10"},
-              {"cancan_b": "variable.armor_stand.pose_index == 11"},
-              {"hero": "variable.armor_stand.pose_index == 12"}
-            ]
-          },
-          "brandish": {
-            "animations": ["brandish_pose"],
-            "blend_transition": 0.1,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"default": "variable.armor_stand.pose_index == 0"},
-              {"none": "variable.armor_stand.pose_index == 1"},
-              {"solemn": "variable.armor_stand.pose_index == 2"},
-              {"athena": "variable.armor_stand.pose_index == 3"},
-              {"honor": "variable.armor_stand.pose_index == 5"},
-              {"entertain": "variable.armor_stand.pose_index == 6"},
-              {"salute": "variable.armor_stand.pose_index == 7"},
-              {"riposte": "variable.armor_stand.pose_index == 8"},
-              {"zombie": "variable.armor_stand.pose_index == 9"},
-              {"cancan_a": "variable.armor_stand.pose_index == 10"},
-              {"cancan_b": "variable.armor_stand.pose_index == 11"},
-              {"hero": "variable.armor_stand.pose_index == 12"}
-            ]
-          },
-          "cancan_a": {
-            "animations": ["cancan_a_pose"],
-            "blend_transition": 0.1,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"default": "variable.armor_stand.pose_index == 0"},
-              {"none": "variable.armor_stand.pose_index == 1"},
-              {"solemn": "variable.armor_stand.pose_index == 2"},
-              {"athena": "variable.armor_stand.pose_index == 3"},
-              {"brandish": "variable.armor_stand.pose_index == 4"},
-              {"honor": "variable.armor_stand.pose_index == 5"},
-              {"entertain": "variable.armor_stand.pose_index == 6"},
-              {"salute": "variable.armor_stand.pose_index == 7"},
-              {"riposte": "variable.armor_stand.pose_index == 8"},
-              {"zombie": "variable.armor_stand.pose_index == 9"},
-              {"cancan_b": "variable.armor_stand.pose_index == 11"},
-              {"hero": "variable.armor_stand.pose_index == 12"}
-            ]
-          },
-          "cancan_b": {
-            "animations": ["cancan_b_pose"],
-            "blend_transition": 0.1,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"default": "variable.armor_stand.pose_index == 0"},
-              {"none": "variable.armor_stand.pose_index == 1"},
-              {"solemn": "variable.armor_stand.pose_index == 2"},
-              {"athena": "variable.armor_stand.pose_index == 3"},
-              {"brandish": "variable.armor_stand.pose_index == 4"},
-              {"honor": "variable.armor_stand.pose_index == 5"},
-              {"entertain": "variable.armor_stand.pose_index == 6"},
-              {"salute": "variable.armor_stand.pose_index == 7"},
-              {"riposte": "variable.armor_stand.pose_index == 8"},
-              {"zombie": "variable.armor_stand.pose_index == 9"},
-              {"cancan_a": "variable.armor_stand.pose_index == 10"},
-              {"hero": "variable.armor_stand.pose_index == 12"}
-            ]
-          },
-          "default": {
-            "animations": ["default_pose"],
-            "blend_transition": 0.1,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"none": "variable.armor_stand.pose_index == 1"},
-              {"solemn": "variable.armor_stand.pose_index == 2"},
-              {"athena": "variable.armor_stand.pose_index == 3"},
-              {"brandish": "variable.armor_stand.pose_index == 4"},
-              {"honor": "variable.armor_stand.pose_index == 5"},
-              {"entertain": "variable.armor_stand.pose_index == 6"},
-              {"salute": "variable.armor_stand.pose_index == 7"},
-              {"riposte": "variable.armor_stand.pose_index == 8"},
-              {"zombie": "variable.armor_stand.pose_index == 9"},
-              {"cancan_a": "variable.armor_stand.pose_index == 10"},
-              {"cancan_b": "variable.armor_stand.pose_index == 11"},
-              {"hero": "variable.armor_stand.pose_index == 12"}
-            ]
-          },
-          "entertain": {
-            "animations": ["entertain_pose"],
-            "blend_transition": 0.1,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"default": "variable.armor_stand.pose_index == 0"},
-              {"none": "variable.armor_stand.pose_index == 1"},
-              {"solemn": "variable.armor_stand.pose_index == 2"},
-              {"athena": "variable.armor_stand.pose_index == 3"},
-              {"brandish": "variable.armor_stand.pose_index == 4"},
-              {"honor": "variable.armor_stand.pose_index == 5"},
-              {"salute": "variable.armor_stand.pose_index == 7"},
-              {"riposte": "variable.armor_stand.pose_index == 8"},
-              {"zombie": "variable.armor_stand.pose_index == 9"},
-              {"cancan_a": "variable.armor_stand.pose_index == 10"},
-              {"cancan_b": "variable.armor_stand.pose_index == 11"},
-              {"hero": "variable.armor_stand.pose_index == 12"}
-            ]
-          },
-          "hero": {
-            "animations": ["hero_pose"],
-            "blend_transition": 0.1,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"default": "variable.armor_stand.pose_index == 0"},
-              {"none": "variable.armor_stand.pose_index == 1"},
-              {"solemn": "variable.armor_stand.pose_index == 2"},
-              {"athena": "variable.armor_stand.pose_index == 3"},
-              {"brandish": "variable.armor_stand.pose_index == 4"},
-              {"honor": "variable.armor_stand.pose_index == 5"},
-              {"entertain": "variable.armor_stand.pose_index == 6"},
-              {"salute": "variable.armor_stand.pose_index == 7"},
-              {"riposte": "variable.armor_stand.pose_index == 8"},
-              {"zombie": "variable.armor_stand.pose_index == 9"},
-              {"cancan_a": "variable.armor_stand.pose_index == 10"},
-              {"cancan_b": "variable.armor_stand.pose_index == 11"}
-            ]
-          },
-          "honor": {
-            "animations": ["honor_pose"],
-            "blend_transition": 0.1,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"default": "variable.armor_stand.pose_index == 0"},
-              {"none": "variable.armor_stand.pose_index == 1"},
-              {"solemn": "variable.armor_stand.pose_index == 2"},
-              {"athena": "variable.armor_stand.pose_index == 3"},
-              {"brandish": "variable.armor_stand.pose_index == 4"},
-              {"entertain": "variable.armor_stand.pose_index == 6"},
-              {"salute": "variable.armor_stand.pose_index == 7"},
-              {"riposte": "variable.armor_stand.pose_index == 8"},
-              {"zombie": "variable.armor_stand.pose_index == 9"},
-              {"cancan_a": "variable.armor_stand.pose_index == 10"},
-              {"cancan_b": "variable.armor_stand.pose_index == 11"},
-              {"hero": "variable.armor_stand.pose_index == 12"}
-            ]
-          },
-          "none": {
-            "animations": ["no_pose"],
-            "blend_transition": 0.1,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"default": "variable.armor_stand.pose_index == 0"},
-              {"solemn": "variable.armor_stand.pose_index == 2"},
-              {"athena": "variable.armor_stand.pose_index == 3"},
-              {"brandish": "variable.armor_stand.pose_index == 4"},
-              {"honor": "variable.armor_stand.pose_index == 5"},
-              {"entertain": "variable.armor_stand.pose_index == 6"},
-              {"salute": "variable.armor_stand.pose_index == 7"},
-              {"riposte": "variable.armor_stand.pose_index == 8"},
-              {"zombie": "variable.armor_stand.pose_index == 9"},
-              {"cancan_a": "variable.armor_stand.pose_index == 10"},
-              {"cancan_b": "variable.armor_stand.pose_index == 11"},
-              {"hero": "variable.armor_stand.pose_index == 12"}
-            ]
-          },
-          "riposte": {
-            "animations": ["riposte_pose"],
-            "blend_transition": 0.1,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"default": "variable.armor_stand.pose_index == 0"},
-              {"none": "variable.armor_stand.pose_index == 1"},
-              {"solemn": "variable.armor_stand.pose_index == 2"},
-              {"athena": "variable.armor_stand.pose_index == 3"},
-              {"brandish": "variable.armor_stand.pose_index == 4"},
-              {"honor": "variable.armor_stand.pose_index == 5"},
-              {"entertain": "variable.armor_stand.pose_index == 6"},
-              {"salute": "variable.armor_stand.pose_index == 7"},
-              {"zombie": "variable.armor_stand.pose_index == 9"},
-              {"cancan_a": "variable.armor_stand.pose_index == 10"},
-              {"cancan_b": "variable.armor_stand.pose_index == 11"},
-              {"hero": "variable.armor_stand.pose_index == 12"}
-            ]
-          },
-          "salute": {
-            "animations": ["salute_pose"],
-            "blend_transition": 0.1,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"default": "variable.armor_stand.pose_index == 0"},
-              {"none": "variable.armor_stand.pose_index == 1"},
-              {"solemn": "variable.armor_stand.pose_index == 2"},
-              {"athena": "variable.armor_stand.pose_index == 3"},
-              {"brandish": "variable.armor_stand.pose_index == 4"},
-              {"honor": "variable.armor_stand.pose_index == 5"},
-              {"entertain": "variable.armor_stand.pose_index == 6"},
-              {"riposte": "variable.armor_stand.pose_index == 8"},
-              {"zombie": "variable.armor_stand.pose_index == 9"},
-              {"cancan_a": "variable.armor_stand.pose_index == 10"},
-              {"cancan_b": "variable.armor_stand.pose_index == 11"},
-              {"hero": "variable.armor_stand.pose_index == 12"}
-            ]
-          },
-          "solemn": {
-            "animations": ["solemn_pose"],
-            "blend_transition": 0.1,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"default": "variable.armor_stand.pose_index == 0"},
-              {"none": "variable.armor_stand.pose_index == 1"},
-              {"athena": "variable.armor_stand.pose_index == 3"},
-              {"brandish": "variable.armor_stand.pose_index == 4"},
-              {"honor": "variable.armor_stand.pose_index == 5"},
-              {"entertain": "variable.armor_stand.pose_index == 6"},
-              {"salute": "variable.armor_stand.pose_index == 7"},
-              {"riposte": "variable.armor_stand.pose_index == 8"},
-              {"zombie": "variable.armor_stand.pose_index == 9"},
-              {"cancan_a": "variable.armor_stand.pose_index == 10"},
-              {"cancan_b": "variable.armor_stand.pose_index == 11"},
-              {"hero": "variable.armor_stand.pose_index == 12"}
-            ]
-          },
-          "zombie": {
-            "animations": ["zombie_pose"],
-            "blend_transition": 0.1,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"default": "variable.armor_stand.pose_index == 0"},
-              {"none": "variable.armor_stand.pose_index == 1"},
-              {"solemn": "variable.armor_stand.pose_index == 2"},
-              {"athena": "variable.armor_stand.pose_index == 3"},
-              {"brandish": "variable.armor_stand.pose_index == 4"},
-              {"honor": "variable.armor_stand.pose_index == 5"},
-              {"entertain": "variable.armor_stand.pose_index == 6"},
-              {"salute": "variable.armor_stand.pose_index == 7"},
-              {"riposte": "variable.armor_stand.pose_index == 8"},
-              {"cancan_a": "variable.armor_stand.pose_index == 10"},
-              {"cancan_b": "variable.armor_stand.pose_index == 11"},
-              {"hero": "variable.armor_stand.pose_index == 12"}
-            ]
-          }
-        }
-      },
-      "controller.wiggling": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [
-              {
-                "wiggling": "(variable.armor_stand.hurt_time - query.frame_alpha) > 0"
-              }
-            ]
-          },
-          "wiggling": {
-            "animations": ["wiggle"],
-            "transitions": [
-              {
-                "default": "(variable.armor_stand.hurt_time - query.frame_alpha) <= 0"
-              }
-            ]
-          }
-        }
-      }
-    }
+    "enable_attachables": true
   },
   "arrow": {
     "identifier": "minecraft:arrow",
@@ -573,28 +122,6 @@
         "textureheight": 32
       }
     },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "variable.shake_power - query.target_x_rotation",
-              "-query.target_y_rotation",
-              0
-            ],
-            "scale": [0.7, 0.7, 0.9]
-          }
-        }
-      }
-    },
-    "scripts": {
-      "pre_animation": [
-        "variable.shake = query.shake_time - query.frame_alpha;",
-        "variable.shake_power = variable.shake > 0.0 ? -Math.sin(variable.shake * 200.0) * variable.shake : 0.0;"
-      ],
-      "animate": ["move"]
-    },
     "render_controllers": ["controller.render.arrow"]
   },
   "bat": {
@@ -674,81 +201,6 @@
         ]
       }
     },
-    "scripts": {"scale": "0.35"},
-    "animations": {
-      "resting": {
-        "loop": true,
-        "bones": {
-          "body": {"position": [0, -0.035, 0], "rotation": [180, 0, 0]},
-          "head": {
-            "position": [0, -0.035, 0],
-            "rotation": [
-              "query.target_x_rotation",
-              "180.0f - query.target_y_rotation",
-              180
-            ]
-          },
-          "leftwing": {"position": [3, 0, 3], "rotation": [-9, 72, 0]},
-          "leftwingtip": {"rotation": [0, 99, 0]},
-          "rightwing": {"position": [-3, 0, 3], "rotation": [-9, -72, 0]},
-          "rightwingtip": {"rotation": [0, -99, 0]}
-        }
-      },
-      "flying": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [0, "math.cos(query.life_time * 343.774) * 1.6", 0],
-            "rotation": [
-              "45.0 - math.cos(query.life_time * 1489.6) * 8.59",
-              0,
-              0
-            ]
-          },
-          "head": {
-            "position": [
-              "-this",
-              "math.cos(query.life_time * 343.774) * 1.6 - this",
-              "-this"
-            ],
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          },
-          "leftwing": {
-            "position": ["-this", "-this", "-this"],
-            "rotation": [0, "math.cos(query.life_time * 1489.6) * -45.0", 0]
-          },
-          "leftwingtip": {
-            "rotation": [0, "math.cos(query.life_time * 1489.6) * -22.0", 0]
-          },
-          "rightwing": {
-            "position": ["-this", "-this", "-this"],
-            "rotation": [0, "math.cos(query.life_time * 1489.6) * 45.0", 0]
-          },
-          "rightwingtip": {
-            "rotation": [0, "math.cos(query.life_time * 1489.6) * 22.0", 0]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "move": {
-        "initial_state": "flying",
-        "states": {
-          "flying": {
-            "animations": ["flying"],
-            "transitions": [{"resting": "query.is_resting"}]
-          },
-          "resting": {
-            "animations": ["resting"],
-            "transitions": [{"flying": "!query.is_resting"}]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.bat"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 18}
   },
@@ -822,890 +274,9 @@
         ]
       }
     },
-    "animations": {
-      "flying": {
-        "loop": true,
-        "animation_length": 2.55,
-        "bones": {
-          "body": {
-            "rotation": {"0.0": [0, 0, 0], "1.30": [5, 0, 0], "2.55": [0, 0, 0]}
-          },
-          "leftwing_bone": {
-            "rotation": {
-              "0.0": [0, 0, 35],
-              "0.05": [0, 0, 0],
-              "0.10": [0, 0, -35],
-              "0.15": [0, 0, 0],
-              "0.2": [0, 0, 35],
-              "0.25": [0, 0, 0],
-              "0.30": [0, 0, -35],
-              "0.35": [0, 0, 0],
-              "0.40": [0, 0, 35],
-              "0.45": [0, 0, 0],
-              "0.50": [0, 0, -35],
-              "0.55": [0, 0, 0],
-              "0.60": [0, 0, 35],
-              "0.65": [0, 0, 0],
-              "0.70": [0, 0, -35],
-              "0.75": [0, 0, 0],
-              "0.80": [0, 0, 35],
-              "0.85": [0, 0, 0],
-              "0.90": [0, 0, -35],
-              "0.95": [0, 0, 0],
-              "1.0": [0, 0, 35],
-              "1.05": [0, 0, 0],
-              "1.10": [0, 0, -35],
-              "1.15": [0, 0, 0],
-              "1.20": [0, 0, 35],
-              "1.25": [0, 0, 0],
-              "1.30": [0, 0, -35],
-              "1.35": [0, 0, 0],
-              "1.40": [0, 0, 35],
-              "1.45": [0, 0, 0],
-              "1.50": [0, 0, -35],
-              "1.55": [0, 0, 0],
-              "1.60": [0, 0, 35],
-              "1.65": [0, 0, 0],
-              "1.70": [0, 0, -35],
-              "1.75": [0, 0, 0],
-              "1.80": [0, 0, 35],
-              "1.85": [0, 0, 0],
-              "1.90": [0, 0, -35],
-              "1.95": [0, 0, 0],
-              "2.0": [0, 0, 35],
-              "2.05": [0, 0, 0],
-              "2.10": [0, 0, -35],
-              "2.15": [0, 0, 0],
-              "2.20": [0, 0, 35],
-              "2.25": [0, 0, 0],
-              "2.30": [0, 0, -35],
-              "2.35": [0, 0, 0],
-              "2.40": [0, 0, 35],
-              "2.45": [0, 0, 0],
-              "2.50": [0, 0, -35],
-              "2.55": [0, 0, 0]
-            }
-          },
-          "leg_front": {
-            "rotation": {
-              "0.0": [15, 0, 0],
-              "1.20": [25, 0, 0],
-              "2.55": [15, 0, 0]
-            }
-          },
-          "leg_mid": {
-            "rotation": {
-              "0.0": [15, 0, 0],
-              "1.30": [35, 0, 0],
-              "2.55": [15, 0, 0]
-            }
-          },
-          "leg_back": {
-            "rotation": {
-              "0.0": [30, 0, 0],
-              "1.60": [45, 0, 0],
-              "2.55": [30, 0, 0]
-            }
-          },
-          "rightwing_bone": {
-            "rotation": {
-              "0.0": [0, 0, -35],
-              "0.05": [0, 0, 0],
-              "0.10": [0, 0, 35],
-              "0.15": [0, 0, 0],
-              "0.2": [0, 0, -35],
-              "0.25": [0, 0, 0],
-              "0.30": [0, 0, 35],
-              "0.35": [0, 0, 0],
-              "0.40": [0, 0, -35],
-              "0.45": [0, 0, 0],
-              "0.50": [0, 0, 35],
-              "0.55": [0, 0, 0],
-              "0.60": [0, 0, -35],
-              "0.65": [0, 0, 0],
-              "0.70": [0, 0, 35],
-              "0.75": [0, 0, 0],
-              "0.80": [0, 0, -35],
-              "0.85": [0, 0, 0],
-              "0.90": [0, 0, 35],
-              "0.95": [0, 0, 0],
-              "1.0": [0, 0, -35],
-              "1.05": [0, 0, 0],
-              "1.10": [0, 0, 35],
-              "1.15": [0, 0, 0],
-              "1.20": [0, 0, -35],
-              "1.25": [0, 0, 0],
-              "1.30": [0, 0, 35],
-              "1.35": [0, 0, 0],
-              "1.40": [0, 0, -35],
-              "1.45": [0, 0, 0],
-              "1.50": [0, 0, 35],
-              "1.55": [0, 0, 0],
-              "1.60": [0, 0, -35],
-              "1.65": [0, 0, 0],
-              "1.70": [0, 0, 35],
-              "1.75": [0, 0, 0],
-              "1.80": [0, 0, -35],
-              "1.85": [0, 0, 0],
-              "1.90": [0, 0, 35],
-              "1.95": [0, 0, 0],
-              "2.0": [0, 0, -35],
-              "2.05": [0, 0, 0],
-              "2.10": [0, 0, 35],
-              "2.15": [0, 0, 0],
-              "2.20": [0, 0, -35],
-              "2.25": [0, 0, 0],
-              "2.30": [0, 0, 35],
-              "2.35": [0, 0, 0],
-              "2.40": [0, 0, -35],
-              "2.45": [0, 0, 0],
-              "2.50": [0, 0, 35],
-              "2.55": [0, 0, 0]
-            }
-          }
-        }
-      },
-      "bee_sting": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": ["-175 * math.sin(variable.attack_time * 180)", 0, 0]
-          }
-        }
-      },
-      "bee_no_stinger": {"loop": true, "bones": {"stinger": {"scale": 0}}},
-      "bee_fly_bobbing": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [0, "math.cos(query.life_time * 343.774) * 1.6", 0],
-            "rotation": [0, "20 * math.cos(query.life_time * 343.774 / 2)", 0]
-          }
-        }
-      }
-    },
     "particle_effects": {"nectar_dripping": "minecraft:nectar_drip_particle"},
-    "scripts": {
-      "animate": [
-        "bee_root_controller",
-        {"bee_no_stinger": "query.mark_variant == 1"}
-      ]
-    },
     "render_controllers": ["controller.render.bee"],
-    "spawn_egg": {"texture": "egg_bee", "texture_index": 0},
-    "animation_controllers": {
-      "drip": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"dripping": "query.is_powered"}]},
-          "dripping": {
-            "particle_effects": [{"effect": "nectar_dripping"}],
-            "transitions": [{"default": "!query.is_powered"}]
-          }
-        }
-      },
-      "controller_bee_sting": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["bee_sting"]}}
-      },
-      "bee_root_controller": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": [
-              "flying",
-              "drip",
-              "bee_fly_bobbing",
-              "controller_bee_sting"
-            ]
-          }
-        }
-      }
-    }
-  },
-  "blaze": {
-    "identifier": "minecraft:blaze",
-    "min_engine_version": "1.8.0",
-    "materials": {"body": "blaze_body", "head": "blaze_head"},
-    "textures": {"default": "textures/entity/blaze"},
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 1.5,
-        "visible_bounds_height": 2,
-        "visible_bounds_offset": [0, 1, 0],
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {
-            "name": "upperBodyParts0",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 16, 0], "size": [2, 8, 2], "uv": [0, 16]}]
-          },
-          {
-            "name": "upperBodyParts1",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 16, 0], "size": [2, 8, 2], "uv": [0, 16]}]
-          },
-          {
-            "name": "upperBodyParts2",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 16, 0], "size": [2, 8, 2], "uv": [0, 16]}]
-          },
-          {
-            "name": "upperBodyParts3",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 16, 0], "size": [2, 8, 2], "uv": [0, 16]}]
-          },
-          {
-            "name": "upperBodyParts4",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 16, 0], "size": [2, 8, 2], "uv": [0, 16]}]
-          },
-          {
-            "name": "upperBodyParts5",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 16, 0], "size": [2, 8, 2], "uv": [0, 16]}]
-          },
-          {
-            "name": "upperBodyParts6",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 16, 0], "size": [2, 8, 2], "uv": [0, 16]}]
-          },
-          {
-            "name": "upperBodyParts7",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 16, 0], "size": [2, 8, 2], "uv": [0, 16]}]
-          },
-          {
-            "name": "upperBodyParts8",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 16, 0], "size": [2, 8, 2], "uv": [0, 16]}]
-          },
-          {
-            "name": "upperBodyParts9",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 16, 0], "size": [2, 8, 2], "uv": [0, 16]}]
-          },
-          {
-            "name": "upperBodyParts10",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 16, 0], "size": [2, 8, 2], "uv": [0, 16]}]
-          },
-          {
-            "name": "upperBodyParts11",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 16, 0], "size": [2, 8, 2], "uv": [0, 16]}]
-          },
-          {
-            "name": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [-4, 20, -4], "size": [8, 8, 8], "uv": [0, 0]}]
-          }
-        ]
-      }
-    },
-    "animations": {
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "upperbodyparts0": {
-            "position": [
-              "math.cos(query.life_time * -360.0        ) * 9.0",
-              "2.0 + math.cos((0 * 2 + query.life_time * 20.0) * 14.32)",
-              "math.sin(query.life_time * -360.0        ) * 9.0"
-            ]
-          },
-          "upperbodyparts1": {
-            "position": [
-              "math.cos(query.life_time * -360.0 +  90.0) * 9.0",
-              "2.0 + math.cos((1 * 2 + query.life_time * 20.0) * 14.32)",
-              "math.sin(query.life_time * -360.0 +  90.0) * 9.0"
-            ]
-          },
-          "upperbodyparts10": {
-            "position": [
-              "math.cos(query.life_time * -180.0 + 207.0) * 5.0",
-              "-11.0 + math.cos((10 * 1.5 + query.life_time * 20.0) * 14.32)",
-              "math.sin(query.life_time * -180.0 + 207.0) * 5.0"
-            ]
-          },
-          "upperbodyparts11": {
-            "position": [
-              "math.cos(query.life_time * -180.0 + 297.0) * 5.0",
-              "-11.0 + math.cos((11 * 1.5 + query.life_time * 20.0) * 14.32)",
-              "math.sin(query.life_time * -180.0 + 297.0) * 5.0"
-            ]
-          },
-          "upperbodyparts2": {
-            "position": [
-              "math.cos(query.life_time * -360.0 + 180.0) * 9.0",
-              "2.0 + math.cos((2 * 2 + query.life_time * 20.0) * 14.32)",
-              "math.sin(query.life_time * -360.0 + 180.0) * 9.0"
-            ]
-          },
-          "upperbodyparts3": {
-            "position": [
-              "math.cos(query.life_time * -360.0 + 270.0) * 9.0",
-              "2.0 + math.cos((3 * 2 + query.life_time * 20.0) * 14.32)",
-              "math.sin(query.life_time * -360.0 + 270.0) * 9.0"
-            ]
-          },
-          "upperbodyparts4": {
-            "position": [
-              "math.cos(query.life_time * 108.0 +  45.0) * 7.0",
-              "-2.0 + math.cos((4 * 2 + query.life_time * 20.0) * 14.32)",
-              "math.sin(query.life_time * 108.0 +  45.0) * 7.0"
-            ]
-          },
-          "upperbodyparts5": {
-            "position": [
-              "math.cos(query.life_time * 108.0 + 135.0) * 7.0",
-              "-2.0 + math.cos((5 * 2 + query.life_time * 20.0) * 14.32)",
-              "math.sin(query.life_time * 108.0 + 135.0) * 7.0"
-            ]
-          },
-          "upperbodyparts6": {
-            "position": [
-              "math.cos(query.life_time * 108.0 + 225.0) * 7.0",
-              "-2.0 + math.cos((6 * 2 + query.life_time * 20.0) * 14.32)",
-              "math.sin(query.life_time * 108.0 + 225.0) * 7.0"
-            ]
-          },
-          "upperbodyparts7": {
-            "position": [
-              "math.cos(query.life_time * 108.0 + 315.0) * 7.0",
-              "-2.0 + math.cos((7 * 2 + query.life_time * 20.0) * 14.32)",
-              "math.sin(query.life_time * 108.0 + 315.0) * 7.0"
-            ]
-          },
-          "upperbodyparts8": {
-            "position": [
-              "math.cos(query.life_time * -180.0 +  27.0) * 5.0",
-              "-11.0 + math.cos((8 * 1.5 + query.life_time * 20.0) * 14.32)",
-              "math.sin(query.life_time * -180.0 +  27.0) * 5.0"
-            ]
-          },
-          "upperbodyparts9": {
-            "position": [
-              "math.cos(query.life_time * -180.0 + 117.0) * 5.0",
-              "-11.0 + math.cos((9 * 1.5 + query.life_time * 20.0) * 14.32)",
-              "math.sin(query.life_time * -180.0 + 117.0) * 5.0"
-            ]
-          }
-        }
-      }
-    },
-    "particle_effects": {"charged_flames": "minecraft:mobflame_emitter"},
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move", "look_at_target"]}}
-      },
-      "flame": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"flaming": "query.is_charged"}]},
-          "flaming": {
-            "particle_effects": [{"effect": "charged_flames"}],
-            "transitions": [{"default": "!query.is_charged"}]
-          }
-        }
-      }
-    },
-    "render_controllers": ["controller.render.blaze"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 21}
-  },
-  "boat": {
-    "identifier": "minecraft:boat",
-    "textures": {
-      "default": "textures/entity/boat/acacia",
-      "acacia": "textures/entity/boat/acacia",
-      "birch": "textures/entity/boat/birch",
-      "darkoak": "textures/entity/boat/dark_oak",
-      "jungle": "textures/entity/boat/jungle",
-      "oak": "textures/entity/boat/oak",
-      "spruce": "textures/entity/boat/spruce"
-    },
-    "geometry": {
-      "default": {
-        "texturewidth": 128,
-        "textureheight": 64,
-        "bones": [
-          {
-            "name": "bottom",
-            "pivot": [0, 18, 0],
-            "rotation": [90, 0, 0],
-            "mirror": true,
-            "cubes": [
-              {"origin": [-14, 10, 0], "size": [28, 16, 3], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "front",
-            "pivot": [15, 24, 0],
-            "rotation": [0, 90, 0],
-            "mirror": true,
-            "cubes": [
-              {"origin": [7, 21, -1], "size": [16, 6, 2], "uv": [0, 27]}
-            ]
-          },
-          {
-            "name": "back",
-            "pivot": [-15, 24, 0],
-            "rotation": [0, -90, 0],
-            "mirror": true,
-            "cubes": [
-              {"origin": [-24, 21, -1], "size": [18, 6, 2], "uv": [0, 19]}
-            ]
-          },
-          {
-            "name": "right",
-            "pivot": [0, 24, -9],
-            "rotation": [0, -180, 0],
-            "mirror": true,
-            "cubes": [
-              {"origin": [-14, 21, -10], "size": [28, 6, 2], "uv": [0, 35]}
-            ]
-          },
-          {
-            "name": "left",
-            "pivot": [0, 24, 9],
-            "mirror": true,
-            "cubes": [
-              {"origin": [-14, 21, 8], "size": [28, 6, 2], "uv": [0, 43]}
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "cat": {
-    "identifier": "minecraft:cat",
-    "materials": {"default": "cat"},
-    "textures": {
-      "white": "textures/entity/cat/white",
-      "black": "textures/entity/cat/tuxedo",
-      "red": "textures/entity/cat/red",
-      "siamese": "textures/entity/cat/siamese",
-      "british": "textures/entity/cat/british_shorthair",
-      "calico": "textures/entity/cat/calico",
-      "persian": "textures/entity/cat/persian",
-      "ragdoll": "textures/entity/cat/ragdoll",
-      "tabby": "textures/entity/cat/tabby",
-      "jellie": "textures/entity/cat/jellie",
-      "all_black": "textures/entity/cat/all_black",
-      "white_tame": "textures/entity/cat/white",
-      "black_tame": "textures/entity/cat/tuxedo_tame",
-      "red_tame": "textures/entity/cat/red",
-      "siamese_tame": "textures/entity/cat/siamese",
-      "british_tame": "textures/entity/cat/british_shorthair",
-      "calico_tame": "textures/entity/cat/calico",
-      "persian_tame": "textures/entity/cat/persian",
-      "ragdoll_tame": "textures/entity/cat/ragdoll",
-      "tabby_tame": "textures/entity/cat/tabby",
-      "all_black_tame": "textures/entity/cat/all_black",
-      "jellie_tame": "textures/entity/cat/jellie"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 2.5,
-        "visible_bounds_height": 1,
-        "visible_bounds_offset": [0, 0.5, 0],
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {
-            "pivot": [0, 9, -9],
-            "locators": {"lead": [0, 9, -9]},
-            "cubes": [
-              {"origin": [-2.5, 7, -12], "size": [5, 4, 5], "uv": [0, 0]},
-              {
-                "origin": [-1.5, 7.01562, -13],
-                "size": [3, 2, 2],
-                "uv": [0, 24]
-              },
-              {"origin": [-2, 11, -9], "size": [1, 1, 2], "uv": [0, 10]},
-              {"origin": [1, 11, -9], "size": [1, 1, 2], "uv": [6, 10]}
-            ],
-            "name": "head",
-            "parent": "body"
-          },
-          {
-            "pivot": [0, 7, 1],
-            "bind_pose_rotation": [90, 0, 0],
-            "cubes": [
-              {"origin": [-2, -1, -2], "size": [4, 16, 6], "uv": [20, 0]}
-            ],
-            "name": "body"
-          },
-          {
-            "pivot": [0, 9, 8],
-            "bind_pose_rotation": [90, 0, 0],
-            "cubes": [
-              {"origin": [-0.5, 1, 8], "size": [1, 8, 1], "uv": [0, 15]}
-            ],
-            "name": "tail1",
-            "parent": "body"
-          },
-          {
-            "pivot": [0, 9, 16],
-            "bind_pose_rotation": [90, 0, 0],
-            "cubes": [
-              {
-                "origin": [-0.5, 1, 16],
-                "size": [1, 8, 1],
-                "uv": [4, 15],
-                "inflate": 0,
-                "mirror": false
-              }
-            ],
-            "name": "tail2",
-            "parent": "tail1"
-          },
-          {
-            "pivot": [1.1, 6, 7],
-            "cubes": [
-              {
-                "origin": [0.1, 0, 6],
-                "size": [2, 6, 2],
-                "uv": [8, 13],
-                "inflate": 0,
-                "mirror": false
-              }
-            ],
-            "name": "backLegL",
-            "parent": "body"
-          },
-          {
-            "pivot": [-1.1, 6, 7],
-            "cubes": [
-              {
-                "origin": [-2.1, 0, 6],
-                "size": [2, 6, 2],
-                "uv": [8, 13],
-                "inflate": 0,
-                "mirror": false
-              }
-            ],
-            "name": "backLegR",
-            "parent": "body"
-          },
-          {
-            "pivot": [1.2, 10, -4],
-            "cubes": [
-              {
-                "origin": [0.2, 0.2, -5],
-                "size": [2, 10, 2],
-                "uv": [40, 0],
-                "inflate": 0,
-                "mirror": false
-              }
-            ],
-            "name": "frontLegL",
-            "parent": "body"
-          },
-          {
-            "pivot": [-1.2, 10, -4],
-            "cubes": [
-              {
-                "origin": [-2.2, 0.2, -5],
-                "size": [2, 10, 2],
-                "uv": [40, 0],
-                "inflate": 0,
-                "mirror": false
-              }
-            ],
-            "name": "frontLegR",
-            "parent": "body"
-          }
-        ]
-      }
-    },
-    "animations": {
-      "sneak": {
-        "loop": true,
-        "bones": {
-          "backlegl": {
-            "position": [0, 1, 0],
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17) * 57.3 * query.modified_move_speed",
-              0,
-              0
-            ]
-          },
-          "backlegr": {
-            "position": [0, 1, 0],
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 180.0) * 57.3 * query.modified_move_speed",
-              0,
-              0
-            ]
-          },
-          "body": {"position": [0, -1, 0]},
-          "frontlegl": {
-            "position": [0, 1, 0],
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 180.0) * 57.3 * query.modified_move_speed",
-              0,
-              0
-            ]
-          },
-          "frontlegr": {
-            "position": [0, 1, 0],
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17) * 57.3 * query.modified_move_speed",
-              0,
-              0
-            ]
-          },
-          "head": {"position": [0, -1, 0]},
-          "tail1": {"position": [0, 1, 0]},
-          "tail2": {
-            "rotation": [
-              "62.0 + math.cos(query.modified_distance_moved * 57.3) * 27.0 * query.modified_move_speed",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "walk": {
-        "loop": true,
-        "bones": {
-          "backlegl": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17) * 57.3 * query.modified_move_speed",
-              0,
-              0
-            ]
-          },
-          "backlegr": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 180.0) * 57.3 * query.modified_move_speed",
-              0,
-              0
-            ]
-          },
-          "frontlegl": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 180.0) * 57.3 * query.modified_move_speed",
-              0,
-              0
-            ]
-          },
-          "frontlegr": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17) * 57.3 * query.modified_move_speed",
-              0,
-              0
-            ]
-          },
-          "tail1": {"rotation": [-51.57, 0, 0]},
-          "tail2": {
-            "rotation": [
-              "62.0 + math.cos(query.modified_distance_moved * 57.3) * 45.0 * query.modified_move_speed",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "sprint": {
-        "loop": true,
-        "bones": {
-          "backlegl": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17) * 57.3 * query.modified_move_speed",
-              0,
-              0
-            ]
-          },
-          "backlegr": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 17.19) * 57.3 * query.modified_move_speed",
-              0,
-              0
-            ]
-          },
-          "frontlegl": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 197.19) * 57.3 * query.modified_move_speed",
-              0,
-              0
-            ]
-          },
-          "frontlegr": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 180.0) * 57.3 * query.modified_move_speed",
-              0,
-              0
-            ]
-          },
-          "tail1": {"rotation": [0, 0, 0]},
-          "tail2": {
-            "rotation": [
-              "62.0 + math.cos(query.modified_distance_moved * 57.3) * 18.0 * query.modified_move_speed",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "sit": {
-        "loop": true,
-        "bones": {
-          "backlegl": {"position": [0, 0, 1], "rotation": [-45, 0, 0]},
-          "backlegr": {"position": [0, 0, 1], "rotation": [-45, 0, 0]},
-          "body": {"position": [0, -1, 0], "rotation": [-45, 0, 0]},
-          "frontlegl": {"position": [0, -4.5, -1], "rotation": [42.15, 0, 0]},
-          "frontlegr": {"position": [0, -4.5, -1], "rotation": [42.15, 0, 0]},
-          "tail1": {"position": [0, -3, 1], "rotation": [45, 0, 0]},
-          "tail2": {"position": [0, 0, 0], "rotation": [45, 0, 0]}
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "baby_transform": {"loop": true, "bones": {"head": {"scale": 1.5}}},
-      "lie_down": {
-        "loop": true,
-        "bones": {
-          "backlegl": {"position": [0, -0.7, 0], "rotation": [-22.92, 0, 0]},
-          "backlegr": {
-            "position": [0.1, -1.2, 0],
-            "rotation": [28.65, 0, -28.65]
-          },
-          "body": {
-            "position": [
-              0,
-              "variable.liedownamount * -4.5 + variable.lieonplayer * (4.5 + query.is_baby * 6)",
-              0
-            ],
-            "rotation": [
-              0,
-              0,
-              "math.lerprotate(0.0, 90.0, variable.liedownamount)"
-            ]
-          },
-          "frontlegl": {"position": [0, -1, -1.5], "rotation": [-72.81, 0, 0]},
-          "frontlegr": {
-            "position": [0.2, -0.9, 0],
-            "rotation": [-30, 0, -14.46]
-          },
-          "head": {
-            "position": [-0.1, 0, -0.5],
-            "rotation": [
-              -10,
-              "math.lerprotate(this, 75.81, variable.liedownamount)",
-              0
-            ]
-          },
-          "tail1": {
-            "position": [0, 0, 0],
-            "rotation": [
-              "math.lerprotate(this, -33.84, variable.liedownamounttail)",
-              0,
-              0
-            ]
-          },
-          "tail2": {
-            "position": [0, 0, 0],
-            "rotation": [
-              "math.lerprotate(this, -68.92, variable.liedownamounttail)",
-              0,
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["look_at_target"]}}
-      },
-      "move": {
-        "initial_state": "lie_down",
-        "states": {
-          "lie_down": {
-            "animations": ["lie_down"],
-            "transitions": [
-              {"sneaking": "variable.state == 0"},
-              {"sprinting": "variable.state == 1"},
-              {"sitting": "variable.state == 2"},
-              {"walking": "variable.state == 3"}
-            ]
-          },
-          "sitting": {
-            "animations": ["sit"],
-            "transitions": [
-              {"sneaking": "variable.state == 0"},
-              {"sprinting": "variable.state == 1"},
-              {"walking": "variable.state == 3"},
-              {"lie_down": "variable.state == 4"}
-            ]
-          },
-          "sneaking": {
-            "animations": ["sneak"],
-            "transitions": [
-              {"sprinting": "variable.state == 1"},
-              {"sitting": "variable.state == 2"},
-              {"walking": "variable.state == 3"},
-              {"lie_down": "variable.state == 4"}
-            ]
-          },
-          "sprinting": {
-            "animations": ["sprint"],
-            "transitions": [
-              {"sneaking": "variable.state == 0"},
-              {"sitting": "variable.state == 2"},
-              {"walking": "variable.state == 3"},
-              {"lie_down": "variable.state == 4"}
-            ]
-          },
-          "walking": {
-            "animations": ["walk"],
-            "transitions": [
-              {"sneaking": "variable.state == 0"},
-              {"sprinting": "variable.state == 1"},
-              {"sitting": "variable.state == 2"},
-              {"lie_down": "variable.state == 4"}
-            ]
-          }
-        }
-      },
-      "baby": {
-        "initial_state": "baby",
-        "states": {
-          "baby": {"animations": [{"baby_transform": "query.is_baby"}]}
-        }
-      }
-    },
-    "render_controllers": ["controller.render.cat"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 53}
+    "spawn_egg": {"texture": "egg_bee", "texture_index": 0}
   },
   "cave_spider": {
     "identifier": "minecraft:cave_spider",
@@ -1804,110 +375,6 @@
         ]
       }
     },
-    "scripts": {"scale": "0.7"},
-    "animations": {
-      "default_leg_pose": {
-        "loop": true,
-        "bones": {
-          "leg0": {"rotation": [0, "45.0 - this", "-45.0 - this"]},
-          "leg1": {"rotation": [0, "-45.0 - this", "45.0 - this"]},
-          "leg2": {"rotation": [0, "22.5 - this", "-33.3 - this"]},
-          "leg3": {"rotation": [0, "-22.5 - this", "33.3 - this"]},
-          "leg4": {"rotation": [0, "-22.5 - this", "-33.3 - this"]},
-          "leg5": {"rotation": [0, "22.5 - this", "33.3 - this"]},
-          "leg6": {"rotation": [0, "-45.0 - this", "-45.0 - this"]},
-          "leg7": {"rotation": [0, "45.0 - this", "45.0 - this"]}
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "walk": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": [
-              0,
-              "-math.abs(math.cos(query.anim_time * 76.34 + 90 * 0) * 22.92)",
-              "math.abs(math.sin(query.anim_time * 38.17 + 90 * 0) * 22.92)"
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              0,
-              "math.abs(math.cos(query.anim_time * 76.34 + 90 * 0) * 22.92)",
-              "-math.abs(math.sin(query.anim_time * 38.17 + 90 * 0) * 22.92)"
-            ]
-          },
-          "leg2": {
-            "rotation": [
-              0,
-              "-math.abs(math.cos(query.anim_time * 76.34 + 90 * 1) * 22.92)",
-              "math.abs(math.sin(query.anim_time * 38.17 + 90 * 1) * 22.92)"
-            ]
-          },
-          "leg3": {
-            "rotation": [
-              0,
-              "math.abs(math.cos(query.anim_time * 76.34 + 90 * 1) * 22.92)",
-              "-math.abs(math.sin(query.anim_time * 38.17 + 90 * 1) * 22.92)"
-            ]
-          },
-          "leg4": {
-            "rotation": [
-              0,
-              "-math.abs(math.cos(query.anim_time * 76.34 + 90 * 2) * 22.92)",
-              "math.abs(math.sin(query.anim_time * 38.17 + 90 * 2) * 22.92)"
-            ]
-          },
-          "leg5": {
-            "rotation": [
-              0,
-              "math.abs(math.cos(query.anim_time * 76.34 + 90 * 2) * 22.92)",
-              "-math.abs(math.sin(query.anim_time * 38.17 + 90 * 2) * 22.92)"
-            ]
-          },
-          "leg6": {
-            "rotation": [
-              0,
-              "-math.abs(math.cos(query.anim_time * 76.34 + 90 * 3) * 22.92)",
-              "math.abs(math.sin(query.anim_time * 38.17 + 90 * 3) * 22.92)"
-            ]
-          },
-          "leg7": {
-            "rotation": [
-              0,
-              "math.abs(math.cos(query.anim_time * 76.34 + 90 * 3) * 22.92)",
-              "-math.abs(math.sin(query.anim_time * 38.17 + 90 * 3) * 22.92)"
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": [
-              "default_leg_pose",
-              {"walk": "query.modified_move_speed"},
-              "look_at_target"
-            ]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.spider"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 22}
   },
@@ -1983,286 +450,8 @@
         "textureheight": 32
       }
     },
-    "scripts": {
-      "pre_animation": ["variable.hurt = query.hurt_time - query.frame_alpha;"],
-      "animate": ["move"]
-    },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "bottom": {
-            "position": [
-              "variable.rail_offset.x / query.model_scale",
-              "variable.rail_offset.y / query.model_scale",
-              "variable.rail_offset.z / query.model_scale"
-            ],
-            "rotation": [
-              "variable.hurt > 0 ? -Math.sin(variable.hurt * 360 / (Math.pi * 2)) * variable.hurt * (((20 * 2 - query.structural_integrity) - query.frame_alpha) < 0 ? 0: (20 * 2 - query.structural_integrity) - query.frame_alpha) / 10 * query.hurt_direction : 0",
-              0,
-              "-variable.rail_rotation.z"
-            ]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.minecart"]
   },
-  "chicken": {
-    "identifier": "minecraft:chicken",
-    "min_engine_version": "1.12.0",
-    "materials": {"default": "chicken", "legs": "chicken_legs"},
-    "textures": {"default": "textures/entity/chicken"},
-    "geometry": {
-      "default": {
-        "bones": [
-          {
-            "name": "body",
-            "pivot": [0, 8, 0],
-            "cubes": [
-              {
-                "origin": [-3, 4, -3],
-                "rotation": [90, 0, 0],
-                "size": [6, 8, 6],
-                "uv": [0, 9]
-              }
-            ]
-          },
-          {
-            "name": "head",
-            "pivot": [0, 9, -4],
-            "cubes": [{"origin": [-2, 9, -6], "size": [4, 6, 3], "uv": [0, 0]}],
-            "locators": {"lead": [0, 9, -4]}
-          },
-          {
-            "name": "comb",
-            "parent": "head",
-            "pivot": [0, 9, -4],
-            "cubes": [{"origin": [-1, 9, -7], "size": [2, 2, 2], "uv": [14, 4]}]
-          },
-          {
-            "name": "beak",
-            "parent": "head",
-            "pivot": [0, 9, -4],
-            "cubes": [
-              {"origin": [-2, 11, -8], "size": [4, 2, 2], "uv": [14, 0]}
-            ]
-          },
-          {
-            "name": "leg0",
-            "pivot": [-2, 5, 1],
-            "cubes": [{"origin": [-3, 0, -2], "size": [3, 5, 3], "uv": [26, 0]}]
-          },
-          {
-            "name": "leg1",
-            "pivot": [1, 5, 1],
-            "cubes": [{"origin": [0, 0, -2], "size": [3, 5, 3], "uv": [26, 0]}]
-          },
-          {
-            "name": "wing0",
-            "pivot": [-3, 11, 0],
-            "cubes": [
-              {"origin": [-4, 7, -3], "size": [1, 4, 6], "uv": [24, 13]}
-            ]
-          },
-          {
-            "name": "wing1",
-            "pivot": [3, 11, 0],
-            "cubes": [{"origin": [3, 7, -3], "size": [1, 4, 6], "uv": [24, 13]}]
-          }
-        ],
-        "visible_bounds_width": 1.5,
-        "visible_bounds_height": 1.5,
-        "visible_bounds_offset": [0, 0.5, 0],
-        "texturewidth": 64,
-        "textureheight": 32
-      }
-    },
-    "animations": {
-      "move": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          },
-          "leg1": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          }
-        }
-      },
-      "general": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", 0, 0]},
-          "wing0": {"rotation": [0, 0, "variable.wing_flap - this"]},
-          "wing1": {"rotation": [0, 0, "-variable.wing_flap - this"]}
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "baby_transform": {"loop": true, "bones": {"head": {"scale": 2}}}
-    },
-    "scripts": {
-      "animate": [
-        "general",
-        {"move": "query.modified_move_speed"},
-        "look_at_target",
-        {"baby_transform": "query.is_baby"}
-      ]
-    },
-    "render_controllers": ["controller.render.chicken"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 0}
-  },
-  "cod": {
-    "identifier": "minecraft:cod",
-    "materials": {"default": "cod"},
-    "textures": {"default": "textures/entity/fish/cod"},
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 0.5,
-        "visible_bounds_height": 0.5,
-        "texturewidth": 32,
-        "textureheight": 32,
-        "bones": [
-          {
-            "name": "body",
-            "cubes": [
-              {"origin": [-1, 0, 1], "size": [2, 4, 7], "uv": [0, 0]},
-              {"origin": [0, 4, 0], "size": [0, 1, 6], "uv": [20, -6]},
-              {"origin": [0, -1, 3], "size": [0, 1, 2], "uv": [22, -1]}
-            ]
-          },
-          {
-            "name": "head",
-            "parent": "body",
-            "pivot": [0, 2, 0],
-            "cubes": [
-              {
-                "origin": [-0.9992, 1.0008, -3],
-                "size": [2, 3, 1],
-                "uv": [0, 0]
-              },
-              {"origin": [-1, 0, -2], "size": [2, 4, 3], "uv": [11, 0]}
-            ]
-          },
-          {
-            "name": "leftFin",
-            "parent": "body",
-            "pivot": [1, 1, 0],
-            "rotation": [0, 0, 35],
-            "cubes": [{"origin": [1, 0, 0], "size": [2, 1, 2], "uv": [24, 4]}]
-          },
-          {
-            "name": "rightFin",
-            "parent": "body",
-            "pivot": [-1, 1, 0],
-            "rotation": [0, 0, -35],
-            "cubes": [{"origin": [-3, 0, 0], "size": [2, 1, 2], "uv": [24, 1]}]
-          },
-          {
-            "name": "tailfin",
-            "parent": "body",
-            "pivot": [0, 0, 8],
-            "cubes": [{"origin": [0, 0, 8], "size": [0, 4, 6], "uv": [20, 1]}]
-          },
-          {"name": "waist", "parent": "body", "cubes": []}
-        ]
-      }
-    },
-    "scripts": {
-      "pre_animation": [
-        "variable.ZRot = !query.is_in_water ? Math.cos((query.time_stamp + query.frame_alpha) * 14.32) * 90 : 0.0;",
-        "variable.AnimationAmountBlend = Math.lerp(variable.AnimationAmountPrev, variable.AnimationAmount, query.frame_alpha);"
-      ]
-    },
-    "animations": {
-      "flop": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 45.0) * 2.0",
-              "variable.zrot"
-            ]
-          },
-          "head": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 45.0) * 4.0",
-              0
-            ]
-          },
-          "tailfin": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 45.0) * -25.75",
-              0
-            ]
-          }
-        }
-      },
-      "swim": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 30.0) * 2.0",
-              0
-            ]
-          },
-          "head": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 30.0) * 4.0",
-              0
-            ]
-          },
-          "tailfin": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 30.0) * -25.75",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "general": {
-        "initial_state": "flopping",
-        "states": {
-          "flopping": {
-            "animations": ["flop"],
-            "transitions": [
-              {"swimming": "query.is_in_water || query.is_levitating"}
-            ]
-          },
-          "swimming": {
-            "animations": ["swim"],
-            "transitions": [
-              {"flopping": "!query.is_in_water && !query.is_levitating"}
-            ]
-          }
-        }
-      }
-    },
-    "render_controllers": ["controller.render.cod"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 45}
-  },
   "command_block_minecart": {
     "identifier": "minecraft:command_block_minecart",
     "min_engine_version": "1.8.0",
@@ -2335,29 +524,6 @@
         "textureheight": 32
       }
     },
-    "scripts": {
-      "pre_animation": ["variable.hurt = query.hurt_time - query.frame_alpha;"],
-      "animate": ["move"]
-    },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "bottom": {
-            "position": [
-              "variable.rail_offset.x / query.model_scale",
-              "variable.rail_offset.y / query.model_scale",
-              "variable.rail_offset.z / query.model_scale"
-            ],
-            "rotation": [
-              "variable.hurt > 0 ? -Math.sin(variable.hurt * 360 / (Math.pi * 2)) * variable.hurt * (((20 * 2 - query.structural_integrity) - query.frame_alpha) < 0 ? 0: (20 * 2 - query.structural_integrity) - query.frame_alpha) / 10 * query.hurt_direction : 0",
-              0,
-              "-variable.rail_rotation.z"
-            ]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.minecart"]
   },
   "cow": {
@@ -2424,786 +590,9 @@
         ]
       }
     },
-    "animations": {
-      "setup": {"loop": true, "bones": {"body": {"rotation": ["-this", 0, 0]}}},
-      "walk": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          },
-          "leg1": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg2": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg3": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "baby_transform": {
-        "loop": true,
-        "bones": {"head": {"position": [0, 4, 4], "scale": 2}}
-      }
-    },
-    "scripts": {
-      "animate": [
-        "setup",
-        {"walk": "query.modified_move_speed"},
-        "look_at_target",
-        {"baby_transform": "query.is_baby"}
-      ]
-    },
     "render_controllers": ["controller.render.cow"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 1}
   },
-  "creeper": {
-    "identifier": "minecraft:creeper",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "creeper", "charged": "charged_creeper"},
-    "textures": {
-      "default": "textures/entity/creeper/creeper",
-      "charged": "textures/entity/creeper/creeper_armor"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 1,
-        "visible_bounds_height": 2,
-        "visible_bounds_offset": [0, 0.75, 0],
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {
-            "name": "body",
-            "cubes": [
-              {"origin": [-4, 6, -2], "size": [8, 12, 4], "uv": [16, 16]}
-            ]
-          },
-          {
-            "name": "head",
-            "parent": "body",
-            "pivot": [0, 18, 0],
-            "cubes": [{"origin": [-4, 18, -4], "size": [8, 8, 8], "uv": [0, 0]}]
-          },
-          {
-            "name": "leg0",
-            "parent": "body",
-            "pivot": [-2, 6, 4],
-            "cubes": [{"origin": [-4, 0, 2], "size": [4, 6, 4], "uv": [0, 16]}]
-          },
-          {
-            "name": "leg1",
-            "parent": "body",
-            "pivot": [2, 6, 4],
-            "cubes": [{"origin": [0, 0, 2], "size": [4, 6, 4], "uv": [0, 16]}]
-          },
-          {
-            "name": "leg2",
-            "parent": "body",
-            "pivot": [-2, 6, -4],
-            "cubes": [{"origin": [-4, 0, -6], "size": [4, 6, 4], "uv": [0, 16]}]
-          },
-          {
-            "name": "leg3",
-            "parent": "body",
-            "pivot": [2, 6, -4],
-            "cubes": [{"origin": [0, 0, -6], "size": [4, 6, 4], "uv": [0, 16]}]
-          }
-        ]
-      },
-      "charged": {
-        "visible_bounds_width": 1,
-        "visible_bounds_height": 2,
-        "visible_bounds_offset": [0, 0.75, 0],
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {
-            "name": "body",
-            "cubes": [
-              {"origin": [-4, 6, -2], "size": [8, 12, 4], "uv": [16, 16]}
-            ],
-            "inflate": 2
-          },
-          {
-            "name": "head",
-            "parent": "body",
-            "pivot": [0, 18, 0],
-            "cubes": [
-              {"origin": [-4, 18, -4], "size": [8, 8, 8], "uv": [0, 0]}
-            ],
-            "inflate": 2
-          },
-          {
-            "name": "leg0",
-            "parent": "body",
-            "pivot": [-2, 6, 4],
-            "cubes": [{"origin": [-4, 0, 2], "size": [4, 6, 4], "uv": [0, 16]}],
-            "inflate": 2
-          },
-          {
-            "name": "leg1",
-            "parent": "body",
-            "pivot": [2, 6, 4],
-            "cubes": [{"origin": [0, 0, 2], "size": [4, 6, 4], "uv": [0, 16]}],
-            "inflate": 2
-          },
-          {
-            "name": "leg2",
-            "parent": "body",
-            "pivot": [-2, 6, -4],
-            "cubes": [
-              {"origin": [-4, 0, -6], "size": [4, 6, 4], "uv": [0, 16]}
-            ],
-            "inflate": 2
-          },
-          {
-            "name": "leg3",
-            "parent": "body",
-            "pivot": [2, 6, -4],
-            "cubes": [{"origin": [0, 0, -6], "size": [4, 6, 4], "uv": [0, 16]}],
-            "inflate": 2
-          }
-        ]
-      }
-    },
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 6},
-    "scripts": {
-      "pre_animation": [
-        "variable.wobble = Math.sin(query.swell_amount * 5730) * query.swell_amount * 0.01 + 1.0;",
-        "variable.swelling_scale1 = (Math.pow(Math.clamp(query.swell_amount, 0.0, 1.0), 4.0) * 0.4 + 1.0) * variable.wobble;",
-        "variable.swelling_scale2 = (Math.pow(Math.clamp(query.swell_amount, 0.0, 1.0), 4.0) * 0.1 + 1.0) / variable.wobble;",
-        "variable.leg_rot = Math.cos(query.modified_distance_moved * 38.17326) * 80.22 * query.modified_move_speed;",
-        "variable.flash = Math.mod(Math.Round(query.swell_amount * 10.0), 2.0);"
-      ]
-    },
-    "animations": {
-      "creeper_head": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "creeper_legs": {
-        "loop": true,
-        "bones": {
-          "leg0": {"rotation": ["variable.leg_rot - this", 0, 0]},
-          "leg1": {"rotation": ["-variable.leg_rot - this", 0, 0]},
-          "leg2": {"rotation": ["-variable.leg_rot - this", 0, 0]},
-          "leg3": {"rotation": ["variable.leg_rot - this", 0, 0]}
-        }
-      },
-      "creeper_swelling": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "scale": [
-              "variable.swelling_scale1",
-              "variable.swelling_scale2",
-              "variable.swelling_scale1"
-            ]
-          },
-          "head": {
-            "scale": [
-              "variable.swelling_scale1",
-              "variable.swelling_scale2",
-              "variable.swelling_scale1"
-            ]
-          },
-          "leg0": {
-            "scale": [
-              "variable.swelling_scale1",
-              "variable.swelling_scale2",
-              "variable.swelling_scale1"
-            ]
-          },
-          "leg1": {
-            "scale": [
-              "variable.swelling_scale1",
-              "variable.swelling_scale2",
-              "variable.swelling_scale1"
-            ]
-          },
-          "leg2": {
-            "scale": [
-              "variable.swelling_scale1",
-              "variable.swelling_scale2",
-              "variable.swelling_scale1"
-            ]
-          },
-          "leg3": {
-            "scale": [
-              "variable.swelling_scale1",
-              "variable.swelling_scale2",
-              "variable.swelling_scale1"
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "creeper_head": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["creeper_head"]}}
-      },
-      "creeper_legs": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["creeper_legs"]}}
-      },
-      "creeper_swelling": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["creeper_swelling"]}}
-      }
-    },
-    "render_controllers": [
-      "controller.render.creeper",
-      "controller.render.creeper_armor"
-    ]
-  },
-  "dolphin": {
-    "identifier": "minecraft:dolphin",
-    "materials": {"default": "dolphin"},
-    "textures": {"default": "textures/entity/dolphin"},
-    "geometry": {
-      "default": {
-        "bones": [
-          {
-            "pivot": [0, 0, -3],
-            "locators": {"lead": [0, 0, 0]},
-            "cubes": [
-              {
-                "origin": [-4, 0, -9],
-                "size": [8, 7, 6],
-                "uv": [0, 0],
-                "inflate": 0,
-                "mirror": false
-              }
-            ],
-            "name": "head",
-            "parent": "body"
-          },
-          {
-            "pivot": [0, 0, -3],
-            "cubes": [
-              {
-                "origin": [-4, 0, -3],
-                "size": [8, 7, 13],
-                "uv": [0, 13],
-                "inflate": 0,
-                "mirror": false
-              }
-            ],
-            "name": "body"
-          },
-          {
-            "pivot": [0, 2.5, 11],
-            "cubes": [
-              {
-                "origin": [-2, 0, 10],
-                "size": [4, 5, 11],
-                "uv": [0, 33],
-                "inflate": 0,
-                "mirror": false
-              }
-            ],
-            "name": "tail",
-            "parent": "body"
-          },
-          {
-            "pivot": [0, 2.5, 20],
-            "cubes": [
-              {
-                "origin": [-5, 2, 19],
-                "size": [10, 1, 6],
-                "uv": [0, 49],
-                "inflate": 0,
-                "mirror": false
-              }
-            ],
-            "name": "tail_fin",
-            "parent": "tail"
-          },
-          {
-            "pivot": [0, 7, 2],
-            "rotation": [-30, 0, 0],
-            "cubes": [
-              {
-                "origin": [-0.5, 6.25, 1],
-                "size": [1, 5, 4],
-                "uv": [29, 0],
-                "inflate": 0,
-                "mirror": false
-              }
-            ],
-            "name": "back_fin",
-            "parent": "body"
-          },
-          {
-            "pivot": [3, 1, -1],
-            "rotation": [0, -25, 20],
-            "cubes": [
-              {
-                "origin": [3, 1, -2.5],
-                "size": [8, 1, 4],
-                "uv": [40, 0],
-                "inflate": 0,
-                "mirror": false
-              }
-            ],
-            "name": "left_fin",
-            "parent": "body"
-          },
-          {
-            "pivot": [-3, 1, -1],
-            "rotation": [0, 25, -20],
-            "cubes": [
-              {
-                "origin": [-11, 1, -2.5],
-                "size": [8, 1, 4],
-                "uv": [40, 6],
-                "inflate": 0,
-                "mirror": false
-              }
-            ],
-            "name": "right_fin",
-            "parent": "body"
-          },
-          {
-            "pivot": [0, 0, -13],
-            "cubes": [
-              {
-                "origin": [-1, 0, -13],
-                "size": [2, 2, 4],
-                "uv": [0, 13],
-                "inflate": 0,
-                "mirror": false
-              }
-            ],
-            "name": "nose",
-            "parent": "head"
-          }
-        ],
-        "texturewidth": 64,
-        "textureheight": 64
-      }
-    },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "query.target_x_rotation - 2.865 + (-2.865 * math.cos(query.life_time * 343.8))",
-              "query.target_y_rotation",
-              0
-            ]
-          },
-          "left_fin": {
-            "rotation": [
-              0,
-              0,
-              "17.19 * math.cos(query.life_time * 229.2) + 22.92"
-            ]
-          },
-          "right_fin": {
-            "rotation": [
-              0,
-              0,
-              "-17.19 * math.cos(query.life_time * 229.2) - 22.92"
-            ]
-          },
-          "tail": {
-            "rotation": ["-5.73 * math.cos(query.life_time * 343.8)", 0, 0]
-          },
-          "tail_fin": {
-            "rotation": ["-11.46 * math.cos(query.life_time * 343.8)", 0, 0]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "general": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      }
-    },
-    "render_controllers": ["controller.render.dolphin"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 49}
-  },
-  "donkey": {
-    "identifier": "minecraft:donkey",
-    "textures": {
-      "base_brown": "textures/entity/horse/horse_brown",
-      "base_white": "textures/entity/horse/horse_white",
-      "base_chestnut": "textures/entity/horse/horse_chestnut",
-      "base_creamy": "textures/entity/horse/horse_creamy",
-      "base_black": "textures/entity/horse/horse_black",
-      "base_gray": "textures/entity/horse/horse_gray",
-      "base_darkbrown": "textures/entity/horse/horse_darkbrown",
-      "markings_none": "textures/entity/horse/horse_markings_none",
-      "markings_white": "textures/entity/horse/horse_markings_white",
-      "markings_whitefield": "textures/entity/horse/horse_markings_whitefield",
-      "markings_whitedots": "textures/entity/horse/horse_markings_whitedots",
-      "markings_blackdots": "textures/entity/horse/horse_markings_blackdots",
-      "mule": "textures/entity/horse/mule",
-      "donkey": "textures/entity/horse/donkey",
-      "skeleton": "textures/entity/horse/horse_skeleton",
-      "zombie": "textures/entity/horse/horse_zombie",
-      "armor_none": "textures/entity/horse/armor/horse_armor_none",
-      "armor_leather": "textures/entity/horse/armor/horse_armor_leather",
-      "armor_iron": "textures/entity/horse/armor/horse_armor_iron",
-      "armor_gold": "textures/entity/horse/armor/horse_armor_gold",
-      "armor_diamond": "textures/entity/horse/armor/horse_armor_diamond"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 2,
-        "visible_bounds_height": 3,
-        "visible_bounds_offset": [0, 1, 0],
-        "texturewidth": 128,
-        "textureheight": 128,
-        "bones": [
-          {
-            "name": "Body",
-            "pivot": [0, 13, 9],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5, 11, -10], "size": [10, 10, 24], "uv": [0, 34]}
-            ]
-          },
-          {
-            "name": "TailA",
-            "pivot": [0, 21, 14],
-            "rotation": [-65, 0, 0],
-            "cubes": [
-              {"origin": [-1, 20, 14], "size": [2, 2, 3], "uv": [44, 0]}
-            ]
-          },
-          {
-            "name": "TailB",
-            "pivot": [0, 21, 14],
-            "rotation": [-65, 0, 0],
-            "cubes": [
-              {"origin": [-1.5, 19, 17], "size": [3, 4, 7], "uv": [38, 7]}
-            ]
-          },
-          {
-            "name": "TailC",
-            "pivot": [0, 21, 14],
-            "rotation": [-80.34, 0, 0],
-            "cubes": [
-              {"origin": [-1.5, 21.5, 23], "size": [3, 4, 7], "uv": [24, 3]}
-            ]
-          },
-          {
-            "name": "Leg1A",
-            "pivot": [4, 15, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.5, 8, 8.5], "size": [4, 9, 5], "uv": [78, 29]}
-            ]
-          },
-          {
-            "name": "Leg1B",
-            "pivot": [4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2, 3, 9.5], "size": [3, 5, 3], "uv": [78, 43]}
-            ]
-          },
-          {
-            "name": "Leg1C",
-            "pivot": [4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.5, -0.1, 9], "size": [4, 3, 4], "uv": [78, 51]}
-            ]
-          },
-          {
-            "name": "Leg2A",
-            "pivot": [-4, 15, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, 8, 8.5], "size": [4, 9, 5], "uv": [96, 29]}
-            ]
-          },
-          {
-            "name": "Leg2B",
-            "pivot": [-4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5, 3, 9.5], "size": [3, 5, 3], "uv": [96, 43]}
-            ]
-          },
-          {
-            "name": "Leg2C",
-            "pivot": [-4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, -0.1, 9], "size": [4, 3, 4], "uv": [96, 51]}
-            ]
-          },
-          {
-            "name": "Leg3A",
-            "pivot": [4, 15, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2.1, 8, -10.1], "size": [3, 8, 4], "uv": [44, 29]}
-            ]
-          },
-          {
-            "name": "Leg3B",
-            "pivot": [4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2.1, 3, -9.6], "size": [3, 5, 3], "uv": [44, 41]}
-            ]
-          },
-          {
-            "name": "Leg3C",
-            "pivot": [4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.6, -0.1, -10.1], "size": [4, 3, 4], "uv": [44, 51]}
-            ]
-          },
-          {
-            "name": "Leg4A",
-            "pivot": [-4, 15, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.1, 8, -10.1], "size": [3, 8, 4], "uv": [60, 29]}
-            ]
-          },
-          {
-            "name": "Leg4B",
-            "pivot": [-4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.1, 3, -9.6], "size": [3, 5, 3], "uv": [60, 41]}
-            ]
-          },
-          {
-            "name": "Leg4C",
-            "pivot": [-4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.6, -0.1, -10.1], "size": [4, 3, 4], "uv": [60, 51]}
-            ]
-          },
-          {
-            "name": "Head",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.5, 25, -11.5], "size": [5, 5, 7], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "UMouth",
-            "pivot": [0, 20.05, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2, 27.05, -17], "size": [4, 3, 6], "uv": [24, 18]}
-            ]
-          },
-          {
-            "name": "LMouth",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2, 25, -16.5], "size": [4, 2, 5], "uv": [24, 27]}
-            ]
-          },
-          {
-            "name": "Ear1",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [0.45, 29, -6], "size": [2, 3, 1], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "Ear2",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.45, 29, -6], "size": [2, 3, 1], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "MuleEarL",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 15],
-            "cubes": [
-              {"origin": [-2, 29, -6], "size": [2, 7, 1], "uv": [0, 12]}
-            ]
-          },
-          {
-            "name": "MuleEarR",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, -15],
-            "cubes": [{"origin": [0, 29, -6], "size": [2, 7, 1], "uv": [0, 12]}]
-          },
-          {
-            "name": "Neck",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.05, 15.8, -12], "size": [4, 14, 8], "uv": [0, 12]}
-            ]
-          },
-          {
-            "name": "Bag1",
-            "pivot": [-7.5, 21, 10],
-            "rotation": [0, 90, 0],
-            "cubes": [
-              {"origin": [-10.5, 13, 10], "size": [8, 8, 3], "uv": [0, 34]}
-            ]
-          },
-          {
-            "name": "Bag2",
-            "pivot": [4.5, 21, 10],
-            "rotation": [0, 90, 0],
-            "cubes": [
-              {"origin": [1.5, 13, 10], "size": [8, 8, 3], "uv": [0, 47]}
-            ]
-          },
-          {
-            "name": "Saddle",
-            "pivot": [0, 22, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5, 21, -1], "size": [10, 1, 8], "uv": [80, 0]}
-            ]
-          },
-          {
-            "name": "SaddleB",
-            "pivot": [0, 22, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-1.5, 22, -1], "size": [3, 1, 2], "uv": [106, 9]}
-            ]
-          },
-          {
-            "name": "SaddleC",
-            "pivot": [0, 22, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [{"origin": [-4, 22, 5], "size": [8, 1, 2], "uv": [80, 9]}]
-          },
-          {
-            "name": "SaddleL2",
-            "pivot": [5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [4.5, 13, 1], "size": [1, 2, 2], "uv": [74, 0]}
-            ]
-          },
-          {
-            "name": "SaddleL",
-            "pivot": [5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [4.5, 15, 1.5], "size": [1, 6, 1], "uv": [70, 0]}
-            ]
-          },
-          {
-            "name": "SaddleR2",
-            "pivot": [-5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, 13, 1], "size": [1, 2, 2], "uv": [74, 4]}
-            ]
-          },
-          {
-            "name": "SaddleR",
-            "pivot": [-5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, 15, 1.5], "size": [1, 6, 1], "uv": [80, 0]}
-            ]
-          },
-          {
-            "name": "SaddleMouthL",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [1.5, 26, -14], "size": [1, 2, 2], "uv": [74, 13]}
-            ]
-          },
-          {
-            "name": "SaddleMouthR",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.5, 26, -14], "size": [1, 2, 2], "uv": [74, 13]}
-            ]
-          },
-          {
-            "name": "SaddleMouthLine",
-            "pivot": [0, 20, -10],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2.6, 23, -16], "size": [0, 3, 16], "uv": [44, 10]}
-            ]
-          },
-          {
-            "name": "SaddleMouthLineR",
-            "pivot": [0, 20, -10],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-2.6, 23, -16], "size": [0, 3, 16], "uv": [44, 5]}
-            ]
-          },
-          {
-            "name": "Mane",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-1, 15.5, -5], "size": [2, 16, 4], "uv": [58, 0]}
-            ]
-          },
-          {
-            "name": "HeadSaddle",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {
-                "origin": [-2.5, 25.1, -17],
-                "size": [5, 5, 12],
-                "uv": [80, 12],
-                "inflate": 0.05
-              }
-            ]
-          }
-        ]
-      }
-    },
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 30}
-  },
   "dragon_fireball": {
     "identifier": "minecraft:dragon_fireball",
     "materials": {"default": "fireball"},
@@ -3227,21 +616,6 @@
         "textureheight": 16
       }
     },
-    "animations": {
-      "face_player": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "query.camera_rotation(0)",
-              "query.camera_rotation(1)",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {"scale": "2.0", "animate": ["face_player"]},
     "render_controllers": ["controller.render.fireball"]
   },
   "drowned": {
@@ -3405,315 +779,9 @@
         "textureheight": 64
       }
     },
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;"
-      ],
-      "animate": [
-        {"humanoid_big_head": "query.is_baby"},
-        "look_at_target",
-        "move",
-        {"riding.arms": "query.is_riding"},
-        {"riding.legs": "query.is_riding"},
-        "holding",
-        {"charging": "query.is_charging"},
-        "attack_controller",
-        {"brandish_spear": "variable.is_brandishing_spear"},
-        "bob",
-        {"damage_nearby_mobs": "variable.damage_nearby_mobs"},
-        {
-          "use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 )"
-        },
-        {"swimming": "variable.swim_amount > 0.0"}
-      ]
-    },
-    "animations": {
-      "humanoid_big_head": {"loop": true, "bones": {"head": {"scale": 1.4}}},
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-36, 0, 0]},
-          "rightarm": {"rotation": [-36, 0, 0]}
-        }
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
-          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
-        }
-      },
-      "holding": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "variable.is_holding_left ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "variable.is_holding_right ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "brandish_spear": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "this * -0.5 - 157.5 - 22.5 * variable.charge_amount",
-              "-this",
-              0
-            ]
-          }
-        }
-      },
-      "charging": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": ["22.5 * variable.charge_amount - this", "-this", 0]
-          }
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "damage_nearby_mobs": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["-45.0-this", "-this", "-this"]},
-          "leftleg": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightarm": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-45.0-this", "-this", "-this"]}
-        }
-      },
-      "use_item_progress": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "variable.use_item_startup_progress * -60.0 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -22.5 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -5.625 + variable.use_item_interval_progress * 11.25"
-            ]
-          }
-        }
-      },
-      "zombie_attack_bare_hand": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-90.0 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) - (math.sin(query.life_time * 76.776372) * 2.865) - this",
-              "5.73 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 0.6) - this",
-              "math.cos(query.life_time * 103.13244) * -2.865 - 2.865 - this"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "90.0 * (variable.is_brandishing_spear - 1.0) - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) + (math.sin(query.life_time * 76.776372) * 2.865) - this",
-              "(math.sin(variable.attack_time * 180.0) * 57.3) * 0.6 - 5.73 - this",
-              "math.cos(query.life_time * 103.13244) * 2.865 + 2.865 - this"
-            ]
-          }
-        }
-      },
-      "attack_rotations": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.sin(math.sqrt(variable.attack_time) * 360.0) * 11.46",
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "-(math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) + math.sin(variable.attack_time * 180.0)) * 5.73",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "-(math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 34.38 + math.sin(variable.attack_time * 180.0) * 28.65) * (variable.is_brandishing_spear ? -2.5 : 1.0 )",
-              "variable.is_brandishing_spear ? 0.0 : math.sin(math.sqrt(variable.attack_time) * 360.0) * 22.92",
-              0
-            ]
-          }
-        }
-      },
-      "swimming": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [
-              0,
-              "variable.swim_amount * -10.0 - this",
-              "variable.swim_amount * 9.0 - this"
-            ],
-            "rotation": [
-              "variable.swim_amount * (90.0 + query.target_x_rotation)",
-              0,
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) - (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "leftleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0 + 180.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) + (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, -14.325, variable.swim_amount) + (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "rightleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.drowned"],
     "enable_attachables": true,
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 48},
-    "animation_controllers": {
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "attack_controller": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["zombie_attack_bare_hand"],
-            "transitions": [
-              {"one_hand_attack": "query.is_item_equipped('off_hand')"},
-              {
-                "spear_attack": "variable.is_brandishing_spear && !query.is_item_equipped('off_hand')"
-              }
-            ]
-          },
-          "one_hand_attack": {
-            "animations": ["attack_rotations"],
-            "transitions": [
-              {"default": "!query.is_item_equipped('off_hand')"},
-              {
-                "spear_attack": "variable.is_brandishing_spear && !query.is_item_equipped('off_hand')"
-              }
-            ]
-          },
-          "spear_attack": {
-            "animations": ["zombie_attack_bare_hand", "attack_rotations"],
-            "transitions": [
-              {
-                "default": "!query.is_item_equipped('off_hand') && !variable.is_brandishing_spear"
-              },
-              {"one_hand_attack": "query.is_item_equipped('off_hand')"}
-            ]
-          }
-        }
-      }
-    }
+    "spawn_egg": {"texture": "spawn_egg", "texture_index": 48}
   },
   "egg": {
     "identifier": "minecraft:egg",
@@ -3739,22 +807,7 @@
         "textureheight": 16
       }
     },
-    "render_controllers": ["controller.render.item_sprite"],
-    "animations": {
-      "flying": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "query.camera_rotation(0)",
-              "query.camera_rotation(1)",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {"animate": ["flying"]}
+    "render_controllers": ["controller.render.item_sprite"]
   },
   "elder_guardian": {
     "identifier": "minecraft:elder_guardian",
@@ -4075,376 +1128,9 @@
         ]
       }
     },
-    "animations": {
-      "setup": {
-        "loop": true,
-        "bones": {
-          "spikepart0": {
-            "rotation": ["-45.0 - this", "0.0 - this", "0.0 - this"]
-          },
-          "spikepart1": {
-            "rotation": ["45.0 - this", "0.0 - this", "0.0 - this"]
-          },
-          "spikepart10": {
-            "rotation": ["0.0 - this", "0.0 - this", " 135.0 - this"]
-          },
-          "spikepart11": {
-            "rotation": ["0.0 - this", "0.0 - this", " -135.0 - this"]
-          },
-          "spikepart2": {
-            "rotation": ["0.0 - this", "0.0 - this", "45.0 - this"]
-          },
-          "spikepart3": {
-            "rotation": ["0.0 - this", "0.0  - this", "-45.0 - this"]
-          },
-          "spikepart4": {
-            "rotation": ["90.0 - this", "45.0 - this", " 0.0 - this"]
-          },
-          "spikepart5": {
-            "rotation": ["90.0 - this", "-45.0 - this", " 0.0 - this"]
-          },
-          "spikepart6": {
-            "rotation": ["90.0 - this", "-135.0 - this", "0.0 - this"]
-          },
-          "spikepart7": {
-            "rotation": ["90.0 - this", "135.0 - this", " 0.0 - this"]
-          },
-          "spikepart8": {
-            "rotation": ["-135.0 - this", "0.0 - this", " 0.0 - this"]
-          },
-          "spikepart9": {
-            "rotation": ["135.0 - this", "0.0 - this", " 0.0 - this"]
-          }
-        }
-      },
-      "spikes": {
-        "loop": true,
-        "bones": {
-          "spikepart0": {
-            "position": [
-              "-this",
-              "24 + -8 * (1 + math.cos(query.life_time * 20 * 1.5) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart1": {
-            "position": [
-              "-this",
-              "24 + -8 * (1 + math.cos(query.life_time * 20 * 1.5 + 1) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 1) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart10": {
-            "position": [
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 10) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this",
-              "-8 + 8 * (1 + math.cos(query.life_time * 20 * 1.5 + 10) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "-this"
-            ]
-          },
-          "spikepart11": {
-            "position": [
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 11) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this",
-              "-8 + 8 * (1 + math.cos(query.life_time * 20 * 1.5 + 11) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "-this"
-            ]
-          },
-          "spikepart2": {
-            "position": [
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 2) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this",
-              "24 + -8 * (1 + math.cos(query.life_time * 20 * 1.5 + 2) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "-this"
-            ]
-          },
-          "spikepart3": {
-            "position": [
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 3) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this",
-              "24 + -8 * (1 + math.cos(query.life_time * 20 * 1.5 + 3) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              0
-            ]
-          },
-          "spikepart4": {
-            "position": [
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 4) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this",
-              "8 - this",
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 4) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart5": {
-            "position": [
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 5) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this",
-              "8 - this",
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 5) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart6": {
-            "position": [
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 6) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this",
-              "8 - this",
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 6) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart7": {
-            "position": [
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 7) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this",
-              "8 - this",
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 7) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart8": {
-            "position": [
-              "-this",
-              "-8  + 8 * (1 + math.cos(query.life_time * 20 * 1.5 + 8) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 8) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart9": {
-            "position": [
-              "-this",
-              "-8 + 8 * (1 + math.cos(query.life_time * 20 * 1.5 + 9) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 9) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this"
-            ]
-          }
-        }
-      },
-      "swim": {
-        "loop": true,
-        "bones": {
-          "tailpart0": {
-            "rotation": [0, "variable.tail_base_angle * 11.6 - this", 0]
-          },
-          "tailpart1": {
-            "position": ["-1.5 - this", "-0.5 - this", "14.0 - this"],
-            "rotation": [0, "variable.tail_base_angle * 22.8 - this", 0]
-          },
-          "tailpart2": {
-            "position": ["0.5 - this", "-0.5 - this", "6.0 - this"],
-            "rotation": [0, "variable.tail_base_angle * 34.4 - this", 0]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "move_eye": {
-        "loop": true,
-        "bones": {
-          "eye": {
-            "position": [
-              "query.eye_target_x_rotation - this",
-              "24 + query.eye_target_y_rotation - this",
-              "-8.25 - this"
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {
-      "pre_animation": [
-        "variable.spike_shake = Math.sin(query.life_time * 2000)/50;",
-        "variable.spike_animation_speed = query.life_time < 0.1 ? 0.0 : (!query.is_in_water ? (Math.round(Math.sin(query.life_time * 2000)) == 0.0 ? (Math.random(0.0, 1.0)) : (variable.spike_animation_speed)) : (query.is_moving ? (variable.spike_animation_speed - variable.spike_animation_speed * 0.06) : (variable.spike_animation_speed + (1.0 - variable.spike_animation_speed) * 0.06)));",
-        "variable.spike_extension = (1.0 - variable.spike_animation_speed) * 0.55;",
-        "variable.tail_animation_speed = query.life_time < 0.1 ? 0.0 : (!query.is_in_water ? 2.0 : query.is_moving ? (variable.tail_animation_speed < 0.5 ? 4.0 : variable.tail_animation_speed + (0.5 - variable.tail_animation_speed) * 0.1) : variable.tail_animation_speed + (0.125 - variable.tail_animation_speed) * 0.2);",
-        "variable.tail_swim = query.life_time < 0.1 ? 0.0 : (variable.tail_swim + variable.tail_animation_speed);",
-        "variable.tail_base_angle = Math.sin(variable.tail_swim*20.0);"
-      ],
-      "scale": "2.35",
-      "animate": ["setup", "spikes", "swim", "look_at_target", "move_eye"]
-    },
     "render_controllers": ["controller.render.guardian"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 36}
   },
-  "ender_dragon": {
-    "identifier": "minecraft:ender_dragon",
-    "textures": {
-      "default": "textures/entity/enderdragon/dragon",
-      "exploding": "textures/entity/enderdragon/dragon_exploding",
-      "beam": "textures/entity/end_crystal/end_crystal_beam"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 14,
-        "visible_bounds_height": 13,
-        "visible_bounds_offset": [0, 2, 0],
-        "texturewidth": 256,
-        "textureheight": 256,
-        "bones": [
-          {
-            "name": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-6, 20, -24], "size": [12, 5, 16], "uv": [176, 44]},
-              {"origin": [-8, 16, -10], "size": [16, 16, 16], "uv": [112, 30]},
-              {
-                "mirror": true,
-                "origin": [-5, 32, -4],
-                "size": [2, 4, 6],
-                "uv": [0, 0]
-              },
-              {
-                "mirror": true,
-                "origin": [-5, 25, -22],
-                "size": [2, 2, 4],
-                "uv": [112, 0]
-              },
-              {"origin": [3, 32, -4], "size": [2, 4, 6], "uv": [0, 0]},
-              {"origin": [3, 25, -22], "size": [2, 2, 4], "uv": [112, 0]}
-            ]
-          },
-          {
-            "name": "jaw",
-            "pivot": [0, 20, -8],
-            "cubes": [
-              {"origin": [-6, 16, -24], "size": [12, 4, 16], "uv": [176, 65]}
-            ]
-          },
-          {
-            "name": "neck",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-5, 19, -5], "size": [10, 10, 10], "uv": [192, 104]},
-              {"origin": [-1, 29, -3], "size": [2, 4, 6], "uv": [48, 0]}
-            ]
-          },
-          {
-            "name": "body",
-            "pivot": [0, 20, 8],
-            "cubes": [
-              {"origin": [-12, -4, -8], "size": [24, 24, 64], "uv": [0, 0]},
-              {"origin": [-1, 20, -2], "size": [2, 6, 12], "uv": [220, 53]},
-              {"origin": [-1, 20, 18], "size": [2, 6, 12], "uv": [220, 53]},
-              {"origin": [-1, 20, 38], "size": [2, 6, 12], "uv": [220, 53]}
-            ]
-          },
-          {
-            "name": "wing",
-            "pivot": [-12, 19, 2],
-            "cubes": [
-              {"origin": [-68, 15, -2], "size": [56, 8, 8], "uv": [112, 88]},
-              {"origin": [-68, 19, 4], "size": [56, 0, 56], "uv": [-56, 88]}
-            ]
-          },
-          {
-            "name": "wingtip",
-            "pivot": [-56, 24, 0],
-            "cubes": [
-              {"origin": [-112, 22, -2], "size": [56, 4, 4], "uv": [112, 136]},
-              {"origin": [-112, 24, 2], "size": [56, 0, 56], "uv": [-56, 144]}
-            ]
-          },
-          {
-            "name": "wing1",
-            "pivot": [12, 19, 2],
-            "cubes": [
-              {"origin": [-44, 15, -2], "size": [56, 8, 8], "uv": [112, 88]},
-              {"origin": [-44, 19, 4], "size": [56, 0, 56], "uv": [-56, 88]}
-            ]
-          },
-          {
-            "name": "wingtip1",
-            "pivot": [-56, 24, 0],
-            "cubes": [
-              {"origin": [-112, 22, -2], "size": [56, 4, 4], "uv": [112, 136]},
-              {"origin": [-112, 24, 2], "size": [56, 0, 56], "uv": [-56, 144]}
-            ]
-          },
-          {
-            "name": "rearleg",
-            "pivot": [-16, 8, 42],
-            "cubes": [
-              {"origin": [-24, -20, 34], "size": [16, 32, 16], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "rearleg1",
-            "pivot": [16, 8, 42],
-            "cubes": [
-              {"origin": [8, -20, 34], "size": [16, 32, 16], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "frontleg",
-            "pivot": [-12, 4, 2],
-            "cubes": [
-              {"origin": [-16, -16, -2], "size": [8, 24, 8], "uv": [112, 104]}
-            ]
-          },
-          {
-            "name": "frontleg1",
-            "pivot": [12, 4, 2],
-            "cubes": [
-              {"origin": [8, -16, -2], "size": [8, 24, 8], "uv": [112, 104]}
-            ]
-          },
-          {
-            "name": "rearlegtip",
-            "pivot": [0, -8, -4],
-            "cubes": [
-              {"origin": [-6, -38, -4], "size": [12, 32, 12], "uv": [196, 0]}
-            ]
-          },
-          {
-            "name": "rearlegtip1",
-            "pivot": [0, -8, -4],
-            "cubes": [
-              {"origin": [-6, -38, -4], "size": [12, 32, 12], "uv": [196, 0]}
-            ]
-          },
-          {
-            "name": "frontlegtip",
-            "pivot": [0, 4, -1],
-            "cubes": [
-              {"origin": [-3, -19, -4], "size": [6, 24, 6], "uv": [226, 138]}
-            ]
-          },
-          {
-            "name": "frontlegtip1",
-            "pivot": [0, 4, -1],
-            "cubes": [
-              {"origin": [-3, -19, -4], "size": [6, 24, 6], "uv": [226, 138]}
-            ]
-          },
-          {
-            "name": "rearfoot",
-            "pivot": [0, -7, 4],
-            "cubes": [
-              {"origin": [-9, -13, -16], "size": [18, 6, 24], "uv": [112, 0]}
-            ]
-          },
-          {
-            "name": "rearfoot1",
-            "pivot": [0, -7, 4],
-            "cubes": [
-              {"origin": [-9, -13, -16], "size": [18, 6, 24], "uv": [112, 0]}
-            ]
-          },
-          {
-            "name": "frontfoot",
-            "pivot": [0, 1, 0],
-            "cubes": [
-              {"origin": [-4, -3, -12], "size": [8, 4, 16], "uv": [144, 104]}
-            ]
-          },
-          {
-            "name": "frontfoot1",
-            "pivot": [0, 1, 0],
-            "cubes": [
-              {"origin": [-4, -3, -12], "size": [8, 4, 16], "uv": [144, 104]}
-            ]
-          }
-        ]
-      }
-    }
-  },
   "eye_of_ender": {
     "identifier": "minecraft:eye_of_ender_signal",
     "materials": {"default": "eye_of_ender_signal"},
@@ -4469,22 +1155,7 @@
         "textureheight": 16
       }
     },
-    "render_controllers": ["controller.render.item_sprite"],
-    "animations": {
-      "flying": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "query.camera_rotation(0)",
-              "query.camera_rotation(1)",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {"animate": ["flying"]}
+    "render_controllers": ["controller.render.item_sprite"]
   },
   "ender_pearl": {
     "identifier": "minecraft:ender_pearl",
@@ -4510,421 +1181,7 @@
         "textureheight": 16
       }
     },
-    "render_controllers": ["controller.render.item_sprite"],
-    "animations": {
-      "flying": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "query.camera_rotation(0)",
-              "query.camera_rotation(1)",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {"animate": ["flying"]}
-  },
-  "enderman": {
-    "identifier": "minecraft:enderman",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "enderman", "invisible": "enderman_invisible"},
-    "textures": {"default": "textures/entity/enderman/enderman"},
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 1.5,
-        "visible_bounds_height": 3,
-        "visible_bounds_offset": [0, 1.5, 0],
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {
-            "name": "hat",
-            "parent": "head",
-            "reset": true,
-            "pivot": [0, 38, 0],
-            "cubes": [
-              {
-                "origin": [-4, 37.5, -4],
-                "size": [8, 8, 8],
-                "uv": [0, 16],
-                "inflate": -0.5
-              }
-            ],
-            "neverRender": false
-          },
-          {
-            "name": "head",
-            "parent": "body",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [-4, 24, -4], "size": [8, 8, 8], "uv": [0, 0]}]
-          },
-          {
-            "name": "body",
-            "reset": true,
-            "pivot": [0, 38, 0],
-            "cubes": [
-              {"origin": [-4, 26, -2], "size": [8, 12, 4], "uv": [32, 16]}
-            ]
-          },
-          {
-            "name": "rightArm",
-            "parent": "body",
-            "reset": true,
-            "pivot": [-3, 36, 0],
-            "cubes": [
-              {"origin": [-4, 8, -1], "size": [2, 30, 2], "uv": [56, 0]}
-            ]
-          },
-          {
-            "name": "rightItem",
-            "pivot": [-6, 15, 1],
-            "neverRender": true,
-            "parent": "rightArm"
-          },
-          {
-            "name": "leftArm",
-            "parent": "body",
-            "reset": true,
-            "mirror": true,
-            "pivot": [5, 36, 0],
-            "cubes": [{"origin": [4, 8, -1], "size": [2, 30, 2], "uv": [56, 0]}]
-          },
-          {
-            "name": "rightLeg",
-            "parent": "body",
-            "reset": true,
-            "pivot": [-2, 26, 0],
-            "cubes": [
-              {"origin": [-3, -4, -1], "size": [2, 30, 2], "uv": [56, 0]}
-            ]
-          },
-          {
-            "name": "leftLeg",
-            "parent": "body",
-            "reset": true,
-            "mirror": true,
-            "pivot": [2, 26, 0],
-            "cubes": [
-              {"origin": [1, -4, -1], "size": [2, 30, 2], "uv": [56, 0]}
-            ]
-          }
-        ]
-      }
-    },
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 28.65;"
-      ]
-    },
-    "animations": {
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "attack.rotations": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46 - this",
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.sin(1.0 - math.pow(1.0 - variable.attack_time, 3.0) * 180.0) * (variable.is_brandishing_spear ? -1.0 : 1.0 )",
-              "variable.is_brandishing_spear ? 0.0 : (math.sin(math.sqrt(variable.attack_time) * 360) * 11.46) * 2.0",
-              0
-            ]
-          }
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "base_pose": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": ["-this", "11.0 - this", "-this"],
-            "rotation": ["-this", 0, 0]
-          },
-          "hat": {
-            "position": ["-this", "-this", "-this"],
-            "rotation": ["-this", "-this", "-this"]
-          },
-          "head": {"position": ["-this", "-this", "-this"]},
-          "leftarm": {"position": ["4.0-this", 0, "-this"]},
-          "leftleg": {"position": [0, "-5.0 - this", 0]},
-          "rightarm": {"position": ["-4.0-this", 0, "-this"]},
-          "rightleg": {"position": [0, "-5.0 - this", 0]}
-        }
-      },
-      "arms_legs": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": ["math.clamp(this, -22.92, 22.92) - this", 0, 0]
-          },
-          "leftleg": {
-            "rotation": ["math.clamp(this, -22.92, 22.92) - this", 0, 0]
-          },
-          "rightarm": {
-            "rotation": ["math.clamp(this, -22.92, 22.92) - this", 0, 0]
-          },
-          "rightleg": {
-            "rotation": ["math.clamp(this, -22.92, 22.92) - this", 0, 0]
-          }
-        }
-      },
-      "carrying": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["-28.65 - this", 0, "-2.87 - this"]},
-          "rightarm": {"rotation": ["-28.65 - this", 0, "2.87 - this"]}
-        }
-      },
-      "scary_face": {
-        "loop": true,
-        "bones": {
-          "hat": {"position": [0, "-5.0 - this", 0]},
-          "head": {"position": [0, "5.0 - this", 0]}
-        }
-      }
-    },
-    "animation_controllers": {
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      },
-      "attack": {
-        "initial_state": "default",
-        "states": {
-          "attacking": {
-            "animations": ["attack.rotations"],
-            "transitions": [{"default": "variable.attack_time < 0.0"}]
-          },
-          "default": {
-            "transitions": [{"attacking": "variable.attack_time >= 0.0"}]
-          }
-        }
-      },
-      "bob": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["bob"]}}
-      },
-      "base_pose": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["base_pose", "arms_legs"]}}
-      },
-      "carrying": {
-        "initial_state": "default",
-        "states": {
-          "carry": {
-            "animations": ["carrying"],
-            "transitions": [{"default": "!query.is_carrying_block"}]
-          },
-          "default": {"transitions": [{"carry": "query.is_carrying_block"}]}
-        }
-      },
-      "scary_face": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"scary": "query.is_angry"}]},
-          "scary": {
-            "animations": ["scary_face"],
-            "transitions": [{"default": "!query.is_angry"}]
-          }
-        }
-      }
-    },
-    "render_controllers": ["controller.render.enderman"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 7}
-  },
-  "endermite": {
-    "identifier": "minecraft:endermite",
-    "materials": {"default": "endermite"},
-    "textures": {"default": "textures/entity/endermite"},
-    "geometry": {
-      "default": {
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {
-            "name": "section_0",
-            "parent": "section_2",
-            "pivot": [0, 0, 0],
-            "cubes": [
-              {"origin": [-2, 0, -4.4], "size": [4, 3, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "section_1",
-            "parent": "section_2",
-            "pivot": [0, 0, 0],
-            "cubes": [
-              {"origin": [-3, 0, -2.4], "size": [6, 4, 5], "uv": [0, 5]}
-            ]
-          },
-          {
-            "name": "section_2",
-            "pivot": [0, 0, 2.5],
-            "cubes": [
-              {"origin": [-1.5, 0, 2.5], "size": [3, 3, 1], "uv": [0, 14]}
-            ]
-          },
-          {
-            "name": "section_3",
-            "parent": "section_2",
-            "pivot": [0, 0, 0],
-            "cubes": [
-              {"origin": [-0.5, 0, 3.5], "size": [1, 2, 1], "uv": [0, 18]}
-            ]
-          }
-        ]
-      }
-    },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "section_0": {
-            "position": [
-              "(math.cos(-query.life_time * 928.26) * 1.26) - this",
-              0,
-              0
-            ],
-            "rotation": [
-              0,
-              "(math.cos(query.life_time * 928.26) * 26.9) - this",
-              0
-            ]
-          },
-          "section_1": {
-            "position": [
-              "(math.sin(query.life_time * 928.26) * 0.63) - this",
-              0,
-              0
-            ],
-            "rotation": [
-              0,
-              "(math.cos(query.life_time * 928.26) * 16) - this",
-              0
-            ]
-          },
-          "section_2": {
-            "position": [0, 0, 0],
-            "rotation": [
-              0,
-              "(math.cos(query.life_time * 928.26) * 9.17) - this",
-              0
-            ]
-          },
-          "section_3": {
-            "position": [
-              "(math.cos(query.life_time * 928.26) * 0.8) - this",
-              0,
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      }
-    },
-    "render_controllers": ["controller.render.endermite"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 25}
+    "render_controllers": ["controller.render.item_sprite"]
   },
   "evoker_fangs": {
     "identifier": "minecraft:evocation_fang",
@@ -4971,26 +1228,6 @@
         ]
       }
     },
-    "scripts": {
-      "pre_animation": [
-        "variable.remaining_life = (query.life_span - 2.0) - (query.life_time*20.0);",
-        "variable.animation_progress = query.life_span == 0.0 ? 0.0 : (variable.remaining_life < 1.0 ? 1.0 : 1.0 - Math.min(1.0, variable.remaining_life / 20.0));",
-        "variable.bite_amount = (1 - Math.Pow(Math.Clamp(variable.animation_progress*2.0, 0, 1.0), 3.0)) * 0.35 * 180;",
-        "variable.y_offset = (variable.animation_progress + Math.sin(variable.animation_progress*2.7*80.0)) * 0.6 * 12.0;"
-      ],
-      "animate": ["bite"],
-      "scale": "variable.animation_progress > 0.9 ? (1.0 - variable.animation_progress) / 0.1 : 1.0"
-    },
-    "animations": {
-      "bite": {
-        "loop": true,
-        "bones": {
-          "base": {"position": [0, "-12.0 + variable.y_offset", 0]},
-          "lower_jaw": {"rotation": [0, 0, "180.0 + variable.bite_amount"]},
-          "upper_jaw": {"rotation": [0, 0, "180.0 - variable.bite_amount"]}
-        }
-      }
-    },
     "render_controllers": ["controller.render.evocation_fang"]
   },
   "evoker": {
@@ -5088,137 +1325,9 @@
         ]
       }
     },
-    "scripts": {
-      "scale": "0.9375",
-      "animate": ["controller_general", "controller_move"]
-    },
-    "animations": {
-      "general": {
-        "loop": true,
-        "bones": {
-          "arms": {
-            "position": [0, "-3.0 - this", "-1.0 - this"],
-            "rotation": ["-42.97 - this", "- this", "- this"],
-            "scale": 1
-          },
-          "leftarm": {"scale": 0},
-          "rightarm": {"scale": 0}
-        }
-      },
-      "casting": {
-        "loop": true,
-        "bones": {
-          "arms": {"scale": 0},
-          "leftarm": {
-            "rotation": [
-              "math.cos(query.life_time * 763.4) * 14.3239 - this",
-              "-this",
-              "-135.0 - this"
-            ],
-            "scale": 1
-          },
-          "rightarm": {
-            "rotation": [
-              "math.cos(query.life_time * 763.4) * 14.3239 - this",
-              "-this",
-              "135.0 - this"
-            ],
-            "scale": 1
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": [
-              "(math.cos(query.anim_time * 38.17) * 40.0) - this",
-              "-this",
-              0
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              "(math.cos(query.anim_time * 38.17 + 180) * 40.0) - this",
-              "-this",
-              0
-            ]
-          }
-        }
-      },
-      "celebrating": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "(math.cos(query.life_time * 800.0) * 2.865)",
-              180,
-              -135
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "(math.cos(query.life_time * 800.0) * 2.865)",
-              180,
-              153
-            ]
-          }
-        }
-      }
-    },
     "particle_effects": {"spell": "minecraft:evoker_spell"},
     "render_controllers": ["controller.render.evoker"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 40},
-    "animation_controllers": {
-      "controller_general": {
-        "initial_state": "default",
-        "states": {
-          "casting": {
-            "animations": ["look_at_target", "casting"],
-            "particle_effects": [
-              {"effect": "spell", "locator": "left_hand"},
-              {"effect": "spell", "locator": "right_hand"}
-            ],
-            "transitions": [{"default": "!query.is_casting"}]
-          },
-          "celebrating": {
-            "animations": ["celebrating"],
-            "blend_transition": 0.2,
-            "blend_via_shortest_path": true,
-            "transitions": [{"default": "!query.is_celebrating"}]
-          },
-          "default": {
-            "animations": ["look_at_target", "general"],
-            "blend_transition": 0.2,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"casting": "query.is_casting"},
-              {"celebrating": "query.is_celebrating"}
-            ]
-          }
-        }
-      },
-      "controller_move": {
-        "initial_state": "default",
-        "states": {
-          "default": {"animations": [{"move": "query.modified_move_speed"}]}
-        }
-      }
-    }
+    "spawn_egg": {"texture": "spawn_egg", "texture_index": 40}
   },
   "experience_bottle": {
     "identifier": "minecraft:xp_bottle",
@@ -5247,22 +1356,7 @@
         "textureheight": 16
       }
     },
-    "render_controllers": ["controller.render.experience_bottle"],
-    "animations": {
-      "flying": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "query.camera_rotation(0)",
-              "query.camera_rotation(1)",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {"animate": ["flying"]}
+    "render_controllers": ["controller.render.experience_bottle"]
   },
   "experience_orb": {
     "identifier": "minecraft:xp_orb",
@@ -5287,28 +1381,6 @@
         "textureheight": 64
       }
     },
-    "animations": {
-      "face_player": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "query.camera_rotation(0)",
-              "query.camera_rotation(1)",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {
-      "scale": "0.3",
-      "pre_animation": [
-        "variable.u = Math.mod(query.texture_frame_index, 4) * 16.0 / 64.0;",
-        "variable.v = math.round(query.texture_frame_index / 4) * 16.0 / 64.0;"
-      ],
-      "animate": ["face_player"]
-    },
     "render_controllers": ["controller.render.experience_orb"]
   },
   "fireball": {
@@ -5334,21 +1406,6 @@
         "textureheight": 16
       }
     },
-    "animations": {
-      "face_player": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "query.camera_rotation(0)",
-              "query.camera_rotation(1)",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {"scale": "2.0", "animate": ["face_player"]},
     "render_controllers": ["controller.render.fireball"]
   },
   "firework_rocket": {
@@ -5381,23 +1438,6 @@
         "textureheight": 32
       }
     },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [0, -3.5, 0],
-            "rotation": [
-              "-query.target_x_rotation",
-              "-query.target_y_rotation",
-              0
-            ],
-            "scale": 0.6
-          }
-        }
-      }
-    },
-    "scripts": {"animate": ["move"]},
     "render_controllers": ["controller.render.fireworks_rocket"]
   },
   "fishing_bobber": {
@@ -5448,1015 +1488,6 @@
     },
     "render_controllers": ["controller.render.fishing_hook"]
   },
-  "fox": {
-    "identifier": "minecraft:fox",
-    "materials": {"default": "fox"},
-    "textures": {
-      "red": "textures/entity/fox/fox",
-      "arctic": "textures/entity/fox/snow_fox"
-    },
-    "geometry": {
-      "default": {
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {
-            "name": "world",
-            "pivot": [0, 0, 0],
-            "bind_pose_rotation": [0, 0, 0],
-            "cubes": []
-          },
-          {
-            "name": "root",
-            "parent": "world",
-            "pivot": [0, 0, 0],
-            "bind_pose_rotation": [0, 0, 0],
-            "cubes": []
-          },
-          {
-            "name": "head",
-            "parent": "body",
-            "pivot": [0, 8, -3],
-            "locators": {"held_item": [-2, 5, -10], "lead": [0, 4, -4]},
-            "bind_pose_rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-4, 4, -9], "size": [8, 6, 6], "uv": [0, 0]},
-              {"origin": [-4, 10, -8], "size": [2, 2, 1], "uv": [0, 0]},
-              {"origin": [2, 10, -8], "size": [2, 2, 1], "uv": [22, 0]},
-              {"origin": [-2, 4, -12], "size": [4, 2, 3], "uv": [0, 24]}
-            ]
-          },
-          {
-            "name": "head_sleeping",
-            "parent": "head",
-            "pivot": [0, 8, -3],
-            "bind_pose_rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-4, 4, -9], "size": [8, 6, 6], "uv": [0, 12]},
-              {"origin": [-4, 10, -8], "size": [2, 2, 1], "uv": [0, 0]},
-              {"origin": [2, 10, -8], "size": [2, 2, 1], "uv": [22, 0]},
-              {"origin": [-2, 4, -12], "size": [4, 2, 3], "uv": [0, 24]}
-            ]
-          },
-          {
-            "name": "body",
-            "parent": "root",
-            "pivot": [0, 8, 0],
-            "bind_pose_rotation": [90, 0, 0],
-            "cubes": [
-              {"origin": [-3, 0, -3], "size": [6, 11, 6], "uv": [30, 15]}
-            ]
-          },
-          {
-            "name": "leg0",
-            "parent": "body",
-            "pivot": [-3, 6, 6],
-            "bind_pose_rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-3.005, 0, 5], "size": [2, 6, 2], "uv": [14, 24]}
-            ]
-          },
-          {
-            "name": "leg1",
-            "parent": "body",
-            "pivot": [1, 6, 6],
-            "bind_pose_rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.005, 0, 5], "size": [2, 6, 2], "uv": [22, 24]}
-            ]
-          },
-          {
-            "name": "leg2",
-            "parent": "body",
-            "pivot": [-3, 6, -1],
-            "bind_pose_rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-3.005, 0, -2], "size": [2, 6, 2], "uv": [14, 24]}
-            ]
-          },
-          {
-            "name": "leg3",
-            "parent": "body",
-            "pivot": [1, 6, -1],
-            "bind_pose_rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.005, 0, -2], "size": [2, 6, 2], "uv": [22, 24]}
-            ]
-          },
-          {
-            "name": "tail",
-            "parent": "body",
-            "pivot": [0, 8, 7],
-            "bind_pose_rotation": [80, 0, 0],
-            "cubes": [
-              {"origin": [-2, -2, 4.75], "size": [4, 9, 5], "uv": [28, 0]}
-            ]
-          }
-        ]
-      }
-    },
-    "animations": {
-      "walk": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          },
-          "leg1": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg2": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg3": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "baby_transform": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "position": [
-              0,
-              "query.is_baby ? 4.0 : 0.0",
-              "query.is_baby ? 4.0 : 0.0"
-            ],
-            "scale": "query.is_baby ? 1.3 : 1.0"
-          }
-        }
-      },
-      "crouch": {
-        "loop": true,
-        "bones": {
-          "body": {"position": [0, -1.8, 0], "rotation": [0, 0, 0]},
-          "head": {"position": [0, -0.8, 0], "rotation": [0, 0, 0]},
-          "leg0": {"position": [0, 1.6, 0], "rotation": [0, 0, 0]},
-          "leg1": {"position": [0, 1.6, 0], "rotation": [0, 0, 0]},
-          "leg2": {"position": [0, 1.6, 0], "rotation": [0, 0, 0]},
-          "leg3": {"position": [0, 1.6, 0], "rotation": [0, 0, 0]}
-        }
-      },
-      "sleep": {
-        "loop": true,
-        "bones": {
-          "body": {"position": [0, -4.8, 0], "rotation": [0, 0, -90]},
-          "head": {
-            "position": [1.8, -0.4, -2],
-            "rotation": [
-              0,
-              -115,
-              "math.cos(query.anim_time * 160.0) + 90 -this"
-            ]
-          },
-          "tail": {"position": [0, 0, 1.5], "rotation": [-125, 0, 0]}
-        }
-      },
-      "setup": {"loop": true, "bones": {"body": {"rotation": ["-this", 0, 0]}}},
-      "sit": {
-        "loop": true,
-        "bones": {
-          "body": {"position": [0, 1, 0], "rotation": [-60, 0, 0]},
-          "head": {"position": [0, 3, -3], "rotation": [60, 0, 0]},
-          "leg0": {"position": [0, 4, 2.5], "rotation": [-15, 0, 0]},
-          "leg1": {"position": [0, 4, 2.5], "rotation": [-15, 0, 0]},
-          "leg2": {"position": [0, 0.75, 3.5], "rotation": [40, 0, 0]},
-          "leg3": {"position": [0, 0.75, 3.5], "rotation": [40, 0, 0]},
-          "tail": {"position": [0, -0.075, -0.15], "rotation": [60, 0, 0]}
-        }
-      },
-      "wiggle": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [0, -1.8, 0],
-            "rotation": [
-              0,
-              "math.cos(query.life_time * 20.0 * 53.7) * 5.0 -this",
-              0
-            ]
-          },
-          "head": {
-            "position": [0, -0.8, 0],
-            "rotation": [
-              "math.clamp(-5.0 * (query.anim_time / 2.0), -5.0, 0)",
-              0,
-              "math.clamp(25.0 * (query.anim_time / 2.0), 0, 25.0)"
-            ]
-          },
-          "leg0": {"position": [0, 1.6, 0], "rotation": [0, 0, 0]},
-          "leg1": {"position": [0, 1.6, 0], "rotation": [0, 0, 0]},
-          "leg2": {"position": [0, 1.6, 0], "rotation": [0, 0, 0]},
-          "leg3": {"position": [0, 1.6, 0], "rotation": [0, 0, 0]},
-          "tail": {
-            "rotation": [
-              0,
-              "math.cos(query.life_time * 20.0 * 53.7) * 10.0 -this",
-              0
-            ]
-          }
-        }
-      },
-      "stuck": {
-        "loop": true,
-        "bones": {"body": {"position": [0, -0.3, 0], "rotation": [60, 0, 0]}}
-      },
-      "pounce": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [0, 0, 0],
-            "rotation": ["query.vertical_speed * -7.0", 0, 0]
-          },
-          "head": {
-            "position": [0, 0, 0],
-            "rotation": ["query.vertical_speed * -7.0", 0, 0]
-          }
-        }
-      }
-    },
-    "scripts": {
-      "animate": ["setup", {"baby_transform": "query.is_baby"}, "move"]
-    },
-    "render_controllers": ["controller.render.fox"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 55},
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "crouch": {
-            "animations": [
-              "look_at_target",
-              "crouch",
-              {"walk": "query.modified_move_speed"}
-            ],
-            "blend_transition": 0.4,
-            "transitions": [
-              {"default": "!query.is_stalking && !query.is_interested"},
-              {"wiggle": "query.is_interested"}
-            ]
-          },
-          "default": {
-            "animations": [
-              "look_at_target",
-              {"walk": "query.modified_move_speed"}
-            ],
-            "blend_transition": 0.1,
-            "transitions": [
-              {"crouch": "query.is_stalking"},
-              {"sleep": "query.is_sleeping"},
-              {"stuck": "query.is_stunned"},
-              {"sit": "query.is_sitting"}
-            ]
-          },
-          "pounce": {
-            "animations": [
-              "look_at_target",
-              "pounce",
-              {"walk": "query.modified_move_speed"}
-            ],
-            "transitions": [{"default": "query.is_on_ground"}]
-          },
-          "sit": {
-            "animations": ["sit"],
-            "blend_transition": 0.2,
-            "transitions": [{"default": "!query.is_sitting"}]
-          },
-          "sleep": {
-            "animations": ["sleep"],
-            "blend_transition": 0.2,
-            "transitions": [{"default": "!query.is_sleeping"}]
-          },
-          "stuck": {
-            "animations": [
-              "stuck",
-              {"walk": "math.cos(query.life_time * 20.0 * 53.7)"}
-            ],
-            "blend_transition": 0.2,
-            "transitions": [{"default": "!query.is_stunned"}]
-          },
-          "wiggle": {
-            "animations": [
-              "look_at_target",
-              "wiggle",
-              {"walk": "query.modified_move_speed"}
-            ],
-            "blend_transition": 0.2,
-            "transitions": [
-              {
-                "default": "query.is_on_ground && !query.is_interested && !query.is_stalking"
-              },
-              {
-                "crouch": "query.is_on_ground && !query.is_interested && query.is_stalking"
-              },
-              {"pounce": "!query.is_on_ground"}
-            ]
-          }
-        }
-      }
-    }
-  },
-  "ghast": {
-    "identifier": "minecraft:ghast",
-    "materials": {"default": "ghast"},
-    "textures": {
-      "default": "textures/entity/ghast/ghast",
-      "shooting": "textures/entity/ghast/ghast_shooting"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 6,
-        "visible_bounds_height": 9,
-        "visible_bounds_offset": [0, 4.5, 0],
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {
-            "name": "tentacles_0",
-            "parent": "body",
-            "pivot": [-3.8, 1, -5],
-            "cubes": [
-              {"origin": [-4.8, -8, -6], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "tentacles_1",
-            "parent": "body",
-            "pivot": [1.3, 1, -5],
-            "cubes": [
-              {"origin": [0.3, -10, -6], "size": [2, 11, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "tentacles_2",
-            "parent": "body",
-            "pivot": [6.3, 1, -5],
-            "cubes": [
-              {"origin": [5.3, -7, -6], "size": [2, 8, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "tentacles_3",
-            "parent": "body",
-            "pivot": [-6.3, 1, 0],
-            "cubes": [
-              {"origin": [-7.3, -8, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "tentacles_4",
-            "parent": "body",
-            "pivot": [-1.3, 1, 0],
-            "cubes": [
-              {"origin": [-2.3, -12, -1], "size": [2, 13, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "tentacles_5",
-            "parent": "body",
-            "pivot": [3.8, 1, 0],
-            "cubes": [
-              {"origin": [2.8, -10, -1], "size": [2, 11, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "tentacles_6",
-            "parent": "body",
-            "pivot": [-3.8, 1, 5],
-            "cubes": [
-              {"origin": [-4.8, -11, 4], "size": [2, 12, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "tentacles_7",
-            "parent": "body",
-            "pivot": [1.3, 1, 5],
-            "cubes": [
-              {"origin": [0.3, -11, 4], "size": [2, 12, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "tentacles_8",
-            "parent": "body",
-            "pivot": [6.3, 1, 5],
-            "cubes": [
-              {"origin": [5.3, -12, 4], "size": [2, 13, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "body",
-            "pivot": [0, 1.5, 0],
-            "cubes": [
-              {"origin": [-8, 0, -8], "size": [16, 16, 16], "uv": [0, 0]}
-            ]
-          }
-        ]
-      }
-    },
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 19},
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "tentacles_0": {
-            "rotation": [
-              "math.sin(query.life_time * 360.0 + 0) * 11.5 + 23",
-              0,
-              0
-            ]
-          },
-          "tentacles_1": {
-            "rotation": [
-              "math.sin(query.life_time * 360.0 + 57) * 11.5 + 23",
-              0,
-              0
-            ]
-          },
-          "tentacles_2": {
-            "rotation": [
-              "math.sin(query.life_time * 360.0 + 115) * 11.5 + 23",
-              0,
-              0
-            ]
-          },
-          "tentacles_3": {
-            "rotation": [
-              "math.sin(query.life_time * 360.0 + 172) * 11.5 + 23",
-              0,
-              0
-            ]
-          },
-          "tentacles_4": {
-            "rotation": [
-              "math.sin(query.life_time * 360.0 + 229) * 11.5 + 23",
-              0,
-              0
-            ]
-          },
-          "tentacles_5": {
-            "rotation": [
-              "math.sin(query.life_time * 360.0 + 286) * 11.5 + 23",
-              0,
-              0
-            ]
-          },
-          "tentacles_6": {
-            "rotation": [
-              "math.sin(query.life_time * 360.0 + 344) * 11.5 + 23",
-              0,
-              0
-            ]
-          },
-          "tentacles_7": {
-            "rotation": [
-              "math.sin(query.life_time * 360.0 + 402) * 11.5 + 23",
-              0,
-              0
-            ]
-          },
-          "tentacles_8": {
-            "rotation": [
-              "math.sin(query.life_time * 360.0 + 458) * 11.5 + 23",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "scale": {"loop": true, "bones": {"body": {"scale": 4.5}}}
-    },
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      },
-      "scale": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["scale"]}}
-      }
-    },
-    "render_controllers": ["controller.render.ghast"]
-  },
-  "guardian": {
-    "identifier": "minecraft:guardian",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "guardian", "ghost": "guardian_ghost"},
-    "textures": {
-      "default": "textures/entity/guardian",
-      "elder": "textures/entity/guardian_elder",
-      "beam": "textures/entity/guardian_beam"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 3.5,
-        "visible_bounds_height": 2,
-        "visible_bounds_offset": [0, 0.5, 0],
-        "texturewidth": 64,
-        "textureheight": 64,
-        "bones": [
-          {
-            "name": "head",
-            "pivot": [0, 0, 0],
-            "mirror": true,
-            "cubes": [
-              {
-                "mirror": false,
-                "origin": [-6, 2, -8],
-                "size": [12, 12, 16],
-                "uv": [0, 0]
-              },
-              {
-                "mirror": false,
-                "origin": [-8, 2, -6],
-                "size": [2, 12, 12],
-                "uv": [0, 28]
-              },
-              {"origin": [6, 2, -6], "size": [2, 12, 12], "uv": [0, 28]},
-              {"origin": [-6, 14, -6], "size": [12, 2, 12], "uv": [16, 40]},
-              {"origin": [-6, 0, -6], "size": [12, 2, 12], "uv": [16, 40]}
-            ]
-          },
-          {
-            "name": "eye",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [-1, 6, 0], "size": [2, 2, 1], "uv": [8, 0]}]
-          },
-          {
-            "name": "tailpart0",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [-2, 6, 7], "size": [4, 4, 8], "uv": [40, 0]}]
-          },
-          {
-            "name": "tailpart1",
-            "parent": "tailpart0",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 7, 0], "size": [3, 3, 7], "uv": [0, 54]}]
-          },
-          {
-            "name": "tailpart2",
-            "parent": "tailpart1",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [0, 8, 0], "size": [2, 2, 6], "uv": [41, 32]},
-              {"origin": [1, 4.5, 3], "size": [1, 9, 9], "uv": [25, 19]}
-            ]
-          },
-          {
-            "name": "spikepart0",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart1",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart2",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart3",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart4",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart5",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart6",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart7",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart8",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart9",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart10",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart11",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          }
-        ]
-      },
-      "ghost": {
-        "visible_bounds_width": 3.5,
-        "visible_bounds_height": 2,
-        "visible_bounds_offset": [0, 0.5, 0],
-        "texturewidth": 64,
-        "textureheight": 64,
-        "bones": [
-          {
-            "name": "head",
-            "pivot": [0, 24, 0],
-            "mirror": true,
-            "cubes": [
-              {
-                "mirror": false,
-                "origin": [-6, 2, -8],
-                "size": [12, 12, 16],
-                "uv": [0, 0]
-              },
-              {
-                "mirror": false,
-                "origin": [-8, 2, -6],
-                "size": [2, 12, 12],
-                "uv": [0, 28]
-              },
-              {"origin": [6, 2, -6], "size": [2, 12, 12], "uv": [0, 28]},
-              {"origin": [-6, 14, -6], "size": [12, 2, 12], "uv": [16, 40]},
-              {"origin": [-6, 0, -6], "size": [12, 2, 12], "uv": [16, 40]}
-            ]
-          },
-          {
-            "name": "eye",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [-1, 7, 0], "size": [2, 2, 1], "uv": [8, 0]}]
-          },
-          {
-            "name": "tailpart0",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [-2, 6, 7], "size": [4, 4, 8], "uv": [40, 0]}]
-          },
-          {
-            "name": "tailpart1",
-            "parent": "tailpart0",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [0, 7, 0], "size": [3, 3, 7], "uv": [0, 54]}]
-          },
-          {
-            "name": "tailpart2",
-            "parent": "tailpart1",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [0, 8, 0], "size": [2, 2, 6], "uv": [41, 32]},
-              {"origin": [1, 4.5, 3], "size": [1, 9, 9], "uv": [25, 19]}
-            ]
-          },
-          {
-            "name": "spikepart0",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart1",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart2",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart3",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart4",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart5",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart6",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart7",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart8",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart9",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart10",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "spikepart11",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-1, 19.5, -1], "size": [2, 9, 2], "uv": [0, 0]}
-            ]
-          }
-        ]
-      }
-    },
-    "animations": {
-      "setup": {
-        "loop": true,
-        "bones": {
-          "spikepart0": {
-            "rotation": ["-45.0 - this", "0.0 - this", "0.0 - this"]
-          },
-          "spikepart1": {
-            "rotation": ["45.0 - this", "0.0 - this", "0.0 - this"]
-          },
-          "spikepart10": {
-            "rotation": ["0.0 - this", "0.0 - this", " 135.0 - this"]
-          },
-          "spikepart11": {
-            "rotation": ["0.0 - this", "0.0 - this", " -135.0 - this"]
-          },
-          "spikepart2": {
-            "rotation": ["0.0 - this", "0.0 - this", "45.0 - this"]
-          },
-          "spikepart3": {
-            "rotation": ["0.0 - this", "0.0  - this", "-45.0 - this"]
-          },
-          "spikepart4": {
-            "rotation": ["90.0 - this", "45.0 - this", " 0.0 - this"]
-          },
-          "spikepart5": {
-            "rotation": ["90.0 - this", "-45.0 - this", " 0.0 - this"]
-          },
-          "spikepart6": {
-            "rotation": ["90.0 - this", "-135.0 - this", "0.0 - this"]
-          },
-          "spikepart7": {
-            "rotation": ["90.0 - this", "135.0 - this", " 0.0 - this"]
-          },
-          "spikepart8": {
-            "rotation": ["-135.0 - this", "0.0 - this", " 0.0 - this"]
-          },
-          "spikepart9": {
-            "rotation": ["135.0 - this", "0.0 - this", " 0.0 - this"]
-          }
-        }
-      },
-      "spikes": {
-        "loop": true,
-        "bones": {
-          "spikepart0": {
-            "position": [
-              "-this",
-              "24 + -8 * (1 + math.cos(query.life_time * 20 * 1.5) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart1": {
-            "position": [
-              "-this",
-              "24 + -8 * (1 + math.cos(query.life_time * 20 * 1.5 + 1) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 1) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart10": {
-            "position": [
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 10) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this",
-              "-8 + 8 * (1 + math.cos(query.life_time * 20 * 1.5 + 10) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "-this"
-            ]
-          },
-          "spikepart11": {
-            "position": [
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 11) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this",
-              "-8 + 8 * (1 + math.cos(query.life_time * 20 * 1.5 + 11) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "-this"
-            ]
-          },
-          "spikepart2": {
-            "position": [
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 2) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this",
-              "24 + -8 * (1 + math.cos(query.life_time * 20 * 1.5 + 2) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "-this"
-            ]
-          },
-          "spikepart3": {
-            "position": [
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 3) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this",
-              "24 + -8 * (1 + math.cos(query.life_time * 20 * 1.5 + 3) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              0
-            ]
-          },
-          "spikepart4": {
-            "position": [
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 4) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this",
-              "8 - this",
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 4) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart5": {
-            "position": [
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 5) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this",
-              "8 - this",
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 5) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart6": {
-            "position": [
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 6) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this",
-              "8 - this",
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 6) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart7": {
-            "position": [
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 7) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this",
-              "8 - this",
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 7) * 0.01 - (variable.spike_extension - variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart8": {
-            "position": [
-              "-this",
-              "-8  + 8 * (1 + math.cos(query.life_time * 20 * 1.5 + 8) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "8 * (1 + math.cos(query.life_time * 20 * 1.5 + 8) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this"
-            ]
-          },
-          "spikepart9": {
-            "position": [
-              "-this",
-              "-8 + 8 * (1 + math.cos(query.life_time * 20 * 1.5 + 9) * 0.01 + (variable.spike_extension + variable.spike_shake)) - this",
-              "-8 * (1 + math.cos(query.life_time * 20 * 1.5 + 9) * 0.01 - (variable.spike_extension + variable.spike_shake)) - this"
-            ]
-          }
-        }
-      },
-      "swim": {
-        "loop": true,
-        "bones": {
-          "tailpart0": {
-            "rotation": [0, "variable.tail_base_angle * 11.6 - this", 0]
-          },
-          "tailpart1": {
-            "position": ["-1.5 - this", "-0.5 - this", "14.0 - this"],
-            "rotation": [0, "variable.tail_base_angle * 22.8 - this", 0]
-          },
-          "tailpart2": {
-            "position": ["0.5 - this", "-0.5 - this", "6.0 - this"],
-            "rotation": [0, "variable.tail_base_angle * 34.4 - this", 0]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "move_eye": {
-        "loop": true,
-        "bones": {
-          "eye": {
-            "position": [
-              "query.eye_target_x_rotation - this",
-              "24 + query.eye_target_y_rotation - this",
-              "-8.25 - this"
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {
-      "pre_animation": [
-        "variable.spike_shake = Math.sin(query.life_time * 2000)/50;",
-        "variable.spike_animation_speed = query.life_time < 0.1 ? 0.0 : (!query.is_in_water ? (Math.round(Math.sin(query.life_time * 2000)) == 0.0 ? (Math.random(0.0, 1.0)) : (variable.spike_animation_speed)) : (query.is_moving ? (variable.spike_animation_speed - variable.spike_animation_speed * 0.06) : (variable.spike_animation_speed + (1.0 - variable.spike_animation_speed) * 0.06)));",
-        "variable.spike_extension = (1.0 - variable.spike_animation_speed) * 0.55;",
-        "variable.tail_animation_speed = query.life_time < 0.1 ? 0.0 : (!query.is_in_water ? 2.0 : query.is_moving ? (variable.tail_animation_speed < 0.5 ? 4.0 : variable.tail_animation_speed + (0.5 - variable.tail_animation_speed) * 0.1) : variable.tail_animation_speed + (0.125 - variable.tail_animation_speed) * 0.2);",
-        "variable.tail_swim = query.life_time < 0.1 ? 0.0 : (variable.tail_swim + variable.tail_animation_speed);",
-        "variable.tail_base_angle = Math.sin(variable.tail_swim*20.0);"
-      ],
-      "animate": ["setup", "spikes", "swim", "look_at_target", "move_eye"]
-    },
-    "render_controllers": ["controller.render.guardian"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 26}
-  },
   "hoglin": {
     "identifier": "minecraft:hoglin",
     "materials": {"default": "hoglin"},
@@ -6545,79 +1576,6 @@
       }
     },
     "spawn_egg": {"base_color": "#C66E55", "overlay_color": "#5f6464"},
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos_right_side = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;",
-        "variable.tcos_left_side = -variable.tcos_right_side;",
-        "variable.attack_head_rot =  Math.sin(variable.attack_time * 180.0) * -37.3;"
-      ]
-    },
-    "animations": {
-      "walk": {
-        "loop": true,
-        "bones": {
-          "left_ear": {"rotation": [0, 0, "variable.tcos_left_side * 0.5"]},
-          "right_ear": {"rotation": [0, 0, "variable.tcos_right_side * 0.5"]},
-          "leg_back_right": {"rotation": ["variable.tcos_right_side", 0, 0]},
-          "leg_back_left": {"rotation": ["variable.tcos_left_side", 0, 0]},
-          "leg_front_right": {"rotation": ["-variable.tcos_right_side", 0, 0]},
-          "leg_front_left": {"rotation": ["-variable.tcos_left_side", 0, 0]}
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [0, "query.target_y_rotation - this", 0]
-          }
-        }
-      },
-      "attack": {
-        "loop": true,
-        "bones": {"head": {"rotation": ["variable.attack_head_rot", 0, 0]}}
-      },
-      "hoglin_baby_scaling": {
-        "loop": true,
-        "bones": {"head": {"position": [0, 10, 4], "scale": 1.4}}
-      }
-    },
-    "animation_controllers": {
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["look_at_target"]}}
-      },
-      "walk": {
-        "initial_state": "walking",
-        "states": {"walking": {"animations": ["walk"]}}
-      },
-      "attack": {
-        "initial_state": "default",
-        "states": {
-          "attack": {
-            "animations": ["attack"],
-            "transitions": [
-              {"default": "!variable.has_target || variable.attack_time < 0.0"}
-            ]
-          },
-          "default": {
-            "transitions": [
-              {"attack": "variable.has_target && variable.attack_time >= 0.0"}
-            ]
-          }
-        }
-      },
-      "hoglin_baby_scaling": {
-        "initial_state": "default",
-        "states": {
-          "baby": {
-            "animations": ["hoglin_baby_scaling"],
-            "transitions": [{"default": "!query.is_baby"}]
-          },
-          "default": {"transitions": [{"baby": "query.is_baby"}]}
-        }
-      }
-    },
     "render_controllers": ["controller.render.hoglin"]
   },
   "hopper_minecart": {
@@ -6692,904 +1650,8 @@
         "textureheight": 32
       }
     },
-    "scripts": {
-      "pre_animation": ["variable.hurt = query.hurt_time - query.frame_alpha;"],
-      "animate": ["move"]
-    },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "bottom": {
-            "position": [
-              "variable.rail_offset.x / query.model_scale",
-              "variable.rail_offset.y / query.model_scale",
-              "variable.rail_offset.z / query.model_scale"
-            ],
-            "rotation": [
-              "variable.hurt > 0 ? -Math.sin(variable.hurt * 360 / (Math.pi * 2)) * variable.hurt * (((20 * 2 - query.structural_integrity) - query.frame_alpha) < 0 ? 0: (20 * 2 - query.structural_integrity) - query.frame_alpha) / 10 * query.hurt_direction : 0",
-              0,
-              "-variable.rail_rotation.z"
-            ]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.minecart"]
   },
-  "horse": {
-    "identifier": "minecraft:horse",
-    "textures": {
-      "base_brown": "textures/entity/horse/horse_brown",
-      "base_white": "textures/entity/horse/horse_white",
-      "base_chestnut": "textures/entity/horse/horse_chestnut",
-      "base_creamy": "textures/entity/horse/horse_creamy",
-      "base_black": "textures/entity/horse/horse_black",
-      "base_gray": "textures/entity/horse/horse_gray",
-      "base_darkbrown": "textures/entity/horse/horse_darkbrown",
-      "markings_none": "textures/entity/horse/horse_markings_none",
-      "markings_white": "textures/entity/horse/horse_markings_white",
-      "markings_whitefield": "textures/entity/horse/horse_markings_whitefield",
-      "markings_whitedots": "textures/entity/horse/horse_markings_whitedots",
-      "markings_blackdots": "textures/entity/horse/horse_markings_blackdots",
-      "mule": "textures/entity/horse/mule",
-      "donkey": "textures/entity/horse/donkey",
-      "skeleton": "textures/entity/horse/horse_skeleton",
-      "zombie": "textures/entity/horse/horse_zombie",
-      "armor_none": "textures/entity/horse/armor/horse_armor_none",
-      "armor_leather": "textures/entity/horse/armor/horse_armor_leather",
-      "armor_iron": "textures/entity/horse/armor/horse_armor_iron",
-      "armor_gold": "textures/entity/horse/armor/horse_armor_gold",
-      "armor_diamond": "textures/entity/horse/armor/horse_armor_diamond"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 2,
-        "visible_bounds_height": 3,
-        "visible_bounds_offset": [0, 1, 0],
-        "texturewidth": 128,
-        "textureheight": 128,
-        "bones": [
-          {
-            "name": "Body",
-            "pivot": [0, 13, 9],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5, 11, -10], "size": [10, 10, 24], "uv": [0, 34]}
-            ]
-          },
-          {
-            "name": "TailA",
-            "pivot": [0, 21, 14],
-            "rotation": [-65, 0, 0],
-            "cubes": [
-              {"origin": [-1, 20, 14], "size": [2, 2, 3], "uv": [44, 0]}
-            ]
-          },
-          {
-            "name": "TailB",
-            "pivot": [0, 21, 14],
-            "rotation": [-65, 0, 0],
-            "cubes": [
-              {"origin": [-1.5, 19, 17], "size": [3, 4, 7], "uv": [38, 7]}
-            ]
-          },
-          {
-            "name": "TailC",
-            "pivot": [0, 21, 14],
-            "rotation": [-80.34, 0, 0],
-            "cubes": [
-              {"origin": [-1.5, 21.5, 23], "size": [3, 4, 7], "uv": [24, 3]}
-            ]
-          },
-          {
-            "name": "Leg1A",
-            "pivot": [4, 15, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.5, 8, 8.5], "size": [4, 9, 5], "uv": [78, 29]}
-            ]
-          },
-          {
-            "name": "Leg1B",
-            "pivot": [4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2, 3, 9.5], "size": [3, 5, 3], "uv": [78, 43]}
-            ]
-          },
-          {
-            "name": "Leg1C",
-            "pivot": [4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.5, -0.1, 9], "size": [4, 3, 4], "uv": [78, 51]}
-            ]
-          },
-          {
-            "name": "Leg2A",
-            "pivot": [-4, 15, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, 8, 8.5], "size": [4, 9, 5], "uv": [96, 29]}
-            ]
-          },
-          {
-            "name": "Leg2B",
-            "pivot": [-4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5, 3, 9.5], "size": [3, 5, 3], "uv": [96, 43]}
-            ]
-          },
-          {
-            "name": "Leg2C",
-            "pivot": [-4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, -0.1, 9], "size": [4, 3, 4], "uv": [96, 51]}
-            ]
-          },
-          {
-            "name": "Leg3A",
-            "pivot": [4, 15, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2.1, 8, -10.1], "size": [3, 8, 4], "uv": [44, 29]}
-            ]
-          },
-          {
-            "name": "Leg3B",
-            "pivot": [4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2.1, 3, -9.6], "size": [3, 5, 3], "uv": [44, 41]}
-            ]
-          },
-          {
-            "name": "Leg3C",
-            "pivot": [4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.6, -0.1, -10.1], "size": [4, 3, 4], "uv": [44, 51]}
-            ]
-          },
-          {
-            "name": "Leg4A",
-            "pivot": [-4, 15, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.1, 8, -10.1], "size": [3, 8, 4], "uv": [60, 29]}
-            ]
-          },
-          {
-            "name": "Leg4B",
-            "pivot": [-4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.1, 3, -9.6], "size": [3, 5, 3], "uv": [60, 41]}
-            ]
-          },
-          {
-            "name": "Leg4C",
-            "pivot": [-4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.6, -0.1, -10.1], "size": [4, 3, 4], "uv": [60, 51]}
-            ]
-          },
-          {
-            "name": "Head",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.5, 25, -11.5], "size": [5, 5, 7], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "UMouth",
-            "pivot": [0, 20.05, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2, 27.05, -17], "size": [4, 3, 6], "uv": [24, 18]}
-            ]
-          },
-          {
-            "name": "LMouth",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2, 25, -16.5], "size": [4, 2, 5], "uv": [24, 27]}
-            ]
-          },
-          {
-            "name": "Ear1",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [0.45, 29, -6], "size": [2, 3, 1], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "Ear2",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.45, 29, -6], "size": [2, 3, 1], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "MuleEarL",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 15],
-            "cubes": [
-              {"origin": [-2, 29, -6], "size": [2, 7, 1], "uv": [0, 12]}
-            ]
-          },
-          {
-            "name": "MuleEarR",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, -15],
-            "cubes": [{"origin": [0, 29, -6], "size": [2, 7, 1], "uv": [0, 12]}]
-          },
-          {
-            "name": "Neck",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.05, 15.8, -12], "size": [4, 14, 8], "uv": [0, 12]}
-            ]
-          },
-          {
-            "name": "Bag1",
-            "pivot": [-7.5, 21, 10],
-            "rotation": [0, 90, 0],
-            "cubes": [
-              {"origin": [-10.5, 13, 10], "size": [8, 8, 3], "uv": [0, 34]}
-            ]
-          },
-          {
-            "name": "Bag2",
-            "pivot": [4.5, 21, 10],
-            "rotation": [0, 90, 0],
-            "cubes": [
-              {"origin": [1.5, 13, 10], "size": [8, 8, 3], "uv": [0, 47]}
-            ]
-          },
-          {
-            "name": "Saddle",
-            "pivot": [0, 22, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5, 21, -1], "size": [10, 1, 8], "uv": [80, 0]}
-            ]
-          },
-          {
-            "name": "SaddleB",
-            "pivot": [0, 22, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-1.5, 22, -1], "size": [3, 1, 2], "uv": [106, 9]}
-            ]
-          },
-          {
-            "name": "SaddleC",
-            "pivot": [0, 22, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [{"origin": [-4, 22, 5], "size": [8, 1, 2], "uv": [80, 9]}]
-          },
-          {
-            "name": "SaddleL2",
-            "pivot": [5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [4.5, 13, 1], "size": [1, 2, 2], "uv": [74, 0]}
-            ]
-          },
-          {
-            "name": "SaddleL",
-            "pivot": [5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [4.5, 15, 1.5], "size": [1, 6, 1], "uv": [70, 0]}
-            ]
-          },
-          {
-            "name": "SaddleR2",
-            "pivot": [-5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, 13, 1], "size": [1, 2, 2], "uv": [74, 4]}
-            ]
-          },
-          {
-            "name": "SaddleR",
-            "pivot": [-5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, 15, 1.5], "size": [1, 6, 1], "uv": [80, 0]}
-            ]
-          },
-          {
-            "name": "SaddleMouthL",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [1.5, 26, -14], "size": [1, 2, 2], "uv": [74, 13]}
-            ]
-          },
-          {
-            "name": "SaddleMouthR",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.5, 26, -14], "size": [1, 2, 2], "uv": [74, 13]}
-            ]
-          },
-          {
-            "name": "SaddleMouthLine",
-            "pivot": [0, 20, -10],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2.6, 23, -16], "size": [0, 3, 16], "uv": [44, 10]}
-            ]
-          },
-          {
-            "name": "SaddleMouthLineR",
-            "pivot": [0, 20, -10],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-2.6, 23, -16], "size": [0, 3, 16], "uv": [44, 5]}
-            ]
-          },
-          {
-            "name": "Mane",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-1, 15.5, -5], "size": [2, 16, 4], "uv": [58, 0]}
-            ]
-          },
-          {
-            "name": "HeadSaddle",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {
-                "origin": [-2.5, 25.1, -17],
-                "size": [5, 5, 12],
-                "uv": [80, 12],
-                "inflate": 0.05
-              }
-            ]
-          }
-        ]
-      }
-    },
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 23}
-  },
-  "husk": {
-    "identifier": "minecraft:husk",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "husk"},
-    "textures": {"default": "textures/entity/zombie/husk"},
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 1.5,
-        "visible_bounds_height": 2.5,
-        "visible_bounds_offset": [0, 1.25, 0],
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {
-            "name": "body",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-4, 12, -2], "size": [8, 12, 4], "uv": [16, 16]}
-            ],
-            "parent": "waist"
-          },
-          {"name": "waist", "neverRender": true, "pivot": [0, 12, 0]},
-          {
-            "name": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-4, 24, -4], "size": [8, 8, 8], "uv": [0, 0]}
-            ],
-            "parent": "body"
-          },
-          {
-            "name": "hat",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {
-                "origin": [-4, 24, -4],
-                "size": [8, 8, 8],
-                "uv": [32, 0],
-                "inflate": 0.5
-              }
-            ],
-            "neverRender": true,
-            "parent": "head"
-          },
-          {
-            "name": "rightArm",
-            "pivot": [-5, 22, 0],
-            "cubes": [
-              {"origin": [-8, 12, -2], "size": [4, 12, 4], "uv": [40, 16]}
-            ],
-            "parent": "body"
-          },
-          {
-            "name": "rightItem",
-            "pivot": [-6, 15, 1],
-            "neverRender": true,
-            "parent": "rightArm"
-          },
-          {
-            "name": "leftArm",
-            "pivot": [5, 22, 0],
-            "cubes": [
-              {"origin": [4, 12, -2], "size": [4, 12, 4], "uv": [40, 16]}
-            ],
-            "mirror": true,
-            "parent": "body"
-          },
-          {
-            "name": "rightLeg",
-            "pivot": [-1.9, 12, 0],
-            "cubes": [
-              {"origin": [-3.9, 0, -2], "size": [4, 12, 4], "uv": [0, 16]}
-            ],
-            "parent": "body"
-          },
-          {
-            "name": "leftLeg",
-            "pivot": [1.9, 12, 0],
-            "cubes": [
-              {"origin": [-0.1, 0, -2], "size": [4, 12, 4], "uv": [0, 16]}
-            ],
-            "mirror": true,
-            "parent": "body"
-          }
-        ]
-      }
-    },
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;"
-      ]
-    },
-    "animations": {
-      "humanoid_big_head": {"loop": true, "bones": {"head": {"scale": 1.4}}},
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-36, 0, 0]},
-          "rightarm": {"rotation": [-36, 0, 0]}
-        }
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
-          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
-        }
-      },
-      "holding": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "variable.is_holding_left ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "variable.is_holding_right ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "brandish_spear": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "this * -0.5 - 157.5 - 22.5 * variable.charge_amount",
-              "-this",
-              0
-            ]
-          }
-        }
-      },
-      "charging": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": ["22.5 * variable.charge_amount - this", "-this", 0]
-          }
-        }
-      },
-      "attack.rotations": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46 - this",
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.sin(1.0 - math.pow(1.0 - variable.attack_time, 3.0) * 180.0) * (variable.is_brandishing_spear ? -1.0 : 1.0 )",
-              "variable.is_brandishing_spear ? 0.0 : (math.sin(math.sqrt(variable.attack_time) * 360) * 11.46) * 2.0",
-              0
-            ]
-          }
-        }
-      },
-      "sneaking": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["0.5 - this", 0, 0]},
-          "head": {"position": [0, 1, 0]},
-          "leftarm": {"rotation": [72, 0, 0]},
-          "leftleg": {"position": [0, -3, 4]},
-          "rightarm": {"rotation": [72, 0, 0]},
-          "rightleg": {"position": [0, -3, 4]}
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "damage_nearby_mobs": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["-45.0-this", "-this", "-this"]},
-          "leftleg": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightarm": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-45.0-this", "-this", "-this"]}
-        }
-      },
-      "bow_and_arrow": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 - math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation + 28.65",
-              "-(math.cos(query.life_time * 103.2) * 2.865) - 2.865"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 + math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation - 5.73",
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "use_item_progress": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "variable.use_item_startup_progress * -60.0 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -22.5 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -5.625 + variable.use_item_interval_progress * 11.25"
-            ]
-          }
-        }
-      },
-      "zombie_attack_bare_hand": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-90.0 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) - (math.sin(query.life_time * 76.776372) * 2.865) - this",
-              "5.73 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 0.6) - this",
-              "math.cos(query.life_time * 103.13244) * -2.865 - 2.865 - this"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "90.0 * (variable.is_brandishing_spear - 1.0) - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) + (math.sin(query.life_time * 76.776372) * 2.865) - this",
-              "(math.sin(variable.attack_time * 180.0) * 57.3) * 0.6 - 5.73 - this",
-              "math.cos(query.life_time * 103.13244) * 2.865 + 2.865 - this"
-            ]
-          }
-        }
-      },
-      "swimming": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [
-              0,
-              "variable.swim_amount * -10.0 - this",
-              "variable.swim_amount * 9.0 - this"
-            ],
-            "rotation": [
-              "variable.swim_amount * (90.0 + query.target_x_rotation)",
-              0,
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) - (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "leftleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0 + 180.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) + (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, -14.325, variable.swim_amount) + (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "rightleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "humanoid_baby_big_head": {
-        "initial_state": "default",
-        "states": {
-          "baby": {
-            "animations": ["humanoid_big_head"],
-            "transitions": [{"default": "!query.is_baby"}]
-          },
-          "default": {"transitions": [{"baby": "query.is_baby"}]}
-        }
-      },
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      },
-      "riding": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"riding": "query.is_riding"}]},
-          "riding": {
-            "animations": ["riding.arms", "riding.legs"],
-            "transitions": [{"default": "!query.is_riding"}]
-          }
-        }
-      },
-      "holding": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["holding"]}}
-      },
-      "brandish_spear": {
-        "initial_state": "default",
-        "states": {
-          "brandish_spear": {
-            "animations": ["brandish_spear"],
-            "transitions": [{"default": "!variable.is_brandishing_spear"}]
-          },
-          "default": {
-            "transitions": [{"brandish_spear": "variable.is_brandishing_spear"}]
-          }
-        }
-      },
-      "charging": {
-        "initial_state": "default",
-        "states": {
-          "charging": {
-            "animations": ["charging"],
-            "transitions": [{"default": "!query.is_charging"}]
-          },
-          "default": {"transitions": [{"charging": "query.is_charging"}]}
-        }
-      },
-      "attack": {
-        "initial_state": "default",
-        "states": {
-          "attacking": {
-            "animations": ["attack.rotations"],
-            "transitions": [{"default": "variable.attack_time < 0.0"}]
-          },
-          "default": {
-            "transitions": [{"attacking": "variable.attack_time >= 0.0"}]
-          }
-        }
-      },
-      "sneaking": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"sneaking": "query.is_sneaking"}]},
-          "sneaking": {
-            "animations": ["sneaking"],
-            "transitions": [{"default": "!query.is_sneaking"}]
-          }
-        }
-      },
-      "bob": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["bob"]}}
-      },
-      "damage_nearby_mobs": {
-        "initial_state": "default",
-        "states": {
-          "damage_nearby_mobs": {
-            "animations": ["damage_nearby_mobs"],
-            "transitions": [{"default": "!variable.damage_nearby_mobs"}]
-          },
-          "default": {
-            "transitions": [
-              {"damage_nearby_mobs": "variable.damage_nearby_mobs"}
-            ]
-          }
-        }
-      },
-      "bow_and_arrow": {
-        "initial_state": "default",
-        "states": {
-          "bow_and_arrow": {
-            "animations": ["bow_and_arrow"],
-            "transitions": [{"default": "!query.has_target"}]
-          },
-          "default": {"transitions": [{"bow_and_arrow": "query.has_target"}]}
-        }
-      },
-      "use_item_progress": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [
-              {
-                "use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 )"
-              }
-            ]
-          },
-          "use_item_progress": {
-            "animations": ["use_item_progress"],
-            "transitions": [
-              {
-                "default": "( variable.use_item_interval_progress <= 0.0 ) && ( variable.use_item_startup_progress <= 0.0 )"
-              }
-            ]
-          }
-        }
-      },
-      "zombie_attack_bare_hand": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [{"is_bare_hand": "variable.is_holding_left != 1.0"}]
-          },
-          "is_bare_hand": {
-            "animations": ["zombie_attack_bare_hand"],
-            "transitions": [{"default": "variable.is_holding_left == 1.0"}]
-          }
-        }
-      },
-      "swimming": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [{"is_swimming": "variable.swim_amount > 0.0"}]
-          },
-          "is_swimming": {
-            "animations": ["swimming"],
-            "transitions": [{"default": "variable.swim_amount <= 0.0"}]
-          }
-        }
-      }
-    },
-    "render_controllers": ["controller.render.husk"],
-    "enable_attachables": true,
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 28}
-  },
   "iron_golem": {
     "identifier": "minecraft:iron_golem",
     "materials": {"default": "iron_golem"},
@@ -7661,182 +1723,7 @@
         ]
       }
     },
-    "animations": {
-      "walk": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": [0, 0, "variable.modified_tcos0 / 1.5"]},
-          "head": {"rotation": [0, 0, "variable.modified_tcos0 / 1.5"]},
-          "leg0": {"rotation": ["variable.modified_tcos0 * 6.0", 0, 0]},
-          "leg1": {"rotation": ["-variable.modified_tcos0 * 6.0", 0, 0]}
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "arm0": {"rotation": ["-variable.modified_tcos0 * 2.0", 0, 0]},
-          "arm1": {"rotation": ["variable.modified_tcos0 * 2.0", 0, 0]}
-        }
-      },
-      "walk_to_target": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              0,
-              "2.0 * (math.abs(math.mod(query.modified_distance_moved + 6, 13.0) - 6.5) - 3.25)"
-            ]
-          },
-          "head": {
-            "rotation": [
-              0,
-              0,
-              "2.0 * (math.abs(math.mod(query.modified_distance_moved + 6, 13.0) - 6.5) - 3.25)"
-            ]
-          },
-          "leg0": {
-            "rotation": [
-              "(math.cos(query.modified_distance_moved * 38.17) * 40.0)",
-              0,
-              0
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              "(math.cos(query.modified_distance_moved * 38.17 + 180) * 40.0)",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "move_to_target": {
-        "loop": true,
-        "bones": {
-          "arm0": {
-            "rotation": [
-              "((math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 2.25) * 30.0",
-              0,
-              0
-            ]
-          },
-          "arm1": {
-            "rotation": [
-              "((math.abs(math.mod(query.modified_distance_moved, 13) - 6.5) - 3.25) / 2.25) * -30.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "attack": {
-        "loop": true,
-        "bones": {
-          "arm0": {
-            "rotation": [
-              "-114 + ((1.5 * math.abs(math.mod(variable.attack_animation_tick - query.frame_alpha, 10) - 5) - 2.5) / 5) * 57.3",
-              0,
-              0
-            ]
-          },
-          "arm1": {
-            "rotation": [
-              "-114 + ((1.5 * math.abs(math.mod(variable.attack_animation_tick - query.frame_alpha, 10) - 5) - 2.5) / 5) * 57.3",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "flower": {
-        "loop": true,
-        "bones": {
-          "arm0": {
-            "rotation": [
-              "-45.8 + ((0.25 * math.abs(math.mod(variable.offer_flower_tick, 70) - 35) - 17.5) / 35)",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {
-      "pre_animation": [
-        "variable.modified_tcos0 = Math.clamp(((Math.cos(query.modified_distance_moved * 13.5) * Math.min(query.modified_move_speed, 0.6) / variable.gliding_speed_value) * 25.0), -12.5, 12.5);"
-      ],
-      "animate": ["look_at_target", "move_controller", "arm_controller"]
-    },
-    "render_controllers": ["controller.render.iron_golem"],
-    "animation_controllers": {
-      "move_controller": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": [{"walk": "query.modified_move_speed"}],
-            "transitions": [{"has_target": "query.has_target"}]
-          },
-          "has_target": {
-            "animations": [{"walk_to_target": "query.modified_move_speed"}],
-            "transitions": [{"default": "!query.has_target"}]
-          }
-        }
-      },
-      "arm_controller": {
-        "initial_state": "default",
-        "states": {
-          "attack": {
-            "animations": ["attack"],
-            "transitions": [
-              {
-                "default": "!query.has_target && variable.attack_animation_tick <= 0.0"
-              },
-              {
-                "has_target": "query.has_target && variable.attack_animation_tick <= 0.0"
-              }
-            ]
-          },
-          "default": {
-            "animations": ["move"],
-            "transitions": [
-              {"attack": "variable.attack_animation_tick > 0.0"},
-              {"flower": "variable.offer_flower_tick"},
-              {"has_target": "query.has_target"}
-            ]
-          },
-          "flower": {
-            "animations": ["flower"],
-            "transitions": [
-              {"attack": "variable.attack_animation_tick > 0.0"},
-              {"default": "variable.offer_flower_tick <= 0.0"},
-              {"has_target": "query.has_target"}
-            ]
-          },
-          "has_target": {
-            "animations": ["move_to_target"],
-            "transitions": [
-              {"attack": "variable.attack_animation_tick > 0.0"},
-              {"default": "!query.has_target"},
-              {"flower": "variable.offer_flower_tick"}
-            ]
-          }
-        }
-      }
-    }
+    "render_controllers": ["controller.render.iron_golem"]
   },
   "item_frame": {
     "identifier": "minecraft:item_frame",
@@ -7904,183 +1791,6 @@
     },
     "render_controllers": ["controller.render.leash_knot"]
   },
-  "llama": {
-    "identifier": "minecraft:llama",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "llama"},
-    "textures": {
-      "creamy": "textures/entity/llama/creamy",
-      "white": "textures/entity/llama/white",
-      "brown": "textures/entity/llama/brown",
-      "gray": "textures/entity/llama/gray",
-      "decor_none": "textures/entity/llama/decor/decor_none",
-      "decor_white": "textures/entity/llama/decor/white",
-      "decor_orange": "textures/entity/llama/decor/orange",
-      "decor_magenta": "textures/entity/llama/decor/magenta",
-      "decor_light_blue": "textures/entity/llama/decor/light_blue",
-      "decor_yellow": "textures/entity/llama/decor/yellow",
-      "decor_lime": "textures/entity/llama/decor/lime",
-      "decor_pink": "textures/entity/llama/decor/pink",
-      "decor_gray": "textures/entity/llama/decor/gray",
-      "decor_silver": "textures/entity/llama/decor/light_gray",
-      "decor_cyan": "textures/entity/llama/decor/cyan",
-      "decor_purple": "textures/entity/llama/decor/purple",
-      "decor_blue": "textures/entity/llama/decor/blue",
-      "decor_brown": "textures/entity/llama/decor/brown",
-      "decor_green": "textures/entity/llama/decor/green",
-      "decor_red": "textures/entity/llama/decor/red",
-      "decor_black": "textures/entity/llama/decor/black",
-      "decor_wandering_trader": "textures/entity/llama/decor/trader_llama"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 2,
-        "visible_bounds_height": 2.5,
-        "visible_bounds_offset": [0, 1, 0],
-        "texturewidth": 128,
-        "textureheight": 64,
-        "bones": [
-          {
-            "name": "head",
-            "parent": "body",
-            "pivot": [0, 17, -6],
-            "locators": {"lead": [0, 18, -11]},
-            "cubes": [
-              {"origin": [-2, 27, -16], "size": [4, 4, 9], "uv": [0, 0]},
-              {"origin": [-4, 15, -12], "size": [8, 18, 6], "uv": [0, 14]},
-              {"origin": [-4, 33, -10], "size": [3, 3, 2], "uv": [17, 0]},
-              {"origin": [1, 33, -10], "size": [3, 3, 2], "uv": [17, 0]}
-            ]
-          },
-          {
-            "name": "chest1",
-            "parent": "body",
-            "pivot": [-8.5, 21, 3],
-            "rotation": [0, 90, 0],
-            "cubes": [
-              {"origin": [-11.5, 13, 3], "size": [8, 8, 3], "uv": [45, 28]}
-            ]
-          },
-          {
-            "name": "chest2",
-            "parent": "body",
-            "pivot": [5.5, 21, 3],
-            "rotation": [0, 90, 0],
-            "cubes": [
-              {"origin": [2.5, 13, 3], "size": [8, 8, 3], "uv": [45, 41]}
-            ]
-          },
-          {
-            "name": "body",
-            "pivot": [0, 19, 2],
-            "bind_pose_rotation": [90, 0, 0],
-            "cubes": [
-              {"origin": [-6, 11, -5], "size": [12, 18, 10], "uv": [29, 0]}
-            ]
-          },
-          {
-            "name": "leg0",
-            "parent": "body",
-            "pivot": [-3.5, 14, 6],
-            "cubes": [
-              {"origin": [-5.5, 0, 4], "size": [4, 14, 4], "uv": [29, 29]}
-            ]
-          },
-          {
-            "name": "leg1",
-            "parent": "body",
-            "pivot": [3.5, 14, 6],
-            "cubes": [
-              {"origin": [1.5, 0, 4], "size": [4, 14, 4], "uv": [29, 29]}
-            ]
-          },
-          {
-            "name": "leg2",
-            "parent": "body",
-            "pivot": [-3.5, 14, -5],
-            "cubes": [
-              {"origin": [-5.5, 0, -7], "size": [4, 14, 4], "uv": [29, 29]}
-            ]
-          },
-          {
-            "name": "leg3",
-            "parent": "body",
-            "pivot": [3.5, 14, -5],
-            "cubes": [
-              {"origin": [1.5, 0, -7], "size": [4, 14, 4], "uv": [29, 29]}
-            ]
-          }
-        ]
-      }
-    },
-    "animations": {
-      "setup": {"loop": true, "bones": {"body": {"rotation": ["-this", 0, 0]}}},
-      "walk": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          },
-          "leg1": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg2": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg3": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "baby_transform": {
-        "loop": true,
-        "bones": {
-          "body": {"position": [0, -5.5, -5], "scale": [1.2, 1, 1]},
-          "head": {"position": [0, 2, 0], "scale": [1.3, 1.2, 1.2]},
-          "leg0": {"position": [0, -1, 0], "scale": [0.91, 0.56, 0.91]},
-          "leg1": {"position": [0, -1, 0], "scale": [0.91, 0.56, 0.91]},
-          "leg2": {"position": [0, -1, 0], "scale": [0.91, 0.56, 0.91]},
-          "leg3": {"position": [0, -1, 0], "scale": [0.91, 0.56, 0.91]}
-        }
-      }
-    },
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": [
-              "setup",
-              {"walk": "query.modified_move_speed"},
-              "look_at_target"
-            ]
-          }
-        }
-      },
-      "baby": {
-        "initial_state": "baby",
-        "states": {
-          "baby": {"animations": [{"baby_transform": "query.is_baby"}]}
-        }
-      }
-    },
-    "render_controllers": ["controller.render.llama"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 38}
-  },
   "llama_spit": {
     "identifier": "minecraft:llama_spit",
     "materials": {"default": "llama_spit"},
@@ -8109,22 +1819,6 @@
         ]
       }
     },
-    "animations": {
-      "setup": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [0, -15, 0],
-            "rotation": [
-              0,
-              "query.target_y_rotation - 90.0 - this",
-              "query.target_x_rotation - this"
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {"animate": ["setup"]},
     "render_controllers": ["controller.render.llama_spit"]
   },
   "magma_cube": {
@@ -8199,179 +1893,9 @@
         ]
       }
     },
-    "scripts": {
-      "pre_animation": [
-        "variable.slime_squish_factor = (query.previous_squish_value + (query.current_squish_value - query.previous_squish_value) * query.frame_alpha);",
-        "variable.bounce = 1 / ((variable.slime_squish_factor / (query.variant * 0.5 + 1)) + 1);",
-        "variable.horizontal_scale_amount = variable.bounce * query.variant;",
-        "variable.vertical_scale_amount = (1 / variable.bounce) * query.variant;"
-      ],
-      "scaleX": "variable.horizontal_scale_amount",
-      "scaleY": "variable.vertical_scale_amount",
-      "scaleZ": "variable.horizontal_scale_amount"
-    },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "bodycube_0": {
-            "position": [
-              0,
-              "3.0 * (variable.slime_squish_factor < 0.0 ? 0.0 : variable.slime_squish_factor) * 1.7",
-              0
-            ]
-          },
-          "bodycube_1": {
-            "position": [
-              0,
-              "2.0 * (variable.slime_squish_factor < 0.0 ? 0.0 : variable.slime_squish_factor) * 1.7",
-              0
-            ]
-          },
-          "bodycube_2": {
-            "position": [
-              0,
-              "1.0 * (variable.slime_squish_factor < 0.0 ? 0.0 : variable.slime_squish_factor) * 1.7",
-              0
-            ]
-          },
-          "bodycube_4": {
-            "position": [
-              0,
-              "-1.0 * (variable.slime_squish_factor < 0.0 ? 0.0 : variable.slime_squish_factor) * 1.7",
-              0
-            ]
-          },
-          "bodycube_5": {
-            "position": [
-              0,
-              "-2.0 * (variable.slime_squish_factor < 0.0 ? 0.0 : variable.slime_squish_factor) * 1.7",
-              0
-            ]
-          },
-          "bodycube_6": {
-            "position": [
-              0,
-              "-3.0 * (variable.slime_squish_factor < 0.0 ? 0.0 : variable.slime_squish_factor) * 1.7",
-              0
-            ]
-          },
-          "bodycube_7": {
-            "position": [
-              0,
-              "-4.0 * (variable.slime_squish_factor < 0.0 ? 0.0 : variable.slime_squish_factor) * 1.7",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "general": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      }
-    },
     "render_controllers": ["controller.render.magma_cube"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 20}
   },
-  "minecart": {
-    "identifier": "minecraft:minecart",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "minecart"},
-    "textures": {"default": "textures/entity/minecart"},
-    "geometry": {
-      "default": {
-        "bones": [
-          {
-            "name": "bottom",
-            "pivot": [0, 6, 0],
-            "cubes": [
-              {
-                "origin": [-10, -6.5, -1],
-                "size": [20, 16, 2],
-                "rotation": [90, 0, 0],
-                "uv": [0, 10]
-              }
-            ]
-          },
-          {
-            "name": "back",
-            "pivot": [0, 0, 0],
-            "cubes": [
-              {
-                "origin": [-17, 2.5, -1],
-                "size": [16, 8, 2],
-                "rotation": [0, 270, 0],
-                "uv": [0, 0]
-              }
-            ],
-            "parent": "bottom"
-          },
-          {
-            "name": "front",
-            "pivot": [0, 0, 0],
-            "cubes": [
-              {
-                "origin": [1, 2.5, -1],
-                "size": [16, 8, 2],
-                "rotation": [0, 90, 0],
-                "uv": [0, 0]
-              }
-            ],
-            "parent": "bottom"
-          },
-          {
-            "name": "right",
-            "pivot": [0, 0, 0],
-            "cubes": [
-              {
-                "origin": [-8, 2.5, -8],
-                "size": [16, 8, 2],
-                "rotation": [0, 180, 0],
-                "uv": [0, 0]
-              }
-            ],
-            "parent": "bottom"
-          },
-          {
-            "name": "left",
-            "pivot": [0, 0, 0],
-            "cubes": [
-              {"origin": [-8, 2.5, 6], "size": [16, 8, 2], "uv": [0, 0]}
-            ],
-            "parent": "bottom"
-          }
-        ],
-        "texturewidth": 64,
-        "textureheight": 32
-      }
-    },
-    "scripts": {
-      "pre_animation": ["variable.hurt = query.hurt_time - query.frame_alpha;"],
-      "animate": ["move"]
-    },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "bottom": {
-            "position": [
-              "variable.rail_offset.x / query.model_scale",
-              "variable.rail_offset.y / query.model_scale",
-              "variable.rail_offset.z / query.model_scale"
-            ],
-            "rotation": [
-              "variable.hurt > 0 ? -Math.sin(variable.hurt * 360 / (Math.pi * 2)) * variable.hurt * (((20 * 2 - query.structural_integrity) - query.frame_alpha) < 0 ? 0: (20 * 2 - query.structural_integrity) - query.frame_alpha) / 10 * query.hurt_direction : 0",
-              0,
-              "-variable.rail_rotation.z"
-            ]
-          }
-        }
-      }
-    },
-    "render_controllers": ["controller.render.minecart"]
-  },
   "mooshroom": {
     "identifier": "minecraft:mooshroom",
     "min_engine_version": "1.8.0",
@@ -8438,745 +1962,9 @@
         ]
       }
     },
-    "animations": {
-      "setup": {"loop": true, "bones": {"body": {"rotation": ["-this", 0, 0]}}},
-      "walk": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          },
-          "leg1": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg2": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg3": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "baby_transform": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "position": [
-              0,
-              "query.is_baby ? 4.0 : 0.0",
-              "query.is_baby ? 4.0 : 0.0"
-            ],
-            "scale": "query.is_baby ? 2.0 : 1.0"
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "setup": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["setup"]}}
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": [
-              {"walk": "query.modified_move_speed"},
-              "look_at_target"
-            ]
-          }
-        }
-      },
-      "baby": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["baby_transform"]}}
-      }
-    },
     "render_controllers": ["controller.render.mooshroom"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 5}
   },
-  "mule": {
-    "identifier": "minecraft:mule",
-    "textures": {
-      "base_brown": "textures/entity/horse/horse_brown",
-      "base_white": "textures/entity/horse/horse_white",
-      "base_chestnut": "textures/entity/horse/horse_chestnut",
-      "base_creamy": "textures/entity/horse/horse_creamy",
-      "base_black": "textures/entity/horse/horse_black",
-      "base_gray": "textures/entity/horse/horse_gray",
-      "base_darkbrown": "textures/entity/horse/horse_darkbrown",
-      "markings_none": "textures/entity/horse/horse_markings_none",
-      "markings_white": "textures/entity/horse/horse_markings_white",
-      "markings_whitefield": "textures/entity/horse/horse_markings_whitefield",
-      "markings_whitedots": "textures/entity/horse/horse_markings_whitedots",
-      "markings_blackdots": "textures/entity/horse/horse_markings_blackdots",
-      "mule": "textures/entity/horse/mule",
-      "donkey": "textures/entity/horse/donkey",
-      "skeleton": "textures/entity/horse/horse_skeleton",
-      "zombie": "textures/entity/horse/horse_zombie",
-      "armor_none": "textures/entity/horse/armor/horse_armor_none",
-      "armor_leather": "textures/entity/horse/armor/horse_armor_leather",
-      "armor_iron": "textures/entity/horse/armor/horse_armor_iron",
-      "armor_gold": "textures/entity/horse/armor/horse_armor_gold",
-      "armor_diamond": "textures/entity/horse/armor/horse_armor_diamond"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 2,
-        "visible_bounds_height": 3,
-        "visible_bounds_offset": [0, 1, 0],
-        "texturewidth": 128,
-        "textureheight": 128,
-        "bones": [
-          {
-            "name": "Body",
-            "pivot": [0, 13, 9],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5, 11, -10], "size": [10, 10, 24], "uv": [0, 34]}
-            ]
-          },
-          {
-            "name": "TailA",
-            "pivot": [0, 21, 14],
-            "rotation": [-65, 0, 0],
-            "cubes": [
-              {"origin": [-1, 20, 14], "size": [2, 2, 3], "uv": [44, 0]}
-            ]
-          },
-          {
-            "name": "TailB",
-            "pivot": [0, 21, 14],
-            "rotation": [-65, 0, 0],
-            "cubes": [
-              {"origin": [-1.5, 19, 17], "size": [3, 4, 7], "uv": [38, 7]}
-            ]
-          },
-          {
-            "name": "TailC",
-            "pivot": [0, 21, 14],
-            "rotation": [-80.34, 0, 0],
-            "cubes": [
-              {"origin": [-1.5, 21.5, 23], "size": [3, 4, 7], "uv": [24, 3]}
-            ]
-          },
-          {
-            "name": "Leg1A",
-            "pivot": [4, 15, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.5, 8, 8.5], "size": [4, 9, 5], "uv": [78, 29]}
-            ]
-          },
-          {
-            "name": "Leg1B",
-            "pivot": [4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2, 3, 9.5], "size": [3, 5, 3], "uv": [78, 43]}
-            ]
-          },
-          {
-            "name": "Leg1C",
-            "pivot": [4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.5, -0.1, 9], "size": [4, 3, 4], "uv": [78, 51]}
-            ]
-          },
-          {
-            "name": "Leg2A",
-            "pivot": [-4, 15, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, 8, 8.5], "size": [4, 9, 5], "uv": [96, 29]}
-            ]
-          },
-          {
-            "name": "Leg2B",
-            "pivot": [-4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5, 3, 9.5], "size": [3, 5, 3], "uv": [96, 43]}
-            ]
-          },
-          {
-            "name": "Leg2C",
-            "pivot": [-4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, -0.1, 9], "size": [4, 3, 4], "uv": [96, 51]}
-            ]
-          },
-          {
-            "name": "Leg3A",
-            "pivot": [4, 15, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2.1, 8, -10.1], "size": [3, 8, 4], "uv": [44, 29]}
-            ]
-          },
-          {
-            "name": "Leg3B",
-            "pivot": [4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2.1, 3, -9.6], "size": [3, 5, 3], "uv": [44, 41]}
-            ]
-          },
-          {
-            "name": "Leg3C",
-            "pivot": [4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.6, -0.1, -10.1], "size": [4, 3, 4], "uv": [44, 51]}
-            ]
-          },
-          {
-            "name": "Leg4A",
-            "pivot": [-4, 15, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.1, 8, -10.1], "size": [3, 8, 4], "uv": [60, 29]}
-            ]
-          },
-          {
-            "name": "Leg4B",
-            "pivot": [-4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.1, 3, -9.6], "size": [3, 5, 3], "uv": [60, 41]}
-            ]
-          },
-          {
-            "name": "Leg4C",
-            "pivot": [-4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.6, -0.1, -10.1], "size": [4, 3, 4], "uv": [60, 51]}
-            ]
-          },
-          {
-            "name": "Head",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.5, 25, -11.5], "size": [5, 5, 7], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "UMouth",
-            "pivot": [0, 20.05, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2, 27.05, -17], "size": [4, 3, 6], "uv": [24, 18]}
-            ]
-          },
-          {
-            "name": "LMouth",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2, 25, -16.5], "size": [4, 2, 5], "uv": [24, 27]}
-            ]
-          },
-          {
-            "name": "Ear1",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [0.45, 29, -6], "size": [2, 3, 1], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "Ear2",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.45, 29, -6], "size": [2, 3, 1], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "MuleEarL",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 15],
-            "cubes": [
-              {"origin": [-2, 29, -6], "size": [2, 7, 1], "uv": [0, 12]}
-            ]
-          },
-          {
-            "name": "MuleEarR",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, -15],
-            "cubes": [{"origin": [0, 29, -6], "size": [2, 7, 1], "uv": [0, 12]}]
-          },
-          {
-            "name": "Neck",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.05, 15.8, -12], "size": [4, 14, 8], "uv": [0, 12]}
-            ]
-          },
-          {
-            "name": "Bag1",
-            "pivot": [-7.5, 21, 10],
-            "rotation": [0, 90, 0],
-            "cubes": [
-              {"origin": [-10.5, 13, 10], "size": [8, 8, 3], "uv": [0, 34]}
-            ]
-          },
-          {
-            "name": "Bag2",
-            "pivot": [4.5, 21, 10],
-            "rotation": [0, 90, 0],
-            "cubes": [
-              {"origin": [1.5, 13, 10], "size": [8, 8, 3], "uv": [0, 47]}
-            ]
-          },
-          {
-            "name": "Saddle",
-            "pivot": [0, 22, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5, 21, -1], "size": [10, 1, 8], "uv": [80, 0]}
-            ]
-          },
-          {
-            "name": "SaddleB",
-            "pivot": [0, 22, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-1.5, 22, -1], "size": [3, 1, 2], "uv": [106, 9]}
-            ]
-          },
-          {
-            "name": "SaddleC",
-            "pivot": [0, 22, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [{"origin": [-4, 22, 5], "size": [8, 1, 2], "uv": [80, 9]}]
-          },
-          {
-            "name": "SaddleL2",
-            "pivot": [5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [4.5, 13, 1], "size": [1, 2, 2], "uv": [74, 0]}
-            ]
-          },
-          {
-            "name": "SaddleL",
-            "pivot": [5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [4.5, 15, 1.5], "size": [1, 6, 1], "uv": [70, 0]}
-            ]
-          },
-          {
-            "name": "SaddleR2",
-            "pivot": [-5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, 13, 1], "size": [1, 2, 2], "uv": [74, 4]}
-            ]
-          },
-          {
-            "name": "SaddleR",
-            "pivot": [-5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, 15, 1.5], "size": [1, 6, 1], "uv": [80, 0]}
-            ]
-          },
-          {
-            "name": "SaddleMouthL",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [1.5, 26, -14], "size": [1, 2, 2], "uv": [74, 13]}
-            ]
-          },
-          {
-            "name": "SaddleMouthR",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.5, 26, -14], "size": [1, 2, 2], "uv": [74, 13]}
-            ]
-          },
-          {
-            "name": "SaddleMouthLine",
-            "pivot": [0, 20, -10],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2.6, 23, -16], "size": [0, 3, 16], "uv": [44, 10]}
-            ]
-          },
-          {
-            "name": "SaddleMouthLineR",
-            "pivot": [0, 20, -10],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-2.6, 23, -16], "size": [0, 3, 16], "uv": [44, 5]}
-            ]
-          },
-          {
-            "name": "Mane",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-1, 15.5, -5], "size": [2, 16, 4], "uv": [58, 0]}
-            ]
-          },
-          {
-            "name": "HeadSaddle",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {
-                "origin": [-2.5, 25.1, -17],
-                "size": [5, 5, 12],
-                "uv": [80, 12],
-                "inflate": 0.05
-              }
-            ]
-          }
-        ]
-      }
-    },
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 31}
-  },
-  "ocelot": {
-    "identifier": "minecraft:ocelot",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "ocelot"},
-    "textures": {
-      "black": "textures/entity/cat/black",
-      "red": "textures/entity/cat/red",
-      "siamese": "textures/entity/cat/siamese",
-      "wild": "textures/entity/cat/ocelot"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 2.5,
-        "visible_bounds_height": 1,
-        "visible_bounds_offset": [0, 0.5, 0],
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {
-            "pivot": [0, 9, -9],
-            "locators": {"lead": [0, 9, -9]},
-            "cubes": [
-              {"origin": [-2.5, 7, -12], "size": [5, 4, 5], "uv": [0, 0]},
-              {
-                "origin": [-1.5, 7.01562, -13],
-                "size": [3, 2, 2],
-                "uv": [0, 24]
-              },
-              {"origin": [-2, 11, -9], "size": [1, 1, 2], "uv": [0, 10]},
-              {"origin": [1, 11, -9], "size": [1, 1, 2], "uv": [6, 10]}
-            ],
-            "name": "head",
-            "parent": "body"
-          },
-          {
-            "pivot": [0, 7, 1],
-            "bind_pose_rotation": [90, 0, 0],
-            "cubes": [
-              {"origin": [-2, -1, -2], "size": [4, 16, 6], "uv": [20, 0]}
-            ],
-            "name": "body"
-          },
-          {
-            "pivot": [0, 9, 8],
-            "bind_pose_rotation": [90, 0, 0],
-            "cubes": [
-              {"origin": [-0.5, 1, 8], "size": [1, 8, 1], "uv": [0, 15]}
-            ],
-            "name": "tail1",
-            "parent": "body"
-          },
-          {
-            "pivot": [0, 9, 16],
-            "bind_pose_rotation": [90, 0, 0],
-            "cubes": [
-              {"origin": [-0.5, 1, 16], "size": [1, 8, 1], "uv": [4, 15]}
-            ],
-            "name": "tail2",
-            "parent": "tail1"
-          },
-          {
-            "pivot": [1.1, 6, 7],
-            "cubes": [
-              {"origin": [0.1, 0, 6], "size": [2, 6, 2], "uv": [8, 13]}
-            ],
-            "name": "backLegL",
-            "parent": "body"
-          },
-          {
-            "pivot": [-1.1, 6, 7],
-            "cubes": [
-              {"origin": [-2.1, 0, 6], "size": [2, 6, 2], "uv": [8, 13]}
-            ],
-            "name": "backLegR",
-            "parent": "body"
-          },
-          {
-            "pivot": [1.2, 10, -4],
-            "cubes": [
-              {"origin": [0.2, 0.2, -5], "size": [2, 10, 2], "uv": [40, 0]}
-            ],
-            "name": "frontLegL",
-            "parent": "body"
-          },
-          {
-            "pivot": [-1.2, 10, -4],
-            "cubes": [
-              {"origin": [-2.2, 0.2, -5], "size": [2, 10, 2], "uv": [40, 0]}
-            ],
-            "name": "frontLegR",
-            "parent": "body"
-          }
-        ]
-      }
-    },
-    "animations": {
-      "sneak": {
-        "loop": true,
-        "bones": {
-          "backlegl": {
-            "position": [0, "1.0 - this", 0],
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17) * 57.3 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "backlegr": {
-            "position": [0, "1.0 - this", 0],
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 180.0) * 57.3 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "body": {"position": [0, -1, 0]},
-          "frontlegl": {
-            "position": [0, "1.0 - this", 0],
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 180.0) * 57.3 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "frontlegr": {
-            "position": [0, "1.0 - this", 0],
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17) * 57.3 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "head": {"position": [0, -1, 0]},
-          "tail1": {"position": [0, "1.0 - this", 0]},
-          "tail2": {
-            "rotation": [
-              "62.0 + math.cos(query.modified_distance_moved * 57.3) * 27.0 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "walk": {
-        "loop": true,
-        "bones": {
-          "backlegl": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17) * 57.3 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "backlegr": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 180.0) * 57.3 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "frontlegl": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 180.0) * 57.3 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "frontlegr": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17) * 57.3 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "tail1": {"rotation": ["-51.57 - this", 0, 0]},
-          "tail2": {
-            "rotation": [
-              "62.0 + math.cos(query.modified_distance_moved * 57.3) * 45.0 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "sprint": {
-        "loop": true,
-        "bones": {
-          "backlegl": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17) * 57.3 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "backlegr": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 17.19) * 57.3 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "frontlegl": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 197.19) * 57.3 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "frontlegr": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 180.0) * 57.3 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "tail1": {"rotation": ["-this", 0, 0]},
-          "tail2": {
-            "rotation": [
-              "62.0 + math.cos(query.modified_distance_moved * 57.3) * 18.0 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "sit": {
-        "loop": true,
-        "bones": {
-          "backlegl": {
-            "position": [0, "-2.0 - this", "6.0 - this"],
-            "rotation": [-45, 0, 0]
-          },
-          "backlegr": {
-            "position": [0, "-2.0 - this", "6.0 - this"],
-            "rotation": ["-45 - this", 0, 0]
-          },
-          "body": {"rotation": ["-45 - this", 0, 0]},
-          "frontlegl": {
-            "position": [0, "-1.5 - this", "-7.0 - this"],
-            "rotation": ["42.15 - this", 0, 0]
-          },
-          "frontlegr": {
-            "position": [0, "-1.5 - this", "-7.0 - this"],
-            "rotation": ["42.15 - this", 0, 0]
-          },
-          "head": {"position": [0, -2, 0]},
-          "tail1": {"position": [0, 0, 0], "rotation": ["45 - this", 0, 0]},
-          "tail2": {"position": [0, 0, 0], "rotation": ["45 - this", 0, 0]}
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "baby_transform": {"loop": true, "bones": {"head": {"scale": 1.5}}}
-    },
-    "animation_controllers": {
-      "move": {
-        "initial_state": "sitting",
-        "states": {
-          "sitting": {
-            "animations": ["sit"],
-            "transitions": [
-              {"sneaking": "variable.state == 0"},
-              {"sprinting": "variable.state == 1"},
-              {"walking": "variable.state == 3"}
-            ]
-          },
-          "sneaking": {
-            "animations": ["sneak"],
-            "transitions": [
-              {"sprinting": "variable.state == 1"},
-              {"sitting": "variable.state == 2"},
-              {"walking": "variable.state == 3"}
-            ]
-          },
-          "sprinting": {
-            "animations": ["sprint"],
-            "transitions": [
-              {"sneaking": "variable.state == 0"},
-              {"sitting": "variable.state == 2"},
-              {"walking": "variable.state == 3"}
-            ]
-          },
-          "walking": {
-            "animations": ["walk"],
-            "transitions": [
-              {"sneaking": "variable.state == 0"},
-              {"sprinting": "variable.state == 1"},
-              {"sitting": "variable.state == 2"}
-            ]
-          }
-        }
-      },
-      "baby": {
-        "initial_state": "baby",
-        "states": {
-          "baby": {"animations": [{"baby_transform": "query.is_baby"}]}
-        }
-      },
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["look_at_target"]}}
-      }
-    },
-    "render_controllers": ["controller.render.ocelot"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 16}
-  },
   "panda": {
     "identifier": "minecraft:panda",
     "materials": {"default": "panda"},
@@ -9247,537 +2035,9 @@
         ]
       }
     },
-    "animations": {
-      "unhappy": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              0,
-              "(math.sin(query.life_time * 327.6) * 20) - this",
-              "(math.sin(query.life_time * 327.6) * 20) - this"
-            ]
-          },
-          "leg2": {
-            "rotation": [
-              "(math.sin(query.life_time * 343.8) * -43) - this",
-              0,
-              0
-            ]
-          },
-          "leg3": {
-            "rotation": [
-              "(math.sin(query.life_time * 343.8) * 43) - this",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "sneezing": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "(query.sneeze_counter < 15) ? (-45 * (query.sneeze_counter / 14)) : (-45 + (9 * (query.sneeze_counter - 15)) - this)",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "walk": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          },
-          "leg1": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg2": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg3": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "baby_transform": {
-        "loop": true,
-        "bones": {
-          "body": {"position": [0, 1.77, 0], "scale": [1.15, 1.15, 1]},
-          "head": {"position": [0, -0.18, 0.15], "scale": 1.8}
-        }
-      },
-      "sitting": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [0, "-2.15 -10 -this", 0],
-            "rotation": [
-              "(query.is_scared * math.cos(query.life_time * 71.62) * 16.2) + (query.sit_amount * -90) - this",
-              0,
-              0
-            ]
-          },
-          "head": {
-            "rotation": [
-              "query.is_eating ? (90.0 + 11.5 * math.sin(query.life_time * 750)) : (query.sit_amount * (100 - this)) - this",
-              0,
-              0
-            ]
-          },
-          "leg0": {"rotation": [0, 0, "32.7 - this"]},
-          "leg1": {"rotation": [0, 0, "-32.7 - this"]},
-          "leg2": {
-            "rotation": [
-              "(query.is_eating ? (-23 - (16.5 * math.sin(query.life_time * 750))) : 0) - this",
-              0,
-              -15
-            ]
-          },
-          "leg3": {
-            "rotation": [
-              "(query.is_eating ? (-23 - (16.5 * math.sin(query.life_time * 750))) : 0) - this",
-              0,
-              15
-            ]
-          }
-        }
-      },
-      "rolling": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["(query.roll_counter / 32) * 360", 0, 0]},
-          "head": {
-            "rotation": ["(this * -118) + query.roll_counter - this", 0, 0]
-          },
-          "leg0": {
-            "rotation": [
-              "math.sin(query.life_time * 60 * (query.is_baby ? 0.95 : 0.5) * 57.3) * 8.6 - this",
-              0,
-              0
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              "math.sin(query.life_time * 60 * (query.is_baby ? 0.95 : 0.5) * 57.3) * -8.6 - this",
-              0,
-              0
-            ]
-          },
-          "leg2": {
-            "rotation": [
-              "math.sin(query.life_time * 60 * (query.is_baby ? 0.95 : 0.5) * 57.3) * -8.6 - this",
-              0,
-              0
-            ]
-          },
-          "leg3": {
-            "rotation": [
-              "math.sin(query.life_time * 60 * (query.is_baby ? 0.95 : 0.5) * 57.3) * 8.6 - this",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "lying": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [
-              0,
-              "(query.is_baby ? -8.8 : -7.67) * query.lie_amount -10 - this",
-              0
-            ],
-            "rotation": ["query.lie_amount * -180 - this", 0, 0]
-          },
-          "head": {"rotation": ["(query.lie_amount * 90) - this", 0, 0]},
-          "leg0": {
-            "rotation": [
-              "math.sin(query.life_time * 206.28) * -17.2 - this",
-              0,
-              0
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              "math.sin(query.life_time * 263.58) * 17.2 - this",
-              0,
-              0
-            ]
-          },
-          "leg2": {
-            "rotation": ["math.sin(query.life_time * 172) * 17.2 - this", 0, 0]
-          },
-          "leg3": {
-            "rotation": [
-              "math.sin(query.life_time * 229.2) * -17.2 - this",
-              0,
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": [
-              {"walk": "query.modified_move_speed"},
-              "look_at_target"
-            ],
-            "transitions": [
-              {"rolling": "query.roll_counter > 0"},
-              {"sitting": "query.sit_amount > 0"},
-              {"lying": "query.lie_amount > 0"}
-            ]
-          },
-          "lying": {
-            "animations": ["lying"],
-            "transitions": [
-              {"default": "query.lie_amount <= 0"},
-              {"rolling": "query.roll_counter > 0"},
-              {"sitting": "query.sit_amount > 0"}
-            ]
-          },
-          "rolling": {
-            "animations": ["rolling"],
-            "transitions": [
-              {"default": "query.roll_counter <= 0"},
-              {"sitting": "query.sit_amount > 0"},
-              {"lying": "query.lie_amount > 0"}
-            ]
-          },
-          "sitting": {
-            "animations": ["sitting"],
-            "transitions": [
-              {"default": "query.sit_amount <= 0"},
-              {"rolling": "query.roll_counter > 0"},
-              {"lying": "query.lie_amount > 0"}
-            ]
-          }
-        }
-      },
-      "unhappy": {
-        "initial_state": "baby",
-        "states": {
-          "baby": {"animations": [{"unhappy": "query.unhappy_counter"}]}
-        }
-      },
-      "sneezing": {
-        "initial_state": "baby",
-        "states": {
-          "baby": {"animations": [{"sneezing": "query.sneeze_counter"}]}
-        }
-      },
-      "baby": {
-        "initial_state": "baby",
-        "states": {
-          "baby": {"animations": [{"baby_transform": "query.is_baby"}]}
-        }
-      }
-    },
     "render_controllers": ["controller.render.panda"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 54}
   },
-  "parrot": {
-    "identifier": "minecraft:parrot",
-    "materials": {"default": "parrot"},
-    "textures": {
-      "blue": "textures/entity/parrot/parrot_blue",
-      "green": "textures/entity/parrot/parrot_green",
-      "red_blue": "textures/entity/parrot/parrot_red_blue",
-      "yellow_blue": "textures/entity/parrot/parrot_yellow_blue",
-      "grey": "textures/entity/parrot/parrot_grey"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 1,
-        "visible_bounds_height": 1,
-        "visible_bounds_offset": [0, 0.5, 0],
-        "texturewidth": 32,
-        "textureheight": 32,
-        "bones": [
-          {
-            "name": "head",
-            "parent": "body",
-            "pivot": [0, 8.3, -2.8],
-            "locators": {"lead": [0, 6, -4]},
-            "cubes": [
-              {"origin": [-1, 6.8, -3.8], "size": [2, 3, 2], "uv": [2, 2]}
-            ]
-          },
-          {
-            "name": "head2",
-            "parent": "head",
-            "pivot": [0, 26, -1],
-            "cubes": [
-              {"origin": [-1, 9.8, -5.8], "size": [2, 1, 4], "uv": [10, 0]}
-            ]
-          },
-          {
-            "name": "beak1",
-            "parent": "head",
-            "pivot": [0, 24.5, -1.5],
-            "cubes": [
-              {"origin": [-0.5, 7.8, -4.7], "size": [1, 2, 1], "uv": [11, 7]}
-            ]
-          },
-          {
-            "name": "beak2",
-            "parent": "head",
-            "pivot": [0, 25.8, -2.5],
-            "cubes": [
-              {"origin": [-0.5, 8.1, -5.7], "size": [1, 1.7, 1], "uv": [16, 7]}
-            ]
-          },
-          {
-            "name": "body",
-            "pivot": [0, 7.5, -3],
-            "bind_pose_rotation": [28.287, 0, 0],
-            "cubes": [
-              {"origin": [-1.5, 1.5, -4.5], "size": [3, 6, 3], "uv": [2, 8]}
-            ]
-          },
-          {
-            "name": "tail",
-            "parent": "body",
-            "pivot": [0, 2.9, 1.2],
-            "cubes": [
-              {"origin": [-1.5, -0.1, 0.2], "size": [3, 4, 1], "uv": [22, 1]}
-            ]
-          },
-          {
-            "name": "wing0",
-            "parent": "body",
-            "pivot": [1.5, 7.1, -2.8],
-            "cubes": [
-              {"origin": [1, 2.1, -4.3], "size": [1, 5, 3], "uv": [19, 8]}
-            ]
-          },
-          {
-            "name": "wing1",
-            "parent": "body",
-            "pivot": [-1.5, 7.1, -2.8],
-            "cubes": [
-              {"origin": [-2, 2.1, -4.3], "size": [1, 5, 3], "uv": [19, 8]}
-            ]
-          },
-          {
-            "name": "feather",
-            "parent": "head",
-            "pivot": [0, 10.1, 0.2],
-            "bind_pose_rotation": [-12.685, 0, 0],
-            "cubes": [
-              {"origin": [0, 9.1, -4.9], "size": [0, 5, 4], "uv": [2, 18]}
-            ]
-          },
-          {
-            "name": "leg0",
-            "parent": "body",
-            "pivot": [1.5, 1, -0.5],
-            "cubes": [
-              {"origin": [0.5, -0.5, -1.5], "size": [1, 2, 1], "uv": [14, 18]}
-            ]
-          },
-          {
-            "name": "leg1",
-            "parent": "body",
-            "pivot": [-0.5, 1, -0.5],
-            "cubes": [
-              {"origin": [-1.5, -0.5, -1.5], "size": [1, 2, 1], "uv": [14, 18]}
-            ]
-          }
-        ]
-      }
-    },
-    "scripts": {
-      "pre_animation": [
-        "variable.state = query.is_dancing ? 3 : (query.is_sitting ? 2 : (!query.is_on_ground && !query.is_jumping && !query.is_riding ? 0 : 1));",
-        "variable.dance.x = Math.cos(query.life_time * 57.3 * 20.0);",
-        "variable.dance.y = -Math.sin(query.life_time * 57.3 * 20.0);",
-        "variable.wing_flap = ((math.sin(query.wing_flap_position * 57.3) + 1) * query.wing_flap_speed);"
-      ]
-    },
-    "animations": {
-      "moving": {
-        "loop": true,
-        "bones": {
-          "body": {"position": [0, "variable.wing_flap * 0.3", 0]},
-          "tail": {
-            "rotation": [
-              "60.0 + math.cos(query.anim_time * 38.17) * 17.0 - this",
-              0,
-              0
-            ]
-          },
-          "wing0": {"rotation": [0, 0, "-5.0 - variable.wing_flap * 57.3"]},
-          "wing1": {"rotation": [0, 0, "5.0 + variable.wing_flap * 57.3"]}
-        }
-      },
-      "base": {
-        "loop": true,
-        "bones": {
-          "body": {"position": ["-this", 0, 0], "rotation": ["-this", 0, 0]},
-          "feather": {"rotation": ["-this", 0, 0]},
-          "head": {"position": ["-this", 0, 0], "rotation": [0, 0, "-this"]},
-          "leg0": {
-            "position": [0, "-6.0-this", -0.5],
-            "rotation": ["-16.713-this", 0, "-this"]
-          },
-          "leg1": {
-            "position": [0, "-6.0-this", -0.5],
-            "rotation": ["-16.713-this", 0, "-this"]
-          },
-          "tail": {"position": ["-this", 0, 0]},
-          "wing0": {
-            "position": ["1.5-this", 0, 0],
-            "rotation": ["-40.0-this", "-180.0-this", 0]
-          },
-          "wing1": {
-            "position": ["-1.5-this", 0, 0],
-            "rotation": ["-40.0-this", "-180.0-this", 0]
-          }
-        }
-      },
-      "dance": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": ["variable.dance.x-this", "variable.dance.y", 0]
-          },
-          "head": {
-            "rotation": ["-this", "-this", "variable.dance.y*23.0 - this"]
-          },
-          "leg0": {
-            "position": ["-variable.dance.x", "-variable.dance.y", 0],
-            "rotation": [0, 0, "-20.0 - this"]
-          },
-          "leg1": {
-            "position": ["-variable.dance.x", "-variable.dance.y", 0],
-            "rotation": [0, 0, "20.0 - this"]
-          },
-          "tail": {"rotation": ["60.0 - this", 0, 0]},
-          "wing0": {"rotation": [0, 0, "-5.0 - variable.wing_flap"]},
-          "wing1": {"rotation": [0, 0, "5.0 + variable.wing_flap"]}
-        }
-      },
-      "sitting": {
-        "loop": true,
-        "bones": {
-          "body": {"position": [0, -1.9, 0]},
-          "leg0": {"rotation": [90, 0, 0]},
-          "leg1": {"rotation": [90, 0, 0]},
-          "tail": {"rotation": ["90.0 - this", 0, 0]},
-          "wing0": {"rotation": [0, 0, "-5.0-this"]},
-          "wing1": {"rotation": [0, 0, "5.0-this"]}
-        }
-      },
-      "flying": {
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": [
-              "math.cos(query.anim_time * 38.17) * 80.0 * query.modified_move_speed",
-              0,
-              0
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              "math.cos(query.anim_time * 38.17) * -80.0 * query.modified_move_speed",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "standing": {
-        "loop": true,
-        "bones": {
-          "leg0": {"rotation": [20, 0, 0]},
-          "leg1": {"rotation": [20, 0, 0]}
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "setup": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["look_at_target", "base"]}}
-      },
-      "move": {
-        "initial_state": "dancing",
-        "states": {
-          "dancing": {
-            "animations": ["dance"],
-            "transitions": [
-              {"flying": "variable.state == 0"},
-              {"standing": "variable.state == 1"},
-              {"sitting": "variable.state == 2"}
-            ]
-          },
-          "flying": {
-            "animations": ["moving", "flying"],
-            "transitions": [
-              {"standing": "variable.state == 1"},
-              {"sitting": "variable.state == 2"},
-              {"dancing": "variable.state == 3"}
-            ]
-          },
-          "sitting": {
-            "animations": ["sitting"],
-            "transitions": [
-              {"flying": "variable.state == 0"},
-              {"standing": "variable.state == 1"},
-              {"dancing": "variable.state == 3"}
-            ]
-          },
-          "standing": {
-            "animations": ["moving", "standing"],
-            "transitions": [
-              {"flying": "variable.state == 0"},
-              {"sitting": "variable.state == 2"},
-              {"dancing": "variable.state == 3"}
-            ]
-          }
-        }
-      }
-    },
-    "render_controllers": ["controller.render.parrot"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 43}
-  },
   "phantom": {
     "identifier": "minecraft:phantom",
     "materials": {"default": "phantom", "invisible": "phantom_invisible"},
@@ -9863,85 +2123,10 @@
         ]
       }
     },
-    "scripts": {
-      "initialize": [
-        "variable.runtimeid = 0;",
-        "variable.tailrotx = -5.0;",
-        "variable.wingrotz = 0.0;"
-      ],
-      "animate": ["phantom_base_pose_controller", "move"]
-    },
-    "animations": {
-      "phantom_base_pose": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [0, -20, 0],
-            "rotation": ["-query.target_x_rotation", 0, 0]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "start_delay": "math.random(0, 2.417)",
-        "animation_length": 2.417,
-        "bones": {
-          "tail": {
-            "rotation": [
-              "-5.0 * Math.cos(297.9380535 * query.anim_time) - 5.0",
-              0,
-              0
-            ]
-          },
-          "tailtip": {
-            "rotation": [
-              "-5.0 * Math.cos(297.9380535 * query.anim_time) - 5.0",
-              0,
-              0
-            ]
-          },
-          "wing0": {
-            "rotation": [0, 0, "16.0 * Math.cos(148.9690267 * query.anim_time)"]
-          },
-          "wing1": {
-            "rotation": [
-              0,
-              0,
-              "-16.0 * Math.cos(148.9690267 * query.anim_time)"
-            ]
-          },
-          "wingtip0": {
-            "rotation": [0, 0, "16.0 * Math.cos(148.9690267 * query.anim_time)"]
-          },
-          "wingtip1": {
-            "rotation": [
-              0,
-              0,
-              "-16.0 * Math.cos(148.9690267 * query.anim_time)"
-            ]
-          }
-        },
-        "sound_effects": {"1.4": {"effect": "flap"}}
-      }
-    },
     "particle_effects": {"wing_dust": "minecraft:phantom_trail_particle"},
     "sound_effects": {"flap": "mob.phantom.flap"},
     "render_controllers": ["controller.render.phantom"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 51},
-    "animation_controllers": {
-      "phantom_base_pose_controller": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["phantom_base_pose"],
-            "particle_effects": [
-              {"effect": "wing_dust", "locator": "left_wing"},
-              {"effect": "wing_dust", "locator": "right_wing"}
-            ]
-          }
-        }
-      }
-    }
+    "spawn_egg": {"texture": "spawn_egg", "texture_index": 51}
   },
   "pig": {
     "identifier": "minecraft:pig",
@@ -10006,477 +2191,9 @@
         ]
       }
     },
-    "animations": {
-      "setup": {"loop": true, "bones": {"body": {"rotation": ["-this", 0, 0]}}},
-      "walk": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          },
-          "leg1": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg2": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg3": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "baby_transform": {
-        "loop": true,
-        "bones": {"head": {"position": [0, 4, 4], "scale": 2}}
-      }
-    },
-    "scripts": {
-      "animate": [
-        "setup",
-        {"walk": "query.modified_move_speed"},
-        "look_at_target",
-        {"baby_transform": "query.is_baby"}
-      ]
-    },
     "render_controllers": ["controller.render.pig"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 2}
   },
-  "piglin": {
-    "identifier": "minecraft:piglin",
-    "materials": {"default": "piglin"},
-    "textures": {"default": "textures/entity/piglin/piglin"},
-    "geometry": {
-      "default": {
-        "bones": [
-          {
-            "name": "body",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-4, 12, -2], "size": [8, 12, 4], "uv": [16, 16]},
-              {
-                "origin": [-4, 12, -2],
-                "size": [8, 12, 4],
-                "uv": [16, 32],
-                "inflate": 0.25
-              }
-            ]
-          },
-          {
-            "name": "head",
-            "parent": "body",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {
-                "origin": [-5, 24, -4],
-                "size": [10, 8, 8],
-                "uv": [0, 0],
-                "inflate": -0.02
-              },
-              {"origin": [-2, 24, -5], "size": [4, 4, 1], "uv": [31, 1]},
-              {"origin": [2, 24, -5], "size": [1, 2, 1], "uv": [2, 4]},
-              {"origin": [-3, 24, -5], "size": [1, 2, 1], "uv": [2, 0]}
-            ],
-            "inflate": -0.02
-          },
-          {
-            "name": "leftear",
-            "parent": "head",
-            "pivot": [5, 30, 0],
-            "rotation": [0, 0, -30],
-            "cubes": [{"origin": [4, 25, -2], "size": [1, 5, 4], "uv": [51, 6]}]
-          },
-          {
-            "name": "rightear",
-            "parent": "head",
-            "pivot": [-5, 30, 0],
-            "rotation": [0, 0, 30],
-            "cubes": [
-              {"origin": [-5, 25, -2], "size": [1, 5, 4], "uv": [39, 6]}
-            ]
-          },
-          {"name": "hat", "parent": "head", "pivot": [0, 24, 0]},
-          {
-            "name": "rightarm",
-            "parent": "body",
-            "pivot": [-5, 22, 0],
-            "cubes": [
-              {"origin": [-8, 12, -2], "size": [4, 12, 4], "uv": [40, 16]},
-              {
-                "origin": [-8, 12, -2],
-                "size": [4, 12, 4],
-                "uv": [40, 32],
-                "inflate": 0.25
-              }
-            ]
-          },
-          {"name": "rightItem", "parent": "rightarm", "pivot": [-6, 15, 1]},
-          {
-            "name": "leftarm",
-            "parent": "body",
-            "pivot": [5, 22, 0],
-            "cubes": [
-              {"origin": [4, 12, -2], "size": [4, 12, 4], "uv": [32, 48]},
-              {
-                "origin": [4, 12, -2],
-                "size": [4, 12, 4],
-                "uv": [48, 48],
-                "inflate": 0.25
-              }
-            ]
-          },
-          {"name": "leftItem", "parent": "leftArm", "pivot": [6, 15, 1]},
-          {
-            "name": "rightleg",
-            "parent": "body",
-            "pivot": [-1.9, 12, 0],
-            "cubes": [
-              {"origin": [-4, 0, -2], "size": [4, 12, 4], "uv": [0, 16]},
-              {
-                "origin": [-4, 0, -2],
-                "size": [4, 12, 4],
-                "uv": [0, 32],
-                "inflate": 0.25
-              }
-            ]
-          },
-          {
-            "name": "leftleg",
-            "parent": "body",
-            "pivot": [1.9, 12, 0],
-            "cubes": [
-              {"origin": [0, 0, -2], "size": [4, 12, 4], "uv": [16, 48]},
-              {
-                "origin": [0, 0, -2],
-                "size": [4, 12, 4],
-                "uv": [0, 48],
-                "inflate": 0.25
-              }
-            ]
-          }
-        ],
-        "visible_bounds_width": 2,
-        "visible_bounds_height": 2,
-        "visible_bounds_offset": [0, 1, 0],
-        "texturewidth": 64,
-        "textureheight": 64
-      }
-    },
-    "spawn_egg": {"base_color": "#995f40", "overlay_color": "#f9f3a4"},
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;",
-        "variable.attack = Math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3;",
-        "variable.attack2 = Math.sin(variable.attack_time * 180.0) * 57.3;",
-        "variable.z_bob = Math.cos(query.life_time * 103.13244) * 2.865 + 2.865;",
-        "variable.x_bob = Math.sin(query.life_time * 76.776372) * 2.865;"
-      ],
-      "animate": [
-        {"admire": "query.is_admiring"},
-        {"humanoid_big_head": "query.is_baby"},
-        {"celebrate_hunt": "query.is_celebrating"},
-        {"celebrate_hunt_special": "query.is_celebrating_special"},
-        "move",
-        "bob",
-        "look_at_target_controller",
-        "piglin_attack_controller",
-        "riding_controller"
-      ]
-    },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "leftear": {"rotation": [0, 0, "variable.tcos0 * 0.5"]},
-          "rightear": {"rotation": [0, 0, "-variable.tcos0 * 0.5"]},
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "leftleg": {"rotation": ["-variable.tcos0 * 1.4", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "humanoid_big_head": {"loop": true, "bones": {"head": {"scale": 1.4}}},
-      "admire": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [320, 25, 0]},
-          "head": {"rotation": [30, 0, 0]}
-        }
-      },
-      "celebrate_hunt": {
-        "loop": true,
-        "bones": {
-          "leftear": {
-            "rotation": [0, 0, "Math.sin(query.time_stamp * 30) * 10"]
-          },
-          "rightear": {
-            "rotation": [0, 0, "Math.cos(query.time_stamp * 30) * 10"]
-          }
-        }
-      },
-      "celebrate_hunt_special": {
-        "loop": true,
-        "bones": {
-          "leftear": {
-            "rotation": [0, 0, "Math.sin(query.time_stamp * 30) * 10"]
-          },
-          "rightear": {
-            "rotation": [0, 0, "Math.cos(query.time_stamp * 30) * 10"]
-          },
-          "head": {
-            "position": [
-              "Math.sin(query.time_stamp * 10)",
-              "Math.sin(query.time_stamp * 40)",
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [0, 0, "70 + Math.cos(query.time_stamp * 40) * 10"]
-          },
-          "leftarm": {
-            "rotation": [0, 0, "-70 - Math.cos(query.time_stamp * 40) * 10"]
-          },
-          "body": {"position": [0, "Math.sin(query.time_stamp * 40) * 0.35", 0]}
-        }
-      },
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "crossbow_hold": {
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-85.94 + query.target_x_rotation -this",
-              "34.38 + math.clamp(query.target_y_rotation, -45, 25) -this",
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "-90.0 + 5.73 + query.target_x_rotation -this",
-              "-17.19 + math.clamp(query.target_y_rotation, -25, 45) -this",
-              0
-            ]
-          }
-        },
-        "loop": true
-      },
-      "crossbow_charge": {
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "math.lerp(-90.0 + 34.38, -90.0, variable.crossbow_charge)  -this",
-              "math.lerp(22.92, 48.70, variable.crossbow_charge) -this",
-              0
-            ]
-          },
-          "rightarm": {"rotation": ["-90.0 + 34.38 -this", "-45.84 -this", 0]}
-        },
-        "loop": true
-      },
-      "melee_attack": {
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "(math.cos(query.life_time * 20.0 * 10.89) * 28.65) + (math.sin(variable.attack_time * 180.0) * 68.76 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0)) * 22.92)",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "-100 + (variable.attack2 * 2.2 - variable.attack * 0.4) + variable.x_bob - this",
-              "variable.attack2 * 0.6 - 5.73 - this",
-              "variable.z_bob - this"
-            ]
-          }
-        },
-        "loop": true
-      },
-      "hand_attack": {
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-(math.sin((1 - math.pow((1 - variable.attack_time), 4)) * 180) * 1.2 + math.sin(variable.attack_time * 180)) * 10.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "-(math.sin((1 - math.pow((1 - variable.attack_time), 4)) * 180) * 1.2 + math.sin(variable.attack_time * 180)) * 30.0",
-              "-(math.sin((1 - math.pow((1 - variable.attack_time), 4)) * 180) ? (-90.0 * math.sin((1 - math.pow((1 - variable.attack_time), 4)) * 180)) + 30.0 : 0.0)",
-              0
-            ]
-          }
-        },
-        "loop": true
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-36, 0, 0]},
-          "rightarm": {"rotation": [-36, 0, 0]}
-        }
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
-          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
-        }
-      }
-    },
-    "render_controllers": ["controller.render.piglin"],
-    "enable_attachables": true,
-    "animation_controllers": {
-      "look_at_target_controller": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "piglin_attack_controller": {
-        "initial_state": "default",
-        "states": {
-          "ranged_charge": {
-            "animations": ["crossbow_charge"],
-            "transitions": [
-              {"default": "variable.attack_state == 0  ||  query.is_admiring"},
-              {"ranged_hold": "variable.attack_state == 1"}
-            ]
-          },
-          "default": {
-            "transitions": [
-              {
-                "ranged_hold": "query.variant == 0 && variable.attack_state == 1 && !query.is_admiring"
-              },
-              {
-                "ranged_charge": "query.variant == 0 && variable.attack_state == 2 && !query.is_admiring"
-              },
-              {
-                "hand_attack": "variable.has_target && query.variant == 1 && !query.is_item_equipped && variable.attack_time >= 0.0 && !query.is_admiring"
-              },
-              {
-                "melee_attack": "variable.has_target && query.variant == 1 && query.is_item_equipped && variable.attack_time >= 0.0 && !query.is_admiring"
-              }
-            ]
-          },
-          "ranged_hold": {
-            "animations": ["crossbow_hold"],
-            "transitions": [
-              {"default": "variable.attack_state == 0  ||  query.is_admiring"},
-              {"ranged_charge": "variable.attack_state == 2"}
-            ]
-          },
-          "melee_attack": {
-            "animations": ["melee_attack"],
-            "transitions": [
-              {
-                "default": "!query.is_item_equipped || !variable.has_target || variable.attack_time < 0.0 ||  query.is_admiring"
-              }
-            ]
-          },
-          "hand_attack": {
-            "animations": ["hand_attack"],
-            "transitions": [
-              {
-                "default": "query.is_item_equipped || !variable.has_target || variable.attack_time < 0.0 ||  query.is_admiring"
-              }
-            ]
-          }
-        }
-      },
-      "riding_controller": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"riding": "query.is_riding"}]},
-          "riding": {
-            "animations": ["riding.arms", "riding.legs"],
-            "transitions": [{"default": "!query.is_riding"}]
-          }
-        }
-      }
-    }
-  },
   "piglin_brute": {
     "identifier": "minecraft:piglin_brute",
     "materials": {"default": "piglin_brute"},
@@ -10598,1691 +2315,8 @@
       }
     },
     "spawn_egg": {"base_color": "#592A10", "overlay_color": "#F9F3A4"},
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;",
-        "variable.attack = Math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3;",
-        "variable.attack2 = Math.sin(variable.attack_time * 180.0) * 57.3;",
-        "variable.z_bob = Math.cos(query.life_time * 103.13244) * 2.865 + 2.865;",
-        "variable.x_bob = Math.sin(query.life_time * 76.776372) * 2.865;"
-      ],
-      "animate": [
-        {"humanoid_big_head": "query.is_baby"},
-        "move",
-        "bob",
-        "look_at_target_controller",
-        "piglin_attack_controller",
-        "riding_controller"
-      ]
-    },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "leftear": {"rotation": [0, 0, "variable.tcos0 * 0.5"]},
-          "rightear": {"rotation": [0, 0, "-variable.tcos0 * 0.5"]},
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "leftleg": {"rotation": ["-variable.tcos0 * 1.4", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "humanoid_big_head": {"loop": true, "bones": {"head": {"scale": 1.4}}},
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "crossbow_hold": {
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-85.94 + query.target_x_rotation -this",
-              "34.38 + math.clamp(query.target_y_rotation, -45, 25) -this",
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "-90.0 + 5.73 + query.target_x_rotation -this",
-              "-17.19 + math.clamp(query.target_y_rotation, -25, 45) -this",
-              0
-            ]
-          }
-        },
-        "loop": true
-      },
-      "crossbow_charge": {
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "math.lerp(-90.0 + 34.38, -90.0, variable.crossbow_charge)  -this",
-              "math.lerp(22.92, 48.70, variable.crossbow_charge) -this",
-              0
-            ]
-          },
-          "rightarm": {"rotation": ["-90.0 + 34.38 -this", "-45.84 -this", 0]}
-        },
-        "loop": true
-      },
-      "melee_attack": {
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "(math.cos(query.life_time * 20.0 * 10.89) * 28.65) + (math.sin(variable.attack_time * 180.0) * 68.76 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0)) * 22.92)",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "-100 + (variable.attack2 * 2.2 - variable.attack * 0.4) + variable.x_bob - this",
-              "variable.attack2 * 0.6 - 5.73 - this",
-              "variable.z_bob - this"
-            ]
-          }
-        },
-        "loop": true
-      },
-      "hand_attack": {
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-(math.sin((1 - math.pow((1 - variable.attack_time), 4)) * 180) * 1.2 + math.sin(variable.attack_time * 180)) * 10.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "-(math.sin((1 - math.pow((1 - variable.attack_time), 4)) * 180) * 1.2 + math.sin(variable.attack_time * 180)) * 30.0",
-              "-(math.sin((1 - math.pow((1 - variable.attack_time), 4)) * 180) ? (-90.0 * math.sin((1 - math.pow((1 - variable.attack_time), 4)) * 180)) + 30.0 : 0.0)",
-              0
-            ]
-          }
-        },
-        "loop": true
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-36, 0, 0]},
-          "rightarm": {"rotation": [-36, 0, 0]}
-        }
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
-          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
-        }
-      }
-    },
     "render_controllers": ["controller.render.piglin_brute"],
-    "enable_attachables": true,
-    "animation_controllers": {
-      "look_at_target_controller": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "piglin_attack_controller": {
-        "initial_state": "default",
-        "states": {
-          "ranged_charge": {
-            "animations": ["crossbow_charge"],
-            "transitions": [
-              {"default": "variable.attack_state == 0  ||  query.is_admiring"},
-              {"ranged_hold": "variable.attack_state == 1"}
-            ]
-          },
-          "default": {
-            "transitions": [
-              {
-                "ranged_hold": "query.variant == 0 && variable.attack_state == 1 && !query.is_admiring"
-              },
-              {
-                "ranged_charge": "query.variant == 0 && variable.attack_state == 2 && !query.is_admiring"
-              },
-              {
-                "hand_attack": "variable.has_target && query.variant == 1 && !query.is_item_equipped && variable.attack_time >= 0.0 && !query.is_admiring"
-              },
-              {
-                "melee_attack": "variable.has_target && query.variant == 1 && query.is_item_equipped && variable.attack_time >= 0.0 && !query.is_admiring"
-              }
-            ]
-          },
-          "ranged_hold": {
-            "animations": ["crossbow_hold"],
-            "transitions": [
-              {"default": "variable.attack_state == 0  ||  query.is_admiring"},
-              {"ranged_charge": "variable.attack_state == 2"}
-            ]
-          },
-          "melee_attack": {
-            "animations": ["melee_attack"],
-            "transitions": [
-              {
-                "default": "!query.is_item_equipped || !variable.has_target || variable.attack_time < 0.0 ||  query.is_admiring"
-              }
-            ]
-          },
-          "hand_attack": {
-            "animations": ["hand_attack"],
-            "transitions": [
-              {
-                "default": "query.is_item_equipped || !variable.has_target || variable.attack_time < 0.0 ||  query.is_admiring"
-              }
-            ]
-          }
-        }
-      },
-      "riding_controller": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"riding": "query.is_riding"}]},
-          "riding": {
-            "animations": ["riding.arms", "riding.legs"],
-            "transitions": [{"default": "!query.is_riding"}]
-          }
-        }
-      }
-    }
-  },
-  "pillager": {
-    "identifier": "minecraft:pillager",
-    "materials": {"default": "pillager"},
-    "textures": {"default": "textures/entity/illager/pillager"},
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 1.5,
-        "visible_bounds_height": 2.5,
-        "visible_bounds_offset": [0, 1.25, 0],
-        "texturewidth": 64,
-        "textureheight": 64,
-        "bones": [
-          {
-            "name": "head",
-            "pivot": [0, 24, 0],
-            "locators": {"lead": [0, 0, 0]},
-            "cubes": [
-              {"origin": [-4, 24, -4], "size": [8, 10, 8], "uv": [0, 0]}
-            ],
-            "parent": "body"
-          },
-          {
-            "name": "nose",
-            "pivot": [0, 26, 0],
-            "cubes": [
-              {"origin": [-1, 23, -6], "size": [2, 4, 2], "uv": [24, 0]}
-            ],
-            "parent": "head"
-          },
-          {
-            "name": "body",
-            "parent": "waist",
-            "pivot": [0, 0, 0],
-            "cubes": [
-              {"origin": [-4, 12, -3], "size": [8, 12, 6], "uv": [16, 20]},
-              {
-                "origin": [-4, 6, -3],
-                "size": [8, 18, 6],
-                "uv": [0, 38],
-                "inflate": 0.5
-              }
-            ]
-          },
-          {"name": "waist", "neverRender": true, "pivot": [0, 12, 0]},
-          {
-            "name": "leftLeg",
-            "parent": "body",
-            "pivot": [2, 12, 0],
-            "cubes": [{"origin": [0, 0, -2], "size": [4, 12, 4], "uv": [0, 22]}]
-          },
-          {
-            "name": "rightLeg",
-            "parent": "body",
-            "pivot": [-2, 12, 0],
-            "mirror": true,
-            "cubes": [
-              {"origin": [-4, 0, -2], "size": [4, 12, 4], "uv": [0, 22]}
-            ]
-          },
-          {
-            "name": "rightarm",
-            "parent": "body",
-            "pivot": [-5, 22, 0],
-            "cubes": [
-              {"origin": [-8, 12, -2], "size": [4, 12, 4], "uv": [40, 46]}
-            ]
-          },
-          {
-            "name": "rightItem",
-            "pivot": [-6, 15, 1],
-            "neverRender": true,
-            "parent": "rightArm"
-          },
-          {
-            "name": "leftarm",
-            "parent": "body",
-            "pivot": [5, 22, 0],
-            "mirror": true,
-            "cubes": [
-              {"origin": [4, 12, -2], "size": [4, 12, 4], "uv": [40, 46]}
-            ]
-          }
-        ]
-      }
-    },
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 56},
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;"
-      ],
-      "animate": ["pillager_root_controller"]
-    },
-    "animations": {
-      "humanoid_base_pose": {
-        "loop": true,
-        "bones": {"waist": {"rotation": [0, 0, 0]}}
-      },
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-36, 0, 0]},
-          "rightarm": {"rotation": [-36, 0, 0]}
-        }
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
-          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
-        }
-      },
-      "holding": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "variable.is_holding_left ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "variable.is_holding_right ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "attack.rotations": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46 - this",
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.sin(1.0 - math.pow(1.0 - variable.attack_time, 3.0) * 180.0) * (variable.is_brandishing_spear ? -1.0 : 1.0 )",
-              "variable.is_brandishing_spear ? 0.0 : (math.sin(math.sqrt(variable.attack_time) * 360) * 11.46) * 2.0",
-              0
-            ]
-          }
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "crossbow_hold": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-85.94 + query.target_x_rotation -this",
-              "34.38 + math.clamp(query.target_y_rotation, -45, 25) -this",
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "-90.0 + 5.73 + query.target_x_rotation -this",
-              "-17.19 + math.clamp(query.target_y_rotation, -25, 45) -this",
-              0
-            ]
-          }
-        }
-      },
-      "crossbow_charge": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "math.lerp(-90.0 + 34.38, -90.0, variable.crossbow_charge)  -this",
-              "math.lerp(22.92, 48.70, variable.crossbow_charge) -this",
-              0
-            ]
-          },
-          "rightarm": {"rotation": ["-90.0 + 34.38 -this", "-45.84 -this", 0]}
-        }
-      },
-      "celebrating": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "(math.cos(query.life_time * 800.0) * 2.865)",
-              180,
-              -135
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "(math.cos(query.life_time * 800.0) * 2.865)",
-              180,
-              153
-            ]
-          }
-        }
-      }
-    },
-    "render_controllers": ["controller.render.pillager"],
-    "enable_attachables": true,
-    "animation_controllers": {
-      "controller_humanoid_base_pose": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["humanoid_base_pose"]}}
-      },
-      "controller_look_at_target": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "controller_move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      },
-      "controller_riding": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"riding": "query.is_riding"}]},
-          "riding": {
-            "animations": ["riding.arms", "riding.legs"],
-            "transitions": [{"default": "!query.is_riding"}]
-          }
-        }
-      },
-      "controller_attack": {
-        "initial_state": "default",
-        "states": {
-          "attacking": {
-            "animations": ["attack.rotations"],
-            "transitions": [{"default": "variable.attack_time < 0.0"}]
-          },
-          "default": {
-            "transitions": [{"attacking": "variable.attack_time >= 0.0"}]
-          }
-        }
-      },
-      "controller_bob": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["bob"]}}
-      },
-      "controller_pillager_attack": {
-        "initial_state": "default",
-        "states": {
-          "charge": {
-            "animations": ["crossbow_charge"],
-            "transitions": [
-              {"default": "variable.attack_state == 0"},
-              {"hold": "variable.attack_state == 1"}
-            ]
-          },
-          "default": {
-            "transitions": [
-              {"hold": "variable.attack_state == 1"},
-              {"charge": "variable.attack_state == 2"}
-            ]
-          },
-          "hold": {
-            "animations": ["crossbow_hold"],
-            "transitions": [
-              {"default": "variable.attack_state == 0"},
-              {"charge": "variable.attack_state == 2"}
-            ]
-          }
-        }
-      },
-      "pillager_root_controller": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "blend_transition": 0.2,
-            "blend_via_shortest_path": true,
-            "animations": [
-              "controller_humanoid_base_pose",
-              "controller_look_at_target",
-              "controller_move",
-              "controller_riding",
-              "controller_attack",
-              "controller_bob",
-              "controller_pillager_attack"
-            ],
-            "transitions": [{"celebrating": "query.is_celebrating"}]
-          },
-          "celebrating": {
-            "animations": ["celebrating", {"riding.legs": "query.is_riding"}],
-            "blend_transition": 0.2,
-            "blend_via_shortest_path": true,
-            "transitions": [{"default": "!query.is_celebrating"}]
-          }
-        }
-      }
-    }
-  },
-  "player": {
-    "identifier": "minecraft:player",
-    "materials": {
-      "default": "entity_alphatest",
-      "cape": "entity_alphatest",
-      "animated": "player_animated"
-    },
-    "textures": {
-      "default": "textures/entity/steve",
-      "cape": "textures/entity/cape_invisible"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 1,
-        "visible_bounds_height": 2,
-        "visible_bounds_offset": [0, 1, 0],
-        "bones": [
-          {"name": "root", "pivot": [0, 0, 0]},
-          {
-            "name": "body",
-            "parent": "waist",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-4, 12, -2], "size": [8, 12, 4], "uv": [16, 16]}
-            ]
-          },
-          {"name": "waist", "parent": "root", "pivot": [0, 12, 0]},
-          {
-            "name": "head",
-            "parent": "body",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [-4, 24, -4], "size": [8, 8, 8], "uv": [0, 0]}]
-          },
-          {"name": "cape", "pivot": [0, 24, 3], "parent": "body"},
-          {
-            "name": "hat",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {
-                "origin": [-4, 24, -4],
-                "size": [8, 8, 8],
-                "uv": [32, 0],
-                "inflate": 0.5
-              }
-            ]
-          },
-          {
-            "name": "leftArm",
-            "parent": "body",
-            "pivot": [5, 22, 0],
-            "cubes": [
-              {"origin": [4, 12, -2], "size": [4, 12, 4], "uv": [32, 48]}
-            ]
-          },
-          {
-            "name": "leftSleeve",
-            "parent": "leftArm",
-            "pivot": [5, 22, 0],
-            "cubes": [
-              {
-                "origin": [4, 12, -2],
-                "size": [4, 12, 4],
-                "uv": [48, 48],
-                "inflate": 0.25
-              }
-            ]
-          },
-          {"name": "leftItem", "pivot": [6, 15, 1], "parent": "leftArm"},
-          {
-            "name": "rightArm",
-            "parent": "body",
-            "pivot": [-5, 22, 0],
-            "cubes": [
-              {"origin": [-8, 12, -2], "size": [4, 12, 4], "uv": [40, 16]}
-            ]
-          },
-          {
-            "name": "rightSleeve",
-            "parent": "rightArm",
-            "pivot": [-5, 22, 0],
-            "cubes": [
-              {
-                "origin": [-8, 12, -2],
-                "size": [4, 12, 4],
-                "uv": [40, 32],
-                "inflate": 0.25
-              }
-            ]
-          },
-          {
-            "name": "rightItem",
-            "pivot": [-6, 15, 1],
-            "locators": {"lead_hold": [-6, 15, 1]},
-            "parent": "rightArm"
-          },
-          {
-            "name": "leftLeg",
-            "parent": "root",
-            "pivot": [1.9, 12, 0],
-            "cubes": [
-              {"origin": [-0.1, 0, -2], "size": [4, 12, 4], "uv": [16, 48]}
-            ]
-          },
-          {
-            "name": "leftPants",
-            "parent": "leftLeg",
-            "pivot": [1.9, 12, 0],
-            "cubes": [
-              {
-                "origin": [-0.1, 0, -2],
-                "size": [4, 12, 4],
-                "uv": [0, 48],
-                "inflate": 0.25
-              }
-            ]
-          },
-          {
-            "name": "rightLeg",
-            "parent": "root",
-            "pivot": [-1.9, 12, 0],
-            "cubes": [
-              {"origin": [-3.9, 0, -2], "size": [4, 12, 4], "uv": [0, 16]}
-            ]
-          },
-          {
-            "name": "rightPants",
-            "parent": "rightLeg",
-            "pivot": [-1.9, 12, 0],
-            "cubes": [
-              {
-                "origin": [-3.9, 0, -2],
-                "size": [4, 12, 4],
-                "uv": [0, 32],
-                "inflate": 0.25
-              }
-            ]
-          },
-          {
-            "name": "jacket",
-            "parent": "body",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {
-                "origin": [-4, 12, -2],
-                "size": [8, 12, 4],
-                "uv": [16, 32],
-                "inflate": 0.25
-              }
-            ]
-          }
-        ]
-      },
-      "cape": {
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {"name": "root", "pivot": [0, 0, 0]},
-          {"name": "body", "pivot": [0, 24, 0], "parent": "waist"},
-          {
-            "name": "waist",
-            "parent": "root",
-            "neverRender": true,
-            "pivot": [0, 12, 0]
-          },
-          {
-            "name": "cape",
-            "parent": "body",
-            "pivot": [0, 24, 3],
-            "bind_pose_rotation": [0, 180, 0],
-            "rotation": [0, 180, 0],
-            "cubes": [{"origin": [-5, 8, 3], "size": [10, 16, 1], "uv": [0, 0]}]
-          }
-        ]
-      }
-    },
-    "scripts": {
-      "scale": "0.9375",
-      "initialize": [
-        "variable.is_holding_right = 0.0;",
-        "variable.is_blinking = 0.0;",
-        "variable.last_blink_time = 0.0;",
-        "variable.hand_bob = 0.0;"
-      ],
-      "pre_animation": [
-        "variable.helmet_layer_visible = 1.0;",
-        "variable.leg_layer_visible = 1.0;",
-        "variable.boot_layer_visible = 1.0;",
-        "variable.chest_layer_visible = 1.0;",
-        "variable.attack_body_rot_y = Math.sin(360*Math.sqrt(variable.attack_time)) * 5.0;",
-        "variable.tcos0 = (math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;",
-        "variable.first_person_rotation_factor = math.sin((1 - variable.attack_time) * 180.0);",
-        "variable.hand_bob = query.life_time < 0.01 ? 0.0 : variable.hand_bob + ((query.is_on_ground && query.is_alive ? math.clamp(math.sqrt(math.pow(query.position_delta(0), 2.0) + math.pow(query.position_delta(2), 2.0)), 0.0, 0.1) : 0.0) - variable.hand_bob) * 0.02;",
-        "variable.map_angle = math.clamp(1 - variable.player_x_rotation / 45.1, 0.0, 1.0);",
-        "variable.item_use_normalized = query.main_hand_item_use_duration / query.main_hand_item_max_duration;"
-      ],
-      "animate": ["root"]
-    },
-    "animations": {
-      "humanoid_base_pose": {
-        "loop": true,
-        "bones": {"waist": {"rotation": [0, 0, 0]}}
-      },
-      "look_at_target_ui": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_inverted": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "-query.target_x_rotation",
-              "-query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "cape": {
-        "loop": true,
-        "bones": {
-          "cape": {
-            "position": [
-              0,
-              "query.get_root_locator_offset('armor_offset.default_neck', 1)",
-              0
-            ],
-            "rotation": [
-              "math.lerp(0.0, -126.0, query.cape_flap_amount) - 6.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "move.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]}
-        }
-      },
-      "move.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "swimming": {
-        "animation_length": 1.3,
-        "loop": true,
-        "override_previous_animation": true,
-        "bones": {
-          "leftarm": {
-            "rotation": {
-              "0": [0, 180, 180],
-              "0.7": [0, 180, 287.2],
-              "1.1": [90, 180, 180],
-              "1.3": [0, 180, 180]
-            }
-          },
-          "rightarm": {
-            "rotation": {
-              "0": [0, 180, -180],
-              "0.7": [0, 180, -287.2],
-              "1.1": [90, 180, -180],
-              "1.3": [0, 180, -180]
-            }
-          },
-          "root": {
-            "position": [
-              0,
-              "(math.sin(query.target_x_rotation) * 24.0 + 3.0) * variable.swim_amount",
-              "(math.cos(query.target_x_rotation) * 24.0 + 9.0) * variable.swim_amount"
-            ],
-            "rotation": [
-              "variable.swim_amount * (90 + query.target_x_rotation)",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "swimming.legs": {
-        "loop": true,
-        "override_previous_animation": true,
-        "bones": {
-          "leftleg": {
-            "rotation": [
-              "math.lerp(0.0, math.cos(query.life_time * 390.0 + 180.0) * 17.2, variable.swim_amount)",
-              0,
-              0
-            ]
-          },
-          "rightleg": {
-            "rotation": [
-              "math.lerp(0.0, math.cos(query.life_time * 390.0) * 17.2, variable.swim_amount)",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-36, 0, 0]},
-          "rightarm": {"rotation": [-36, 0, 0]}
-        }
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
-          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
-        }
-      },
-      "holding": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "variable.is_holding_left ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "variable.is_holding_right ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "brandish_spear": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "this * -0.5 - 157.5 - 22.5 * variable.charge_amount",
-              "-this",
-              0
-            ]
-          }
-        }
-      },
-      "charging": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": ["22.5 * variable.charge_amount - this", "-this", 0]
-          }
-        }
-      },
-      "attack.positions": {
-        "loop": true,
-        "bones": {"head": {"rotation": [0, 0, 0]}}
-      },
-      "attack.rotations": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": [0, "variable.attack_body_rot_y", 0]},
-          "leftarm": {
-            "rotation": [
-              "-(math.sin((1 - math.pow((1 - variable.attack_time), 4)) * 180) * 1.2 + math.sin(variable.attack_time * 180)) * 10.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "-(math.sin((1 - math.pow((1 - variable.attack_time), 4)) * 180) * 1.2 + math.sin(variable.attack_time * 180)) * 30.0",
-              "-(math.sin((1 - math.pow((1 - variable.attack_time), 4)) * 180) ? (-90.0 * math.sin((1 - math.pow((1 - variable.attack_time), 4)) * 180)) + 30.0 : 0.0)",
-              0
-            ]
-          }
-        }
-      },
-      "sneaking": {
-        "loop": true,
-        "bones": {
-          "body": {"position": [0, -2, 0]},
-          "head": {"position": [0, -1, 0]},
-          "leftarm": {"rotation": [-5.7, 0, 0]},
-          "leftleg": {"rotation": [-28, 0, 0]},
-          "rightarm": {"rotation": [-5.7, 0, 0]},
-          "rightleg": {"rotation": [-28, 0, 0]},
-          "root": {"position": [0, 1.25, 9], "rotation": ["28.0 - this", 0, 0]}
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "-((math.cos(query.life_time * 103.2) * 2.865) + 2.865)"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "damage_nearby_mobs": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["-45.0-this", "-this", "-this"]},
-          "leftleg": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightarm": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-45.0-this", "-this", "-this"]}
-        }
-      },
-      "fishing_rod": {
-        "loop": true,
-        "bones": {"rightarm": {"rotation": [" -19.0 - this", "-this", "-this"]}}
-      },
-      "use_item_progress": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "variable.use_item_startup_progress * -60.0 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -22.5 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -5.625 + variable.use_item_interval_progress * 11.25"
-            ]
-          }
-        }
-      },
-      "skeleton_attack": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-68.75 * math.sin(variable.attack_time * 180.0) + 22.92 * (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0))",
-              "5.73 - math.sin(variable.attack_time * 180.0) * 34.38 - this",
-              "-this"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "-68.75 * math.sin(variable.attack_time * 180.0) + 22.92 * (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0))",
-              "-5.73 + math.sin(variable.attack_time * 180.0) * 34.38 - this",
-              "-this"
-            ]
-          }
-        }
-      },
-      "sleeping": {
-        "loop": true,
-        "override_previous_animation": true,
-        "bones": {
-          "head": {"rotation": ["30.0 - this", "-this", "-this"]},
-          "root": {
-            "position": [
-              "24.0 * math.cos(query.body_y_rotation) * math.cos(query.sleep_rotation) - 24.0 * math.sin(query.body_y_rotation) * math.sin(query.sleep_rotation)",
-              0,
-              "24.0 * math.cos(query.body_y_rotation) * math.sin(query.sleep_rotation) + 24.0 * math.sin(query.body_y_rotation) * math.cos(query.sleep_rotation)"
-            ],
-            "rotation": [
-              -90,
-              "270.0 - query.sleep_rotation - query.body_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "first_person_base_pose": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "first_person_empty_hand": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "position": [13.5, -10, 12],
-            "rotation": [
-              "95.0 + variable.is_using_vr * 7.5",
-              "-45.0 + variable.is_using_vr * 7.5",
-              "115.0 + variable.is_using_vr * -2.5"
-            ]
-          }
-        }
-      },
-      "first_person_swap_item": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "position": [
-              0,
-              "query.get_equipped_item_name('off_hand') == 'map' ? 0.0 : -10.0 * (1.0 - variable.player_arm_height)",
-              0
-            ]
-          },
-          "rightarm": {
-            "position": [0, "-10.0 * (1.0 - variable.player_arm_height)", 0]
-          }
-        }
-      },
-      "first_person_attack_rotation": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "position": [
-              "math.clamp(-15.5 * math.sin(variable.first_person_rotation_factor * variable.attack_time * 112.0), -7.0, 999.0) * math.sin(variable.first_person_rotation_factor * variable.attack_time * 112.0)",
-              "math.sin(variable.first_person_rotation_factor * (1.0 - variable.attack_time) * (1.0 - variable.attack_time) * 200.0) * 7.5 - variable.first_person_rotation_factor * variable.attack_time * 15.0 + variable.short_arm_offset_right",
-              "math.sin(variable.first_person_rotation_factor * variable.attack_time * 120.0) * 1.75"
-            ],
-            "rotation": [
-              "math.sin(variable.first_person_rotation_factor * (1.0 - variable.attack_time) * (1.0 - variable.attack_time) * 280.0) * -60.0",
-              "math.sin(variable.first_person_rotation_factor * (1.0 - variable.attack_time) * (1.0 - variable.attack_time) * 280.0) * 40.0",
-              "math.sin(variable.first_person_rotation_factor * (1.0 - variable.attack_time) * (1.0 - variable.attack_time) * 280.0) * 20.0"
-            ]
-          }
-        }
-      },
-      "first_person_vr_attack_rotation": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "position": [
-              "5.0 * math.sin(variable.first_person_rotation_factor * variable.attack_time * 112.0)",
-              "(math.sin(variable.first_person_rotation_factor * (1.0 - variable.attack_time) * (1.0 - variable.attack_time) * 200.0) - 0.8) * 8.75 + 5.0",
-              "math.sin(variable.first_person_rotation_factor * variable.attack_time * 120.0) * 15.0"
-            ],
-            "rotation": [
-              "30.7 * math.sin(variable.first_person_rotation_factor * variable.attack_time * -180.0 - 45.0) * 1.5",
-              0,
-              "21.8 * math.sin(variable.first_person_rotation_factor * variable.attack_time * 200.0 + 30.0) * 1.25"
-            ]
-          }
-        }
-      },
-      "first_person_map_hold": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "position": [
-              "-16.250 + variable.is_vertical_splitscreen * 7.0",
-              "-10.75 - variable.map_angle * 8.0 + variable.is_vertical_splitscreen * 0.6 - variable.short_arm_offset_left",
-              "9.0 - variable.map_angle * 8.0 + variable.short_arm_offset_left"
-            ],
-            "rotation": [40, -20, -155],
-            "scale": [1.15, 1.15, 1.15]
-          },
-          "rightarm": {
-            "position": [
-              "12.50 + variable.is_vertical_splitscreen * 1.75",
-              "-7.5 - variable.map_angle * 8.0 + variable.is_vertical_splitscreen * 0.5 - variable.short_arm_offset_right",
-              "5.25 - variable.map_angle * 8.0 + variable.short_arm_offset_right"
-            ],
-            "rotation": [77.5, 7.5, 160]
-          }
-        }
-      },
-      "first_person_map_hold_attack": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "position": [
-              "math.sin(variable.first_person_rotation_factor * variable.attack_time * 112.0) * -10.75",
-              "math.sin(variable.first_person_rotation_factor * (1.0 - variable.attack_time) * (1.0 - variable.attack_time) * 200.0) * 3.75 - variable.first_person_rotation_factor * variable.attack_time * 1.25 + variable.short_arm_offset_left",
-              "math.sin(variable.first_person_rotation_factor * variable.attack_time * 120.0) * 5.75"
-            ],
-            "rotation": [
-              "variable.map_angle * 90.0",
-              "-15.0 * math.sin(variable.first_person_rotation_factor * (1.0 - variable.attack_time) * -100.0)",
-              0
-            ]
-          },
-          "rightarm": {
-            "position": [
-              "math.sin(variable.first_person_rotation_factor * variable.attack_time * 112.0) * -6.25",
-              "math.sin(variable.first_person_rotation_factor * (1.0 - variable.attack_time) * (1.0 - variable.attack_time) * 200.0) * 1.75 + variable.short_arm_offset_right",
-              "math.sin(variable.first_person_rotation_factor * variable.attack_time * 120.0) * 5.25"
-            ],
-            "rotation": ["variable.map_angle * 90.0", 0, 0]
-          }
-        }
-      },
-      "first_person_map_hold_off_hand": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "position": [
-              "-14.50 + variable.is_horizontal_splitscreen * 2.0 + variable.is_vertical_splitscreen * 8.7",
-              "-8.250 + variable.short_arm_offset_left",
-              "11.50 + variable.is_horizontal_splitscreen * 0.5"
-            ],
-            "rotation": [195, 182.5, 2.5],
-            "scale": [0.75, 0.75, 0.75]
-          }
-        }
-      },
-      "first_person_map_hold_main_hand": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "position": [
-              "14.50 - variable.is_vertical_splitscreen * 0.75",
-              "-8.25 + variable.short_arm_offset_right + math.sin(variable.first_person_rotation_factor * (1.0 - variable.attack_time) * (1.0 - variable.attack_time) * 200.0) * 2.75 - variable.first_person_rotation_factor * variable.attack_time * 3.0 - variable.is_horizontal_splitscreen",
-              "11.5 + math.sin(variable.first_person_rotation_factor * variable.attack_time * 120.0) * 3.5 + variable.is_horizontal_splitscreen * 3.5"
-            ],
-            "rotation": [195, 182.5, -5],
-            "scale": [0.75, 0.75, 0.75]
-          }
-        }
-      },
-      "first_person_crossbow_equipped": {
-        "loop": true,
-        "override_previous_animation": true,
-        "bones": {
-          "leftarm": {
-            "position": [
-              "1.5 - variable.item_use_normalized * 3.5",
-              "-3.799999952316284 + variable.short_arm_offset_left",
-              "8.25 - (1 - variable.item_use_normalized)"
-            ],
-            "rotation": [165, -60, 45],
-            "scale": [0.4, 0.4, 0.4]
-          }
-        }
-      },
-      "third_person_crossbow_equipped": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "position": [0, 0, 0.5],
-            "rotation": [
-              "-this - 65.0 - (1.0 - variable.item_use_normalized) * 5.0",
-              "-this + (1.0 - variable.item_use_normalized) * 30.0",
-              "-this + 20.0 + (1.0 - variable.item_use_normalized) * 10.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": ["- 60.0 - this", "- 45.0 - this", "- 2.5 - this"]
-          }
-        }
-      },
-      "third_person_bow_equipped": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-90.0 + query.target_x_rotation - query.is_sneaking * 15.0 - this",
-              "27.5 + query.target_y_rotation",
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "-90.0 + query.target_x_rotation - query.is_sneaking * 15.0 - this",
-              "-5.0 + query.target_y_rotation",
-              0
-            ]
-          },
-          "rightitem": {"rotation": [0, -10, 0]}
-        }
-      },
-      "crossbow_hold": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "query.is_swimming ? 0.0 : -93.0 + query.target_x_rotation - query.is_sneaking * 27.0 -this",
-              "query.is_swimming ? 0.0 : 42.0 + math.clamp(query.target_y_rotation, -45.0, 5.0) -this",
-              "query.is_sneaking * -15.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "query.is_swimming ? 0.0 : -93.0 + query.target_x_rotation - query.is_sneaking * 27.0 -this",
-              "query.is_swimming ? 0.0 : math.clamp(query.target_y_rotation, -60.0, 45.0) -this",
-              0
-            ]
-          }
-        }
-      },
-      "shield_block_main_hand": {
-        "loop": true,
-        "bones": {
-          "rightarm": {"rotation": [-20, -30, -25]},
-          "rightitem": {"position": [-1, -3, 0], "rotation": [0, -60, -45]}
-        }
-      },
-      "shield_block_off_hand": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-20, 20, 20]},
-          "leftitem": {
-            "position": [
-              "1.0 + query.item_is_charged * 1.5",
-              "-3.0 + query.item_is_charged",
-              0
-            ],
-            "rotation": [
-              "query.item_is_charged * 30.0",
-              "70.0 - query.item_is_charged * 60.0",
-              "65.0 - query.item_is_charged * 15.0"
-            ]
-          }
-        }
-      }
-    },
-    "render_controllers": [
-      {"controller.render.player.first_person": "variable.is_first_person"},
-      {
-        "controller.render.player.third_person": "!variable.is_first_person && !variable.map_face_icon"
-      },
-      {"controller.render.player.map": "variable.map_face_icon"}
-    ],
-    "enable_attachables": true,
-    "animation_controllers": {
-      "root": {
-        "initial_state": "first_person",
-        "states": {
-          "first_person": {
-            "animations": [
-              "first_person_swap_item",
-              {
-                "first_person_attack_controller": "variable.attack_time > 0.0f && query.get_equipped_item_name != 'map'"
-              },
-              "first_person_base_pose",
-              {
-                "first_person_empty_hand": "query.get_equipped_item_name(0, 1) != 'map'"
-              },
-              {
-                "first_person_map_controller": "(query.get_equipped_item_name(0, 1) == 'map' || query.get_equipped_item_name('off_hand') == 'map')"
-              },
-              {
-                "first_person_crossbow_equipped": "query.get_equipped_item_name == 'crossbow' && (variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0)"
-              }
-            ],
-            "transitions": [
-              {"paperdoll": "variable.is_paperdoll"},
-              {"map_player": "variable.map_face_icon"},
-              {"third_person": "!variable.is_first_person"}
-            ]
-          },
-          "map_player": {
-            "transitions": [
-              {"paperdoll": "variable.is_paperdoll"},
-              {"first_person": "variable.is_first_person"},
-              {
-                "third_person": "!variable.map_face_icon && !variable.is_first_person"
-              }
-            ]
-          },
-          "paperdoll": {
-            "animations": [
-              "humanoid_base_pose",
-              {"look_at_target_ui": "variable.should_look_at_target_ui"},
-              "move.arms",
-              "move.legs",
-              "cape"
-            ],
-            "transitions": [
-              {
-                "first_person": "!variable.is_paperdoll && variable.is_first_person"
-              },
-              {"map_player": "variable.map_face_icon"},
-              {
-                "third_person": "!variable.is_paperdoll && !variable.is_first_person"
-              }
-            ]
-          },
-          "third_person": {
-            "animations": [
-              "humanoid_base_pose",
-              {"look_at_target": "!query.is_sleeping && !query.is_emoting"},
-              "move.arms",
-              "move.legs",
-              "cape",
-              {"riding.arms": "query.is_riding"},
-              {"riding.legs": "query.is_riding"},
-              "holding",
-              {"brandish_spear": "variable.is_brandishing_spear"},
-              {"charging": "query.is_charging"},
-              {"sneaking": "query.is_sneaking && !query.is_sleeping"},
-              "bob",
-              {"damage_nearby_mobs": "variable.damage_nearby_mobs"},
-              {"swimming": "variable.swim_amount > 0.0"},
-              {"swimming.legs": "variable.swim_amount > 0.0"},
-              {
-                "use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 ) && !variable.is_brandishing_spear"
-              },
-              {"fishing_rod": "query.get_equipped_item_name == 'fishing_rod'"},
-              {"sleeping": "query.is_sleeping && query.is_alive"},
-              {"attack.positions": "variable.attack_time >= 0.0"},
-              {"attack.rotations": "variable.attack_time >= 0.0"},
-              {
-                "shield_block_main_hand": "query.blocking && query.get_equipped_item_name('off_hand') != 'shield' && query.get_equipped_item_name == 'shield'"
-              },
-              {
-                "shield_block_off_hand": "query.blocking && query.get_equipped_item_name('off_hand') == 'shield' && !(variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0)"
-              },
-              {
-                "crossbow_controller": "query.get_equipped_item_name == 'crossbow'"
-              },
-              {
-                "third_person_bow_equipped": "query.get_equipped_item_name == 'bow' && (variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0)"
-              }
-            ],
-            "transitions": [
-              {"paperdoll": "variable.is_paperdoll"},
-              {"first_person": "variable.is_first_person"},
-              {"map_player": "variable.map_face_icon"}
-            ]
-          }
-        }
-      },
-      "base_controller": "controller.animation.player.base",
-      "hudplayer": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": [
-              "humanoid_base_pose",
-              {"look_at_target": "!query.is_sleeping && !query.is_emoting"},
-              "move.arms",
-              "move.legs",
-              "cape",
-              {"riding.arms": "query.is_riding"},
-              {"riding.legs": "query.is_riding"},
-              "holding",
-              {"brandish_spear": "variable.is_brandishing_spear"},
-              {"charging": "query.is_charging"},
-              {"sneaking": "query.is_sneaking && !query.is_sleeping"},
-              "bob",
-              {"damage_nearby_mobs": "variable.damage_nearby_mobs"},
-              {"swimming": "variable.swim_amount > 0.0"},
-              {"swimming.legs": "variable.swim_amount > 0.0"},
-              {
-                "use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 ) && !variable.is_brandishing_spear"
-              },
-              {"sleeping": "query.is_sleeping && query.is_alive"},
-              {"attack.positions": "variable.attack_time >= 0.0"},
-              {"attack.rotations": "variable.attack_time >= 0.0"},
-              {
-                "shield_block_main_hand": "query.blocking && query.get_equipped_item_name('off_hand') != 'shield' && query.get_equipped_item_name == 'shield'"
-              },
-              {
-                "shield_block_off_hand": "query.blocking && query.get_equipped_item_name('off_hand') == 'shield' && !(variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0)"
-              },
-              {
-                "crossbow_controller": "query.get_equipped_item_name == 'crossbow'"
-              },
-              {
-                "third_person_bow_equipped": "query.get_equipped_item_name == 'bow' && (variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0)"
-              }
-            ]
-          }
-        }
-      },
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "first_person_attack_controller": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["first_person_attack_rotation"],
-            "transitions": [{"vr_attack": "variable.is_using_vr"}]
-          },
-          "vr_attack": {
-            "animations": ["first_person_vr_attack_rotation"],
-            "transitions": [{"default": "!variable.is_using_vr"}]
-          }
-        }
-      },
-      "first_person_map_controller": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [
-              {
-                "one_hand": "query.get_equipped_item_name('off_hand') == 'map' || query.get_equipped_item_name('off_hand') == 'shield'"
-              },
-              {
-                "two_hand": "query.get_equipped_item_name('off_hand') != 'map' && query.get_equipped_item_name('off_hand') != 'shield'"
-              }
-            ]
-          },
-          "one_hand": {
-            "animations": [
-              {
-                "first_person_map_hold_main_hand": "query.get_equipped_item_name(0, 1) == 'map'"
-              },
-              {
-                "first_person_map_hold_off_hand": "query.get_equipped_item_name('off_hand') == 'map' && (query.get_equipped_item_name == 'bow' ? !(variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0) : 1.0)"
-              }
-            ],
-            "transitions": [
-              {
-                "default": "query.get_equipped_item_name(0, 1) != 'map' && query.get_equipped_item_name('off_hand') != 'map'"
-              },
-              {
-                "two_hand": "query.get_equipped_item_name('off_hand') != 'map' && query.get_equipped_item_name('off_hand') != 'shield'"
-              }
-            ]
-          },
-          "two_hand": {
-            "animations": [
-              "first_person_map_hold",
-              "first_person_map_hold_attack"
-            ],
-            "transitions": [
-              {
-                "default": "query.get_equipped_item_name(0, 1) != 'map' && query.get_equipped_item_name('off_hand') != 'map'"
-              },
-              {
-                "one_hand": "query.get_equipped_item_name('off_hand') == 'map' || query.get_equipped_item_name('off_hand') == 'shield'"
-              }
-            ]
-          }
-        }
-      },
-      "crossbow_controller": {
-        "initial_state": "default",
-        "states": {
-          "charge": {
-            "animations": ["third_person_crossbow_equipped"],
-            "transitions": [
-              {
-                "default": "query.get_equipped_item_name != 'crossbow' || (query.item_remaining_use_duration <= 0.0 && !query.item_is_charged)"
-              },
-              {"hold": "query.item_is_charged"}
-            ]
-          },
-          "default": {
-            "transitions": [
-              {"hold": "query.item_is_charged"},
-              {"charge": "query.item_remaining_use_duration > 0.0"}
-            ]
-          },
-          "hold": {
-            "animations": ["crossbow_hold"],
-            "transitions": [
-              {
-                "default": "query.get_equipped_item_name != 'crossbow' || (query.item_remaining_use_duration <= 0.0 && !query.item_is_charged)"
-              },
-              {"charge": "query.item_remaining_use_duration > 0.0"}
-            ]
-          }
-        }
-      },
-      "blink": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [
-              {
-                "open": "variable.is_blinking = 0; variable.last_blink_time = query.life_time; return variable.last_blink_time != 0;"
-              }
-            ]
-          },
-          "open": {
-            "transitions": [
-              {
-                "blink": "variable.is_blinking = 0; variable.return_from_blink = query.life_time + math.random(0, 0.2); return query.life_time > (variable.last_blink_time + math.random(3, 40));"
-              }
-            ]
-          },
-          "blink": {
-            "transitions": [
-              {
-                "open": "variable.is_blinking = 1; variable.last_blink_time = query.life_time; return query.all_animations_finished && (query.life_time > variable.return_from_blink);"
-              }
-            ]
-          }
-        }
-      }
-    }
+    "enable_attachables": true
   },
   "polar_bear": {
     "identifier": "minecraft:polar_bear",
@@ -12368,103 +2402,6 @@
         ]
       }
     },
-    "animations": {
-      "walk": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          },
-          "leg1": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg2": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg3": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [0, "-9 - 2 * query.standing_scale - this", 0],
-            "rotation": ["(-(query.standing_scale) * 63) - this", 0, 0]
-          },
-          "leg0": {
-            "position": [
-              0,
-              "-1 * query.standing_scale",
-              "6 * query.standing_scale"
-            ],
-            "rotation": ["query.standing_scale * 63", 0, 0]
-          },
-          "leg1": {
-            "position": [
-              0,
-              "-1 * query.standing_scale",
-              "6 * query.standing_scale"
-            ],
-            "rotation": ["query.standing_scale * 63", 0, 0]
-          },
-          "leg2": {
-            "rotation": [
-              "(query.standing_scale > 1) ? (query.standing_scale * 81) - this : 0",
-              0,
-              0
-            ]
-          },
-          "leg3": {
-            "rotation": [
-              "(query.standing_scale > 1) ? (query.standing_scale * 81) - this : 0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "baby_transform": {
-        "loop": true,
-        "bones": {"head": {"position": [0, -1, 3], "scale": 1.25}}
-      }
-    },
-    "scripts": {"scale": "1.2"},
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": [
-              {"walk": "query.modified_move_speed"},
-              "move",
-              "look_at_target"
-            ]
-          }
-        }
-      },
-      "baby": {
-        "initial_state": "baby",
-        "states": {
-          "baby": {"animations": [{"baby_transform": "query.is_baby"}]}
-        }
-      }
-    },
     "render_controllers": ["controller.render.polarbear"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 37}
   },
@@ -12757,65 +2694,12 @@
         ]
       }
     },
-    "scripts": {
-      "pre_animation": [
-        "variable.ZRot = !query.is_in_water ? Math.cos(query.time_stamp * 14.32) * 90 : 0.0;",
-        "variable.AnimationAmountBlend = Math.lerp(variable.AnimationAmountPrev, variable.AnimationAmount, query.frame_alpha);"
-      ],
-      "animate": ["general"]
-    },
-    "animations": {
-      "flop": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": [0, 0, "variable.zrot"]},
-          "tailfin": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 45.0) * -5.75",
-              0
-            ]
-          }
-        }
-      },
-      "swim": {
-        "loop": true,
-        "bones": {
-          "tailfin": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 30.0) * -5.75",
-              0
-            ]
-          }
-        }
-      }
-    },
     "render_controllers": [
       {"controller.render.pufferfish.small": "query.variant == 0"},
       {"controller.render.pufferfish.medium": "query.variant == 1"},
       {"controller.render.pufferfish.large": "query.variant == 2"}
     ],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 46},
-    "animation_controllers": {
-      "general": {
-        "initial_state": "flopping",
-        "states": {
-          "flopping": {
-            "animations": ["flop"],
-            "transitions": [
-              {"swimming": "query.is_in_water || query.is_levitating"}
-            ]
-          },
-          "swimming": {
-            "animations": ["swim"],
-            "transitions": [
-              {"flopping": "!query.is_in_water && !query.is_levitating"}
-            ]
-          }
-        }
-      }
-    }
+    "spawn_egg": {"texture": "spawn_egg", "texture_index": 46}
   },
   "rabbit": {
     "identifier": "minecraft:rabbit",
@@ -12947,86 +2831,6 @@
         ]
       }
     },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "earleft": {
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this + 15.0",
-              0
-            ]
-          },
-          "earright": {
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this - 15.0",
-              0
-            ]
-          },
-          "frontlegleft": {
-            "rotation": ["variable.jump_rotation * -40.0 - 11.0 - this", 0, 0]
-          },
-          "frontlegright": {
-            "rotation": ["variable.jump_rotation * -40.0 - 11.0 - this", 0, 0]
-          },
-          "haunchleft": {
-            "rotation": ["variable.jump_rotation * 50.0 - 21.0 - this", 0, 0]
-          },
-          "haunchright": {
-            "rotation": ["variable.jump_rotation * 50.0 - 21.0 - this", 0, 0]
-          },
-          "nose": {
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          },
-          "rearfootleft": {
-            "rotation": ["variable.jump_rotation * 50.0 - this", 0, 0]
-          },
-          "rearfootright": {
-            "rotation": ["variable.jump_rotation * 50.0 - this", 0, 0]
-          }
-        }
-      },
-      "baby_transform": {
-        "loop": true,
-        "bones": {
-          "earleft": {"position": [0, -1, 1], "scale": 1.5},
-          "earright": {"position": [0, -1, 1], "scale": 1.5},
-          "head": {"position": [0, -1, 1], "scale": 1.5},
-          "nose": {"position": [0, -1, 1], "scale": 1.5}
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "general": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move", "look_at_target"]}}
-      },
-      "baby": {
-        "initial_state": "baby",
-        "states": {
-          "baby": {"animations": [{"baby_transform": "query.is_baby"}]}
-        }
-      }
-    },
     "render_controllers": ["controller.render.rabbit"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 24}
   },
@@ -13119,136 +2923,7 @@
     },
     "render_controllers": ["controller.render.ravager"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 57},
-    "animations": {
-      "walk": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  22.92", 0, 0]
-          },
-          "leg1": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -22.92", 0, 0]
-          },
-          "leg2": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -22.92", 0, 0]
-          },
-          "leg3": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  22.92", 0, 0]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "idle_mouth": {
-        "loop": true,
-        "bones": {
-          "mouth": {"rotation": [1.8, 0, 0]},
-          "neck": {"position": [0, 0, 0]}
-        }
-      },
-      "stunned": {
-        "loop": true,
-        "bones": {
-          "neck": {
-            "position": ["math.sin(query.life_time * 180.0) * 2.8", -5, 0],
-            "rotation": [15, 0, 0]
-          }
-        }
-      },
-      "roaring": {
-        "loop": true,
-        "bones": {
-          "mouth": {
-            "rotation": [
-              "math.sin(math.min(query.anim_time / variable.roar_length, 1.0) * 180) * 40.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "biting": {
-        "loop": true,
-        "bones": {
-          "mouth": {
-            "rotation": [
-              "math.sin(math.min(query.anim_time / (variable.bite_anim_duration / 2.0f), 1.0f) * 180.0f) * 40.0f",
-              0,
-              0
-            ]
-          },
-          "neck": {
-            "position": [
-              0,
-              0,
-              "-math.sin(math.min(query.anim_time / variable.bite_anim_duration, 1.0f) * 180.0f) * variable.bite_neck_length"
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {
-      "pre_animation": [
-        "variable.roar_length = 1.0;",
-        "variable.bite_anim_duration = 0.75f;",
-        "variable.bite_neck_length = 10;"
-      ],
-      "animate": ["move", "head"]
-    },
-    "particle_effects": {"stun_particles": "minecraft:stunned_emitter"},
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": [
-              {"walk": "query.modified_move_speed"},
-              "look_at_target"
-            ],
-            "transitions": [{"stunned": "query.is_stunned == 1"}]
-          },
-          "stunned": {
-            "animations": ["stunned"],
-            "particle_effects": [
-              {"effect": "stun_particles", "locator": "stun"}
-            ],
-            "transitions": [{"default": "query.is_stunned == 0"}]
-          }
-        }
-      },
-      "head": {
-        "initial_state": "default",
-        "states": {
-          "biting": {
-            "animations": ["biting"],
-            "transitions": [{"default": "query.is_delayed_attacking == 0"}]
-          },
-          "default": {
-            "animations": ["idle_mouth"],
-            "transitions": [
-              {"roaring": "query.is_roaring == 1"},
-              {"biting": "query.is_delayed_attacking == 1"}
-            ]
-          },
-          "roaring": {
-            "animations": ["roaring"],
-            "transitions": [{"default": "query.is_roaring == 0"}]
-          }
-        }
-      }
-    }
+    "particle_effects": {"stun_particles": "minecraft:stunned_emitter"}
   },
   "salmon": {
     "identifier": "minecraft:salmon",
@@ -13335,476 +3010,9 @@
         ]
       }
     },
-    "scripts": {
-      "pre_animation": [
-        "variable.ZRot = !query.is_in_water ? Math.cos((query.time_stamp + query.frame_alpha) * 14.32) * 90 : 0.0;",
-        "variable.AnimationAmountBlend = Math.lerp(variable.AnimationAmountPrev, variable.AnimationAmount, query.frame_alpha);"
-      ]
-    },
-    "animations": {
-      "flop": {
-        "loop": true,
-        "bones": {
-          "body_back": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 45.0) * -21.75",
-              0
-            ]
-          },
-          "body_front": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 45.0) * 4.0",
-              "variable.zrot"
-            ]
-          },
-          "tailfin": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 45.0) * -40.0",
-              0
-            ]
-          }
-        }
-      },
-      "swim": {
-        "loop": true,
-        "bones": {
-          "body_back": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 30.0) * -21.75",
-              0
-            ]
-          },
-          "body_front": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 30.0) * 4.0",
-              0
-            ]
-          },
-          "tailfin": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 30.0) * -40.0",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "general": {
-        "initial_state": "flopping",
-        "states": {
-          "flopping": {
-            "animations": ["flop"],
-            "transitions": [
-              {"swimming": "query.is_in_water || query.is_levitating"}
-            ]
-          },
-          "swimming": {
-            "animations": ["swim"],
-            "transitions": [
-              {"flopping": "!query.is_in_water && !query.is_levitating"}
-            ]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.salmon"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 47}
   },
-  "sheep": {
-    "identifier": "minecraft:sheep",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "sheep"},
-    "textures": {
-      "default": "textures/entity/sheep/sheep_fur",
-      "sheared": "textures/entity/sheep/sheep"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 2,
-        "visible_bounds_height": 1.75,
-        "visible_bounds_offset": [0, 0.5, 0],
-        "bones": [
-          {
-            "name": "head",
-            "pivot": [0, 18, -8],
-            "cubes": [
-              {
-                "origin": [-3, 16, -12],
-                "size": [6, 6, 6],
-                "uv": [0, 32],
-                "inflate": 0.6
-              }
-            ]
-          },
-          {
-            "name": "body",
-            "pivot": [0, 19, 2],
-            "bind_pose_rotation": [90, 0, 0],
-            "cubes": [
-              {
-                "origin": [-4, 13, -5],
-                "size": [8, 16, 6],
-                "uv": [28, 40],
-                "inflate": 1.75
-              }
-            ]
-          },
-          {
-            "name": "leg0",
-            "parent": "body",
-            "pivot": [-3, 12, 7],
-            "cubes": [
-              {
-                "origin": [-5, 6, 5],
-                "size": [4, 6, 4],
-                "uv": [0, 48],
-                "inflate": 0.5
-              }
-            ]
-          },
-          {
-            "name": "leg1",
-            "parent": "body",
-            "pivot": [3, 12, 7],
-            "cubes": [
-              {
-                "origin": [1, 6, 5],
-                "size": [4, 6, 4],
-                "uv": [0, 48],
-                "inflate": 0.5
-              }
-            ]
-          },
-          {
-            "name": "leg2",
-            "parent": "body",
-            "pivot": [-3, 12, -5],
-            "cubes": [
-              {
-                "origin": [-5, 6, -7],
-                "size": [4, 6, 4],
-                "uv": [0, 48],
-                "inflate": 0.5
-              }
-            ]
-          },
-          {
-            "name": "leg3",
-            "parent": "body",
-            "pivot": [3, 12, -5],
-            "cubes": [
-              {
-                "origin": [1, 6, -7],
-                "size": [4, 6, 4],
-                "uv": [0, 48],
-                "inflate": 0.5
-              }
-            ]
-          }
-        ]
-      },
-      "sheared": {
-        "visible_bounds_width": 2,
-        "visible_bounds_height": 1.75,
-        "visible_bounds_offset": [0, 0.5, 0],
-        "bones": [
-          {
-            "name": "body",
-            "pivot": [0, 19, 2],
-            "bind_pose_rotation": [90, 0, 0],
-            "cubes": [
-              {"origin": [-4, 13, -5], "size": [8, 16, 6], "uv": [28, 8]}
-            ]
-          },
-          {
-            "name": "head",
-            "pivot": [0, 18, -8],
-            "locators": {"lead": [0, 18, -8]},
-            "cubes": [
-              {"origin": [-3, 16, -14], "size": [6, 6, 8], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "leg0",
-            "parent": "body",
-            "pivot": [-3, 12, 7],
-            "cubes": [{"origin": [-5, 0, 5], "size": [4, 12, 4], "uv": [0, 16]}]
-          },
-          {
-            "name": "leg1",
-            "parent": "body",
-            "pivot": [3, 12, 7],
-            "cubes": [{"origin": [1, 0, 5], "size": [4, 12, 4], "uv": [0, 16]}]
-          },
-          {
-            "name": "leg2",
-            "parent": "body",
-            "pivot": [-3, 12, -5],
-            "cubes": [
-              {"origin": [-5, 0, -7], "size": [4, 12, 4], "uv": [0, 16]}
-            ]
-          },
-          {
-            "name": "leg3",
-            "parent": "body",
-            "pivot": [3, 12, -5],
-            "cubes": [{"origin": [1, 0, -7], "size": [4, 12, 4], "uv": [0, 16]}]
-          }
-        ]
-      }
-    },
-    "animations": {
-      "setup": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["-this", 0, 0]},
-          "head": {"position": [0, "-6.0 - this", 0]}
-        }
-      },
-      "grazing": {
-        "animation_length": 2,
-        "loop": true,
-        "bones": {
-          "head": {
-            "position": {
-              "0": [0, 0, 0],
-              "2": [0, 0, 0],
-              "0.2": [0, -9, 0],
-              "1.8": [0, -9, 0]
-            },
-            "rotation": {
-              "0.2": {
-                "post": [
-                  "180.0 * (0.2 + 0.07 * math.sin(query.key_frame_lerp_time * 1644.39))",
-                  0,
-                  0
-                ],
-                "pre": [36, 0, 0]
-              },
-              "1.8": {
-                "post": [36, 0, 0],
-                "pre": [
-                  "180.0 * (0.2 + 0.07 * math.sin(query.key_frame_lerp_time * 1644.39))",
-                  0,
-                  0
-                ]
-              }
-            }
-          }
-        }
-      },
-      "walk": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          },
-          "leg1": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg2": {
-            "rotation": ["math.cos(query.anim_time * 38.17) * -80.0", 0, 0]
-          },
-          "leg3": {
-            "rotation": ["math.cos(query.anim_time * 38.17) *  80.0", 0, 0]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "baby_transform": {
-        "loop": true,
-        "bones": {"head": {"position": [0, 4, 4], "scale": 2}}
-      }
-    },
-    "scripts": {
-      "animate": [
-        "setup",
-        "look_at_target",
-        "move",
-        {"baby_transform": "query.is_baby"}
-      ]
-    },
-    "render_controllers": ["controller.render.sheep"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 3},
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": [{"walk": "query.modified_move_speed"}],
-            "transitions": [{"grazing": "query.is_grazing"}]
-          },
-          "grazing": {
-            "animations": ["grazing"],
-            "transitions": [{"default": "query.all_animations_finished"}]
-          }
-        }
-      }
-    }
-  },
-  "shulker": {
-    "identifier": "minecraft:shulker",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "shulker"},
-    "textures": {
-      "undyed": "textures/entity/shulker/shulker",
-      "white": "textures/entity/shulker/shulker_white",
-      "orange": "textures/entity/shulker/shulker_orange",
-      "magenta": "textures/entity/shulker/shulker_magenta",
-      "light_blue": "textures/entity/shulker/shulker_light_blue",
-      "yellow": "textures/entity/shulker/shulker_yellow",
-      "lime": "textures/entity/shulker/shulker_lime",
-      "pink": "textures/entity/shulker/shulker_pink",
-      "gray": "textures/entity/shulker/shulker_gray",
-      "silver": "textures/entity/shulker/shulker_light_gray",
-      "cyan": "textures/entity/shulker/shulker_cyan",
-      "purple": "textures/entity/shulker/shulker_purple",
-      "blue": "textures/entity/shulker/shulker_blue",
-      "brown": "textures/entity/shulker/shulker_brown",
-      "green": "textures/entity/shulker/shulker_green",
-      "red": "textures/entity/shulker/shulker_red",
-      "black": "textures/entity/shulker/shulker_black"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 3,
-        "visible_bounds_height": 3,
-        "visible_bounds_offset": [0, 0.5, 0],
-        "texturewidth": 64,
-        "textureheight": 64,
-        "bones": [
-          {
-            "name": "lid",
-            "parent": "base",
-            "pivot": [0, 0, 0],
-            "cubes": [
-              {"origin": [-8, 4, -8], "size": [16, 12, 16], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "base",
-            "pivot": [0, 0, 0],
-            "cubes": [
-              {"origin": [-8, 0, -8], "size": [16, 8, 16], "uv": [0, 28]}
-            ]
-          },
-          {
-            "name": "head",
-            "parent": "base",
-            "pivot": [0, 12, 0],
-            "cubes": [{"origin": [-3, 6, -3], "size": [6, 6, 6], "uv": [0, 52]}]
-          }
-        ]
-      }
-    },
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 34},
-    "scripts": {
-      "pre_animation": [
-        "variable.Shulker.LidPositionFactor = 180 * (0.5 + variable.Shulker.PeekAmount);",
-        "variable.Shulker.LidRotationFactor = -1 + Math.sin(180 * (0.5 + variable.Shulker.PeekAmount));",
-        "variable.Shulker.UpFacing = variable.Shulker.FacingDirection == 1;",
-        "variable.Shulker.NorthFacing = variable.Shulker.FacingDirection == 2;",
-        "variable.Shulker.SouthFacing = variable.Shulker.FacingDirection == 3;",
-        "variable.Shulker.WestFacing = variable.Shulker.FacingDirection == 4;",
-        "variable.Shulker.EastFacing = variable.Shulker.FacingDirection == 5;",
-        "variable.Shulker.XPreRotation = variable.Shulker.UpFacing * 180 + variable.Shulker.NorthFacing * 90 - variable.Shulker.SouthFacing * 90;",
-        "variable.Shulker.ZPreRotation = variable.Shulker.NorthFacing * 180 + variable.Shulker.WestFacing * 90 - variable.Shulker.EastFacing * 90;",
-        "variable.Shulker.XOffset = -variable.Shulker.WestFacing * 7.99 + variable.Shulker.EastFacing * 7.99;",
-        "variable.Shulker.YOffset = variable.Shulker.UpFacing * 16 + variable.Shulker.NorthFacing * 7.99 + variable.Shulker.SouthFacing * 7.99 + variable.Shulker.WestFacing * 7.99 + variable.Shulker.EastFacing * 7.99;",
-        "variable.Shulker.ZOffset = variable.Shulker.NorthFacing * 7.99 - variable.Shulker.SouthFacing * 7.99;"
-      ]
-    },
-    "animations": {
-      "facing": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "base": {
-            "position": [
-              "variable.shulker.xoffset",
-              "variable.shulker.yoffset",
-              "variable.shulker.zoffset"
-            ],
-            "rotation": [
-              "variable.shulker.xprerotation",
-              0,
-              "variable.shulker.zprerotation"
-            ],
-            "scale": 0.98
-          }
-        }
-      },
-      "move": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "head": {
-            "position": [
-              0,
-              "-variable.shulker.upfacing * 6 - (3 * (variable.shulker.northfacing + variable.shulker.southfacing + variable.shulker.westfacing + variable.shulker.eastfacing))",
-              0
-            ]
-          },
-          "lid": {
-            "position": [
-              0,
-              "7.2 - math.sin(variable.shulker.lidpositionfactor * 1.16) * 7.5 + (variable.shulker.lidpositionfactor > 180 ? math.sin(query.life_time * 114.6) * 0.7 + 1.5: 0.0)",
-              0
-            ],
-            "rotation": [
-              0,
-              "variable.shulker.peekamount > 0.3 ? math.pow(variable.shulker.lidrotationfactor, 4) * 22.5 : 0.0",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "facing": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["facing"]}}
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move", "look_at_target"]}}
-      }
-    },
-    "render_controllers": ["controller.render.shulker"]
-  },
   "shulker_bullet": {
     "identifier": "minecraft:shulker_bullet",
     "materials": {"default": "shulker_bullet"},
@@ -13826,21 +3034,6 @@
         ]
       }
     },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "math.cos(query.life_time * 120) * 180",
-              "math.sin(query.life_time * 120) * 180",
-              "math.sin(query.life_time * 170) * 360"
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {"animate": ["move"]},
     "render_controllers": ["controller.render.shulker_bullet"]
   },
   "silverfish": {
@@ -13937,67 +3130,6 @@
         ]
       }
     },
-    "animations": {
-      "move": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "bodypart_0": {
-            "position": ["math.sin(query.life_time * 1031.4) * 1.26", 0, 0],
-            "rotation": [0, "math.cos(query.life_time * 1031.4) * 27", 0]
-          },
-          "bodypart_1": {
-            "position": [
-              "math.sin(query.life_time * 1031.4 + 27) * 0.63",
-              0,
-              0
-            ],
-            "rotation": [0, "math.cos(query.life_time * 1031.4 + 27) * 18", 0]
-          },
-          "bodypart_2": {
-            "rotation": [0, "math.cos(query.life_time * 1031.4 + 54) * 9", 0]
-          },
-          "bodypart_3": {
-            "position": [
-              "math.sin(query.life_time * 1031.4 + 81) * 0.63",
-              0,
-              0
-            ],
-            "rotation": [0, "math.cos(query.life_time * 1031.4 + 81) * 18", 0]
-          },
-          "bodypart_4": {
-            "position": [
-              "math.sin(query.life_time * 1031.4 + 108) * 1.26",
-              0,
-              0
-            ],
-            "rotation": [0, "math.cos(query.life_time * 1031.4 + 108) * 27", 0]
-          },
-          "bodypart_5": {
-            "position": [
-              "math.sin(query.life_time * 1031.4 + 135) * 1.89",
-              0,
-              0
-            ],
-            "rotation": [0, "math.cos(query.life_time * 1031.4 + 135) * 36", 0]
-          },
-          "bodypart_6": {
-            "position": [
-              "math.sin(query.life_time * 1031.4 + 162) * 2.52",
-              0,
-              0
-            ],
-            "rotation": [0, "math.cos(query.life_time * 1031.4 + 162) * 45", 0]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      }
-    },
     "render_controllers": ["controller.render.silverfish"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 8}
   },
@@ -14095,418 +3227,6 @@
       }
     },
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 9},
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;"
-      ]
-    },
-    "animations": {
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-36, 0, 0]},
-          "rightarm": {"rotation": [-36, 0, 0]}
-        }
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
-          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
-        }
-      },
-      "holding": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "variable.is_holding_left ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "variable.is_holding_right ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "brandish_spear": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "this * -0.5 - 157.5 - 22.5 * variable.charge_amount",
-              "-this",
-              0
-            ]
-          }
-        }
-      },
-      "charging": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": ["22.5 * variable.charge_amount - this", "-this", 0]
-          }
-        }
-      },
-      "attack.rotations": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46 - this",
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.sin(1.0 - math.pow(1.0 - variable.attack_time, 3.0) * 180.0) * (variable.is_brandishing_spear ? -1.0 : 1.0 )",
-              "variable.is_brandishing_spear ? 0.0 : (math.sin(math.sqrt(variable.attack_time) * 360) * 11.46) * 2.0",
-              0
-            ]
-          }
-        }
-      },
-      "sneaking": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["0.5 - this", 0, 0]},
-          "head": {"position": [0, 1, 0]},
-          "leftarm": {"rotation": [72, 0, 0]},
-          "leftleg": {"position": [0, -3, 4]},
-          "rightarm": {"rotation": [72, 0, 0]},
-          "rightleg": {"position": [0, -3, 4]}
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "damage_nearby_mobs": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["-45.0-this", "-this", "-this"]},
-          "leftleg": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightarm": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-45.0-this", "-this", "-this"]}
-        }
-      },
-      "bow_and_arrow": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 - math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation + 28.65",
-              "-(math.cos(query.life_time * 103.2) * 2.865) - 2.865"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 + math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation - 5.73",
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "swimming": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [
-              0,
-              "variable.swim_amount * -10.0 - this",
-              "variable.swim_amount * 9.0 - this"
-            ],
-            "rotation": [
-              "variable.swim_amount * (90.0 + query.target_x_rotation)",
-              0,
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) - (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "leftleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0 + 180.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) + (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, -14.325, variable.swim_amount) + (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "rightleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "use_item_progress": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "variable.use_item_startup_progress * -60.0 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -22.5 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -5.625 + variable.use_item_interval_progress * 11.25"
-            ]
-          }
-        }
-      },
-      "skeleton_attack": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-68.75 * math.sin(variable.attack_time * 180.0) + 22.92 * (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0))",
-              "5.73 - math.sin(variable.attack_time * 180.0) * 34.38 - this",
-              "-this"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "-68.75 * math.sin(variable.attack_time * 180.0) + 22.92 * (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0))",
-              "-5.73 + math.sin(variable.attack_time * 180.0) * 34.38 - this",
-              "-this"
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      },
-      "riding": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"riding": "query.is_riding"}]},
-          "riding": {
-            "animations": ["riding.arms", "riding.legs"],
-            "transitions": [{"default": "!query.is_riding"}]
-          }
-        }
-      },
-      "holding": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["holding"]}}
-      },
-      "brandish_spear": {
-        "initial_state": "default",
-        "states": {
-          "brandish_spear": {
-            "animations": ["brandish_spear"],
-            "transitions": [{"default": "!variable.is_brandishing_spear"}]
-          },
-          "default": {
-            "transitions": [{"brandish_spear": "variable.is_brandishing_spear"}]
-          }
-        }
-      },
-      "charging": {
-        "initial_state": "default",
-        "states": {
-          "charging": {
-            "animations": ["charging"],
-            "transitions": [{"default": "!query.is_charging"}]
-          },
-          "default": {"transitions": [{"charging": "query.is_charging"}]}
-        }
-      },
-      "attack": {
-        "initial_state": "default",
-        "states": {
-          "attacking": {
-            "animations": ["attack.rotations"],
-            "transitions": [{"default": "variable.attack_time < 0.0"}]
-          },
-          "default": {
-            "transitions": [{"attacking": "variable.attack_time >= 0.0"}]
-          }
-        }
-      },
-      "sneaking": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"sneaking": "query.is_sneaking"}]},
-          "sneaking": {
-            "animations": ["sneaking"],
-            "transitions": [{"default": "!query.is_sneaking"}]
-          }
-        }
-      },
-      "bob": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["bob"]}}
-      },
-      "damage_nearby_mobs": {
-        "initial_state": "default",
-        "states": {
-          "damage_nearby_mobs": {
-            "animations": ["damage_nearby_mobs"],
-            "transitions": [{"default": "!variable.damage_nearby_mobs"}]
-          },
-          "default": {
-            "transitions": [
-              {"damage_nearby_mobs": "variable.damage_nearby_mobs"}
-            ]
-          }
-        }
-      },
-      "bow_and_arrow": {
-        "initial_state": "default",
-        "states": {
-          "bow_and_arrow": {
-            "animations": ["bow_and_arrow"],
-            "transitions": [{"default": "!query.has_target"}]
-          },
-          "default": {"transitions": [{"bow_and_arrow": "query.has_target"}]}
-        }
-      },
-      "swimming": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [{"is_swimming": "variable.swim_amount > 0.0"}]
-          },
-          "is_swimming": {
-            "animations": ["swimming"],
-            "transitions": [{"default": "variable.swim_amount <= 0.0"}]
-          }
-        }
-      },
-      "use_item_progress": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [
-              {
-                "use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 )"
-              }
-            ]
-          },
-          "use_item_progress": {
-            "animations": ["use_item_progress"],
-            "transitions": [
-              {
-                "default": "( variable.use_item_interval_progress <= 0.0 ) && ( variable.use_item_startup_progress <= 0.0 )"
-              }
-            ]
-          }
-        }
-      },
-      "skeleton_attack": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["skeleton_attack"]}}
-      }
-    },
     "render_controllers": ["controller.render.skeleton"],
     "enable_attachables": true
   },
@@ -14943,17 +3663,6 @@
         ]
       }
     },
-    "scripts": {
-      "pre_animation": [
-        "variable.squish_factor = (query.previous_squish_value + (query.current_squish_value - query.previous_squish_value) * query.frame_alpha);",
-        "variable.bounce = 1 / ((variable.squish_factor / (query.variant * 0.5 + 1)) + 1);",
-        "variable.horizontal_scale_amount = variable.bounce * query.variant;",
-        "variable.vertical_scale_amount = (1 / variable.bounce) * query.variant;"
-      ],
-      "scaleX": "variable.horizontal_scale_amount",
-      "scaleY": "variable.vertical_scale_amount",
-      "scaleZ": "variable.horizontal_scale_amount"
-    },
     "render_controllers": [
       "controller.render.slime",
       "controller.render.slime_armor"
@@ -14983,21 +3692,6 @@
         "textureheight": 16
       }
     },
-    "animations": {
-      "face_player": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "query.camera_rotation(0)",
-              "query.camera_rotation(1)",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {"scale": "0.5", "animate": ["face_player"]},
     "render_controllers": ["controller.render.fireball"]
   },
   "snow_golem": {
@@ -15081,40 +3775,6 @@
         ]
       }
     },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "piece1": {"rotation": [0, "query.target_y_rotation * 0.25", 0]}
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": [
-              {"move": "query.modified_move_speed"},
-              "look_at_target"
-            ]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.snowgolem"]
   },
   "snowball": {
@@ -15141,225 +3801,7 @@
         "textureheight": 16
       }
     },
-    "render_controllers": ["controller.render.item_sprite"],
-    "animations": {
-      "flying": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "query.camera_rotation(0)",
-              "query.camera_rotation(1)",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {"animate": ["flying"]}
-  },
-  "spider": {
-    "identifier": "minecraft:spider",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "spider", "invisible": "spider_invisible"},
-    "textures": {"default": "textures/entity/spider/spider"},
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 2,
-        "visible_bounds_height": 1,
-        "visible_bounds_offset": [0, 0.5, 0],
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {
-            "name": "head",
-            "pivot": [0, 9, -3],
-            "cubes": [
-              {"origin": [-4, 5, -11], "size": [8, 8, 8], "uv": [32, 4]}
-            ],
-            "parent": "body0"
-          },
-          {
-            "name": "body0",
-            "pivot": [0, 9, 0],
-            "cubes": [{"origin": [-3, 6, -3], "size": [6, 6, 6], "uv": [0, 0]}]
-          },
-          {
-            "name": "body1",
-            "pivot": [0, 9, 9],
-            "cubes": [
-              {"origin": [-5, 5, 3], "size": [10, 8, 12], "uv": [0, 12]}
-            ],
-            "parent": "body0"
-          },
-          {
-            "name": "leg0",
-            "pivot": [-4, 9, 2],
-            "cubes": [
-              {"origin": [-19, 8, 1], "size": [16, 2, 2], "uv": [18, 0]}
-            ],
-            "parent": "body0"
-          },
-          {
-            "name": "leg1",
-            "pivot": [4, 9, 2],
-            "cubes": [{"origin": [3, 8, 1], "size": [16, 2, 2], "uv": [18, 0]}],
-            "parent": "body0"
-          },
-          {
-            "name": "leg2",
-            "pivot": [-4, 9, 1],
-            "cubes": [
-              {"origin": [-19, 8, 0], "size": [16, 2, 2], "uv": [18, 0]}
-            ],
-            "parent": "body0"
-          },
-          {
-            "name": "leg3",
-            "pivot": [4, 9, 1],
-            "cubes": [{"origin": [3, 8, 0], "size": [16, 2, 2], "uv": [18, 0]}],
-            "parent": "body0"
-          },
-          {
-            "name": "leg4",
-            "pivot": [-4, 9, 0],
-            "cubes": [
-              {"origin": [-19, 8, -1], "size": [16, 2, 2], "uv": [18, 0]}
-            ],
-            "parent": "body0"
-          },
-          {
-            "name": "leg5",
-            "pivot": [4, 9, 0],
-            "cubes": [
-              {"origin": [3, 8, -1], "size": [16, 2, 2], "uv": [18, 0]}
-            ],
-            "parent": "body0"
-          },
-          {
-            "name": "leg6",
-            "pivot": [-4, 9, -1],
-            "cubes": [
-              {"origin": [-19, 8, -2], "size": [16, 2, 2], "uv": [18, 0]}
-            ],
-            "parent": "body0"
-          },
-          {
-            "name": "leg7",
-            "pivot": [4, 9, -1],
-            "cubes": [
-              {"origin": [3, 8, -2], "size": [16, 2, 2], "uv": [18, 0]}
-            ],
-            "parent": "body0"
-          }
-        ]
-      }
-    },
-    "animations": {
-      "default_leg_pose": {
-        "loop": true,
-        "bones": {
-          "leg0": {"rotation": [0, "45.0 - this", "-45.0 - this"]},
-          "leg1": {"rotation": [0, "-45.0 - this", "45.0 - this"]},
-          "leg2": {"rotation": [0, "22.5 - this", "-33.3 - this"]},
-          "leg3": {"rotation": [0, "-22.5 - this", "33.3 - this"]},
-          "leg4": {"rotation": [0, "-22.5 - this", "-33.3 - this"]},
-          "leg5": {"rotation": [0, "22.5 - this", "33.3 - this"]},
-          "leg6": {"rotation": [0, "-45.0 - this", "-45.0 - this"]},
-          "leg7": {"rotation": [0, "45.0 - this", "45.0 - this"]}
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "walk": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": [
-              0,
-              "-math.abs(math.cos(query.anim_time * 76.34 + 90 * 0) * 22.92)",
-              "math.abs(math.sin(query.anim_time * 38.17 + 90 * 0) * 22.92)"
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              0,
-              "math.abs(math.cos(query.anim_time * 76.34 + 90 * 0) * 22.92)",
-              "-math.abs(math.sin(query.anim_time * 38.17 + 90 * 0) * 22.92)"
-            ]
-          },
-          "leg2": {
-            "rotation": [
-              0,
-              "-math.abs(math.cos(query.anim_time * 76.34 + 90 * 1) * 22.92)",
-              "math.abs(math.sin(query.anim_time * 38.17 + 90 * 1) * 22.92)"
-            ]
-          },
-          "leg3": {
-            "rotation": [
-              0,
-              "math.abs(math.cos(query.anim_time * 76.34 + 90 * 1) * 22.92)",
-              "-math.abs(math.sin(query.anim_time * 38.17 + 90 * 1) * 22.92)"
-            ]
-          },
-          "leg4": {
-            "rotation": [
-              0,
-              "-math.abs(math.cos(query.anim_time * 76.34 + 90 * 2) * 22.92)",
-              "math.abs(math.sin(query.anim_time * 38.17 + 90 * 2) * 22.92)"
-            ]
-          },
-          "leg5": {
-            "rotation": [
-              0,
-              "math.abs(math.cos(query.anim_time * 76.34 + 90 * 2) * 22.92)",
-              "-math.abs(math.sin(query.anim_time * 38.17 + 90 * 2) * 22.92)"
-            ]
-          },
-          "leg6": {
-            "rotation": [
-              0,
-              "-math.abs(math.cos(query.anim_time * 76.34 + 90 * 3) * 22.92)",
-              "math.abs(math.sin(query.anim_time * 38.17 + 90 * 3) * 22.92)"
-            ]
-          },
-          "leg7": {
-            "rotation": [
-              0,
-              "math.abs(math.cos(query.anim_time * 76.34 + 90 * 3) * 22.92)",
-              "-math.abs(math.sin(query.anim_time * 38.17 + 90 * 3) * 22.92)"
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": [
-              "default_leg_pose",
-              {"walk": "query.modified_move_speed"},
-              "look_at_target"
-            ]
-          }
-        }
-      }
-    },
-    "render_controllers": ["controller.render.spider"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 11}
+    "render_controllers": ["controller.render.item_sprite"]
   },
   "potion": {
     "identifier": "minecraft:splash_potion",
@@ -15414,22 +3856,7 @@
         "textureheight": 16
       }
     },
-    "render_controllers": ["controller.render.splash_potion"],
-    "animations": {
-      "flying": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              "query.camera_rotation(0)",
-              "query.camera_rotation(1)",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {"animate": ["flying"]}
+    "render_controllers": ["controller.render.splash_potion"]
   },
   "squid": {
     "identifier": "minecraft:squid",
@@ -15524,91 +3951,6 @@
         ]
       }
     },
-    "animations": {
-      "move": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [
-              0,
-              "query.is_in_water ? 0.0 : (query.is_baby ? 3.2 : 6.4)",
-              0
-            ]
-          },
-          "tentacle1": {
-            "rotation": [
-              "variable.squid.tentacle_angle - this",
-              "90.0 - this",
-              0
-            ]
-          },
-          "tentacle2": {
-            "rotation": [
-              "variable.squid.tentacle_angle - this",
-              "45.0 - this",
-              0
-            ]
-          },
-          "tentacle3": {
-            "rotation": [
-              "variable.squid.tentacle_angle - this",
-              "0.0 - this",
-              0
-            ]
-          },
-          "tentacle4": {
-            "rotation": [
-              "variable.squid.tentacle_angle - this",
-              "-45.0 - this",
-              0
-            ]
-          },
-          "tentacle5": {
-            "rotation": [
-              "variable.squid.tentacle_angle - this",
-              "-90.0 - this",
-              0
-            ]
-          },
-          "tentacle6": {
-            "rotation": [
-              "variable.squid.tentacle_angle - this",
-              "-135.0 - this",
-              0
-            ]
-          },
-          "tentacle7": {
-            "rotation": [
-              "variable.squid.tentacle_angle - this",
-              "-180.0 - this",
-              0
-            ]
-          },
-          "tentacle8": {
-            "rotation": [
-              "variable.squid.tentacle_angle - this",
-              "-225.0 - this",
-              0
-            ]
-          }
-        }
-      },
-      "squid_rotate": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              {"y": "180.0 - this"},
-              {"x": "query.body_x_rotation"},
-              {"y": "variable.squid.swim_rotation"}
-            ]
-          }
-        }
-      }
-    },
-    "scripts": {"animate": ["move", "squid_rotate"]},
     "render_controllers": ["controller.render.squid"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 15}
   },
@@ -15796,395 +4138,6 @@
       }
     },
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 27},
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;"
-      ]
-    },
-    "animations": {
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-36, 0, 0]},
-          "rightarm": {"rotation": [-36, 0, 0]}
-        }
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
-          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
-        }
-      },
-      "holding": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "variable.is_holding_left ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "variable.is_holding_right ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "brandish_spear": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "this * -0.5 - 157.5 - 22.5 * variable.charge_amount",
-              "-this",
-              0
-            ]
-          }
-        }
-      },
-      "charging": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": ["22.5 * variable.charge_amount - this", "-this", 0]
-          }
-        }
-      },
-      "attack.rotations": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46 - this",
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.sin(1.0 - math.pow(1.0 - variable.attack_time, 3.0) * 180.0) * (variable.is_brandishing_spear ? -1.0 : 1.0 )",
-              "variable.is_brandishing_spear ? 0.0 : (math.sin(math.sqrt(variable.attack_time) * 360) * 11.46) * 2.0",
-              0
-            ]
-          }
-        }
-      },
-      "sneaking": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["0.5 - this", 0, 0]},
-          "head": {"position": [0, 1, 0]},
-          "leftarm": {"rotation": [72, 0, 0]},
-          "leftleg": {"position": [0, -3, 4]},
-          "rightarm": {"rotation": [72, 0, 0]},
-          "rightleg": {"position": [0, -3, 4]}
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "damage_nearby_mobs": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["-45.0-this", "-this", "-this"]},
-          "leftleg": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightarm": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-45.0-this", "-this", "-this"]}
-        }
-      },
-      "bow_and_arrow": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 - math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation + 28.65",
-              "-(math.cos(query.life_time * 103.2) * 2.865) - 2.865"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 + math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation - 5.73",
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "swimming": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [
-              0,
-              "variable.swim_amount * -10.0 - this",
-              "variable.swim_amount * 9.0 - this"
-            ],
-            "rotation": [
-              "variable.swim_amount * (90.0 + query.target_x_rotation)",
-              0,
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) - (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "leftleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0 + 180.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) + (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, -14.325, variable.swim_amount) + (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "rightleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "use_item_progress": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "variable.use_item_startup_progress * -60.0 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -22.5 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -5.625 + variable.use_item_interval_progress * 11.25"
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      },
-      "riding": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"riding": "query.is_riding"}]},
-          "riding": {
-            "animations": ["riding.arms", "riding.legs"],
-            "transitions": [{"default": "!query.is_riding"}]
-          }
-        }
-      },
-      "holding": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["holding"]}}
-      },
-      "brandish_spear": {
-        "initial_state": "default",
-        "states": {
-          "brandish_spear": {
-            "animations": ["brandish_spear"],
-            "transitions": [{"default": "!variable.is_brandishing_spear"}]
-          },
-          "default": {
-            "transitions": [{"brandish_spear": "variable.is_brandishing_spear"}]
-          }
-        }
-      },
-      "charging": {
-        "initial_state": "default",
-        "states": {
-          "charging": {
-            "animations": ["charging"],
-            "transitions": [{"default": "!query.is_charging"}]
-          },
-          "default": {"transitions": [{"charging": "query.is_charging"}]}
-        }
-      },
-      "attack": {
-        "initial_state": "default",
-        "states": {
-          "attacking": {
-            "animations": ["attack.rotations"],
-            "transitions": [{"default": "variable.attack_time < 0.0"}]
-          },
-          "default": {
-            "transitions": [{"attacking": "variable.attack_time >= 0.0"}]
-          }
-        }
-      },
-      "sneaking": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"sneaking": "query.is_sneaking"}]},
-          "sneaking": {
-            "animations": ["sneaking"],
-            "transitions": [{"default": "!query.is_sneaking"}]
-          }
-        }
-      },
-      "bob": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["bob"]}}
-      },
-      "damage_nearby_mobs": {
-        "initial_state": "default",
-        "states": {
-          "damage_nearby_mobs": {
-            "animations": ["damage_nearby_mobs"],
-            "transitions": [{"default": "!variable.damage_nearby_mobs"}]
-          },
-          "default": {
-            "transitions": [
-              {"damage_nearby_mobs": "variable.damage_nearby_mobs"}
-            ]
-          }
-        }
-      },
-      "bow_and_arrow": {
-        "initial_state": "default",
-        "states": {
-          "bow_and_arrow": {
-            "animations": ["bow_and_arrow"],
-            "transitions": [{"default": "!query.has_target"}]
-          },
-          "default": {"transitions": [{"bow_and_arrow": "query.has_target"}]}
-        }
-      },
-      "swimming": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [{"is_swimming": "variable.swim_amount > 0.0"}]
-          },
-          "is_swimming": {
-            "animations": ["swimming"],
-            "transitions": [{"default": "variable.swim_amount <= 0.0"}]
-          }
-        }
-      },
-      "use_item_progress": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [
-              {
-                "use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 )"
-              }
-            ]
-          },
-          "use_item_progress": {
-            "animations": ["use_item_progress"],
-            "transitions": [
-              {
-                "default": "( variable.use_item_interval_progress <= 0.0 ) && ( variable.use_item_startup_progress <= 0.0 )"
-              }
-            ]
-          }
-        }
-      }
-    },
     "render_controllers": [
       "controller.render.stray_clothes",
       "controller.render.stray"
@@ -16319,124 +4272,6 @@
       }
     },
     "spawn_egg": {"base_color": "#9c3436", "overlay_color": "#4d494d"},
-    "scripts": {
-      "pre_animation": [
-        "variable.animation_speed = Math.min(query.modified_move_speed, 0.25);",
-        "variable.speed = 85.9437;",
-        "variable.bristle_flow=Math.cos(query.modified_distance_moved * variable.speed + 180) * variable.animation_speed;",
-        "variable.bristle_range_mod=1;",
-        "variable.bristle_speed_mod=1;"
-      ],
-      "animate": ["look_at_target", "walk", "bristle_flow"]
-    },
-    "animations": {
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "walk": {
-        "loop": true,
-        "bones": {
-          "right_leg": {
-            "rotation": [
-              "Math.sin(query.modified_distance_moved * variable.speed * 0.5 + 180) * 114.592 * variable.animation_speed",
-              0,
-              "10 * Math.cos(query.modified_distance_moved * variable.speed * 0.5f + 180) * variable.animation_speed"
-            ],
-            "position": [
-              0,
-              "-2 * Math.sin(query.modified_distance_moved * variable.speed * 0.5) * 2 * variable.animation_speed",
-              0
-            ]
-          },
-          "left_leg": {
-            "rotation": [
-              "Math.sin(query.modified_distance_moved * variable.speed * 0.5) * 114.592 * variable.animation_speed",
-              0,
-              "10 * Math.cos(query.modified_distance_moved * variable.speed * 0.5f) * variable.animation_speed"
-            ],
-            "position": [
-              0,
-              "-2 * Math.sin(query.modified_distance_moved * variable.speed * 0.5 + 180) * 2 * variable.animation_speed",
-              0
-            ]
-          },
-          "body": {
-            "rotation": [
-              0,
-              0,
-              "5.72958 * Math.sin(query.modified_distance_moved * variable.speed) * 4 * variable.animation_speed"
-            ],
-            "position": [
-              0,
-              "-2 * Math.cos(query.modified_distance_moved * variable.speed) * 2 * variable.animation_speed",
-              0
-            ]
-          },
-          "bristle1": {"rotation": [0, 0, "variable.bristle_flow * 74.4845"]},
-          "bristle2": {"rotation": [0, 0, "variable.bristle_flow * 68.7549"]},
-          "bristle3": {"rotation": [0, 0, "variable.bristle_flow * 34.3775"]},
-          "bristle4": {"rotation": [0, 0, "variable.bristle_flow * 68.7549"]},
-          "bristle5": {"rotation": [0, 0, "variable.bristle_flow * 74.4845"]}
-        }
-      },
-      "bristle_flow": {
-        "loop": true,
-        "bones": {
-          "bristle0": {
-            "rotation": [
-              0,
-              0,
-              "2.864789 * variable.bristle_range_mod * Math.sin(query.life_time * 20 * variable.bristle_speed_mod * -22.9183)"
-            ]
-          },
-          "bristle1": {
-            "rotation": [
-              0,
-              0,
-              "5.72958 * variable.bristle_range_mod * Math.sin(query.life_time * 20 * variable.bristle_speed_mod * 11.4592)"
-            ]
-          },
-          "bristle2": {
-            "rotation": [
-              0,
-              0,
-              "5.72958 * variable.bristle_range_mod * Math.sin(query.life_time * 20 * variable.bristle_speed_mod * 22.9183)"
-            ]
-          },
-          "bristle3": {
-            "rotation": [
-              0,
-              0,
-              "5.72958 * variable.bristle_range_mod * Math.sin(query.life_time * 20 * variable.bristle_speed_mod * 22.9183)"
-            ]
-          },
-          "bristle4": {
-            "rotation": [
-              0,
-              0,
-              "5.72958 * variable.bristle_range_mod * Math.sin(query.life_time * 20 * variable.bristle_speed_mod * 11.4592)"
-            ]
-          },
-          "bristle5": {
-            "rotation": [
-              0,
-              0,
-              "2.864789 * variable.bristle_range_mod * Math.sin(query.life_time * 20 * variable.bristle_speed_mod * -22.9183)"
-            ]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.strider"]
   },
   "text_display": {
@@ -16545,29 +4380,6 @@
         "textureheight": 32
       }
     },
-    "scripts": {
-      "pre_animation": ["variable.hurt = query.hurt_time - query.frame_alpha;"],
-      "animate": ["move"]
-    },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {
-          "bottom": {
-            "position": [
-              "variable.rail_offset.x / query.model_scale",
-              "variable.rail_offset.y / query.model_scale",
-              "variable.rail_offset.z / query.model_scale"
-            ],
-            "rotation": [
-              "variable.hurt > 0 ? -Math.sin(variable.hurt * 360 / (Math.pi * 2)) * variable.hurt * (((20 * 2 - query.structural_integrity) - query.frame_alpha) < 0 ? 0: (20 * 2 - query.structural_integrity) - query.frame_alpha) / 10 * query.hurt_direction : 0",
-              0,
-              "-variable.rail_rotation.z"
-            ]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.minecart"]
   },
   "tropical_fish": {
@@ -16589,12 +4401,6 @@
       "bPattern5": "textures/entity/fish/tropical_b_pattern_5",
       "bPattern6": "textures/entity/fish/tropical_b_pattern_6"
     },
-    "scripts": {
-      "pre_animation": [
-        "variable.ZRot = !query.is_in_water ? Math.cos((query.time_stamp + query.frame_alpha) * 0.25) * 90 : 0.0;",
-        "variable.AnimationAmountBlend = Math.lerp(variable.AnimationAmountPrev, variable.AnimationAmount, query.frame_alpha);"
-      ]
-    },
     "geometry": {
       "typeA": {
         "visible_bounds_width": 0.5,
@@ -16692,953 +4498,9 @@
         "textureheight": 32
       }
     },
-    "animations": {
-      "flop": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 45.0) * 2.0",
-              "variable.zrot"
-            ]
-          },
-          "tailfin": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 45.0) * -25.75",
-              0
-            ]
-          }
-        }
-      },
-      "swim": {
-        "loop": true,
-        "bones": {
-          "tailfin": {
-            "rotation": [
-              0,
-              "math.cos(variable.animationamountblend * 30.0) * -25.75",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "general": {
-        "initial_state": "flopping",
-        "states": {
-          "flopping": {
-            "animations": ["flop"],
-            "transitions": [
-              {"swimming": "query.is_in_water || query.is_levitating"}
-            ]
-          },
-          "swimming": {
-            "animations": ["swim"],
-            "transitions": [
-              {"flopping": "!query.is_in_water && !query.is_levitating"}
-            ]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.tropicalfish"],
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 44}
   },
-  "turtle": {
-    "identifier": "minecraft:turtle",
-    "materials": {"default": "turtle"},
-    "textures": {"default": "textures/entity/turtle/big_sea_turtle"},
-    "geometry": {
-      "default": {
-        "texturewidth": 128,
-        "textureheight": 64,
-        "bones": [
-          {
-            "name": "head",
-            "parent": "body",
-            "pivot": [0, 5, -10],
-            "cubes": [{"origin": [-3, 1, -13], "size": [6, 5, 6], "uv": [2, 0]}]
-          },
-          {
-            "name": "eggbelly",
-            "parent": "body",
-            "pivot": [0, 13, -10],
-            "bind_pose_rotation": [90, 0, 0],
-            "cubes": [
-              {"origin": [-4.5, -8, -24], "size": [9, 18, 1], "uv": [69, 33]}
-            ]
-          },
-          {
-            "name": "body",
-            "pivot": [0, 13, -10],
-            "bind_pose_rotation": [90, 0, 0],
-            "cubes": [
-              {"origin": [-9.5, -10, -20], "size": [19, 20, 6], "uv": [6, 37]},
-              {"origin": [-5.5, -8, -23], "size": [11, 18, 3], "uv": [30, 1]}
-            ]
-          },
-          {
-            "name": "leg0",
-            "parent": "body",
-            "pivot": [-3.5, 2, 11],
-            "cubes": [
-              {"origin": [-5.5, 1, 11], "size": [4, 1, 10], "uv": [0, 23]}
-            ]
-          },
-          {
-            "name": "leg1",
-            "parent": "body",
-            "pivot": [3.5, 2, 11],
-            "cubes": [
-              {"origin": [1.5, 1, 11], "size": [4, 1, 10], "uv": [0, 12]}
-            ]
-          },
-          {
-            "name": "leg2",
-            "parent": "body",
-            "pivot": [-5, 3, -4],
-            "cubes": [
-              {"origin": [-18, 2, -6], "size": [13, 1, 5], "uv": [26, 30]}
-            ]
-          },
-          {
-            "name": "leg3",
-            "parent": "body",
-            "pivot": [5, 3, -4],
-            "cubes": [
-              {"origin": [5, 2, -6], "size": [13, 1, 5], "uv": [26, 24]}
-            ]
-          }
-        ]
-      }
-    },
-    "scripts": {
-      "pre_animation": [
-        "variable.timeMultiplier = query.has_rider ? 0.39972 : 1.0;",
-        "variable.backLegMultiplier = query.has_rider ? 0.5 : 3.0;",
-        "variable.frontLegMultiplier = query.has_rider ? 2.0 : 8.0;",
-        "variable.legSpeedMultiplier = query.has_rider ? 2.0 : 5.0;"
-      ],
-      "scale": "1.2"
-    },
-    "animations": {
-      "general": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [0, "query.is_pregnant ? 1.0 : 0.0", 0],
-            "rotation": ["-this", 0, 0]
-          },
-          "eggbelly": {
-            "position": [0, -0.08, 0],
-            "rotation": ["-this", 0, 0],
-            "scale": "query.is_pregnant ? 1.0 : 0.0"
-          }
-        }
-      },
-      "move": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": [
-              "math.clamp(math.cos(query.anim_time * 22.92) * query.modified_move_speed * 28.65, -90.0, 90.0) - this",
-              "-this",
-              "-this"
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              "math.clamp(math.cos(query.anim_time * 22.92 + 180) * query.modified_move_speed * 28.65, -90.0, 90.0) - this",
-              "-this",
-              "-this"
-            ]
-          },
-          "leg2": {
-            "rotation": [
-              "-this",
-              "-this",
-              "math.clamp(math.cos(query.anim_time * 22.92 + 180) * query.modified_move_speed * 28.65, -90.0, 90.0) - this"
-            ]
-          },
-          "leg3": {
-            "rotation": [
-              "-this",
-              "-this",
-              "math.clamp(math.cos(query.anim_time * 22.92) * query.modified_move_speed * 28.65, -90.0, 90.0) - this"
-            ]
-          }
-        }
-      },
-      "ground_move": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": [
-              "-this",
-              "math.clamp(math.cos(query.anim_time * variable.timemultiplier * variable.legspeedmultiplier * 57.3 + 180) * variable.backlegmultiplier * query.modified_move_speed * 57.3, -90.0, 90.0) - this",
-              "-this"
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              "-this",
-              "math.clamp(math.cos(query.anim_time * variable.timemultiplier * variable.legspeedmultiplier * 57.3) * variable.backlegmultiplier * query.modified_move_speed * 57.3, -90.0, 90.0) - this",
-              "-this"
-            ]
-          },
-          "leg2": {
-            "rotation": [
-              "-this",
-              "query.is_laying_egg ? math.cos(query.life_time * 1146.0 + 180) * 90.0 : math.clamp(math.cos(query.anim_time * variable.timemultiplier * variable.legspeedmultiplier * 57.3 + 180) * variable.frontlegmultiplier * query.modified_move_speed * 57.3, -90.0, 90.0) - this",
-              "-this"
-            ]
-          },
-          "leg3": {
-            "rotation": [
-              "-this",
-              "query.is_laying_egg ? math.cos(query.life_time * 1146.0) * 90.0 : math.clamp(math.cos(query.anim_time * variable.timemultiplier * variable.legspeedmultiplier * 57.3) * variable.frontlegmultiplier * query.modified_move_speed * 57.3, -90.0, 90.0) - this",
-              "-this"
-            ]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "general": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["general"]}}
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target"],
-            "transitions": [
-              {"swimming": "query.is_in_water && !query.is_on_ground"},
-              {"walking": "!query.is_in_water && query.is_on_ground"}
-            ]
-          },
-          "swimming": {
-            "animations": ["move", "look_at_target"],
-            "transitions": [
-              {"walking": "!query.is_in_water && query.is_on_ground"}
-            ]
-          },
-          "walking": {
-            "animations": ["ground_move", "look_at_target"],
-            "transitions": [
-              {"swimming": "query.is_in_water && !query.is_on_ground"}
-            ]
-          }
-        }
-      }
-    },
-    "render_controllers": ["controller.render.turtle"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 50}
-  },
-  "vex": {
-    "identifier": "minecraft:vex",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "vex"},
-    "textures": {
-      "default": "textures/entity/illager/vex",
-      "charging": "textures/entity/illager/vex_charging"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 1.5,
-        "visible_bounds_height": 1,
-        "visible_bounds_offset": [0, 0.5, 0],
-        "texturewidth": 64,
-        "textureheight": 64,
-        "bones": [
-          {
-            "name": "head",
-            "parent": "body",
-            "pivot": [0, 24, 0],
-            "cubes": [{"origin": [-4, 24, -4], "size": [8, 8, 8], "uv": [0, 0]}]
-          },
-          {
-            "name": "body",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-4, 12, -2], "size": [8, 12, 4], "uv": [16, 16]}
-            ]
-          },
-          {
-            "name": "rightArm",
-            "parent": "body",
-            "pivot": [-5, 22, 0],
-            "cubes": [
-              {"origin": [-8, 12, -2], "size": [4, 12, 4], "uv": [40, 16]}
-            ]
-          },
-          {
-            "name": "rightItem",
-            "pivot": [-6, 13, 0],
-            "neverRender": true,
-            "parent": "rightarm"
-          },
-          {
-            "name": "leftArm",
-            "parent": "body",
-            "pivot": [5, 22, 0],
-            "mirror": true,
-            "cubes": [
-              {"origin": [4, 12, -2], "size": [4, 12, 4], "uv": [40, 16]}
-            ]
-          },
-          {
-            "name": "leg0",
-            "parent": "body",
-            "pivot": [-1.9, 12, 0],
-            "cubes": [
-              {"origin": [-3.9, 0, -2], "size": [4, 12, 4], "uv": [0, 16]},
-              {"origin": [-2.9, 3, -2], "size": [6, 10, 4], "uv": [32, 0]}
-            ]
-          },
-          {
-            "name": "leftwing",
-            "parent": "body",
-            "pivot": [0, 24, 0],
-            "mirror": true,
-            "cubes": [
-              {"origin": [0, 12, 0], "size": [20, 12, 1], "uv": [0, 32]}
-            ]
-          },
-          {
-            "name": "rightwing",
-            "parent": "body",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-20, 12, 0], "size": [20, 12, 1], "uv": [0, 32]}
-            ]
-          }
-        ]
-      }
-    },
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;"
-      ],
-      "scale": "0.4"
-    },
-    "animations": {
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-36, 0, 0]},
-          "rightarm": {"rotation": [-36, 0, 0]}
-        }
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
-          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
-        }
-      },
-      "holding": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "variable.is_holding_left ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "variable.is_holding_right ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "brandish_spear": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "this * -0.5 - 157.5 - 22.5 * variable.charge_amount",
-              "-this",
-              0
-            ]
-          }
-        }
-      },
-      "charging": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": ["22.5 * variable.charge_amount - this", "-this", 0]
-          }
-        }
-      },
-      "attack.rotations": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46 - this",
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.sin(1.0 - math.pow(1.0 - variable.attack_time, 3.0) * 180.0) * (variable.is_brandishing_spear ? -1.0 : 1.0 )",
-              "variable.is_brandishing_spear ? 0.0 : (math.sin(math.sqrt(variable.attack_time) * 360) * 11.46) * 2.0",
-              0
-            ]
-          }
-        }
-      },
-      "sneaking": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["0.5 - this", 0, 0]},
-          "head": {"position": [0, 1, 0]},
-          "leftarm": {"rotation": [72, 0, 0]},
-          "leftleg": {"position": [0, -3, 4]},
-          "rightarm": {"rotation": [72, 0, 0]},
-          "rightleg": {"position": [0, -3, 4]}
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "damage_nearby_mobs": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["-45.0-this", "-this", "-this"]},
-          "leftleg": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightarm": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-45.0-this", "-this", "-this"]}
-        }
-      },
-      "bow_and_arrow": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 - math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation + 28.65",
-              "-(math.cos(query.life_time * 103.2) * 2.865) - 2.865"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 + math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation - 5.73",
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "swimming": {
-        "animation_length": 1.3,
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": {
-              "0.7": {
-                "post": [
-                  "math.lerp(this, 11.25 * math.mod(query.modified_distance_moved, 26.0), variable.leftarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.leftarmswim_amount)",
-                  "math.lerp(this, 72.77 + 13.4 * math.mod(query.modified_distance_moved, 26.0), variable.leftarmswim_amount)"
-                ],
-                "pre": [
-                  "math.lerp(this, 0.0, variable.leftarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.leftarmswim_amount)",
-                  "math.lerp(this, 180.0 - 0.01877 * (-65.0 * math.mod(query.modified_distance_moved, 26.0) + math.mod(query.modified_distance_moved, 26.0) * math.mod(query.modified_distance_moved, 26.0)), variable.leftarmswim_amount)"
-                ]
-              },
-              "1.1": [
-                "math.lerp(this, 11.25 * math.mod(query.modified_distance_moved, 26.0), variable.leftarmswim_amount)",
-                "math.lerp(this, 180.0, variable.leftarmswim_amount)",
-                "math.lerp(this, 72.77 + 13.4 * math.mod(query.modified_distance_moved, 26.0), variable.leftarmswim_amount)"
-              ],
-              "1.3": {
-                "post": [
-                  "math.lerp(this, 90.0 - (22.5 * math.mod(query.modified_distance_moved, 26.0)), variable.leftarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.leftarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.leftarmswim_amount)"
-                ],
-                "pre": [
-                  "math.lerp(this, 11.25 * math.mod(query.modified_distance_moved, 26.0), variable.leftarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.leftarmswim_amount)",
-                  "math.lerp(this, 72.77 + 13.4 * math.mod(query.modified_distance_moved, 26.0), variable.leftarmswim_amount)"
-                ]
-              }
-            }
-          },
-          "leftleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.modified_distance_moved * 19.5 + 180.0) * 17.2, variable.leftarmswim_amount) - this",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": {
-              "0.7": {
-                "post": [
-                  "math.lerp(this, 11.25 * math.mod(query.modified_distance_moved, 26.0), variable.rightarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.rightarmswim_amount)",
-                  "math.lerp(this, 72.77 + 13.4 * math.mod(query.modified_distance_moved, 26.0), variable.rightarmswim_amount)"
-                ],
-                "pre": [
-                  "math.lerp(this, 0.0, variable.rightarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.rightarmswim_amount)",
-                  "math.lerp(this, -0.1019 * (-65.0 * math.mod(query.modified_distance_moved, 26.0) + math.mod(query.modified_distance_moved, 26.0) * math.mod(query.modified_distance_moved, 26.0)), variable.rightarmswim_amount)"
-                ]
-              },
-              "1.1": [
-                "math.lerp(this, 11.25 * math.mod(query.modified_distance_moved, 26.0), variable.rightarmswim_amount)",
-                "math.lerp(this, 180.0, variable.rightarmswim_amount)",
-                "math.lerp(this, 72.77 + 13.4 * math.mod(query.modified_distance_moved, 26.0), variable.rightarmswim_amount)"
-              ],
-              "1.3": {
-                "post": [
-                  "math.lerp(this, 90.0 - (22.5 * math.mod(query.modified_distance_moved, 26.0)), variable.rightarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.rightarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.rightarmswim_amount)"
-                ],
-                "pre": [
-                  "math.lerp(this, 11.25 * math.mod(query.modified_distance_moved, 26.0), variable.rightarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.rightarmswim_amount)",
-                  "math.lerp(this, 72.77 + 13.4 * math.mod(query.modified_distance_moved, 26.0), variable.rightarmswim_amount)"
-                ]
-              }
-            }
-          },
-          "rightleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.modified_distance_moved * 19.5) * 17.2, variable.leftarmswim_amount) - this",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "use_item_progress": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "variable.use_item_startup_progress * -60.0 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -22.5 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -5.625 + variable.use_item_interval_progress * 11.25"
-            ]
-          }
-        }
-      },
-      "vex_move": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leftwing": {
-            "position": [0, "-1.0 - this", "2.0 - this"],
-            "rotation": [
-              "27.0 - this",
-              "-(27.0 + math.cos(query.life_time * 916.8) * 9.0) - this",
-              "-27.0 - this"
-            ]
-          },
-          "leg0": {"rotation": ["variable.tcos0 * 1.4 + 36.0", 0, 0]},
-          "rightarm": {
-            "rotation": ["query.is_charging ? (216.0 - this) : 0.0", 0, 0]
-          },
-          "rightwing": {
-            "position": [0, "-1.0 - this", "2.0 - this"],
-            "rotation": [
-              "27.0 - this",
-              "27.0 + math.cos(query.life_time * 916.8) * 9.0 - this",
-              "27.0 - this"
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      },
-      "riding": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"riding": "query.is_riding"}]},
-          "riding": {
-            "animations": ["riding.arms", "riding.legs"],
-            "transitions": [{"default": "!query.is_riding"}]
-          }
-        }
-      },
-      "holding": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["holding"]}}
-      },
-      "brandish_spear": {
-        "initial_state": "default",
-        "states": {
-          "brandish_spear": {
-            "animations": ["brandish_spear"],
-            "transitions": [{"default": "!variable.is_brandishing_spear"}]
-          },
-          "default": {
-            "transitions": [{"brandish_spear": "variable.is_brandishing_spear"}]
-          }
-        }
-      },
-      "charging": {
-        "initial_state": "default",
-        "states": {
-          "charging": {
-            "animations": ["charging"],
-            "transitions": [{"default": "!query.is_charging"}]
-          },
-          "default": {"transitions": [{"charging": "query.is_charging"}]}
-        }
-      },
-      "attack": {
-        "initial_state": "default",
-        "states": {
-          "attacking": {
-            "animations": ["attack.rotations"],
-            "transitions": [{"default": "variable.attack_time < 0.0"}]
-          },
-          "default": {
-            "transitions": [{"attacking": "variable.attack_time >= 0.0"}]
-          }
-        }
-      },
-      "sneaking": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"sneaking": "query.is_sneaking"}]},
-          "sneaking": {
-            "animations": ["sneaking"],
-            "transitions": [{"default": "!query.is_sneaking"}]
-          }
-        }
-      },
-      "bob": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["bob"]}}
-      },
-      "damage_nearby_mobs": {
-        "initial_state": "default",
-        "states": {
-          "damage_nearby_mobs": {
-            "animations": ["damage_nearby_mobs"],
-            "transitions": [{"default": "!variable.damage_nearby_mobs"}]
-          },
-          "default": {
-            "transitions": [
-              {"damage_nearby_mobs": "variable.damage_nearby_mobs"}
-            ]
-          }
-        }
-      },
-      "bow_and_arrow": {
-        "initial_state": "default",
-        "states": {
-          "bow_and_arrow": {
-            "animations": ["bow_and_arrow"],
-            "transitions": [{"default": "!query.has_target"}]
-          },
-          "default": {"transitions": [{"bow_and_arrow": "query.has_target"}]}
-        }
-      },
-      "swimming": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [{"swimming": "variable.swim_amount > 0.0"}]
-          },
-          "swimming": {
-            "animations": ["swimming"],
-            "transitions": [{"default": "variable.swim_amount <= 0.0"}]
-          }
-        }
-      },
-      "use_item_progress": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [
-              {
-                "use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 )"
-              }
-            ]
-          },
-          "use_item_progress": {
-            "animations": ["use_item_progress"],
-            "transitions": [
-              {
-                "default": "( variable.use_item_interval_progress <= 0.0 ) && ( variable.use_item_startup_progress <= 0.0 )"
-              }
-            ]
-          }
-        }
-      },
-      "vex_move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["vex_move"]}}
-      }
-    },
-    "render_controllers": ["controller.render.vex"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 41}
-  },
-  "villager": {
-    "identifier": "minecraft:villager",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "villager"},
-    "textures": {
-      "farmer": "textures/entity/villager/profession/farmer",
-      "librarian": "textures/entity/villager/profession/librarian",
-      "priest": "textures/entity/villager/profession/cleric",
-      "smith": "textures/entity/villager/profession/weaponsmith",
-      "butcher": "textures/entity/villager/profession/butcher"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 1.5,
-        "visible_bounds_height": 2.5,
-        "visible_bounds_offset": [0, 1.25, 0],
-        "bones": [
-          {
-            "name": "head",
-            "parent": "body",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-4, 24, -4], "size": [8, 10, 8], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "nose",
-            "parent": "head",
-            "pivot": [0, 26, 0],
-            "cubes": [
-              {"origin": [-1, 23, -6], "size": [2, 4, 2], "uv": [24, 0]}
-            ]
-          },
-          {
-            "name": "body",
-            "cubes": [
-              {"origin": [-4, 12, -3], "size": [8, 12, 6], "uv": [16, 20]},
-              {
-                "origin": [-4, 6, -3],
-                "size": [8, 18, 6],
-                "uv": [0, 38],
-                "inflate": 0.5
-              }
-            ]
-          },
-          {
-            "name": "arms",
-            "parent": "body",
-            "pivot": [0, 22, 0],
-            "cubes": [
-              {"origin": [-4, 16, -2], "size": [8, 4, 4], "uv": [40, 38]},
-              {"origin": [-8, 16, -2], "size": [4, 8, 4], "uv": [44, 22]},
-              {"origin": [4, 16, -2], "size": [4, 8, 4], "uv": [44, 22]}
-            ]
-          },
-          {
-            "name": "leg0",
-            "parent": "body",
-            "pivot": [-2, 12, 0],
-            "cubes": [
-              {"origin": [-4, 0, -2], "size": [4, 12, 4], "uv": [0, 22]}
-            ]
-          },
-          {
-            "name": "leg1",
-            "parent": "body",
-            "pivot": [2, 12, 0],
-            "cubes": [{"origin": [0, 0, -2], "size": [4, 12, 4], "uv": [0, 22]}]
-          }
-        ]
-      }
-    },
-    "scripts": {"scale": "0.9375"},
-    "animations": {
-      "general": {
-        "loop": true,
-        "bones": {
-          "arms": {"position": [0, -1, -1], "rotation": ["-42.97 - this", 0, 0]}
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": [
-              "(math.cos(query.anim_time * 38.17) * 40.0) - this",
-              "-this",
-              0
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              "(math.cos(query.anim_time * 38.17 + 180) * 40.0) - this",
-              "-this",
-              0
-            ]
-          }
-        }
-      },
-      "baby_transform": {"loop": true, "bones": {"head": {"scale": 1.5}}}
-    },
-    "animation_controllers": {
-      "general": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["general", {"look_at_target": "!query.is_sleeping"}]
-          }
-        }
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {"animations": [{"move": "query.modified_move_speed"}]}
-        }
-      },
-      "baby": {
-        "initial_state": "baby",
-        "states": {
-          "baby": {"animations": [{"baby_transform": "query.is_baby"}]}
-        }
-      }
-    },
-    "render_controllers": ["controller.render.villager"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 14}
-  },
   "vindicator": {
     "identifier": "minecraft:vindicator",
     "min_engine_version": "1.8.0",
@@ -17733,241 +4595,8 @@
       }
     },
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 39},
-    "scripts": {
-      "scale": "0.9375",
-      "animate": [
-        "vindicator_base",
-        "vindicator_walk",
-        "controller_look_at_target",
-        "controller_vindicator_base",
-        "controller_riding"
-      ]
-    },
-    "animations": {
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {"leftarm": {"rotation": [-36, 0, 0]}}
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leg0": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]},
-          "leg1": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]}
-        }
-      },
-      "vindicator_base": {
-        "loop": true,
-        "bones": {
-          "arms": {
-            "position": [0, "-3.0 - this", "-1.0 - this"],
-            "rotation": ["-42.97 - this", 0, 0]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.cos(query.life_time * 20.0 * 3.84) * 2.87",
-              -9,
-              "-1 * (math.cos(query.life_time * 20.0 * 5.16) * 2.87 + 2.87)"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.cos(query.life_time * 20.0 * 3.84) * 2.87",
-              9,
-              "math.cos(query.life_time * 20.0 * 5.16) * 2.87 + 2.87"
-            ]
-          }
-        }
-      },
-      "vindicator_attack": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "query.is_riding ? 0.0 : ((math.cos(query.life_time * 20.0 * 10.89) * 28.65) + (math.sin(variable.attack_time * 180.0) * 68.76 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0)) * 22.92))",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "(-108 + math.cos(query.life_time * 20.0 * 3.84) * 2.87) + (math.sin(variable.attack_time * 180.0) * 126.05 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0)) * 22.92)",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "vindicator_hand_attack": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "(-108 + math.cos(query.life_time * 20.0 * 3.84) * 2.87) + (math.sin(variable.attack_time * 180.0) * 126.05 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0)) * 22.92)",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "(-108 + math.cos(query.life_time * 20.0 * 3.84) * 2.87) + (math.sin(variable.attack_time * 180.0) * 126.05 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0)) * 22.92)",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "vindicator_walk": {
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": [
-              "(math.cos(query.modified_distance_moved * 38.17) * 80.21) * query.modified_move_speed * 0.5",
-              0,
-              0
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              "(math.cos(query.modified_distance_moved * 38.17 + 180) * 80.21) * query.modified_move_speed * 0.5",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "celebrating": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "(math.cos(query.life_time * 800.0) * 2.865)",
-              180,
-              -135
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "(math.cos(query.life_time * 800.0) * 2.865)",
-              180,
-              153
-            ]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.vindicator"],
-    "enable_attachables": true,
-    "animation_controllers": {
-      "controller_look_at_target": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "controller_vindicator_base": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "blend_transition": 0.2,
-            "blend_via_shortest_path": true,
-            "transitions": [
-              {"celebrating": "query.is_celebrating"},
-              {
-                "hand_attack": "!query.is_item_equipped && variable.has_target && variable.attack_time >= 0.0"
-              },
-              {
-                "melee_attack": "query.is_item_equipped && variable.has_target && variable.attack_time >= 0.0"
-              }
-            ]
-          },
-          "hand_attack": {
-            "blend_transition": 0.2,
-            "blend_via_shortest_path": true,
-            "animations": ["vindicator_hand_attack"],
-            "transitions": [
-              {
-                "default": "query.is_item_equipped || !variable.has_target || variable.attack_time < 0.0 || query.is_celebrating"
-              }
-            ]
-          },
-          "melee_attack": {
-            "blend_transition": 0.2,
-            "blend_via_shortest_path": true,
-            "animations": ["vindicator_attack"],
-            "transitions": [
-              {
-                "default": "!query.is_item_equipped || !variable.has_target || variable.attack_time < 0.0 || query.is_celebrating"
-              }
-            ]
-          },
-          "celebrating": {
-            "animations": ["celebrating"],
-            "blend_transition": 0.2,
-            "blend_via_shortest_path": true,
-            "transitions": [{"default": "!query.is_celebrating"}]
-          }
-        }
-      },
-      "controller_riding": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"riding": "query.is_riding"}]},
-          "riding": {
-            "animations": ["riding.arms", "riding.legs"],
-            "transitions": [{"default": "!query.is_riding"}]
-          }
-        }
-      }
-    }
+    "enable_attachables": true
   },
   "wandering_trader": {
     "identifier": "minecraft:wandering_trader",
@@ -18075,224 +4704,9 @@
         ]
       }
     },
-    "scripts": {"scale": "0.9375"},
-    "animations": {
-      "general": {
-        "loop": true,
-        "bones": {
-          "arms": {"position": [0, -1, -1], "rotation": ["-42.97 - this", 0, 0]}
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "raise_arms": {
-        "loop": true,
-        "bones": {"arms": {"rotation": ["variable.raise_arms * -15.0", 0, 0]}}
-      },
-      "move": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": [
-              "(math.cos(query.anim_time * 38.17) * 40.0) - this",
-              "-this",
-              0
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              "(math.cos(query.anim_time * 38.17 + 180) * 40.0) - this",
-              "-this",
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "general": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["general", {"look_at_target": "!query.is_sleeping"}]
-          }
-        }
-      },
-      "raise_arms": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [{"raising": "variable.raise_arms > 0.0"}]
-          },
-          "raising": {
-            "animations": ["raise_arms"],
-            "transitions": [{"default": "variable.raise_arms == 0.0"}]
-          }
-        }
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {"animations": [{"move": "query.modified_move_speed"}]}
-        }
-      }
-    },
     "render_controllers": ["controller.render.wandering_trader"],
     "spawn_egg": {"texture": "spawn_egg_wandering_trader"}
   },
-  "witch": {
-    "identifier": "minecraft:witch",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "witch"},
-    "textures": {"default": "textures/entity/witch"},
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 1.5,
-        "visible_bounds_height": 3,
-        "visible_bounds_offset": [0, 1.5, 0],
-        "texturewidth": 64,
-        "textureheight": 128,
-        "bones": [
-          {
-            "name": "nose",
-            "parent": "head",
-            "cubes": [
-              {
-                "origin": [0, 25, -6.75],
-                "size": [1, 1, 1],
-                "uv": [0, 0],
-                "inflate": -0.25
-              }
-            ]
-          },
-          {
-            "name": "hat",
-            "parent": "head",
-            "pivot": [-5, 32.03125, -5],
-            "cubes": [
-              {"origin": [-5, 32.05, -5], "size": [10, 2, 10], "uv": [0, 64]}
-            ]
-          },
-          {
-            "name": "hat2",
-            "parent": "hat",
-            "pivot": [1.75, 32, 2],
-            "cubes": [
-              {"origin": [-3.25, 33.5, -3], "size": [7, 4, 7], "uv": [0, 76]}
-            ],
-            "rotation": [-3, 0, 1.5]
-          },
-          {
-            "name": "hat3",
-            "parent": "hat2",
-            "pivot": [1.75, 35, 2],
-            "cubes": [
-              {"origin": [-1.5, 36.5, -1], "size": [4, 4, 4], "uv": [0, 87]}
-            ],
-            "rotation": [-6, 0, 3]
-          },
-          {
-            "name": "hat4",
-            "parent": "hat3",
-            "pivot": [1.75, 38, 2],
-            "cubes": [
-              {
-                "origin": [0.25, 40, 1],
-                "size": [1, 2, 1],
-                "uv": [0, 95],
-                "inflate": 0.25
-              }
-            ],
-            "rotation": [-12, 0, 6]
-          }
-        ]
-      }
-    },
-    "scripts": {"scale": "0.9375"},
-    "animations": {
-      "villager_general": {
-        "loop": true,
-        "bones": {
-          "arms": {"position": [0, -1, -1], "rotation": ["-42.97 - this", 0, 0]}
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "anim_time_update": "query.modified_distance_moved",
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": [
-              "(math.cos(query.anim_time * 38.17) * 40.0) - this",
-              "-this",
-              0
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              "(math.cos(query.anim_time * 38.17 + 180) * 40.0) - this",
-              "-this",
-              0
-            ]
-          }
-        }
-      },
-      "general": {
-        "loop": true,
-        "bones": {
-          "nose": {
-            "rotation": [
-              "(variable.isholdingitem ? -25.7831 : (math.sin(query.life_time * 57.296) * 4.5)) - this",
-              0,
-              "(math.cos(query.life_time * 57.296) * 2.5) - this"
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "general": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["villager_general", "look_at_target", "general"]
-          }
-        }
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {"animations": [{"move": "query.modified_move_speed"}]}
-        }
-      }
-    },
-    "render_controllers": ["controller.render.witch"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 17}
-  },
   "wither": {
     "identifier": "minecraft:wither",
     "min_engine_version": "1.8.0",
@@ -18421,83 +4835,6 @@
         ]
       }
     },
-    "scripts": {
-      "pre_animation": [
-        "variable.base_scale = 2;",
-        "variable.swell_clamped = Math.clamp(query.swell_amount, 0.0, 1.0);",
-        "variable.wobble = 1.0 + Math.sin(query.swell_amount * 5730) * query.swell_amount * 0.01;",
-        "variable.swell_adjustment = Math.pow(variable.swell_clamped, 4);",
-        "variable.scale_xz = (1.0 + variable.swell_adjustment * 0.4) * variable.wobble;",
-        "variable.scale_y = (1.0 + variable.swell_adjustment * 0.1) / variable.wobble;",
-        "variable.body_base_rotation = Math.cos(query.life_time * 114.6);",
-        "variable.upper_body_rotation = (0.065 + 0.05 * variable.body_base_rotation) * 180 + query.target_x_rotation;",
-        "variable.is_invulnerable = query.invulnerable_ticks > 0.0;",
-        "variable.display_normal_skin = (query.invulnerable_ticks <= 0) || ((query.invulnerable_ticks <= 80) && (Math.mod(query.invulnerable_ticks / 5, 2) == 1));"
-      ],
-      "scalex": "variable.scale_xz * variable.base_scale",
-      "scaley": "variable.scale_y * variable.base_scale",
-      "scalez": "variable.scale_xz * variable.base_scale"
-    },
-    "animations": {
-      "scale": {
-        "loop": true,
-        "bones": {"upperbodypart1": {"rotation": ["-this", "-this", "-this"]}}
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "upperbodypart2": {
-            "rotation": [
-              "variable.upper_body_rotation - this",
-              "-this",
-              "-this"
-            ]
-          },
-          "upperbodypart3": {
-            "position": [-2, -16.9, -0.5],
-            "rotation": [
-              "((0.2 + 0.1 * variable.body_base_rotation) * 180) - this",
-              "-this",
-              "-this"
-            ]
-          }
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head1": {
-            "rotation": [
-              "query.head_x_rotation(0) - this",
-              "query.head_y_rotation(0) - this",
-              "-this"
-            ]
-          },
-          "head2": {
-            "rotation": [
-              "query.head_x_rotation(1) - this",
-              "query.head_y_rotation(1) - this",
-              "-this"
-            ]
-          },
-          "head3": {
-            "rotation": [
-              "query.head_x_rotation(2) - this",
-              "query.head_y_rotation(2) - this",
-              "-this"
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "move": {
-        "initial_state": "default",
-        "states": {
-          "default": {"animations": ["scale", "move", "look_at_target"]}
-        }
-      }
-    },
     "render_controllers": [
       "controller.render.wither_boss",
       "controller.render.wither_boss_armor_white",
@@ -18595,420 +4932,6 @@
         ]
       }
     },
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;"
-      ]
-    },
-    "animations": {
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-36, 0, 0]},
-          "rightarm": {"rotation": [-36, 0, 0]}
-        }
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
-          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
-        }
-      },
-      "holding": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "variable.is_holding_left ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "variable.is_holding_right ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "brandish_spear": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "this * -0.5 - 157.5 - 22.5 * variable.charge_amount",
-              "-this",
-              0
-            ]
-          }
-        }
-      },
-      "charging": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": ["22.5 * variable.charge_amount - this", "-this", 0]
-          }
-        }
-      },
-      "attack.rotations": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46 - this",
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.sin(1.0 - math.pow(1.0 - variable.attack_time, 3.0) * 180.0) * (variable.is_brandishing_spear ? -1.0 : 1.0 )",
-              "variable.is_brandishing_spear ? 0.0 : (math.sin(math.sqrt(variable.attack_time) * 360) * 11.46) * 2.0",
-              0
-            ]
-          }
-        }
-      },
-      "sneaking": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["0.5 - this", 0, 0]},
-          "head": {"position": [0, 1, 0]},
-          "leftarm": {"rotation": [72, 0, 0]},
-          "leftleg": {"position": [0, -3, 4]},
-          "rightarm": {"rotation": [72, 0, 0]},
-          "rightleg": {"position": [0, -3, 4]}
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "damage_nearby_mobs": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["-45.0-this", "-this", "-this"]},
-          "leftleg": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightarm": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-45.0-this", "-this", "-this"]}
-        }
-      },
-      "bow_and_arrow": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 - math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation + 28.65",
-              "-(math.cos(query.life_time * 103.2) * 2.865) - 2.865"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 + math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation - 5.73",
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "use_item_progress": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "variable.use_item_startup_progress * -60.0 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -22.5 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -5.625 + variable.use_item_interval_progress * 11.25"
-            ]
-          }
-        }
-      },
-      "wither_skeleton_attack": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-90 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) - (math.sin(query.life_time * 76.776372) * 2.865) - this",
-              "5.73 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 0.6) - this",
-              "math.cos(query.life_time * 103.13244) * -2.865 - 2.865 - this"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "-90 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) + (math.sin(query.life_time * 76.776372) * 2.865) - this",
-              "(math.sin(variable.attack_time * 180.0) * 57.3) * 0.6 - 5.73 - this",
-              "math.cos(query.life_time * 103.13244) * 2.865 + 2.865 - this"
-            ]
-          }
-        }
-      },
-      "swimming": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [
-              0,
-              "variable.swim_amount * -10.0 - this",
-              "variable.swim_amount * 9.0 - this"
-            ],
-            "rotation": [
-              "variable.swim_amount * (90.0 + query.target_x_rotation)",
-              0,
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) - (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "leftleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0 + 180.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) + (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, -14.325, variable.swim_amount) + (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "rightleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      },
-      "riding": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"riding": "query.is_riding"}]},
-          "riding": {
-            "animations": ["riding.arms", "riding.legs"],
-            "transitions": [{"default": "!query.is_riding"}]
-          }
-        }
-      },
-      "holding": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["holding"]}}
-      },
-      "brandish_spear": {
-        "initial_state": "default",
-        "states": {
-          "brandish_spear": {
-            "animations": ["brandish_spear"],
-            "transitions": [{"default": "!variable.is_brandishing_spear"}]
-          },
-          "default": {
-            "transitions": [{"brandish_spear": "variable.is_brandishing_spear"}]
-          }
-        }
-      },
-      "charging": {
-        "initial_state": "default",
-        "states": {
-          "charging": {
-            "animations": ["charging"],
-            "transitions": [{"default": "!query.is_charging"}]
-          },
-          "default": {"transitions": [{"charging": "query.is_charging"}]}
-        }
-      },
-      "attack": {
-        "initial_state": "default",
-        "states": {
-          "attacking": {
-            "animations": ["attack.rotations"],
-            "transitions": [{"default": "variable.attack_time < 0.0"}]
-          },
-          "default": {
-            "transitions": [{"attacking": "variable.attack_time >= 0.0"}]
-          }
-        }
-      },
-      "sneaking": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"sneaking": "query.is_sneaking"}]},
-          "sneaking": {
-            "animations": ["sneaking"],
-            "transitions": [{"default": "!query.is_sneaking"}]
-          }
-        }
-      },
-      "damage_nearby_mobs": {
-        "initial_state": "default",
-        "states": {
-          "damage_nearby_mobs": {
-            "animations": ["damage_nearby_mobs"],
-            "transitions": [{"default": "!variable.damage_nearby_mobs"}]
-          },
-          "default": {
-            "transitions": [
-              {"damage_nearby_mobs": "variable.damage_nearby_mobs"}
-            ]
-          }
-        }
-      },
-      "bow_and_arrow": {
-        "initial_state": "default",
-        "states": {
-          "bow_and_arrow": {
-            "animations": ["bow_and_arrow"],
-            "transitions": [{"default": "!query.has_target"}]
-          },
-          "default": {"transitions": [{"bow_and_arrow": "query.has_target"}]}
-        }
-      },
-      "use_item_progress": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [
-              {
-                "use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 )"
-              }
-            ]
-          },
-          "use_item_progress": {
-            "animations": ["use_item_progress"],
-            "transitions": [
-              {
-                "default": "( variable.use_item_interval_progress <= 0.0 ) && ( variable.use_item_startup_progress <= 0.0 )"
-              }
-            ]
-          }
-        }
-      },
-      "wither_skeleton_attack": {
-        "initial_state": "default",
-        "states": {
-          "chase_target": {
-            "animations": ["wither_skeleton_attack"],
-            "transitions": [{"default": "!variable.has_target"}]
-          },
-          "default": {"transitions": [{"chase_target": "variable.has_target"}]}
-        }
-      },
-      "swimming": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [{"is_swimming": "variable.swim_amount > 0.0"}]
-          },
-          "is_swimming": {
-            "animations": ["swimming"],
-            "transitions": [{"default": "variable.swim_amount <= 0.0"}]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.wither_skeleton"],
     "enable_attachables": true,
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 29}
@@ -19031,320 +4954,8 @@
         "textureheight": 64
       }
     },
-    "animations": {
-      "move": {
-        "loop": true,
-        "bones": {"head": {"rotation": [0, "-query.target_y_rotation", 0]}}
-      }
-    },
-    "scripts": {"animate": ["move"]},
     "render_controllers": ["controller.render.wither_skull"]
   },
-  "wolf": {
-    "identifier": "minecraft:wolf",
-    "materials": {"default": "wolf"},
-    "textures": {
-      "default": "textures/entity/wolf/wolf",
-      "angry": "textures/entity/wolf/wolf_angry",
-      "tame": "textures/entity/wolf/wolf_tame"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 1.5,
-        "visible_bounds_height": 1,
-        "visible_bounds_offset": [0, 0.5, 0],
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {
-            "name": "head",
-            "pivot": [-1, 10.5, -7],
-            "locators": {"lead": [-1, 10.5, -7]},
-            "cubes": [
-              {"origin": [-4, 7.5, -9], "size": [6, 6, 4], "uv": [0, 0]},
-              {"origin": [-4, 13.5, -7], "size": [2, 2, 1], "uv": [16, 14]},
-              {"origin": [0, 13.5, -7], "size": [2, 2, 1], "uv": [16, 14]},
-              {
-                "origin": [-2.5, 7.515625, -12],
-                "size": [3, 3, 4],
-                "uv": [0, 10]
-              }
-            ]
-          },
-          {
-            "name": "body",
-            "pivot": [0, 10, 2],
-            "cubes": [
-              {"origin": [-4, 3, -1], "size": [6, 9, 6], "uv": [18, 14]}
-            ]
-          },
-          {
-            "name": "upperBody",
-            "pivot": [-1, 10, 2],
-            "cubes": [{"origin": [-5, 7, -1], "size": [8, 6, 7], "uv": [21, 0]}]
-          },
-          {
-            "name": "leg0",
-            "pivot": [-2.5, 8, 7],
-            "cubes": [
-              {"origin": [-3.5, 0, 6], "size": [2, 8, 2], "uv": [0, 18]}
-            ]
-          },
-          {
-            "name": "leg1",
-            "pivot": [0.5, 8, 7],
-            "cubes": [
-              {"origin": [-0.5, 0, 6], "size": [2, 8, 2], "uv": [0, 18]}
-            ]
-          },
-          {
-            "name": "leg2",
-            "pivot": [-2.5, 8, -4],
-            "cubes": [
-              {"origin": [-3.5, 0, -5], "size": [2, 8, 2], "uv": [0, 18]}
-            ]
-          },
-          {
-            "name": "leg3",
-            "pivot": [0.5, 8, -4],
-            "cubes": [
-              {"origin": [-0.5, 0, -5], "size": [2, 8, 2], "uv": [0, 18]}
-            ]
-          },
-          {
-            "name": "tail",
-            "pivot": [-1, 12, 8],
-            "cubes": [{"origin": [-2, 4, 7], "size": [2, 8, 2], "uv": [9, 18]}]
-          }
-        ]
-      }
-    },
-    "scripts": {
-      "pre_animation": [
-        "variable.body_shake_angle = 0.05 * query.frame_alpha + query.shake_angle;",
-        "variable.body_roll_progress = Math.clamp((variable.body_shake_angle - 0.16) / 1.8, 0, 1);",
-        "variable.body_rot_z = Math.sin(variable.body_roll_progress * 180) * Math.sin(variable.body_roll_progress * 1980) * 27;",
-        "variable.upper_body_roll_progress = Math.clamp((variable.body_shake_angle - 0.08) / 1.8, 0, 1);",
-        "variable.upper_body_rot_z = (Math.sin(variable.upper_body_roll_progress * 180) * Math.sin(variable.upper_body_roll_progress * 1980) * 27) - variable.body_rot_z;",
-        "variable.tail_roll_progress = Math.clamp((variable.body_shake_angle - 0.2) / 1.8, 0, 1);",
-        "variable.tail_rot_z = (Math.sin(variable.tail_roll_progress * 180) * Math.sin(variable.tail_roll_progress * 1980) * 27) - variable.body_rot_z;",
-        "variable.head_roll_progress = Math.clamp(variable.body_shake_angle / 1.8, 0, 1);",
-        "variable.head_rot_z = (Math.sin(variable.head_roll_progress * 180) * Math.sin(variable.head_roll_progress * 1980) * 27) - variable.body_rot_z;"
-      ]
-    },
-    "animations": {
-      "wolf_setup": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": ["-this", "-14 - this", "2.0 - this"],
-            "rotation": ["90 - this", 0, 0]
-          },
-          "leg0": {"position": ["-2.5 - this", "-16 - this", "7 - this"]},
-          "leg1": {"position": ["0.5 - this", "-16 - this", "7 - this"]},
-          "leg2": {"position": ["-2.5 - this", "-16 - this", "-4 - this"]},
-          "leg3": {"position": ["0.5 - this", "-16 - this", "-4 - this"]},
-          "tail": {"position": ["-1.0 - this", "-12 - this", "8.0 - this"]},
-          "upperbody": {
-            "position": ["-1.0 - this", "-14 - this", "-3.0 - this"],
-            "rotation": ["90 - this", 0, 0]
-          }
-        }
-      },
-      "wolf_baby_scaling": {
-        "loop": true,
-        "bones": {"head": {"position": [0, 1, -2], "scale": 1.6}}
-      },
-      "wolf_look_at": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation - this",
-              "query.target_y_rotation - this",
-              0
-            ]
-          }
-        }
-      },
-      "wolf_head_rot_z": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              0,
-              0,
-              "(query.is_interested ? (query.head_roll_angle * 57.3) : 0) + (query.is_shaking_wetness ? variable.head_rot_z : 0) - this"
-            ]
-          }
-        }
-      },
-      "wolf_tail_default": {
-        "loop": true,
-        "bones": {
-          "tail": {
-            "rotation": [
-              "query.tail_angle * 57.3 - this",
-              0,
-              "variable.tail_rot_z - this"
-            ]
-          }
-        }
-      },
-      "wolf_angry": {
-        "loop": true,
-        "bones": {
-          "tail": {
-            "rotation": [
-              0,
-              "query.is_angry ? -this : (math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed * 80.22 - this)",
-              0
-            ]
-          }
-        }
-      },
-      "wolf_sitting": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": ["-this", "-18 - this", "-this"],
-            "rotation": ["45.0 - this", 0, 0]
-          },
-          "leg0": {
-            "position": ["-2.5 - this", "-22 - this", "2 - this"],
-            "rotation": ["270 - this", 0, 0]
-          },
-          "leg1": {
-            "position": ["0.5 - this", "-22 - this", "2 - this"],
-            "rotation": ["270 - this", 0, 0]
-          },
-          "leg2": {
-            "position": ["-2.49 - this", "-17 - this", "-4 - this"],
-            "rotation": ["333 - this", 0, 0]
-          },
-          "leg3": {
-            "position": ["0.51 - this", "-17 - this", "-4 - this"],
-            "rotation": ["333 - this", 0, 0]
-          },
-          "tail": {"position": ["-1.0 - this", "-19 - this", "6.0 - this"]},
-          "upperbody": {
-            "position": ["-1.0 - this", "-16 - this", "-3.0 - this"],
-            "rotation": ["72 - this", "-this", 0]
-          }
-        }
-      },
-      "wolf_shaking": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": [0, 0, "variable.body_rot_z - this"]},
-          "upperbody": {"rotation": [0, 0, "variable.upper_body_rot_z - this"]}
-        }
-      },
-      "wolf_leg_default": {
-        "loop": true,
-        "bones": {
-          "leg0": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17) * 80.22 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "leg1": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 180) * 80.22 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "leg2": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17 + 180) * 80.22 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          },
-          "leg3": {
-            "rotation": [
-              "math.cos(query.modified_distance_moved * 38.17) * 80.22 * query.modified_move_speed - this",
-              0,
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "wolf_setup": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["wolf_setup"]}}
-      },
-      "wolf_look_at": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["wolf_look_at"]}}
-      },
-      "wolf_baby_scaling": {
-        "initial_state": "default",
-        "states": {
-          "baby": {
-            "animations": ["wolf_baby_scaling"],
-            "transitions": [{"default": "!query.is_baby"}]
-          },
-          "default": {"transitions": [{"baby": "query.is_baby"}]}
-        }
-      },
-      "wolf_head_rot_z": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [
-              {"rot": "query.is_interested || query.is_shaking_wetness"}
-            ]
-          },
-          "rot": {
-            "animations": ["wolf_head_rot_z"],
-            "transitions": [
-              {"default": "!query.is_interested && !query.is_shaking_wetness"}
-            ]
-          }
-        }
-      },
-      "wolf_tail_default": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["wolf_tail_default"]}}
-      },
-      "wolf_angry": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["wolf_angry"]}}
-      },
-      "wolf_sitting": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["wolf_leg_default"],
-            "transitions": [{"sitting": "query.is_sitting"}]
-          },
-          "sitting": {
-            "animations": ["wolf_sitting"],
-            "transitions": [{"default": "!query.is_sitting"}]
-          }
-        }
-      },
-      "wolf_shaking": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"shaking": "query.is_shaking_wetness"}]},
-          "shaking": {
-            "animations": ["wolf_shaking"],
-            "transitions": [{"default": "!query.is_shaking_wetness"}]
-          }
-        }
-      }
-    },
-    "render_controllers": ["controller.render.wolf"],
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 4}
-  },
   "zoglin": {
     "identifier": "minecraft:zoglin",
     "materials": {"default": "zoglin"},
@@ -19433,924 +5044,8 @@
       }
     },
     "spawn_egg": {"base_color": "#c66e55", "overlay_color": "#e6e6e6"},
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos_right_side = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;",
-        "variable.tcos_left_side = -variable.tcos_right_side;",
-        "variable.attack_head_rot =  Math.sin(variable.attack_time * 180.0) * -37.3;"
-      ],
-      "animate": [
-        "walk",
-        "look_at_target",
-        {"attack": "variable.has_target && variable.attack_time >= 0.0"},
-        {"hoglin_baby_scaling": "query.is_baby"}
-      ]
-    },
-    "animations": {
-      "walk": {
-        "loop": true,
-        "bones": {
-          "left_ear": {"rotation": [0, 0, "variable.tcos_left_side * 0.5"]},
-          "right_ear": {"rotation": [0, 0, "variable.tcos_right_side * 0.5"]},
-          "leg_back_right": {"rotation": ["variable.tcos_right_side", 0, 0]},
-          "leg_back_left": {"rotation": ["variable.tcos_left_side", 0, 0]},
-          "leg_front_right": {"rotation": ["-variable.tcos_right_side", 0, 0]},
-          "leg_front_left": {"rotation": ["-variable.tcos_left_side", 0, 0]}
-        }
-      },
-      "look_at_target": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [0, "query.target_y_rotation - this", 0]
-          }
-        }
-      },
-      "attack": {
-        "loop": true,
-        "bones": {"head": {"rotation": ["variable.attack_head_rot", 0, 0]}}
-      },
-      "hoglin_baby_scaling": {
-        "loop": true,
-        "bones": {"head": {"position": [0, 10, 4], "scale": 1.4}}
-      }
-    },
     "render_controllers": ["controller.render.zoglin"]
   },
-  "zombie": {
-    "identifier": "minecraft:zombie",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "zombie"},
-    "textures": {"default": "textures/entity/zombie/zombie"},
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 2,
-        "visible_bounds_height": 2,
-        "visible_bounds_offset": [0, 1, 0],
-        "texturewidth": 64,
-        "textureheight": 32,
-        "bones": [
-          {
-            "name": "body",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-4, 12, -2], "size": [8, 12, 4], "uv": [16, 16]}
-            ],
-            "parent": "waist"
-          },
-          {"name": "waist", "neverRender": true, "pivot": [0, 12, 0]},
-          {
-            "name": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-4, 24, -4], "size": [8, 8, 8], "uv": [0, 0]}
-            ],
-            "parent": "body"
-          },
-          {
-            "name": "hat",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {
-                "origin": [-4, 24, -4],
-                "size": [8, 8, 8],
-                "uv": [32, 0],
-                "inflate": 0.5
-              }
-            ],
-            "neverRender": true,
-            "parent": "head"
-          },
-          {
-            "name": "rightArm",
-            "pivot": [-5, 22, 0],
-            "cubes": [
-              {"origin": [-8, 12, -2], "size": [4, 12, 4], "uv": [40, 16]}
-            ],
-            "parent": "body"
-          },
-          {
-            "name": "rightItem",
-            "pivot": [-6, 15, 1],
-            "neverRender": true,
-            "parent": "rightArm"
-          },
-          {
-            "name": "leftArm",
-            "pivot": [5, 22, 0],
-            "cubes": [
-              {"origin": [4, 12, -2], "size": [4, 12, 4], "uv": [40, 16]}
-            ],
-            "mirror": true,
-            "parent": "body"
-          },
-          {
-            "name": "rightLeg",
-            "pivot": [-1.9, 12, 0],
-            "cubes": [
-              {"origin": [-3.9, 0, -2], "size": [4, 12, 4], "uv": [0, 16]}
-            ],
-            "parent": "body"
-          },
-          {
-            "name": "leftLeg",
-            "pivot": [1.9, 12, 0],
-            "cubes": [
-              {"origin": [-0.1, 0, -2], "size": [4, 12, 4], "uv": [0, 16]}
-            ],
-            "mirror": true,
-            "parent": "body"
-          }
-        ]
-      }
-    },
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 12},
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;"
-      ]
-    },
-    "animations": {
-      "humanoid_big_head": {"loop": true, "bones": {"head": {"scale": 1.4}}},
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-36, 0, 0]},
-          "rightarm": {"rotation": [-36, 0, 0]}
-        }
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
-          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
-        }
-      },
-      "holding": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "variable.is_holding_left ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "variable.is_holding_right ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "brandish_spear": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "this * -0.5 - 157.5 - 22.5 * variable.charge_amount",
-              "-this",
-              0
-            ]
-          }
-        }
-      },
-      "charging": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": ["22.5 * variable.charge_amount - this", "-this", 0]
-          }
-        }
-      },
-      "attack.rotations": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46 - this",
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.sin(1.0 - math.pow(1.0 - variable.attack_time, 3.0) * 180.0) * (variable.is_brandishing_spear ? -1.0 : 1.0 )",
-              "variable.is_brandishing_spear ? 0.0 : (math.sin(math.sqrt(variable.attack_time) * 360) * 11.46) * 2.0",
-              0
-            ]
-          }
-        }
-      },
-      "sneaking": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["0.5 - this", 0, 0]},
-          "head": {"position": [0, 1, 0]},
-          "leftarm": {"rotation": [72, 0, 0]},
-          "leftleg": {"position": [0, -3, 4]},
-          "rightarm": {"rotation": [72, 0, 0]},
-          "rightleg": {"position": [0, -3, 4]}
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "damage_nearby_mobs": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["-45.0-this", "-this", "-this"]},
-          "leftleg": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightarm": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-45.0-this", "-this", "-this"]}
-        }
-      },
-      "bow_and_arrow": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 - math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation + 28.65",
-              "-(math.cos(query.life_time * 103.2) * 2.865) - 2.865"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 + math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation - 5.73",
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "use_item_progress": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "variable.use_item_startup_progress * -60.0 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -22.5 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -5.625 + variable.use_item_interval_progress * 11.25"
-            ]
-          }
-        }
-      },
-      "zombie_attack_bare_hand": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-90.0 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) - (math.sin(query.life_time * 76.776372) * 2.865) - this",
-              "5.73 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 0.6) - this",
-              "math.cos(query.life_time * 103.13244) * -2.865 - 2.865 - this"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "90.0 * (variable.is_brandishing_spear - 1.0) - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) + (math.sin(query.life_time * 76.776372) * 2.865) - this",
-              "(math.sin(variable.attack_time * 180.0) * 57.3) * 0.6 - 5.73 - this",
-              "math.cos(query.life_time * 103.13244) * 2.865 + 2.865 - this"
-            ]
-          }
-        }
-      },
-      "swimming": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [
-              0,
-              "variable.swim_amount * -10.0 - this",
-              "variable.swim_amount * 9.0 - this"
-            ],
-            "rotation": [
-              "variable.swim_amount * (90.0 + query.target_x_rotation)",
-              0,
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) - (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "leftleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0 + 180.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) + (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, -14.325, variable.swim_amount) + (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "rightleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "humanoid_baby_big_head": {
-        "initial_state": "default",
-        "states": {
-          "baby": {
-            "animations": ["humanoid_big_head"],
-            "transitions": [{"default": "!query.is_baby"}]
-          },
-          "default": {"transitions": [{"baby": "query.is_baby"}]}
-        }
-      },
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      },
-      "riding": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"riding": "query.is_riding"}]},
-          "riding": {
-            "animations": ["riding.arms", "riding.legs"],
-            "transitions": [{"default": "!query.is_riding"}]
-          }
-        }
-      },
-      "holding": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["holding"]}}
-      },
-      "brandish_spear": {
-        "initial_state": "default",
-        "states": {
-          "brandish_spear": {
-            "animations": ["brandish_spear"],
-            "transitions": [{"default": "!variable.is_brandishing_spear"}]
-          },
-          "default": {
-            "transitions": [{"brandish_spear": "variable.is_brandishing_spear"}]
-          }
-        }
-      },
-      "charging": {
-        "initial_state": "default",
-        "states": {
-          "charging": {
-            "animations": ["charging"],
-            "transitions": [{"default": "!query.is_charging"}]
-          },
-          "default": {"transitions": [{"charging": "query.is_charging"}]}
-        }
-      },
-      "attack": {
-        "initial_state": "default",
-        "states": {
-          "attacking": {
-            "animations": ["attack.rotations"],
-            "transitions": [{"default": "variable.attack_time < 0.0"}]
-          },
-          "default": {
-            "transitions": [{"attacking": "variable.attack_time >= 0.0"}]
-          }
-        }
-      },
-      "sneaking": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"sneaking": "query.is_sneaking"}]},
-          "sneaking": {
-            "animations": ["sneaking"],
-            "transitions": [{"default": "!query.is_sneaking"}]
-          }
-        }
-      },
-      "bob": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["bob"]}}
-      },
-      "damage_nearby_mobs": {
-        "initial_state": "default",
-        "states": {
-          "damage_nearby_mobs": {
-            "animations": ["damage_nearby_mobs"],
-            "transitions": [{"default": "!variable.damage_nearby_mobs"}]
-          },
-          "default": {
-            "transitions": [
-              {"damage_nearby_mobs": "variable.damage_nearby_mobs"}
-            ]
-          }
-        }
-      },
-      "bow_and_arrow": {
-        "initial_state": "default",
-        "states": {
-          "bow_and_arrow": {
-            "animations": ["bow_and_arrow"],
-            "transitions": [{"default": "!query.has_target"}]
-          },
-          "default": {"transitions": [{"bow_and_arrow": "query.has_target"}]}
-        }
-      },
-      "use_item_progress": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [
-              {
-                "use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 )"
-              }
-            ]
-          },
-          "use_item_progress": {
-            "animations": ["use_item_progress"],
-            "transitions": [
-              {
-                "default": "( variable.use_item_interval_progress <= 0.0 ) && ( variable.use_item_startup_progress <= 0.0 )"
-              }
-            ]
-          }
-        }
-      },
-      "zombie_attack_bare_hand": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [{"is_bare_hand": "variable.is_holding_left != 1.0"}]
-          },
-          "is_bare_hand": {
-            "animations": ["zombie_attack_bare_hand"],
-            "transitions": [{"default": "variable.is_holding_left == 1.0"}]
-          }
-        }
-      },
-      "swimming": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [{"is_swimming": "variable.swim_amount > 0.0"}]
-          },
-          "is_swimming": {
-            "animations": ["swimming"],
-            "transitions": [{"default": "variable.swim_amount <= 0.0"}]
-          }
-        }
-      }
-    },
-    "render_controllers": ["controller.render.zombie"],
-    "enable_attachables": true
-  },
-  "zombie_horse": {
-    "identifier": "minecraft:zombie_horse",
-    "textures": {
-      "base_brown": "textures/entity/horse/horse_brown",
-      "base_white": "textures/entity/horse/horse_white",
-      "base_chestnut": "textures/entity/horse/horse_chestnut",
-      "base_creamy": "textures/entity/horse/horse_creamy",
-      "base_black": "textures/entity/horse/horse_black",
-      "base_gray": "textures/entity/horse/horse_gray",
-      "base_darkbrown": "textures/entity/horse/horse_darkbrown",
-      "markings_none": "textures/entity/horse/horse_markings_none",
-      "markings_white": "textures/entity/horse/horse_markings_white",
-      "markings_whitefield": "textures/entity/horse/horse_markings_whitefield",
-      "markings_whitedots": "textures/entity/horse/horse_markings_whitedots",
-      "markings_blackdots": "textures/entity/horse/horse_markings_blackdots",
-      "mule": "textures/entity/horse/mule",
-      "donkey": "textures/entity/horse/donkey",
-      "skeleton": "textures/entity/horse/horse_skeleton",
-      "zombie": "textures/entity/horse/horse_zombie",
-      "armor_none": "textures/entity/horse/armor/horse_armor_none",
-      "armor_leather": "textures/entity/horse/armor/horse_armor_leather",
-      "armor_iron": "textures/entity/horse/armor/horse_armor_iron",
-      "armor_gold": "textures/entity/horse/armor/horse_armor_gold",
-      "armor_diamond": "textures/entity/horse/armor/horse_armor_diamond"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 2,
-        "visible_bounds_height": 3,
-        "visible_bounds_offset": [0, 1, 0],
-        "texturewidth": 128,
-        "textureheight": 128,
-        "bones": [
-          {
-            "name": "Body",
-            "pivot": [0, 13, 9],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5, 11, -10], "size": [10, 10, 24], "uv": [0, 34]}
-            ]
-          },
-          {
-            "name": "TailA",
-            "pivot": [0, 21, 14],
-            "rotation": [-65, 0, 0],
-            "cubes": [
-              {"origin": [-1, 20, 14], "size": [2, 2, 3], "uv": [44, 0]}
-            ]
-          },
-          {
-            "name": "TailB",
-            "pivot": [0, 21, 14],
-            "rotation": [-65, 0, 0],
-            "cubes": [
-              {"origin": [-1.5, 19, 17], "size": [3, 4, 7], "uv": [38, 7]}
-            ]
-          },
-          {
-            "name": "TailC",
-            "pivot": [0, 21, 14],
-            "rotation": [-80.34, 0, 0],
-            "cubes": [
-              {"origin": [-1.5, 21.5, 23], "size": [3, 4, 7], "uv": [24, 3]}
-            ]
-          },
-          {
-            "name": "Leg1A",
-            "pivot": [4, 15, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.5, 8, 8.5], "size": [4, 9, 5], "uv": [78, 29]}
-            ]
-          },
-          {
-            "name": "Leg1B",
-            "pivot": [4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2, 3, 9.5], "size": [3, 5, 3], "uv": [78, 43]}
-            ]
-          },
-          {
-            "name": "Leg1C",
-            "pivot": [4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.5, -0.1, 9], "size": [4, 3, 4], "uv": [78, 51]}
-            ]
-          },
-          {
-            "name": "Leg2A",
-            "pivot": [-4, 15, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, 8, 8.5], "size": [4, 9, 5], "uv": [96, 29]}
-            ]
-          },
-          {
-            "name": "Leg2B",
-            "pivot": [-4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5, 3, 9.5], "size": [3, 5, 3], "uv": [96, 43]}
-            ]
-          },
-          {
-            "name": "Leg2C",
-            "pivot": [-4, 8, 11],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, -0.1, 9], "size": [4, 3, 4], "uv": [96, 51]}
-            ]
-          },
-          {
-            "name": "Leg3A",
-            "pivot": [4, 15, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2.1, 8, -10.1], "size": [3, 8, 4], "uv": [44, 29]}
-            ]
-          },
-          {
-            "name": "Leg3B",
-            "pivot": [4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2.1, 3, -9.6], "size": [3, 5, 3], "uv": [44, 41]}
-            ]
-          },
-          {
-            "name": "Leg3C",
-            "pivot": [4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [1.6, -0.1, -10.1], "size": [4, 3, 4], "uv": [44, 51]}
-            ]
-          },
-          {
-            "name": "Leg4A",
-            "pivot": [-4, 15, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.1, 8, -10.1], "size": [3, 8, 4], "uv": [60, 29]}
-            ]
-          },
-          {
-            "name": "Leg4B",
-            "pivot": [-4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.1, 3, -9.6], "size": [3, 5, 3], "uv": [60, 41]}
-            ]
-          },
-          {
-            "name": "Leg4C",
-            "pivot": [-4, 8, -8],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.6, -0.1, -10.1], "size": [4, 3, 4], "uv": [60, 51]}
-            ]
-          },
-          {
-            "name": "Head",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.5, 25, -11.5], "size": [5, 5, 7], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "UMouth",
-            "pivot": [0, 20.05, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2, 27.05, -17], "size": [4, 3, 6], "uv": [24, 18]}
-            ]
-          },
-          {
-            "name": "LMouth",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2, 25, -16.5], "size": [4, 2, 5], "uv": [24, 27]}
-            ]
-          },
-          {
-            "name": "Ear1",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [0.45, 29, -6], "size": [2, 3, 1], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "Ear2",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.45, 29, -6], "size": [2, 3, 1], "uv": [0, 0]}
-            ]
-          },
-          {
-            "name": "MuleEarL",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 15],
-            "cubes": [
-              {"origin": [-2, 29, -6], "size": [2, 7, 1], "uv": [0, 12]}
-            ]
-          },
-          {
-            "name": "MuleEarR",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, -15],
-            "cubes": [{"origin": [0, 29, -6], "size": [2, 7, 1], "uv": [0, 12]}]
-          },
-          {
-            "name": "Neck",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.05, 15.8, -12], "size": [4, 14, 8], "uv": [0, 12]}
-            ]
-          },
-          {
-            "name": "Bag1",
-            "pivot": [-7.5, 21, 10],
-            "rotation": [0, 90, 0],
-            "cubes": [
-              {"origin": [-10.5, 13, 10], "size": [8, 8, 3], "uv": [0, 34]}
-            ]
-          },
-          {
-            "name": "Bag2",
-            "pivot": [4.5, 21, 10],
-            "rotation": [0, 90, 0],
-            "cubes": [
-              {"origin": [1.5, 13, 10], "size": [8, 8, 3], "uv": [0, 47]}
-            ]
-          },
-          {
-            "name": "Saddle",
-            "pivot": [0, 22, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5, 21, -1], "size": [10, 1, 8], "uv": [80, 0]}
-            ]
-          },
-          {
-            "name": "SaddleB",
-            "pivot": [0, 22, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-1.5, 22, -1], "size": [3, 1, 2], "uv": [106, 9]}
-            ]
-          },
-          {
-            "name": "SaddleC",
-            "pivot": [0, 22, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [{"origin": [-4, 22, 5], "size": [8, 1, 2], "uv": [80, 9]}]
-          },
-          {
-            "name": "SaddleL2",
-            "pivot": [5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [4.5, 13, 1], "size": [1, 2, 2], "uv": [74, 0]}
-            ]
-          },
-          {
-            "name": "SaddleL",
-            "pivot": [5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [4.5, 15, 1.5], "size": [1, 6, 1], "uv": [70, 0]}
-            ]
-          },
-          {
-            "name": "SaddleR2",
-            "pivot": [-5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, 13, 1], "size": [1, 2, 2], "uv": [74, 4]}
-            ]
-          },
-          {
-            "name": "SaddleR",
-            "pivot": [-5, 21, 2],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-5.5, 15, 1.5], "size": [1, 6, 1], "uv": [80, 0]}
-            ]
-          },
-          {
-            "name": "SaddleMouthL",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [1.5, 26, -14], "size": [1, 2, 2], "uv": [74, 13]}
-            ]
-          },
-          {
-            "name": "SaddleMouthR",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-2.5, 26, -14], "size": [1, 2, 2], "uv": [74, 13]}
-            ]
-          },
-          {
-            "name": "SaddleMouthLine",
-            "pivot": [0, 20, -10],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [2.6, 23, -16], "size": [0, 3, 16], "uv": [44, 10]}
-            ]
-          },
-          {
-            "name": "SaddleMouthLineR",
-            "pivot": [0, 20, -10],
-            "rotation": [0, 0, 0],
-            "cubes": [
-              {"origin": [-2.6, 23, -16], "size": [0, 3, 16], "uv": [44, 5]}
-            ]
-          },
-          {
-            "name": "Mane",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {"origin": [-1, 15.5, -5], "size": [2, 16, 4], "uv": [58, 0]}
-            ]
-          },
-          {
-            "name": "HeadSaddle",
-            "pivot": [0, 20, -10],
-            "rotation": [30, 0, 0],
-            "cubes": [
-              {
-                "origin": [-2.5, 25.1, -17],
-                "size": [5, 5, 12],
-                "uv": [80, 12],
-                "inflate": 0.05
-              }
-            ]
-          }
-        ]
-      }
-    },
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 33}
-  },
   "zombified_piglin": {
     "identifier": "minecraft:zombie_pigman",
     "min_engine_version": "1.8.0",
@@ -20473,1057 +5168,7 @@
       }
     },
     "spawn_egg": {"texture": "spawn_egg", "texture_index": 13},
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;"
-      ]
-    },
-    "animations": {
-      "humanoid_big_head": {"loop": true, "bones": {"head": {"scale": 1.4}}},
-      "humanoid_base_pose": {
-        "loop": true,
-        "bones": {"waist": {"rotation": [0, 0, 0]}}
-      },
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-36, 0, 0]},
-          "rightarm": {"rotation": [-36, 0, 0]}
-        }
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
-          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
-        }
-      },
-      "holding": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "variable.is_holding_left ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "variable.is_holding_right ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "brandish_spear": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "this * -0.5 - 157.5 - 22.5 * variable.charge_amount",
-              "-this",
-              0
-            ]
-          }
-        }
-      },
-      "charging": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": ["22.5 * variable.charge_amount - this", "-this", 0]
-          }
-        }
-      },
-      "attack.rotations": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46 - this",
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.sin(1.0 - math.pow(1.0 - variable.attack_time, 3.0) * 180.0) * (variable.is_brandishing_spear ? -1.0 : 1.0 )",
-              "variable.is_brandishing_spear ? 0.0 : (math.sin(math.sqrt(variable.attack_time) * 360) * 11.46) * 2.0",
-              0
-            ]
-          }
-        }
-      },
-      "sneaking": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["0.5 - this", 0, 0]},
-          "head": {"position": [0, 1, 0]},
-          "leftarm": {"rotation": [72, 0, 0]},
-          "leftleg": {"position": [0, -3, 4]},
-          "rightarm": {"rotation": [72, 0, 0]},
-          "rightleg": {"position": [0, -3, 4]}
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "damage_nearby_mobs": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["-45.0-this", "-this", "-this"]},
-          "leftleg": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightarm": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-45.0-this", "-this", "-this"]}
-        }
-      },
-      "bow_and_arrow": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 - math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation + 28.65",
-              "-(math.cos(query.life_time * 103.2) * 2.865) - 2.865"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 + math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation - 5.73",
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "swimming": {
-        "animation_length": 1.3,
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": {
-              "0.7": {
-                "post": [
-                  "math.lerp(this, 11.25 * math.mod(query.modified_distance_moved, 26.0), variable.leftarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.leftarmswim_amount)",
-                  "math.lerp(this, 72.77 + 13.4 * math.mod(query.modified_distance_moved, 26.0), variable.leftarmswim_amount)"
-                ],
-                "pre": [
-                  "math.lerp(this, 0.0, variable.leftarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.leftarmswim_amount)",
-                  "math.lerp(this, 180.0 - 0.01877 * (-65.0 * math.mod(query.modified_distance_moved, 26.0) + math.mod(query.modified_distance_moved, 26.0) * math.mod(query.modified_distance_moved, 26.0)), variable.leftarmswim_amount)"
-                ]
-              },
-              "1.1": [
-                "math.lerp(this, 11.25 * math.mod(query.modified_distance_moved, 26.0), variable.leftarmswim_amount)",
-                "math.lerp(this, 180.0, variable.leftarmswim_amount)",
-                "math.lerp(this, 72.77 + 13.4 * math.mod(query.modified_distance_moved, 26.0), variable.leftarmswim_amount)"
-              ],
-              "1.3": {
-                "post": [
-                  "math.lerp(this, 90.0 - (22.5 * math.mod(query.modified_distance_moved, 26.0)), variable.leftarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.leftarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.leftarmswim_amount)"
-                ],
-                "pre": [
-                  "math.lerp(this, 11.25 * math.mod(query.modified_distance_moved, 26.0), variable.leftarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.leftarmswim_amount)",
-                  "math.lerp(this, 72.77 + 13.4 * math.mod(query.modified_distance_moved, 26.0), variable.leftarmswim_amount)"
-                ]
-              }
-            }
-          },
-          "leftleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.modified_distance_moved * 19.5 + 180.0) * 17.2, variable.leftarmswim_amount) - this",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": {
-              "0.7": {
-                "post": [
-                  "math.lerp(this, 11.25 * math.mod(query.modified_distance_moved, 26.0), variable.rightarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.rightarmswim_amount)",
-                  "math.lerp(this, 72.77 + 13.4 * math.mod(query.modified_distance_moved, 26.0), variable.rightarmswim_amount)"
-                ],
-                "pre": [
-                  "math.lerp(this, 0.0, variable.rightarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.rightarmswim_amount)",
-                  "math.lerp(this, -0.1019 * (-65.0 * math.mod(query.modified_distance_moved, 26.0) + math.mod(query.modified_distance_moved, 26.0) * math.mod(query.modified_distance_moved, 26.0)), variable.rightarmswim_amount)"
-                ]
-              },
-              "1.1": [
-                "math.lerp(this, 11.25 * math.mod(query.modified_distance_moved, 26.0), variable.rightarmswim_amount)",
-                "math.lerp(this, 180.0, variable.rightarmswim_amount)",
-                "math.lerp(this, 72.77 + 13.4 * math.mod(query.modified_distance_moved, 26.0), variable.rightarmswim_amount)"
-              ],
-              "1.3": {
-                "post": [
-                  "math.lerp(this, 90.0 - (22.5 * math.mod(query.modified_distance_moved, 26.0)), variable.rightarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.rightarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.rightarmswim_amount)"
-                ],
-                "pre": [
-                  "math.lerp(this, 11.25 * math.mod(query.modified_distance_moved, 26.0), variable.rightarmswim_amount)",
-                  "math.lerp(this, 180.0, variable.rightarmswim_amount)",
-                  "math.lerp(this, 72.77 + 13.4 * math.mod(query.modified_distance_moved, 26.0), variable.rightarmswim_amount)"
-                ]
-              }
-            }
-          },
-          "rightleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.modified_distance_moved * 19.5) * 17.2, variable.leftarmswim_amount) - this",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "use_item_progress": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "variable.use_item_startup_progress * -60.0 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -22.5 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -5.625 + variable.use_item_interval_progress * 11.25"
-            ]
-          }
-        }
-      },
-      "zombie_attack_bare_hand": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-90.0 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) - (math.sin(query.life_time * 76.776372) * 2.865) - this",
-              "5.73 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 0.6) - this",
-              "math.cos(query.life_time * 103.13244) * -2.865 - 2.865 - this"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "90.0 * (variable.is_brandishing_spear - 1.0) - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) + (math.sin(query.life_time * 76.776372) * 2.865) - this",
-              "(math.sin(variable.attack_time * 180.0) * 57.3) * 0.6 - 5.73 - this",
-              "math.cos(query.life_time * 103.13244) * 2.865 + 2.865 - this"
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "humanoid_baby_big_head": {
-        "initial_state": "default",
-        "states": {
-          "baby": {
-            "animations": ["humanoid_big_head"],
-            "transitions": [{"default": "!query.is_baby"}]
-          },
-          "default": {"transitions": [{"baby": "query.is_baby"}]}
-        }
-      },
-      "humanoid_base_pose": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["humanoid_base_pose"]}}
-      },
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      },
-      "riding": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"riding": "query.is_riding"}]},
-          "riding": {
-            "animations": ["riding.arms", "riding.legs"],
-            "transitions": [{"default": "!query.is_riding"}]
-          }
-        }
-      },
-      "holding": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["holding"]}}
-      },
-      "brandish_spear": {
-        "initial_state": "default",
-        "states": {
-          "brandish_spear": {
-            "animations": ["brandish_spear"],
-            "transitions": [{"default": "!variable.is_brandishing_spear"}]
-          },
-          "default": {
-            "transitions": [{"brandish_spear": "variable.is_brandishing_spear"}]
-          }
-        }
-      },
-      "charging": {
-        "initial_state": "default",
-        "states": {
-          "charging": {
-            "animations": ["charging"],
-            "transitions": [{"default": "!query.is_charging"}]
-          },
-          "default": {"transitions": [{"charging": "query.is_charging"}]}
-        }
-      },
-      "attack": {
-        "initial_state": "default",
-        "states": {
-          "attacking": {
-            "animations": ["attack.rotations"],
-            "transitions": [{"default": "variable.attack_time < 0.0"}]
-          },
-          "default": {
-            "transitions": [{"attacking": "variable.attack_time >= 0.0"}]
-          }
-        }
-      },
-      "sneaking": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"sneaking": "query.is_sneaking"}]},
-          "sneaking": {
-            "animations": ["sneaking"],
-            "transitions": [{"default": "!query.is_sneaking"}]
-          }
-        }
-      },
-      "bob": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["bob"]}}
-      },
-      "damage_nearby_mobs": {
-        "initial_state": "default",
-        "states": {
-          "damage_nearby_mobs": {
-            "animations": ["damage_nearby_mobs"],
-            "transitions": [{"default": "!variable.damage_nearby_mobs"}]
-          },
-          "default": {
-            "transitions": [
-              {"damage_nearby_mobs": "variable.damage_nearby_mobs"}
-            ]
-          }
-        }
-      },
-      "bow_and_arrow": {
-        "initial_state": "default",
-        "states": {
-          "bow_and_arrow": {
-            "animations": ["bow_and_arrow"],
-            "transitions": [{"default": "!query.has_target"}]
-          },
-          "default": {"transitions": [{"bow_and_arrow": "query.has_target"}]}
-        }
-      },
-      "swimming": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [{"swimming": "variable.swim_amount > 0.0"}]
-          },
-          "swimming": {
-            "animations": ["swimming"],
-            "transitions": [{"default": "variable.swim_amount <= 0.0"}]
-          }
-        }
-      },
-      "use_item_progress": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [
-              {
-                "use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 )"
-              }
-            ]
-          },
-          "use_item_progress": {
-            "animations": ["use_item_progress"],
-            "transitions": [
-              {
-                "default": "( variable.use_item_interval_progress <= 0.0 ) && ( variable.use_item_startup_progress <= 0.0 )"
-              }
-            ]
-          }
-        }
-      },
-      "zombie_attack_bare_hand": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [{"is_bare_hand": "variable.is_holding_left != 1.0"}]
-          },
-          "is_bare_hand": {
-            "animations": ["zombie_attack_bare_hand"],
-            "transitions": [{"default": "variable.is_holding_left == 1.0"}]
-          }
-        }
-      }
-    },
     "render_controllers": ["controller.render.zombie_pigman"],
     "enable_attachables": true
-  },
-  "zombie_villager": {
-    "identifier": "minecraft:zombie_villager",
-    "min_engine_version": "1.8.0",
-    "materials": {"default": "zombie_villager"},
-    "textures": {
-      "smith": "textures/entity/zombie_villager/profession/weaponsmith",
-      "butcher": "textures/entity/zombie_villager/profession/butcher",
-      "librarian": "textures/entity/zombie_villager/profession/librarian",
-      "priest": "textures/entity/zombie_villager/profession/cleric",
-      "farmer": "textures/entity/zombie_villager/profession/farmer"
-    },
-    "geometry": {
-      "default": {
-        "visible_bounds_width": 1.5,
-        "visible_bounds_height": 2.5,
-        "visible_bounds_offset": [0, 1.25, 0],
-        "texturewidth": 64,
-        "textureheight": 64,
-        "bones": [
-          {
-            "name": "hat",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {
-                "origin": [-4, 24, -4],
-                "size": [8, 8, 8],
-                "uv": [32, 0],
-                "inflate": 0.5
-              }
-            ],
-            "neverRender": true
-          },
-          {
-            "name": "head",
-            "parent": "body",
-            "reset": true,
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {
-                "origin": [-4, 24, -4],
-                "size": [8, 10, 8],
-                "uv": [0, 0],
-                "inflate": 0.25
-              },
-              {
-                "origin": [-1, 23, -6],
-                "size": [2, 4, 2],
-                "uv": [24, 0],
-                "inflate": 0.25
-              }
-            ]
-          },
-          {
-            "name": "hat",
-            "parent": "head",
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {
-                "origin": [-4, 24, -4],
-                "size": [8, 8, 8],
-                "uv": [32, 0],
-                "inflate": 0.5
-              }
-            ],
-            "neverRender": true
-          },
-          {
-            "name": "body",
-            "parent": "waist",
-            "reset": true,
-            "pivot": [0, 24, 0],
-            "cubes": [
-              {"origin": [-4, 12, -3], "size": [8, 12, 6], "uv": [16, 20]},
-              {
-                "origin": [-4, 6, -3],
-                "size": [8, 18, 6],
-                "uv": [0, 38],
-                "inflate": 0.5
-              }
-            ]
-          },
-          {"name": "waist", "neverRender": true, "pivot": [0, 12, 0]},
-          {
-            "name": "rightArm",
-            "parent": "body",
-            "reset": true,
-            "pivot": [-5, 22, 0],
-            "cubes": [
-              {"origin": [-8, 12, -2], "size": [4, 12, 4], "uv": [44, 38]}
-            ]
-          },
-          {
-            "name": "rightItem",
-            "pivot": [-6, 15, 1],
-            "neverRender": true,
-            "parent": "rightArm"
-          },
-          {
-            "name": "leftArm",
-            "parent": "body",
-            "reset": true,
-            "mirror": true,
-            "pivot": [5, 22, 0],
-            "cubes": [
-              {"origin": [4, 12, -2], "size": [4, 12, 4], "uv": [44, 38]}
-            ]
-          },
-          {
-            "name": "rightLeg",
-            "parent": "body",
-            "reset": true,
-            "pivot": [-2, 12, 0],
-            "cubes": [
-              {"origin": [-4, 0, -2], "size": [4, 12, 4], "uv": [0, 22]}
-            ]
-          },
-          {
-            "name": "leftLeg",
-            "parent": "body",
-            "reset": true,
-            "mirror": true,
-            "pivot": [2, 12, 0],
-            "cubes": [{"origin": [0, 0, -2], "size": [4, 12, 4], "uv": [0, 22]}]
-          }
-        ]
-      }
-    },
-    "scripts": {
-      "pre_animation": [
-        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;"
-      ]
-    },
-    "animations": {
-      "humanoid_big_head": {"loop": true, "bones": {"head": {"scale": 1.4}}},
-      "humanoid_base_pose": {
-        "loop": true,
-        "bones": {"waist": {"rotation": [0, 0, 0]}}
-      },
-      "look_at_target_default": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "relative_to": {"rotation": "entity"},
-            "rotation": [
-              "query.target_x_rotation",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "look_at_target_gliding": {
-        "loop": true,
-        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
-      },
-      "look_at_target_swimming": {
-        "loop": true,
-        "bones": {
-          "head": {
-            "rotation": [
-              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
-              "query.target_y_rotation",
-              0
-            ]
-          }
-        }
-      },
-      "move": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
-          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
-          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
-          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
-        }
-      },
-      "riding.arms": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": [-36, 0, 0]},
-          "rightarm": {"rotation": [-36, 0, 0]}
-        }
-      },
-      "riding.legs": {
-        "loop": true,
-        "bones": {
-          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
-          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
-        }
-      },
-      "holding": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "variable.is_holding_left ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "variable.is_holding_right ? (-this * 0.5 - 18.0) : 0.0",
-              0,
-              0
-            ]
-          }
-        }
-      },
-      "brandish_spear": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "this * -0.5 - 157.5 - 22.5 * variable.charge_amount",
-              "-this",
-              0
-            ]
-          }
-        }
-      },
-      "charging": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": ["22.5 * variable.charge_amount - this", "-this", 0]
-          }
-        }
-      },
-      "attack.rotations": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "rotation": [
-              0,
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46 - this",
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.sin(1.0 - math.pow(1.0 - variable.attack_time, 3.0) * 180.0) * (variable.is_brandishing_spear ? -1.0 : 1.0 )",
-              "variable.is_brandishing_spear ? 0.0 : (math.sin(math.sqrt(variable.attack_time) * 360) * 11.46) * 2.0",
-              0
-            ]
-          }
-        }
-      },
-      "sneaking": {
-        "loop": true,
-        "bones": {
-          "body": {"rotation": ["0.5 - this", 0, 0]},
-          "head": {"position": [0, 1, 0]},
-          "leftarm": {"rotation": [72, 0, 0]},
-          "leftleg": {"position": [0, -3, 4]},
-          "rightarm": {"rotation": [72, 0, 0]},
-          "rightleg": {"position": [0, -3, 4]}
-        }
-      },
-      "bob": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              0,
-              0,
-              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              0,
-              0,
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "damage_nearby_mobs": {
-        "loop": true,
-        "bones": {
-          "leftarm": {"rotation": ["-45.0-this", "-this", "-this"]},
-          "leftleg": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightarm": {"rotation": ["45.0-this", "-this", "-this"]},
-          "rightleg": {"rotation": ["-45.0-this", "-this", "-this"]}
-        }
-      },
-      "bow_and_arrow": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 - math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation + 28.65",
-              "-(math.cos(query.life_time * 103.2) * 2.865) - 2.865"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "query.target_x_rotation - 90.0 + math.sin(query.life_time * 76.8) * 2.865 - this",
-              "query.target_y_rotation - 5.73",
-              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
-            ]
-          }
-        }
-      },
-      "use_item_progress": {
-        "loop": true,
-        "bones": {
-          "rightarm": {
-            "rotation": [
-              "variable.use_item_startup_progress * -60.0 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -22.5 + variable.use_item_interval_progress * 11.25",
-              "variable.use_item_startup_progress * -5.625 + variable.use_item_interval_progress * 11.25"
-            ]
-          }
-        }
-      },
-      "zombie_attack_bare_hand": {
-        "loop": true,
-        "bones": {
-          "leftarm": {
-            "rotation": [
-              "-90.0 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) - (math.sin(query.life_time * 76.776372) * 2.865) - this",
-              "5.73 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 0.6) - this",
-              "math.cos(query.life_time * 103.13244) * -2.865 - 2.865 - this"
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "90.0 * (variable.is_brandishing_spear - 1.0) - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) + (math.sin(query.life_time * 76.776372) * 2.865) - this",
-              "(math.sin(variable.attack_time * 180.0) * 57.3) * 0.6 - 5.73 - this",
-              "math.cos(query.life_time * 103.13244) * 2.865 + 2.865 - this"
-            ]
-          }
-        }
-      },
-      "swimming": {
-        "loop": true,
-        "bones": {
-          "body": {
-            "position": [
-              0,
-              "variable.swim_amount * -10.0 - this",
-              "variable.swim_amount * 9.0 - this"
-            ],
-            "rotation": [
-              "variable.swim_amount * (90.0 + query.target_x_rotation)",
-              0,
-              0
-            ]
-          },
-          "leftarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) - (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "leftleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0 + 180.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          },
-          "rightarm": {
-            "rotation": [
-              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) + (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
-              "math.lerp(this, 14.325, variable.swim_amount) - this",
-              "math.lerp(this, -14.325, variable.swim_amount) + (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
-            ]
-          },
-          "rightleg": {
-            "rotation": [
-              "math.lerp(this, math.cos(query.life_time * 390.0) * 0.3, variable.swim_amount)",
-              0,
-              0
-            ]
-          }
-        }
-      }
-    },
-    "animation_controllers": {
-      "humanoid_baby_big_head": {
-        "initial_state": "default",
-        "states": {
-          "baby": {
-            "animations": ["humanoid_big_head"],
-            "transitions": [{"default": "!query.is_baby"}]
-          },
-          "default": {"transitions": [{"baby": "query.is_baby"}]}
-        }
-      },
-      "humanoid_base_pose": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["humanoid_base_pose"]}}
-      },
-      "look_at_target": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "animations": ["look_at_target_default"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"swimming": "query.is_swimming"}
-            ]
-          },
-          "gliding": {
-            "animations": ["look_at_target_gliding"],
-            "transitions": [
-              {"swimming": "query.is_swimming"},
-              {"default": "!query.is_gliding"}
-            ]
-          },
-          "swimming": {
-            "animations": ["look_at_target_swimming"],
-            "transitions": [
-              {"gliding": "query.is_gliding"},
-              {"default": "!query.is_swimming"}
-            ]
-          }
-        }
-      },
-      "move": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["move"]}}
-      },
-      "riding": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"riding": "query.is_riding"}]},
-          "riding": {
-            "animations": ["riding.arms", "riding.legs"],
-            "transitions": [{"default": "!query.is_riding"}]
-          }
-        }
-      },
-      "holding": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["holding"]}}
-      },
-      "brandish_spear": {
-        "initial_state": "default",
-        "states": {
-          "brandish_spear": {
-            "animations": ["brandish_spear"],
-            "transitions": [{"default": "!variable.is_brandishing_spear"}]
-          },
-          "default": {
-            "transitions": [{"brandish_spear": "variable.is_brandishing_spear"}]
-          }
-        }
-      },
-      "charging": {
-        "initial_state": "default",
-        "states": {
-          "charging": {
-            "animations": ["charging"],
-            "transitions": [{"default": "!query.is_charging"}]
-          },
-          "default": {"transitions": [{"charging": "query.is_charging"}]}
-        }
-      },
-      "attack": {
-        "initial_state": "default",
-        "states": {
-          "attacking": {
-            "animations": ["attack.rotations"],
-            "transitions": [{"default": "variable.attack_time < 0.0"}]
-          },
-          "default": {
-            "transitions": [{"attacking": "variable.attack_time >= 0.0"}]
-          }
-        }
-      },
-      "sneaking": {
-        "initial_state": "default",
-        "states": {
-          "default": {"transitions": [{"sneaking": "query.is_sneaking"}]},
-          "sneaking": {
-            "animations": ["sneaking"],
-            "transitions": [{"default": "!query.is_sneaking"}]
-          }
-        }
-      },
-      "bob": {
-        "initial_state": "default",
-        "states": {"default": {"animations": ["bob"]}}
-      },
-      "damage_nearby_mobs": {
-        "initial_state": "default",
-        "states": {
-          "damage_nearby_mobs": {
-            "animations": ["damage_nearby_mobs"],
-            "transitions": [{"default": "!variable.damage_nearby_mobs"}]
-          },
-          "default": {
-            "transitions": [
-              {"damage_nearby_mobs": "variable.damage_nearby_mobs"}
-            ]
-          }
-        }
-      },
-      "bow_and_arrow": {
-        "initial_state": "default",
-        "states": {
-          "bow_and_arrow": {
-            "animations": ["bow_and_arrow"],
-            "transitions": [{"default": "!query.has_target"}]
-          },
-          "default": {"transitions": [{"bow_and_arrow": "query.has_target"}]}
-        }
-      },
-      "use_item_progress": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [
-              {
-                "use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 )"
-              }
-            ]
-          },
-          "use_item_progress": {
-            "animations": ["use_item_progress"],
-            "transitions": [
-              {
-                "default": "( variable.use_item_interval_progress <= 0.0 ) && ( variable.use_item_startup_progress <= 0.0 )"
-              }
-            ]
-          }
-        }
-      },
-      "zombie_attack_bare_hand": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [{"is_bare_hand": "variable.is_holding_left != 1.0"}]
-          },
-          "is_bare_hand": {
-            "animations": ["zombie_attack_bare_hand"],
-            "transitions": [{"default": "variable.is_holding_left == 1.0"}]
-          }
-        }
-      },
-      "swimming": {
-        "initial_state": "default",
-        "states": {
-          "default": {
-            "transitions": [{"is_swimming": "variable.swim_amount > 0.0"}]
-          },
-          "is_swimming": {
-            "animations": ["swimming"],
-            "transitions": [{"default": "variable.swim_amount <= 0.0"}]
-          }
-        }
-      }
-    },
-    "render_controllers": ["controller.render.zombie_villager"],
-    "enable_attachables": true,
-    "spawn_egg": {"texture": "spawn_egg", "texture_index": 42}
   }
 }
\ No newline at end of file
diff --git a/renderer/viewer/lib/holdingBlock.ts b/renderer/viewer/lib/holdingBlock.ts
index 2acab1a5..c9fdc5f5 100644
--- a/renderer/viewer/lib/holdingBlock.ts
+++ b/renderer/viewer/lib/holdingBlock.ts
@@ -870,8 +870,3 @@ export const getBlockMeshFromModel = (material: THREE.Material, model: BlockMode
   })
   return getThreeBlockModelGroup(material, [[worldRenderModel]], undefined, 'plains', loadedData)
 }
-
-setTimeout(() => {
-  //@ts-expect-error
-  window.holdingBlock = viewer.world.holdingBlock
-})
diff --git a/renderer/viewer/lib/utils.electron.js b/renderer/viewer/lib/utils.electron.js
deleted file mode 100644
index 021bf092..00000000
--- a/renderer/viewer/lib/utils.electron.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const path = require('path')
-const THREE = require('three')
-
-const textureCache = {}
-function loadTexture(texture, cb) {
-  if (!textureCache[texture]) {
-    const url = path.resolve(__dirname, '../../public/' + texture)
-    textureCache[texture] = new THREE.TextureLoader().load(url)
-  }
-  cb(textureCache[texture])
-}
-
-function loadJSON(json, cb) {
-  cb(require(path.resolve(__dirname, '../../public/' + json)))
-}
-
-module.exports = { loadTexture, loadJSON }
diff --git a/renderer/viewer/lib/utils.js b/renderer/viewer/lib/utils.js
deleted file mode 100644
index 3c7de26a..00000000
--- a/renderer/viewer/lib/utils.js
+++ /dev/null
@@ -1,57 +0,0 @@
-function safeRequire(path) {
-  try {
-    return require(path)
-  } catch (e) {
-    return {}
-  }
-}
-const { loadImage } = safeRequire('node-canvas-webgl/lib')
-const path = require('path')
-const THREE = require('three')
-
-const textureCache = {}
-// todo not ideal, export different functions for browser and node
-export function loadTexture(texture, cb) {
-  if (process.platform === 'browser') {
-    return require('./utils.web').loadTexture(texture, cb)
-  }
-
-  if (textureCache[texture]) {
-    cb(textureCache[texture])
-  } else {
-    loadImage(path.resolve(__dirname, '../../public/' + texture)).then(image => {
-      textureCache[texture] = new THREE.CanvasTexture(image)
-      cb(textureCache[texture])
-    })
-  }
-}
-
-export function loadJSON(json, cb) {
-  if (process.platform === 'browser') {
-    return require('./utils.web').loadJSON(json, cb)
-  }
-  cb(require(path.resolve(__dirname, '../../public/' + json)))
-}
-
-export const loadScript = async function (/** @type {string} */scriptSrc) {
-  if (document.querySelector(`script[src="${scriptSrc}"]`)) {
-    return
-  }
-
-  return new Promise((resolve, reject) => {
-    const scriptElement = document.createElement('script')
-    scriptElement.src = scriptSrc
-    scriptElement.async = true
-
-    scriptElement.addEventListener('load', () => {
-      resolve(scriptElement)
-    })
-
-    scriptElement.onerror = (error) => {
-      reject(new Error(error.message))
-      scriptElement.remove()
-    }
-
-    document.head.appendChild(scriptElement)
-  })
-}
diff --git a/renderer/viewer/lib/utils.ts b/renderer/viewer/lib/utils.ts
new file mode 100644
index 00000000..1549690f
--- /dev/null
+++ b/renderer/viewer/lib/utils.ts
@@ -0,0 +1,55 @@
+import * as THREE from 'three'
+
+const textureCache = {}
+
+export function loadTexture (texture: string, cb: (texture: THREE.Texture) => void) {
+  const cached = textureCache[texture]
+  if (cached) {
+    cb(cached)
+    return
+  }
+
+  const threeTexture = new THREE.TextureLoader().load(texture, (loadedTexture) => {
+    loadedTexture.needsUpdate = true
+    textureCache[texture] = loadedTexture
+    cb(loadedTexture)
+  })
+}
+
+export function loadJSON (url, callback) {
+  const xhr = new XMLHttpRequest()
+  xhr.open('GET', url, true)
+  xhr.responseType = 'json'
+  xhr.onload = function () {
+    const { status } = xhr
+    if (status === 200) {
+      callback(xhr.response)
+    } else {
+      throw new Error(url + ' not found')
+    }
+  }
+  xhr.send()
+}
+
+export const loadScript = async function (scriptSrc) {
+  if (document.querySelector(`script[src="${scriptSrc}"]`)) {
+    return
+  }
+
+  return new Promise((resolve, reject) => {
+    const scriptElement = document.createElement('script')
+    scriptElement.src = scriptSrc
+    scriptElement.async = true
+
+    scriptElement.addEventListener('load', () => {
+      resolve(scriptElement)
+    })
+
+    scriptElement.onerror = (error) => {
+      reject(new Error(typeof error === 'string' ? error : (error as any).message))
+      scriptElement.remove()
+    }
+
+    document.head.appendChild(scriptElement)
+  })
+}
diff --git a/renderer/viewer/lib/utils.web.js b/renderer/viewer/lib/utils.web.js
deleted file mode 100644
index 53e8ac40..00000000
--- a/renderer/viewer/lib/utils.web.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/* global XMLHttpRequest */
-const THREE = require('three')
-
-const textureCache = {}
-function loadTexture(texture, cb, onLoad) {
-  const cached = textureCache[texture]
-  if (!cached) {
-    textureCache[texture] = new THREE.TextureLoader().load(texture, onLoad)
-  }
-  cb(textureCache[texture])
-  if (cached) onLoad?.()
-}
-
-function loadJSON(url, callback) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('GET', url, true)
-  xhr.responseType = 'json'
-  xhr.onload = function () {
-    const { status } = xhr
-    if (status === 200) {
-      callback(xhr.response)
-    } else {
-      throw new Error(url + ' not found')
-    }
-  }
-  xhr.send()
-}
-
-module.exports = { loadTexture, loadJSON }
diff --git a/src/devtools.ts b/src/devtools.ts
index 6624dda8..ea51dbb5 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -146,3 +146,5 @@ Object.defineProperty(window, 'debugToggle', {
     console.log('Enabled debug for', v)
   }
 })
+
+window.holdingBlock = (viewer.world as WorldRendererThree).holdingBlock

From 4223800fd83067438088a63e92866b57a24ab1be Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 18 Feb 2025 03:47:24 +0300
Subject: [PATCH 235/753] fix: improve rendering of some entites like arrow and
 sheep

---
 README.MD                                    |   5 +-
 renderer/playground/playground.ts            |   2 +-
 renderer/playground/scenes/allEntities.ts    | 165 ++++++++++++++++
 renderer/playground/scenes/index.ts          |   1 +
 renderer/viewer/lib/basePlayerState.ts       |   6 -
 renderer/viewer/lib/entity/EntityMesh.ts     | 189 ++++++++++++-------
 renderer/viewer/lib/entity/exportedModels.js |   3 +-
 renderer/viewer/lib/utils.ts                 |  53 +++---
 src/devtools.ts                              |   4 +-
 9 files changed, 318 insertions(+), 110 deletions(-)
 create mode 100644 renderer/playground/scenes/allEntities.ts

diff --git a/README.MD b/README.MD
index 922984d1..bd884b43 100644
--- a/README.MD
+++ b/README.MD
@@ -14,13 +14,14 @@ For building the project yourself / contributing, see [Development, Debugging &
 
 - Open any zip world file or even folder in read-write mode!
 - Connect to Java servers running in both offline (cracked) and online mode* (it's possible because of proxy servers, see below)
-- Integrated JS server capable of opening Java world saves in any way (folders, zip, web streaming, etc)
+- Integrated JS server clone capable of opening Java world saves in any way (folders, zip, web chunks streaming, etc)
 - Singleplayer mode with simple world generations!
 - Works offline
 - First-class touch (mobile) & controller support
 - First-class keybindings configuration
 - Advanced Resource pack support: Custom GUI, all textures. Server resource packs are supported with proper CORS configuration.
-- Builtin JEI with recipes & descriptions for every item (JEI is creative inventory replacement)
+- Builtin JEI with recipes & descriptions for almost every item (JEI is creative inventory replacement)
+- Custom protocol channel extensions (eg for custom block models in the world)
 - Play with friends over internet! (P2P is powered by Peer.js discovery servers)
 - ~~Google Drive support for reading / saving worlds back to the cloud~~
 - even even more!
diff --git a/renderer/playground/playground.ts b/renderer/playground/playground.ts
index cd0fa219..a233bca2 100644
--- a/renderer/playground/playground.ts
+++ b/renderer/playground/playground.ts
@@ -4,7 +4,7 @@ import * as scenes from './scenes'
 
 const qsScene = new URLSearchParams(window.location.search).get('scene')
 const Scene: typeof BasePlaygroundScene = qsScene ? scenes[qsScene] : scenes.main
-playgroundGlobalUiState.scenes = ['main', 'railsCobweb', 'floorRandom', 'lightingStarfield', 'transparencyIssue', 'entities', 'frequentUpdates', 'slabsOptimization']
+playgroundGlobalUiState.scenes = ['main', 'railsCobweb', 'floorRandom', 'lightingStarfield', 'transparencyIssue', 'entities', 'frequentUpdates', 'slabsOptimization', 'allEntities']
 playgroundGlobalUiState.selected = qsScene ?? 'main'
 
 const scene = new Scene()
diff --git a/renderer/playground/scenes/allEntities.ts b/renderer/playground/scenes/allEntities.ts
new file mode 100644
index 00000000..7fa0b6eb
--- /dev/null
+++ b/renderer/playground/scenes/allEntities.ts
@@ -0,0 +1,165 @@
+import { BasePlaygroundScene } from '../baseScene'
+import { EntityDebugFlags, EntityMesh, rendererSpecialHandled } from '../../viewer/lib/entity/EntityMesh'
+
+export default class AllEntities extends BasePlaygroundScene {
+  continuousRender = false
+  enableCameraControls = false
+
+  async initData () {
+    await super.initData()
+
+    // Create results container
+    const container = document.createElement('div')
+    container.style.cssText = `
+      position: fixed;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      max-height: 90vh;
+      overflow-y: auto;
+      background: rgba(0,0,0,0.8);
+      color: white;
+      padding: 20px;
+      border-radius: 8px;
+      font-family: monospace;
+      min-width: 400px;
+    `
+    document.body.appendChild(container)
+
+    // Add title
+    const title = document.createElement('h2')
+    title.textContent = 'Minecraft Entity Support'
+    title.style.cssText = 'margin-top: 0; text-align: center;'
+    container.appendChild(title)
+
+    // Test entities
+    const results: Array<{
+      entity: string;
+      supported: boolean;
+      type?: 'obj' | 'bedrock';
+      mappedFrom?: string;
+      textureMap?: boolean;
+      errors?: string[];
+    }> = []
+    const { mcData } = window
+    const entityNames = Object.keys(mcData.entitiesArray.reduce((acc, entity) => {
+      acc[entity.name] = true
+      return acc
+    }, {}))
+
+    // Add loading indicator
+    const loading = document.createElement('div')
+    loading.textContent = 'Testing entities...'
+    loading.style.textAlign = 'center'
+    container.appendChild(loading)
+
+    for (const entity of entityNames) {
+      const debugFlags: EntityDebugFlags = {}
+
+      try {
+        // eslint-disable-next-line no-new
+        new EntityMesh(this.version, entity, viewer.world, {}, debugFlags)
+
+        results.push({
+          entity,
+          supported: !!debugFlags.type || rendererSpecialHandled.includes(entity),
+          type: debugFlags.type,
+          mappedFrom: debugFlags.tempMap,
+          textureMap: debugFlags.textureMap,
+          errors: debugFlags.errors
+        })
+      } catch (e) {
+        console.error(e)
+        results.push({
+          entity,
+          supported: false,
+          mappedFrom: debugFlags.tempMap
+        })
+      }
+    }
+
+    // Remove loading indicator
+    loading.remove()
+
+    const createSection = (title: string, items: any[], filter: (item: any) => boolean) => {
+      const section = document.createElement('div')
+      section.style.marginBottom = '20px'
+
+      const sectionTitle = document.createElement('h3')
+      sectionTitle.textContent = title
+      sectionTitle.style.textAlign = 'center'
+      section.appendChild(sectionTitle)
+
+      const list = document.createElement('ul')
+      list.style.cssText = 'padding-left: 20px; list-style-type: none; margin: 0;'
+
+      const filteredItems = items.filter(filter)
+      for (const item of filteredItems) {
+        const listItem = document.createElement('li')
+        listItem.style.cssText = 'line-height: 1.4; margin: 8px 0;'
+
+        const entityName = document.createElement('strong')
+        entityName.style.cssText = 'user-select: text;-webkit-user-select: text;'
+        entityName.textContent = item.entity
+        listItem.appendChild(entityName)
+
+        let text = ''
+        if (item.mappedFrom) {
+          text += ` -> ${item.mappedFrom}`
+        }
+        if (item.type) {
+          text += ` - ${item.type}`
+        }
+        if (item.textureMap) {
+          text += ' ⚠️'
+        }
+        if (item.errors) {
+          text += ' ❌'
+        }
+
+        listItem.appendChild(document.createTextNode(text))
+        list.appendChild(listItem)
+      }
+
+      section.appendChild(list)
+      return { section, count: filteredItems.length }
+    }
+
+    // Sort results - bedrock first
+    results.sort((a, b) => {
+      if (a.type === 'bedrock' && b.type !== 'bedrock') return -1
+      if (a.type !== 'bedrock' && b.type === 'bedrock') return 1
+      return a.entity.localeCompare(b.entity)
+    })
+
+    // Add sections
+    const sections = [
+      {
+        title: '❌ Unsupported Entities',
+        filter: (r: any) => !r.supported && !r.mappedFrom
+      },
+      {
+        title: '⚠️ Partially Supported Entities',
+        filter: (r: any) => r.mappedFrom
+      },
+      {
+        title: '✅ Supported Entities',
+        filter: (r: any) => r.supported && !r.mappedFrom
+      }
+    ]
+
+    for (const { title, filter } of sections) {
+      const { section, count } = createSection(title, results, filter)
+      if (count > 0) {
+        container.appendChild(section)
+      }
+    }
+
+    // log object with errors per entity
+    const errors = results.filter(r => r.errors).map(r => ({
+      entity: r.entity,
+      errors: r.errors
+    }))
+    console.log(errors)
+  }
+}
diff --git a/renderer/playground/scenes/index.ts b/renderer/playground/scenes/index.ts
index 81657a71..bf881812 100644
--- a/renderer/playground/scenes/index.ts
+++ b/renderer/playground/scenes/index.ts
@@ -8,3 +8,4 @@ export { default as rotationIssue } from './rotationIssue'
 export { default as entities } from './entities'
 export { default as frequentUpdates } from './frequentUpdates'
 export { default as slabsOptimization } from './slabsOptimization'
+export { default as allEntities } from './allEntities'
diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index ac36ffec..1bbb690f 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -35,12 +35,6 @@ export interface IPlayerState {
 }
 
 export class BasePlayerState implements IPlayerState {
-  getItemUsageTicks? (): number {
-    throw new Error('Method not implemented.')
-  }
-  getHeldItem? (isLeftHand: boolean): HandItemBlock | undefined {
-    throw new Error('Method not implemented.')
-  }
   reactive = proxy({
     playerSkin: undefined
   })
diff --git a/renderer/viewer/lib/entity/EntityMesh.ts b/renderer/viewer/lib/entity/EntityMesh.ts
index 3835ab8a..cb9dd225 100644
--- a/renderer/viewer/lib/entity/EntityMesh.ts
+++ b/renderer/viewer/lib/entity/EntityMesh.ts
@@ -2,6 +2,7 @@ import * as THREE from 'three'
 import { OBJLoader } from 'three-stdlib'
 import huskPng from 'mc-assets/dist/other-textures/latest/entity/zombie/husk.png'
 import { Vec3 } from 'vec3'
+import arrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/arrow.png'
 import spectralArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/spectral_arrow.png'
 import tippedArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/tipped_arrow.png'
 import { WorldRendererCommon } from '../worldrendererCommon'
@@ -150,7 +151,8 @@ function addCube (
   sameTextureForAllFaces = false,
   texWidth = 64,
   texHeight = 64,
-  mirror = false
+  mirror = false,
+  errors: string[] = []
 ): void {
   const cubeRotation = new THREE.Euler(0, 0, 0)
   if (cube.rotation) {
@@ -173,6 +175,14 @@ function addCube (
         u = (cube.uv[0] + dot(pos[3] ? u1 : u0, cube.size)) / texWidth
         v = (cube.uv[1] + dot(pos[4] ? v1 : v0, cube.size)) / texHeight
       }
+      if (isNaN(u) || isNaN(v)) {
+        errors.push(`NaN u: ${u}, v: ${v}`)
+        continue
+      }
+      if (u < 0 || u > 1 || v < 0 || v > 1) {
+        errors.push(`u: ${u}, v: ${v} out of range`)
+        continue
+      }
 
       const posX = eastOrWest && mirror ? pos[0] ^ 1 : pos[0]
       const posY = pos[1]
@@ -213,22 +223,24 @@ function addCube (
 }
 
 export function getMesh (
-  worldRenderer: WorldRendererCommon,
+  worldRenderer: WorldRendererCommon | undefined,
   texture: string,
   jsonModel: JsonModel,
-  overrides: EntityOverrides = {}
+  overrides: EntityOverrides = {},
+  debugFlags: EntityDebugFlags = {}
 ): THREE.SkinnedMesh {
   let textureWidth = jsonModel.texturewidth ?? 64
   let textureHeight = jsonModel.textureheight ?? 64
-  let textureOffset
+  let textureOffset: number[] | undefined
   const useBlockTexture = texture.startsWith('block:')
-  const blocksTexture = worldRenderer.material.map!
+  const blocksTexture = worldRenderer?.material.map
   if (useBlockTexture) {
+    if (!worldRenderer) throw new Error('worldRenderer is required for block textures')
     const blockName = texture.slice(6)
     const textureInfo = worldRenderer.blocksAtlasParser!.getTextureInfo(blockName)
     if (textureInfo) {
-      textureWidth = blocksTexture.image.width
-      textureHeight = blocksTexture.image.height
+      textureWidth = blocksTexture!.image.width
+      textureHeight = blocksTexture!.image.height
       textureOffset = [textureInfo.u, textureInfo.v]
     } else {
       console.error(`Unknown block ${blockName}`)
@@ -272,7 +284,12 @@ export function getMesh (
 
     if (jsonBone.cubes) {
       for (const cube of jsonBone.cubes) {
-        addCube(geoData, i, bone, cube, useBlockTexture, textureWidth, textureHeight, jsonBone.mirror)
+        const errors: string[] = []
+        addCube(geoData, i, bone, cube, useBlockTexture, textureWidth, textureHeight, jsonBone.mirror, errors)
+        if (errors.length) {
+          debugFlags.errors ??= []
+          debugFlags.errors.push(...errors.map(error => `Bone ${jsonBone.name}: ${error}`))
+        }
       }
     }
     i++
@@ -305,7 +322,7 @@ export function getMesh (
 
   if (textureOffset) {
     // todo(memory) dont clone
-    const loadedTexture = blocksTexture.clone()
+    const loadedTexture = blocksTexture!.clone()
     loadedTexture.offset.set(textureOffset[0], textureOffset[1])
     loadedTexture.needsUpdate = true
     material.map = loadedTexture
@@ -335,40 +352,48 @@ export function getMesh (
   return mesh
 }
 
-export const knownNotHandled: string[] = [
-  'area_effect_cloud', 'block_display',
-  'chest_boat', 'end_crystal',
-  'falling_block', 'furnace_minecart',
-  'giant', 'glow_item_frame',
-  'glow_squid', 'illusioner',
-  'interaction', 'item',
-  'item_display', 'item_frame',
-  'lightning_bolt', 'marker',
-  'painting', 'spawner_minecart',
-  'spectral_arrow', 'tnt',
-  'trader_llama', 'zombie_horse'
+export const rendererSpecialHandled = ['item_frame', 'item', 'player']
+
+type EntityMapping = {
+  pattern: string | RegExp
+  target: string
+}
+
+const temporaryMappings: EntityMapping[] = [
+  // Exact matches
+  { pattern: 'furnace_minecart', target: 'minecart' },
+  { pattern: 'spawner_minecart', target: 'minecart' },
+  { pattern: 'chest_minecart', target: 'minecart' },
+  { pattern: 'hopper_minecart', target: 'minecart' },
+  { pattern: 'command_block_minecart', target: 'minecart' },
+  { pattern: 'tnt_minecart', target: 'minecart' },
+  { pattern: 'glow_item_frame', target: 'item_frame' },
+  { pattern: 'glow_squid', target: 'squid' },
+  { pattern: 'trader_llama', target: 'llama' },
+  { pattern: 'chest_boat', target: 'boat' },
+  { pattern: 'spectral_arrow', target: 'arrow' },
+  { pattern: 'husk', target: 'zombie' },
+  { pattern: 'zombie_horse', target: 'horse' },
+  { pattern: 'donkey', target: 'horse' },
+  { pattern: 'skeleton_horse', target: 'horse' },
+  { pattern: 'mule', target: 'horse' },
+  { pattern: 'ocelot', target: 'cat' },
+  // Regex patterns
+  { pattern: /_minecraft$/, target: 'minecraft' },
+  { pattern: /_boat$/, target: 'boat' },
+  { pattern: /_raft$/, target: 'boat' },
+  { pattern: /_horse$/, target: 'horse' },
+  { pattern: /_zombie$/, target: 'zombie' },
+  { pattern: /_arrow$/, target: 'zombie' },
 ]
 
-export const temporaryMap: Record<string, string> = {
-  'furnace_minecart': 'minecart',
-  'spawner_minecart': 'minecart',
-  'chest_minecart': 'minecart',
-  'hopper_minecart': 'minecart',
-  'command_block_minecart': 'minecart',
-  'tnt_minecart': 'minecart',
-  'glow_item_frame': 'item_frame',
-  'glow_squid': 'squid',
-  'trader_llama': 'llama',
-  'chest_boat': 'boat',
-  'spectral_arrow': 'arrow',
-  'husk': 'zombie',
-  'zombie_horse': 'horse',
-  'donkey': 'horse',
-  'skeleton_horse': 'horse',
-  'mule': 'horse',
-  'ocelot': 'cat',
-  // 'falling_block': 'block',
-  // 'lightning_bolt': 'lightning',
+function getEntityMapping (type: string): string | undefined {
+  for (const mapping of temporaryMappings) {
+    if (typeof mapping.pattern === 'string') {
+      if (mapping.pattern === type) return mapping.target
+    } else if (mapping.pattern.test(type)) { return mapping.target }
+  }
+  return undefined
 }
 
 const getEntity = (name: string) => {
@@ -377,13 +402,15 @@ const getEntity = (name: string) => {
 
 const scaleEntity: Record<string, number> = {
   zombie: 1.85,
-  husk: 1.85
+  husk: 1.85,
+  arrow: 0.0025
 }
 
 const offsetEntity: Record<string, Vec3> = {
   zombie: new Vec3(0, 1, 0),
   husk: new Vec3(0, 1, 0),
   boat: new Vec3(0, -1, 0),
+  arrow: new Vec3(0, -0.9, 0)
 }
 
 interface EntityGeometry {
@@ -393,39 +420,51 @@ interface EntityGeometry {
   }>;
 }
 
+export type EntityDebugFlags = {
+  type?: 'obj' | 'bedrock'
+  tempMap?: string
+  textureMap?: boolean
+  errors?: string[]
+  isHardcodedTexture?: boolean
+}
+
 export class EntityMesh {
   mesh: THREE.Object3D
 
   constructor (
     version: string,
     type: string,
-    worldRenderer: WorldRendererCommon,
-    overrides: EntityOverrides = {}
+    worldRenderer?: WorldRendererCommon,
+    overrides: EntityOverrides = {},
+    debugFlags: EntityDebugFlags = {}
   ) {
     const originalType = type
-    const mappedValue = temporaryMap[type]
-    if (mappedValue) type = mappedValue
+    const mappedValue = getEntityMapping(type)
+    if (mappedValue) {
+      type = mappedValue
+      debugFlags.tempMap = mappedValue
+    }
 
     if (externalModels[type]) {
       const objLoader = new OBJLoader()
-      let texturePath = externalTexturesJson[type]
-      if (originalType === 'zombie_horse') {
-        texturePath = `textures/${version}/entity/horse/horse_zombie.png`
+      const texturePathMap = {
+        'zombie_horse': `textures/${version}/entity/horse/horse_zombie.png`,
+        'husk': huskPng,
+        'skeleton_horse': `textures/${version}/entity/horse/horse_skeleton.png`,
+        'donkey': `textures/${version}/entity/horse/donkey.png`,
+        'mule': `textures/${version}/entity/horse/mule.png`,
+        'ocelot': `textures/${version}/entity/cat/ocelot.png`,
+        'arrow': arrowTexture,
+        'spectral_arrow': spectralArrowTexture,
+        'tipped_arrow': tippedArrowTexture
       }
-      if (originalType === 'husk') {
-        texturePath = huskPng
+      const tempTextureMap = texturePathMap[originalType] || texturePathMap[type]
+      if (tempTextureMap) {
+        debugFlags.textureMap = true
       }
-      if (originalType === 'skeleton_horse') {
-        texturePath = `textures/${version}/entity/horse/horse_skeleton.png`
-      }
-      if (originalType === 'donkey') {
-        texturePath = `textures/${version}/entity/horse/donkey.png`
-      }
-      if (originalType === 'mule') {
-        texturePath = `textures/${version}/entity/horse/mule.png`
-      }
-      if (originalType === 'ocelot') {
-        texturePath = `textures/${version}/entity/cat/ocelot.png`
+      const texturePath = tempTextureMap || externalTexturesJson[type]
+      if (externalTexturesJson[type]) {
+        debugFlags.isHardcodedTexture = true
       }
       if (!texturePath) throw new Error(`No texture for ${type}`)
       const texture = new THREE.TextureLoader().load(texturePath)
@@ -437,7 +476,7 @@ export class EntityMesh {
         alphaTest: 0.1
       })
       const obj = objLoader.parse(externalModels[type])
-      const scale = scaleEntity[originalType]
+      const scale = scaleEntity[originalType] || scaleEntity[type]
       if (scale) obj.scale.set(scale, scale, scale)
       const offset = offsetEntity[originalType]
       if (offset) obj.position.set(offset.x, offset.y, offset.z)
@@ -454,20 +493,22 @@ export class EntityMesh {
         }
       })
       this.mesh = obj
+      debugFlags.type = 'obj'
       return
     }
 
-    // if (originalType === 'arrow') {
-    //   overrides.textures = {
-    //     'default': arrowTexture,
-    //     ...overrides.textures,
-    //   }
-    // }
+    if (originalType === 'arrow') {
+      // overrides.textures = {
+      //   'default': testArrow,
+      //   ...overrides.textures,
+      // }
+    }
 
     const e = getEntity(type)
     if (!e) {
-      if (knownNotHandled.includes(type)) return
-      throw new Error(`Unknown entity ${type}`)
+      // if (knownNotHandled.includes(type)) return
+      // throw new Error(`Unknown entity ${type}`)
+      return
     }
 
     this.mesh = new THREE.Object3D()
@@ -479,7 +520,8 @@ export class EntityMesh {
         texture.endsWith('.png') || texture.startsWith('data:image/') || texture.startsWith('block:')
           ? texture : texture + '.png',
         jsonModel,
-        overrides)
+        overrides,
+        debugFlags)
       mesh.name = `geometry_${name}`
       this.mesh.add(mesh)
 
@@ -489,10 +531,11 @@ export class EntityMesh {
       skeletonHelper.visible = false
       this.mesh.add(skeletonHelper)
     }
+    debugFlags.type = 'bedrock'
   }
 
   static getStaticData (name: string): { boneNames: string[] } {
-    name = temporaryMap[name] || name
+    name = getEntityMapping(name) || name
     if (externalModels[name]) {
       return {
         boneNames: [] // todo
diff --git a/renderer/viewer/lib/entity/exportedModels.js b/renderer/viewer/lib/entity/exportedModels.js
index 53d55d5e..60ac6723 100644
--- a/renderer/viewer/lib/entity/exportedModels.js
+++ b/renderer/viewer/lib/entity/exportedModels.js
@@ -22,7 +22,8 @@ export { default as parrot } from './models/parrot.obj'
 export { default as piglin } from './models/piglin.obj'
 export { default as pillager } from './models/pillager.obj'
 export { default as rabbit } from './models/rabbit.obj'
-// export { default as sheep } from './models/sheep.obj'
+export { default as sheep } from './models/sheep.obj'
+export { default as arrow } from './models/arrow.obj'
 export { default as shulker } from './models/shulker.obj'
 export { default as sniffer } from './models/sniffer.obj'
 export { default as spider } from './models/spider.obj'
diff --git a/renderer/viewer/lib/utils.ts b/renderer/viewer/lib/utils.ts
index 1549690f..69f425a3 100644
--- a/renderer/viewer/lib/utils.ts
+++ b/renderer/viewer/lib/utils.ts
@@ -1,41 +1,42 @@
 import * as THREE from 'three'
 
-const textureCache = {}
+const textureCache: Record<string, THREE.Texture> = {}
+const loadingTextures = new Map<string, Promise<THREE.Texture>>()
 
-export function loadTexture (texture: string, cb: (texture: THREE.Texture) => void) {
+export function loadTexture (texture: string, cb: (texture: THREE.Texture) => void): void {
   const cached = textureCache[texture]
   if (cached) {
     cb(cached)
     return
   }
 
-  const threeTexture = new THREE.TextureLoader().load(texture, (loadedTexture) => {
-    loadedTexture.needsUpdate = true
-    textureCache[texture] = loadedTexture
-    cb(loadedTexture)
-  })
-}
-
-export function loadJSON (url, callback) {
-  const xhr = new XMLHttpRequest()
-  xhr.open('GET', url, true)
-  xhr.responseType = 'json'
-  xhr.onload = function () {
-    const { status } = xhr
-    if (status === 200) {
-      callback(xhr.response)
-    } else {
-      throw new Error(url + ' not found')
-    }
-  }
-  xhr.send()
-}
-
-export const loadScript = async function (scriptSrc) {
-  if (document.querySelector(`script[src="${scriptSrc}"]`)) {
+  // Check if this texture is already being loaded
+  const loadingPromise = loadingTextures.get(texture)
+  if (loadingPromise) {
+    void loadingPromise.then(loadedTexture => cb(loadedTexture))
     return
   }
 
+  // Create new loading promise for this texture
+  const promise = new Promise<THREE.Texture>(resolve => {
+    new THREE.TextureLoader().load(texture, (loadedTexture) => {
+      loadedTexture.needsUpdate = true
+      textureCache[texture] = loadedTexture
+      loadingTextures.delete(texture)
+      resolve(loadedTexture)
+      cb(loadedTexture)
+    })
+  })
+
+  loadingTextures.set(texture, promise)
+}
+
+export const loadScript = async function (scriptSrc: string): Promise<HTMLScriptElement> {
+  const existingScript = document.querySelector<HTMLScriptElement>(`script[src="${scriptSrc}"]`)
+  if (existingScript) {
+    return existingScript
+  }
+
   return new Promise((resolve, reject) => {
     const scriptElement = document.createElement('script')
     scriptElement.src = scriptSrc
diff --git a/src/devtools.ts b/src/devtools.ts
index ea51dbb5..e534c293 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -147,4 +147,6 @@ Object.defineProperty(window, 'debugToggle', {
   }
 })
 
-window.holdingBlock = (viewer.world as WorldRendererThree).holdingBlock
+customEvents.on('gameLoaded', () => {
+  window.holdingBlock = (viewer.world as WorldRendererThree).holdingBlock
+})

From c1bf8bf1d7d25332c31e779986779338346b3a7e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 18 Feb 2025 03:51:02 +0300
Subject: [PATCH 236/753] add arrow obj

---
 renderer/viewer/lib/entity/models/Arrow.obj | 60 +++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 renderer/viewer/lib/entity/models/Arrow.obj

diff --git a/renderer/viewer/lib/entity/models/Arrow.obj b/renderer/viewer/lib/entity/models/Arrow.obj
new file mode 100644
index 00000000..469dd6cd
--- /dev/null
+++ b/renderer/viewer/lib/entity/models/Arrow.obj
@@ -0,0 +1,60 @@
+# Aspose.3D Wavefront OBJ Exporter
+# Copyright 2004-2024 Aspose Pty Ltd.
+# File created: 02/12/2025 20:01:28
+
+mtllib material.lib
+g Arrow
+
+#
+# object Arrow
+#
+
+v -160 8.146034E-06 50
+v 160 8.146034E-06 50
+v -160 -8.146034E-06 -50
+v 160 -8.146034E-06 -50
+v -160 -50 1.1920929E-05
+v 160 -50 1.1920929E-05
+v -160 50 -1.1920929E-05
+v 160 50 -1.1920929E-05
+v -140 -49.999992 50.000008
+v -140 50.000008 49.999992
+v -140 -50.000008 -49.999992
+v -140 49.999992 -50.000008
+# 12 vertices
+
+vn 0 1 -1.6292068E-07
+vn 0 1 -1.6292068E-07
+vn 0 1 -1.6292068E-07
+vn 0 1 -1.6292068E-07
+vn 0 3.1391647E-07 1
+vn 0 3.1391647E-07 1
+vn 0 3.1391647E-07 1
+vn 0 3.1391647E-07 1
+vn -1 0 0
+vn -1 0 0
+vn -1 0 0
+vn -1 0 0
+# 12 vertex normals
+
+vt 0 0.84375 0
+vt 0.5 1 0
+vt 0.5 1 0
+vt 0.5 0.84375 0
+vt 0 1 0
+vt 0.15625 0.84375 0
+vt 0.15625 0.6875 0
+vt 0 0.84375 0
+vt 0.5 0.84375 0
+vt 0 1 0
+vt 0 0.6875 0
+vt 0 0.84375 0
+# 12 texture coords
+
+usemtl Arrow
+s 1
+f 1/1/1 2/9/2 4/2/3 3/10/4
+f 5/8/5 6/4/6 8/3/7 7/5/8
+f 9/11/9 10/7/10 12/6/11 11/12/12
+#3 polygons
+

From 5e0ece82884ebac6ddea694b2156726e8e421fce Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 18 Feb 2025 04:01:17 +0300
Subject: [PATCH 237/753] fix arrow file casing

---
 renderer/viewer/lib/entity/models/{Arrow.obj => arrow.obj} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename renderer/viewer/lib/entity/models/{Arrow.obj => arrow.obj} (100%)

diff --git a/renderer/viewer/lib/entity/models/Arrow.obj b/renderer/viewer/lib/entity/models/arrow.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/Arrow.obj
rename to renderer/viewer/lib/entity/models/arrow.obj

From 9a8451fff7940b3bb6841c2ffa172fc9a552cda6 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 18 Feb 2025 04:28:48 +0300
Subject: [PATCH 238/753] fix: fix all known issues with chat auto scroll!

---
 src/mineflayer/java-tester/commands.ts |  10 ++-
 src/react/Chat.css                     |   3 +-
 src/react/Chat.tsx                     | 112 +++++++------------------
 src/react/hooks/useScrollBehavior.ts   |  32 +++----
 4 files changed, 51 insertions(+), 106 deletions(-)

diff --git a/src/mineflayer/java-tester/commands.ts b/src/mineflayer/java-tester/commands.ts
index 94e9bf81..1925c4d7 100644
--- a/src/mineflayer/java-tester/commands.ts
+++ b/src/mineflayer/java-tester/commands.ts
@@ -18,6 +18,8 @@ const writeCmd = (cmd: string) => {
   bot.chat(cmd)
 }
 
+let msg = 0
+const LIMIT_MSG = 100
 export const javaServerTester = {
   itemCustomLore () {
     const cmd = customStickNbt({
@@ -51,14 +53,16 @@ export const javaServerTester = {
     })
     writeCmd(cmd)
   },
+
   spamChat () {
-    for (let i = 0; i < 100; i++) {
+    for (let i = msg; i < msg + LIMIT_MSG; i++) {
       bot.chat('Hello, world, ' + i)
     }
+    msg += LIMIT_MSG
   },
   spamChatComplexMessage () {
-    for (let i = 0; i < 100; i++) {
-      bot.chat('/tell @a ')
+    for (let i = msg; i < msg + LIMIT_MSG; i++) {
+      bot.chat('/tell @a ' + i)
     }
   }
 }
diff --git a/src/react/Chat.css b/src/react/Chat.css
index e4df8af8..141524af 100644
--- a/src/react/Chat.css
+++ b/src/react/Chat.css
@@ -55,7 +55,8 @@ div.chat-wrapper {
   transform: none;
   top: 100%;
   padding-left: calc(env(safe-area-inset-left) / 2);
-  margin-top: 20px;
+  margin-top: 14px;
+  margin-left: 20px;
   /* input height */
 }
 
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index dde8ee62..a0fcc241 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -6,6 +6,7 @@ import './Chat.css'
 import { isIos, reactKeyForMessage } from './utils'
 import Button from './Button'
 import { pixelartIcons } from './PixelartIcon'
+import { useScrollBehavior } from './hooks/useScrollBehavior'
 
 export type Message = {
   parts: MessageFormatPart[],
@@ -77,22 +78,10 @@ export default ({
 
   const chatInput = useRef<HTMLInputElement>(null!)
   const chatMessages = useRef<HTMLDivElement>(null)
-  const openedChatWasAtBottom = useRef(false)
-  const wasAtBottomBeforeOpen = useRef(false)
   const chatHistoryPos = useRef(sendHistoryRef.current.length)
   const inputCurrentlyEnteredValue = useRef('')
 
-  const isAtBottom = () => {
-    if (!chatMessages.current) return true
-    const { scrollTop, scrollHeight, clientHeight } = chatMessages.current
-    return Math.abs(scrollHeight - clientHeight - scrollTop) < 1
-  }
-
-  const scrollToBottom = () => {
-    if (chatMessages.current) {
-      chatMessages.current.scrollTop = chatMessages.current.scrollHeight
-    }
-  }
+  const { scrollToBottom } = useScrollBehavior(chatMessages, { messages, opened })
 
   const setSendHistory = (newHistory: string[]) => {
     sendHistoryRef.current = newHistory
@@ -117,6 +106,11 @@ export default ({
     }, 0)
   }
 
+  const auxInputFocus = (fireKey: string) => {
+    chatInput.current.focus()
+    chatInput.current.dispatchEvent(new KeyboardEvent('keydown', { code: fireKey, bubbles: true }))
+  }
+
   useEffect(() => {
     // todo focus input on any keypress except tab
   }, [])
@@ -133,11 +127,6 @@ export default ({
       if (!usingTouch) {
         chatInput.current.focus()
       }
-      // Check if was at bottom before opening
-      wasAtBottomBeforeOpen.current = isAtBottom()
-      if (wasAtBottomBeforeOpen.current) {
-        scrollToBottom()
-      }
       const unsubscribe = subscribe(chatInputValueGlobal, () => {
         if (!chatInputValueGlobal.value) return
         updateInputValue(chatInputValueGlobal.value)
@@ -146,9 +135,6 @@ export default ({
       })
       return unsubscribe
     }
-    if (!opened && chatMessages.current) {
-      scrollToBottom()
-    }
   }, [opened])
 
   useMemo(() => {
@@ -158,50 +144,23 @@ export default ({
     }
   }, [opened])
 
-  useEffect(() => {
-    if ((!opened || (opened && openedChatWasAtBottom.current)) && chatMessages.current) {
-      openedChatWasAtBottom.current = false
-      // stay at bottom on messages changes only if we were at bottom
-      if (isAtBottom()) {
-        scrollToBottom()
-      }
-    }
-  }, [messages])
-
-  useMemo(() => {
-    if ((opened && chatMessages.current)) {
-      openedChatWasAtBottom.current = isAtBottom()
-    }
-  }, [messages])
-
-  // Add scroll handler to track scroll position
-  useEffect(() => {
-    const messagesEl = chatMessages.current
-    if (!messagesEl) return
-
-    const handleScroll = () => {
-      openedChatWasAtBottom.current = isAtBottom()
+  const onMainInputChange = () => {
+    const completeValue = getCompleteValue()
+    setCompletePadText(completeValue === '/' ? '' : completeValue)
+    if (completeRequestValue.current === completeValue) {
+      updateFilteredCompleteItems(completionItemsSource)
+      return
     }
 
-    messagesEl.addEventListener('scroll', handleScroll)
-    return () => messagesEl.removeEventListener('scroll', handleScroll)
-  }, [])
-
-  const auxInputFocus = (fireKey: string) => {
-    chatInput.current.focus()
-    chatInput.current.dispatchEvent(new KeyboardEvent('keydown', { code: fireKey, bubbles: true }))
-  }
-
-  const getDefaultCompleteValue = () => {
-    const raw = chatInput.current.value
-    return raw.slice(0, chatInput.current.selectionEnd ?? raw.length)
-  }
-  const getCompleteValue = (value = getDefaultCompleteValue()) => {
-    const valueParts = value.split(' ')
-    const lastLength = valueParts.at(-1)!.length
-    const completeValue = lastLength ? value.slice(0, -lastLength) : value
-    if (valueParts.length === 1 && value.startsWith('/')) return '/'
-    return completeValue
+    if (completeValue.startsWith('/')) {
+      void fetchCompletions(true)
+    } else {
+      resetCompletionItems()
+    }
+    completeRequestValue.current = completeValue
+    // if (completeValue === '/') {
+    //   void fetchCompletions(true)
+    // }
   }
 
   const fetchCompletions = async (implicit: boolean, inputValue = chatInput.current.value) => {
@@ -224,23 +183,16 @@ export default ({
     setCompletionItems(newCompleteItems)
   }
 
-  const onMainInputChange = () => {
-    const completeValue = getCompleteValue()
-    setCompletePadText(completeValue === '/' ? '' : completeValue)
-    if (completeRequestValue.current === completeValue) {
-      updateFilteredCompleteItems(completionItemsSource)
-      return
-    }
-
-    if (completeValue.startsWith('/')) {
-      void fetchCompletions(true)
-    } else {
-      resetCompletionItems()
-    }
-    completeRequestValue.current = completeValue
-    // if (completeValue === '/') {
-    //   void fetchCompletions(true)
-    // }
+  const getDefaultCompleteValue = () => {
+    const raw = chatInput.current.value
+    return raw.slice(0, chatInput.current.selectionEnd ?? raw.length)
+  }
+  const getCompleteValue = (value = getDefaultCompleteValue()) => {
+    const valueParts = value.split(' ')
+    const lastLength = valueParts.at(-1)!.length
+    const completeValue = lastLength ? value.slice(0, -lastLength) : value
+    if (valueParts.length === 1 && value.startsWith('/')) return '/'
+    return completeValue
   }
 
   return (
diff --git a/src/react/hooks/useScrollBehavior.ts b/src/react/hooks/useScrollBehavior.ts
index b877625a..d8cabf07 100644
--- a/src/react/hooks/useScrollBehavior.ts
+++ b/src/react/hooks/useScrollBehavior.ts
@@ -1,4 +1,4 @@
-import { RefObject, useEffect, useRef } from 'react'
+import { RefObject, useEffect, useLayoutEffect, useRef } from 'react'
 
 export const useScrollBehavior = (
   elementRef: RefObject<HTMLElement>,
@@ -10,13 +10,14 @@ export const useScrollBehavior = (
     opened?: boolean
   }
 ) => {
-  const wasAtBottomBeforeOpen = useRef(false)
-  const openedWasAtBottom = useRef(false)
+  const openedWasAtBottom = useRef(true) // before new messages
+  window.openedWasAtBottom = openedWasAtBottom
 
   const isAtBottom = () => {
     if (!elementRef.current) return true
     const { scrollTop, scrollHeight, clientHeight } = elementRef.current
-    return Math.abs(scrollHeight - clientHeight - scrollTop) < 1
+    const distanceFromBottom = Math.abs(scrollHeight - clientHeight - scrollTop)
+    return distanceFromBottom < 1
   }
 
   const scrollToBottom = () => {
@@ -39,31 +40,18 @@ export const useScrollBehavior = (
   }, [])
 
   // Handle opened state changes
-  useEffect(() => {
+  useLayoutEffect(() => {
     if (opened) {
-      wasAtBottomBeforeOpen.current = isAtBottom()
-      if (wasAtBottomBeforeOpen.current) {
-        scrollToBottom()
-      }
-    } else if (elementRef.current) {
+      openedWasAtBottom.current = true
+    } else {
       scrollToBottom()
     }
   }, [opened])
 
   // Handle messages changes
-  useEffect(() => {
+  useLayoutEffect(() => {
     if ((!opened || (opened && openedWasAtBottom.current)) && elementRef.current) {
-      openedWasAtBottom.current = false
-      if (isAtBottom()) {
-        scrollToBottom()
-      }
-    }
-  }, [messages])
-
-  // Update bottom state when messages change
-  useEffect(() => {
-    if (opened && elementRef.current) {
-      openedWasAtBottom.current = isAtBottom()
+      scrollToBottom()
     }
   }, [messages])
 

From d83fbb03936a1c2e0847d9e04d4c022d530e26e8 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Tue, 18 Feb 2025 15:45:47 +0100
Subject: [PATCH 239/753] fix: maps on invisible Item Frames would have gap
 (#281)

---
 renderer/viewer/lib/entities.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/entities.ts b/renderer/viewer/lib/entities.ts
index 0e5938b2..21802089 100644
--- a/renderer/viewer/lib/entities.ts
+++ b/renderer/viewer/lib/entities.ts
@@ -897,7 +897,7 @@ export class Entities extends EventEmitter {
 
     mapMesh.rotation.set(0, Math.PI, 0)
     entityMesh.add(mapMesh)
-    let isInvisible = false
+    let isInvisible = true
     entityMesh.traverseVisible(c => {
       if (c.name === 'geometry_frame') {
         isInvisible = false

From 191043380ec3e38550f1d9ccb8b855fb1d65e439 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 18 Feb 2025 20:10:17 +0300
Subject: [PATCH 240/753] fix textures loading regression, fix entity tex
 resizing

---
 renderer/viewer/lib/entity/EntityMesh.ts | 13 +++++---
 renderer/viewer/lib/utils.ts             | 37 +++++++++-------------
 src/mineflayer/plugins/ping.ts           | 40 ++++++++++++++++++++++++
 src/react/hooks/useScrollBehavior.ts     |  2 +-
 4 files changed, 63 insertions(+), 29 deletions(-)
 create mode 100644 src/mineflayer/plugins/ping.ts

diff --git a/renderer/viewer/lib/entity/EntityMesh.ts b/renderer/viewer/lib/entity/EntityMesh.ts
index cb9dd225..f0b90e19 100644
--- a/renderer/viewer/lib/entity/EntityMesh.ts
+++ b/renderer/viewer/lib/entity/EntityMesh.ts
@@ -327,7 +327,7 @@ export function getMesh (
     loadedTexture.needsUpdate = true
     material.map = loadedTexture
   } else {
-    loadTexture(texture, loadedTexture => {
+    void loadTexture(texture, loadedTexture => {
       if (material.map) {
         // texture is already loaded
         return
@@ -338,14 +338,17 @@ export function getMesh (
       loadedTexture.wrapS = THREE.RepeatWrapping
       loadedTexture.wrapT = THREE.RepeatWrapping
       material.map = loadedTexture
-      const actualWidth = loadedTexture.image.width
+    }, () => {
+      // This callback runs after the texture is fully loaded
+      const actualWidth = material.map!.image.width
       if (actualWidth && textureWidth !== actualWidth) {
-        loadedTexture.repeat.x = textureWidth / actualWidth
+        material.map!.repeat.x = textureWidth / actualWidth
       }
-      const actualHeight = loadedTexture.image.height
+      const actualHeight = material.map!.image.height
       if (actualHeight && textureHeight !== actualHeight) {
-        loadedTexture.repeat.y = textureHeight / actualHeight
+        material.map!.repeat.y = textureHeight / actualHeight
       }
+      material.needsUpdate = true
     })
   }
 
diff --git a/renderer/viewer/lib/utils.ts b/renderer/viewer/lib/utils.ts
index 69f425a3..240dfa7f 100644
--- a/renderer/viewer/lib/utils.ts
+++ b/renderer/viewer/lib/utils.ts
@@ -1,34 +1,25 @@
 import * as THREE from 'three'
 
-const textureCache: Record<string, THREE.Texture> = {}
-const loadingTextures = new Map<string, Promise<THREE.Texture>>()
+let textureCache: Record<string, THREE.Texture> = {}
+let imagesPromises: Record<string, Promise<THREE.Texture>> = {}
 
-export function loadTexture (texture: string, cb: (texture: THREE.Texture) => void): void {
+export async function loadTexture (texture: string, cb: (texture: THREE.Texture) => void, onLoad?: () => void): Promise<void> {
   const cached = textureCache[texture]
-  if (cached) {
-    cb(cached)
-    return
+  if (!cached) {
+    const { promise, resolve } = Promise.withResolvers<THREE.Texture>()
+    textureCache[texture] = new THREE.TextureLoader().load(texture, resolve)
+    imagesPromises[texture] = promise
   }
 
-  // Check if this texture is already being loaded
-  const loadingPromise = loadingTextures.get(texture)
-  if (loadingPromise) {
-    void loadingPromise.then(loadedTexture => cb(loadedTexture))
-    return
-  }
-
-  // Create new loading promise for this texture
-  const promise = new Promise<THREE.Texture>(resolve => {
-    new THREE.TextureLoader().load(texture, (loadedTexture) => {
-      loadedTexture.needsUpdate = true
-      textureCache[texture] = loadedTexture
-      loadingTextures.delete(texture)
-      resolve(loadedTexture)
-      cb(loadedTexture)
-    })
+  cb(textureCache[texture])
+  void imagesPromises[texture].then(() => {
+    onLoad?.()
   })
+}
 
-  loadingTextures.set(texture, promise)
+export const clearTextureCache = () => {
+  textureCache = {}
+  imagesPromises = {}
 }
 
 export const loadScript = async function (scriptSrc: string): Promise<HTMLScriptElement> {
diff --git a/src/mineflayer/plugins/ping.ts b/src/mineflayer/plugins/ping.ts
new file mode 100644
index 00000000..fe0ac85d
--- /dev/null
+++ b/src/mineflayer/plugins/ping.ts
@@ -0,0 +1,40 @@
+export default () => {
+  let i = 0
+  bot.pingProxy = async () => {
+    const curI = ++i
+    return new Promise(resolve => {
+      //@ts-expect-error
+      bot._client.socket._ws.send(`ping:${curI}`)
+      const date = Date.now()
+      const onPong = (received) => {
+        if (received !== curI.toString()) return
+        bot._client.socket.off('pong' as any, onPong)
+        resolve(Date.now() - date)
+      }
+      bot._client.socket.on('pong' as any, onPong)
+    })
+  }
+
+  let pingPending = false
+  bot.pingServer = async () => {
+    if (pingPending) return
+    pingPending = true
+    return new Promise<number>((resolve) => {
+      bot._client.write('ping' as any, { time: [0, 0] })
+      const date = Date.now()
+      const onPong = () => {
+        bot._client.off('ping' as any, onPong)
+        resolve(Date.now() - date)
+        pingPending = false
+      }
+      bot._client.on('ping' as any, onPong)
+    })
+  }
+}
+
+declare module 'mineflayer' {
+  interface Bot {
+    pingProxy: () => Promise<number>
+    pingServer: () => Promise<number | undefined>
+  }
+}
diff --git a/src/react/hooks/useScrollBehavior.ts b/src/react/hooks/useScrollBehavior.ts
index d8cabf07..c7c4499a 100644
--- a/src/react/hooks/useScrollBehavior.ts
+++ b/src/react/hooks/useScrollBehavior.ts
@@ -1,4 +1,5 @@
 import { RefObject, useEffect, useLayoutEffect, useRef } from 'react'
+import { pixelartIcons } from '../PixelartIcon'
 
 export const useScrollBehavior = (
   elementRef: RefObject<HTMLElement>,
@@ -11,7 +12,6 @@ export const useScrollBehavior = (
   }
 ) => {
   const openedWasAtBottom = useRef(true) // before new messages
-  window.openedWasAtBottom = openedWasAtBottom
 
   const isAtBottom = () => {
     if (!elementRef.current) return true

From 612b35426e96a6721da7e8c90fc649db14e14a63 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 18 Feb 2025 20:36:59 +0300
Subject: [PATCH 241/753] feat: add ping display view in pause menu!

---
 src/index.ts                            | 18 +------
 src/mineflayer/plugins/ping.ts          | 18 +++----
 src/react/NetworkStatus.module.css      | 42 ++++++++++++++++
 src/react/NetworkStatus.module.css.d.ts | 12 +++++
 src/react/NetworkStatus.tsx             | 64 +++++++++++++++++++++++++
 src/react/PauseScreen.tsx               |  4 ++
 src/react/PixelartIcon.tsx              |  2 +-
 7 files changed, 135 insertions(+), 25 deletions(-)
 create mode 100644 src/react/NetworkStatus.module.css
 create mode 100644 src/react/NetworkStatus.module.css.d.ts
 create mode 100644 src/react/NetworkStatus.tsx

diff --git a/src/index.ts b/src/index.ts
index bf41abc9..a21fa001 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -110,6 +110,7 @@ import { playerState, PlayerStateManager } from './mineflayer/playerState'
 import { states } from 'minecraft-protocol'
 import { initMotionTracking } from './react/uiMotion'
 import { UserError } from './mineflayer/userError'
+import ping from './mineflayer/plugins/ping'
 
 window.debug = debug
 window.THREE = THREE
@@ -643,22 +644,7 @@ export async function connect (connectOptions: ConnectOptions) {
             })
           })
         })
-        let i = 0
-        //@ts-expect-error
-        bot.pingProxy = async () => {
-          const curI = ++i
-          return new Promise(resolve => {
-            //@ts-expect-error
-            bot._client.socket._ws.send(`ping:${curI}`)
-            const date = Date.now()
-            const onPong = (received) => {
-              if (received !== curI.toString()) return
-              bot._client.socket.off('pong' as any, onPong)
-              resolve(Date.now() - date)
-            }
-            bot._client.socket.on('pong' as any, onPong)
-          })
-        }
+        bot.loadPlugin(ping)
       }
       // socket setup actually can be delayed because of dns lookup
       if (bot._client.socket) {
diff --git a/src/mineflayer/plugins/ping.ts b/src/mineflayer/plugins/ping.ts
index fe0ac85d..47af8986 100644
--- a/src/mineflayer/plugins/ping.ts
+++ b/src/mineflayer/plugins/ping.ts
@@ -1,3 +1,5 @@
+import { versionToNumber } from 'renderer/viewer/prepare/utils'
+
 export default () => {
   let i = 0
   bot.pingProxy = async () => {
@@ -15,19 +17,19 @@ export default () => {
     })
   }
 
-  let pingPending = false
+  let pingId = 0
   bot.pingServer = async () => {
-    if (pingPending) return
-    pingPending = true
+    if (versionToNumber(bot.version) < versionToNumber('1.20.2')) return bot.player.ping
     return new Promise<number>((resolve) => {
-      bot._client.write('ping' as any, { time: [0, 0] })
+      const curId = pingId++
+      bot._client.write('ping_request', { id: BigInt(curId) })
       const date = Date.now()
-      const onPong = () => {
-        bot._client.off('ping' as any, onPong)
+      const onPong = (data: { id: bigint }) => {
+        if (BigInt(data.id) !== BigInt(curId)) return
+        bot._client.off('ping_response' as any, onPong)
         resolve(Date.now() - date)
-        pingPending = false
       }
-      bot._client.on('ping' as any, onPong)
+      bot._client.on('ping_response' as any, onPong)
     })
   }
 }
diff --git a/src/react/NetworkStatus.module.css b/src/react/NetworkStatus.module.css
new file mode 100644
index 00000000..3752379e
--- /dev/null
+++ b/src/react/NetworkStatus.module.css
@@ -0,0 +1,42 @@
+.container {
+  scale: 0.8;
+  transform-origin: left;
+  display: grid;
+  grid-template-columns: auto auto auto auto auto;
+  gap: 2px 4px;
+  font-size: 8px;
+  color: #fff;
+  opacity: 0.8;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  justify-items: center;
+}
+
+.iconRow {
+    display: block;
+}
+.arrowRow {
+    scale: 1.5 1;
+}
+
+.dataRow {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 70px;
+  font-size: 5px;
+}
+
+.ping {
+  font-size: 6px;
+}
+
+/* .dataRow > span:nth-child(3) {
+  max-width: 120px;
+} */
+
+.totalRow {
+  grid-column: span 3;
+  font-size: 7px;
+}
diff --git a/src/react/NetworkStatus.module.css.d.ts b/src/react/NetworkStatus.module.css.d.ts
new file mode 100644
index 00000000..13cb6950
--- /dev/null
+++ b/src/react/NetworkStatus.module.css.d.ts
@@ -0,0 +1,12 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  arrowRow: string;
+  container: string;
+  dataRow: string;
+  iconRow: string;
+  ping: string;
+  totalRow: string;
+}
+declare const cssExports: CssExports;
+export default cssExports;
diff --git a/src/react/NetworkStatus.tsx b/src/react/NetworkStatus.tsx
new file mode 100644
index 00000000..57e3990e
--- /dev/null
+++ b/src/react/NetworkStatus.tsx
@@ -0,0 +1,64 @@
+import { useEffect, useState } from 'react'
+import { lastConnectOptions } from './AppStatusProvider'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+import styles from './NetworkStatus.module.css'
+
+export default () => {
+  const [proxyPing, setProxyPing] = useState<number | null>(null)
+  const [serverPing, setServerPing] = useState<number | null>(null)
+
+  useEffect(() => {
+    if (!lastConnectOptions.value?.proxy) return
+
+    let update = 0
+
+    const updatePing = async () => {
+      const currentUpdate = ++update
+
+      const updateServerPing = async () => {
+        const ping = await bot.pingServer()
+        if (ping) setServerPing(ping)
+      }
+
+      const updateProxyPing = async () => {
+        const ping = await bot.pingProxy()
+        setProxyPing(ping)
+      }
+
+      try {
+        await Promise.all([updateServerPing(), updateProxyPing()])
+      } catch (err) {
+        console.error('Failed to ping:', err)
+      }
+    }
+
+    void updatePing()
+    const interval = setInterval(updatePing, 1000)
+    return () => clearInterval(interval)
+  }, [])
+
+  // if (!lastConnectOptions.value?.proxy) return null
+
+  const { username } = bot.player
+  const { proxy: proxyUrl, server: serverIp } = lastConnectOptions.value!
+  const pingTotal = serverPing
+
+  const ICON_SIZE = 18
+  return (
+    <div className={styles.container}>
+      <PixelartIcon className={styles.iconRow} iconName={pixelartIcons.monitor} width={ICON_SIZE} />
+      <PixelartIcon className={`${styles.iconRow} ${styles.arrowRow}`} iconName={pixelartIcons['arrow-right']} width={16} />
+      <PixelartIcon className={styles.iconRow} iconName={pixelartIcons.server} width={ICON_SIZE} />
+      <PixelartIcon className={`${styles.iconRow} ${styles.arrowRow}`} iconName={pixelartIcons['arrow-right']} width={16} />
+      <PixelartIcon className={styles.iconRow} iconName={pixelartIcons['list-box']} width={ICON_SIZE} />
+
+      <span className={styles.dataRow}>{username}</span>
+      <span className={`${styles.dataRow} ${styles.ping}`}>{proxyPing}ms</span>
+      <span className={styles.dataRow}>{proxyUrl}</span>
+      <span className={`${styles.dataRow} ${styles.ping}`}>{pingTotal ? pingTotal - (proxyPing ?? 0) : '...'}ms</span>
+      <span className={styles.dataRow}>{serverIp}</span>
+
+      <span className={styles.totalRow}>Ping: {pingTotal}ms</span>
+    </div>
+  )
+}
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 0d2f0fab..0215c6d7 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -30,6 +30,7 @@ import styles from './PauseScreen.module.css'
 import { DiscordButton } from './DiscordButton'
 import { showNotification } from './NotificationProvider'
 import { appStatusState, reconnectReload } from './AppStatusProvider'
+import NetworkStatus from './NetworkStatus'
 
 const waitForPotentialRender = async () => {
   return new Promise<void>(resolve => {
@@ -226,6 +227,9 @@ export default () => {
       style={{ position: 'fixed', top: '5px', left: 'calc(env(safe-area-inset-left) + 5px)' }}
       onClick={async () => openWorldActions()}
     />
+    <div style={{ position: 'fixed', top: '5px', left: 'calc(env(safe-area-inset-left) + 35px)' }}>
+      <NetworkStatus />
+    </div>
     <div className={styles.pause_container}>
       <Button className="button" style={{ width: '204px' }} onClick={onReturnPress}>Back to Game</Button>
       <div className={styles.row}>
diff --git a/src/react/PixelartIcon.tsx b/src/react/PixelartIcon.tsx
index 5e6302e8..8694d9f5 100644
--- a/src/react/PixelartIcon.tsx
+++ b/src/react/PixelartIcon.tsx
@@ -8,7 +8,7 @@ export default ({
   className = undefined as undefined | string,
   onClick = () => { }
 }) => {
-  if (width !== undefined) styles = { width, height: width, ...styles }
+  if (width !== undefined) styles = { width, height: width, fontSize: width, ...styles }
   iconName = iconName.replace('pixelarticons:', '')
 
   return <div

From 71966238535977d501cf9a7cdcbf12b15e36c2f8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 18 Feb 2025 20:37:15 +0300
Subject: [PATCH 242/753] minor visual updates to status component

---
 src/react/NetworkStatus.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/react/NetworkStatus.tsx b/src/react/NetworkStatus.tsx
index 57e3990e..386e08cf 100644
--- a/src/react/NetworkStatus.tsx
+++ b/src/react/NetworkStatus.tsx
@@ -37,16 +37,16 @@ export default () => {
     return () => clearInterval(interval)
   }, [])
 
-  // if (!lastConnectOptions.value?.proxy) return null
+  if (!lastConnectOptions.value?.proxy) return null
 
   const { username } = bot.player
-  const { proxy: proxyUrl, server: serverIp } = lastConnectOptions.value!
+  const { proxy: proxyUrl, server: serverIp } = lastConnectOptions.value
   const pingTotal = serverPing
 
   const ICON_SIZE = 18
   return (
     <div className={styles.container}>
-      <PixelartIcon className={styles.iconRow} iconName={pixelartIcons.monitor} width={ICON_SIZE} />
+      <PixelartIcon className={styles.iconRow} iconName={pixelartIcons.user} width={ICON_SIZE} />
       <PixelartIcon className={`${styles.iconRow} ${styles.arrowRow}`} iconName={pixelartIcons['arrow-right']} width={16} />
       <PixelartIcon className={styles.iconRow} iconName={pixelartIcons.server} width={ICON_SIZE} />
       <PixelartIcon className={`${styles.iconRow} ${styles.arrowRow}`} iconName={pixelartIcons['arrow-right']} width={16} />

From 0cd11ebe293576ea2d3c185110f534348a1bd392 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 18 Feb 2025 20:58:19 +0300
Subject: [PATCH 243/753] regression hand disappeared

---
 src/devtools.ts     | 10 ++++++++++
 src/index.ts        | 13 +++++++------
 src/watchOptions.ts |  1 +
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/devtools.ts b/src/devtools.ts
index e534c293..5d0be20b 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -150,3 +150,13 @@ Object.defineProperty(window, 'debugToggle', {
 customEvents.on('gameLoaded', () => {
   window.holdingBlock = (viewer.world as WorldRendererThree).holdingBlock
 })
+
+window.clearStorage = (...keysToKeep: string[]) => {
+  for (let i = 0; i < localStorage.length; i++) {
+    const key = localStorage.key(i)
+    if (key && !keysToKeep.includes(key)) {
+      localStorage.removeItem(key)
+    }
+  }
+  return `Cleared ${localStorage.length - keysToKeep.length} items from localStorage. Kept: ${keysToKeep.join(', ')}`
+}
diff --git a/src/index.ts b/src/index.ts
index a21fa001..74bf2f27 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -711,6 +711,13 @@ export async function connect (connectOptions: ConnectOptions) {
     worldInteractions.initBot()
 
     setLoadingScreenStatus('Loading world')
+
+    const mcData = MinecraftData(bot.version)
+    window.PrismarineBlock = PrismarineBlock(mcData.version.minecraftVersion!)
+    window.PrismarineItem = PrismarineItem(mcData.version.minecraftVersion!)
+    window.loadedData = mcData
+    window.Vec3 = Vec3
+    window.pathfinder = pathfinder
   })
 
   const spawnEarlier = !singleplayer && !p2pMultiplayer
@@ -731,12 +738,6 @@ export async function connect (connectOptions: ConnectOptions) {
     }
     window.focus?.()
     errorAbortController.abort()
-    const mcData = MinecraftData(bot.version)
-    window.PrismarineBlock = PrismarineBlock(mcData.version.minecraftVersion!)
-    window.PrismarineItem = PrismarineItem(mcData.version.minecraftVersion!)
-    window.loadedData = mcData
-    window.Vec3 = Vec3
-    window.pathfinder = pathfinder
 
     miscUiState.gameLoaded = true
     miscUiState.loadedServerIndex = connectOptions.serverIndex ?? ''
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index acedad71..724fb2ba 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -97,6 +97,7 @@ export const watchOptionsAfterWorldViewInit = () => {
     if (!worldView) return
     worldView.keepChunksDistance = o.keepChunksDistance
     viewer.world.config.renderEars = o.renderEars
+    viewer.world.config.showHand = o.showHand
     viewer.world.config.viewBobbing = o.viewBobbing
   })
 }

From 44d630b1b3f7ebbb98e1002f3446fc2a927d0e58 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 18 Feb 2025 21:25:18 +0300
Subject: [PATCH 244/753] fix entities apply skin crash fix websocket ping
 display for ws

---
 renderer/viewer/lib/entities.ts         | 13 +++++--
 src/index.ts                            |  5 ++-
 src/react/AppStatusProvider.tsx         |  1 +
 src/react/NetworkStatus.module.css      |  4 +++
 src/react/NetworkStatus.module.css.d.ts |  1 +
 src/react/NetworkStatus.tsx             | 45 +++++++++++++++----------
 6 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/renderer/viewer/lib/entities.ts b/renderer/viewer/lib/entities.ts
index 21802089..df7ea926 100644
--- a/renderer/viewer/lib/entities.ts
+++ b/renderer/viewer/lib/entities.ts
@@ -383,19 +383,26 @@ export class Entities extends EventEmitter {
       if (!playerObject) return
 
       let skinTexture: THREE.Texture
+      let skinCanvas: HTMLCanvasElement
       if (skinUrl === stevePngUrl) {
         skinTexture = await steveTexture
+        const canvas = document.createElement('canvas')
+        const ctx = canvas.getContext('2d')
+        if (!ctx) throw new Error('Failed to get context')
+        ctx.drawImage(skinTexture.image, 0, 0)
+        skinCanvas = canvas
       } else {
-        const { canvas: skinCanvas, image } = await loadSkinImage(skinUrl)
+        const { canvas, image } = await loadSkinImage(skinUrl)
         playerCustomSkinImage = image
-        skinTexture = new THREE.CanvasTexture(skinCanvas)
+        skinTexture = new THREE.CanvasTexture(canvas)
+        skinCanvas = canvas
       }
 
       skinTexture.magFilter = THREE.NearestFilter
       skinTexture.minFilter = THREE.NearestFilter
       skinTexture.needsUpdate = true
       playerObject.skin.map = skinTexture as any
-      playerObject.skin.modelType = inferModelType(skinTexture.image)
+      playerObject.skin.modelType = inferModelType(skinCanvas)
 
       let earsCanvas
       if (renderEars && playerCustomSkinImage) {
diff --git a/src/index.ts b/src/index.ts
index 74bf2f27..941b76c2 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -644,7 +644,6 @@ export async function connect (connectOptions: ConnectOptions) {
             })
           })
         })
-        bot.loadPlugin(ping)
       }
       // socket setup actually can be delayed because of dns lookup
       if (bot._client.socket) {
@@ -662,6 +661,10 @@ export async function connect (connectOptions: ConnectOptions) {
   } catch (err) {
     handleError(err)
   }
+
+  if (connectOptions.server) {
+    bot.loadPlugin(ping)
+  }
   if (!bot) return
 
   const p2pConnectTimeout = p2pMultiplayer ? setTimeout(() => { throw new UserError('Spawn timeout. There might be error on the other side, check console.') }, 20_000) : undefined
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index 955a2cc5..09fcb40a 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -36,6 +36,7 @@ export const resetAppStatusState = () => {
 export const lastConnectOptions = {
   value: null as ConnectOptions | null
 }
+globalThis.lastConnectOptions = lastConnectOptions
 
 const saveReconnectOptions = (options: ConnectOptions) => {
   sessionStorage.setItem('reconnectOptions', JSON.stringify({
diff --git a/src/react/NetworkStatus.module.css b/src/react/NetworkStatus.module.css
index 3752379e..372ea79f 100644
--- a/src/react/NetworkStatus.module.css
+++ b/src/react/NetworkStatus.module.css
@@ -13,6 +13,10 @@
   justify-items: center;
 }
 
+.container.websocket {
+  grid-template-columns: auto auto auto;
+}
+
 .iconRow {
     display: block;
 }
diff --git a/src/react/NetworkStatus.module.css.d.ts b/src/react/NetworkStatus.module.css.d.ts
index 13cb6950..bea85a4c 100644
--- a/src/react/NetworkStatus.module.css.d.ts
+++ b/src/react/NetworkStatus.module.css.d.ts
@@ -7,6 +7,7 @@ interface CssExports {
   iconRow: string;
   ping: string;
   totalRow: string;
+  websocket: string;
 }
 declare const cssExports: CssExports;
 export default cssExports;
diff --git a/src/react/NetworkStatus.tsx b/src/react/NetworkStatus.tsx
index 386e08cf..27d619d7 100644
--- a/src/react/NetworkStatus.tsx
+++ b/src/react/NetworkStatus.tsx
@@ -1,4 +1,5 @@
-import { useEffect, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
+import { parseServerAddress } from '../parseServerAddress'
 import { lastConnectOptions } from './AppStatusProvider'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import styles from './NetworkStatus.module.css'
@@ -7,22 +8,23 @@ export default () => {
   const [proxyPing, setProxyPing] = useState<number | null>(null)
   const [serverPing, setServerPing] = useState<number | null>(null)
 
-  useEffect(() => {
-    if (!lastConnectOptions.value?.proxy) return
+  const isWebSocket = useMemo(() => parseServerAddress(lastConnectOptions.value?.server).isWebSocket, [lastConnectOptions.value?.server])
+  const serverIp = useMemo(() => lastConnectOptions.value?.server, [])
 
-    let update = 0
+  useEffect(() => {
+    if (!serverIp) return
 
     const updatePing = async () => {
-      const currentUpdate = ++update
-
       const updateServerPing = async () => {
         const ping = await bot.pingServer()
         if (ping) setServerPing(ping)
       }
 
       const updateProxyPing = async () => {
-        const ping = await bot.pingProxy()
-        setProxyPing(ping)
+        if (!isWebSocket) {
+          const ping = await bot.pingProxy()
+          setProxyPing(ping)
+        }
       }
 
       try {
@@ -37,28 +39,37 @@ export default () => {
     return () => clearInterval(interval)
   }, [])
 
-  if (!lastConnectOptions.value?.proxy) return null
+  if (!serverIp) return null
 
   const { username } = bot.player
-  const { proxy: proxyUrl, server: serverIp } = lastConnectOptions.value
+  const { proxy: proxyUrl } = lastConnectOptions.value!
   const pingTotal = serverPing
 
   const ICON_SIZE = 18
+
   return (
-    <div className={styles.container}>
+    <div className={`${styles.container} ${isWebSocket ? styles.websocket : ''}`}>
       <PixelartIcon className={styles.iconRow} iconName={pixelartIcons.user} width={ICON_SIZE} />
-      <PixelartIcon className={`${styles.iconRow} ${styles.arrowRow}`} iconName={pixelartIcons['arrow-right']} width={16} />
-      <PixelartIcon className={styles.iconRow} iconName={pixelartIcons.server} width={ICON_SIZE} />
+      {!isWebSocket && (
+        <>
+          <PixelartIcon className={`${styles.iconRow} ${styles.arrowRow}`} iconName={pixelartIcons['arrow-right']} width={16} />
+          <PixelartIcon className={styles.iconRow} iconName={pixelartIcons.server} width={ICON_SIZE} />
+        </>
+      )}
       <PixelartIcon className={`${styles.iconRow} ${styles.arrowRow}`} iconName={pixelartIcons['arrow-right']} width={16} />
       <PixelartIcon className={styles.iconRow} iconName={pixelartIcons['list-box']} width={ICON_SIZE} />
 
       <span className={styles.dataRow}>{username}</span>
-      <span className={`${styles.dataRow} ${styles.ping}`}>{proxyPing}ms</span>
-      <span className={styles.dataRow}>{proxyUrl}</span>
-      <span className={`${styles.dataRow} ${styles.ping}`}>{pingTotal ? pingTotal - (proxyPing ?? 0) : '...'}ms</span>
+      {!isWebSocket && (
+        <>
+          <span className={`${styles.dataRow} ${styles.ping}`}>{proxyPing}ms</span>
+          <span className={styles.dataRow}>{proxyUrl}</span>
+        </>
+      )}
+      <span className={`${styles.dataRow} ${styles.ping}`}>{isWebSocket ? (pingTotal || '?') : (pingTotal ? pingTotal - (proxyPing ?? 0) : '...')}ms</span>
       <span className={styles.dataRow}>{serverIp}</span>
 
-      <span className={styles.totalRow}>Ping: {pingTotal}ms</span>
+      <span className={styles.totalRow}>Ping: {pingTotal || '?'}ms</span>
     </div>
   )
 }

From f8c44ae4f01328bfde5d56e4e3555127287706e9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 19 Feb 2025 02:57:21 +0300
Subject: [PATCH 245/753] add mirror server for play.mcraft.fun

---
 config.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config.json b/config.json
index 58b35a75..d6d68b94 100644
--- a/config.json
+++ b/config.json
@@ -9,6 +9,9 @@
     {
       "ip": "ws://play.mcraft.fun"
     },
+    {
+      "ip": "ws://play2.mcraft.fun"
+    },
     {
       "ip": "kaboom.pw",
       "version": "1.20.3",

From a0a01d9a3fa65aaf2f18118168c77a948c706962 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 19 Feb 2025 03:01:52 +0300
Subject: [PATCH 246/753] disable possibly invalid entity checks

---
 renderer/viewer/lib/entity/EntityMesh.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/renderer/viewer/lib/entity/EntityMesh.ts b/renderer/viewer/lib/entity/EntityMesh.ts
index f0b90e19..74023794 100644
--- a/renderer/viewer/lib/entity/EntityMesh.ts
+++ b/renderer/viewer/lib/entity/EntityMesh.ts
@@ -175,14 +175,14 @@ function addCube (
         u = (cube.uv[0] + dot(pos[3] ? u1 : u0, cube.size)) / texWidth
         v = (cube.uv[1] + dot(pos[4] ? v1 : v0, cube.size)) / texHeight
       }
-      if (isNaN(u) || isNaN(v)) {
-        errors.push(`NaN u: ${u}, v: ${v}`)
-        continue
-      }
-      if (u < 0 || u > 1 || v < 0 || v > 1) {
-        errors.push(`u: ${u}, v: ${v} out of range`)
-        continue
-      }
+      // if (isNaN(u) || isNaN(v)) {
+      //   errors.push(`NaN u: ${u}, v: ${v}`)
+      //   continue
+      // }
+      // if (u < 0 || u > 1 || v < 0 || v > 1) {
+      //   errors.push(`u: ${u}, v: ${v} out of range`)
+      //   continue
+      // }
 
       const posX = eastOrWest && mirror ? pos[0] ^ 1 : pos[0]
       const posY = pos[1]

From b7e6793c07c8aabab3a7b635a487606c703c2d9f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 19 Feb 2025 03:13:28 +0300
Subject: [PATCH 247/753] do not display invisible ears on steve (default skin)

---
 renderer/viewer/lib/entities.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/renderer/viewer/lib/entities.ts b/renderer/viewer/lib/entities.ts
index df7ea926..a09d57eb 100644
--- a/renderer/viewer/lib/entities.ts
+++ b/renderer/viewer/lib/entities.ts
@@ -404,14 +404,16 @@ export class Entities extends EventEmitter {
       playerObject.skin.map = skinTexture as any
       playerObject.skin.modelType = inferModelType(skinCanvas)
 
-      let earsCanvas
-      if (renderEars && playerCustomSkinImage) {
+      let earsCanvas: HTMLCanvasElement | undefined
+      if (!playerCustomSkinImage) {
+        renderEars = false
+      } else if (renderEars) {
         earsCanvas = document.createElement('canvas')
         loadEarsToCanvasFromSkin(earsCanvas, playerCustomSkinImage)
         renderEars = !this.isCanvasBlank(earsCanvas)
       }
       if (renderEars) {
-        const earsTexture = new THREE.CanvasTexture(earsCanvas)
+        const earsTexture = new THREE.CanvasTexture(earsCanvas!)
         earsTexture.magFilter = THREE.NearestFilter
         earsTexture.minFilter = THREE.NearestFilter
         earsTexture.needsUpdate = true

From 0bb63010569ceace36234be3fcbf10b03ad74a9d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 19 Feb 2025 03:26:14 +0300
Subject: [PATCH 248/753] feat: now always focus chat when letter or ctrl+v is
 pressed (like in discord) feat: hide completions when input is not focused

---
 src/react/Chat.tsx | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index a0fcc241..1752daba 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -70,6 +70,7 @@ export default ({
   placeholder
 }: Props) => {
   const sendHistoryRef = useRef(JSON.parse(window.sessionStorage.chatHistory || '[]'))
+  const [isInputFocused, setIsInputFocused] = useState(false)
 
   const [completePadText, setCompletePadText] = useState('')
   const completeRequestValue = useRef('')
@@ -127,13 +128,31 @@ export default ({
       if (!usingTouch) {
         chatInput.current.focus()
       }
-      const unsubscribe = subscribe(chatInputValueGlobal, () => {
+
+      // Add keyboard event listener for letter keys and paste
+      const handleKeyDown = (e: KeyboardEvent) => {
+        // Check if it's a single character key (works with any layout) without modifiers except shift
+        const isSingleChar = e.key.length === 1 && !e.ctrlKey && !e.altKey && !e.metaKey
+        // Check if it's paste command
+        const isPaste = e.code === 'KeyV' && (e.ctrlKey || e.metaKey)
+
+        if ((isSingleChar || isPaste) && document.activeElement !== chatInput.current) {
+          chatInput.current.focus()
+        }
+      }
+
+      window.addEventListener('keydown', handleKeyDown)
+      const unsubscribeValtio = subscribe(chatInputValueGlobal, () => {
         if (!chatInputValueGlobal.value) return
         updateInputValue(chatInputValueGlobal.value)
         chatInputValueGlobal.value = ''
         chatInput.current.focus()
       })
-      return unsubscribe
+
+      return () => {
+        window.removeEventListener('keydown', handleKeyDown)
+        unsubscribeValtio()
+      }
     }
   }, [opened])
 
@@ -213,7 +232,7 @@ export default ({
         {/* close button */}
         {usingTouch && <Button icon={pixelartIcons.close} onClick={() => onClose?.()} />}
         <div className="chat-input">
-          {completionItems?.length ? (
+          {isInputFocused && completionItems?.length ? (
             <div className="chat-completions">
               <div className="chat-completions-pad-text">{completePadText}</div>
               <div className="chat-completions-items">
@@ -259,6 +278,8 @@ export default ({
               onChange={onMainInputChange}
               disabled={!!inputDisabled}
               placeholder={inputDisabled || placeholder}
+              onFocus={() => setIsInputFocused(true)}
+              onBlur={() => setIsInputFocused(false)}
               onKeyDown={(e) => {
                 if (e.code === 'ArrowUp') {
                   if (chatHistoryPos.current === 0) return

From bfd88ce54430f0aceb88ae01adb5ee01289eb9b4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 19 Feb 2025 03:33:39 +0300
Subject: [PATCH 249/753] add stale ping status display

---
 src/react/NetworkStatus.module.css      |  4 +++
 src/react/NetworkStatus.module.css.d.ts |  1 +
 src/react/NetworkStatus.tsx             | 39 +++++++++++++++++++++----
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/react/NetworkStatus.module.css b/src/react/NetworkStatus.module.css
index 372ea79f..7b4de39e 100644
--- a/src/react/NetworkStatus.module.css
+++ b/src/react/NetworkStatus.module.css
@@ -44,3 +44,7 @@
   grid-column: span 3;
   font-size: 7px;
 }
+
+.stale {
+  color: #ff4444;
+}
diff --git a/src/react/NetworkStatus.module.css.d.ts b/src/react/NetworkStatus.module.css.d.ts
index bea85a4c..1fe32b1b 100644
--- a/src/react/NetworkStatus.module.css.d.ts
+++ b/src/react/NetworkStatus.module.css.d.ts
@@ -6,6 +6,7 @@ interface CssExports {
   dataRow: string;
   iconRow: string;
   ping: string;
+  stale: string;
   totalRow: string;
   websocket: string;
 }
diff --git a/src/react/NetworkStatus.tsx b/src/react/NetworkStatus.tsx
index 27d619d7..1eeb9584 100644
--- a/src/react/NetworkStatus.tsx
+++ b/src/react/NetworkStatus.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useMemo, useState, useRef } from 'react'
 import { parseServerAddress } from '../parseServerAddress'
 import { lastConnectOptions } from './AppStatusProvider'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
@@ -7,23 +7,44 @@ import styles from './NetworkStatus.module.css'
 export default () => {
   const [proxyPing, setProxyPing] = useState<number | null>(null)
   const [serverPing, setServerPing] = useState<number | null>(null)
+  const [isProxyStale, setIsProxyStale] = useState(false)
+  const [isServerStale, setIsServerStale] = useState(false)
+
+  const proxyTimeoutRef = useRef<NodeJS.Timeout>()
+  const serverTimeoutRef = useRef<NodeJS.Timeout>()
 
   const isWebSocket = useMemo(() => parseServerAddress(lastConnectOptions.value?.server).isWebSocket, [lastConnectOptions.value?.server])
   const serverIp = useMemo(() => lastConnectOptions.value?.server, [])
 
+  const setProxyPingWithTimeout = (ping: number | null) => {
+    setProxyPing(ping)
+    setIsProxyStale(false)
+    if (proxyTimeoutRef.current) clearTimeout(proxyTimeoutRef.current)
+    proxyTimeoutRef.current = setTimeout(() => setIsProxyStale(true), 1000)
+  }
+
+  const setServerPingWithTimeout = (ping: number | null) => {
+    setServerPing(ping)
+    setIsServerStale(false)
+    if (serverTimeoutRef.current) clearTimeout(serverTimeoutRef.current)
+    serverTimeoutRef.current = setTimeout(() => setIsServerStale(true), 1000)
+  }
+
   useEffect(() => {
     if (!serverIp) return
 
     const updatePing = async () => {
       const updateServerPing = async () => {
         const ping = await bot.pingServer()
-        if (ping) setServerPing(ping)
+        if (ping) {
+          setServerPingWithTimeout(ping)
+        }
       }
 
       const updateProxyPing = async () => {
         if (!isWebSocket) {
           const ping = await bot.pingProxy()
-          setProxyPing(ping)
+          setProxyPingWithTimeout(ping)
         }
       }
 
@@ -36,7 +57,11 @@ export default () => {
 
     void updatePing()
     const interval = setInterval(updatePing, 1000)
-    return () => clearInterval(interval)
+    return () => {
+      clearInterval(interval)
+      if (proxyTimeoutRef.current) clearTimeout(proxyTimeoutRef.current)
+      if (serverTimeoutRef.current) clearTimeout(serverTimeoutRef.current)
+    }
   }, [])
 
   if (!serverIp) return null
@@ -62,11 +87,13 @@ export default () => {
       <span className={styles.dataRow}>{username}</span>
       {!isWebSocket && (
         <>
-          <span className={`${styles.dataRow} ${styles.ping}`}>{proxyPing}ms</span>
+          <span className={`${styles.dataRow} ${styles.ping} ${isProxyStale ? styles.stale : ''}`}>{proxyPing}ms</span>
           <span className={styles.dataRow}>{proxyUrl}</span>
         </>
       )}
-      <span className={`${styles.dataRow} ${styles.ping}`}>{isWebSocket ? (pingTotal || '?') : (pingTotal ? pingTotal - (proxyPing ?? 0) : '...')}ms</span>
+      <span className={`${styles.dataRow} ${styles.ping} ${isServerStale ? styles.stale : ''}`}>
+        {isWebSocket ? (pingTotal || '?') : (pingTotal ? pingTotal - (proxyPing ?? 0) : '...')}ms
+      </span>
       <span className={styles.dataRow}>{serverIp}</span>
 
       <span className={styles.totalRow}>Ping: {pingTotal || '?'}ms</span>

From 11bfcb8f1a74b435b186913cdac9c7793f98ff70 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 19 Feb 2025 03:40:02 +0300
Subject: [PATCH 250/753] fix wasnt possible to click suggestions

---
 src/react/Chat.tsx | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 1752daba..8e15180d 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -192,13 +192,15 @@ export default ({
     updateFilteredCompleteItems(newItems)
   }
 
-  const updateFilteredCompleteItems = (sourceItems: string[]) => {
-    const newCompleteItems = sourceItems.filter(item => {
+  const updateFilteredCompleteItems = (sourceItems: string[] | Array<{ match: string, toolip: string }>) => {
+    const newCompleteItems = sourceItems
+      .map(item => (typeof item === 'string' ? item : item.match))
+      .filter(item => {
       // this regex is imporatnt is it controls the word matching
-      const compareableParts = item.split(/[[\]{},_:]/)
-      const lastWord = chatInput.current.value.slice(0, chatInput.current.selectionEnd ?? chatInput.current.value.length).split(' ').at(-1)!
-      return [item, ...compareableParts].some(compareablePart => compareablePart.startsWith(lastWord))
-    })
+        const compareableParts = item.split(/[[\]{},_:]/)
+        const lastWord = chatInput.current.value.slice(0, chatInput.current.selectionEnd ?? chatInput.current.value.length).split(' ').at(-1)!
+        return [item, ...compareableParts].some(compareablePart => compareablePart.startsWith(lastWord))
+      })
     setCompletionItems(newCompleteItems)
   }
 
@@ -237,7 +239,15 @@ export default ({
               <div className="chat-completions-pad-text">{completePadText}</div>
               <div className="chat-completions-items">
                 {completionItems.map((item) => (
-                  <div key={item} onClick={() => acceptComplete(item)}>{item}</div>
+                  <div
+                    key={item}
+                    onMouseDown={(e) => {
+                      e.preventDefault() // Prevent blur before click
+                      acceptComplete(item)
+                    }}
+                  >
+                    {item}
+                  </div>
                 ))}
               </div>
             </div>

From 5fd3584823c107f9767002967487efe0e630305b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 19 Feb 2025 03:44:50 +0300
Subject: [PATCH 251/753] move reconnect button below disconnect

---
 src/react/PauseScreen.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 0215c6d7..0d4e9a57 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -260,16 +260,16 @@ export default () => {
           />
         </div>
       ) : null}
-      {noConnection && (
-        <Button className="button" style={{ width: '204px' }} onClick={reconnectReload}>
-          Reconnect
-        </Button>
-      )}
       {!lockConnect && <>
         <Button className="button" style={{ width: '204px' }} onClick={disconnect}>
           {localServer && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
         </Button>
       </>}
+      {noConnection && (
+        <Button className="button" style={{ width: '204px' }} onClick={reconnectReload}>
+          Reconnect
+        </Button>
+      )}
     </div>
   </Screen>
 }

From 795f241cbd69604f846c9e6a064d611fcc4d5559 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 19 Feb 2025 01:53:36 +0100
Subject: [PATCH 252/753] fix: floor and ceiling button hitboxes (#282)

Co-authored-by: Vitaly <vital2580@icloud.com>
---
 src/interactionShapesGenerated.json | 832 ++++++++++++++--------------
 1 file changed, 416 insertions(+), 416 deletions(-)

diff --git a/src/interactionShapesGenerated.json b/src/interactionShapesGenerated.json
index 425cfb0d..8c8c283e 100644
--- a/src/interactionShapesGenerated.json
+++ b/src/interactionShapesGenerated.json
@@ -1632,20 +1632,20 @@
     },
     "stone_button": {
         "face=floor,facing=north,powered=false": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             2,
-            11
+            10
         ],
         "face=floor,facing=north,powered=true": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             1,
-            11
+            10
         ],
         "face=floor,facing=south,powered=false": [
             5,
@@ -1664,34 +1664,34 @@
             10
         ],
         "face=floor,facing=west,powered=false": [
-            14,
+            6,
             0,
             5,
-            16,
+            10,
             2,
             11
         ],
         "face=floor,facing=west,powered=true": [
-            15,
+            6,
             0,
             5,
-            16,
+            10,
             1,
             11
         ],
         "face=floor,facing=east,powered=false": [
-            0,
+            6,
             0,
             5,
-            2,
+            10,
             2,
             11
         ],
         "face=floor,facing=east,powered=true": [
-            0,
+            6,
             0,
             5,
-            1,
+            10,
             1,
             11
         ],
@@ -1760,20 +1760,20 @@
             11
         ],
         "face=ceiling,facing=north,powered=false": [
-            6,
-            14,
             5,
-            10,
+            14,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=north,powered=true": [
-            6,
-            15,
             5,
-            10,
+            15,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=south,powered=false": [
             5,
@@ -1792,34 +1792,34 @@
             10
         ],
         "face=ceiling,facing=west,powered=false": [
-            14,
+            6,
             14,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=west,powered=true": [
-            15,
+            6,
             15,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=false": [
-            0,
+            6,
             14,
             5,
-            2,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=true": [
-            0,
+            6,
             15,
             5,
-            1,
+            10,
             16,
             11
         ]
@@ -2374,20 +2374,20 @@
     },
     "oak_button": {
         "face=floor,facing=north,powered=false": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             2,
-            11
+            10
         ],
         "face=floor,facing=north,powered=true": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             1,
-            11
+            10
         ],
         "face=floor,facing=south,powered=false": [
             5,
@@ -2406,34 +2406,34 @@
             10
         ],
         "face=floor,facing=west,powered=false": [
-            14,
+            6,
             0,
             5,
-            16,
+            10,
             2,
             11
         ],
         "face=floor,facing=west,powered=true": [
-            15,
+            6,
             0,
             5,
-            16,
+            10,
             1,
             11
         ],
         "face=floor,facing=east,powered=false": [
-            0,
+            6,
             0,
             5,
-            2,
+            10,
             2,
             11
         ],
         "face=floor,facing=east,powered=true": [
-            0,
+            6,
             0,
             5,
-            1,
+            10,
             1,
             11
         ],
@@ -2502,20 +2502,20 @@
             11
         ],
         "face=ceiling,facing=north,powered=false": [
-            6,
-            14,
             5,
-            10,
+            14,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=north,powered=true": [
-            6,
-            15,
             5,
-            10,
+            15,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=south,powered=false": [
             5,
@@ -2534,54 +2534,54 @@
             10
         ],
         "face=ceiling,facing=west,powered=false": [
-            14,
+            6,
             14,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=west,powered=true": [
-            15,
+            6,
             15,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=false": [
-            0,
+            6,
             14,
             5,
-            2,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=true": [
-            0,
+            6,
             15,
             5,
-            1,
+            10,
             16,
             11
         ]
     },
     "spruce_button": {
         "face=floor,facing=north,powered=false": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             2,
-            11
+            10
         ],
         "face=floor,facing=north,powered=true": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             1,
-            11
+            10
         ],
         "face=floor,facing=south,powered=false": [
             5,
@@ -2600,34 +2600,34 @@
             10
         ],
         "face=floor,facing=west,powered=false": [
-            14,
+            6,
             0,
             5,
-            16,
+            10,
             2,
             11
         ],
         "face=floor,facing=west,powered=true": [
-            15,
+            6,
             0,
             5,
-            16,
+            10,
             1,
             11
         ],
         "face=floor,facing=east,powered=false": [
-            0,
+            6,
             0,
             5,
-            2,
+            10,
             2,
             11
         ],
         "face=floor,facing=east,powered=true": [
-            0,
+            6,
             0,
             5,
-            1,
+            10,
             1,
             11
         ],
@@ -2696,20 +2696,20 @@
             11
         ],
         "face=ceiling,facing=north,powered=false": [
-            6,
-            14,
             5,
-            10,
+            14,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=north,powered=true": [
-            6,
-            15,
             5,
-            10,
+            15,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=south,powered=false": [
             5,
@@ -2728,54 +2728,54 @@
             10
         ],
         "face=ceiling,facing=west,powered=false": [
-            14,
+            6,
             14,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=west,powered=true": [
-            15,
+            6,
             15,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=false": [
-            0,
+            6,
             14,
             5,
-            2,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=true": [
-            0,
+            6,
             15,
             5,
-            1,
+            10,
             16,
             11
         ]
     },
     "birch_button": {
         "face=floor,facing=north,powered=false": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             2,
-            11
+            10
         ],
         "face=floor,facing=north,powered=true": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             1,
-            11
+            10
         ],
         "face=floor,facing=south,powered=false": [
             5,
@@ -2794,34 +2794,34 @@
             10
         ],
         "face=floor,facing=west,powered=false": [
-            14,
+            6,
             0,
             5,
-            16,
+            10,
             2,
             11
         ],
         "face=floor,facing=west,powered=true": [
-            15,
+            6,
             0,
             5,
-            16,
+            10,
             1,
             11
         ],
         "face=floor,facing=east,powered=false": [
-            0,
+            6,
             0,
             5,
-            2,
+            10,
             2,
             11
         ],
         "face=floor,facing=east,powered=true": [
-            0,
+            6,
             0,
             5,
-            1,
+            10,
             1,
             11
         ],
@@ -2890,20 +2890,20 @@
             11
         ],
         "face=ceiling,facing=north,powered=false": [
-            6,
-            14,
             5,
-            10,
+            14,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=north,powered=true": [
-            6,
-            15,
             5,
-            10,
+            15,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=south,powered=false": [
             5,
@@ -2922,54 +2922,54 @@
             10
         ],
         "face=ceiling,facing=west,powered=false": [
-            14,
+            6,
             14,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=west,powered=true": [
-            15,
+            6,
             15,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=false": [
-            0,
+            6,
             14,
             5,
-            2,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=true": [
-            0,
+            6,
             15,
             5,
-            1,
+            10,
             16,
             11
         ]
     },
     "jungle_button": {
         "face=floor,facing=north,powered=false": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             2,
-            11
+            10
         ],
         "face=floor,facing=north,powered=true": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             1,
-            11
+            10
         ],
         "face=floor,facing=south,powered=false": [
             5,
@@ -2988,34 +2988,34 @@
             10
         ],
         "face=floor,facing=west,powered=false": [
-            14,
+            6,
             0,
             5,
-            16,
+            10,
             2,
             11
         ],
         "face=floor,facing=west,powered=true": [
-            15,
+            6,
             0,
             5,
-            16,
+            10,
             1,
             11
         ],
         "face=floor,facing=east,powered=false": [
-            0,
+            6,
             0,
             5,
-            2,
+            10,
             2,
             11
         ],
         "face=floor,facing=east,powered=true": [
-            0,
+            6,
             0,
             5,
-            1,
+            10,
             1,
             11
         ],
@@ -3084,20 +3084,20 @@
             11
         ],
         "face=ceiling,facing=north,powered=false": [
-            6,
-            14,
             5,
-            10,
+            14,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=north,powered=true": [
-            6,
-            15,
             5,
-            10,
+            15,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=south,powered=false": [
             5,
@@ -3116,54 +3116,54 @@
             10
         ],
         "face=ceiling,facing=west,powered=false": [
-            14,
+            6,
             14,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=west,powered=true": [
-            15,
+            6,
             15,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=false": [
-            0,
+            6,
             14,
             5,
-            2,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=true": [
-            0,
+            6,
             15,
             5,
-            1,
+            10,
             16,
             11
         ]
     },
     "acacia_button": {
         "face=floor,facing=north,powered=false": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             2,
-            11
+            10
         ],
         "face=floor,facing=north,powered=true": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             1,
-            11
+            10
         ],
         "face=floor,facing=south,powered=false": [
             5,
@@ -3182,34 +3182,34 @@
             10
         ],
         "face=floor,facing=west,powered=false": [
-            14,
+            6,
             0,
             5,
-            16,
+            10,
             2,
             11
         ],
         "face=floor,facing=west,powered=true": [
-            15,
+            6,
             0,
             5,
-            16,
+            10,
             1,
             11
         ],
         "face=floor,facing=east,powered=false": [
-            0,
+            6,
             0,
             5,
-            2,
+            10,
             2,
             11
         ],
         "face=floor,facing=east,powered=true": [
-            0,
+            6,
             0,
             5,
-            1,
+            10,
             1,
             11
         ],
@@ -3278,20 +3278,20 @@
             11
         ],
         "face=ceiling,facing=north,powered=false": [
-            6,
-            14,
             5,
-            10,
+            14,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=north,powered=true": [
-            6,
-            15,
             5,
-            10,
+            15,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=south,powered=false": [
             5,
@@ -3310,54 +3310,54 @@
             10
         ],
         "face=ceiling,facing=west,powered=false": [
-            14,
+            6,
             14,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=west,powered=true": [
-            15,
+            6,
             15,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=false": [
-            0,
+            6,
             14,
             5,
-            2,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=true": [
-            0,
+            6,
             15,
             5,
-            1,
+            10,
             16,
             11
         ]
     },
     "cherry_button": {
         "face=floor,facing=north,powered=false": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             2,
-            11
+            10
         ],
         "face=floor,facing=north,powered=true": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             1,
-            11
+            10
         ],
         "face=floor,facing=south,powered=false": [
             5,
@@ -3376,34 +3376,34 @@
             10
         ],
         "face=floor,facing=west,powered=false": [
-            14,
+            6,
             0,
             5,
-            16,
+            10,
             2,
             11
         ],
         "face=floor,facing=west,powered=true": [
-            15,
+            6,
             0,
             5,
-            16,
+            10,
             1,
             11
         ],
         "face=floor,facing=east,powered=false": [
-            0,
+            6,
             0,
             5,
-            2,
+            10,
             2,
             11
         ],
         "face=floor,facing=east,powered=true": [
-            0,
+            6,
             0,
             5,
-            1,
+            10,
             1,
             11
         ],
@@ -3472,20 +3472,20 @@
             11
         ],
         "face=ceiling,facing=north,powered=false": [
-            6,
-            14,
             5,
-            10,
+            14,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=north,powered=true": [
-            6,
-            15,
             5,
-            10,
+            15,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=south,powered=false": [
             5,
@@ -3504,54 +3504,54 @@
             10
         ],
         "face=ceiling,facing=west,powered=false": [
-            14,
+            6,
             14,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=west,powered=true": [
-            15,
+            6,
             15,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=false": [
-            0,
+            6,
             14,
             5,
-            2,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=true": [
-            0,
+            6,
             15,
             5,
-            1,
+            10,
             16,
             11
         ]
     },
     "dark_oak_button": {
         "face=floor,facing=north,powered=false": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             2,
-            11
+            10
         ],
         "face=floor,facing=north,powered=true": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             1,
-            11
+            10
         ],
         "face=floor,facing=south,powered=false": [
             5,
@@ -3570,34 +3570,34 @@
             10
         ],
         "face=floor,facing=west,powered=false": [
-            14,
+            6,
             0,
             5,
-            16,
+            10,
             2,
             11
         ],
         "face=floor,facing=west,powered=true": [
-            15,
+            6,
             0,
             5,
-            16,
+            10,
             1,
             11
         ],
         "face=floor,facing=east,powered=false": [
-            0,
+            6,
             0,
             5,
-            2,
+            10,
             2,
             11
         ],
         "face=floor,facing=east,powered=true": [
-            0,
+            6,
             0,
             5,
-            1,
+            10,
             1,
             11
         ],
@@ -3666,20 +3666,20 @@
             11
         ],
         "face=ceiling,facing=north,powered=false": [
-            6,
-            14,
             5,
-            10,
+            14,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=north,powered=true": [
-            6,
-            15,
             5,
-            10,
+            15,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=south,powered=false": [
             5,
@@ -3698,54 +3698,54 @@
             10
         ],
         "face=ceiling,facing=west,powered=false": [
-            14,
+            6,
             14,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=west,powered=true": [
-            15,
+            6,
             15,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=false": [
-            0,
+            6,
             14,
             5,
-            2,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=true": [
-            0,
+            6,
             15,
             5,
-            1,
+            10,
             16,
             11
         ]
     },
     "mangrove_button": {
         "face=floor,facing=north,powered=false": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             2,
-            11
+            10
         ],
         "face=floor,facing=north,powered=true": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             1,
-            11
+            10
         ],
         "face=floor,facing=south,powered=false": [
             5,
@@ -3764,34 +3764,34 @@
             10
         ],
         "face=floor,facing=west,powered=false": [
-            14,
+            6,
             0,
             5,
-            16,
+            10,
             2,
             11
         ],
         "face=floor,facing=west,powered=true": [
-            15,
+            6,
             0,
             5,
-            16,
+            10,
             1,
             11
         ],
         "face=floor,facing=east,powered=false": [
-            0,
+            6,
             0,
             5,
-            2,
+            10,
             2,
             11
         ],
         "face=floor,facing=east,powered=true": [
-            0,
+            6,
             0,
             5,
-            1,
+            10,
             1,
             11
         ],
@@ -3860,20 +3860,20 @@
             11
         ],
         "face=ceiling,facing=north,powered=false": [
-            6,
-            14,
             5,
-            10,
+            14,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=north,powered=true": [
-            6,
-            15,
             5,
-            10,
+            15,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=south,powered=false": [
             5,
@@ -3892,54 +3892,54 @@
             10
         ],
         "face=ceiling,facing=west,powered=false": [
-            14,
+            6,
             14,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=west,powered=true": [
-            15,
+            6,
             15,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=false": [
-            0,
+            6,
             14,
             5,
-            2,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=true": [
-            0,
+            6,
             15,
             5,
-            1,
+            10,
             16,
             11
         ]
     },
     "bamboo_button": {
         "face=floor,facing=north,powered=false": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             2,
-            11
+            10
         ],
         "face=floor,facing=north,powered=true": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             1,
-            11
+            10
         ],
         "face=floor,facing=south,powered=false": [
             5,
@@ -3958,34 +3958,34 @@
             10
         ],
         "face=floor,facing=west,powered=false": [
-            14,
+            6,
             0,
             5,
-            16,
+            10,
             2,
             11
         ],
         "face=floor,facing=west,powered=true": [
-            15,
+            6,
             0,
             5,
-            16,
+            10,
             1,
             11
         ],
         "face=floor,facing=east,powered=false": [
-            0,
+            6,
             0,
             5,
-            2,
+            10,
             2,
             11
         ],
         "face=floor,facing=east,powered=true": [
-            0,
+            6,
             0,
             5,
-            1,
+            10,
             1,
             11
         ],
@@ -4054,20 +4054,20 @@
             11
         ],
         "face=ceiling,facing=north,powered=false": [
-            6,
-            14,
             5,
-            10,
+            14,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=north,powered=true": [
-            6,
-            15,
             5,
-            10,
+            15,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=south,powered=false": [
             5,
@@ -4086,34 +4086,34 @@
             10
         ],
         "face=ceiling,facing=west,powered=false": [
-            14,
+            6,
             14,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=west,powered=true": [
-            15,
+            6,
             15,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=false": [
-            0,
+            6,
             14,
             5,
-            2,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=true": [
-            0,
+            6,
             15,
             5,
-            1,
+            10,
             16,
             11
         ]
@@ -5813,20 +5813,20 @@
     },
     "crimson_button": {
         "face=floor,facing=north,powered=false": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             2,
-            11
+            10
         ],
         "face=floor,facing=north,powered=true": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             1,
-            11
+            10
         ],
         "face=floor,facing=south,powered=false": [
             5,
@@ -5845,34 +5845,34 @@
             10
         ],
         "face=floor,facing=west,powered=false": [
-            14,
+            6,
             0,
             5,
-            16,
+            10,
             2,
             11
         ],
         "face=floor,facing=west,powered=true": [
-            15,
+            6,
             0,
             5,
-            16,
+            10,
             1,
             11
         ],
         "face=floor,facing=east,powered=false": [
-            0,
+            6,
             0,
             5,
-            2,
+            10,
             2,
             11
         ],
         "face=floor,facing=east,powered=true": [
-            0,
+            6,
             0,
             5,
-            1,
+            10,
             1,
             11
         ],
@@ -5941,20 +5941,20 @@
             11
         ],
         "face=ceiling,facing=north,powered=false": [
-            6,
-            14,
             5,
-            10,
+            14,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=north,powered=true": [
-            6,
-            15,
             5,
-            10,
+            15,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=south,powered=false": [
             5,
@@ -5973,54 +5973,54 @@
             10
         ],
         "face=ceiling,facing=west,powered=false": [
-            14,
+            6,
             14,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=west,powered=true": [
-            15,
+            6,
             15,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=false": [
-            0,
+            6,
             14,
             5,
-            2,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=true": [
-            0,
+            6,
             15,
             5,
-            1,
+            10,
             16,
             11
         ]
     },
     "warped_button": {
         "face=floor,facing=north,powered=false": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             2,
-            11
+            10
         ],
         "face=floor,facing=north,powered=true": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             1,
-            11
+            10
         ],
         "face=floor,facing=south,powered=false": [
             5,
@@ -6039,34 +6039,34 @@
             10
         ],
         "face=floor,facing=west,powered=false": [
-            14,
+            6,
             0,
             5,
-            16,
+            10,
             2,
             11
         ],
         "face=floor,facing=west,powered=true": [
-            15,
+            6,
             0,
             5,
-            16,
+            10,
             1,
             11
         ],
         "face=floor,facing=east,powered=false": [
-            0,
+            6,
             0,
             5,
-            2,
+            10,
             2,
             11
         ],
         "face=floor,facing=east,powered=true": [
-            0,
+            6,
             0,
             5,
-            1,
+            10,
             1,
             11
         ],
@@ -6135,20 +6135,20 @@
             11
         ],
         "face=ceiling,facing=north,powered=false": [
-            6,
-            14,
             5,
-            10,
+            14,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=north,powered=true": [
-            6,
-            15,
             5,
-            10,
+            15,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=south,powered=false": [
             5,
@@ -6167,34 +6167,34 @@
             10
         ],
         "face=ceiling,facing=west,powered=false": [
-            14,
+            6,
             14,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=west,powered=true": [
-            15,
+            6,
             15,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=false": [
-            0,
+            6,
             14,
             5,
-            2,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=true": [
-            0,
+            6,
             15,
             5,
-            1,
+            10,
             16,
             11
         ]
@@ -6303,20 +6303,20 @@
     },
     "polished_blackstone_button": {
         "face=floor,facing=north,powered=false": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             2,
-            11
+            10
         ],
         "face=floor,facing=north,powered=true": [
-            6,
-            0,
             5,
-            10,
+            0,
+            6,
+            11,
             1,
-            11
+            10
         ],
         "face=floor,facing=south,powered=false": [
             5,
@@ -6335,34 +6335,34 @@
             10
         ],
         "face=floor,facing=west,powered=false": [
-            14,
+            6,
             0,
             5,
-            16,
+            10,
             2,
             11
         ],
         "face=floor,facing=west,powered=true": [
-            15,
+            6,
             0,
             5,
-            16,
+            10,
             1,
             11
         ],
         "face=floor,facing=east,powered=false": [
-            0,
+            6,
             0,
             5,
-            2,
+            10,
             2,
             11
         ],
         "face=floor,facing=east,powered=true": [
-            0,
+            6,
             0,
             5,
-            1,
+            10,
             1,
             11
         ],
@@ -6431,20 +6431,20 @@
             11
         ],
         "face=ceiling,facing=north,powered=false": [
-            6,
-            14,
             5,
-            10,
+            14,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=north,powered=true": [
-            6,
-            15,
             5,
-            10,
+            15,
+            6,
+            11,
             16,
-            11
+            10
         ],
         "face=ceiling,facing=south,powered=false": [
             5,
@@ -6463,34 +6463,34 @@
             10
         ],
         "face=ceiling,facing=west,powered=false": [
-            14,
+            6,
             14,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=west,powered=true": [
-            15,
+            6,
             15,
             5,
-            16,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=false": [
-            0,
+            6,
             14,
             5,
-            2,
+            10,
             16,
             11
         ],
         "face=ceiling,facing=east,powered=true": [
-            0,
+            6,
             15,
             5,
-            1,
+            10,
             16,
             11
         ]

From 3b9503982c2592b41f3f74d397eac2b26a2cc2c1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 19 Feb 2025 04:03:20 +0300
Subject: [PATCH 253/753] fix: fix custom item display on 1.21.4, fix text
 component potential crash

---
 src/chatUtils.test.ts                | 18 ------------------
 src/mineflayer/items.ts              |  7 +++++--
 src/react/MessageFormattedString.tsx | 10 ----------
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/src/chatUtils.test.ts b/src/chatUtils.test.ts
index 3fc563fd..e717da28 100644
--- a/src/chatUtils.test.ts
+++ b/src/chatUtils.test.ts
@@ -11,24 +11,6 @@ const mapIncludeDefined = (props) => {
   }
 }
 
-/*
-TODO (nbt)
-{
-    "extra": [
-        {
-            "italic": 0,
-            "underlined": 0,
-            "bold": 0,
-            "color": "aqua",
-            "obfuscated": 0,
-            "strikethrough": 0,
-            "text": "minecraft:lift"
-        }
-    ],
-    "text": ""
-}
-*/
-
 test('formatMessage', () => {
   const result = formatMessage({
     'json': {
diff --git a/src/mineflayer/items.ts b/src/mineflayer/items.ts
index f7f78c31..2f1b2f8d 100644
--- a/src/mineflayer/items.ts
+++ b/src/mineflayer/items.ts
@@ -38,7 +38,7 @@ export const getItemMetadata = (item: GeneralInputItem) => {
 
     const customTextComponent = componentMap.get('custom_name') || componentMap.get('item_name')
     if (customTextComponent) {
-      customText = customTextComponent.data.value
+      customText = nbt.simplify(customTextComponent.data)
     }
     const customModelComponent = componentMap.get('item_model')
     if (customModelComponent) {
@@ -70,6 +70,9 @@ export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'>
   const { customText } = getItemMetadata(item as any)
   if (!customText) return
   try {
+    if (typeof customText === 'object') {
+      return customText
+    }
     const parsed = customText.startsWith('{') && customText.endsWith('}') ? mojangson.simplify(mojangson.parse(customText)) : fromFormattedString(customText)
     if (parsed.extra) {
       return parsed as Record<string, any>
@@ -78,7 +81,7 @@ export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'>
     }
   } catch (err) {
     return {
-      text: customText
+      text: JSON.stringify(customText)
     }
   }
 }
diff --git a/src/react/MessageFormattedString.tsx b/src/react/MessageFormattedString.tsx
index 09797076..f667cdd8 100644
--- a/src/react/MessageFormattedString.tsx
+++ b/src/react/MessageFormattedString.tsx
@@ -12,16 +12,6 @@ export default ({ message, fallbackColor, className }: {
 }) => {
   const messageJson = useMemo(() => {
     if (!message) return null
-    // const transformIfNbt = (x) => {
-    //   if (typeof x === 'object' && x?.type) return nbt.simplify(x) as Record<string, any>
-    //   // if (Array.isArray(x)) return x.map(transformIfNbt)
-    //   // if (typeof x === 'object') return Object.fromEntries(Object.entries(x).map(([k, v]) => [k, transformIfNbt(v)]))
-    //   return x
-    // }
-    // if (typeof message === 'object' && message.text?.text?.type) {
-    //   message.text.text = transformIfNbt(message.text.text)
-    //   message.text.extra = transformIfNbt(message.text.extra)
-    // }
     try {
       const texts = formatMessage(typeof message === 'string' ? fromFormattedString(message) : message)
       return texts.map(text => {

From f1c945d22a4315da8eed2451a5af684aa2c9515f Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 19 Feb 2025 15:00:43 +0100
Subject: [PATCH 254/753] fix: baby mobs are not rendered smaller (#283)

---
 renderer/viewer/lib/entities.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/entities.ts b/renderer/viewer/lib/entities.ts
index a09d57eb..c4664489 100644
--- a/renderer/viewer/lib/entities.ts
+++ b/renderer/viewer/lib/entities.ts
@@ -714,7 +714,13 @@ export class Entities extends EventEmitter {
       }
     }
     // ---
-    // not player
+    // set baby size
+    if (meta.baby) {
+      e.scale.set(0.5, 0.5, 0.5)
+    } else {
+      e.scale.set(1, 1, 1)
+    }
+    // entity specific meta
     const textDisplayMeta = getSpecificEntityMetadata('text_display', entity)
     const displayTextRaw = textDisplayMeta?.text || meta.custom_name_visible && meta.custom_name
     const displayText = this.parseEntityLabel(displayTextRaw)

From fda38bbf5982ae20dc49951a7911dedad7589ad1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 20 Feb 2025 02:30:33 +0300
Subject: [PATCH 255/753] fix custom channel crash

---
 src/customChannels.ts | 39 ++++++++++++++++++++-------------------
 src/index.ts          |  4 ++--
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/customChannels.ts b/src/customChannels.ts
index 075bf23a..7c398eef 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -43,32 +43,33 @@ customEvents.on('mineflayerBotCreated', async () => {
     const { worldName, x, y, z, model } = data
     console.debug('Received model data:', { worldName, x, y, z, model })
 
-    if (viewer?.world) {
-      const chunkX = Math.floor(x / 16) * 16
-      const chunkZ = Math.floor(z / 16) * 16
-      const chunkKey = `${chunkX},${chunkZ}`
-      const blockPosKey = `${x},${y},${z}`
+    const chunkX = Math.floor(x / 16) * 16
+    const chunkZ = Math.floor(z / 16) * 16
+    const chunkKey = `${chunkX},${chunkZ}`
+    const blockPosKey = `${x},${y},${z}`
 
-      const chunkModels = viewer.world.customBlockModels.get(chunkKey) || {}
+    const chunkModels = viewer.world.customBlockModels.get(chunkKey) || {}
 
-      if (model) {
-        chunkModels[blockPosKey] = model
-      } else {
-        delete chunkModels[blockPosKey]
-      }
+    if (model) {
+      chunkModels[blockPosKey] = model
+    } else {
+      delete chunkModels[blockPosKey]
+    }
 
-      if (Object.keys(chunkModels).length > 0) {
-        viewer.world.customBlockModels.set(chunkKey, chunkModels)
-      } else {
-        viewer.world.customBlockModels.delete(chunkKey)
-      }
+    if (Object.keys(chunkModels).length > 0) {
+      viewer.world.customBlockModels.set(chunkKey, chunkModels)
+    } else {
+      viewer.world.customBlockModels.delete(chunkKey)
+    }
 
-      // Trigger update
-      const block = worldView!.world.getBlock(new Vec3(x, y, z))
+    // Trigger update
+    if (worldView) {
+      const block = worldView.world.getBlock(new Vec3(x, y, z))
       if (block) {
-        worldView!.world.setBlockStateId(new Vec3(x, y, z), block.stateId)
+        worldView.world.setBlockStateId(new Vec3(x, y, z), block.stateId)
       }
     }
+
   })
 
   console.debug(`registered custom channel ${CHANNEL_NAME} channel`)
diff --git a/src/index.ts b/src/index.ts
index 941b76c2..99923e19 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -476,7 +476,7 @@ export async function connect (connectOptions: ConnectOptions) {
         const autoVersionSelect = await getServerInfo(server.host, server.port ? Number(server.port) : undefined, versionAutoSelect)
         finalVersion = autoVersionSelect.version
       }
-      initialLoadingText = `Connecting to server ${server.host} with version ${finalVersion}`
+      initialLoadingText = `Connecting to server ${server.host}:${server.port ?? 25_565} with version ${finalVersion}`
     } else if (connectOptions.viewerWsConnect) {
       initialLoadingText = `Connecting to Mineflayer WebSocket server ${connectOptions.viewerWsConnect}`
     } else {
@@ -828,7 +828,7 @@ export async function connect (connectOptions: ConnectOptions) {
     fsState.saveLoaded = true
   }
 
-  if (!connectOptions.ignoreQs) {
+  if (!connectOptions.ignoreQs || process.env.NODE_ENV === 'development') {
     // todo cleanup
     customEvents.on('gameLoaded', () => {
       const commands = appQueryParamsArray.command ?? []

From 730cf656de562990ba7c315299ed93b7a8c55eb9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 20 Feb 2025 03:41:44 +0300
Subject: [PATCH 256/753] feat: add detailed block assets parsing (blockstates
 + models) in F3 on right side (includes parsing errors! super useful for
 resourcepacks)

---
 package.json                               |  2 +-
 pnpm-lock.yaml                             | 23 ++++++++-----
 renderer/viewer/lib/mesher/mesher.ts       | 16 +++++++++
 renderer/viewer/lib/mesher/shared.ts       | 11 ++++++
 renderer/viewer/lib/mesher/world.ts        | 39 +++++++++++++++++-----
 renderer/viewer/lib/worldrendererCommon.ts | 17 +++++++---
 src/customChannels.ts                      |  6 ++--
 src/react/DebugOverlay.module.css          |  2 ++
 src/react/DebugOverlay.tsx                 | 25 ++++++++++++--
 9 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 79e2a9ba..995dfb95 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.34",
+    "mc-assets": "^0.2.35",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7540c5bb..ceda01e1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -349,8 +349,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.34
-        version: 0.2.34
+        specifier: ^0.2.35
+        version: 0.2.35
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -6243,8 +6243,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.34:
-    resolution: {integrity: sha512-BvE2mVs9XETLFb+FN1Zbc4mJ+CvZqgxVd3kxhERp1QljudDmMsWsMcK2EUTrevuE6a7L3F2kx8XC1vVA79i/ow==}
+  mc-assets@0.2.35:
+    resolution: {integrity: sha512-fOzeqn7fXVJ+ufA23H3iaeDGukEohhoUz8DXXv4bDCI6BMN8zq9q3eFhcGYOEKw9kXKe3ch49D8QAn6ou/+cHg==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.0.3:
@@ -8883,6 +8883,9 @@ packages:
     resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
     engines: {node: '>= 0.8'}
 
+  vec3@0.1.10:
+    resolution: {integrity: sha512-Sr1U3mYtMqCOonGd3LAN9iqy0qF6C+Gjil92awyK/i2OwiUo9bm7PnLgFpafymun50mOjnDcg4ToTgRssrlTcw==}
+
   vec3@0.1.8:
     resolution: {integrity: sha512-LfKrP625Bsg/Tj52YdYPsHmpsJuo+tc6fLxZxXjEo9k2xSspKlPvoYTHehykKhp1FvV9nm+XU3Ehej5/9tpDCg==}
 
@@ -12789,7 +12792,7 @@ snapshots:
       sanitize-filename: 1.6.3
       typed-emitter: 1.4.0
       uuid-1345: 1.0.2
-      vec3: 0.1.8
+      vec3: 0.1.10
       yaml: 2.4.1
       yargs: 17.7.2
     transitivePeerDependencies:
@@ -14263,7 +14266,7 @@ snapshots:
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-registry: 1.11.0
       random-seed: 0.3.0
-      vec3: 0.1.8
+      vec3: 0.1.10
 
   diff-match-patch@1.0.5: {}
 
@@ -16679,7 +16682,7 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.34:
+  mc-assets@0.2.35:
     dependencies:
       zod: 3.24.1
 
@@ -17917,7 +17920,7 @@ snapshots:
     dependencies:
       minecraft-data: 3.83.1
       prismarine-nbt: 2.5.0
-      vec3: 0.1.8
+      vec3: 0.1.10
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
     dependencies:
@@ -17964,7 +17967,7 @@ snapshots:
 
   prismarine-world@https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c:
     dependencies:
-      vec3: 0.1.8
+      vec3: 0.1.10
 
   process-nextick-args@2.0.1: {}
 
@@ -19968,6 +19971,8 @@ snapshots:
 
   vary@1.1.2: {}
 
+  vec3@0.1.10: {}
+
   vec3@0.1.8: {}
 
   verror@1.10.0:
diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index 132179da..9afcfeb3 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -1,6 +1,7 @@
 import { Vec3 } from 'vec3'
 import { World } from './world'
 import { getSectionGeometry, setBlockStatesData as setMesherData } from './models'
+import { BlockStateModelInfo } from './shared'
 
 globalThis.structuredClone ??= (value) => JSON.parse(JSON.stringify(value))
 
@@ -182,6 +183,21 @@ setInterval(() => {
     }
     dirtySections.delete(key)
   }
+
+  // Send new block state model info if any
+  if (world.blockStateModelInfo.size > 0) {
+    const newBlockStateInfo: Record<string, BlockStateModelInfo> = {}
+    for (const [cacheKey, info] of world.blockStateModelInfo) {
+      if (!world.sentBlockStateModels.has(cacheKey)) {
+        newBlockStateInfo[cacheKey] = info
+        world.sentBlockStateModels.add(cacheKey)
+      }
+    }
+    if (Object.keys(newBlockStateInfo).length > 0) {
+      postMessage({ type: 'blockStateModelInfo', info: newBlockStateInfo })
+    }
+  }
+
   // const time = performance.now() - start
   // console.log(`Processed ${sections.length} sections in ${time} ms (${time / sections.length} ms/section)`)
 }, 50)
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index 6da1aed5..92ea2c82 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -44,3 +44,14 @@ export type MesherGeometryOutput = {
 }
 
 export type HighestBlockInfo = { y: number, stateId: number | undefined, biomeId: number | undefined }
+
+export type BlockStateModelInfo = {
+  cacheKey: string
+  issues: string[]
+  modelNames: string[]
+  conditions: string[]
+}
+
+export const getBlockAssetsCacheKey = (stateId: number, modelNameOverride?: string) => {
+  return modelNameOverride ? `${stateId}:${modelNameOverride}` : String(stateId)
+}
diff --git a/renderer/viewer/lib/mesher/world.ts b/renderer/viewer/lib/mesher/world.ts
index c2dd3b7f..57f3ec2f 100644
--- a/renderer/viewer/lib/mesher/world.ts
+++ b/renderer/viewer/lib/mesher/world.ts
@@ -5,7 +5,7 @@ import { Vec3 } from 'vec3'
 import { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import moreBlockDataGeneratedJson from '../moreBlockDataGenerated.json'
 import legacyJson from '../../../../src/preflatMap.json'
-import { defaultMesherConfig, CustomBlockModels } from './shared'
+import { defaultMesherConfig, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey } from './shared'
 import { INVISIBLE_BLOCKS } from './worldConstants'
 
 const ignoreAoBlocks = Object.keys(moreBlockDataGeneratedJson.noOcclusions)
@@ -39,7 +39,6 @@ export type WorldBlock = Omit<Block, 'position'> & {
   _properties?: Record<string, any>
 }
 
-
 export class World {
   config = defaultMesherConfig
   Chunk: typeof import('prismarine-chunk/types/index').PCChunk
@@ -49,6 +48,8 @@ export class World {
   preflat: boolean
   erroredBlockModel?: BlockModelPartsResolved
   customBlockModels = new Map<string, CustomBlockModels>() // chunkKey -> blockModels
+  sentBlockStateModels = new Set<string>()
+  blockStateModelInfo = new Map<string, BlockStateModelInfo>()
 
   constructor (version) {
     this.Chunk = Chunks(version) as any
@@ -123,7 +124,7 @@ export class World {
     return this.getColumn(Math.floor(pos.x / 16) * 16, Math.floor(pos.z / 16) * 16)
   }
 
-  getBlock (pos: Vec3, blockProvider?, attr?): WorldBlock | null {
+  getBlock (pos: Vec3, blockProvider?: WorldBlockProvider, attr?: { hadErrors: boolean }): WorldBlock | null {
     // for easier testing
     if (!(pos instanceof Vec3)) pos = new Vec3(...pos as [number, number, number])
     const key = columnKey(Math.floor(pos.x / 16) * 16, Math.floor(pos.z / 16) * 16)
@@ -138,7 +139,7 @@ export class World {
     const locInChunk = posInChunk(loc)
     const stateId = column.getBlockStateId(locInChunk)
 
-    const cacheKey = modelOverride ? `${stateId}:${modelOverride}` : stateId
+    const cacheKey = getBlockAssetsCacheKey(stateId, modelOverride)
 
     if (!this.blockCache[cacheKey]) {
       const b = column.getBlock(locInChunk) as unknown as WorldBlock
@@ -196,11 +197,31 @@ export class World {
           }
         }
 
-        const useFallbackModel = this.preflat || modelOverride
-        block.models = blockProvider.getAllResolvedModels0_1({
-          name: block.name,
-          properties: props,
-        }, useFallbackModel)! // fixme! this is a hack (also need a setting for all versions)
+        const useFallbackModel = !!(this.preflat || modelOverride)
+        const issues = [] as string[]
+        const resolvedModelNames = [] as string[]
+        const resolvedConditions = [] as string[]
+        block.models = blockProvider.getAllResolvedModels0_1(
+          {
+            name: block.name,
+            properties: props,
+          },
+          useFallbackModel,
+          issues,
+          resolvedModelNames,
+          resolvedConditions
+        )!
+
+        // Track block state model info
+        if (!this.sentBlockStateModels.has(cacheKey)) {
+          this.blockStateModelInfo.set(cacheKey, {
+            cacheKey,
+            issues,
+            modelNames: resolvedModelNames,
+            conditions: resolvedConditions
+          })
+        }
+
         if (!block.models!.length) {
           if (block.name !== 'water' && block.name !== 'lava' && !INVISIBLE_BLOCKS.has(block.name)) {
             console.debug('[mesher] block to render not found', block.name, props)
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 0cd0b955..747481b1 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -19,7 +19,7 @@ import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBloc
 import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
 import { toMajorVersion } from '../../../src/utils'
 import { buildCleanupDecorator } from './cleanupDecorator'
-import { defaultMesherConfig, HighestBlockInfo, MesherGeometryOutput, CustomBlockModels } from './mesher/shared'
+import { defaultMesherConfig, HighestBlockInfo, MesherGeometryOutput, CustomBlockModels, BlockStateModelInfo } from './mesher/shared'
 import { chunkPos } from './simpleUtils'
 import { HandItemBlock } from './holdingBlock'
 import { updateStatText } from './ui/newStats'
@@ -152,7 +152,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   @worldCleanup()
   itemsRenderer: ItemsRenderer | undefined
 
-  customBlockModels = new Map<string, CustomBlockModels>()
+  protocolCustomBlocks = new Map<string, CustomBlockModels>()
+
+  @worldCleanup()
+  blockStateModelInfo = new Map<string, BlockStateModelInfo>()
 
   abstract outputFormat: 'threeJs' | 'webgpu'
   worldBlockProvider: WorldBlockProvider
@@ -232,6 +235,12 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
             this.maxWorkersProcessTime = Math.max(this.maxWorkersProcessTime, data.processTime)
           }
         }
+
+        if (data.type === 'blockStateModelInfo') {
+          for (const [cacheKey, info] of Object.entries(data.info)) {
+            this.blockStateModelInfo.set(cacheKey, info)
+          }
+        }
       }
       worker.onmessage = ({ data }) => {
         if (Array.isArray(data)) {
@@ -417,7 +426,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.updateChunksStatsText()
 
     const chunkKey = `${x},${z}`
-    const customBlockModels = this.customBlockModels.get(chunkKey)
+    const customBlockModels = this.protocolCustomBlocks.get(chunkKey)
 
     for (const worker of this.workers) {
       worker.postMessage({
@@ -478,7 +487,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     const needAoRecalculation = true
     const chunkKey = `${Math.floor(pos.x / 16) * 16},${Math.floor(pos.z / 16) * 16}`
     const blockPosKey = `${pos.x},${pos.y},${pos.z}`
-    const customBlockModels = this.customBlockModels.get(chunkKey) || {}
+    const customBlockModels = this.protocolCustomBlocks.get(chunkKey) || {}
 
     for (const worker of this.workers) {
       worker.postMessage({
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 7c398eef..33bc8fcd 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -48,7 +48,7 @@ customEvents.on('mineflayerBotCreated', async () => {
     const chunkKey = `${chunkX},${chunkZ}`
     const blockPosKey = `${x},${y},${z}`
 
-    const chunkModels = viewer.world.customBlockModels.get(chunkKey) || {}
+    const chunkModels = viewer.world.protocolCustomBlocks.get(chunkKey) || {}
 
     if (model) {
       chunkModels[blockPosKey] = model
@@ -57,9 +57,9 @@ customEvents.on('mineflayerBotCreated', async () => {
     }
 
     if (Object.keys(chunkModels).length > 0) {
-      viewer.world.customBlockModels.set(chunkKey, chunkModels)
+      viewer.world.protocolCustomBlocks.set(chunkKey, chunkModels)
     } else {
-      viewer.world.customBlockModels.delete(chunkKey)
+      viewer.world.protocolCustomBlocks.delete(chunkKey)
     }
 
     // Trigger update
diff --git a/src/react/DebugOverlay.module.css b/src/react/DebugOverlay.module.css
index 9ea30ebf..3b966426 100644
--- a/src/react/DebugOverlay.module.css
+++ b/src/react/DebugOverlay.module.css
@@ -36,6 +36,8 @@
 
 .debug-right-side p {
   margin-left: auto;
+  text-align: right;
+  word-break: break-all;
 }
 
 .empty {
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index 61bec590..d7fc16d7 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -3,6 +3,7 @@ import * as THREE from 'three'
 import type { Block } from 'prismarine-block'
 import { getFixedFilesize } from '../downloadAndOpenFile'
 import { options } from '../optionsStorage'
+import { getBlockAssetsCacheKey } from '../../renderer/viewer/lib/mesher/shared'
 import styles from './DebugOverlay.module.css'
 
 export default () => {
@@ -133,7 +134,7 @@ export default () => {
   if (!showDebug) return null
 
   return <>
-    <div className={styles['debug-left-side']}>
+    <div className={`debug-left-side ${styles['debug-left-side']}`}>
       <p>Prismarine Web Client ({bot.version})</p>
       <p>E: {entitiesCount}</p>
       <p>{dimension}</p>
@@ -151,7 +152,7 @@ export default () => {
       {Object.entries(customEntries.current).map(([name, value]) => <p key={name}>{name}: {value}</p>)}
     </div>
 
-    <div className={styles['debug-right-side']}>
+    <div className={`debug-right-side ${styles['debug-right-side']}`}>
       <p>Renderer: {rendererDevice}</p>
       <div className={styles.empty} />
       {cursorBlock ? (<>
@@ -172,6 +173,26 @@ export default () => {
       {cursorBlock ? (
         <p>Looking at: {cursorBlock.position.x} {cursorBlock.position.y} {cursorBlock.position.z}</p>
       ) : ''}
+      <div className={styles.empty} />
+      {cursorBlock && (() => {
+        const chunkKey = `${Math.floor(cursorBlock.position.x / 16) * 16},${Math.floor(cursorBlock.position.z / 16) * 16}`
+        const customBlockName = viewer.world.protocolCustomBlocks.get(chunkKey)?.[`${cursorBlock.position.x},${cursorBlock.position.y},${cursorBlock.position.z}`]
+        const cacheKey = getBlockAssetsCacheKey(cursorBlock.stateId, customBlockName)
+        const modelInfo = viewer.world.blockStateModelInfo.get(cacheKey)
+        return modelInfo && (
+          <>
+            {customBlockName && <p style={{ fontSize: 7, }}>Custom block: {customBlockName}</p>}
+            {modelInfo.issues.map((issue, i) => (
+              <p key={i} style={{ color: 'yellow', fontSize: 7, }}>{issue}</p>
+            ))}
+            {/* <p style={{ fontSize: 7, }}>Resolved models chain: {modelInfo.modelNames.join(' -> ')}</p> */}
+            <p style={{ fontSize: 7, }}>Resolved model: {modelInfo.modelNames[0] ?? '-'}</p>
+            <p style={{ fontSize: 7, whiteSpace: 'nowrap', maxWidth: '100px', overflow: 'hidden', textOverflow: 'ellipsis' }}>
+              {modelInfo.conditions.join(', ')}
+            </p>
+          </>
+        )
+      })()}
     </div>
   </>
 }

From 2ea74b22fdec8a8978fe4e92dc65dc23697dda60 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 20 Feb 2025 04:01:48 +0300
Subject: [PATCH 257/753] fix: literally fix the notification component

---
 renderer/viewer/lib/ui/newStats.ts |  2 +-
 src/react/Notification.tsx         |  4 +++-
 src/react/NotificationProvider.tsx | 24 ++++++++++++++++--------
 src/reactUi.tsx                    |  2 +-
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/renderer/viewer/lib/ui/newStats.ts b/renderer/viewer/lib/ui/newStats.ts
index 6fccac53..fff4d28c 100644
--- a/renderer/viewer/lib/ui/newStats.ts
+++ b/renderer/viewer/lib/ui/newStats.ts
@@ -15,7 +15,7 @@ export const addNewStat = (id: string, width = 80, x = rightOffset, y = lastY) =
   pane.style.padding = '2px'
   pane.style.fontFamily = 'monospace'
   pane.style.fontSize = '12px'
-  pane.style.zIndex = '10000'
+  pane.style.zIndex = '100'
   pane.style.pointerEvents = 'none'
   document.body.appendChild(pane)
   stats[id] = pane
diff --git a/src/react/Notification.tsx b/src/react/Notification.tsx
index 4d73da7e..ec2f8f2b 100644
--- a/src/react/Notification.tsx
+++ b/src/react/Notification.tsx
@@ -58,7 +58,9 @@ export default ({ type = 'message', message, subMessage = '', open, icon = '', a
           gap: 2,
         }}
         >
-          <div>
+          <div style={{
+            whiteSpace: 'normal',
+          }}>
             {message}
           </div>
           <div style={{
diff --git a/src/react/NotificationProvider.tsx b/src/react/NotificationProvider.tsx
index e5ceb0b3..73a73d1b 100644
--- a/src/react/NotificationProvider.tsx
+++ b/src/react/NotificationProvider.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect } from 'react'
 import { proxy, useSnapshot } from 'valtio'
+import { useAppScale } from '../scaleInterface'
 import Notification from './Notification'
 
 type NotificationType = React.ComponentProps<typeof Notification> & {
@@ -34,6 +35,7 @@ export const showNotification = (
   notificationProxy.autoHide = autoHide
   notificationProxy.action = action
 }
+globalThis.showNotification = showNotification
 export const hideNotification = () => {
   // openNotification('') // reset
   notificationProxy.open = false
@@ -56,13 +58,19 @@ export default () => {
   //     openNotification('test', 'test', false, 'message')
   //   }, 1000)
   // }, [])
+  const scale = useAppScale()
 
-  return <Notification
-    action={action}
-    type={type}
-    message={message}
-    subMessage={subMessage}
-    open={open}
-    icon={icon}
-  />
+  return <div style={{
+    scale,
+    transformOrigin: 'top right',
+  }}>
+    <Notification
+      action={action}
+      type={type}
+      message={message}
+      subMessage={subMessage}
+      open={open}
+      icon={icon}
+    />
+  </div>
 }
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index fc508a3a..5c294282 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -202,7 +202,6 @@ const App = () => {
             <ServersListProvider />
             <OptionsRenderApp />
             <MainMenuRenderApp />
-            <NotificationProvider />
             <TouchAreasControlsProvider />
             <SignInMessageProvider />
             <NoModalFoundProvider />
@@ -213,6 +212,7 @@ const App = () => {
             </div>
             <div />
             <DebugEdges />
+            <NotificationProvider />
           </RobustPortal>
         </ButtonAppProvider>
       </div>

From 8e4987e68566b379db0931eaf24be3041989fd5c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 20 Feb 2025 04:02:15 +0300
Subject: [PATCH 258/753] fix: add resourcepack texture processing error
 catching

---
 src/resourcePack.ts | 43 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index d17d07b4..debe8cea 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -133,7 +133,12 @@ export const completeTexturePackInstall = async (displayName: string | undefined
 
   await updateTextures()
   setLoadingScreenStatus(undefined)
-  showNotification('Texturepack installed & enabled')
+  if (currentErrors.length > 0) {
+    showNotification(`Texturepack installed & enabled with ${currentErrors.length} errors`)
+    console.error('Texturepack installed & enabled with errors:', currentErrors)
+  } else {
+    showNotification('Texturepack installed & enabled')
+  }
   await updateTexturePackInstalledState()
   if (isServer) {
     gameAdditionalState.usingServerResourcePack = true
@@ -204,6 +209,8 @@ const getFilesMapFromDir = async (dir: string) => {
   return files
 }
 
+let currentErrors = [] as string[]
+
 export const getResourcepackTiles = async (type: 'blocks' | 'items' | 'armor', existingTextures: string[]) => {
   const basePath = await getActiveResourcepackBasePath()
   if (!basePath) return
@@ -264,7 +271,7 @@ export const getResourcepackTiles = async (type: 'blocks' | 'items' | 'armor', e
       const file = basename(path)
       allInterestedPathsPerDir.get(dir)!.push(file)
     }
-    // filter out by readdir each dir
+
     const allInterestedImages = [] as string[]
     for (const [dir, paths] of allInterestedPathsPerDir) {
       if (!await existsAsync(dir)) {
@@ -280,22 +287,34 @@ export const getResourcepackTiles = async (type: 'blocks' | 'items' | 'armor', e
 
     const firstImageFile = allInterestedImages[0]!
     try {
-      // todo check all sizes from atlas
       firstTextureSize ??= await getSizeFromImage(`${firstImageFile}.png`)
     } catch (err) { }
+    // eslint-disable-next-line @typescript-eslint/no-loop-func
     const newTextures = Object.fromEntries(await Promise.all(allInterestedImages.map(async (image) => {
-      const imagePath = `${image}.png`
-      const contents = await fs.promises.readFile(imagePath, 'base64')
-      const img = await getLoadedImage(`data:image/png;base64,${contents}`)
-      const imageRelative = image.replace(`${texturesBasePath}/`, '').replace(`${texturesCommonBasePath}/`, '')
-      const textureName = isMinecraftNamespace ? imageRelative : `${namespace}:${imageRelative}`
-      return [textureName, img]
+      try {
+        const imagePath = `${image}.png`
+        const contents = await fs.promises.readFile(imagePath, 'base64')
+        const img = await getLoadedImage(`data:image/png;base64,${contents}`)
+        const imageRelative = image.replace(`${texturesBasePath}/`, '').replace(`${texturesCommonBasePath}/`, '')
+        const textureName = isMinecraftNamespace ? imageRelative : `${namespace}:${imageRelative}`
+
+        if (firstTextureSize && (img.width !== firstTextureSize || img.height !== firstTextureSize) && (type === 'blocks' || type === 'items')) {
+          currentErrors.push(`[${imageRelative}] Size mismatch: expected ${firstTextureSize}x${firstTextureSize}, got ${img.width}x${img.height}`)
+          return [textureName, undefined]
+        }
+        return [textureName, img]
+      } catch (err) {
+        const imageRelative = image.replace(`${texturesBasePath}/`, '').replace(`${texturesCommonBasePath}/`, '')
+        const textureName = isMinecraftNamespace ? imageRelative : `${namespace}:${imageRelative}`
+        currentErrors.push(`[${imageRelative}] ${err.message}`)
+        return [textureName, undefined]
+      }
     })))
-    Object.assign(textures, newTextures) as any
+    Object.assign(textures, Object.fromEntries(Object.entries(newTextures).filter(([, img]) => img !== undefined)))
   }
   return {
     firstTextureSize,
-    textures
+    textures,
   }
 }
 
@@ -478,6 +497,7 @@ const updateAllReplacableTextures = async () => {
 const repeatArr = (arr, i) => Array.from({ length: i }, () => arr)
 
 const updateTextures = async () => {
+  currentErrors = []
   const origBlocksFiles = Object.keys(viewer.world.sourceData.blocksAtlases.latest.textures)
   const origItemsFiles = Object.keys(viewer.world.sourceData.itemsAtlases.latest.textures)
   const origArmorFiles = Object.keys(armorTextures)
@@ -505,6 +525,7 @@ const updateTextures = async () => {
       textures: armorData.textures
     }
   }
+
   if (viewer.world.active) {
     await viewer.world.updateAssetsData()
     if (viewer.world instanceof WorldRendererThree) {

From 7110b8c66d94160e83763126dc581bd867340096 Mon Sep 17 00:00:00 2001
From: Phoenix616 <max@themoep.de>
Date: Thu, 20 Feb 2025 14:53:04 +0100
Subject: [PATCH 259/753] fix: improve rendering of armor to closer match game
 and prevent z-fighting

---
 renderer/viewer/lib/entity/armorModels.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/renderer/viewer/lib/entity/armorModels.json b/renderer/viewer/lib/entity/armorModels.json
index a9737725..3e33939e 100644
--- a/renderer/viewer/lib/entity/armorModels.json
+++ b/renderer/viewer/lib/entity/armorModels.json
@@ -92,7 +92,7 @@
             "origin": [4, 12, -2],
             "size": [4, 12, 4],
             "uv": [40, 16],
-            "inflate": 0.75
+            "inflate": 0.85
           }
         ]
       },
@@ -105,7 +105,7 @@
             "origin": [-8, 12, -2],
             "size": [4, 12, 4],
             "uv": [40, 16],
-            "inflate": 0.75
+            "inflate": 0.85
           }
         ],
         "mirror": true
@@ -128,7 +128,7 @@
             "origin": [-4, 12, -2],
             "size": [8, 12, 4],
             "uv": [16, 16],
-            "inflate": 0.75
+            "inflate": 0.5
           }
         ]
       },
@@ -151,7 +151,7 @@
         "pivot": [-1.9, 1, 0],
         "cubes": [
           {
-            "origin": [-3.9, 0, -2],
+            "origin": [-3.9, 0, -2.01],
             "size": [4, 12, 4],
             "uv": [0, 16],
             "inflate": 0.5
@@ -177,7 +177,7 @@
             "origin": [-0.1, 0, -2],
             "size": [4, 12, 4],
             "uv": [0, 16],
-            "inflate": 0.75
+            "inflate": 0.8
           }
         ]
       },
@@ -187,10 +187,10 @@
         "pivot": [-1.9, 1, 0],
         "cubes": [
           {
-            "origin": [-3.9, 0, -2],
+            "origin": [-3.9, 0.01, -2.01],
             "size": [4, 12, 4],
             "uv": [0, 16],
-            "inflate": 0.75
+            "inflate": 0.8
           }
         ],
         "mirror": true

From a268c698790f2c9c54fd28b0a7d603239ff5bd0f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 21 Feb 2025 20:15:38 +0300
Subject: [PATCH 260/753] feat: rework atlas packing so now almost any
 resourepack with different tile sizes can be used

---
 index.html                                 |  3 +-
 package.json                               |  3 +-
 pnpm-lock.yaml                             | 48 +++++++++++-----------
 renderer/viewer/lib/mesher/world.ts        |  2 +-
 renderer/viewer/lib/worldrendererCommon.ts | 13 ++++++
 src/index.ts                               |  5 +++
 src/resourcePack.ts                        |  4 --
 7 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/index.html b/index.html
index f168b6e4..50d96a6a 100644
--- a/index.html
+++ b/index.html
@@ -38,8 +38,9 @@
           }
           // load error handling
           const onError = (errorOrMessage, log = false) => {
-            const message = errorOrMessage instanceof Error ? (errorOrMessage.stack ?? errorOrMessage.message) : errorOrMessage
+            let message = errorOrMessage instanceof Error ? (errorOrMessage.stack ?? errorOrMessage.message) : errorOrMessage
             if (log) console.log(message)
+            if (typeof message !== 'string') message = String(message)
             if (document.querySelector('.initial-loader') && document.querySelector('.initial-loader').querySelector('.title').textContent !== 'Error') {
               document.querySelector('.initial-loader').querySelector('.title').textContent = 'Error'
               const [errorMessage, ...errorStack] = message.split('\n')
diff --git a/package.json b/package.json
index 995dfb95..96be22cb 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.35",
+    "mc-assets": "^0.2.36",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
@@ -188,6 +188,7 @@
   "pnpm": {
     "overrides": {
       "buffer": "^6.0.3",
+      "vec3": "0.1.10",
       "@nxg-org/mineflayer-physics-util": "1.5.8",
       "three": "0.154.0",
       "diamond-square": "github:zardoy/diamond-square",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ceda01e1..07a8244b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,6 +6,7 @@ settings:
 
 overrides:
   buffer: ^6.0.3
+  vec3: 0.1.10
   '@nxg-org/mineflayer-physics-util': 1.5.8
   three: 0.154.0
   diamond-square: github:zardoy/diamond-square
@@ -233,8 +234,8 @@ importers:
         specifier: ^1.11.1
         version: 1.11.2(@types/react@18.2.20)(react@18.2.0)
       vec3:
-        specifier: ^0.1.7
-        version: 0.1.8
+        specifier: 0.1.10
+        version: 0.1.10
       wait-on:
         specifier: ^7.2.0
         version: 7.2.0(debug@4.4.0)
@@ -349,8 +350,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.35
-        version: 0.2.35
+        specifier: ^0.2.36
+        version: 0.2.36
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -460,8 +461,8 @@ importers:
         specifier: ^4.7.0
         version: 4.7.0
       vec3:
-        specifier: ^0.1.7
-        version: 0.1.8
+        specifier: 0.1.10
+        version: 0.1.10
     optionalDependencies:
       canvas:
         specifier: ^2.11.2
@@ -3305,6 +3306,9 @@ packages:
     resolution: {integrity: sha512-FCAJojipPn0bXjuEpjOOOMN8FZDkxfWWp4JGN9mifU2IhxvKyXZYqpzPHdnTSUpmPDy+tsslB6Z1g+Vg6nVbYA==}
     engines: {node: '>=8'}
 
+  apl-image-packer@1.1.0:
+    resolution: {integrity: sha512-Pb1Q76cp8xpY8X4OqVrnk5v1/tB5kOtCzwgOnx8IxMNeekFh/eNUiUKeX5fvGNViZiLmuKAAQc5ICuBDspZ4cA==}
+
   app-root-dir@1.0.2:
     resolution: {integrity: sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g==}
 
@@ -6243,8 +6247,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.35:
-    resolution: {integrity: sha512-fOzeqn7fXVJ+ufA23H3iaeDGukEohhoUz8DXXv4bDCI6BMN8zq9q3eFhcGYOEKw9kXKe3ch49D8QAn6ou/+cHg==}
+  mc-assets@0.2.36:
+    resolution: {integrity: sha512-JBi9frIACmzmpKL38YudZJpml+tWP3UuCeb8ko5iJRHpmCmmChE+X3xzVEbEYnYBI2dMiO7915/5eYnKUVys3Q==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.0.3:
@@ -8886,9 +8890,6 @@ packages:
   vec3@0.1.10:
     resolution: {integrity: sha512-Sr1U3mYtMqCOonGd3LAN9iqy0qF6C+Gjil92awyK/i2OwiUo9bm7PnLgFpafymun50mOjnDcg4ToTgRssrlTcw==}
 
-  vec3@0.1.8:
-    resolution: {integrity: sha512-LfKrP625Bsg/Tj52YdYPsHmpsJuo+tc6fLxZxXjEo9k2xSspKlPvoYTHehykKhp1FvV9nm+XU3Ehej5/9tpDCg==}
-
   verror@1.10.0:
     resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
     engines: {'0': node >=0.6.0}
@@ -12828,7 +12829,7 @@ snapshots:
       sanitize-filename: 1.6.3
       typed-emitter: 1.4.0
       uuid-1345: 1.0.2
-      vec3: 0.1.8
+      vec3: 0.1.10
       yaml: 2.4.1
       yargs: 17.7.2
     transitivePeerDependencies:
@@ -12984,6 +12985,8 @@ snapshots:
 
   apache-md5@1.1.8: {}
 
+  apl-image-packer@1.1.0: {}
+
   app-root-dir@1.0.2: {}
 
   aproba@2.0.0:
@@ -16682,8 +16685,9 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.35:
+  mc-assets@0.2.36:
     dependencies:
+      apl-image-packer: 1.1.0
       zod: 3.24.1
 
   mcraft-fun-mineflayer@0.0.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13)):
@@ -17046,7 +17050,7 @@ snapshots:
   minecrafthawkeye@1.3.6:
     dependencies:
       detect-collisions: 7.0.5
-      vec3: 0.1.8
+      vec3: 0.1.10
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13):
     dependencies:
@@ -17064,7 +17068,7 @@ snapshots:
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
-      vec3: 0.1.8
+      vec3: 0.1.10
 
   mineflayer@4.25.0(encoding@0.1.13):
     dependencies:
@@ -17084,7 +17088,7 @@ snapshots:
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       protodef: 1.18.0
       typed-emitter: 1.4.0
-      vec3: 0.1.8
+      vec3: 0.1.10
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -17107,7 +17111,7 @@ snapshots:
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       protodef: 1.18.0
       typed-emitter: 1.4.0
-      vec3: 0.1.8
+      vec3: 0.1.10
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -17895,7 +17899,7 @@ snapshots:
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
       uint4: 0.1.2
-      vec3: 0.1.8
+      vec3: 0.1.10
       xxhash-wasm: 0.4.2
     transitivePeerDependencies:
       - minecraft-data
@@ -17905,7 +17909,7 @@ snapshots:
       prismarine-chat: 1.10.1
       prismarine-item: 1.16.0
       prismarine-registry: 1.11.0
-      vec3: 0.1.8
+      vec3: 0.1.10
 
   prismarine-item@1.16.0:
     dependencies:
@@ -17929,7 +17933,7 @@ snapshots:
       prismarine-nbt: 2.5.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       uint4: 0.1.2
-      vec3: 0.1.8
+      vec3: 0.1.10
     transitivePeerDependencies:
       - minecraft-data
 
@@ -17957,7 +17961,7 @@ snapshots:
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.5.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
-      vec3: 0.1.8
+      vec3: 0.1.10
 
   prismarine-windows@2.9.0:
     dependencies:
@@ -19973,8 +19977,6 @@ snapshots:
 
   vec3@0.1.10: {}
 
-  vec3@0.1.8: {}
-
   verror@1.10.0:
     dependencies:
       assert-plus: 1.0.0
diff --git a/renderer/viewer/lib/mesher/world.ts b/renderer/viewer/lib/mesher/world.ts
index 57f3ec2f..b914e8cf 100644
--- a/renderer/viewer/lib/mesher/world.ts
+++ b/renderer/viewer/lib/mesher/world.ts
@@ -124,7 +124,7 @@ export class World {
     return this.getColumn(Math.floor(pos.x / 16) * 16, Math.floor(pos.z / 16) * 16)
   }
 
-  getBlock (pos: Vec3, blockProvider?: WorldBlockProvider, attr?: { hadErrors: boolean }): WorldBlock | null {
+  getBlock (pos: Vec3, blockProvider?: WorldBlockProvider, attr?: { hadErrors?: boolean }): WorldBlock | null {
     // for easier testing
     if (!(pos instanceof Vec3)) pos = new Vec3(...pos as [number, number, number])
     const key = columnKey(Math.floor(pos.x / 16) * 16, Math.floor(pos.z / 16) * 16)
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 747481b1..c590cc1a 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -357,15 +357,19 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
 
     const customBlockTextures = Object.keys(this.customTextures.blocks?.textures ?? {})
+    console.time('createBlocksAtlas')
     const { atlas: blocksAtlas, canvas: blocksCanvas } = await blocksAssetsParser.makeNewAtlas(this.texturesVersion ?? this.version ?? 'latest', (textureName) => {
       const texture = this.customTextures?.blocks?.textures[textureName]
       return blockTexturesChanges[textureName] ?? texture
     }, /* this.customTextures?.blocks?.tileSize */undefined, prioritizeBlockTextures, customBlockTextures)
+    console.timeEnd('createBlocksAtlas')
+    console.time('createItemsAtlas')
     const { atlas: itemsAtlas, canvas: itemsCanvas } = await itemsAssetsParser.makeNewAtlas(this.texturesVersion ?? this.version ?? 'latest', (textureName) => {
       const texture = this.customTextures?.items?.textures[textureName]
       if (!texture) return
       return texture
     }, this.customTextures?.items?.tileSize)
+    console.timeEnd('createItemsAtlas')
     this.blocksAtlasParser = new AtlasParser({ latest: blocksAtlas }, blocksCanvas.toDataURL())
     this.itemsAtlasParser = new AtlasParser({ latest: itemsAtlas }, itemsCanvas.toDataURL())
 
@@ -409,6 +413,15 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     console.log('texture loaded')
   }
 
+  async downloadDebugAtlas (isItems = false) {
+    const atlasParser = (isItems ? this.itemsAtlasParser : this.blocksAtlasParser)!
+    const dataUrl = await atlasParser.createDebugImage(true)
+    const a = document.createElement('a')
+    a.href = dataUrl
+    a.download = `atlas-debug-${isItems ? 'items' : 'blocks'}.png`
+    a.click()
+  }
+
   get worldMinYRender () {
     return Math.floor(Math.max(this.worldConfig.minY, this.mesherConfig.clipWorldBelowY ?? -Infinity) / 16) * 16
   }
diff --git a/src/index.ts b/src/index.ts
index 99923e19..6426f219 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -167,6 +167,11 @@ if (appQueryParams.testCrashApp === '2') throw new Error('test')
 // Create viewer
 const viewer: import('renderer/viewer/lib/viewer').Viewer = new Viewer(renderer, undefined, playerState)
 window.viewer = viewer
+Object.defineProperty(window, 'world', {
+  get () {
+    return viewer.world
+  },
+})
 // todo unify
 viewer.entities.getItemUv = (item, specificProps) => {
   const idOrName = item.itemId ?? item.blockId
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index debe8cea..795440d2 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -298,10 +298,6 @@ export const getResourcepackTiles = async (type: 'blocks' | 'items' | 'armor', e
         const imageRelative = image.replace(`${texturesBasePath}/`, '').replace(`${texturesCommonBasePath}/`, '')
         const textureName = isMinecraftNamespace ? imageRelative : `${namespace}:${imageRelative}`
 
-        if (firstTextureSize && (img.width !== firstTextureSize || img.height !== firstTextureSize) && (type === 'blocks' || type === 'items')) {
-          currentErrors.push(`[${imageRelative}] Size mismatch: expected ${firstTextureSize}x${firstTextureSize}, got ${img.width}x${img.height}`)
-          return [textureName, undefined]
-        }
         return [textureName, img]
       } catch (err) {
         const imageRelative = image.replace(`${texturesBasePath}/`, '').replace(`${texturesCommonBasePath}/`, '')

From ba6a6184434c04dbdd2aa75c4b4930db638de132 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 21 Feb 2025 20:15:49 +0300
Subject: [PATCH 261/753] feat: add support for custom sounds and sounds.json

---
 src/sounds/botSoundSystem.ts |  4 +-
 src/sounds/soundsMap.ts      | 91 ++++++++++++++++++++++++++++--------
 2 files changed, 75 insertions(+), 20 deletions(-)

diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 01cef0c5..fa4bb88c 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -14,7 +14,8 @@ let soundMap: SoundMap | undefined
 
 const updateResourcePack = async () => {
   if (!soundMap) return
-  soundMap.activeResourcePackBasePath = await getActiveResourcepackBasePath() ?? undefined
+  // todo, rework to await
+  void soundMap.updateActiveResourcePackBasePath(await getActiveResourcepackBasePath() ?? undefined)
 }
 
 let musicInterval: ReturnType<typeof setInterval> | null = null
@@ -28,6 +29,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
 
   console.log(`Loading sounds for version ${bot.version}. Resourcepack state: ${JSON.stringify(resourcePackState)}`)
   soundMap = createSoundMap(bot.version) ?? undefined
+  globalThis.soundMap = soundMap
   if (!soundMap) return
   void updateResourcePack()
   startMusicSystem()
diff --git a/src/sounds/soundsMap.ts b/src/sounds/soundsMap.ts
index c53be871..bb849cca 100644
--- a/src/sounds/soundsMap.ts
+++ b/src/sounds/soundsMap.ts
@@ -31,10 +31,26 @@ interface SoundEntry {
   volume: number
 }
 
+interface ResourcePackSoundEntry {
+  name: string
+  stream?: boolean
+  volume?: number
+}
+
+interface ResourcePackSound {
+  category: string
+  sounds: ResourcePackSoundEntry[]
+}
+
+interface ResourcePackSoundsJson {
+  [soundId: string]: ResourcePackSound
+}
+
 export class SoundMap {
   private readonly soundsPerName: Record<string, SoundEntry[]>
   private readonly existingResourcePackPaths: Set<string>
-  public activeResourcePackBasePath: string | undefined
+  private activeResourcePackBasePath: string | undefined
+  private activeResourcePackSoundsJson: ResourcePackSoundsJson | undefined
 
   constructor (
     private readonly soundData: SoundMapData,
@@ -62,6 +78,28 @@ export class SoundMap {
     )
   }
 
+  async updateActiveResourcePackBasePath (basePath: string | undefined) {
+    this.activeResourcePackBasePath = basePath
+    if (!basePath) {
+      this.activeResourcePackSoundsJson = undefined
+      return
+    }
+
+    let soundsJsonContent: string | undefined
+    try {
+      const soundsJsonPath = path.join(basePath, 'assets/minecraft/sounds.json')
+      soundsJsonContent = await fs.promises.readFile(soundsJsonPath, 'utf8')
+    } catch (err) {}
+    try {
+      if (soundsJsonContent) {
+        this.activeResourcePackSoundsJson = JSON.parse(soundsJsonContent)
+      }
+    } catch (err) {
+      console.warn('Failed to parse sounds.json from resourcepack', err)
+      this.activeResourcePackSoundsJson = undefined
+    }
+  }
+
   async updateExistingResourcePackPaths () {
     if (!this.activeResourcePackBasePath) return
     // todo support sounds.js from resource pack
@@ -84,6 +122,38 @@ export class SoundMap {
   }
 
   async getSoundUrl (soundKey: string, volume = 1): Promise<{ url: string; volume: number } | undefined> {
+    // First check resource pack sounds.json
+    if (this.activeResourcePackSoundsJson && soundKey in this.activeResourcePackSoundsJson) {
+      const rpSound = this.activeResourcePackSoundsJson[soundKey]
+      // Pick a random sound from the resource pack
+      const sound = rpSound.sounds[Math.floor(Math.random() * rpSound.sounds.length)]
+      const soundVolume = sound.volume ?? 1
+
+      if (this.activeResourcePackBasePath) {
+        const tryFormat = async (format: string) => {
+          try {
+            const resourcePackPath = path.join(this.activeResourcePackBasePath!, `/assets/minecraft/sounds/${sound.name}.${format}`)
+            const fileData = await fs.promises.readFile(resourcePackPath)
+            return {
+              url: `data:audio/${format};base64,${fileData.toString('base64')}`,
+              volume: soundVolume * Math.max(Math.min(volume, 1), 0)
+            }
+          } catch (err) {
+            return null
+          }
+        }
+
+        const result = await tryFormat(this.soundData.soundsMeta.format)
+        if (result) return result
+
+        if (this.soundData.soundsMeta.format !== 'ogg') {
+          const oggResult = await tryFormat('ogg')
+          if (oggResult) return oggResult
+        }
+      }
+    }
+
+    // Fall back to vanilla sounds if no resource pack sound found
     const sounds = this.soundsPerName[soundKey]
     if (!sounds?.length) return undefined
 
@@ -97,30 +167,13 @@ export class SoundMap {
 
     const versionedSound = this.getVersionedSound(sound.file)
 
-    let url = this.soundData.soundsMeta.baseUrl.replace(/\/$/, '') +
+    const url = this.soundData.soundsMeta.baseUrl.replace(/\/$/, '') +
       (versionedSound ? `/${versionedSound}` : '') +
       '/minecraft/sounds/' +
       sound.file +
       '.' +
       this.soundData.soundsMeta.format
 
-    // Try loading from resource pack file first
-    if (this.activeResourcePackBasePath) {
-      const tryFormat = async (format: string) => {
-        try {
-          const resourcePackPath = path.join(this.activeResourcePackBasePath!, `/assets/minecraft/sounds/${sound.file}.${format}`)
-          const fileData = await fs.promises.readFile(resourcePackPath)
-          url = `data:audio/${format};base64,${fileData.toString('base64')}`
-          return true
-        } catch (err) {
-        }
-      }
-      const success = await tryFormat(this.soundData.soundsMeta.format)
-      if (!success && this.soundData.soundsMeta.format !== 'ogg') {
-        await tryFormat('ogg')
-      }
-    }
-
     return {
       url,
       volume: sound.volume * Math.max(Math.min(volume, 1), 0)

From f0d5ad616d8a2fe1bd74bc6b8165738e2ec11466 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 21 Feb 2025 20:38:24 +0300
Subject: [PATCH 262/753] fix: fix visual issue when loading screen disappears
 fix: display loading pregress of server resourecepacks

---
 src/appStatus.ts                |  1 +
 src/index.ts                    |  4 ----
 src/react/AppStatusProvider.tsx | 14 +++++++++++---
 src/resourcePack.ts             | 26 +++++++++++++++++++++++++-
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/appStatus.ts b/src/appStatus.ts
index 4c82973a..d3bfc461 100644
--- a/src/appStatus.ts
+++ b/src/appStatus.ts
@@ -33,3 +33,4 @@ export const setLoadingScreenStatus = function (status: string | undefined | nul
   appStatusState.status = status
   appStatusState.minecraftJsonMessage = minecraftJsonMessage ?? null
 }
+globalThis.setLoadingScreenStatus = setLoadingScreenStatus
diff --git a/src/index.ts b/src/index.ts
index 6426f219..bac2593e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -732,12 +732,8 @@ export async function connect (connectOptions: ConnectOptions) {
   // don't use spawn event, player can be dead
   bot.once(spawnEarlier ? 'forcedMove' : 'health', async () => {
     if (resourcePackState.isServerInstalling) {
-      setLoadingScreenStatus('Downloading resource pack')
       await new Promise<void>(resolve => {
         subscribe(resourcePackState, () => {
-          if (!resourcePackState.isServerDownloading) {
-            setLoadingScreenStatus('Installing resource pack')
-          }
           if (!resourcePackState.isServerInstalling) {
             resolve()
           }
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index 09fcb40a..dfb1b9bf 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -1,5 +1,5 @@
 import { proxy, useSnapshot } from 'valtio'
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { activeModalStack, activeModalStacks, hideModal, insertActiveModalStack, miscUiState } from '../globalState'
 import { guessProblem } from '../errorLoadingScreenHelpers'
 import type { ConnectOptions } from '../connect'
@@ -53,11 +53,19 @@ export const reconnectReload = () => {
 }
 
 export default () => {
-  const { isError, lastStatus, maybeRecoverable, status, hideDots, descriptionHint, loadingChunksData, loadingChunksDataPlayerChunk, minecraftJsonMessage, showReconnect } = useSnapshot(appStatusState)
+  const lastState = useRef(JSON.parse(JSON.stringify(appStatusState)))
+  const currentState = useSnapshot(appStatusState)
   const { active: replayActive } = useSnapshot(packetsReplaceSessionState)
 
   const isOpen = useIsModalActive('app-status')
 
+  if (isOpen) {
+    lastState.current = JSON.parse(JSON.stringify(currentState))
+  }
+
+  const usingState = isOpen ? currentState : lastState.current
+  const { isError, lastStatus, maybeRecoverable, status, hideDots, descriptionHint, loadingChunksData, loadingChunksDataPlayerChunk, minecraftJsonMessage, showReconnect } = usingState
+
   useDidUpdateEffect(() => {
     // todo play effect only when world successfully loaded
     if (!isOpen) {
@@ -108,7 +116,7 @@ export default () => {
   return <DiveTransition open={isOpen}>
     <AppStatus
       status={status}
-      isError={isError || appStatusState.status === ''} // display back button if status is empty as probably our app is errored
+      isError={isError || status === ''} // display back button if status is empty as probably our app is errored
       hideDots={hideDots}
       lastStatus={lastStatus}
       showReconnect={showReconnect}
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 795440d2..fdb36d45 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -381,6 +381,7 @@ const downloadAndUseResourcePack = async (url: string): Promise<void> => {
   try {
     resourcePackState.isServerInstalling = true
     resourcePackState.isServerDownloading = true
+    if (!miscUiState.gameLoaded) setLoadingScreenStatus('Downloading resource pack')
     console.log('Downloading server resource pack', url)
     console.time('downloadServerResourcePack')
     const response = await fetch(url).catch((err) => {
@@ -390,8 +391,31 @@ const downloadAndUseResourcePack = async (url: string): Promise<void> => {
     })
     console.timeEnd('downloadServerResourcePack')
     if (!response) return
+    if (!miscUiState.gameLoaded) setLoadingScreenStatus('Installing resource pack')
+
+    const contentLength = response.headers.get('Content-Length')
+    const total = contentLength ? parseInt(contentLength, 10) : 0
+    let loaded = 0
+
+    const reader = response.body!.getReader()
+    const chunks: Uint8Array[] = []
+
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      const { done, value } = await reader.read()
+      if (done) break
+
+      chunks.push(value)
+      loaded += value.length
+
+      if (total) {
+        const progress = Math.round((loaded / total) * 100)
+        if (!miscUiState.gameLoaded) setLoadingScreenStatus(`Downloading resource pack: ${progress}%`)
+      }
+    }
+
     resourcePackState.isServerDownloading = false
-    const resourcePackData = await response.arrayBuffer()
+    const resourcePackData = await new Blob(chunks).arrayBuffer()
     showNotification('Installing resource pack...')
     await installResourcepackPack(resourcePackData, undefined, undefined, true).catch((err) => {
       console.error(err)

From 78d923d81748850e6812a82e56accb4bf5c00d4b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 21 Feb 2025 21:33:21 +0300
Subject: [PATCH 263/753] a way to have packets logger always enabled

---
 src/optionsStorage.ts | 1 +
 src/packetsReplay.ts  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 8102ead5..b82d6bfb 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -57,6 +57,7 @@ const defaultOptions = {
   packetsLoggerPreset: 'all' as 'all' | 'no-buffers',
   serversAutoVersionSelect: 'auto' as 'auto' | 'latest' | '1.20.4' | string,
   customChannels: false,
+  packetsReplayAutoStart: false,
 
   // antiAliasing: false,
 
diff --git a/src/packetsReplay.ts b/src/packetsReplay.ts
index 615f7782..6b99e665 100644
--- a/src/packetsReplay.ts
+++ b/src/packetsReplay.ts
@@ -3,7 +3,7 @@ import { PacketsLogger } from './packetsReplayBase'
 import { options } from './optionsStorage'
 
 export const packetsReplaceSessionState = proxy({
-  active: false,
+  active: options.packetsReplayAutoStart,
   hasRecordedPackets: false
 })
 

From 81a692272cbaf24118b7c4dd1fa57a3aeef70cfa Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 22 Feb 2025 20:57:40 +0300
Subject: [PATCH 264/753] fix: fix sound id mapping for some versions like
 1.16.5

---
 scripts/makeOptimizedMcData.mjs |  6 ++--
 src/sounds/botSoundSystem.ts    |  5 ++-
 src/sounds/soundsMap.ts         | 63 +++++++++++++++++++++++----------
 3 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/scripts/makeOptimizedMcData.mjs b/scripts/makeOptimizedMcData.mjs
index ebc97b59..eae0444b 100644
--- a/scripts/makeOptimizedMcData.mjs
+++ b/scripts/makeOptimizedMcData.mjs
@@ -138,9 +138,9 @@ const dataTypeBundling = {
   protocol: {
     raw: true
   },
-  sounds: {
-    arrKey: 'name'
-  }
+  // sounds: {
+  //   arrKey: 'name'
+  // }
 }
 
 const notBundling = [...dataTypes.keys()].filter(x => !Object.keys(dataTypeBundling).includes(x))
diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index fa4bb88c..059f7e65 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -21,7 +21,7 @@ const updateResourcePack = async () => {
 let musicInterval: ReturnType<typeof setInterval> | null = null
 
 subscribeKey(miscUiState, 'gameLoaded', async () => {
-  if (!miscUiState.gameLoaded || !loadedData.sounds) {
+  if (!miscUiState.gameLoaded) {
     stopMusicSystem()
     soundMap?.quit()
     return
@@ -108,8 +108,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
   })
 
   bot.on('hardcodedSoundEffectHeard', async (soundIdNum, soundCategory, position, volume, pitch) => {
-    const fixOffset = versionToNumber('1.20.4') === versionToNumber(bot.version) ? -1 : 0
-    const soundKey = loadedData.sounds[soundIdNum + fixOffset]?.name
+    const soundKey = soundMap!.soundsIdToName[soundIdNum]
     if (soundKey === undefined) return
     await playGeneralSound(soundKey, position, volume, pitch)
   })
diff --git a/src/sounds/soundsMap.ts b/src/sounds/soundsMap.ts
index bb849cca..7cdfe74d 100644
--- a/src/sounds/soundsMap.ts
+++ b/src/sounds/soundsMap.ts
@@ -48,6 +48,7 @@ interface ResourcePackSoundsJson {
 
 export class SoundMap {
   private readonly soundsPerName: Record<string, SoundEntry[]>
+  soundsIdToName: Record<string, string>
   private readonly existingResourcePackPaths: Set<string>
   private activeResourcePackBasePath: string | undefined
   private activeResourcePackSoundsJson: ResourcePackSoundsJson | undefined
@@ -58,24 +59,28 @@ export class SoundMap {
   ) {
     const allSoundsMajor = versionsMapToMajor(soundData.allSoundsMap)
     const soundsMap = allSoundsMajor[versionToMajor(version)] ?? Object.values(allSoundsMajor)[0]
-    this.soundsPerName = Object.fromEntries(
-      Object.entries(soundsMap).map(([id, soundsStr]) => {
-        const sounds = soundsStr.split(',').map(s => {
-          const [volume, name, weight] = s.split(';')
-          if (isNaN(Number(volume))) throw new Error('volume is not a number')
-          if (isNaN(Number(weight))) {
-            // debugger
-            throw new TypeError('weight is not a number')
-          }
-          return {
-            file: name,
-            weight: Number(weight),
-            volume: Number(volume)
-          }
-        })
-        return [id.split(';')[1], sounds]
+
+    // Create both mappings
+    this.soundsIdToName = {}
+    this.soundsPerName = {}
+
+    for (const [id, soundsStr] of Object.entries(soundsMap)) {
+      const sounds = soundsStr.split(',').map(s => {
+        const [volume, name, weight] = s.split(';')
+        if (isNaN(Number(volume))) throw new Error('volume is not a number')
+        if (isNaN(Number(weight))) throw new TypeError('weight is not a number')
+        return {
+          file: name,
+          weight: Number(weight),
+          volume: Number(volume)
+        }
       })
-    )
+
+      const [idPart, namePart] = id.split(';')
+      this.soundsIdToName[idPart] = namePart
+
+      this.soundsPerName[namePart] = sounds
+    }
   }
 
   async updateActiveResourcePackBasePath (basePath: string | undefined) {
@@ -241,7 +246,6 @@ const blockSoundAliases: BlockSoundMap = {
   bamboo: 'grass',
   vine: 'grass',
   nether_sprouts: 'grass',
-  nether_wart: 'grass',
   twisting_vines: 'grass',
   weeping_vines: 'grass',
   sweet_berry_bush: 'grass',
@@ -257,6 +261,28 @@ const blockSoundAliases: BlockSoundMap = {
   azalea_leaves: 'grass',
   flowering_azalea_leaves: 'grass',
 
+  // Dirt and ground blocks
+  dirt: 'gravel',
+  coarse_dirt: 'gravel',
+  podzol: 'gravel',
+  mycelium: 'gravel',
+  farmland: 'gravel',
+  dirt_path: 'gravel',
+  rooted_dirt: 'rooted_dirt',
+
+  // Crop blocks
+  wheat: 'crop',
+  potatoes: 'crop',
+  carrots: 'crop',
+  beetroots: 'crop',
+  melon_stem: 'crop',
+  pumpkin_stem: 'crop',
+  sweet_berries: 'crop',
+  cocoa: 'crop',
+  nether_wart: 'crop',
+  torchflower_crop: 'crop',
+  pitcher_crop: 'crop',
+
   // Stone-like blocks
   cobblestone: 'stone',
   stone_bricks: 'stone',
@@ -394,7 +420,6 @@ const blockSoundAliases: BlockSoundMap = {
   soul_lantern: 'lantern',
   pointed_dripstone: 'pointed_dripstone',
   dripstone_block: 'dripstone_block',
-  rooted_dirt: 'rooted_dirt',
   sculk_sensor: 'sculk_sensor',
   shroomlight: 'shroomlight'
 }

From 1387cb036bf56db69ba71fd5cf7ace6c92f6cca1 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sun, 23 Feb 2025 03:48:15 +0300
Subject: [PATCH 265/753] feat: Replay packets server functionality! (#287)

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 README.MD                                     |   1 +
 package.json                                  |   2 +-
 pnpm-lock.yaml                                |  47 ++-
 src/appParams.ts                              |   8 +-
 src/browserfs.ts                              |  28 +-
 src/connect.ts                                |   3 +
 src/controls.ts                               |   4 +-
 src/downloadAndOpenFile.ts                    |  18 ++
 src/dragndrop.ts                              |  12 +-
 src/index.ts                                  |  47 ++-
 src/mineflayer/plugins/localRelay.ts          |  32 ++
 src/optionsGuiScheme.tsx                      |   2 +-
 .../packetsReplayLegacy.ts}                   |   4 +-
 src/packetsReplay/replayPackets.ts            | 274 ++++++++++++++++++
 src/packetsReplayBase.ts                      |  60 ----
 src/react/AppStatusProvider.tsx               |   3 +-
 src/react/Book.stories.tsx                    |   2 +-
 src/react/GameInteractionOverlay.tsx          |   6 +-
 src/react/HotbarRenderApp.tsx                 |   6 +-
 src/react/NotificationProvider.tsx            |   2 +-
 src/react/PacketsReplayProvider.tsx           |  66 +++++
 src/react/ReplayPanel.stories.tsx             | 106 +++++++
 src/react/ReplayPanel.tsx                     | 172 +++++++++++
 src/react/components/replay/FilterInput.tsx   | 159 ++++++++++
 src/react/components/replay/PacketList.tsx    | 141 +++++++++
 src/react/components/replay/ProgressBar.tsx   |  36 +++
 src/react/components/replay/constants.ts      |  11 +
 src/react/packetsFilter.ts                    |  55 ++++
 src/react/state/packetsReplayState.ts         |  19 ++
 src/reactUi.tsx                               |   2 +
 src/utils.ts                                  |   7 +-
 31 files changed, 1232 insertions(+), 103 deletions(-)
 create mode 100644 src/mineflayer/plugins/localRelay.ts
 rename src/{packetsReplay.ts => packetsReplay/packetsReplayLegacy.ts} (94%)
 create mode 100644 src/packetsReplay/replayPackets.ts
 delete mode 100644 src/packetsReplayBase.ts
 create mode 100644 src/react/PacketsReplayProvider.tsx
 create mode 100644 src/react/ReplayPanel.stories.tsx
 create mode 100644 src/react/ReplayPanel.tsx
 create mode 100644 src/react/components/replay/FilterInput.tsx
 create mode 100644 src/react/components/replay/PacketList.tsx
 create mode 100644 src/react/components/replay/ProgressBar.tsx
 create mode 100644 src/react/components/replay/constants.ts
 create mode 100644 src/react/packetsFilter.ts
 create mode 100644 src/react/state/packetsReplayState.ts

diff --git a/README.MD b/README.MD
index bd884b43..90e8f35f 100644
--- a/README.MD
+++ b/README.MD
@@ -144,6 +144,7 @@ General:
 
 - **`?setting=<setting_name>:<setting_value>`** - Set and lock the setting on load. You can set multiple settings by separating them with `&` e.g. `?setting=autoParkour:true&setting=renderDistance:4`
 - `?modal=<modal>` - Open specific modal on page load eg `keybindings`. Very useful on UI changes testing during dev. For path use `,` as separator. To get currently opened modal type this in the console: `activeModalStack.at(-1).reactType`
+- `?replayFileUrl=<url>` - Load and start a packet replay session from a URL with a integrated server. For debugging / previewing recorded sessions. The file must be CORS enabled.
 
 Server specific:
 
diff --git a/package.json b/package.json
index 96be22cb..250c8522 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "mojangson": "^2.0.4",
     "net-browserify": "github:zardoy/prismarinejs-net-browserify",
     "node-gzip": "^1.1.2",
-    "mcraft-fun-mineflayer": "0.0.3",
+    "mcraft-fun-mineflayer": "^0.1.3",
     "peerjs": "^1.5.0",
     "pixelarticons": "^1.8.1",
     "pretty-bytes": "^6.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 07a8244b..9f4ccb76 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -135,8 +135,8 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       mcraft-fun-mineflayer:
-        specifier: 0.0.3
-        version: 0.0.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13))
+        specifier: ^0.1.3
+        version: 0.1.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -6251,9 +6251,9 @@ packages:
     resolution: {integrity: sha512-JBi9frIACmzmpKL38YudZJpml+tWP3UuCeb8ko5iJRHpmCmmChE+X3xzVEbEYnYBI2dMiO7915/5eYnKUVys3Q==}
     engines: {node: '>=18.0.0'}
 
-  mcraft-fun-mineflayer@0.0.3:
-    resolution: {integrity: sha512-IqYXHk5ihQOF9FzEpMWsFwgilTySklYVj3AODK7sdgaSe+pU9wZllJjVvsYdc/F3uLMgogkyTLuVoEVMD+UiSA==}
-    version: 0.0.3
+  mcraft-fun-mineflayer@0.1.3:
+    resolution: {integrity: sha512-3Xds5XBLwYHFgH09RS9fHNK7NJI2ZStXiYvU/9FVUMd9TOwcMwLorn1kNYOw022/0nGi3hibT3ldj6vLCjASIg==}
+    version: 0.1.3
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       '@roamhq/wrtc': '*'
@@ -6461,6 +6461,11 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8}
     version: 1.0.1
 
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d}
+    version: 1.54.0
+    engines: {node: '>=22'}
+
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76:
     resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76}
     version: 1.54.0
@@ -12775,7 +12780,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.2.3
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -16690,11 +16695,11 @@ snapshots:
       apl-image-packer: 1.1.0
       zod: 3.24.1
 
-  mcraft-fun-mineflayer@0.0.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.0
@@ -17003,6 +17008,32 @@ snapshots:
       - '@types/react'
       - react
 
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13):
+    dependencies:
+      '@types/node-rsa': 1.1.4
+      '@types/readable-stream': 4.0.12
+      aes-js: 3.1.2
+      buffer-equal: 1.0.1
+      debug: 4.4.0(supports-color@8.1.1)
+      endian-toggle: 0.0.0
+      lodash.get: 4.4.2
+      lodash.merge: 4.6.2
+      minecraft-data: 3.83.1
+      minecraft-folder-path: 1.2.0
+      node-fetch: 2.7.0(encoding@0.1.13)
+      node-rsa: 0.4.2
+      prismarine-auth: 2.4.2(encoding@0.1.13)
+      prismarine-chat: 1.10.1
+      prismarine-nbt: 2.5.0
+      prismarine-realms: 1.3.2(encoding@0.1.13)
+      protodef: 1.18.0
+      readable-stream: 4.5.2
+      uuid-1345: 1.0.2
+      yggdrasil: 1.7.0(encoding@0.1.13)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
diff --git a/src/appParams.ts b/src/appParams.ts
index 61ee9e07..413b6c2d 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -39,6 +39,12 @@ export type AppQsParams = {
   suggest_save?: string
   noPacketsValidation?: string
   testCrashApp?: string
+
+  // Replay params
+  replayFilter?: string
+  replaySpeed?: string
+  replayFileUrl?: string
+  replayValidateClient?: string
 }
 
 export type AppQsParamsArray = {
@@ -55,7 +61,7 @@ type AppQsParamsArrayTransformed = {
 export const appQueryParams = new Proxy<AppQsParams>({} as AppQsParams, {
   get (target, property) {
     if (typeof property !== 'string') {
-      return null
+      return undefined
     }
     return qsParams.get(property)
   },
diff --git a/src/browserfs.ts b/src/browserfs.ts
index bd862ae0..76733e64 100644
--- a/src/browserfs.ts
+++ b/src/browserfs.ts
@@ -10,7 +10,10 @@ import { fsState, loadSave } from './loadSave'
 import { installResourcepackPack, installTexturePackFromHandle, updateTexturePackInstalledState } from './resourcePack'
 import { miscUiState } from './globalState'
 import { setLoadingScreenStatus } from './appStatus'
-const { GoogleDriveFileSystem } = require('google-drive-browserfs/src/backends/GoogleDrive') // disable type checking
+import { VALID_REPLAY_EXTENSIONS, openFile } from './packetsReplay/replayPackets'
+import { getFixedFilesize } from './downloadAndOpenFile'
+import { packetsReplayState } from './react/state/packetsReplayState'
+const { GoogleDriveFileSystem } = require('google-drive-browserfs/src/backends/GoogleDrive')
 
 browserfs.install(window)
 const defaultMountablePoints = {
@@ -621,22 +624,33 @@ export const openFilePicker = (specificCase?: 'resourcepack') => {
   if (!picker) {
     picker = document.createElement('input')
     picker.type = 'file'
-    picker.accept = '.zip'
+    picker.accept = specificCase ? '.zip' : [...VALID_REPLAY_EXTENSIONS, '.zip'].join(',')
 
     picker.addEventListener('change', () => {
       const file = picker.files?.[0]
       picker.value = ''
       if (!file) return
-      if (!file.name.endsWith('.zip')) {
-        const doContinue = confirm(`Are you sure ${file.name.slice(-20)} is .zip file? Only .zip files are supported. Continue?`)
-        if (!doContinue) return
-      }
       if (specificCase === 'resourcepack') {
+        if (!file.name.endsWith('.zip')) {
+          const doContinue = confirm(`Are you sure ${file.name.slice(-20)} is .zip file? ONLY .zip files are supported. Continue?`)
+          if (!doContinue) return
+        }
         void installResourcepackPack(file).catch((err) => {
           setLoadingScreenStatus(err.message, true)
         })
       } else {
-        void openWorldZip(file)
+        // eslint-disable-next-line no-lonely-if
+        if (VALID_REPLAY_EXTENSIONS.some(ext => file.name.endsWith(ext)) || file.name.startsWith('packets-replay')) {
+          void file.text().then(contents => {
+            openFile({
+              contents,
+              filename: file.name,
+              filesize: file.size
+            })
+          })
+        } else {
+          void openWorldZip(file)
+        }
       }
     })
     picker.hidden = true
diff --git a/src/connect.ts b/src/connect.ts
index 9ada9b8a..a67e6a62 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -23,6 +23,9 @@ export type ConnectOptions = {
   peerOptions?: any
   viewerWsConnect?: string
   saveServerToHistory?: boolean
+
+  /** Will enable local replay server */
+  worldStateFileContents?: string
 }
 
 export const getVersionAutoSelect = (autoVersionSelect = options.serversAutoVersionSelect) => {
diff --git a/src/controls.ts b/src/controls.ts
index b0add043..965a2a67 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -8,7 +8,7 @@ import { CommandEventArgument, SchemaCommandInput } from 'contro-max/build/types
 import { stringStartsWith } from 'contro-max/build/stringUtils'
 import { UserOverrideCommand, UserOverridesConfig } from 'contro-max/build/types/store'
 import { isGameActive, showModal, gameAdditionalState, activeModalStack, hideCurrentModal, miscUiState, hideModal, hideAllModals } from './globalState'
-import { goFullscreen, pointerLock, reloadChunks } from './utils'
+import { goFullscreen, isInRealGameSession, pointerLock, reloadChunks } from './utils'
 import { options } from './optionsStorage'
 import { openPlayerInventory } from './inventoryWindows'
 import { chatInputValueGlobal } from './react/Chat'
@@ -835,7 +835,7 @@ const selectItem = async () => {
 
 addEventListener('mousedown', async (e) => {
   if ((e.target as HTMLElement).matches?.('#VRButton')) return
-  if (gameAdditionalState.viewerConnection && !(e.target as HTMLElement).id.includes('ui-root')) return
+  if (!isInRealGameSession() && !(e.target as HTMLElement).id.includes('ui-root')) return
   void pointerLock.requestPointerLock()
   if (!bot) return
   // wheel click
diff --git a/src/downloadAndOpenFile.ts b/src/downloadAndOpenFile.ts
index b1cf6859..2cbb3aad 100644
--- a/src/downloadAndOpenFile.ts
+++ b/src/downloadAndOpenFile.ts
@@ -3,12 +3,30 @@ import { openWorldFromHttpDir, openWorldZip } from './browserfs'
 import { getResourcePackNames, installResourcepackPack, resourcePackState, updateTexturePackInstalledState } from './resourcePack'
 import { setLoadingScreenStatus } from './appStatus'
 import { appQueryParams, appQueryParamsArray } from './appParams'
+import { VALID_REPLAY_EXTENSIONS, openFile } from './packetsReplay/replayPackets'
 
 export const getFixedFilesize = (bytes: number) => {
   return prettyBytes(bytes, { minimumFractionDigits: 2, maximumFractionDigits: 2 })
 }
 
 const inner = async () => {
+  const { replayFileUrl } = appQueryParams
+  if (replayFileUrl) {
+    setLoadingScreenStatus('Downloading replay file...')
+    const response = await fetch(replayFileUrl)
+    const contentLength = response.headers?.get('Content-Length')
+    const size = contentLength ? +contentLength : undefined
+    const filename = replayFileUrl.split('/').pop()
+
+    const contents = await response.text()
+    openFile({
+      contents,
+      filename,
+      filesize: size
+    })
+    return true
+  }
+
   const mapUrlDir = appQueryParamsArray.mapDir ?? []
   const mapUrlDirGuess = appQueryParams.mapDirGuess
   const mapUrlDirBaseUrl = appQueryParams.mapDirBaseUrl
diff --git a/src/dragndrop.ts b/src/dragndrop.ts
index 1f4b0e2b..6c8af856 100644
--- a/src/dragndrop.ts
+++ b/src/dragndrop.ts
@@ -6,6 +6,7 @@ import { versions } from 'minecraft-data'
 import { openWorldDirectory, openWorldZip } from './browserfs'
 import { isGameActive } from './globalState'
 import { showNotification } from './react/NotificationProvider'
+import { openFile, VALID_REPLAY_EXTENSIONS } from './packetsReplay/replayPackets'
 
 const parseNbt = promisify(nbt.parse)
 const simplifyNbt = nbt.simplify
@@ -53,10 +54,19 @@ async function handleDroppedFile (file: File) {
     alert('Rar files are not supported yet!')
     return
   }
+  if (VALID_REPLAY_EXTENSIONS.some(ext => file.name.endsWith(ext)) || file.name.startsWith('packets-replay')) {
+    const contents = await file.text()
+    openFile({
+      contents,
+      filename: file.name,
+      filesize: file.size
+    })
+    return
+  }
   if (file.name.endsWith('.mca')) {
     const tempPath = '/data/temp.mca'
     try {
-      await fs.promises.writeFile(tempPath, Buffer.from(await file.arrayBuffer()))
+      await fs.promises.writeFile(tempPath, Buffer.from(await file.arrayBuffer()) as any)
       const region = new RegionFile(tempPath)
       await region.initialize()
       const chunks: Record<string, any> = {}
diff --git a/src/index.ts b/src/index.ts
index bac2593e..def72d2e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -45,7 +45,7 @@ import * as THREE from 'three'
 import MinecraftData from 'minecraft-data'
 import debug from 'debug'
 import { defaultsDeep } from 'lodash-es'
-import initializePacketsReplay from './packetsReplay'
+import initializePacketsReplay from './packetsReplay/packetsReplayLegacy'
 
 import { initVR } from './vr'
 import {
@@ -111,6 +111,9 @@ import { states } from 'minecraft-protocol'
 import { initMotionTracking } from './react/uiMotion'
 import { UserError } from './mineflayer/userError'
 import ping from './mineflayer/plugins/ping'
+import { LocalServer } from './customServer'
+import { startLocalReplayServer } from './packetsReplay/replayPackets'
+import { localRelayServerPlugin } from './mineflayer/plugins/localRelay'
 
 window.debug = debug
 window.THREE = THREE
@@ -397,6 +400,7 @@ export async function connect (connectOptions: ConnectOptions) {
   const renderDistance = singleplayer ? renderDistanceSingleplayer : multiplayerRenderDistance
   let updateDataAfterJoin = () => { }
   let localServer
+  let localReplaySession: ReturnType<typeof startLocalReplayServer> | undefined
   try {
     const serverOptions = defaultsDeep({}, connectOptions.serverOverrides ?? {}, options.localServerOptions, defaultServerOptions)
     Object.assign(serverOptions, connectOptions.serverOverridesFlat ?? {})
@@ -436,6 +440,16 @@ export async function connect (connectOptions: ConnectOptions) {
 
     let finalVersion = connectOptions.botVersion || (singleplayer ? serverOptions.version : undefined)
 
+    if (connectOptions.worldStateFileContents) {
+      try {
+        localReplaySession = startLocalReplayServer(connectOptions.worldStateFileContents)
+      } catch (err) {
+        console.error(err)
+        throw new UserError(`Failed to start local replay server: ${err}`)
+      }
+      finalVersion = localReplaySession.version
+    }
+
     if (singleplayer) {
       // SINGLEPLAYER EXPLAINER:
       // Note 1: here we have custom sync communication between server Client (flying-squid) and game client (mineflayer)
@@ -484,6 +498,8 @@ export async function connect (connectOptions: ConnectOptions) {
       initialLoadingText = `Connecting to server ${server.host}:${server.port ?? 25_565} with version ${finalVersion}`
     } else if (connectOptions.viewerWsConnect) {
       initialLoadingText = `Connecting to Mineflayer WebSocket server ${connectOptions.viewerWsConnect}`
+    } else if (connectOptions.worldStateFileContents) {
+      initialLoadingText = `Loading local replay server`
     } else {
       initialLoadingText = 'We have no idea what to do'
     }
@@ -543,7 +559,7 @@ export async function connect (connectOptions: ConnectOptions) {
       ...clientDataStream ? {
         stream: clientDataStream as any,
       } : {},
-      ...singleplayer || p2pMultiplayer ? {
+      ...singleplayer || p2pMultiplayer || localReplaySession ? {
         keepAlive: false,
       } : {},
       ...singleplayer ? {
@@ -551,6 +567,10 @@ export async function connect (connectOptions: ConnectOptions) {
         connect () { },
         Client: CustomChannelClient as any,
       } : {},
+      ...localReplaySession ? {
+        connect () { },
+        Client: CustomChannelClient as any,
+      } : {},
       onMsaCode (data) {
         signInMessageState.code = data.user_code
         signInMessageState.link = data.verification_uri
@@ -613,15 +633,17 @@ export async function connect (connectOptions: ConnectOptions) {
       void handleCustomChannel()
     }
     customEvents.emit('mineflayerBotCreated')
-    if (singleplayer || p2pMultiplayer) {
-      // in case of p2pMultiplayer there is still flying-squid on the host side
-      const _supportFeature = bot.supportFeature
-      bot.supportFeature = ((feature) => {
-        if (unsupportedLocalServerFeatures.includes(feature)) {
-          return false
-        }
-        return _supportFeature(feature)
-      }) as typeof bot.supportFeature
+    if (singleplayer || p2pMultiplayer || localReplaySession) {
+      if (singleplayer || p2pMultiplayer) {
+        // in case of p2pMultiplayer there is still flying-squid on the host side
+        const _supportFeature = bot.supportFeature
+        bot.supportFeature = ((feature) => {
+          if (unsupportedLocalServerFeatures.includes(feature)) {
+            return false
+          }
+          return _supportFeature(feature)
+        }) as typeof bot.supportFeature
+      }
 
       bot.emit('inject_allowed')
       bot._client.emit('connect')
@@ -670,6 +692,9 @@ export async function connect (connectOptions: ConnectOptions) {
   if (connectOptions.server) {
     bot.loadPlugin(ping)
   }
+  if (!localReplaySession) {
+    bot.loadPlugin(localRelayServerPlugin)
+  }
   if (!bot) return
 
   const p2pConnectTimeout = p2pMultiplayer ? setTimeout(() => { throw new UserError('Spawn timeout. There might be error on the other side, check console.') }, 20_000) : undefined
diff --git a/src/mineflayer/plugins/localRelay.ts b/src/mineflayer/plugins/localRelay.ts
new file mode 100644
index 00000000..e7d304a7
--- /dev/null
+++ b/src/mineflayer/plugins/localRelay.ts
@@ -0,0 +1,32 @@
+import { viewerConnector } from 'mcraft-fun-mineflayer'
+import { PACKETS_REPLAY_FILE_EXTENSION, WORLD_STATE_FILE_EXTENSION } from 'mcraft-fun-mineflayer/build/worldState'
+import { Bot } from 'mineflayer'
+
+export const localRelayServerPlugin = (bot: Bot) => {
+  bot.loadPlugin(
+    viewerConnector({
+      tcpEnabled: false,
+      websocketEnabled: false,
+    })
+  )
+
+  bot.downloadCurrentWorldState = () => {
+    const worldState = bot.webViewer._unstable.createStateCaptureFile()
+    const a = document.createElement('a')
+    const textContents = worldState.contents
+    const blob = new Blob([textContents], { type: 'text/plain' })
+    const url = URL.createObjectURL(blob)
+    a.href = url
+    // add readable timestamp to filename
+    const timestamp = new Date().toISOString().replaceAll(/[-:Z]/g, '')
+    a.download = `${bot.username}-world-state-${timestamp}.${WORLD_STATE_FILE_EXTENSION}`
+    a.click()
+    URL.revokeObjectURL(url)
+  }
+}
+
+declare module 'mineflayer' {
+  interface Bot {
+    downloadCurrentWorldState: () => void
+  }
+}
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index bbc04fa6..8b994507 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -11,7 +11,7 @@ import { getScreenRefreshRate } from './utils'
 import { setLoadingScreenStatus } from './appStatus'
 import { openFilePicker, resetLocalStorageWithoutWorld } from './browserfs'
 import { completeTexturePackInstall, getResourcePackNames, resourcePackState, uninstallResourcePack } from './resourcePack'
-import { downloadPacketsReplay, packetsReplaceSessionState } from './packetsReplay'
+import { downloadPacketsReplay, packetsReplaceSessionState } from './packetsReplay/packetsReplayLegacy'
 import { showOptionsModal } from './react/SelectOption'
 import supportedVersions from './supportedVersions.mjs'
 import { getVersionAutoSelect } from './connect'
diff --git a/src/packetsReplay.ts b/src/packetsReplay/packetsReplayLegacy.ts
similarity index 94%
rename from src/packetsReplay.ts
rename to src/packetsReplay/packetsReplayLegacy.ts
index 6b99e665..0db97012 100644
--- a/src/packetsReplay.ts
+++ b/src/packetsReplay/packetsReplayLegacy.ts
@@ -1,6 +1,6 @@
 import { proxy } from 'valtio'
-import { PacketsLogger } from './packetsReplayBase'
-import { options } from './optionsStorage'
+import { PacketsLogger } from 'mcraft-fun-mineflayer/build/packetsLogger'
+import { options } from '../optionsStorage'
 
 export const packetsReplaceSessionState = proxy({
   active: options.packetsReplayAutoStart,
diff --git a/src/packetsReplay/replayPackets.ts b/src/packetsReplay/replayPackets.ts
new file mode 100644
index 00000000..1af819f6
--- /dev/null
+++ b/src/packetsReplay/replayPackets.ts
@@ -0,0 +1,274 @@
+/* eslint-disable no-await-in-loop */
+import { createServer, ServerClient } from 'minecraft-protocol'
+import { parseReplayContents } from 'mcraft-fun-mineflayer/build/packetsLogger'
+import { WorldStateHeader, PACKETS_REPLAY_FILE_EXTENSION, WORLD_STATE_FILE_EXTENSION } from 'mcraft-fun-mineflayer/build/worldState'
+import { LocalServer } from '../customServer'
+import { UserError } from '../mineflayer/userError'
+import { packetsReplayState } from '../react/state/packetsReplayState'
+import { getFixedFilesize } from '../react/simpleUtils'
+import { appQueryParams } from '../appParams'
+
+const SUPPORTED_FORMAT_VERSION = 1
+
+type ReplayDefinition = {
+  minecraftVersion: string
+  replayAgainst?: 'client' | 'server'
+  serverIp?: string
+}
+
+interface OpenFileOptions {
+  contents: string
+  filename?: string
+  filesize?: number
+}
+
+export function openFile ({ contents, filename = 'unnamed', filesize }: OpenFileOptions) {
+  packetsReplayState.replayName = `${filename} (${getFixedFilesize(filesize ?? contents.length)})`
+  packetsReplayState.isOpen = true
+  packetsReplayState.isPlaying = false
+
+  const connectOptions = {
+    worldStateFileContents: contents,
+    username: 'replay'
+  }
+  dispatchEvent(new CustomEvent('connect', { detail: connectOptions }))
+}
+
+export const startLocalReplayServer = (contents: string) => {
+  const lines = contents.split('\n')
+  if (!lines[0]) {
+    throw new UserError('No header line found. Cannot parse replay definition.')
+  }
+  let def: WorldStateHeader | ReplayDefinition
+  try {
+    def = JSON.parse(lines[0])
+  } catch (err) {
+    throw new UserError(`Invalid JSON in file header: ${String(err)}`)
+  }
+  const packetsRaw = lines.slice(1).join('\n')
+  const replayData = parseReplayContents(packetsRaw)
+
+  packetsReplayState.packetsPlayback = []
+  packetsReplayState.isOpen = true
+  packetsReplayState.isPlaying = true
+  packetsReplayState.progress = {
+    current: 0,
+    total: replayData.packets.filter(packet => packet.isFromServer).length
+  }
+  packetsReplayState.speed = 1
+  packetsReplayState.replayName ||= `local ${getFixedFilesize(contents.length)}`
+  packetsReplayState.replayName = `${def.minecraftVersion} ${packetsReplayState.replayName}`
+
+  if ('formatVersion' in def && def.formatVersion !== SUPPORTED_FORMAT_VERSION) {
+    throw new UserError(`Unsupported format version: ${def.formatVersion}`)
+  }
+  if ('replayAgainst' in def && def.replayAgainst === 'server') {
+    throw new Error('not supported')
+  }
+
+  const server = createServer({
+    Server: LocalServer as any,
+    version: def.minecraftVersion,
+    'online-mode': false
+  })
+
+  server.on('login', async client => {
+    await mainPacketsReplayer(
+      client,
+      replayData,
+      appQueryParams.replayValidateClient === 'true' ? true : undefined
+    )
+  })
+
+  return {
+    server,
+    version: def.minecraftVersion
+  }
+}
+
+// time based packets
+const FLATTEN_CLIENT_PACKETS = new Set(['position', 'position_look'])
+
+const positions = {
+  client: 0,
+  server: 0
+}
+const addPacketToReplayer = (name: string, data, isFromClient: boolean, wasUpcoming = false) => {
+  const side = isFromClient ? 'client' : 'server'
+
+  if (wasUpcoming) {
+    const lastUpcoming = packetsReplayState.packetsPlayback.findLast(p => p.isUpcoming && p.name === name)
+    if (lastUpcoming) {
+      lastUpcoming.isUpcoming = false
+    }
+  } else {
+    packetsReplayState.packetsPlayback.push({
+      name,
+      data,
+      isFromClient,
+      position: ++positions[side]!,
+      isUpcoming: false,
+      timestamp: Date.now()
+    })
+  }
+
+  if (!isFromClient && !wasUpcoming) {
+    packetsReplayState.progress.current++
+  }
+}
+
+const IGNORE_SERVER_PACKETS = new Set([
+  'kick_disconnect',
+])
+
+const mainPacketsReplayer = async (client: ServerClient, replayData: ReturnType<typeof parseReplayContents>, ignoreClientPacketsWait: string[] | true = []) => {
+  const writePacket = (name: string, data: any) => {
+    data = restoreData(data)
+    client.write(name, data)
+  }
+
+  const playPackets = replayData.packets.filter(p => p.state === 'play')
+
+  let clientPackets = [] as Array<{ name: string, params: any }>
+  const clientsPacketsWaiter = createPacketsWaiter({
+    unexpectedPacketReceived (name, params) {
+      console.log('unexpectedPacketReceived', name, params)
+      addPacketToReplayer(name, params, true)
+    },
+    expectedPacketReceived (name, params) {
+      console.log('expectedPacketReceived', name, params)
+      addPacketToReplayer(name, params, true, true)
+    }
+  })
+  bot._client.on('writePacket' as any, (name, params) => {
+    console.log('writePacket', name, params)
+    clientsPacketsWaiter.addPacket(name, params)
+  })
+
+  console.log('start replaying!')
+  for (const [i, packet] of playPackets.entries()) {
+    if (packet.isFromServer) {
+      writePacket(packet.name, packet.params)
+      addPacketToReplayer(packet.name, packet.params, false)
+      await new Promise(resolve => {
+        setTimeout(resolve, packet.diff * packetsReplayState.speed)
+      })
+    } else if (ignoreClientPacketsWait !== true && !ignoreClientPacketsWait.includes(packet.name)) {
+      clientPackets.push({ name: packet.name, params: packet.params })
+      if (playPackets[i + 1]?.isFromServer) {
+        // eslint-disable-next-line @typescript-eslint/no-loop-func
+        clientPackets = clientPackets.filter((p, index) => {
+          return !FLATTEN_CLIENT_PACKETS.has(p.name) || index === clientPackets.findIndex(clientPacket => clientPacket.name === p.name)
+        })
+        for (const packet of clientPackets) {
+          packetsReplayState.packetsPlayback.push({
+            name: packet.name,
+            data: packet.params,
+            isFromClient: true,
+            position: positions.client++,
+            timestamp: Date.now(),
+            isUpcoming: true,
+          })
+        }
+
+        await clientsPacketsWaiter.waitForPackets(clientPackets.map(p => p.name))
+        clientPackets = []
+      }
+    }
+  }
+}
+
+interface PacketsWaiterOptions {
+  unexpectedPacketReceived?: (name: string, params: any) => void
+  expectedPacketReceived?: (name: string, params: any) => void
+}
+
+interface PacketsWaiter {
+  addPacket(name: string, params: any): void
+  waitForPackets(packets: string[]): Promise<void>
+}
+
+const createPacketsWaiter = (options: PacketsWaiterOptions = {}): PacketsWaiter => {
+  let packetHandler: ((data: any, name: string) => void) | null = null
+  const queuedPackets: Array<{ name: string, params: any }> = []
+  let isWaiting = false
+
+  const handlePacket = (data: any, name: string, waitingPackets: string[], resolve: () => void) => {
+    if (waitingPackets.includes(name)) {
+      waitingPackets.splice(waitingPackets.indexOf(name), 1)
+      options.expectedPacketReceived?.(name, data)
+    } else {
+      options.unexpectedPacketReceived?.(name, data)
+    }
+
+    if (waitingPackets.length === 0) {
+      resolve()
+    }
+  }
+
+  return {
+    addPacket (name: string, params: any) {
+      if (packetHandler) {
+        packetHandler(params, name)
+      } else {
+        queuedPackets.push({ name, params })
+      }
+    },
+
+    async waitForPackets (packets: string[]) {
+      if (isWaiting) {
+        throw new Error('Already waiting for packets')
+      }
+      isWaiting = true
+
+      try {
+        await new Promise<void>(resolve => {
+          const waitingPackets = [...packets]
+
+          packetHandler = (data: any, name: string) => {
+            handlePacket(data, name, waitingPackets, resolve)
+          }
+
+          // Process any queued packets
+          for (const packet of queuedPackets) {
+            handlePacket(packet.params, packet.name, waitingPackets, resolve)
+          }
+          queuedPackets.length = 0
+        })
+      } finally {
+        isWaiting = false
+        packetHandler = null
+      }
+    }
+  }
+}
+
+const isArrayEqual = (a: any[], b: any[]) => {
+  if (a.length !== b.length) return false
+  for (const [i, element] of a.entries()) {
+    if (element !== b[i]) return false
+  }
+  return true
+}
+
+const restoreData = (json: any) => {
+  const keys = Object.keys(json)
+
+  if (isArrayEqual(keys.sort(), ['data', 'type'].sort())) {
+    if (json.type === 'Buffer') {
+      return Buffer.from(json.data)
+    }
+  }
+
+  if (typeof json === 'object' && json) {
+    for (const [key, value] of Object.entries(json)) {
+      if (typeof value === 'object') {
+        json[key] = restoreData(value)
+      }
+    }
+  }
+
+  return json
+}
+
+export const VALID_REPLAY_EXTENSIONS = [`.${PACKETS_REPLAY_FILE_EXTENSION}`, `.${WORLD_STATE_FILE_EXTENSION}`]
diff --git a/src/packetsReplayBase.ts b/src/packetsReplayBase.ts
deleted file mode 100644
index fda41ae2..00000000
--- a/src/packetsReplayBase.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-export class PacketsLogger {
-  lastPacketTime = -1
-  contents = ''
-  logOnly = [] as string[]
-  skip = [] as string[]
-
-  logStr (str: string) {
-    this.contents += `${str}\n`
-  }
-
-  log (isFromServer: boolean, packet: { name; state }, data: any) {
-    if (this.logOnly.length > 0 && !this.logOnly.includes(packet.name)) {
-      return
-    }
-    if (this.skip.length > 0 && this.skip.includes(packet.name)) {
-      return
-    }
-    if (this.lastPacketTime === -1) {
-      this.lastPacketTime = Date.now()
-    }
-
-    const diff = `+${Date.now() - this.lastPacketTime}`
-    // serialize bigint
-    const str = `${isFromServer ? 'S' : 'C'} ${packet.state}:${packet.name} ${diff} ${JSON.stringify(data, (key, value) => {
-      if (typeof value === 'bigint') return value.toString()
-      return value
-    })}`
-    this.logStr(str)
-    this.lastPacketTime = Date.now()
-  }
-}
-
-export type ParsedReplayPacket = {
-  name: string
-  params: any
-  state: string
-  diff: number
-  isFromServer: boolean
-}
-export function parseReplayContents (contents: string) {
-  const lines = contents.split('\n')
-
-  const packets = [] as ParsedReplayPacket[]
-  for (let line of lines) {
-    line = line.trim()
-    if (!line || line.startsWith('#')) continue
-    const [side, nameState, diff, ...data] = line.split(' ')
-    const parsed = JSON.parse(data.join(' '))
-    const [state, name] = nameState.split(':')
-    packets.push({
-      name,
-      state,
-      params: parsed,
-      isFromServer: side.toUpperCase() === 'S',
-      diff: Number.parseInt(diff.slice(1), 10),
-    })
-  }
-
-  return packets
-}
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index dfb1b9bf..a484bc35 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -3,7 +3,7 @@ import { useEffect, useRef, useState } from 'react'
 import { activeModalStack, activeModalStacks, hideModal, insertActiveModalStack, miscUiState } from '../globalState'
 import { guessProblem } from '../errorLoadingScreenHelpers'
 import type { ConnectOptions } from '../connect'
-import { downloadPacketsReplay, packetsReplaceSessionState, replayLogger } from '../packetsReplay'
+import { downloadPacketsReplay, packetsReplaceSessionState, replayLogger } from '../packetsReplay/packetsReplayLegacy'
 import { getProxyDetails } from '../microsoftAuthflow'
 import AppStatus from './AppStatus'
 import DiveTransition from './DiveTransition'
@@ -89,6 +89,7 @@ export default () => {
   useEffect(() => {
     const controller = new AbortController()
     window.addEventListener('keyup', (e) => {
+      if ('input textarea select'.split(' ').includes((e.target as HTMLElement).tagName?.toLowerCase() ?? '')) return
       if (activeModalStack.at(-1)?.reactType !== 'app-status') return
       if (e.code !== 'KeyR' || !lastConnectOptions.value) return
       reconnect()
diff --git a/src/react/Book.stories.tsx b/src/react/Book.stories.tsx
index a90762c2..f772122d 100644
--- a/src/react/Book.stories.tsx
+++ b/src/react/Book.stories.tsx
@@ -2,7 +2,7 @@ import { Meta, Story } from '@storybook/react'
 import Book, { BookProps } from './Book'
 
 export default {
-  title: 'Components/Book',
+  title: 'Book',
   component: Book,
 } as Meta
 
diff --git a/src/react/GameInteractionOverlay.tsx b/src/react/GameInteractionOverlay.tsx
index bdfdb859..503ca8b4 100644
--- a/src/react/GameInteractionOverlay.tsx
+++ b/src/react/GameInteractionOverlay.tsx
@@ -2,10 +2,10 @@ import { useRef, useEffect } from 'react'
 import { subscribe, useSnapshot } from 'valtio'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { options } from '../optionsStorage'
-import { activeModalStack, gameAdditionalState, isGameActive, miscUiState } from '../globalState'
+import { activeModalStack, isGameActive, miscUiState } from '../globalState'
 import worldInteractions from '../worldInteractions'
 import { onCameraMove, CameraMoveEvent } from '../cameraRotationControls'
-import { pointerLock } from '../utils'
+import { pointerLock, isInRealGameSession } from '../utils'
 import { handleMovementStickDelta, joystickPointer } from './TouchAreasControls'
 
 /** after what time of holding the finger start breaking the block */
@@ -291,7 +291,7 @@ export default function GameInteractionOverlay ({ zIndex }: { zIndex: number })
 
 subscribe(activeModalStack, () => {
   if (activeModalStack.length === 0) {
-    if (isGameActive(false) && !gameAdditionalState.viewerConnection) {
+    if (isInRealGameSession()) {
       void pointerLock.requestPointerLock()
     }
   } else {
diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index 2f581f9a..af7d1387 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -7,8 +7,10 @@ import { activeModalStack, isGameActive, miscUiState } from '../globalState'
 import { currentScaling } from '../scaleInterface'
 import { watchUnloadForCleanup } from '../gameUnload'
 import { getItemNameRaw } from '../mineflayer/items'
+import { isInRealGameSession } from '../utils'
 import MessageFormattedString from './MessageFormattedString'
 import SharedHudVars from './SharedHudVars'
+import { packetsReplayState } from './state/packetsReplayState'
 
 
 const ItemName = ({ itemKey }: { itemKey: string }) => {
@@ -147,7 +149,7 @@ const HotbarInner = () => {
     bot.on('heldItemChanged' as any, heldItemChanged)
 
     document.addEventListener('wheel', (e) => {
-      if (!isGameActive(true)) return
+      if (!isInRealGameSession()) return
       e.preventDefault()
       const newSlot = ((bot.quickBarSlot + Math.sign(e.deltaY)) % 9 + 9) % 9
       setSelectedSlot(newSlot)
@@ -157,7 +159,7 @@ const HotbarInner = () => {
     })
 
     document.addEventListener('keydown', (e) => {
-      if (!isGameActive(true)) return
+      if (!isInRealGameSession()) return
       const numPressed = +((/Digit(\d)/.exec(e.code))?.[1] ?? -1)
       if (numPressed < 1 || numPressed > 9) return
       setSelectedSlot(numPressed - 1)
diff --git a/src/react/NotificationProvider.tsx b/src/react/NotificationProvider.tsx
index 73a73d1b..4c9661e0 100644
--- a/src/react/NotificationProvider.tsx
+++ b/src/react/NotificationProvider.tsx
@@ -61,7 +61,7 @@ export default () => {
   const scale = useAppScale()
 
   return <div style={{
-    scale,
+    transform: `scale(${scale})`,
     transformOrigin: 'top right',
   }}>
     <Notification
diff --git a/src/react/PacketsReplayProvider.tsx b/src/react/PacketsReplayProvider.tsx
new file mode 100644
index 00000000..81ae8562
--- /dev/null
+++ b/src/react/PacketsReplayProvider.tsx
@@ -0,0 +1,66 @@
+import { useSnapshot } from 'valtio'
+import { useMemo } from 'react'
+import { appQueryParams } from '../appParams'
+import { miscUiState } from '../globalState'
+import { packetsReplayState } from './state/packetsReplayState'
+import ReplayPanel from './ReplayPanel'
+
+function updateQsParam (name: string, value: string | undefined) {
+  const url = new URL(window.location.href)
+  if (value) {
+    url.searchParams.set(name, value)
+  } else {
+    url.searchParams.delete(name)
+  }
+  window.history.replaceState({}, '', url.toString())
+}
+
+export default function PacketsReplayProvider () {
+  const state = useSnapshot(packetsReplayState)
+  const { gameLoaded } = useSnapshot(miscUiState)
+
+  const autocomplete = useMemo(() => {
+    if (!loadedData) return
+    return {
+      client: Object.keys(loadedData.protocol.play.toClient.types).filter(a => a.startsWith('packet_')).map(a => a.slice('packet_'.length)),
+      server: Object.keys(loadedData.protocol.play.toServer.types).filter(a => a.startsWith('packet_')).map(a => a.slice('packet_'.length))
+    }
+  }, [gameLoaded])
+
+  if (!state.isOpen) return null
+
+  return (
+    <div style={{
+      transform: 'scale(0.5)',
+      transformOrigin: 'top right'
+    }}>
+      <ReplayPanel
+        replayName={state.replayName}
+        packets={state.packetsPlayback}
+        isPlaying={state.isPlaying}
+        progress={state.progress}
+        speed={state.speed}
+        defaultFilter={appQueryParams.replayFilter ?? ''}
+        clientPacketsAutocomplete={autocomplete?.client ?? []}
+        serverPacketsAutocomplete={autocomplete?.server ?? []}
+        customButtons={state.customButtons}
+        onPlayPause={(isPlaying) => {
+          packetsReplayState.isPlaying = isPlaying
+        }}
+        onRestart={() => {
+          window.location.reload()
+        }}
+        onSpeedChange={(speed) => {
+          packetsReplayState.speed = speed
+          updateQsParam('replaySpeed', speed === 1 ? undefined : speed.toString())
+        }}
+        onFilterChange={(filter) => {
+          updateQsParam('replayFilter', filter)
+        }}
+        onCustomButtonToggle={(button) => {
+          packetsReplayState.customButtons[button] = !state.customButtons[button]
+        }}
+      />
+    </div>
+  )
+}
diff --git a/src/react/ReplayPanel.stories.tsx b/src/react/ReplayPanel.stories.tsx
new file mode 100644
index 00000000..132c8011
--- /dev/null
+++ b/src/react/ReplayPanel.stories.tsx
@@ -0,0 +1,106 @@
+import type { Meta, StoryObj } from '@storybook/react'
+import { proxy, useSnapshot } from 'valtio'
+import { useEffect } from 'react'
+import ReplayPanel, { PacketData } from './ReplayPanel'
+
+const meta: Meta<typeof ReplayPanel> = {
+  component: ReplayPanel,
+  title: 'ReplayPanel'
+}
+
+export default meta
+type Story = StoryObj<typeof ReplayPanel>
+
+const mockPackets = proxy([
+  {
+    name: 'position',
+    data: { x: 100.123, y: 64.456, z: -200.789 },
+    isFromClient: true,
+    isUpcoming: false,
+    position: 1,
+    timestamp: 1_234_567_890
+  },
+  {
+    name: 'chat',
+    data: { message: 'Hello, world!' },
+    isFromClient: true,
+    isUpcoming: false,
+    position: 2,
+    timestamp: 1_234_567_890
+  },
+  {
+    name: 'block_change',
+    data: { blockId: 1, position: { x: 100, y: 64, z: -200 } },
+    isFromClient: false,
+    isUpcoming: true,
+    position: 3,
+    timestamp: 1_234_567_890
+  },
+  {
+    name: 'entity_move',
+    data: { entityId: 1, x: 100, y: 64, z: -200 },
+    isFromClient: false,
+    isUpcoming: false,
+    actualVersion: { x: 101, y: 64, z: -201 },
+    position: 4,
+    timestamp: 1_234_567_890
+  }
+] satisfies PacketData[])
+
+const ReplayPanelWithToggle = (props: Parameters<typeof ReplayPanel>[0]) => {
+  const packets = useSnapshot(mockPackets)
+
+  useEffect(() => {
+    const interval = setInterval(() => {
+      for (const [index, packet] of mockPackets.entries()) {
+        packet.isUpcoming = !packet.isUpcoming
+      }
+    }, 3000)
+
+    return () => clearInterval(interval)
+  }, [])
+
+  return <ReplayPanel {...props} packets={packets} />
+}
+
+export const Primary: Story = {
+  render: () => (
+    <ReplayPanelWithToggle
+      replayName="Test Replay"
+      clientPacketsAutocomplete={[]}
+      serverPacketsAutocomplete={[]}
+      isPlaying={false}
+      progress={{ current: 0, total: 100 }}
+      speed={1}
+      defaultFilter=""
+      customButtons={{ button1: false, button2: false }}
+      onPlayPause={() => {}}
+      onRestart={() => {}}
+      onSpeedChange={() => {}}
+      onCustomButtonToggle={() => {}}
+      onFilterChange={() => {}}
+      packets={mockPackets}
+    />
+  )
+}
+
+export const Playing: Story = {
+  render: () => (
+    <ReplayPanelWithToggle
+      replayName="Test Replay"
+      clientPacketsAutocomplete={[]}
+      serverPacketsAutocomplete={[]}
+      isPlaying={true}
+      progress={{ current: 50, total: 100 }}
+      speed={1}
+      defaultFilter=""
+      customButtons={{ button1: false, button2: false }}
+      onPlayPause={() => {}}
+      onRestart={() => {}}
+      onSpeedChange={() => {}}
+      onCustomButtonToggle={() => {}}
+      onFilterChange={() => {}}
+      packets={mockPackets}
+    />
+  )
+}
diff --git a/src/react/ReplayPanel.tsx b/src/react/ReplayPanel.tsx
new file mode 100644
index 00000000..fbc4ea6a
--- /dev/null
+++ b/src/react/ReplayPanel.tsx
@@ -0,0 +1,172 @@
+import { useState, useEffect } from 'react'
+import { filterPackets } from './packetsFilter'
+import { DARK_COLORS } from './components/replay/constants'
+import FilterInput from './components/replay/FilterInput'
+import PacketList from './components/replay/PacketList'
+import ProgressBar from './components/replay/ProgressBar'
+
+interface Props {
+  replayName: string
+  packets: readonly PacketData[]
+  isPlaying: boolean
+  progress: { current: number; total: number }
+  speed: number
+  defaultFilter?: string
+  customButtons: { button1: boolean; button2: boolean }
+  onPlayPause?: (isPlaying: boolean) => void
+  onRestart?: () => void
+  onSpeedChange?: (speed: number) => void
+  onFilterChange: (filter: string) => void
+  onCustomButtonToggle: (button: 'button1' | 'button2') => void
+  clientPacketsAutocomplete: string[]
+  serverPacketsAutocomplete: string[]
+}
+
+export default function ReplayPanel ({
+  replayName,
+  packets,
+  isPlaying,
+  progress,
+  speed,
+  defaultFilter = '',
+  customButtons,
+  onPlayPause,
+  onRestart,
+  onSpeedChange,
+  onFilterChange,
+  onCustomButtonToggle,
+  clientPacketsAutocomplete,
+  serverPacketsAutocomplete
+}: Props) {
+  const [filter, setFilter] = useState(defaultFilter)
+  const { filtered: filteredPackets, hiddenCount } = filterPackets(packets.slice(-500), filter)
+
+  useEffect(() => {
+    onFilterChange(filter)
+  }, [filter, onFilterChange])
+
+  return (
+    <div style={{
+      position: 'fixed',
+      top: 18,
+      right: 0,
+      zIndex: 1000,
+      background: DARK_COLORS.bg,
+      padding: '16px',
+      borderRadius: '0 0 8px 0',
+      boxShadow: '0 2px 8px rgba(0,0,0,0.3)',
+      width: '400px',
+      maxHeight: '80vh',
+      display: 'flex',
+      flexDirection: 'column',
+      gap: '12px',
+      color: DARK_COLORS.text
+    }}>
+      <div style={{ fontSize: '12px', fontWeight: 'bold' }}>{replayName || 'Unnamed Replay'}</div>
+
+      <FilterInput
+        value={filter}
+        onChange={setFilter}
+        hiddenCount={hiddenCount}
+        shownCount={filteredPackets.length}
+        onClearFilter={() => setFilter('')}
+        clientPacketsAutocomplete={clientPacketsAutocomplete}
+        serverPacketsAutocomplete={serverPacketsAutocomplete}
+      />
+
+      <PacketList
+        packets={filteredPackets}
+        filter={filter}
+        maxHeight={300}
+      />
+
+      <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
+        <button
+          onClick={() => onPlayPause?.(!isPlaying)}
+          style={{
+            background: 'none',
+            border: 'none',
+            cursor: 'pointer',
+            padding: '4px',
+            color: DARK_COLORS.text
+          }}
+        >
+          <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+            {isPlaying ? (
+              <path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/>
+            ) : (
+              <path d="M8 5v14l11-7z"/>
+            )}
+          </svg>
+        </button>
+
+        <ProgressBar current={progress.current} total={progress.total} />
+      </div>
+
+      <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
+        <button
+          onClick={onRestart}
+          style={{
+            padding: '4px 8px',
+            borderRadius: '4px',
+            border: `1px solid ${DARK_COLORS.border}`,
+            background: DARK_COLORS.input,
+            color: DARK_COLORS.text,
+            cursor: 'pointer'
+          }}
+        >
+          Restart
+        </button>
+
+        <input
+          type="number"
+          value={speed}
+          onChange={e => onSpeedChange?.(Number(e.target.value))}
+          onContextMenu={e => {
+            e.preventDefault()
+            onSpeedChange?.(1)
+          }}
+          step={0.1}
+          min={0.1}
+          style={{
+            width: '60px',
+            padding: '4px',
+            border: `1px solid ${DARK_COLORS.border}`,
+            borderRadius: '4px',
+            background: DARK_COLORS.input,
+            color: DARK_COLORS.text
+          }}
+        />
+
+        {[1, 2].map(num => (
+          <button
+            key={num}
+            onClick={() => onCustomButtonToggle(`button${num}` as 'button1' | 'button2')}
+            style={{
+              padding: '4px 8px',
+              borderRadius: '4px',
+              border: `1px solid ${DARK_COLORS.border}`,
+              background: customButtons[`button${num}`]
+                ? (num === 1 ? DARK_COLORS.client : DARK_COLORS.server)
+                : DARK_COLORS.input,
+              color: DARK_COLORS.text,
+              cursor: 'pointer'
+            }}
+          >
+            {num}
+          </button>
+        ))}
+      </div>
+    </div>
+  )
+}
+
+export interface PacketData {
+  name: string
+  data: any
+  isFromClient: boolean
+  isUpcoming: boolean
+  actualVersion?: any
+  position: number
+  timestamp: number
+}
diff --git a/src/react/components/replay/FilterInput.tsx b/src/react/components/replay/FilterInput.tsx
new file mode 100644
index 00000000..0e241c8f
--- /dev/null
+++ b/src/react/components/replay/FilterInput.tsx
@@ -0,0 +1,159 @@
+import { useEffect, useRef, useState } from 'react'
+import { DARK_COLORS } from './constants'
+
+interface Props {
+  value: string
+  onChange: (value: string) => void
+  hiddenCount: number
+  shownCount: number
+  onClearFilter: () => void
+  clientPacketsAutocomplete: string[]
+  serverPacketsAutocomplete: string[]
+}
+
+export default function FilterInput ({
+  value,
+  onChange,
+  hiddenCount,
+  shownCount,
+  onClearFilter,
+  clientPacketsAutocomplete,
+  serverPacketsAutocomplete
+}: Props) {
+  const inputRef = useRef<HTMLInputElement>(null)
+  const [showAutocomplete, setShowAutocomplete] = useState(false)
+  const [selectedIndex, setSelectedIndex] = useState(0)
+
+  const allSuggestions = [
+    ...clientPacketsAutocomplete.map(name => ({ name, isClient: true })),
+    ...serverPacketsAutocomplete.map(name => ({ name, isClient: false }))
+  ].sort((a, b) => a.name.localeCompare(b.name))
+
+  const currentWord = value.split(/,\s*/).pop() || ''
+  const filteredSuggestions = allSuggestions.filter(
+    ({ name }) => name.toLowerCase().includes(currentWord.toLowerCase().replace(/^\$/, ''))
+  )
+
+  useEffect(() => {
+    setSelectedIndex(0)
+  }, [currentWord])
+
+  const acceptSuggestion = (suggestion: string) => {
+    const parts = value.split(/,\s*/)
+    parts[parts.length - 1] = suggestion
+    onChange(parts.join(', '))
+    setShowAutocomplete(false)
+    inputRef.current?.focus()
+  }
+
+  return (
+    <div>
+      <div style={{ position: 'relative' }}>
+        <input
+          ref={inputRef}
+          type="text"
+          value={value}
+          onChange={e => onChange(e.target.value)}
+          onFocus={() => setShowAutocomplete(true)}
+          onKeyDown={e => {
+            if (!showAutocomplete) {
+              if (e.key === 'Tab') {
+                e.preventDefault()
+                setShowAutocomplete(true)
+              }
+              return
+            }
+
+            if (e.key === 'ArrowDown') {
+              e.preventDefault()
+              setSelectedIndex(i => (i + 1) % filteredSuggestions.length)
+            } else if (e.key === 'ArrowUp') {
+              e.preventDefault()
+              setSelectedIndex(i => (i - 1 + filteredSuggestions.length) % filteredSuggestions.length)
+            } else if (e.key === 'Enter' && filteredSuggestions.length > 0) {
+              e.preventDefault()
+              acceptSuggestion(filteredSuggestions[selectedIndex].name)
+            } else if (e.key === 'Escape') {
+              e.preventDefault()
+              setShowAutocomplete(false)
+            }
+          }}
+          placeholder="Filter packets (e.g. entity, $block_display, !position)"
+          style={{
+            width: '100%',
+            padding: '8px',
+            border: `1px solid ${DARK_COLORS.border}`,
+            borderRadius: '4px',
+            background: DARK_COLORS.input,
+            color: DARK_COLORS.text
+          }}
+        />
+        {showAutocomplete && filteredSuggestions.length > 0 && (
+          <div style={{
+            position: 'absolute',
+            top: '100%',
+            left: 0,
+            right: 0,
+            background: DARK_COLORS.bg,
+            border: `1px solid ${DARK_COLORS.border}`,
+            borderRadius: '4px',
+            marginTop: '4px',
+            maxHeight: '200px',
+            overflowY: 'auto',
+            zIndex: 1
+          }}>
+            {filteredSuggestions.map(({ name, isClient }, index) => (
+              <div
+                key={name}
+                onClick={() => acceptSuggestion(name)}
+                style={{
+                  padding: '4px 8px',
+                  cursor: 'pointer',
+                  background: index === selectedIndex ? DARK_COLORS.hover : 'transparent',
+                  color: isClient ? DARK_COLORS.client : DARK_COLORS.server
+                }}
+              >
+                {name}
+              </div>
+            ))}
+          </div>
+        )}
+      </div>
+      <div style={{
+        marginTop: '4px',
+        fontSize: '12px',
+        color: DARK_COLORS.textDim,
+        display: 'flex',
+        alignItems: 'center',
+        gap: '4px'
+      }}>
+        <span>Showing: {shownCount}</span>
+        <span>•</span>
+        <span>Hidden: {hiddenCount}</span>
+
+        <div style={{
+          opacity: value ? 1 : 0,
+          gap: '4px',
+          display: 'flex',
+          alignItems: 'center'
+        }}>
+          <span>•</span>
+          <button
+            onClick={onClearFilter}
+            style={{
+              background: 'none',
+              border: 'none',
+              padding: 0,
+              color: DARK_COLORS.text,
+              cursor: 'pointer',
+              textDecoration: 'underline',
+            }}
+          >
+            clear all
+          </button>
+        </div>
+
+      </div>
+    </div>
+  )
+}
diff --git a/src/react/components/replay/PacketList.tsx b/src/react/components/replay/PacketList.tsx
new file mode 100644
index 00000000..c481ad52
--- /dev/null
+++ b/src/react/components/replay/PacketList.tsx
@@ -0,0 +1,141 @@
+import { useRef, useState } from 'react'
+import { PacketData } from '../../ReplayPanel'
+import { useScrollBehavior } from '../../hooks/useScrollBehavior'
+import { DARK_COLORS } from './constants'
+
+const formatters: Record<string, (data: any) => string> = {
+  position: (data) => `x:${data.x.toFixed(2)} y:${data.y.toFixed(2)} z:${data.z.toFixed(2)}`,
+  chat: (data) => data.message,
+  // Add more formatters as needed
+}
+
+const getPacketIcon = (name: string): string => {
+  if (name.includes('position')) return '📍'
+  if (name.includes('chat')) return '💬'
+  if (name.includes('block') || name.includes('chunk') || name.includes('light')) return '📦'
+  if (name.includes('entity') || name.includes('player') || name.includes('passenger')) return '🎯'
+  return '📄'
+}
+
+interface Props {
+  packets: PacketData[]
+  filter: string
+  maxHeight?: number
+}
+
+const ROW_HEIGHT = 24
+const EXPANDED_HEIGHT = 120
+
+function formatTimeDiff (current: number, prev: number | null): string {
+  if (prev === null) return ''
+  const diff = current - prev
+  return `+${Math.floor(diff / 1000)}`
+}
+
+const styles = {
+  packetRow: {
+    height: ROW_HEIGHT,
+    padding: '0 8px',
+    fontSize: '12px',
+    display: 'flex',
+    alignItems: 'center',
+    gap: '8px',
+    whiteSpace: 'nowrap',
+    overflow: 'hidden',
+    cursor: 'pointer',
+    transition: 'background-color 0.1s'
+  } as const,
+  expandedPacket: {
+    height: EXPANDED_HEIGHT,
+    padding: '8px',
+    background: DARK_COLORS.input,
+    fontSize: '12px',
+    overflow: 'auto',
+    borderBottom: `1px solid ${DARK_COLORS.border}`
+  } as const
+}
+
+export default function PacketList ({ packets, filter, maxHeight = 300 }: Props) {
+  const listRef = useRef<HTMLDivElement>(null)
+  const [expandedPacket, setExpandedPacket] = useState<number | null>(null)
+  const { scrollToBottom } = useScrollBehavior(listRef, { messages: packets, opened: true })
+
+  let prevTimestamp: number | null = null
+
+  return (
+    <>
+      <style>
+        {`
+          .packet-row:hover {
+            background: ${DARK_COLORS.hover} !important;
+          }
+        `}
+      </style>
+      <div
+        ref={listRef}
+        style={{
+          overflowY: 'auto',
+          height: maxHeight,
+          display: 'flex',
+          flexDirection: 'column'
+        }}
+      >
+        <div style={{ minHeight: '100%' }}>
+          {packets.map((packet, index) => {
+            const timeDiff = formatTimeDiff(packet.timestamp, prevTimestamp)
+            prevTimestamp = packet.timestamp
+            return (
+              <div key={`${packet.timestamp}-${packet.position}`}>
+                <div
+                  className="packet-row"
+                  onClick={() => setExpandedPacket(expandedPacket === packet.position ? null : packet.position)}
+                  style={{
+                    ...styles.packetRow,
+                    background: packet.isFromClient ? DARK_COLORS.client : DARK_COLORS.server,
+                    opacity: packet.isUpcoming ? 0.5 : 1
+                  }}
+                >
+                  <span>{getPacketIcon(packet.name)}</span>
+                  <span style={{ color: DARK_COLORS.textDim }}>
+                    #{packet.position}
+                    {timeDiff && <span style={{ marginLeft: '4px' }}>{timeDiff}</span>}
+                  </span>
+                  {filter && (
+                    <span style={{ color: DARK_COLORS.textDim }}>#{index + 1}</span>
+                  )}
+                  <span style={{
+                    color: packet.actualVersion ? DARK_COLORS.modified : DARK_COLORS.text,
+                    fontWeight: 'bold'
+                  }}>
+                    {packet.name}
+                  </span>
+                  <span style={{ color: DARK_COLORS.textDim, flex: 1, overflow: 'hidden', textOverflow: 'ellipsis' }}>
+                    {formatters[packet.name]?.(packet.data) ?? JSON.stringify(packet.data)}
+                  </span>
+                </div>
+                {expandedPacket === packet.position && (
+                  <div style={styles.expandedPacket}>
+                    <div style={{ marginBottom: '8px' }}>
+                      <strong>Data:</strong>
+                      <pre style={{ margin: '4px 0', color: DARK_COLORS.textDim }}>
+                        {JSON.stringify(packet.data, null, 2)}
+                      </pre>
+                    </div>
+                    {packet.actualVersion && (
+                      <div>
+                        <strong>Actual Version:</strong>
+                        <pre style={{ margin: '4px 0', color: DARK_COLORS.textDim }}>
+                          {JSON.stringify(packet.actualVersion, null, 2)}
+                        </pre>
+                      </div>
+                    )}
+                  </div>
+                )}
+              </div>
+            )
+          })}
+        </div>
+      </div>
+    </>
+  )
+}
diff --git a/src/react/components/replay/ProgressBar.tsx b/src/react/components/replay/ProgressBar.tsx
new file mode 100644
index 00000000..7bf5f88b
--- /dev/null
+++ b/src/react/components/replay/ProgressBar.tsx
@@ -0,0 +1,36 @@
+import { DARK_COLORS } from './constants'
+
+interface Props {
+  current: number
+  total: number
+}
+
+function padNumber (num: number): string {
+  return String(num).padStart(3, '0')
+}
+
+export default function ProgressBar ({ current, total }: Props) {
+  return (
+    <div style={{ display: 'flex', alignItems: 'center', gap: '8px', flex: 1 }}>
+      <div style={{ color: DARK_COLORS.textDim, fontSize: '12px', minWidth: '70px' }}>
+        {padNumber(current)}/{padNumber(total)}
+      </div>
+      <div style={{
+        flex: 1,
+        height: '4px',
+        background: DARK_COLORS.border,
+        borderRadius: '2px'
+      }}>
+        <div
+          style={{
+            width: `${(current / total) * 100}%`,
+            height: '100%',
+            background: DARK_COLORS.text,
+            borderRadius: '2px',
+            transition: 'width 0.2s'
+          }}
+        />
+      </div>
+    </div>
+  )
+}
diff --git a/src/react/components/replay/constants.ts b/src/react/components/replay/constants.ts
new file mode 100644
index 00000000..54beb7cb
--- /dev/null
+++ b/src/react/components/replay/constants.ts
@@ -0,0 +1,11 @@
+export const DARK_COLORS = {
+  bg: '#1e1e1e',
+  input: '#2d2d2d',
+  text: '#ffffff',
+  textDim: '#888888',
+  client: '#144218',
+  server: '#750200',
+  modified: '#f57f17',
+  border: '#333333',
+  hover: '#404040'
+}
diff --git a/src/react/packetsFilter.ts b/src/react/packetsFilter.ts
new file mode 100644
index 00000000..e89621cf
--- /dev/null
+++ b/src/react/packetsFilter.ts
@@ -0,0 +1,55 @@
+import { PacketData } from './ReplayPanel'
+
+function wildcardToRegExp (pattern: string): RegExp {
+  const escaped = pattern.replaceAll(/[.*+?^${}()|[\]\\]/g, '\\$&')
+  return new RegExp(`^${escaped.replaceAll('\\*', '.*')}$`)
+}
+
+function patternToRegExp (pattern: string): RegExp {
+  if (pattern.startsWith('$')) {
+    return new RegExp(`^${pattern.slice(1)}$`)
+  }
+  return wildcardToRegExp(`*${pattern}*`)
+}
+
+export function parseFilterString (filter: string): { include: RegExp[]; exclude: RegExp[] } {
+  const parts = filter.split(/,\s*/)
+  const include: RegExp[] = []
+  const exclude: RegExp[] = []
+
+  for (const part of parts) {
+    if (!part) continue
+    if (part.startsWith('!')) {
+      exclude.push(patternToRegExp(part.slice(1)))
+    } else {
+      include.push(patternToRegExp(part))
+    }
+  }
+
+  return { include, exclude }
+}
+
+export function filterPackets (packets: PacketData[], filter: string): { filtered: PacketData[]; hiddenCount: number } {
+  if (!filter.trim()) {
+    return { filtered: packets, hiddenCount: 0 }
+  }
+
+  const { include, exclude } = parseFilterString(filter)
+  const filtered = packets.filter(packet => {
+    // If packet matches any exclude pattern, filter it out
+    if (exclude.some(pattern => pattern.test(packet.name))) {
+      return false
+    }
+    // If there are include patterns, packet must match at least one
+    if (include.length > 0) {
+      return include.some(pattern => pattern.test(packet.name))
+    }
+    // If no include patterns, keep the packet (unless it was excluded)
+    return true
+  })
+
+  return {
+    filtered,
+    hiddenCount: packets.length - filtered.length
+  }
+}
diff --git a/src/react/state/packetsReplayState.ts b/src/react/state/packetsReplayState.ts
new file mode 100644
index 00000000..102a0ba1
--- /dev/null
+++ b/src/react/state/packetsReplayState.ts
@@ -0,0 +1,19 @@
+import { proxy } from 'valtio'
+import type { PacketData } from '../ReplayPanel'
+import { appQueryParams } from '../../appParams'
+
+export const packetsReplayState = proxy({
+  packetsPlayback: [] as PacketData[],
+  isOpen: false,
+  replayName: '',
+  isPlaying: false,
+  progress: {
+    current: 0,
+    total: 0
+  },
+  speed: appQueryParams.replaySpeed ? parseFloat(appQueryParams.replaySpeed) : 1,
+  customButtons: {
+    button1: false,
+    button2: false
+  }
+})
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 5c294282..b6d4b6d2 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -51,6 +51,7 @@ import MineflayerPluginHud from './react/MineflayerPluginHud'
 import MineflayerPluginConsole from './react/MineflayerPluginConsole'
 import { UIProvider } from './react/UIProvider'
 import { useAppScale } from './scaleInterface'
+import PacketsReplayProvider from './react/PacketsReplayProvider'
 
 const RobustPortal = ({ children, to }) => {
   return createPortal(<PerComponentErrorBoundary>{children}</PerComponentErrorBoundary>, to)
@@ -205,6 +206,7 @@ const App = () => {
             <TouchAreasControlsProvider />
             <SignInMessageProvider />
             <NoModalFoundProvider />
+            <PacketsReplayProvider />
           </RobustPortal>
           <RobustPortal to={document.body}>
             <div className='overlay-top-scaled'>
diff --git a/src/utils.ts b/src/utils.ts
index a5867a41..8039d403 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,6 +1,7 @@
-import { isGameActive, miscUiState } from './globalState'
+import { gameAdditionalState, isGameActive, miscUiState } from './globalState'
 import { options } from './optionsStorage'
 import { notificationProxy, showNotification } from './react/NotificationProvider'
+import { packetsReplayState } from './react/state/packetsReplayState'
 
 export const goFullscreen = async (doToggle = false) => {
   if (!document.fullscreenElement) {
@@ -64,6 +65,10 @@ export const pointerLock = {
   }
 }
 
+export const isInRealGameSession = () => {
+  return isGameActive(true) && !packetsReplayState.isOpen && !gameAdditionalState.viewerConnection
+}
+
 window.getScreenRefreshRate = getScreenRefreshRate
 
 /**

From 334e8a502d064676f111ae84e2b944d7e57c6c94 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 23 Feb 2025 04:45:33 +0300
Subject: [PATCH 266/753] fix a few bugs in packet, replayer feat: add a way to
 ALWAYS inspect 30 packets on disconnect fix: fix a few server packets

---
 src/globalDomListeners.ts                |  2 +
 src/index.ts                             |  2 +-
 src/mineflayer/plugins/localRelay.ts     | 29 ++++++++++++++
 src/mineflayer/plugins/packetsPatcher.ts | 50 ++++++++++++++++++++++++
 src/packetsPatcher.ts                    | 14 -------
 src/packetsReplay/replayPackets.ts       |  5 ++-
 src/react/AppStatusProvider.tsx          |  5 ++-
 src/react/ReplayPanel.tsx                |  1 +
 src/worldInteractions.ts                 |  1 +
 9 files changed, 91 insertions(+), 18 deletions(-)
 create mode 100644 src/mineflayer/plugins/packetsPatcher.ts
 delete mode 100644 src/packetsPatcher.ts

diff --git a/src/globalDomListeners.ts b/src/globalDomListeners.ts
index 866c9784..5055c600 100644
--- a/src/globalDomListeners.ts
+++ b/src/globalDomListeners.ts
@@ -1,6 +1,7 @@
 import { saveServer } from './flyingSquidUtils'
 import { isGameActive, activeModalStack } from './globalState'
 import { options } from './optionsStorage'
+import { isInRealGameSession } from './utils'
 
 window.addEventListener('unload', (e) => {
   if (!window.justReloaded) {
@@ -25,6 +26,7 @@ window.addEventListener('beforeunload', (event) => {
   if (!isGameActive(true) && activeModalStack.at(-1)?.elem?.id !== 'chat') return
   if (sessionStorage.lastReload && !options.preventDevReloadWhilePlaying) return
   if (!options.closeConfirmation) return
+  if (!isInRealGameSession()) return
 
   // For major browsers doning only this is enough
   event.preventDefault()
diff --git a/src/index.ts b/src/index.ts
index def72d2e..74c82479 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -96,7 +96,7 @@ import { ref, subscribe } from 'valtio'
 import { signInMessageState } from './react/SignInMessageProvider'
 import { updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/serversStorage'
 import { versionToNumber } from 'renderer/viewer/prepare/utils'
-import packetsPatcher from './packetsPatcher'
+import packetsPatcher from './mineflayer/plugins/packetsPatcher'
 import { mainMenuState } from './react/MainMenuRenderApp'
 import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import './mobileShim'
diff --git a/src/mineflayer/plugins/localRelay.ts b/src/mineflayer/plugins/localRelay.ts
index e7d304a7..b55685b1 100644
--- a/src/mineflayer/plugins/localRelay.ts
+++ b/src/mineflayer/plugins/localRelay.ts
@@ -1,6 +1,8 @@
 import { viewerConnector } from 'mcraft-fun-mineflayer'
 import { PACKETS_REPLAY_FILE_EXTENSION, WORLD_STATE_FILE_EXTENSION } from 'mcraft-fun-mineflayer/build/worldState'
 import { Bot } from 'mineflayer'
+import CircularBuffer from 'flying-squid/dist/circularBuffer'
+import { PacketsLogger } from 'mcraft-fun-mineflayer/build/packetsLogger'
 
 export const localRelayServerPlugin = (bot: Bot) => {
   bot.loadPlugin(
@@ -23,6 +25,14 @@ export const localRelayServerPlugin = (bot: Bot) => {
     a.click()
     URL.revokeObjectURL(url)
   }
+
+  circularBuffer = new CircularBuffer(AUTO_CAPTURE_PACKETS_COUNT)
+  bot._client.on('writePacket' as any, (name, params) => {
+    circularBuffer!.add({ name, params, isFromServer: false })
+  })
+  bot._client.on('packet', (data, { name }) => {
+    circularBuffer!.add({ name, params: data, isFromServer: true })
+  })
 }
 
 declare module 'mineflayer' {
@@ -30,3 +40,22 @@ declare module 'mineflayer' {
     downloadCurrentWorldState: () => void
   }
 }
+
+const AUTO_CAPTURE_PACKETS_COUNT = 30
+let circularBuffer: CircularBuffer | undefined
+
+export const getLastAutoCapturedPackets = () => circularBuffer?.size
+export const downloadAutoCapturedPackets = () => {
+  const logger = new PacketsLogger()
+  for (const packet of circularBuffer?.getLastElements() ?? []) {
+    logger.log(packet.isFromServer, packet.name, packet.params)
+  }
+  const textContents = logger.contents
+  const blob = new Blob([textContents], { type: 'text/plain' })
+  const url = URL.createObjectURL(blob)
+  const a = document.createElement('a')
+  a.href = url
+  a.download = `${bot.username}-auto-captured-packets.txt`
+  a.click()
+  URL.revokeObjectURL(url)
+}
diff --git a/src/mineflayer/plugins/packetsPatcher.ts b/src/mineflayer/plugins/packetsPatcher.ts
new file mode 100644
index 00000000..446bd397
--- /dev/null
+++ b/src/mineflayer/plugins/packetsPatcher.ts
@@ -0,0 +1,50 @@
+export default () => {
+  // not plugin so its loaded earlier
+  customEvents.on('mineflayerBotCreated', () => {
+    botInit()
+  })
+}
+
+const waitingPackets = {} as Record<string, Array<{ name: string, data: any }>>
+
+const botInit = () => {
+  // PATCH READING
+  bot._client.on('packet', (data, meta) => {
+    if (meta.name === 'map_chunk') {
+      if (data.groundUp && data.bitMap === 1 && data.chunkData.every(x => x === 0)) {
+        data.chunkData = Buffer.from(Array.from({ length: 12_544 }).fill(0) as any)
+      }
+    }
+  })
+
+  // PATCH WRITING
+
+  const clientWrite = bot._client.write.bind(bot._client)
+  const sendAllPackets = (name: string, data: any) => {
+    for (const packet of waitingPackets[name]) {
+      clientWrite(packet.name, packet.data)
+    }
+    delete waitingPackets[name]
+  }
+
+  //@ts-expect-error
+  bot._client.write = (name: string, data: any) => {
+    // if (name === 'position' || name === 'position_look' || name === 'look' || name === 'teleport_confirm') {
+    //   const chunkX = Math.floor(bot.entity.position.x / 16)
+    //   const chunkZ = Math.floor(bot.entity.position.z / 16)
+    //   const loadedColumns = bot.world.getColumns()
+    //   if (loadedColumns.some((c) => c.chunkX === chunkX && c.chunkZ === chunkZ)) {
+    //     sendAllPackets('position', data)
+    //   } else {
+    //     waitingPackets['position'] = [...(waitingPackets['position'] || []), { name, data }]
+    //     return
+    //   }
+    // }
+    if (name === 'settings') {
+      data['viewDistance'] = Math.min(data['viewDistance'], 3)
+    }
+    return clientWrite(name, data)
+  }
+
+  // PATCH INTERACTIONS
+}
diff --git a/src/packetsPatcher.ts b/src/packetsPatcher.ts
deleted file mode 100644
index 587c41c9..00000000
--- a/src/packetsPatcher.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// todo it should not be there, most likely it will be more automatically updated in the future
-// todo these fixes should be ported to mineflayer
-
-export default () => {
-  customEvents.on('mineflayerBotCreated', () => {
-    bot._client.on('packet', (data, meta) => {
-      if (meta.name === 'map_chunk') {
-        if (data.groundUp && data.bitMap === 1 && data.chunkData.every(x => x === 0)) {
-          data.chunkData = Buffer.from(Array.from({ length: 12_544 }).fill(0) as any)
-        }
-      }
-    })
-  })
-}
diff --git a/src/packetsReplay/replayPackets.ts b/src/packetsReplay/replayPackets.ts
index 1af819f6..9ce88a1c 100644
--- a/src/packetsReplay/replayPackets.ts
+++ b/src/packetsReplay/replayPackets.ts
@@ -87,7 +87,8 @@ export const startLocalReplayServer = (contents: string) => {
 }
 
 // time based packets
-const FLATTEN_CLIENT_PACKETS = new Set(['position', 'position_look'])
+// const FLATTEN_CLIENT_PACKETS = new Set(['position', 'position_look'])
+const FLATTEN_CLIENT_PACKETS = new Set([] as string[])
 
 const positions = {
   client: 0,
@@ -97,7 +98,7 @@ const addPacketToReplayer = (name: string, data, isFromClient: boolean, wasUpcom
   const side = isFromClient ? 'client' : 'server'
 
   if (wasUpcoming) {
-    const lastUpcoming = packetsReplayState.packetsPlayback.findLast(p => p.isUpcoming && p.name === name)
+    const lastUpcoming = packetsReplayState.packetsPlayback.find(p => p.isUpcoming && p.name === name)
     if (lastUpcoming) {
       lastUpcoming.isUpcoming = false
     }
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index a484bc35..a3ef4c9d 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -5,6 +5,7 @@ import { guessProblem } from '../errorLoadingScreenHelpers'
 import type { ConnectOptions } from '../connect'
 import { downloadPacketsReplay, packetsReplaceSessionState, replayLogger } from '../packetsReplay/packetsReplayLegacy'
 import { getProxyDetails } from '../microsoftAuthflow'
+import { downloadAutoCapturedPackets, getLastAutoCapturedPackets } from '../mineflayer/plugins/localRelay'
 import AppStatus from './AppStatus'
 import DiveTransition from './DiveTransition'
 import { useDidUpdateEffect } from './utils'
@@ -114,10 +115,11 @@ export default () => {
     reconnect()
   }
 
+  const lastAutoCapturedPackets = getLastAutoCapturedPackets()
   return <DiveTransition open={isOpen}>
     <AppStatus
       status={status}
-      isError={isError || status === ''} // display back button if status is empty as probably our app is errored
+      isError={isError || status === ''} // display back button if status is empty as probably our app is errored // display back button if status is empty as probably our app is errored
       hideDots={hideDots}
       lastStatus={lastStatus}
       showReconnect={showReconnect}
@@ -146,6 +148,7 @@ export default () => {
           {displayAuthButton && <Button label='Authenticate' onClick={authReconnectAction} />}
           {displayVpnButton && <PossiblyVpnBypassProxyButton reconnect={reconnect} />}
           {replayActive && <Button label={`Download Packets Replay ${replayLogger.contents.split('\n').length}L`} onClick={downloadPacketsReplay} />}
+          {lastAutoCapturedPackets && <Button label={`Inspect Last ${lastAutoCapturedPackets} Packets`} onClick={() => downloadAutoCapturedPackets()} />}
         </>
       }
     >
diff --git a/src/react/ReplayPanel.tsx b/src/react/ReplayPanel.tsx
index fbc4ea6a..51771a5b 100644
--- a/src/react/ReplayPanel.tsx
+++ b/src/react/ReplayPanel.tsx
@@ -63,6 +63,7 @@ export default function ReplayPanel ({
       color: DARK_COLORS.text
     }}>
       <div style={{ fontSize: '12px', fontWeight: 'bold' }}>{replayName || 'Unnamed Replay'}</div>
+      <div style={{ fontSize: '8px', color: '#888888', marginTop: '-8px' }}>Integrated server emulation. Testing client...</div>
 
       <FilterInput
         value={filter}
diff --git a/src/worldInteractions.ts b/src/worldInteractions.ts
index e54b0ebe..5b03184c 100644
--- a/src/worldInteractions.ts
+++ b/src/worldInteractions.ts
@@ -158,6 +158,7 @@ class WorldInteraction {
         if (this.swingTimeout) {
           clearTimeout(this.swingTimeout)
         }
+        bot.swingArm('right')
         viewer.world.changeHandSwingingState(true, false)
         this.swingTimeout = setTimeout(() => {
           viewer.world.changeHandSwingingState(false, false)

From 0505b64539890bed2ccffb02b6e78111dea9c48c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 23 Feb 2025 19:08:35 +0300
Subject: [PATCH 267/753] fix: fix shift desync issue, dedupe

---
 pnpm-lock.yaml                | 128 +++++++++++++---------------------
 src/mineflayer/playerState.ts |   2 +-
 2 files changed, 50 insertions(+), 80 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9f4ccb76..44894157 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,13 +136,13 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.3
-        version: 0.1.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13))
+        version: 0.1.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13)
@@ -357,7 +357,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
       mineflayer:
         specifier: github:zardoy/mineflayer
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -3722,8 +3722,8 @@ packages:
     resolution: {integrity: sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==}
     engines: {node: '>=6'}
 
-  call-bind-apply-helpers@1.0.1:
-    resolution: {integrity: sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==}
+  call-bind-apply-helpers@1.0.2:
+    resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
     engines: {node: '>= 0.4'}
 
   call-bind@1.0.8:
@@ -4549,8 +4549,9 @@ packages:
     resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
     engines: {node: '>= 0.4'}
 
-  es-shim-unscopables@1.0.2:
-    resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
+  es-shim-unscopables@1.1.0:
+    resolution: {integrity: sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==}
+    engines: {node: '>= 0.4'}
 
   es-to-primitive@1.3.0:
     resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==}
@@ -5137,8 +5138,8 @@ packages:
   get-func-name@2.0.2:
     resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==}
 
-  get-intrinsic@1.2.7:
-    resolution: {integrity: sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==}
+  get-intrinsic@1.3.0:
+    resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
     engines: {node: '>= 0.4'}
 
   get-nonce@1.0.1:
@@ -6466,11 +6467,6 @@ packages:
     version: 1.54.0
     engines: {node: '>=22'}
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76}
-    version: 1.54.0
-    engines: {node: '>=22'}
-
   minecraft-wrap@1.5.1:
     resolution: {integrity: sha512-7DZ2WhrcRD3fUMau84l9Va0KWzV92SHNdB7mnNdNhgXID2aW6pjWuYPZi8MepEBemA4XKKdnDx7HmhTbkoiR8A==}
     hasBin: true
@@ -6489,8 +6485,8 @@ packages:
     resolution: {integrity: sha512-q7cmpZFaSI6sodcMJxc2GkV8IO84HbsUP+xNipGKfGg+FMISKabzdJ838Axb60qRtZrp6ny7LluQE7lesHvvxQ==}
     engines: {node: '>=18'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49}
     version: 4.25.0
     engines: {node: '>=18'}
 
@@ -12816,7 +12812,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.2.3
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13041,7 +13037,7 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.23.9
       es-object-atoms: 1.1.1
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       is-string: 1.1.1
 
   array-union@2.1.0: {}
@@ -13055,28 +13051,28 @@ snapshots:
       es-abstract: 1.23.9
       es-errors: 1.3.0
       es-object-atoms: 1.1.1
-      es-shim-unscopables: 1.0.2
+      es-shim-unscopables: 1.1.0
 
   array.prototype.flat@1.3.3:
     dependencies:
       call-bind: 1.0.8
       define-properties: 1.2.1
       es-abstract: 1.23.9
-      es-shim-unscopables: 1.0.2
+      es-shim-unscopables: 1.1.0
 
   array.prototype.flatmap@1.3.3:
     dependencies:
       call-bind: 1.0.8
       define-properties: 1.2.1
       es-abstract: 1.23.9
-      es-shim-unscopables: 1.0.2
+      es-shim-unscopables: 1.1.0
 
   array.prototype.toreversed@1.1.2:
     dependencies:
       call-bind: 1.0.8
       define-properties: 1.2.1
       es-abstract: 1.23.9
-      es-shim-unscopables: 1.0.2
+      es-shim-unscopables: 1.1.0
 
   array.prototype.tosorted@1.1.4:
     dependencies:
@@ -13084,7 +13080,7 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.23.9
       es-errors: 1.3.0
-      es-shim-unscopables: 1.0.2
+      es-shim-unscopables: 1.1.0
 
   arraybuffer.prototype.slice@1.0.4:
     dependencies:
@@ -13093,7 +13089,7 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.23.9
       es-errors: 1.3.0
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       is-array-buffer: 3.0.5
 
   arraybuffer.slice@0.0.7:
@@ -13525,22 +13521,22 @@ snapshots:
   cachedir@2.4.0:
     optional: true
 
-  call-bind-apply-helpers@1.0.1:
+  call-bind-apply-helpers@1.0.2:
     dependencies:
       es-errors: 1.3.0
       function-bind: 1.1.2
 
   call-bind@1.0.8:
     dependencies:
-      call-bind-apply-helpers: 1.0.1
+      call-bind-apply-helpers: 1.0.2
       es-define-property: 1.0.1
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       set-function-length: 1.2.2
 
   call-bound@1.0.3:
     dependencies:
-      call-bind-apply-helpers: 1.0.1
-      get-intrinsic: 1.2.7
+      call-bind-apply-helpers: 1.0.2
+      get-intrinsic: 1.3.0
 
   callsites@3.1.0: {}
 
@@ -14355,7 +14351,7 @@ snapshots:
 
   dunder-proto@1.0.1:
     dependencies:
-      call-bind-apply-helpers: 1.0.1
+      call-bind-apply-helpers: 1.0.2
       es-errors: 1.3.0
       gopd: 1.2.0
 
@@ -14539,7 +14535,7 @@ snapshots:
       es-set-tostringtag: 2.1.0
       es-to-primitive: 1.3.0
       function.prototype.name: 1.1.8
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       get-proto: 1.0.1
       get-symbol-description: 1.1.0
       globalthis: 1.0.4
@@ -14590,7 +14586,7 @@ snapshots:
       es-errors: 1.3.0
       es-set-tostringtag: 2.1.0
       function-bind: 1.1.2
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       globalthis: 1.0.4
       gopd: 1.2.0
       has-property-descriptors: 1.0.2
@@ -14611,11 +14607,11 @@ snapshots:
   es-set-tostringtag@2.1.0:
     dependencies:
       es-errors: 1.3.0
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       has-tostringtag: 1.0.2
       hasown: 2.0.2
 
-  es-shim-unscopables@1.0.2:
+  es-shim-unscopables@1.1.0:
     dependencies:
       hasown: 2.0.2
 
@@ -15435,9 +15431,9 @@ snapshots:
 
   get-func-name@2.0.2: {}
 
-  get-intrinsic@1.2.7:
+  get-intrinsic@1.3.0:
     dependencies:
-      call-bind-apply-helpers: 1.0.1
+      call-bind-apply-helpers: 1.0.2
       es-define-property: 1.0.1
       es-errors: 1.3.0
       es-object-atoms: 1.1.1
@@ -15473,7 +15469,7 @@ snapshots:
     dependencies:
       call-bound: 1.0.3
       es-errors: 1.3.0
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
 
   get-tsconfig@4.7.2:
     dependencies:
@@ -15939,7 +15935,7 @@ snapshots:
     dependencies:
       call-bind: 1.0.8
       call-bound: 1.0.3
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
 
   is-arrayish@0.2.1: {}
 
@@ -15994,7 +15990,7 @@ snapshots:
   is-data-view@1.0.2:
     dependencies:
       call-bound: 1.0.3
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       is-typed-array: 1.1.15
 
   is-date-object@1.1.0:
@@ -16143,7 +16139,7 @@ snapshots:
   is-weakset@2.0.4:
     dependencies:
       call-bound: 1.0.3
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
 
   is-windows@1.0.2: {}
 
@@ -16201,7 +16197,7 @@ snapshots:
     dependencies:
       define-data-property: 1.1.4
       es-object-atoms: 1.1.1
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       get-proto: 1.0.1
       has-symbols: 1.1.0
       set-function-name: 2.0.2
@@ -16695,12 +16691,12 @@ snapshots:
       apl-image-packer: 1.1.0
       zod: 3.24.1
 
-  mcraft-fun-mineflayer@0.1.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.0
     transitivePeerDependencies:
@@ -17034,32 +17030,6 @@ snapshots:
       - encoding
       - supports-color
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13):
-    dependencies:
-      '@types/node-rsa': 1.1.4
-      '@types/readable-stream': 4.0.12
-      aes-js: 3.1.2
-      buffer-equal: 1.0.1
-      debug: 4.4.0(supports-color@8.1.1)
-      endian-toggle: 0.0.0
-      lodash.get: 4.4.2
-      lodash.merge: 4.6.2
-      minecraft-data: 3.83.1
-      minecraft-folder-path: 1.2.0
-      node-fetch: 2.7.0(encoding@0.1.13)
-      node-rsa: 0.4.2
-      prismarine-auth: 2.4.2(encoding@0.1.13)
-      prismarine-chat: 1.10.1
-      prismarine-nbt: 2.5.0
-      prismarine-realms: 1.3.2(encoding@0.1.13)
-      protodef: 1.18.0
-      readable-stream: 4.5.2
-      uuid-1345: 1.0.2
-      yggdrasil: 1.7.0(encoding@0.1.13)
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-
   minecraft-wrap@1.5.1(encoding@0.1.13):
     dependencies:
       debug: 4.4.0(supports-color@8.1.1)
@@ -17104,7 +17074,7 @@ snapshots:
   mineflayer@4.25.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.10.1
@@ -17124,10 +17094,10 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4fa1af9964cab91315d8d1ae02615f3039638828(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/e9eb551ba30ec2e742c49e6927be6402b413bb76(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.10.1
@@ -17600,7 +17570,7 @@ snapshots:
 
   own-keys@1.0.1:
     dependencies:
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       object-keys: 1.1.1
       safe-push-apply: 1.0.0
 
@@ -18550,7 +18520,7 @@ snapshots:
       es-abstract: 1.23.9
       es-errors: 1.3.0
       es-object-atoms: 1.1.1
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       get-proto: 1.0.1
       which-builtin-type: 1.2.1
 
@@ -18751,7 +18721,7 @@ snapshots:
     dependencies:
       call-bind: 1.0.8
       call-bound: 1.0.3
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       has-symbols: 1.1.0
       isarray: 2.0.5
 
@@ -18887,7 +18857,7 @@ snapshots:
       define-data-property: 1.1.4
       es-errors: 1.3.0
       function-bind: 1.1.2
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       gopd: 1.2.0
       has-property-descriptors: 1.0.2
 
@@ -18962,14 +18932,14 @@ snapshots:
     dependencies:
       call-bound: 1.0.3
       es-errors: 1.3.0
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       object-inspect: 1.13.3
 
   side-channel-weakmap@1.0.2:
     dependencies:
       call-bound: 1.0.3
       es-errors: 1.3.0
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       object-inspect: 1.13.3
       side-channel-map: 1.0.1
 
@@ -19332,7 +19302,7 @@ snapshots:
       es-abstract: 1.23.9
       es-errors: 1.3.0
       es-object-atoms: 1.1.1
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       gopd: 1.2.0
       has-symbols: 1.1.0
       internal-slot: 1.1.0
diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
index 793f306f..260f8e53 100644
--- a/src/mineflayer/playerState.ts
+++ b/src/mineflayer/playerState.ts
@@ -115,7 +115,7 @@ export class PlayerStateManager implements IPlayerState {
   }
 
   getEyeHeight (): number {
-    return bot.controlState.sneak ? 1.27 : bot.entity?.['eyeHeight'] ?? 1.62
+    return bot.controlState.sneak ? 1.27 : 1.62
   }
 
   isOnGround (): boolean {

From 75e44407edf23a16b24dbfaa395a782b51f54abc Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 23 Feb 2025 20:06:25 +0300
Subject: [PATCH 268/753] fix autocomplete in replay

---
 src/react/components/replay/FilterInput.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/react/components/replay/FilterInput.tsx b/src/react/components/replay/FilterInput.tsx
index 0e241c8f..7f968d3e 100644
--- a/src/react/components/replay/FilterInput.tsx
+++ b/src/react/components/replay/FilterInput.tsx
@@ -55,6 +55,9 @@ export default function FilterInput ({
           value={value}
           onChange={e => onChange(e.target.value)}
           onFocus={() => setShowAutocomplete(true)}
+          onBlur={() => {
+            setTimeout(() => setShowAutocomplete(false), 200)
+          }}
           onKeyDown={e => {
             if (!showAutocomplete) {
               if (e.key === 'Tab') {
@@ -94,7 +97,7 @@ export default function FilterInput ({
             top: '100%',
             left: 0,
             right: 0,
-            background: DARK_COLORS.bg,
+            backgroundColor: DARK_COLORS.bg,
             border: `1px solid ${DARK_COLORS.border}`,
             borderRadius: '4px',
             marginTop: '4px',
@@ -109,7 +112,7 @@ export default function FilterInput ({
                 style={{
                   padding: '4px 8px',
                   cursor: 'pointer',
-                  background: index === selectedIndex ? DARK_COLORS.hover : 'transparent',
+                  backgroundColor: index === selectedIndex ? DARK_COLORS.hover : DARK_COLORS.bg,
                   color: isClient ? DARK_COLORS.client : DARK_COLORS.server
                 }}
               >

From 9613a0e644b43a1ea4b8314e4bd5627b71b2bb86 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 23 Feb 2025 20:06:47 +0300
Subject: [PATCH 269/753] fix: fix bossbar flickering

---
 src/react/BossBarOverlay.tsx         |  3 ++-
 src/react/BossBarOverlayProvider.tsx | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/react/BossBarOverlay.tsx b/src/react/BossBarOverlay.tsx
index b5e058b8..431d19c1 100644
--- a/src/react/BossBarOverlay.tsx
+++ b/src/react/BossBarOverlay.tsx
@@ -12,7 +12,8 @@ export type BossBarType = BossBarTypeRaw & {
   _title: string | Record<string, any> | null,
   _color: string,
   _dividers: number,
-  _health: number
+  _health: number,
+  lastUpdated: number
 }
 
 export default ({ bar }: { bar: BossBarType }) => {
diff --git a/src/react/BossBarOverlayProvider.tsx b/src/react/BossBarOverlayProvider.tsx
index d67a4af6..2605e521 100644
--- a/src/react/BossBarOverlayProvider.tsx
+++ b/src/react/BossBarOverlayProvider.tsx
@@ -9,7 +9,10 @@ export default () => {
   const { currentTouch } = useSnapshot(miscUiState)
   const [bossBars, setBossBars] = useState(new Map<string, BossBarType>())
   const addBossBar = (bossBar: BossBarType) => {
-    setBossBars(prevBossBars => new Map(prevBossBars.set(bossBar.entityUUID, bossBar)))
+    setBossBars(prevBossBars => new Map(prevBossBars.set(bossBar.entityUUID, {
+      ...bossBar,
+      lastUpdated: Date.now()
+    })))
   }
 
   const removeBossBar = (bossBar: BossBarType) => {
@@ -25,8 +28,7 @@ export default () => {
       addBossBar(bossBar as BossBarType)
     })
     bot.on('bossBarUpdated', (bossBar) => {
-      removeBossBar(bossBar as BossBarType)
-      setTimeout(() => addBossBar(bossBar as BossBarType), 1)
+      addBossBar(bossBar as BossBarType)
     })
     bot.on('bossBarDeleted', (bossBar) => {
       removeBossBar(bossBar as BossBarType)
@@ -36,7 +38,7 @@ export default () => {
   return (
     <div className={`bossBars ${currentTouch ? 'mobile' : ''}`} id="bossBars">
       {[...bossBars.values()].map(bar => (
-        <BossBar key={bar.entityUUID} bar={bar} />
+        <BossBar key={`${bar.entityUUID}-${bar.lastUpdated}`} bar={bar} />
       ))}
     </div>
   )

From bdea1fc50ceeb05ac0b03b4efef504f326e294d0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 23 Feb 2025 21:52:12 +0300
Subject: [PATCH 270/753] a huge progress on packet replay component, fix bugs
 add switches

---
 package.json                               |   2 +-
 pnpm-lock.yaml                             |  12 +-
 renderer/viewer/lib/worldrendererCommon.ts |   8 ++
 renderer/viewer/lib/worldrendererThree.ts  |   9 +-
 src/appParams.ts                           |  13 ++
 src/cameraRotationControls.ts              |   8 ++
 src/controls.ts                            |  32 ++++-
 src/index.ts                               |   4 +-
 src/packetsReplay/replayPackets.ts         | 141 +++++++++++++++------
 src/react/BossBarOverlay.stories.tsx       |   3 +-
 src/react/PacketsReplayProvider.tsx        |  16 +--
 src/react/ReplayPanel.tsx                  |  20 +--
 src/react/components/replay/PacketList.tsx |   9 +-
 src/react/state/packetsReplayState.ts      |  46 ++++++-
 14 files changed, 248 insertions(+), 75 deletions(-)

diff --git a/package.json b/package.json
index 250c8522..58ffa652 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "mojangson": "^2.0.4",
     "net-browserify": "github:zardoy/prismarinejs-net-browserify",
     "node-gzip": "^1.1.2",
-    "mcraft-fun-mineflayer": "^0.1.3",
+    "mcraft-fun-mineflayer": "^0.1.4",
     "peerjs": "^1.5.0",
     "pixelarticons": "^1.8.1",
     "pretty-bytes": "^6.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 44894157..6886b974 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -135,8 +135,8 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       mcraft-fun-mineflayer:
-        specifier: ^0.1.3
-        version: 0.1.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13))
+        specifier: ^0.1.4
+        version: 0.1.4(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -6252,9 +6252,9 @@ packages:
     resolution: {integrity: sha512-JBi9frIACmzmpKL38YudZJpml+tWP3UuCeb8ko5iJRHpmCmmChE+X3xzVEbEYnYBI2dMiO7915/5eYnKUVys3Q==}
     engines: {node: '>=18.0.0'}
 
-  mcraft-fun-mineflayer@0.1.3:
-    resolution: {integrity: sha512-3Xds5XBLwYHFgH09RS9fHNK7NJI2ZStXiYvU/9FVUMd9TOwcMwLorn1kNYOw022/0nGi3hibT3ldj6vLCjASIg==}
-    version: 0.1.3
+  mcraft-fun-mineflayer@0.1.4:
+    resolution: {integrity: sha512-h6Dmnj/1No1aZO9FG14GTCZ80xPHVnkhByUFKIZr0PV2Hto7PoG4hBG8fa1fifwQIgLwBa+bURPyBw3KzzFPhw==}
+    version: 0.1.4
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       '@roamhq/wrtc': '*'
@@ -16691,7 +16691,7 @@ snapshots:
       apl-image-packer: 1.1.0
       zod: 3.24.1
 
-  mcraft-fun-mineflayer@0.1.3(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.4(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index c590cc1a..3ca100a2 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -149,6 +149,14 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   lastChunkDistance = 0
   debugStopGeometryUpdate = false
 
+  @worldCleanup()
+  freeFlyMode = false
+  @worldCleanup()
+  freeFlyState = {
+    yaw: 0,
+    pitch: 0,
+    position: new Vec3(0, 0, 0)
+  }
   @worldCleanup()
   itemsRenderer: ItemsRenderer | undefined
 
diff --git a/renderer/viewer/lib/worldrendererThree.ts b/renderer/viewer/lib/worldrendererThree.ts
index 4ff56cdb..697717c9 100644
--- a/renderer/viewer/lib/worldrendererThree.ts
+++ b/renderer/viewer/lib/worldrendererThree.ts
@@ -223,8 +223,15 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   updateCamera (pos: Vec3 | null, yaw: number, pitch: number): void {
+    if (this.freeFlyMode) {
+      pos = this.freeFlyState.position
+      pitch = this.freeFlyState.pitch
+      yaw = this.freeFlyState.yaw
+    }
+
     if (pos) {
       new tweenJs.Tween(this.camera.position).to({ x: pos.x, y: pos.y, z: pos.z }, 50).start()
+      this.freeFlyState.position = pos
     }
     this.camera.rotation.set(pitch, yaw, this.cameraRoll, 'ZYX')
   }
@@ -234,7 +241,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
     const cam = this.camera instanceof THREE.Group ? this.camera.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
-    if (this.config.showHand) {
+    if (this.config.showHand && !this.freeFlyMode) {
       this.holdingBlock.render(this.camera, this.renderer, viewer.ambientLight, viewer.directionalLight)
       this.holdingBlockLeft.render(this.camera, this.renderer, viewer.ambientLight, viewer.directionalLight)
     }
diff --git a/src/appParams.ts b/src/appParams.ts
index 413b6c2d..6e9a2d50 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -45,6 +45,9 @@ export type AppQsParams = {
   replaySpeed?: string
   replayFileUrl?: string
   replayValidateClient?: string
+  replayStopOnError?: string
+  replaySkipMissingOnTimeout?: string
+  replayPacketsSenderDelay?: string
 }
 
 export type AppQsParamsArray = {
@@ -76,6 +79,16 @@ export const appQueryParamsArray = new Proxy({} as AppQsParamsArrayTransformed,
   },
 })
 
+export function updateQsParam (name: keyof AppQsParams, value: string | undefined) {
+  const url = new URL(window.location.href)
+  if (value) {
+    url.searchParams.set(name, value)
+  } else {
+    url.searchParams.delete(name)
+  }
+  window.history.replaceState({}, '', url.toString())
+}
+
 // Helper function to check if a specific query parameter exists
 export const hasQueryParam = (param: keyof AppQsParams) => qsParams.has(param)
 
diff --git a/src/cameraRotationControls.ts b/src/cameraRotationControls.ts
index 31c20654..b9bc5fe9 100644
--- a/src/cameraRotationControls.ts
+++ b/src/cameraRotationControls.ts
@@ -48,6 +48,14 @@ export const moveCameraRawHandler = ({ x, y }: { x: number; y: number }) => {
   const minPitch = -0.5 * Math.PI
 
   viewer.world.lastCamUpdate = Date.now()
+
+  if (viewer.world.freeFlyMode) {
+    // Update freeFlyState directly
+    viewer.world.freeFlyState.yaw = (viewer.world.freeFlyState.yaw - x) % (2 * Math.PI)
+    viewer.world.freeFlyState.pitch = Math.max(minPitch, Math.min(maxPitch, viewer.world.freeFlyState.pitch - y))
+    return
+  }
+
   if (!bot?.entity) return
   const pitch = bot.entity.pitch - y
   void bot.look(bot.entity.yaw - x, Math.max(minPitch, Math.min(maxPitch, pitch)), true)
diff --git a/src/controls.ts b/src/controls.ts
index 965a2a67..be5028aa 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -2,6 +2,7 @@
 
 import { Vec3 } from 'vec3'
 import { proxy, subscribe } from 'valtio'
+import * as THREE from 'three'
 
 import { ControMax } from 'contro-max/build/controMax'
 import { CommandEventArgument, SchemaCommandInput } from 'contro-max/build/types'
@@ -127,6 +128,23 @@ contro.on('movementUpdate', ({ vector, soleVector, gamepadIndex }) => {
   }
   miscUiState.usingGamepadInput = gamepadIndex !== undefined
   if (!bot || !isGameActive(false)) return
+
+  if (viewer.world.freeFlyMode) {
+    // Create movement vector from input
+    const direction = new THREE.Vector3(0, 0, 0)
+    if (vector.z !== undefined) direction.z = vector.z
+    if (vector.x !== undefined) direction.x = vector.x
+
+    // Apply camera rotation to movement direction
+    direction.applyQuaternion(viewer.camera.quaternion)
+
+    // Update freeFlyState position with normalized direction
+    const moveSpeed = 1
+    direction.multiplyScalar(moveSpeed)
+    viewer.world.freeFlyState.position.add(new Vec3(direction.x, direction.y, direction.z))
+    return
+  }
+
   // gamepadIndex will be used for splitscreen in future
   const coordToAction = [
     ['z', -1, 'forward'],
@@ -333,10 +351,20 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
     // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
     switch (command) {
       case 'general.jump':
-        bot.setControlState('jump', pressed)
+        if (viewer.world.freeFlyMode) {
+          const moveSpeed = 0.5
+          viewer.world.freeFlyState.position.add(new Vec3(0, pressed ? moveSpeed : 0, 0))
+        } else {
+          bot.setControlState('jump', pressed)
+        }
         break
       case 'general.sneak':
-        setSneaking(pressed)
+        if (viewer.world.freeFlyMode) {
+          const moveSpeed = 0.5
+          viewer.world.freeFlyState.position.add(new Vec3(0, pressed ? -moveSpeed : 0, 0))
+        } else {
+          setSneaking(pressed)
+        }
         break
       case 'general.sprint':
         // todo add setting to change behavior
diff --git a/src/index.ts b/src/index.ts
index 74c82479..b3c04d8c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -776,7 +776,9 @@ export async function connect (connectOptions: ConnectOptions) {
     playerState.onlineMode = !!connectOptions.authenticatedAccount
 
     setLoadingScreenStatus('Placing blocks (starting viewer)')
-    localStorage.lastConnectOptions = JSON.stringify(connectOptions)
+    if (connectOptions.worldStateFileContents && connectOptions.worldStateFileContents.length < 3 * 1024 * 1024) {
+      localStorage.lastConnectOptions = JSON.stringify(connectOptions)
+    }
     connectOptions.onSuccessfulPlay?.()
     if (process.env.NODE_ENV === 'development' && !localStorage.lockUrl && !Object.keys(window.debugQueryParams).length) {
       lockUrl()
diff --git a/src/packetsReplay/replayPackets.ts b/src/packetsReplay/replayPackets.ts
index 9ce88a1c..3713d9a2 100644
--- a/src/packetsReplay/replayPackets.ts
+++ b/src/packetsReplay/replayPackets.ts
@@ -2,6 +2,7 @@
 import { createServer, ServerClient } from 'minecraft-protocol'
 import { parseReplayContents } from 'mcraft-fun-mineflayer/build/packetsLogger'
 import { WorldStateHeader, PACKETS_REPLAY_FILE_EXTENSION, WORLD_STATE_FILE_EXTENSION } from 'mcraft-fun-mineflayer/build/worldState'
+import MinecraftData from 'minecraft-data'
 import { LocalServer } from '../customServer'
 import { UserError } from '../mineflayer/userError'
 import { packetsReplayState } from '../react/state/packetsReplayState'
@@ -24,7 +25,6 @@ interface OpenFileOptions {
 
 export function openFile ({ contents, filename = 'unnamed', filesize }: OpenFileOptions) {
   packetsReplayState.replayName = `${filename} (${getFixedFilesize(filesize ?? contents.length)})`
-  packetsReplayState.isOpen = true
   packetsReplayState.isPlaying = false
 
   const connectOptions = {
@@ -72,11 +72,12 @@ export const startLocalReplayServer = (contents: string) => {
     'online-mode': false
   })
 
-  server.on('login', async client => {
+  const data = MinecraftData(def.minecraftVersion)
+  server.on(data.supportFeature('hasConfigurationState') ? 'playerJoin' : 'login' as any, async client => {
     await mainPacketsReplayer(
       client,
       replayData,
-      appQueryParams.replayValidateClient === 'true' ? true : undefined
+      packetsReplayState.customButtons.validateClientPackets.state ? true : undefined
     )
   })
 
@@ -122,6 +123,8 @@ const IGNORE_SERVER_PACKETS = new Set([
   'kick_disconnect',
 ])
 
+const ADDITIONAL_DELAY = 500
+
 const mainPacketsReplayer = async (client: ServerClient, replayData: ReturnType<typeof parseReplayContents>, ignoreClientPacketsWait: string[] | true = []) => {
   const writePacket = (name: string, data: any) => {
     data = restoreData(data)
@@ -139,49 +142,107 @@ const mainPacketsReplayer = async (client: ServerClient, replayData: ReturnType<
     expectedPacketReceived (name, params) {
       console.log('expectedPacketReceived', name, params)
       addPacketToReplayer(name, params, true, true)
+    },
+    unexpectedPacketsLimit: 15,
+    onUnexpectedPacketsLimitReached () {
+      addPacketToReplayer('...', {}, true)
     }
   })
-  bot._client.on('writePacket' as any, (name, params) => {
-    console.log('writePacket', name, params)
-    clientsPacketsWaiter.addPacket(name, params)
-  })
 
-  console.log('start replaying!')
-  for (const [i, packet] of playPackets.entries()) {
-    if (packet.isFromServer) {
-      writePacket(packet.name, packet.params)
-      addPacketToReplayer(packet.name, packet.params, false)
-      await new Promise(resolve => {
-        setTimeout(resolve, packet.diff * packetsReplayState.speed)
-      })
-    } else if (ignoreClientPacketsWait !== true && !ignoreClientPacketsWait.includes(packet.name)) {
-      clientPackets.push({ name: packet.name, params: packet.params })
-      if (playPackets[i + 1]?.isFromServer) {
-        // eslint-disable-next-line @typescript-eslint/no-loop-func
-        clientPackets = clientPackets.filter((p, index) => {
-          return !FLATTEN_CLIENT_PACKETS.has(p.name) || index === clientPackets.findIndex(clientPacket => clientPacket.name === p.name)
-        })
-        for (const packet of clientPackets) {
-          packetsReplayState.packetsPlayback.push({
-            name: packet.name,
-            data: packet.params,
-            isFromClient: true,
-            position: positions.client++,
-            timestamp: Date.now(),
-            isUpcoming: true,
-          })
-        }
+  // Patch console.error to detect errors
+  const originalConsoleError = console.error
+  let lastSentPacket: { name: string, params: any } | null = null
+  console.error = (...args) => {
+    if (lastSentPacket) {
+      console.log('Got error after packet', lastSentPacket.name, lastSentPacket.params)
+    }
+    originalConsoleError.apply(console, args)
+    if (packetsReplayState.customButtons.stopOnError.state) {
+      packetsReplayState.isPlaying = false
+      throw new Error('Replay stopped due to error: ' + args.join(' '))
+    }
+  }
 
-        await clientsPacketsWaiter.waitForPackets(clientPackets.map(p => p.name))
-        clientPackets = []
+  const playServerPacket = (name: string, params: any) => {
+    try {
+      writePacket(name, params)
+      addPacketToReplayer(name, params, false)
+      lastSentPacket = { name, params }
+    } catch (err) {
+      console.error('Error processing packet:', err)
+      if (packetsReplayState.customButtons.stopOnError.state) {
+        packetsReplayState.isPlaying = false
       }
     }
   }
+
+  try {
+    bot.on('error', (err) => {
+      console.error('Mineflayer error:', err)
+    })
+
+    client.on('writePacket' as any, (name, params) => {
+      console.log('writePacket', name, params)
+      clientsPacketsWaiter.addPacket(name, params)
+    })
+
+    console.log('start replaying!')
+    for (const [i, packet] of playPackets.entries()) {
+      if (!packetsReplayState.isPlaying) {
+        await new Promise<void>(resolve => {
+          const interval = setInterval(() => {
+            if (packetsReplayState.isPlaying) {
+              clearInterval(interval)
+              resolve()
+            }
+          }, 100)
+        })
+      }
+
+      if (packet.isFromServer) {
+        playServerPacket(packet.name, packet.params)
+        await new Promise(resolve => {
+          setTimeout(resolve, packet.diff * packetsReplayState.speed + ADDITIONAL_DELAY * (packetsReplayState.customButtons.packetsSenderDelay.state ? 1 : 0))
+        })
+      } else if (ignoreClientPacketsWait !== true && !ignoreClientPacketsWait.includes(packet.name)) {
+        clientPackets.push({ name: packet.name, params: packet.params })
+        if (playPackets[i + 1]?.isFromServer) {
+          // eslint-disable-next-line @typescript-eslint/no-loop-func
+          clientPackets = clientPackets.filter((p, index) => {
+            return !FLATTEN_CLIENT_PACKETS.has(p.name) || index === clientPackets.findIndex(clientPacket => clientPacket.name === p.name)
+          })
+          for (const packet of clientPackets) {
+            packetsReplayState.packetsPlayback.push({
+              name: packet.name,
+              data: packet.params,
+              isFromClient: true,
+              position: positions.client++,
+              timestamp: Date.now(),
+              isUpcoming: true,
+            })
+          }
+
+          await Promise.race([
+            clientsPacketsWaiter.waitForPackets(clientPackets.map(p => p.name)),
+            ...(packetsReplayState.customButtons.skipMissingOnTimeout.state ? [new Promise(resolve => {
+              setTimeout(resolve, 1000)
+            })] : [])
+          ])
+          clientPackets = []
+        }
+      }
+    }
+  } finally {
+    // Restore original console.error
+    console.error = originalConsoleError
+  }
 }
 
 interface PacketsWaiterOptions {
   unexpectedPacketReceived?: (name: string, params: any) => void
   expectedPacketReceived?: (name: string, params: any) => void
+  onUnexpectedPacketsLimitReached?: () => void
+  unexpectedPacketsLimit?: number
 }
 
 interface PacketsWaiter {
@@ -193,13 +254,19 @@ const createPacketsWaiter = (options: PacketsWaiterOptions = {}): PacketsWaiter
   let packetHandler: ((data: any, name: string) => void) | null = null
   const queuedPackets: Array<{ name: string, params: any }> = []
   let isWaiting = false
-
+  let unexpectedPacketsCount = 0
   const handlePacket = (data: any, name: string, waitingPackets: string[], resolve: () => void) => {
     if (waitingPackets.includes(name)) {
       waitingPackets.splice(waitingPackets.indexOf(name), 1)
       options.expectedPacketReceived?.(name, data)
     } else {
-      options.unexpectedPacketReceived?.(name, data)
+      if (options.unexpectedPacketsLimit && unexpectedPacketsCount < options.unexpectedPacketsLimit) {
+        options.unexpectedPacketReceived?.(name, data)
+      }
+      if (options.onUnexpectedPacketsLimitReached && unexpectedPacketsCount === options.unexpectedPacketsLimit) {
+        options.onUnexpectedPacketsLimitReached?.()
+      }
+      unexpectedPacketsCount++
     }
 
     if (waitingPackets.length === 0) {
@@ -220,6 +287,7 @@ const createPacketsWaiter = (options: PacketsWaiterOptions = {}): PacketsWaiter
       if (isWaiting) {
         throw new Error('Already waiting for packets')
       }
+      unexpectedPacketsCount = 0
       isWaiting = true
 
       try {
@@ -253,6 +321,7 @@ const isArrayEqual = (a: any[], b: any[]) => {
 }
 
 const restoreData = (json: any) => {
+  if (!json) return json
   const keys = Object.keys(json)
 
   if (isArrayEqual(keys.sort(), ['data', 'type'].sort())) {
diff --git a/src/react/BossBarOverlay.stories.tsx b/src/react/BossBarOverlay.stories.tsx
index c5699b58..ed88a8ce 100644
--- a/src/react/BossBarOverlay.stories.tsx
+++ b/src/react/BossBarOverlay.stories.tsx
@@ -27,7 +27,8 @@ export const Primary: Story = {
       _title: { text: 'Boss', translate: 'entity.minecraft.ender_dragon' },
       _color: 'red',
       _dividers: 2,
-      _health: 100
+      _health: 100,
+      lastUpdated: 0
     }
   }
 }
diff --git a/src/react/PacketsReplayProvider.tsx b/src/react/PacketsReplayProvider.tsx
index 81ae8562..cb307ed0 100644
--- a/src/react/PacketsReplayProvider.tsx
+++ b/src/react/PacketsReplayProvider.tsx
@@ -1,20 +1,10 @@
 import { useSnapshot } from 'valtio'
 import { useMemo } from 'react'
-import { appQueryParams } from '../appParams'
+import { appQueryParams, updateQsParam } from '../appParams'
 import { miscUiState } from '../globalState'
-import { packetsReplayState } from './state/packetsReplayState'
+import { onChangeButtonState, packetsReplayState } from './state/packetsReplayState'
 import ReplayPanel from './ReplayPanel'
 
-function updateQsParam (name: string, value: string | undefined) {
-  const url = new URL(window.location.href)
-  if (value) {
-    url.searchParams.set(name, value)
-  } else {
-    url.searchParams.delete(name)
-  }
-  window.history.replaceState({}, '', url.toString())
-}
-
 export default function PacketsReplayProvider () {
   const state = useSnapshot(packetsReplayState)
   const { gameLoaded } = useSnapshot(miscUiState)
@@ -58,7 +48,7 @@ export default function PacketsReplayProvider () {
           updateQsParam('replayFilter', filter)
         }}
         onCustomButtonToggle={(button) => {
-          packetsReplayState.customButtons[button] = !state.customButtons[button]
+          onChangeButtonState(button as keyof typeof packetsReplayState.customButtons, !state.customButtons[button].state)
         }}
       />
     </div>
diff --git a/src/react/ReplayPanel.tsx b/src/react/ReplayPanel.tsx
index 51771a5b..c9d5439b 100644
--- a/src/react/ReplayPanel.tsx
+++ b/src/react/ReplayPanel.tsx
@@ -12,12 +12,12 @@ interface Props {
   progress: { current: number; total: number }
   speed: number
   defaultFilter?: string
-  customButtons: { button1: boolean; button2: boolean }
+  customButtons: Readonly<Record<string, { state: boolean; label: string; tooltip?: string }>>
   onPlayPause?: (isPlaying: boolean) => void
   onRestart?: () => void
   onSpeedChange?: (speed: number) => void
   onFilterChange: (filter: string) => void
-  onCustomButtonToggle: (button: 'button1' | 'button2') => void
+  onCustomButtonToggle: (buttonId: string) => void
   clientPacketsAutocomplete: string[]
   serverPacketsAutocomplete: string[]
 }
@@ -139,22 +139,24 @@ export default function ReplayPanel ({
           }}
         />
 
-        {[1, 2].map(num => (
+        {Object.entries(customButtons).map(([buttonId, { state, label, tooltip }]) => (
           <button
-            key={num}
-            onClick={() => onCustomButtonToggle(`button${num}` as 'button1' | 'button2')}
+            key={buttonId}
+            onClick={() => onCustomButtonToggle(buttonId)}
+            title={tooltip}
             style={{
               padding: '4px 8px',
               borderRadius: '4px',
               border: `1px solid ${DARK_COLORS.border}`,
-              background: customButtons[`button${num}`]
-                ? (num === 1 ? DARK_COLORS.client : DARK_COLORS.server)
+              background: state
+                ? (buttonId.startsWith('client') ? DARK_COLORS.client : DARK_COLORS.server)
                 : DARK_COLORS.input,
               color: DARK_COLORS.text,
-              cursor: 'pointer'
+              cursor: 'pointer',
+              minWidth: '32px'
             }}
           >
-            {num}
+            {label}
           </button>
         ))}
       </div>
diff --git a/src/react/components/replay/PacketList.tsx b/src/react/components/replay/PacketList.tsx
index c481ad52..484c42c9 100644
--- a/src/react/components/replay/PacketList.tsx
+++ b/src/react/components/replay/PacketList.tsx
@@ -1,12 +1,17 @@
 import { useRef, useState } from 'react'
 import { PacketData } from '../../ReplayPanel'
 import { useScrollBehavior } from '../../hooks/useScrollBehavior'
+import { ClientOnMap } from '../../../generatedServerPackets'
 import { DARK_COLORS } from './constants'
 
 const formatters: Record<string, (data: any) => string> = {
   position: (data) => `x:${data.x.toFixed(2)} y:${data.y.toFixed(2)} z:${data.z.toFixed(2)}`,
-  chat: (data) => data.message,
-  // Add more formatters as needed
+  // chat: (data) => data,
+  map_chunk (data: ClientOnMap['map_chunk'] | any) {
+    const sizeOfChunk = data.chunkData?.length
+    const blockEntitiesCount = data.blockEntities?.length
+    return `x:${data.x} z:${data.z} C:${sizeOfChunk} E:${blockEntitiesCount}`
+  },
 }
 
 const getPacketIcon = (name: string): string => {
diff --git a/src/react/state/packetsReplayState.ts b/src/react/state/packetsReplayState.ts
index 102a0ba1..79b0640a 100644
--- a/src/react/state/packetsReplayState.ts
+++ b/src/react/state/packetsReplayState.ts
@@ -1,6 +1,6 @@
 import { proxy } from 'valtio'
 import type { PacketData } from '../ReplayPanel'
-import { appQueryParams } from '../../appParams'
+import { appQueryParams, updateQsParam } from '../../appParams'
 
 export const packetsReplayState = proxy({
   packetsPlayback: [] as PacketData[],
@@ -13,7 +13,47 @@ export const packetsReplayState = proxy({
   },
   speed: appQueryParams.replaySpeed ? parseFloat(appQueryParams.replaySpeed) : 1,
   customButtons: {
-    button1: false,
-    button2: false
+    validateClientPackets: {
+      state: appQueryParams.replayValidateClient === 'true',
+      label: 'C',
+      tooltip: 'Validate client packets'
+    },
+    stopOnError: {
+      state: appQueryParams.replayStopOnError === 'true',
+      label: 'E',
+      tooltip: 'Stop the replay when an error occurs'
+    },
+    skipMissingOnTimeout: {
+      state: appQueryParams.replaySkipMissingOnTimeout === 'true',
+      label: 'M',
+      tooltip: 'Skip missing packets on timeout'
+    },
+    packetsSenderDelay: {
+      state: appQueryParams.replayPacketsSenderDelay === 'true',
+      label: 'D',
+      tooltip: 'Send packets with an additional delay'
+    }
   }
 })
+
+export const onChangeButtonState = (button: keyof typeof packetsReplayState.customButtons, state: boolean) => {
+  packetsReplayState.customButtons[button].state = state
+  switch (button) {
+    case 'validateClientPackets': {
+      updateQsParam('replayValidateClient', String(state))
+      break
+    }
+    case 'stopOnError': {
+      updateQsParam('replayStopOnError', String(state))
+      break
+    }
+    case 'skipMissingOnTimeout': {
+      updateQsParam('replaySkipMissingOnTimeout', String(state))
+      break
+    }
+    case 'packetsSenderDelay': {
+      updateQsParam('replayPacketsSenderDelay', String(state))
+      break
+    }
+  }
+}

From 2cb8bea374a371c125d798e6ffc644dcab2c69b4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 23 Feb 2025 21:55:07 +0300
Subject: [PATCH 271/753] fix types

---
 src/react/ReplayPanel.stories.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/react/ReplayPanel.stories.tsx b/src/react/ReplayPanel.stories.tsx
index 132c8011..70d21ea6 100644
--- a/src/react/ReplayPanel.stories.tsx
+++ b/src/react/ReplayPanel.stories.tsx
@@ -73,7 +73,7 @@ export const Primary: Story = {
       progress={{ current: 0, total: 100 }}
       speed={1}
       defaultFilter=""
-      customButtons={{ button1: false, button2: false }}
+      customButtons={{ }}
       onPlayPause={() => {}}
       onRestart={() => {}}
       onSpeedChange={() => {}}
@@ -94,7 +94,7 @@ export const Playing: Story = {
       progress={{ current: 50, total: 100 }}
       speed={1}
       defaultFilter=""
-      customButtons={{ button1: false, button2: false }}
+      customButtons={{ }}
       onPlayPause={() => {}}
       onRestart={() => {}}
       onSpeedChange={() => {}}

From 2e3363dce89ea56d73124576c8051316c72c6cae Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 24 Feb 2025 01:18:48 +0300
Subject: [PATCH 272/753] a lot of replay code cleanup

---
 package.json                             |  2 +-
 pnpm-lock.yaml                           | 12 ++---
 src/mineflayer/plugins/packetsPatcher.ts |  2 +-
 src/packetsReplay/replayPackets.ts       | 39 ++++++---------
 src/react/PacketsReplayProvider.tsx      | 63 ++++++++++++------------
 src/react/PauseScreen.tsx                |  9 ++--
 src/react/ReplayPanel.tsx                |  9 ++--
 src/react/state/packetsReplayState.ts    |  2 +-
 8 files changed, 66 insertions(+), 72 deletions(-)

diff --git a/package.json b/package.json
index 58ffa652..aff91168 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "mojangson": "^2.0.4",
     "net-browserify": "github:zardoy/prismarinejs-net-browserify",
     "node-gzip": "^1.1.2",
-    "mcraft-fun-mineflayer": "^0.1.4",
+    "mcraft-fun-mineflayer": "^0.1.6",
     "peerjs": "^1.5.0",
     "pixelarticons": "^1.8.1",
     "pretty-bytes": "^6.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6886b974..0e58b6da 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -135,8 +135,8 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       mcraft-fun-mineflayer:
-        specifier: ^0.1.4
-        version: 0.1.4(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13))
+        specifier: ^0.1.6
+        version: 0.1.6(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -6252,9 +6252,9 @@ packages:
     resolution: {integrity: sha512-JBi9frIACmzmpKL38YudZJpml+tWP3UuCeb8ko5iJRHpmCmmChE+X3xzVEbEYnYBI2dMiO7915/5eYnKUVys3Q==}
     engines: {node: '>=18.0.0'}
 
-  mcraft-fun-mineflayer@0.1.4:
-    resolution: {integrity: sha512-h6Dmnj/1No1aZO9FG14GTCZ80xPHVnkhByUFKIZr0PV2Hto7PoG4hBG8fa1fifwQIgLwBa+bURPyBw3KzzFPhw==}
-    version: 0.1.4
+  mcraft-fun-mineflayer@0.1.6:
+    resolution: {integrity: sha512-ifaIL//NJtkGcYasEULy0KcJjwUA8BwcmC/KoIpTTj6Xmk5o8AYEVdUnR9jrir4kpiLBOIbHgG1QhY1Wbofl1g==}
+    version: 0.1.6
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       '@roamhq/wrtc': '*'
@@ -16691,7 +16691,7 @@ snapshots:
       apl-image-packer: 1.1.0
       zod: 3.24.1
 
-  mcraft-fun-mineflayer@0.1.4(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.6(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
diff --git a/src/mineflayer/plugins/packetsPatcher.ts b/src/mineflayer/plugins/packetsPatcher.ts
index 446bd397..5e93ef60 100644
--- a/src/mineflayer/plugins/packetsPatcher.ts
+++ b/src/mineflayer/plugins/packetsPatcher.ts
@@ -41,7 +41,7 @@ const botInit = () => {
     //   }
     // }
     if (name === 'settings') {
-      data['viewDistance'] = Math.min(data['viewDistance'], 3)
+      data['viewDistance'] = Math.max(data['viewDistance'], 3)
     }
     return clientWrite(name, data)
   }
diff --git a/src/packetsReplay/replayPackets.ts b/src/packetsReplay/replayPackets.ts
index 3713d9a2..4fb5b8bd 100644
--- a/src/packetsReplay/replayPackets.ts
+++ b/src/packetsReplay/replayPackets.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-await-in-loop */
 import { createServer, ServerClient } from 'minecraft-protocol'
-import { parseReplayContents } from 'mcraft-fun-mineflayer/build/packetsLogger'
+import { ParsedReplayPacket, parseReplayContents } from 'mcraft-fun-mineflayer/build/packetsLogger'
 import { WorldStateHeader, PACKETS_REPLAY_FILE_EXTENSION, WORLD_STATE_FILE_EXTENSION } from 'mcraft-fun-mineflayer/build/worldState'
 import MinecraftData from 'minecraft-data'
 import { LocalServer } from '../customServer'
@@ -35,55 +35,44 @@ export function openFile ({ contents, filename = 'unnamed', filesize }: OpenFile
 }
 
 export const startLocalReplayServer = (contents: string) => {
-  const lines = contents.split('\n')
-  if (!lines[0]) {
-    throw new UserError('No header line found. Cannot parse replay definition.')
-  }
-  let def: WorldStateHeader | ReplayDefinition
-  try {
-    def = JSON.parse(lines[0])
-  } catch (err) {
-    throw new UserError(`Invalid JSON in file header: ${String(err)}`)
-  }
-  const packetsRaw = lines.slice(1).join('\n')
-  const replayData = parseReplayContents(packetsRaw)
+  const { packets, header } = parseReplayContents(contents)
 
   packetsReplayState.packetsPlayback = []
   packetsReplayState.isOpen = true
   packetsReplayState.isPlaying = true
   packetsReplayState.progress = {
     current: 0,
-    total: replayData.packets.filter(packet => packet.isFromServer).length
+    total: packets.filter(packet => packet.isFromServer).length
   }
   packetsReplayState.speed = 1
   packetsReplayState.replayName ||= `local ${getFixedFilesize(contents.length)}`
-  packetsReplayState.replayName = `${def.minecraftVersion} ${packetsReplayState.replayName}`
+  packetsReplayState.replayName = `${header.minecraftVersion} ${packetsReplayState.replayName}`
 
-  if ('formatVersion' in def && def.formatVersion !== SUPPORTED_FORMAT_VERSION) {
-    throw new UserError(`Unsupported format version: ${def.formatVersion}`)
+  if ('formatVersion' in header && header.formatVersion !== SUPPORTED_FORMAT_VERSION) {
+    throw new UserError(`Unsupported format version: ${header.formatVersion}`)
   }
-  if ('replayAgainst' in def && def.replayAgainst === 'server') {
+  if ('replayAgainst' in header && header.replayAgainst === 'server') {
     throw new Error('not supported')
   }
 
   const server = createServer({
     Server: LocalServer as any,
-    version: def.minecraftVersion,
+    version: header.minecraftVersion,
     'online-mode': false
   })
 
-  const data = MinecraftData(def.minecraftVersion)
+  const data = MinecraftData(header.minecraftVersion)
   server.on(data.supportFeature('hasConfigurationState') ? 'playerJoin' : 'login' as any, async client => {
     await mainPacketsReplayer(
       client,
-      replayData,
-      packetsReplayState.customButtons.validateClientPackets.state ? true : undefined
+      packets,
+      packetsReplayState.customButtons.validateClientPackets.state ? undefined : true
     )
   })
 
   return {
     server,
-    version: def.minecraftVersion
+    version: header.minecraftVersion
   }
 }
 
@@ -125,13 +114,13 @@ const IGNORE_SERVER_PACKETS = new Set([
 
 const ADDITIONAL_DELAY = 500
 
-const mainPacketsReplayer = async (client: ServerClient, replayData: ReturnType<typeof parseReplayContents>, ignoreClientPacketsWait: string[] | true = []) => {
+const mainPacketsReplayer = async (client: ServerClient, packets: ParsedReplayPacket[], ignoreClientPacketsWait: string[] | true = []) => {
   const writePacket = (name: string, data: any) => {
     data = restoreData(data)
     client.write(name, data)
   }
 
-  const playPackets = replayData.packets.filter(p => p.state === 'play')
+  const playPackets = packets.filter(p => p.state === 'play')
 
   let clientPackets = [] as Array<{ name: string, params: any }>
   const clientsPacketsWaiter = createPacketsWaiter({
diff --git a/src/react/PacketsReplayProvider.tsx b/src/react/PacketsReplayProvider.tsx
index cb307ed0..782134c2 100644
--- a/src/react/PacketsReplayProvider.tsx
+++ b/src/react/PacketsReplayProvider.tsx
@@ -20,37 +20,36 @@ export default function PacketsReplayProvider () {
   if (!state.isOpen) return null
 
   return (
-    <div style={{
-      transform: 'scale(0.5)',
-      transformOrigin: 'top right'
-    }}>
-      <ReplayPanel
-        replayName={state.replayName}
-        packets={state.packetsPlayback}
-        isPlaying={state.isPlaying}
-        progress={state.progress}
-        speed={state.speed}
-        defaultFilter={appQueryParams.replayFilter ?? ''}
-        clientPacketsAutocomplete={autocomplete?.client ?? []}
-        serverPacketsAutocomplete={autocomplete?.server ?? []}
-        customButtons={state.customButtons}
-        onPlayPause={(isPlaying) => {
-          packetsReplayState.isPlaying = isPlaying
-        }}
-        onRestart={() => {
-          window.location.reload()
-        }}
-        onSpeedChange={(speed) => {
-          packetsReplayState.speed = speed
-          updateQsParam('replaySpeed', speed === 1 ? undefined : speed.toString())
-        }}
-        onFilterChange={(filter) => {
-          updateQsParam('replayFilter', filter)
-        }}
-        onCustomButtonToggle={(button) => {
-          onChangeButtonState(button as keyof typeof packetsReplayState.customButtons, !state.customButtons[button].state)
-        }}
-      />
-    </div>
+    <ReplayPanel
+      style={{
+        transform: 'scale(0.5)',
+        transformOrigin: 'top right'
+      }}
+      replayName={state.replayName}
+      packets={state.packetsPlayback}
+      isPlaying={state.isPlaying}
+      progress={state.progress}
+      speed={state.speed}
+      defaultFilter={appQueryParams.replayFilter ?? ''}
+      clientPacketsAutocomplete={autocomplete?.client ?? []}
+      serverPacketsAutocomplete={autocomplete?.server ?? []}
+      customButtons={state.customButtons}
+      onPlayPause={(isPlaying) => {
+        packetsReplayState.isPlaying = isPlaying
+      }}
+      onRestart={() => {
+        window.location.reload()
+      }}
+      onSpeedChange={(speed) => {
+        packetsReplayState.speed = speed
+        updateQsParam('replaySpeed', speed === 1 ? undefined : speed.toString())
+      }}
+      onFilterChange={(filter) => {
+        updateQsParam('replayFilter', filter)
+      }}
+      onCustomButtonToggle={(button) => {
+        onChangeButtonState(button as keyof typeof packetsReplayState.customButtons, !state.customButtons[button].state)
+      }}
+    />
   )
 }
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 0d4e9a57..6a0fc90e 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -7,6 +7,7 @@ import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { Vec3 } from 'vec3'
 import { generateSpiralMatrix } from 'flying-squid/dist/utils'
 import { subscribeKey } from 'valtio/utils'
+import { ErrorBoundary } from '@zardoy/react-util'
 import {
   activeModalStack,
   showModal,
@@ -227,9 +228,11 @@ export default () => {
       style={{ position: 'fixed', top: '5px', left: 'calc(env(safe-area-inset-left) + 5px)' }}
       onClick={async () => openWorldActions()}
     />
-    <div style={{ position: 'fixed', top: '5px', left: 'calc(env(safe-area-inset-left) + 35px)' }}>
-      <NetworkStatus />
-    </div>
+    <ErrorBoundary renderError={() => <div>error</div>}>
+      <div style={{ position: 'fixed', top: '5px', left: 'calc(env(safe-area-inset-left) + 35px)' }}>
+        <NetworkStatus />
+      </div>
+    </ErrorBoundary>
     <div className={styles.pause_container}>
       <Button className="button" style={{ width: '204px' }} onClick={onReturnPress}>Back to Game</Button>
       <div className={styles.row}>
diff --git a/src/react/ReplayPanel.tsx b/src/react/ReplayPanel.tsx
index c9d5439b..59950555 100644
--- a/src/react/ReplayPanel.tsx
+++ b/src/react/ReplayPanel.tsx
@@ -20,6 +20,7 @@ interface Props {
   onCustomButtonToggle: (buttonId: string) => void
   clientPacketsAutocomplete: string[]
   serverPacketsAutocomplete: string[]
+  style?: React.CSSProperties
 }
 
 export default function ReplayPanel ({
@@ -36,7 +37,8 @@ export default function ReplayPanel ({
   onFilterChange,
   onCustomButtonToggle,
   clientPacketsAutocomplete,
-  serverPacketsAutocomplete
+  serverPacketsAutocomplete,
+  style
 }: Props) {
   const [filter, setFilter] = useState(defaultFilter)
   const { filtered: filteredPackets, hiddenCount } = filterPackets(packets.slice(-500), filter)
@@ -60,7 +62,8 @@ export default function ReplayPanel ({
       display: 'flex',
       flexDirection: 'column',
       gap: '12px',
-      color: DARK_COLORS.text
+      color: DARK_COLORS.text,
+      ...style
     }}>
       <div style={{ fontSize: '12px', fontWeight: 'bold' }}>{replayName || 'Unnamed Replay'}</div>
       <div style={{ fontSize: '8px', color: '#888888', marginTop: '-8px' }}>Integrated server emulation. Testing client...</div>
@@ -149,7 +152,7 @@ export default function ReplayPanel ({
               borderRadius: '4px',
               border: `1px solid ${DARK_COLORS.border}`,
               background: state
-                ? (buttonId.startsWith('client') ? DARK_COLORS.client : DARK_COLORS.server)
+                ? DARK_COLORS.client
                 : DARK_COLORS.input,
               color: DARK_COLORS.text,
               cursor: 'pointer',
diff --git a/src/react/state/packetsReplayState.ts b/src/react/state/packetsReplayState.ts
index 79b0640a..0ff475a9 100644
--- a/src/react/state/packetsReplayState.ts
+++ b/src/react/state/packetsReplayState.ts
@@ -25,7 +25,7 @@ export const packetsReplayState = proxy({
     },
     skipMissingOnTimeout: {
       state: appQueryParams.replaySkipMissingOnTimeout === 'true',
-      label: 'M',
+      label: 'T',
       tooltip: 'Skip missing packets on timeout'
     },
     packetsSenderDelay: {

From 2f29a9a5cb1b88701ab0139d21a676cfb4bd751f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 24 Feb 2025 07:44:24 +0300
Subject: [PATCH 273/753] fix stupid errors

---
 src/mineflayer/plugins/localRelay.ts | 3 ++-
 src/packetsReplay/replayPackets.ts   | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mineflayer/plugins/localRelay.ts b/src/mineflayer/plugins/localRelay.ts
index b55685b1..e6c8cfe5 100644
--- a/src/mineflayer/plugins/localRelay.ts
+++ b/src/mineflayer/plugins/localRelay.ts
@@ -3,6 +3,7 @@ import { PACKETS_REPLAY_FILE_EXTENSION, WORLD_STATE_FILE_EXTENSION } from 'mcraf
 import { Bot } from 'mineflayer'
 import CircularBuffer from 'flying-squid/dist/circularBuffer'
 import { PacketsLogger } from 'mcraft-fun-mineflayer/build/packetsLogger'
+import { lastConnectOptions } from '../../react/AppStatusProvider'
 
 export const localRelayServerPlugin = (bot: Bot) => {
   bot.loadPlugin(
@@ -55,7 +56,7 @@ export const downloadAutoCapturedPackets = () => {
   const url = URL.createObjectURL(blob)
   const a = document.createElement('a')
   a.href = url
-  a.download = `${bot.username}-auto-captured-packets.txt`
+  a.download = `${lastConnectOptions.value?.server ?? 'unknown-server'}-${lastConnectOptions.value?.username ?? 'unknown-username'}-auto-captured-packets.txt`
   a.click()
   URL.revokeObjectURL(url)
 }
diff --git a/src/packetsReplay/replayPackets.ts b/src/packetsReplay/replayPackets.ts
index 4fb5b8bd..e3935258 100644
--- a/src/packetsReplay/replayPackets.ts
+++ b/src/packetsReplay/replayPackets.ts
@@ -170,8 +170,7 @@ const mainPacketsReplayer = async (client: ServerClient, packets: ParsedReplayPa
       console.error('Mineflayer error:', err)
     })
 
-    client.on('writePacket' as any, (name, params) => {
-      console.log('writePacket', name, params)
+    bot._client.on('writePacket' as any, (name, params) => {
       clientsPacketsWaiter.addPacket(name, params)
     })
 

From cde239211c5de595c55ae9d7805cae845be8ada2 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 24 Feb 2025 21:21:48 +0300
Subject: [PATCH 274/753] fix: change chat completions filtering to be not
 aggressive

---
 src/react/Chat.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 8e15180d..5a775b7a 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -194,12 +194,13 @@ export default ({
 
   const updateFilteredCompleteItems = (sourceItems: string[] | Array<{ match: string, toolip: string }>) => {
     const newCompleteItems = sourceItems
-      .map(item => (typeof item === 'string' ? item : item.match))
+      .map((item): string => (typeof item === 'string' ? item : item.match))
       .filter(item => {
-      // this regex is imporatnt is it controls the word matching
-        const compareableParts = item.split(/[[\]{},_:]/)
+        // this regex is imporatnt is it controls the word matching
+        // const compareableParts = item.split(/[[\]{},_:]/)
         const lastWord = chatInput.current.value.slice(0, chatInput.current.selectionEnd ?? chatInput.current.value.length).split(' ').at(-1)!
-        return [item, ...compareableParts].some(compareablePart => compareablePart.startsWith(lastWord))
+        // return [item, ...compareableParts].some(compareablePart => compareablePart.startsWith(lastWord))
+        return item.includes(lastWord)
       })
     setCompletionItems(newCompleteItems)
   }

From 2f200a876ae67fa94a95d7f1dc965cda7e49bbf5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 24 Feb 2025 21:22:06 +0300
Subject: [PATCH 275/753] fix: fix hardcoded sounds played when resource is
 requested

---
 src/index.ts                 |  2 +-
 src/sounds/botSoundSystem.ts | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index b3c04d8c..c0721cc6 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -776,7 +776,7 @@ export async function connect (connectOptions: ConnectOptions) {
     playerState.onlineMode = !!connectOptions.authenticatedAccount
 
     setLoadingScreenStatus('Placing blocks (starting viewer)')
-    if (connectOptions.worldStateFileContents && connectOptions.worldStateFileContents.length < 3 * 1024 * 1024) {
+    if (!connectOptions.worldStateFileContents || connectOptions.worldStateFileContents.length < 3 * 1024 * 1024) {
       localStorage.lastConnectOptions = JSON.stringify(connectOptions)
     }
     connectOptions.onSuccessfulPlay?.()
diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 059f7e65..8a22082e 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -107,16 +107,16 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
     await playHardcodedSound(soundId, position, volume, pitch)
   })
 
-  bot.on('hardcodedSoundEffectHeard', async (soundIdNum, soundCategory, position, volume, pitch) => {
-    const soundKey = soundMap!.soundsIdToName[soundIdNum]
-    if (soundKey === undefined) return
-    await playGeneralSound(soundKey, position, volume, pitch)
-  })
-
   bot._client.on('sound_effect', async (packet) => {
     const soundResource = packet['soundEvent']?.resource as string | undefined
-    if (packet.soundId !== 0 || !soundResource) return
     const pos = new Vec3(packet.x / 8, packet.y / 8, packet.z / 8)
+    if (packet.soundId !== 0 || !soundResource) {
+      const soundKey = soundMap!.soundsIdToName[packet.soundId]
+      if (soundKey === undefined) return
+      await playGeneralSound(soundKey, pos, packet.volume, packet.pitch)
+      return
+    }
+
     await playHardcodedSound(soundResource.replace('minecraft:', ''), pos, packet.volume, packet.pitch)
   })
 

From 6d29413a5d807f104c0db33110e1287bff6fef21 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 24 Feb 2025 21:53:43 +0300
Subject: [PATCH 276/753] add transparent block model override

---
 experiments/state.html              |  1 +
 experiments/state.ts                | 37 +++++++++++++++++++++++++++++
 renderer/viewer/lib/mesher/world.ts |  7 +++++-
 src/customChannels.ts               |  1 -
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 experiments/state.html
 create mode 100644 experiments/state.ts

diff --git a/experiments/state.html b/experiments/state.html
new file mode 100644
index 00000000..7a5282b7
--- /dev/null
+++ b/experiments/state.html
@@ -0,0 +1 @@
+<script src="state.ts" type="module"></script>
diff --git a/experiments/state.ts b/experiments/state.ts
new file mode 100644
index 00000000..b01523fc
--- /dev/null
+++ b/experiments/state.ts
@@ -0,0 +1,37 @@
+import { SmoothSwitcher } from '../renderer/viewer/lib/smoothSwitcher'
+
+const div = document.createElement('div')
+div.style.width = '100px'
+div.style.height = '100px'
+div.style.backgroundColor = 'red'
+document.body.appendChild(div)
+
+const pos = {x: 0, y: 0}
+
+const positionSwitcher = new SmoothSwitcher(() => pos, (key, value) => {
+  pos[key] = value
+})
+globalThis.positionSwitcher = positionSwitcher
+
+document.body.addEventListener('keydown', e => {
+  if (e.code === 'ArrowLeft' || e.code === 'ArrowRight') {
+    const to = {
+      x: e.code === 'ArrowLeft' ? -100 : 100
+    }
+    console.log(pos, to)
+    positionSwitcher.transitionTo(to, e.code === 'ArrowLeft' ? 'Left' : 'Right', () => {
+      console.log('Switched to ', e.code === 'ArrowLeft' ? 'Left' : 'Right')
+    })
+  }
+  if (e.code === 'Space') {
+    pos.x = 200
+  }
+})
+
+const render = () => {
+  positionSwitcher.update()
+    div.style.transform = `translate(${pos.x}px, ${pos.y}px)`
+    requestAnimationFrame(render)
+}
+
+render()
diff --git a/renderer/viewer/lib/mesher/world.ts b/renderer/viewer/lib/mesher/world.ts
index b914e8cf..2106e179 100644
--- a/renderer/viewer/lib/mesher/world.ts
+++ b/renderer/viewer/lib/mesher/world.ts
@@ -144,7 +144,7 @@ export class World {
     if (!this.blockCache[cacheKey]) {
       const b = column.getBlock(locInChunk) as unknown as WorldBlock
       if (modelOverride) {
-        b.name = modelOverride
+        // b.name = modelOverride
       }
       b.isCube = isCube(b.shapes)
       this.blockCache[cacheKey] = b
@@ -228,6 +228,11 @@ export class World {
           }
           block.models = null
         }
+
+        if (block.models && modelOverride) {
+          const model = block.models[0]
+          block.transparent = model['transparent'] ?? block.transparent
+        }
       } catch (err) {
         this.erroredBlockModel ??= blockProvider.getAllResolvedModels0_1({ name: 'errored', properties: {} })
         block.models ??= this.erroredBlockModel
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 33bc8fcd..71dc7067 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -41,7 +41,6 @@ customEvents.on('mineflayerBotCreated', async () => {
 
   bot._client.on(CHANNEL_NAME as any, (data) => {
     const { worldName, x, y, z, model } = data
-    console.debug('Received model data:', { worldName, x, y, z, model })
 
     const chunkX = Math.floor(x / 16) * 16
     const chunkZ = Math.floor(z / 16) * 16

From 0b2d676d9373ecd76e74ac3061e8fecc22b5065b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Feb 2025 00:01:56 +0300
Subject: [PATCH 277/753] fix: fix a lof of bugs in base transition classes and
 fix bug with possibly wrong item display in hand

---
 package.json                               |  2 +-
 pnpm-lock.yaml                             | 10 ++---
 renderer/viewer/lib/animationController.ts | 16 ++++++--
 renderer/viewer/lib/holdingBlock.ts        | 45 ++++++++++++++++------
 renderer/viewer/lib/mesher/world.ts        |  7 ++--
 renderer/viewer/lib/smoothSwitcher.ts      |  5 +--
 6 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index aff91168..f3f2f644 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.36",
+    "mc-assets": "^0.2.37",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0e58b6da..7060521d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -350,8 +350,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.36
-        version: 0.2.36
+        specifier: ^0.2.37
+        version: 0.2.37
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -6248,8 +6248,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.36:
-    resolution: {integrity: sha512-JBi9frIACmzmpKL38YudZJpml+tWP3UuCeb8ko5iJRHpmCmmChE+X3xzVEbEYnYBI2dMiO7915/5eYnKUVys3Q==}
+  mc-assets@0.2.37:
+    resolution: {integrity: sha512-49tk3shwxsDoV0PrrbORZEKg613vUQPULgusWjXNl8JEma5y41LEo57D6q4aHliXsV3Gb9ThrkFf6hIb0WlY1Q==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.6:
@@ -16686,7 +16686,7 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.36:
+  mc-assets@0.2.37:
     dependencies:
       apl-image-packer: 1.1.0
       zod: 3.24.1
diff --git a/renderer/viewer/lib/animationController.ts b/renderer/viewer/lib/animationController.ts
index bfccc72f..329d0e24 100644
--- a/renderer/viewer/lib/animationController.ts
+++ b/renderer/viewer/lib/animationController.ts
@@ -5,9 +5,10 @@ export class AnimationController {
   private isAnimating = false
   private cancelRequested = false
   private completionCallbacks: Array<() => void> = []
+  private currentCancelCallback: (() => void) | null = null
 
   /** Main method */
-  async startAnimation (createAnimation: () => tweenJs.Group): Promise<void> {
+  async startAnimation (createAnimation: () => tweenJs.Group, onCancelled?: () => void): Promise<void> {
     if (this.isAnimating) {
       await this.cancelCurrentAnimation()
     }
@@ -15,6 +16,7 @@ export class AnimationController {
     return new Promise((resolve) => {
       this.isAnimating = true
       this.cancelRequested = false
+      this.currentCancelCallback = onCancelled ?? null
       this.currentAnimation = createAnimation()
 
       this.completionCallbacks.push(() => {
@@ -29,6 +31,12 @@ export class AnimationController {
   async cancelCurrentAnimation (): Promise<void> {
     if (!this.isAnimating) return
 
+    if (this.currentCancelCallback) {
+      const callback = this.currentCancelCallback
+      this.currentCancelCallback = null
+      callback()
+    }
+
     return new Promise((resolve) => {
       this.cancelRequested = true
       this.completionCallbacks.push(() => {
@@ -41,7 +49,7 @@ export class AnimationController {
     if (this.cancelRequested) this.forceFinish()
   }
 
-  forceFinish () {
+  forceFinish (callComplete = true) {
     if (!this.isAnimating) return
 
     if (this.currentAnimation) {
@@ -55,7 +63,9 @@ export class AnimationController {
 
     const callbacks = [...this.completionCallbacks]
     this.completionCallbacks = []
-    for (const cb of callbacks) cb()
+    if (callComplete) {
+      for (const cb of callbacks) cb()
+    }
   }
 
   /** Required method */
diff --git a/renderer/viewer/lib/holdingBlock.ts b/renderer/viewer/lib/holdingBlock.ts
index c9fdc5f5..3dcc0d5c 100644
--- a/renderer/viewer/lib/holdingBlock.ts
+++ b/renderer/viewer/lib/holdingBlock.ts
@@ -235,7 +235,7 @@ export default class HoldingBlock {
   //   new tweenJs.Tween(group.rotation).to({ z: THREE.MathUtils.degToRad(90) }, 1000).yoyo(true).repeat(Infinity).start()
   // }
 
-  async playBlockSwapAnimation (forceState?: 'appeared' | 'disappeared') {
+  async playBlockSwapAnimation (forceState: 'appeared' | 'disappeared') {
     this.blockSwapAnimation ??= {
       switcher: new SmoothSwitcher(
         () => ({
@@ -250,23 +250,29 @@ export default class HoldingBlock {
       )
     }
 
-    const newState = this.blockSwapAnimation.switcher.currentStateName === 'disappeared' ? 'appeared' : 'disappeared'
-    if (forceState && newState !== forceState) throw new Error(`forceState does not match current state ${newState} !== ${forceState}`)
+    const newState = forceState
+    // if (forceState && newState !== forceState) {
+    //   throw new Error(`forceState does not match current state ${forceState} !== ${newState}`)
+    // }
 
     const targetY = this.objectInnerGroup.position.y + (this.objectInnerGroup.scale.y * 1.5 * (newState === 'appeared' ? 1 : -1))
 
-    if (newState === this.blockSwapAnimation.switcher.transitioningToStateName) {
-      return false
-    }
+    // if (newState === this.blockSwapAnimation.switcher.transitioningToStateName) {
+    //   return false
+    // }
 
+    let cancelled = false
     return new Promise<boolean>((resolve) => {
       this.blockSwapAnimation!.switcher.transitionTo(
         { y: targetY },
         newState,
         () => {
-          resolve(true)
+          if (!cancelled) {
+            resolve(true)
+          }
         },
         () => {
+          cancelled = true
           resolve(false)
         }
       )
@@ -274,7 +280,18 @@ export default class HoldingBlock {
   }
 
   isDifferentItem (block: HandItemBlock | undefined) {
-    return !this.lastHeldItem || (this.lastHeldItem.name !== block?.name || JSON.stringify(this.lastHeldItem.fullItem) !== JSON.stringify(block?.fullItem ?? '{}'))
+    if (!this.lastHeldItem) {
+      return true
+    }
+    if (this.lastHeldItem.name !== block?.name) {
+      return true
+    }
+    // eslint-disable-next-line sonarjs/prefer-single-boolean-return
+    if (JSON.stringify(this.lastHeldItem.fullItem) !== JSON.stringify(block?.fullItem ?? '{}')) {
+      return true
+    }
+
+    return false
   }
 
   updateCameraGroup () {
@@ -339,6 +356,9 @@ export default class HoldingBlock {
   }
 
   async replaceItemModel (handItem?: HandItemBlock): Promise<void> {
+    // if switch animation is in progress, do not replace the item
+    if (this.blockSwapAnimation?.switcher.isTransitioning) return
+
     if (!handItem) {
       this.holdingBlock?.removeFromParent()
       this.holdingBlock = undefined
@@ -359,19 +379,21 @@ export default class HoldingBlock {
 
   }
 
+  switchRequest = 0
   async setNewItem (handItem?: HandItemBlock) {
     if (!this.isDifferentItem(handItem)) return
+    const switchRequest = ++this.switchRequest
+    this.lastHeldItem = handItem
     let playAppearAnimation = false
     if (this.holdingBlock) {
       // play disappear animation
       playAppearAnimation = true
-      const result = await this.playBlockSwapAnimation()
+      const result = await this.playBlockSwapAnimation('disappeared')
       if (!result) return
       this.holdingBlock?.removeFromParent()
       this.holdingBlock = undefined
     }
 
-    this.lastHeldItem = handItem
     if (!handItem) {
       this.swingAnimator?.stopSwing()
       this.swingAnimator = undefined
@@ -380,8 +402,9 @@ export default class HoldingBlock {
       return
     }
 
+    if (switchRequest !== this.switchRequest) return
     const result = await this.createItemModel(handItem)
-    if (!result) return
+    if (!result || switchRequest !== this.switchRequest) return
 
     const blockOuterGroup = new THREE.Group()
     this.holdingBlockInnerGroup.removeFromParent()
diff --git a/renderer/viewer/lib/mesher/world.ts b/renderer/viewer/lib/mesher/world.ts
index 2106e179..e18f8201 100644
--- a/renderer/viewer/lib/mesher/world.ts
+++ b/renderer/viewer/lib/mesher/world.ts
@@ -172,7 +172,7 @@ export class World {
       }
     }
 
-    const block = this.blockCache[cacheKey]
+    const block: WorldBlock = this.blockCache[cacheKey]
 
     if (block.models === undefined && blockProvider) {
       if (!attr) throw new Error('attr is required')
@@ -222,7 +222,7 @@ export class World {
           })
         }
 
-        if (!block.models!.length) {
+        if (!block.models.length) {
           if (block.name !== 'water' && block.name !== 'lava' && !INVISIBLE_BLOCKS.has(block.name)) {
             console.debug('[mesher] block to render not found', block.name, props)
           }
@@ -231,7 +231,7 @@ export class World {
 
         if (block.models && modelOverride) {
           const model = block.models[0]
-          block.transparent = model['transparent'] ?? block.transparent
+          block.transparent = model[0]?.['transparent'] ?? block.transparent
         }
       } catch (err) {
         this.erroredBlockModel ??= blockProvider.getAllResolvedModels0_1({ name: 'errored', properties: {} })
@@ -245,6 +245,7 @@ export class World {
     if (block.name === 'flowing_lava') block.name = 'lava'
     if (block.name === 'bubble_column') block.name = 'water' // TODO need to distinguish between water and bubble column
     // block.position = loc // it overrides position of all currently loaded blocks
+    //@ts-expect-error
     block.biome = this.biomeCache[column.getBiome(locInChunk)] ?? this.biomeCache[1] ?? this.biomeCache[0]
     if (block.name === 'redstone_ore') block.transparent = false
     return block
diff --git a/renderer/viewer/lib/smoothSwitcher.ts b/renderer/viewer/lib/smoothSwitcher.ts
index 925affec..74eb1171 100644
--- a/renderer/viewer/lib/smoothSwitcher.ts
+++ b/renderer/viewer/lib/smoothSwitcher.ts
@@ -88,8 +88,7 @@ export class SmoothSwitcher {
     onCancelled?: () => void
   ): void {
     if (this.isTransitioning) {
-      onCancelled?.()
-      this.animationController.forceFinish()
+      this.animationController.forceFinish(false)
     }
 
     this.transitioningToStateName = stateName ?? ''
@@ -116,7 +115,7 @@ export class SmoothSwitcher {
         })
         .start()
       return group
-    })
+    }, onCancelled)
   }
 
   /**

From 077dc9df26dba3476c0d186bd6ce4644debaad14 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Feb 2025 00:02:35 +0300
Subject: [PATCH 278/753] fix: fix hand performance because of unnecessary
 texture rewrites

---
 renderer/viewer/lib/entities.ts     |  9 ++++++--
 renderer/viewer/lib/holdingBlock.ts | 36 +++++++++++++++++++++--------
 src/index.ts                        |  3 ++-
 src/inventoryWindows.ts             |  3 ++-
 4 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/renderer/viewer/lib/entities.ts b/renderer/viewer/lib/entities.ts
index c4664489..b60a5fef 100644
--- a/renderer/viewer/lib/entities.ts
+++ b/renderer/viewer/lib/entities.ts
@@ -225,10 +225,11 @@ export class Entities extends EventEmitter {
     su?: number;
     sv?: number;
     size?: number;
+    modelName?: string;
   } | {
     resolvedModel: BlockModel
     modelName: string
-  })
+  } | undefined)
 
   get entitiesByName (): Record<string, SceneEntity[]> {
     const byName: Record<string, SceneEntity[]> = {}
@@ -498,8 +499,10 @@ export class Entities extends EventEmitter {
     return typeof component === 'string' ? component : component.text ?? ''
   }
 
-  getItemMesh (item, specificProps: ItemSpecificContextProperties) {
+  getItemMesh (item, specificProps: ItemSpecificContextProperties, previousModel?: string) {
     const textureUv = this.getItemUv?.(item, specificProps)
+    if (previousModel && previousModel === textureUv?.modelName) return undefined
+
     if (textureUv && 'resolvedModel' in textureUv) {
       const mesh = getBlockMeshFromModel(this.viewer.world.material, textureUv.resolvedModel, textureUv.modelName)
       if (specificProps['minecraft:display_context'] === 'ground') {
@@ -514,6 +517,7 @@ export class Entities extends EventEmitter {
         isBlock: true,
         itemsTexture: null,
         itemsTextureFlipped: null,
+        modelName: textureUv.modelName,
       }
     }
 
@@ -555,6 +559,7 @@ export class Entities extends EventEmitter {
         isBlock: false,
         itemsTexture,
         itemsTextureFlipped,
+        modelName: textureUv.modelName,
       }
     }
   }
diff --git a/renderer/viewer/lib/holdingBlock.ts b/renderer/viewer/lib/holdingBlock.ts
index 3dcc0d5c..084953fd 100644
--- a/renderer/viewer/lib/holdingBlock.ts
+++ b/renderer/viewer/lib/holdingBlock.ts
@@ -320,31 +320,37 @@ export default class HoldingBlock {
     this.objectOuterGroup.scale.set(scale, scale, scale)
   }
 
+  lastItemModelName: string | undefined
   private async createItemModel (handItem: HandItemBlock): Promise<{ model: THREE.Object3D; type: 'hand' | 'block' | 'item' } | undefined> {
     this.lastUpdate = performance.now()
     if (!handItem || (handItem.type === 'hand' && !this.playerHand)) return undefined
 
-    let blockInner: THREE.Object3D
+    let blockInner: THREE.Object3D | undefined
     if (handItem.type === 'item' || handItem.type === 'block') {
-      const { mesh: itemMesh, isBlock } = viewer.entities.getItemMesh({
+      const result = viewer.entities.getItemMesh({
         ...handItem.fullItem,
         itemId: handItem.id,
       }, {
         'minecraft:display_context': 'firstperson',
         'minecraft:use_duration': this.playerState.getItemUsageTicks?.(),
         'minecraft:using_item': !!this.playerState.getItemUsageTicks?.(),
-      })!
-      if (isBlock) {
-        blockInner = itemMesh
-        handItem.type = 'block'
-      } else {
-        itemMesh.position.set(0.5, 0.5, 0.5)
-        blockInner = itemMesh
-        handItem.type = 'item'
+      }, this.lastItemModelName)
+      if (result) {
+        const { mesh: itemMesh, isBlock, modelName } = result
+        if (isBlock) {
+          blockInner = itemMesh
+          handItem.type = 'block'
+        } else {
+          itemMesh.position.set(0.5, 0.5, 0.5)
+          blockInner = itemMesh
+          handItem.type = 'item'
+        }
+        this.lastItemModelName = modelName
       }
     } else {
       blockInner = this.playerHand!
     }
+    if (!blockInner) return
     blockInner.name = 'holdingBlock'
 
     const rotationDeg = this.getHandHeld3d().rotation
@@ -379,9 +385,19 @@ export default class HoldingBlock {
 
   }
 
+  testUnknownBlockSwitch () {
+    void this.setNewItem({
+      type: 'item',
+      name: 'minecraft:some-unknown-block',
+      id: 0,
+      fullItem: {}
+    })
+  }
+
   switchRequest = 0
   async setNewItem (handItem?: HandItemBlock) {
     if (!this.isDifferentItem(handItem)) return
+    this.lastItemModelName = undefined
     const switchRequest = ++this.switchRequest
     this.lastHeldItem = handItem
     let playAppearAnimation = false
diff --git a/src/index.ts b/src/index.ts
index c0721cc6..6c46d0e9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -214,7 +214,8 @@ viewer.entities.getItemUv = (item, specificProps) => {
       const [u, v, su, sv] = [x / img.width, y / img.height, (w / img.width), (h / img.height)]
       return {
         u, v, su, sv,
-        texture: textureThree
+        texture: textureThree,
+        modelName: renderInfo.modelName
       }
     }
 
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index bdcdef3c..471f5be4 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -207,7 +207,8 @@ export const renderSlot = (slot: GeneralInputItem, debugIsQuickbar = false, full
     // is item
     return {
       texture: itemTexture.type,
-      slice: itemTexture.slice
+      slice: itemTexture.slice,
+      modelName: itemModelName
     }
   } else {
     // is block

From 2833b33b4ed24a5400b7441701a57eb2b73e13e5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Feb 2025 00:29:34 +0300
Subject: [PATCH 279/753] fix: display err when sound mappings not found

---
 src/sounds/botSoundSystem.ts |  4 ++++
 src/sounds/soundsMap.ts      | 18 ++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 8a22082e..aa33db60 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -7,6 +7,7 @@ import { miscUiState } from '../globalState'
 import { options } from '../optionsStorage'
 import { loadOrPlaySound } from '../basicSounds'
 import { getActiveResourcepackBasePath, resourcePackState } from '../resourcePack'
+import { showNotification } from '../react/NotificationProvider'
 import { createSoundMap, SoundMap } from './soundsMap'
 import { musicSystem } from './musicSystem'
 
@@ -31,6 +32,9 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
   soundMap = createSoundMap(bot.version) ?? undefined
   globalThis.soundMap = soundMap
   if (!soundMap) return
+  if (soundMap.noVersionIdMapping) {
+    showNotification('No sound ID mapping for this version', undefined, true)
+  }
   void updateResourcePack()
   startMusicSystem()
 
diff --git a/src/sounds/soundsMap.ts b/src/sounds/soundsMap.ts
index 7cdfe74d..c461dd8d 100644
--- a/src/sounds/soundsMap.ts
+++ b/src/sounds/soundsMap.ts
@@ -52,13 +52,27 @@ export class SoundMap {
   private readonly existingResourcePackPaths: Set<string>
   private activeResourcePackBasePath: string | undefined
   private activeResourcePackSoundsJson: ResourcePackSoundsJson | undefined
+  noVersionIdMapping = false
 
   constructor (
     private readonly soundData: SoundMapData,
     private readonly version: string
   ) {
-    const allSoundsMajor = versionsMapToMajor(soundData.allSoundsMap)
-    const soundsMap = allSoundsMajor[versionToMajor(version)] ?? Object.values(allSoundsMajor)[0]
+    // First try exact version match
+    let soundsMap = soundData.allSoundsMap[this.version]
+
+    if (!soundsMap) {
+      // If no exact match, try major version
+      const allSoundsMajor = versionsMapToMajor(soundData.allSoundsMap)
+      soundsMap = allSoundsMajor[versionToMajor(version)]
+
+      if (!soundsMap) {
+        // If still no match, use first available mapping
+        soundsMap = Object.values(allSoundsMajor)[0]
+      }
+
+      this.noVersionIdMapping = true
+    }
 
     // Create both mappings
     this.soundsIdToName = {}

From b7560f716a86d84e2ec1f889035a52b4d9e12a2a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Feb 2025 23:11:02 +0300
Subject: [PATCH 280/753] fix custom block models regression

---
 renderer/viewer/lib/mesher/world.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/mesher/world.ts b/renderer/viewer/lib/mesher/world.ts
index e18f8201..e13bf760 100644
--- a/renderer/viewer/lib/mesher/world.ts
+++ b/renderer/viewer/lib/mesher/world.ts
@@ -144,7 +144,7 @@ export class World {
     if (!this.blockCache[cacheKey]) {
       const b = column.getBlock(locInChunk) as unknown as WorldBlock
       if (modelOverride) {
-        // b.name = modelOverride
+        b.name = modelOverride
       }
       b.isCube = isCube(b.shapes)
       this.blockCache[cacheKey] = b

From acd8144d7640188bd5854cbe344ac53a540d88ac Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Feb 2025 03:29:10 +0300
Subject: [PATCH 281/753] feat: initial config.json is now bundled on build
 step, which is required for defaultSettings feat: allow to specify default
 and locked settings in config.json feat: allow to specify default app params
 in config.json feat: rework how loading progress is reported in app on
 connect feat: add setting to wait for chunks to load before starting
 rendering (which is highly recommended to enable), however not enabled by
 default because functionality is top priority of the client out of the box,
 not pleasent ux, so pls enable yourself

---
 renderer/viewer/lib/viewerWrapper.ts |   4 +-
 rsbuild.config.ts                    |  11 ++-
 scripts/prepareSounds.mjs            |  10 +-
 src/appParams.ts                     |  12 ++-
 src/browserfs.ts                     |   3 +-
 src/controls.ts                      |   9 +-
 src/downloadAndOpenFile.ts           |   3 +-
 src/globalState.ts                   |  23 +++++
 src/index.ts                         | 142 ++++++++++++++++++---------
 src/optionsGuiScheme.tsx             |   4 +-
 src/optionsStorage.ts                |  13 ++-
 src/react/OptionsItems.tsx           |   4 +-
 src/resourcePack.ts                  |  95 +++++++++---------
 src/supportedVersions.mjs            |   2 +
 14 files changed, 218 insertions(+), 117 deletions(-)

diff --git a/renderer/viewer/lib/viewerWrapper.ts b/renderer/viewer/lib/viewerWrapper.ts
index 2e08da1d..6b2fb562 100644
--- a/renderer/viewer/lib/viewerWrapper.ts
+++ b/renderer/viewer/lib/viewerWrapper.ts
@@ -1,5 +1,6 @@
 import * as THREE from 'three'
 import { statsEnd, statsStart } from '../../../src/topRightStats'
+import { activeModalStack } from '../../../src/globalState'
 
 // wrapper for now
 export class ViewerWrapper {
@@ -77,8 +78,8 @@ export class ViewerWrapper {
   postRender = () => { }
   render (time: DOMHighResTimeStamp) {
     if (this.globalObject.stopLoop) return
-    for (const fn of beforeRenderFrame) fn()
     this.globalObject.requestAnimationFrame(this.render.bind(this))
+    if (activeModalStack.some(m => m.reactType === 'app-status')) return
     if (!viewer || this.globalObject.stopRender || this.renderer?.xr.isPresenting || (this.stopRenderOnBlur && !this.windowFocused)) return
     const renderInterval = (this.windowFocused ? this.renderInterval : this.renderIntervalUnfocused) ?? this.renderInterval
     if (renderInterval) {
@@ -91,6 +92,7 @@ export class ViewerWrapper {
         return
       }
     }
+    for (const fn of beforeRenderFrame) fn()
     this.preRender()
     statsStart()
     // ios bug: viewport dimensions are updated after the resize event
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index a93e2c84..5fd9316c 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -33,6 +33,11 @@ if (fs.existsSync('./assets/release.json')) {
     releaseChangelog = releaseJson.changelog?.replace(/<!-- bump-type:[\w]+ -->/, '')
 }
 
+const configJson = JSON.parse(fs.readFileSync('./config.json', 'utf8'))
+if (dev) {
+    configJson.defaultProxy = ':8080'
+}
+
 // base options are in ./renderer/rsbuildSharedConfig.ts
 const appConfig = defineConfig({
     html: {
@@ -64,6 +69,7 @@ const appConfig = defineConfig({
             'process.env.RELEASE_LINK': JSON.stringify(releaseLink),
             'process.env.RELEASE_CHANGELOG': JSON.stringify(releaseChangelog),
             'process.env.DISABLE_SERVICE_WORKER': JSON.stringify(disableServiceWorker),
+            'process.env.INLINED_APP_CONFIG': JSON.stringify(configJson),
         },
     },
     server: {
@@ -99,14 +105,11 @@ const appConfig = defineConfig({
                     if (fs.existsSync('./assets/release.json')) {
                         fs.copyFileSync('./assets/release.json', './dist/release.json')
                     }
-                    const configJson = JSON.parse(fs.readFileSync('./config.json', 'utf8'))
                     let configLocalJson = {}
                     try {
                         configLocalJson = JSON.parse(fs.readFileSync('./config.local.json', 'utf8'))
                     } catch (err) {}
-                    if (dev) {
-                        configJson.defaultProxy = ':8080'
-                    }
+
                     fs.writeFileSync('./dist/config.json', JSON.stringify({ ...configJson, ...configLocalJson }), 'utf8')
                     if (fs.existsSync('./generated/sounds.js')) {
                         fs.copyFileSync('./generated/sounds.js', './dist/sounds.js')
diff --git a/scripts/prepareSounds.mjs b/scripts/prepareSounds.mjs
index f9b8cd60..f80ace4e 100644
--- a/scripts/prepareSounds.mjs
+++ b/scripts/prepareSounds.mjs
@@ -7,10 +7,11 @@ import { fileURLToPath } from 'url'
 import { exec } from 'child_process'
 import { promisify } from 'util'
 import { build } from 'esbuild'
+import supportedVersions from '../src/supportedVersions.mjs'
 
 const __dirname = path.dirname(fileURLToPath(new URL(import.meta.url)))
 
-const targetedVersions = ['1.21.1', '1.20.6', '1.20.1', '1.19.2', '1.18.2', '1.17.1', '1.16.5', '1.15.2', '1.14.4', '1.13.2', '1.12.2', '1.11.2', '1.10.2', '1.9.4', '1.8.9']
+const targetedVersions = supportedVersions.reverse()
 
 /** @type {{name, size, hash}[]} */
 let prevSounds = null
@@ -145,6 +146,7 @@ const convertSounds = async () => {
   const convertSound = async (i) => {
     const proc = promisify(exec)(`${ffmpegExec} -i "${toConvert[i]}" -y -codec:a libmp3lame ${maintainBitrate ? '-qscale:a 2' : ''} "${toConvert[i].replace('.ogg', '.mp3')}"`)
     // pipe stdout to the console
+    //@ts-ignore
     proc.child.stdout.pipe(process.stdout)
     await proc
     console.log('converted to mp3', i, '/', toConvert.length, toConvert[i])
@@ -173,7 +175,11 @@ const writeSoundsMap = async () => {
   // const localTargetedVersions = targetedVersions.slice(0, 2)
   const localTargetedVersions = targetedVersions
   for (const targetedVersion of localTargetedVersions) {
-    const burgerData = await fetch(burgerDataUrl(targetedVersion)).then((r) => r.json())
+    const burgerData = await fetch(burgerDataUrl(targetedVersion)).then((r) => r.json()).catch((err) => {
+      console.error('error fetching burger data', targetedVersion, err)
+      return null
+    })
+    if (!burgerData) continue
     const allSoundsMap = getSoundsMap(burgerData)
     // console.log(Object.keys(sounds).length, 'ids')
     const outputIdMap = {}
diff --git a/src/appParams.ts b/src/appParams.ts
index 6e9a2d50..50fbf055 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -1,3 +1,5 @@
+import type { AppConfig } from './globalState'
+
 const qsParams = new URLSearchParams(window.location?.search ?? '')
 
 export type AppQsParams = {
@@ -61,12 +63,16 @@ type AppQsParamsArrayTransformed = {
   [k in keyof AppQsParamsArray]: string[]
 }
 
+const initialAppConfig = process.env.INLINED_APP_CONFIG as AppConfig ?? {}
+
 export const appQueryParams = new Proxy<AppQsParams>({} as AppQsParams, {
   get (target, property) {
     if (typeof property !== 'string') {
       return undefined
     }
-    return qsParams.get(property)
+    const qsParam = qsParams.get(property)
+    if (qsParam) return qsParam
+    return initialAppConfig.appParams?.[property]
   },
 })
 
@@ -75,7 +81,9 @@ export const appQueryParamsArray = new Proxy({} as AppQsParamsArrayTransformed,
     if (typeof property !== 'string') {
       return null
     }
-    return qsParams.getAll(property)
+    const qsParam = qsParams.getAll(property)
+    if (qsParam.length) return qsParam
+    return initialAppConfig.appParams?.[property] ?? []
   },
 })
 
diff --git a/src/browserfs.ts b/src/browserfs.ts
index 76733e64..d38b13a2 100644
--- a/src/browserfs.ts
+++ b/src/browserfs.ts
@@ -13,6 +13,7 @@ import { setLoadingScreenStatus } from './appStatus'
 import { VALID_REPLAY_EXTENSIONS, openFile } from './packetsReplay/replayPackets'
 import { getFixedFilesize } from './downloadAndOpenFile'
 import { packetsReplayState } from './react/state/packetsReplayState'
+import { createFullScreenProgressReporter } from './core/progressReporter'
 const { GoogleDriveFileSystem } = require('google-drive-browserfs/src/backends/GoogleDrive')
 
 browserfs.install(window)
@@ -635,7 +636,7 @@ export const openFilePicker = (specificCase?: 'resourcepack') => {
           const doContinue = confirm(`Are you sure ${file.name.slice(-20)} is .zip file? ONLY .zip files are supported. Continue?`)
           if (!doContinue) return
         }
-        void installResourcepackPack(file).catch((err) => {
+        void installResourcepackPack(file, createFullScreenProgressReporter()).catch((err) => {
           setLoadingScreenStatus(err.message, true)
         })
       } else {
diff --git a/src/controls.ts b/src/controls.ts
index be5028aa..a3a54ffb 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -20,10 +20,11 @@ import { showOptionsModal } from './react/SelectOption'
 import widgets from './react/widgets'
 import { getItemFromBlock } from './chatUtils'
 import { gamepadUiCursorState, moveGamepadCursorByPx } from './react/GamepadUiCursor'
-import { completeTexturePackInstall, copyServerResourcePackToRegular, resourcePackState } from './resourcePack'
+import { completeResourcepackPackInstall, copyServerResourcePackToRegular, resourcePackState } from './resourcePack'
 import { showNotification } from './react/NotificationProvider'
 import { lastConnectOptions } from './react/AppStatusProvider'
 import { onCameraMove, onControInit } from './cameraRotationControls'
+import { createNotificationProgressReporter } from './core/progressReporter'
 
 
 export const customKeymaps = proxy(JSON.parse(localStorage.keymap || '{}')) as UserOverridesConfig
@@ -627,7 +628,7 @@ export const f3Keybinds: Array<{
       // TODO!
       if (resourcePackState.resourcePackInstalled || gameAdditionalState.usingServerResourcePack) {
         showNotification('Reloading textures...')
-        await completeTexturePackInstall('default', 'default', gameAdditionalState.usingServerResourcePack)
+        await completeResourcepackPackInstall('default', 'default', gameAdditionalState.usingServerResourcePack, createNotificationProgressReporter())
       }
     },
     mobileTitle: 'Reload Textures'
@@ -668,8 +669,8 @@ export const f3Keybinds: Array<{
       const proxyPing = await bot['pingProxy']()
       void showOptionsModal(`${username}: last known total latency (ping): ${playerPing}. Connected to ${lastConnectOptions.value?.proxy} with current ping ${proxyPing}. Player UUID: ${uuid}`, [])
     },
-    mobileTitle: 'Show Proxy & Ping Details',
-    enabled: () => !!lastConnectOptions.value?.proxy
+    mobileTitle: 'Show Player & Ping Details',
+    enabled: () => !lastConnectOptions.value?.singleplayer && !!bot.player
   },
   {
     action () {
diff --git a/src/downloadAndOpenFile.ts b/src/downloadAndOpenFile.ts
index 2cbb3aad..870a70b1 100644
--- a/src/downloadAndOpenFile.ts
+++ b/src/downloadAndOpenFile.ts
@@ -4,6 +4,7 @@ import { getResourcePackNames, installResourcepackPack, resourcePackState, updat
 import { setLoadingScreenStatus } from './appStatus'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 import { VALID_REPLAY_EXTENSIONS, openFile } from './packetsReplay/replayPackets'
+import { createFullScreenProgressReporter } from './core/progressReporter'
 
 export const getFixedFilesize = (bytes: number) => {
   return prettyBytes(bytes, { minimumFractionDigits: 2, maximumFractionDigits: 2 })
@@ -92,7 +93,7 @@ const inner = async () => {
   })).arrayBuffer()
   if (texturepack) {
     const name = mapUrl.slice(mapUrl.lastIndexOf('/') + 1).slice(-30)
-    await installResourcepackPack(buffer, name)
+    await installResourcepackPack(buffer, createFullScreenProgressReporter(), name)
   } else {
     await openWorldZip(buffer)
   }
diff --git a/src/globalState.ts b/src/globalState.ts
index 412dd31b..66959198 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -4,6 +4,7 @@ import { proxy, ref, subscribe } from 'valtio'
 import type { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
 import type { OptionsGroupType } from './optionsGuiScheme'
 import { appQueryParams } from './appParams'
+import { options, disabledSettings } from './optionsStorage'
 
 // todo: refactor structure with support of hideNext=false
 
@@ -120,7 +121,11 @@ export type AppConfig = {
   promoteServers?: Array<{ ip, description, version? }>
   mapsProvider?: string
 
+  appParams?: Record<string, any> // query string params
+
   defaultSettings?: Record<string, any>
+  forceSettings?: Record<string, boolean>
+  // hideSettings?: Record<string, boolean>
   allowAutoConnect?: boolean
 }
 
@@ -145,6 +150,24 @@ export const miscUiState = proxy({
   displayFullmap: false
 })
 
+export const loadAppConfig = (appConfig: AppConfig) => {
+  if (miscUiState.appConfig) {
+    Object.assign(miscUiState.appConfig, appConfig)
+  } else {
+    miscUiState.appConfig = appConfig
+  }
+
+  if (appConfig.forceSettings) {
+    for (const [key, value] of Object.entries(appConfig.forceSettings)) {
+      if (value) {
+        disabledSettings.value.delete(key)
+      } else {
+        disabledSettings.value.add(key)
+      }
+    }
+  }
+}
+
 export const isGameActive = (foregroundCheck: boolean) => {
   if (foregroundCheck && activeModalStack.length) return false
   return miscUiState.gameLoaded
diff --git a/src/index.ts b/src/index.ts
index 6c46d0e9..1fb318b8 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -57,7 +57,8 @@ import {
   isGameActive,
   miscUiState,
   showModal,
-  gameAdditionalState
+  gameAdditionalState,
+  loadAppConfig
 } from './globalState'
 
 import { parseServerAddress } from './parseServerAddress'
@@ -114,6 +115,7 @@ import ping from './mineflayer/plugins/ping'
 import { LocalServer } from './customServer'
 import { startLocalReplayServer } from './packetsReplay/replayPackets'
 import { localRelayServerPlugin } from './mineflayer/plugins/localRelay'
+import { createFullScreenProgressReporter } from './core/progressReporter'
 
 window.debug = debug
 window.THREE = THREE
@@ -318,8 +320,9 @@ export async function connect (connectOptions: ConnectOptions) {
   console.log('using player username', username)
 
   hideCurrentScreens()
+  const progress = createFullScreenProgressReporter()
   const loggingInMsg = connectOptions.server ? 'Connecting to server' : 'Logging in'
-  setLoadingScreenStatus(loggingInMsg)
+  progress.beginStage('connect', loggingInMsg)
 
   let ended = false
   let bot!: typeof __type_bot
@@ -405,38 +408,43 @@ export async function connect (connectOptions: ConnectOptions) {
   try {
     const serverOptions = defaultsDeep({}, connectOptions.serverOverrides ?? {}, options.localServerOptions, defaultServerOptions)
     Object.assign(serverOptions, connectOptions.serverOverridesFlat ?? {})
-    setLoadingScreenStatus('Downloading minecraft data')
-    await Promise.all([
-      downloadAllMinecraftData(), // download mc data before we can use minecraft-data at all
-      downloadOtherGameData()
-    ])
-    setLoadingScreenStatus(loggingInMsg)
+
+    await progress.executeWithMessage('Downloading minecraft data', 'download-mcdata', async () => {
+      await Promise.all([
+        downloadAllMinecraftData(),
+        downloadOtherGameData()
+      ])
+    })
+
     let dataDownloaded = false
     const downloadMcData = async (version: string) => {
       if (dataDownloaded) return
       dataDownloaded = true
-      // if (connectOptions.authenticatedAccount && (versionToNumber(version) < versionToNumber('1.19.4') || versionToNumber(version) >= versionToNumber('1.21'))) {
-      //   // todo support it (just need to fix .export crash)
-      //   throw new UserError('Microsoft authentication is only supported on 1.19.4 - 1.20.6 (at least for now)')
-      // }
 
-      await downloadMcDataOnConnect(version)
-      try {
-        // TODO! reload only after login packet (delay viewer display) so no unecessary reload after server one is isntalled
-        await resourcepackReload(version)
-      } catch (err) {
-        console.error(err)
-        const doContinue = confirm('Failed to apply texture pack. See errors in the console. Continue?')
-        if (!doContinue) {
-          throw err
+      await progress.executeWithMessage(
+        'Applying user-installed resource pack',
+        async () => {
+          await downloadMcDataOnConnect(version)
+          try {
+            await resourcepackReload(version)
+          } catch (err) {
+            console.error(err)
+            const doContinue = confirm('Failed to apply texture pack. See errors in the console. Continue?')
+            if (!doContinue) {
+              throw err
+            }
+          }
         }
-      }
-      const oldStatus = appStatusState.status
-      setLoadingScreenStatus('Loading minecraft assets')
-      viewer.world.blockstatesModels = await import('mc-assets/dist/blockStatesModels.json')
-      void viewer.setVersion(version, options.useVersionsTextures === 'latest' ? version : options.useVersionsTextures)
-      miscUiState.loadedDataVersion = version
-      setLoadingScreenStatus(oldStatus)
+      )
+
+      await progress.executeWithMessage(
+        'Loading minecraft models',
+        async () => {
+          viewer.world.blockstatesModels = await import('mc-assets/dist/blockStatesModels.json')
+          void viewer.setVersion(version, options.useVersionsTextures === 'latest' ? version : options.useVersionsTextures)
+          miscUiState.loadedDataVersion = version
+        }
+      )
     }
 
     let finalVersion = connectOptions.botVersion || (singleplayer ? serverOptions.version : undefined)
@@ -463,21 +471,24 @@ export async function connect (connectOptions: ConnectOptions) {
       // Client (class) of flying-squid (in server/login.js of mc-protocol): onLogin handler: skip most logic & go to loginClient() which assigns uuid and sends 'success' back to client (onLogin handler) and emits 'login' on the server (login.js in flying-squid handler)
       // flying-squid: 'login' -> player.login -> now sends 'login' event to the client (handled in many plugins in mineflayer) -> then 'update_health' is sent which emits 'spawn' in mineflayer
 
-      setLoadingScreenStatus('Starting local server')
       localServer = window.localServer = window.server = startLocalServer(serverOptions)
       // todo need just to call quit if started
       // loadingScreen.maybeRecoverable = false
       // init world, todo: do it for any async plugins
       if (!localServer.pluginsReady) {
-        await new Promise(resolve => {
-          localServer.once('pluginsReady', resolve)
-        })
+        await progress.executeWithMessage(
+          'Starting local server',
+          async () => {
+            await new Promise(resolve => {
+              localServer.once('pluginsReady', resolve)
+            })
+          }
+        )
       }
 
       localServer.on('newPlayer', (player) => {
-        // it's you!
         player.on('loadingStatus', (newStatus) => {
-          setLoadingScreenStatus(newStatus, false, false, true)
+          progress.beginStage('flying-squid', newStatus)
         })
       })
       flyingSquidEvents()
@@ -754,6 +765,17 @@ export async function connect (connectOptions: ConnectOptions) {
     window.pathfinder = pathfinder
   })
 
+  const start = Date.now()
+  let worldWasReady = false
+  void viewer.world.renderUpdateEmitter.on('update', () => {
+    // todo might not emit as servers simply don't send chunk if it's empty
+    if (!viewer.world.allChunksFinished || worldWasReady) return
+    worldWasReady = true
+    console.log('All chunks done and ready! Time from renderer open to ready', (Date.now() - start) / 1000, 's')
+    viewer.render() // ensure the last state is rendered
+    document.dispatchEvent(new Event('cypress-world-ready'))
+  })
+
   const spawnEarlier = !singleplayer && !p2pMultiplayer
   // don't use spawn event, player can be dead
   bot.once(spawnEarlier ? 'forcedMove' : 'health', async () => {
@@ -769,11 +791,7 @@ export async function connect (connectOptions: ConnectOptions) {
     window.focus?.()
     errorAbortController.abort()
 
-    miscUiState.gameLoaded = true
-    miscUiState.loadedServerIndex = connectOptions.serverIndex ?? ''
-    customEvents.emit('gameLoaded')
     if (p2pConnectTimeout) clearTimeout(p2pConnectTimeout)
-
     playerState.onlineMode = !!connectOptions.authenticatedAccount
 
     setLoadingScreenStatus('Placing blocks (starting viewer)')
@@ -827,6 +845,36 @@ export async function connect (connectOptions: ConnectOptions) {
     onGameLoad(() => {})
 
     if (appStatusState.isError) return
+
+    const waitForChunks = async () => {
+      const waitForChunks = options.waitForChunksRender === 'sp-only' ? !!singleplayer : options.waitForChunksRender
+      if (viewer.world.allChunksFinished || !waitForChunks) {
+        return
+      }
+
+      await progress.executeWithMessage(
+        'Loading chunks',
+        'chunks',
+        async () => {
+          await new Promise<void>(resolve => {
+            let wasFinished = false
+            void viewer.world.renderUpdateEmitter.on('update', () => {
+              if (wasFinished) return
+              if (viewer.world.allChunksFinished) {
+                wasFinished = true
+                resolve()
+              } else {
+                const perc = Math.round(Object.keys(viewer.world.finishedChunks).length / viewer.world.chunksLength * 100)
+                progress.reportProgress('chunks', perc / 100)
+              }
+            })
+          })
+        }
+      )
+    }
+
+    await waitForChunks()
+
     setTimeout(() => {
       if (appQueryParams.suggest_save) {
         showNotification('Suggestion', 'Save the world to keep your progress!', false, undefined, async () => {
@@ -840,17 +888,11 @@ export async function connect (connectOptions: ConnectOptions) {
       }
     }, 600)
 
+    miscUiState.gameLoaded = true
+    miscUiState.loadedServerIndex = connectOptions.serverIndex ?? ''
+    customEvents.emit('gameLoaded')
     setLoadingScreenStatus(undefined)
-    const start = Date.now()
-    let done = false
-    void viewer.world.renderUpdateEmitter.on('update', () => {
-      // todo might not emit as servers simply don't send chunk if it's empty
-      if (!viewer.world.allChunksFinished || done) return
-      done = true
-      console.log('All chunks done and ready! Time from renderer open to ready', (Date.now() - start) / 1000, 's')
-      viewer.render() // ensure the last state is rendered
-      document.dispatchEvent(new Event('cypress-world-ready'))
-    })
+    progress.end()
   })
 
   if (singleplayer && connectOptions.serverOverrides.worldFolder) {
@@ -934,11 +976,13 @@ document.body.addEventListener('touchstart', (e) => {
 }, { passive: false })
 // #endregion
 
+loadAppConfig(process.env.INLINED_APP_CONFIG as AppConfig ?? {})
+// load maybe updated config on the server with updated params (just in case)
 void window.fetch('config.json').then(async res => res.json()).then(c => c, (error) => {
   console.warn('Failed to load optional app config.json', error)
   return {}
 }).then((config: AppConfig | {}) => {
-  miscUiState.appConfig = config
+  loadAppConfig(config)
 })
 
 // qs open actions
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 8b994507..cb2d9be8 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -10,7 +10,7 @@ import Slider from './react/Slider'
 import { getScreenRefreshRate } from './utils'
 import { setLoadingScreenStatus } from './appStatus'
 import { openFilePicker, resetLocalStorageWithoutWorld } from './browserfs'
-import { completeTexturePackInstall, getResourcePackNames, resourcePackState, uninstallResourcePack } from './resourcePack'
+import { completeResourcepackPackInstall, getResourcePackNames, resourcePackState, uninstallResourcePack } from './resourcePack'
 import { downloadPacketsReplay, packetsReplaceSessionState } from './packetsReplay/packetsReplayLegacy'
 import { showOptionsModal } from './react/SelectOption'
 import supportedVersions from './supportedVersions.mjs'
@@ -181,7 +181,7 @@ export const guiOptionsScheme: {
               }
               if (choice === 'Enable') {
                 options.enabledResourcepack = name
-                await completeTexturePackInstall(name, name, false)
+                await completeResourcepackPackInstall(name, name, false)
                 return
               }
               if (choice === 'Uninstall') {
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index b82d6bfb..6dc1608b 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -5,8 +5,10 @@ import { proxy, subscribe } from 'valtio/vanilla'
 import { subscribeKey } from 'valtio/utils'
 import { omitObj } from '@zardoy/utils'
 import { appQueryParamsArray } from './appParams'
+import type { AppConfig } from './globalState'
 
 const isDev = process.env.NODE_ENV === 'development'
+const initialAppConfig = process.env.INLINED_APP_CONFIG as AppConfig ?? {}
 const defaultOptions = {
   renderDistance: 3,
   keepChunksDistance: 1,
@@ -58,6 +60,8 @@ const defaultOptions = {
   serversAutoVersionSelect: 'auto' as 'auto' | 'latest' | '1.20.4' | string,
   customChannels: false,
   packetsReplayAutoStart: false,
+  // todo ui setting, maybe enable by default?
+  waitForChunksRender: 'sp-only' as 'sp-only' | boolean,
 
   // antiAliasing: false,
 
@@ -133,6 +137,11 @@ export const qsOptions = Object.fromEntries(qsOptionsRaw.map(o => {
   return [key, JSON.parse(value)]
 }))
 
+// Track which settings are disabled (controlled by QS or forced by config)
+export const disabledSettings = proxy({
+  value: new Set<string>(Object.keys(qsOptions))
+})
+
 const migrateOptions = (options: Partial<AppOptions & Record<string, any>>) => {
   if (options.highPerformanceGpu) {
     options.gpuPreference = 'high-performance'
@@ -155,6 +164,7 @@ export type AppOptions = typeof defaultOptions
 
 export const options: AppOptions = proxy({
   ...defaultOptions,
+  ...initialAppConfig.defaultSettings,
   ...migrateOptions(JSON.parse(localStorage.options || '{}')),
   ...qsOptions
 })
@@ -172,7 +182,8 @@ Object.defineProperty(window, 'debugChangedOptions', {
 })
 
 subscribe(options, () => {
-  const saveOptions = omitObj(options, ...Object.keys(qsOptions) as [any])
+  // Don't save disabled settings to localStorage
+  const saveOptions = omitObj(options, [...disabledSettings.value] as any)
   localStorage.options = JSON.stringify(saveOptions)
 })
 
diff --git a/src/react/OptionsItems.tsx b/src/react/OptionsItems.tsx
index 9879aeb4..4759b3d7 100644
--- a/src/react/OptionsItems.tsx
+++ b/src/react/OptionsItems.tsx
@@ -2,7 +2,7 @@ import { useSnapshot } from 'valtio'
 import { noCase } from 'change-case'
 import { titleCase } from 'title-case'
 import { useMemo } from 'react'
-import { options, qsOptions } from '../optionsStorage'
+import { disabledSettings, options, qsOptions } from '../optionsStorage'
 import { hideAllModals, miscUiState } from '../globalState'
 import Button from './Button'
 import Slider from './Slider'
@@ -39,7 +39,7 @@ export type OptionMeta<T = any> = GeneralItem<T & string> & ({
 
 // todo not reactive
 const isLocked = (item: GeneralItem<any>) => {
-  return Object.keys(qsOptions).includes(item.id!)
+  return disabledSettings.value.has(item.id!)
 }
 
 const useCommonComponentsProps = (item: OptionMeta) => {
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index fdb36d45..aef23e8f 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -6,7 +6,6 @@ import { proxy, subscribe } from 'valtio'
 import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
 import { armorTextures } from 'renderer/viewer/lib/entity/armorModels'
 import { collectFilesToCopy, copyFilesAsyncWithProgress, mkdirRecursive, removeFileRecursiveAsync } from './browserfs'
-import { setLoadingScreenStatus } from './appStatus'
 import { showNotification } from './react/NotificationProvider'
 import { options } from './optionsStorage'
 import { showOptionsModal } from './react/SelectOption'
@@ -14,6 +13,7 @@ import { appStatusState } from './react/AppStatusProvider'
 import { appReplacableResources, resourcesContentOriginal } from './generated/resources'
 import { gameAdditionalState, miscUiState } from './globalState'
 import { watchUnloadForCleanup } from './gameUnload'
+import { createConsoleLogProgressReporter, createFullScreenProgressReporter, ProgressReporter } from './core/progressReporter'
 
 export const resourcePackState = proxy({
   resourcePackInstalled: false,
@@ -31,13 +31,13 @@ const getLoadedImage = async (url: string) => {
   return img
 }
 
-const texturePackBasePath = '/data/resourcePacks/'
+const resourcepackPackBasePath = '/data/resourcePacks/'
 export const uninstallResourcePack = async (name = 'default') => {
   if (await existsAsync('/resourcepack/pack.mcmeta')) {
     await removeFileRecursiveAsync('/resourcepack')
     gameAdditionalState.usingServerResourcePack = false
   }
-  const basePath = texturePackBasePath + name
+  const basePath = resourcepackPackBasePath + name
   if (!(await existsAsync(basePath))) return
   await removeFileRecursiveAsync(basePath)
   options.enabledResourcepack = null
@@ -47,7 +47,7 @@ export const uninstallResourcePack = async (name = 'default') => {
 export const getResourcePackNames = async () => {
   // TODO
   try {
-    return { [await fs.promises.readFile(join(texturePackBasePath, 'default', 'name.txt'), 'utf8')]: true }
+    return { [await fs.promises.readFile(join(resourcepackPackBasePath, 'default', 'name.txt'), 'utf8')]: true }
   } catch (err) {
     return {}
   }
@@ -59,7 +59,7 @@ export const fromTexturePackPath = (path) => {
 
 export const updateTexturePackInstalledState = async () => {
   try {
-    resourcePackState.resourcePackInstalled = await existsAsync(texturePackBasePath + 'default')
+    resourcePackState.resourcePackInstalled = await existsAsync(resourcepackPackBasePath + 'default')
   } catch {
   }
 }
@@ -70,19 +70,18 @@ export const installTexturePackFromHandle = async () => {
   // await completeTexturePackInstall()
 }
 
-export const installResourcepackPack = async (file: File | ArrayBuffer, displayName = file['name'], name = 'default', isServer = false) => {
+export const installResourcepackPack = async (file: File | ArrayBuffer, progressReporter: ProgressReporter, displayName = file['name'], name = 'default', isServer = false) => {
   console.time('processResourcePack')
-  const installPath = isServer ? '/resourcepack/' : texturePackBasePath + name
+  const installPath = isServer ? '/resourcepack/' : resourcepackPackBasePath + name
   try {
-    await uninstallResourcePack(name)
+    await progressReporter.executeWithMessage('Uninstalling resource pack', async () => {
+      await uninstallResourcePack(name)
+    })
   } catch (err) {
   }
-  const showLoader = !isServer
   const status = 'Installing resource pack: copying all files'
+  progressReporter.beginStage('copy-files-resourcepack', status)
 
-  if (showLoader) {
-    setLoadingScreenStatus(status)
-  }
   // extract the zip and write to fs every file in it
   const zip = new JSZip()
   const zipFile = await zip.loadAsync(file)
@@ -93,9 +92,7 @@ export const installResourcepackPack = async (file: File | ArrayBuffer, displayN
     .filter(([path]) => !path.startsWith('.') && !path.startsWith('_') && !path.startsWith('/')) // ignore dot files and __MACOSX
   let done = 0
   const upStatus = () => {
-    if (showLoader) {
-      setLoadingScreenStatus(`${status} ${Math.round(done / allFilesArr.length * 100)}%`)
-    }
+    progressReporter.reportProgress('copy-files-resourcepack', done / allFilesArr.length)
   }
   const createdDirs = new Set<string>()
   const copyTasks = [] as Array<Promise<void>>
@@ -119,25 +116,24 @@ export const installResourcepackPack = async (file: File | ArrayBuffer, displayN
     upStatus()
   }))
   console.timeEnd('resourcePackCopy')
-  await completeTexturePackInstall(displayName, name, isServer)
+  await completeResourcepackPackInstall(displayName, name, isServer, progressReporter)
   console.log('resource pack install done')
   console.timeEnd('processResourcePack')
 }
 
 // or enablement
-export const completeTexturePackInstall = async (displayName: string | undefined, name: string, isServer: boolean) => {
-  const basePath = isServer ? '/resourcepack/' : texturePackBasePath + name
+export const completeResourcepackPackInstall = async (displayName: string | undefined, name: string, isServer: boolean, progressReporter: ProgressReporter) => {
+  const basePath = isServer ? '/resourcepack/' : resourcepackPackBasePath + name
   if (displayName) {
     await fs.promises.writeFile(join(basePath, 'name.txt'), displayName, 'utf8')
   }
 
-  await updateTextures()
-  setLoadingScreenStatus(undefined)
+  await updateTextures(progressReporter)
   if (currentErrors.length > 0) {
-    showNotification(`Texturepack installed & enabled with ${currentErrors.length} errors`)
-    console.error('Texturepack installed & enabled with errors:', currentErrors)
+    showNotification(`Resource pack installed & enabled with ${currentErrors.length} errors`)
+    console.error('Resource pack installed & enabled with errors:', currentErrors)
   } else {
-    showNotification('Texturepack installed & enabled')
+    showNotification('Resource pack installed & enabled')
   }
   await updateTexturePackInstalledState()
   if (isServer) {
@@ -145,6 +141,8 @@ export const completeTexturePackInstall = async (displayName: string | undefined
   } else {
     options.enabledResourcepack = name
   }
+
+  progressReporter.end()
 }
 
 const existsAsync = async (path) => {
@@ -211,14 +209,13 @@ const getFilesMapFromDir = async (dir: string) => {
 
 let currentErrors = [] as string[]
 
-export const getResourcepackTiles = async (type: 'blocks' | 'items' | 'armor', existingTextures: string[]) => {
+export const getResourcepackTiles = async (type: 'blocks' | 'items' | 'armor', existingTextures: string[], progressReporter: ProgressReporter) => {
   const basePath = await getActiveResourcepackBasePath()
   if (!basePath) return
   let firstTextureSize: number | undefined
   const namespaces = await fs.promises.readdir(join(basePath, 'assets'))
-  if (appStatusState.status) {
-    setLoadingScreenStatus(`Generating atlas texture for ${type}`)
-  }
+  progressReporter.beginStage(`generate-atlas-texture-${type}`, `Generating atlas texture for ${type}`)
+
   const textures = {} as Record<string, HTMLImageElement>
   let path
   switch (type) {
@@ -314,15 +311,13 @@ export const getResourcepackTiles = async (type: 'blocks' | 'items' | 'armor', e
   }
 }
 
-const prepareBlockstatesAndModels = async () => {
+const prepareBlockstatesAndModels = async (progressReporter: ProgressReporter) => {
   viewer.world.customBlockStates = {}
   viewer.world.customModels = {}
   const usedTextures = new Set<string>()
   const basePath = await getActiveResourcepackBasePath()
   if (!basePath) return
-  if (appStatusState.status) {
-    setLoadingScreenStatus('Reading resource pack blockstates and models')
-  }
+  progressReporter.beginStage('read-resource-pack-blockstates-and-models', 'Reading resource pack blockstates and models')
 
   const readModelData = async (path: string, type: 'models' | 'blockstates', namespaceDir: string) => {
     if (!(await existsAsync(path))) return
@@ -377,11 +372,12 @@ const prepareBlockstatesAndModels = async () => {
   return { usedTextures }
 }
 
-const downloadAndUseResourcePack = async (url: string): Promise<void> => {
+const downloadAndUseResourcePack = async (url: string, progressReporter: ProgressReporter): Promise<void> => {
+  progressReporter.beginStage('install-resource-pack', 'Installing server resource pack')
   try {
     resourcePackState.isServerInstalling = true
     resourcePackState.isServerDownloading = true
-    if (!miscUiState.gameLoaded) setLoadingScreenStatus('Downloading resource pack')
+    progressReporter.beginStage('download-resource-pack', 'Downloading server resource pack')
     console.log('Downloading server resource pack', url)
     console.time('downloadServerResourcePack')
     const response = await fetch(url).catch((err) => {
@@ -391,7 +387,6 @@ const downloadAndUseResourcePack = async (url: string): Promise<void> => {
     })
     console.timeEnd('downloadServerResourcePack')
     if (!response) return
-    if (!miscUiState.gameLoaded) setLoadingScreenStatus('Installing resource pack')
 
     const contentLength = response.headers.get('Content-Length')
     const total = contentLength ? parseInt(contentLength, 10) : 0
@@ -410,18 +405,19 @@ const downloadAndUseResourcePack = async (url: string): Promise<void> => {
 
       if (total) {
         const progress = Math.round((loaded / total) * 100)
-        if (!miscUiState.gameLoaded) setLoadingScreenStatus(`Downloading resource pack: ${progress}%`)
+        progressReporter.reportProgress('download-resource-pack', progress / 100)
       }
     }
 
     resourcePackState.isServerDownloading = false
     const resourcePackData = await new Blob(chunks).arrayBuffer()
-    showNotification('Installing resource pack...')
-    await installResourcepackPack(resourcePackData, undefined, undefined, true).catch((err) => {
+    progressReporter.endStage('install-resource-pack')
+    await installResourcepackPack(resourcePackData, progressReporter, undefined, undefined, true).catch((err) => {
       console.error(err)
       showNotification('Failed to install resource pack: ' + err.message)
     })
   } finally {
+    progressReporter.endStage('download-resource-pack')
     resourcePackState.isServerInstalling = false
     resourcePackState.isServerDownloading = false
   }
@@ -465,7 +461,7 @@ export const onAppLoad = () => {
       console.log('accepting resource pack')
       bot.acceptResourcePack()
       if (choice === true || choice === 'Download & Install (recommended)') {
-        await downloadAndUseResourcePack(packet.url).catch((err) => {
+        await downloadAndUseResourcePack(packet.url, createFullScreenProgressReporter()).catch((err) => {
           console.error(err)
           showNotification('Failed to download resource pack: ' + err.message)
         })
@@ -516,15 +512,15 @@ const updateAllReplacableTextures = async () => {
 
 const repeatArr = (arr, i) => Array.from({ length: i }, () => arr)
 
-const updateTextures = async () => {
+const updateTextures = async (progressReporter = createConsoleLogProgressReporter()) => {
   currentErrors = []
   const origBlocksFiles = Object.keys(viewer.world.sourceData.blocksAtlases.latest.textures)
   const origItemsFiles = Object.keys(viewer.world.sourceData.itemsAtlases.latest.textures)
   const origArmorFiles = Object.keys(armorTextures)
-  const { usedTextures: extraBlockTextures = new Set<string>() } = await prepareBlockstatesAndModels() ?? {}
-  const blocksData = await getResourcepackTiles('blocks', [...origBlocksFiles, ...extraBlockTextures])
-  const itemsData = await getResourcepackTiles('items', origItemsFiles)
-  const armorData = await getResourcepackTiles('armor', origArmorFiles)
+  const { usedTextures: extraBlockTextures = new Set<string>() } = await prepareBlockstatesAndModels(progressReporter) ?? {}
+  const blocksData = await getResourcepackTiles('blocks', [...origBlocksFiles, ...extraBlockTextures], progressReporter)
+  const itemsData = await getResourcepackTiles('items', origItemsFiles, progressReporter)
+  const armorData = await getResourcepackTiles('armor', origArmorFiles, progressReporter)
   await updateAllReplacableTextures()
   viewer.world.customTextures = {}
   if (blocksData) {
@@ -573,13 +569,16 @@ export const copyServerResourcePackToRegular = async (name = 'default') => {
   }
 
   // Copy all files from server resource pack to regular location
-  const destPath = texturePackBasePath + name
+  const destPath = resourcepackPackBasePath + name
   await mkdirRecursive(destPath)
 
-  setLoadingScreenStatus('Copying server resource pack to regular location')
-  await copyFilesAsyncWithProgress('/resourcepack', destPath, true, ' (server -> regular)')
+  const reporter = createFullScreenProgressReporter()
+  reporter.setMessage('Copying server resource pack to user location')
+  await copyFilesAsyncWithProgress('/resourcepack', destPath, true, ' (server -> user)')
 
   // Complete the installation
-  await completeTexturePackInstall(displayName, name, false)
-  showNotification('Server resource pack copied to regular location')
+  await completeResourcepackPackInstall(displayName, name, false, reporter)
+  showNotification('Server resource pack copied to user location')
+
+  reporter.end()
 }
diff --git a/src/supportedVersions.mjs b/src/supportedVersions.mjs
index 39fd38d1..87dd5ea1 100644
--- a/src/supportedVersions.mjs
+++ b/src/supportedVersions.mjs
@@ -5,4 +5,6 @@ export const ignoredVersionsRegex = /(^0\.30c$)|w|-pre|-rc/
 /** @type {string[]} */
 const versionsFromProtocol = Object.values(postNettyVersionsByProtocolVersion.pc).flat().filter(x => !ignoredVersionsRegex.test(x.minecraftVersion)).map(x => x.minecraftVersion)
 
+export const notTestedVersions = '1.19.3 1.20 1.19.1 1.19 1.18.1 1.15.1 1.14.1'.split(' ')
+
 export default versionsFromProtocol.filter(x => x !== '1.7' && !x.startsWith('1.7.'))

From e8d980b790e5c56bbd79faea8ea24476af0f7eb2 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Feb 2025 03:31:02 +0300
Subject: [PATCH 282/753] add brand new progress reporter

---
 src/core/progressReporter.ts | 195 +++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100644 src/core/progressReporter.ts

diff --git a/src/core/progressReporter.ts b/src/core/progressReporter.ts
new file mode 100644
index 00000000..db1958da
--- /dev/null
+++ b/src/core/progressReporter.ts
@@ -0,0 +1,195 @@
+import { setLoadingScreenStatus } from '../appStatus'
+import { appStatusState } from '../react/AppStatusProvider'
+import { hideNotification, showNotification } from '../react/NotificationProvider'
+
+export interface ProgressReporter {
+  currentMessage: string | undefined
+  beginStage (stage: string, title: string): void
+  endStage (stage: string): void
+  setSubStage (stage: string, subStageTitle: string): void
+  reportProgress (stage: string, progress: number): void
+  executeWithMessage<T>(message: string, fn: () => Promise<T>): Promise<T>
+  executeWithMessage<T>(message: string, stage: string, fn: () => Promise<T>): Promise<T>
+
+  setMessage (message: string): void
+
+  end (): void
+}
+
+interface ReporterDisplayImplementation {
+  setMessage (message: string): void
+  end (): void
+}
+
+interface StageInfo {
+  title: string
+  subStage?: string
+  progress?: number
+}
+
+const NO_STAGES_ACTION_END = false
+
+const createProgressReporter = (implementation: ReporterDisplayImplementation): ProgressReporter => {
+  const stages = new Map<string, StageInfo>()
+  let currentMessage: string | undefined
+  let ended = false
+
+  const end = () => {
+    if (ended) return
+    ended = true
+    stages.clear()
+    implementation.end()
+  }
+
+  const updateStatus = () => {
+    if (ended) return
+    const activeStages = [...stages.entries()]
+    if (activeStages.length === 0) {
+      if (NO_STAGES_ACTION_END) {
+        end()
+      } else {
+        implementation.setMessage('Waiting for tasks')
+      }
+      return
+    }
+
+    const [currentStage, info] = activeStages.at(-1)!
+    let message = info.title
+    if (info.subStage) {
+      message += ` - ${info.subStage}`
+    }
+    if (info.progress !== undefined) {
+      const num = Math.round(info.progress * 100)
+      if (isFinite(num)) {
+        message += `: ${num}%`
+      }
+    }
+
+    currentMessage = message
+    implementation.setMessage(message)
+  }
+
+  const reporter = {
+    beginStage (stage: string, title: string) {
+      if (stages.has(stage)) {
+        throw new Error(`Stage ${stage} already is running`)
+      }
+      stages.set(stage, { title })
+      updateStatus()
+    },
+
+    endStage (stage: string) {
+      stages.delete(stage)
+      updateStatus()
+    },
+
+    setSubStage (stage: string, subStageTitle: string) {
+      const info = stages.get(stage)
+      if (info) {
+        info.subStage = subStageTitle
+        updateStatus()
+      }
+    },
+
+    reportProgress (stage: string, progress: number) {
+      const info = stages.get(stage)
+      if (info) {
+        info.progress = progress
+        updateStatus()
+      }
+    },
+
+    async executeWithMessage<T>(...args: any[]): Promise<T> {
+      const message = args[0]
+      const stage = typeof args[1] === 'string' ? args[1] : undefined
+      const fn = typeof args[1] === 'string' ? args[2] : args[1]
+
+      const tempStage = stage ?? 'temp-' + Math.random().toString(36).slice(2)
+      reporter.beginStage(tempStage, message)
+      try {
+        const result = await fn()
+        return result
+      } finally {
+        reporter.endStage(tempStage)
+      }
+    },
+
+    end (): void {
+      end()
+    },
+
+    setMessage (message: string): void {
+      implementation.setMessage(message)
+    },
+
+    get currentMessage () {
+      return currentMessage
+    }
+  }
+
+  return reporter
+}
+
+const fullScreenReporters = [] as ProgressReporter[]
+export const createFullScreenProgressReporter = (): ProgressReporter => {
+  const reporter = createProgressReporter({
+    setMessage (message: string) {
+      if (appStatusState.isError) return
+      setLoadingScreenStatus(message)
+    },
+    end () {
+      fullScreenReporters.splice(fullScreenReporters.indexOf(reporter), 1)
+      if (fullScreenReporters.length === 0) {
+        setLoadingScreenStatus(undefined)
+      } else {
+        setLoadingScreenStatus(fullScreenReporters.at(-1)!.currentMessage)
+      }
+    }
+  })
+  fullScreenReporters.push(reporter)
+  return reporter
+}
+
+export const createNotificationProgressReporter = (endMessage?: string): ProgressReporter => {
+  return createProgressReporter({
+    setMessage (message: string) {
+      showNotification(`${message}...`, '', false, '', undefined, true)
+    },
+    end () {
+      if (endMessage) {
+        showNotification(endMessage, '', false, '', undefined, true)
+      } else {
+        hideNotification()
+      }
+    }
+  })
+}
+
+export const createConsoleLogProgressReporter = (): ProgressReporter => {
+  return createProgressReporter({
+    setMessage (message: string) {
+      console.log(message)
+    },
+    end () {
+      console.log('done')
+    }
+  })
+}
+
+export const createWrappedProgressReporter = (reporter: ProgressReporter, message?: string) => {
+  const stage = `wrapped-${message}`
+  if (message) {
+    reporter.beginStage(stage, message)
+  }
+
+  return createProgressReporter({
+    setMessage (message: string) {
+      reporter.setMessage(message)
+    },
+    end () {
+      if (message) {
+        reporter.endStage(stage)
+      }
+    }
+  })
+}

From 59cb4422259aa56bb752ca77d83b958d4519be0d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Feb 2025 03:33:49 +0300
Subject: [PATCH 283/753] fix: display notification on user resourecepack
 enable

---
 src/optionsGuiScheme.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index cb2d9be8..6f4d4fea 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -15,6 +15,7 @@ import { downloadPacketsReplay, packetsReplaceSessionState } from './packetsRepl
 import { showOptionsModal } from './react/SelectOption'
 import supportedVersions from './supportedVersions.mjs'
 import { getVersionAutoSelect } from './connect'
+import { createNotificationProgressReporter } from './core/progressReporter'
 
 export const guiOptionsScheme: {
   [t in OptionsGroupType]: Array<{ [K in keyof AppOptions]?: Partial<OptionMeta<AppOptions[K]>> } & { custom? }>
@@ -181,7 +182,7 @@ export const guiOptionsScheme: {
               }
               if (choice === 'Enable') {
                 options.enabledResourcepack = name
-                await completeResourcepackPackInstall(name, name, false)
+                await completeResourcepackPackInstall(name, name, false, createNotificationProgressReporter())
                 return
               }
               if (choice === 'Uninstall') {

From ecf55727bc4d340591378903cc167297ea3d9271 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Feb 2025 03:52:32 +0300
Subject: [PATCH 284/753] stop publishing UI to npm since no one uses it

---
 .github/workflows/ci.yml      | 2 +-
 .github/workflows/publish.yml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bc54da4e..92b7e7f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
       - run: pnpm build-storybook
       - run: pnpm test-unit
       - run: pnpm lint
-      - run: pnpm tsx scripts/buildNpmReact.ts
+      # - run: pnpm tsx scripts/buildNpmReact.ts
       - run: nohup pnpm prod-start &
       - run: nohup pnpm test-mc-server &
       - uses: cypress-io/github-action@v5
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ce7f56b9..eb765648 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -60,7 +60,7 @@ jobs:
         run: pnpm config set '//registry.npmjs.org/:_authToken' "${NODE_AUTH_TOKEN}"
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - run: pnpm tsx scripts/buildNpmReact.ts ${{ steps.release.outputs.tag }}
-        if: steps.release.outputs.tag
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      # - run: pnpm tsx scripts/buildNpmReact.ts ${{ steps.release.outputs.tag }}
+      #   if: steps.release.outputs.tag
+      #   env:
+      #     NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

From deedcda4675f78c1d8e31978512a206696749167 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Feb 2025 03:54:25 +0300
Subject: [PATCH 285/753] correctly merge local config when building

---
 rsbuild.config.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 5fd9316c..4147ce7d 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -34,6 +34,9 @@ if (fs.existsSync('./assets/release.json')) {
 }
 
 const configJson = JSON.parse(fs.readFileSync('./config.json', 'utf8'))
+try {
+    Object.assign(configJson, JSON.parse(fs.readFileSync('./config.local.json', 'utf8')))
+} catch (err) {}
 if (dev) {
     configJson.defaultProxy = ':8080'
 }
@@ -105,12 +108,8 @@ const appConfig = defineConfig({
                     if (fs.existsSync('./assets/release.json')) {
                         fs.copyFileSync('./assets/release.json', './dist/release.json')
                     }
-                    let configLocalJson = {}
-                    try {
-                        configLocalJson = JSON.parse(fs.readFileSync('./config.local.json', 'utf8'))
-                    } catch (err) {}
 
-                    fs.writeFileSync('./dist/config.json', JSON.stringify({ ...configJson, ...configLocalJson }), 'utf8')
+                    fs.writeFileSync('./dist/config.json', JSON.stringify(configJson), 'utf8')
                     if (fs.existsSync('./generated/sounds.js')) {
                         fs.copyFileSync('./generated/sounds.js', './dist/sounds.js')
                     }

From 89fd5dde71292f7a1a83ba17cb828d6f91e5f31c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Feb 2025 04:36:15 +0300
Subject: [PATCH 286/753] add external folder for forks code (ext
 functionality)

---
 src/external/index.ts | 0
 src/index.ts          | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 src/external/index.ts

diff --git a/src/external/index.ts b/src/external/index.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/index.ts b/src/index.ts
index 1fb318b8..01912e94 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -11,6 +11,7 @@ import './mineflayer/maps'
 import './mineflayer/cameraShake'
 import './shims/patchShims'
 import './mineflayer/java-tester/index'
+import './external'
 import { getServerInfo } from './mineflayer/mc-protocol'
 import { onGameLoad, renderSlot } from './inventoryWindows'
 import { RenderItem } from './mineflayer/items'
@@ -488,7 +489,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
       localServer.on('newPlayer', (player) => {
         player.on('loadingStatus', (newStatus) => {
-          progress.beginStage('flying-squid', newStatus)
+          progress.setMessage(newStatus)
         })
       })
       flyingSquidEvents()

From 322e2f9b4496cece3da35356b65ba0a45ff430a1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Feb 2025 22:18:51 +0300
Subject: [PATCH 287/753] fix sounds

---
 scripts/prepareSounds.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/prepareSounds.mjs b/scripts/prepareSounds.mjs
index f80ace4e..7ff614a2 100644
--- a/scripts/prepareSounds.mjs
+++ b/scripts/prepareSounds.mjs
@@ -246,6 +246,7 @@ const writeSoundsMap = async () => {
 const makeSoundsBundle = async () => {
   const allSoundsMap = JSON.parse(fs.readFileSync('./generated/sounds.json', 'utf8'))
   const allSoundsVersionedMap = JSON.parse(fs.readFileSync('./generated/soundsPathVersionsRemap.json', 'utf8'))
+  if (!process.env.REPO_SLUG) throw new Error('REPO_SLUG is not set')
 
   const allSoundsMeta = {
     format: 'mp3',

From 8ff05924dd76cec13b86b237675bd489692886fa Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 26 Feb 2025 20:31:22 +0100
Subject: [PATCH 288/753] feat: add config option for pause screen links (#288)

---
 config.json                 | 10 ++++++++++
 src/globalState.ts          |  1 +
 src/react/DiscordButton.tsx |  8 ++++----
 src/react/PauseScreen.tsx   | 27 ++++++++++++++++++++++-----
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/config.json b/config.json
index d6d68b94..6aa86397 100644
--- a/config.json
+++ b/config.json
@@ -17,5 +17,15 @@
       "version": "1.20.3",
       "description": "Very nice a polite server. Must try for everyone!"
     }
+  ],
+  "pauseLinks": [
+    [
+      {
+        "type": "github"
+      },
+      {
+        "type": "discord"
+      }
+    ]
   ]
 }
diff --git a/src/globalState.ts b/src/globalState.ts
index 66959198..cc9cd127 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -127,6 +127,7 @@ export type AppConfig = {
   forceSettings?: Record<string, boolean>
   // hideSettings?: Record<string, boolean>
   allowAutoConnect?: boolean
+  pauseLinks?: Array<Array<Record<string, any>>>
 }
 
 export const miscUiState = proxy({
diff --git a/src/react/DiscordButton.tsx b/src/react/DiscordButton.tsx
index 3824c4c1..e8278e95 100644
--- a/src/react/DiscordButton.tsx
+++ b/src/react/DiscordButton.tsx
@@ -4,7 +4,7 @@ import { CSSProperties, useState } from 'react'
 import Button from './Button'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 
-export const DiscordButton = () => {
+export const DiscordButton = ({ text, style }: { text?: string, style?: Record<string, any> }) => {
   const links: DropdownButtonItem[] = [
     {
       text: 'Support Official Server (mcraft.fun)',
@@ -16,7 +16,7 @@ export const DiscordButton = () => {
     }
   ]
 
-  return <DropdownButton text="Discord" links={links} />
+  return <DropdownButton text={text ?? 'Discord'} style={style} links={links} />
 }
 
 export type DropdownButtonItem = {
@@ -24,7 +24,7 @@ export type DropdownButtonItem = {
   clickHandler: () => void
 }
 
-export const DropdownButton = ({ text, links }: { text: string, links: DropdownButtonItem[] }) => {
+export const DropdownButton = ({ text, style, links }: { text: string, style?: Record<string, any>, links: DropdownButtonItem[] }) => {
   const [isOpen, setIsOpen] = useState(false)
   const { refs, floatingStyles } = useFloating({
     open: isOpen,
@@ -50,7 +50,7 @@ export const DropdownButton = ({ text, links }: { text: string, links: DropdownB
 
   return <>
     <Button
-      style={{ position: 'relative', width: '98px' }}
+      style={style ?? { position: 'relative', width: '98px' }}
       rootRef={refs.setReference}
       onClick={() => {
         setIsOpen(!isOpen)
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 6a0fc90e..fad29d21 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -18,7 +18,7 @@ import {
 } from '../globalState'
 import { fsState } from '../loadSave'
 import { disconnect } from '../flyingSquidUtils'
-import { pointerLock } from '../utils'
+import { openGithub, pointerLock } from '../utils'
 import { setLoadingScreenStatus } from '../appStatus'
 import { closeWan, openToWanAndCopyJoinLink, getJoinLink } from '../localServerMultiplayer'
 import { collectFilesToCopy, fileExistsAsyncOptimized, mkdirRecursive, uniqueFileNameFromWorldName } from '../browserfs'
@@ -222,6 +222,26 @@ export default () => {
   }
 
   if (!isModalActive) return null
+
+  const pauseLinks: any[] = []
+  const pauseLinksConfig = miscUiState.appConfig?.pauseLinks
+  if (pauseLinksConfig) {
+    for (const row of pauseLinksConfig) {
+      const rowButtons: any[] = []
+      for (const button of row) {
+        const style = { width: (204 / row.length - (row.length > 1 ? 4 : 0)) + 'px' }
+        if (button.type === 'discord') {
+          rowButtons.push(<DiscordButton style={style} text={button.text}/>)
+        } else if (button.type === 'github') {
+          rowButtons.push(<Button className="button" style={style} onClick={() => openGithub()}>{button.text ?? 'GitHub'}</Button>)
+        } else if (button.type === 'url' && button.text) {
+          rowButtons.push(<Button className="button" style={style} onClick={() => openURL(button.url)}>{button.text}</Button>)
+        }
+      }
+      pauseLinks.push(<div className={styles.row}>{rowButtons}</div>)
+    }
+  }
+
   return <Screen title='Game Menu'>
     <Button
       icon="pixelarticons:folder"
@@ -235,10 +255,7 @@ export default () => {
     </ErrorBoundary>
     <div className={styles.pause_container}>
       <Button className="button" style={{ width: '204px' }} onClick={onReturnPress}>Back to Game</Button>
-      <div className={styles.row}>
-        <Button className="button" style={{ width: '98px' }} onClick={() => openURL(process.env.GITHUB_URL!)}>GitHub</Button>
-        <DiscordButton />
-      </div>
+      {pauseLinks}
       <Button className="button" style={{ width: '204px' }} onClick={() => openOptionsMenu('main')}>Options</Button>
       {singleplayer ? (
         <div className={styles.row}>

From 52ae41a78d24b1bb95e26eb24d9b4b3b5cb977f0 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 26 Feb 2025 20:33:50 +0100
Subject: [PATCH 289/753] Add better chat link prompt screen (#290)

---
 src/react/MessageFormatted.tsx | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/react/MessageFormatted.tsx b/src/react/MessageFormatted.tsx
index 95204b26..554d5a9b 100644
--- a/src/react/MessageFormatted.tsx
+++ b/src/react/MessageFormatted.tsx
@@ -6,6 +6,7 @@ import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { MessageFormatPart } from '../chatUtils'
 import { chatInputValueGlobal } from './Chat'
 import './MessageFormatted.css'
+import { showOptionsModal } from './SelectOption'
 
 const hoverItemToText = (hoverEvent: MessageFormatPart['hoverEvent']) => {
   try {
@@ -42,17 +43,21 @@ const clickEventToProps = (clickEvent: MessageFormatPart['clickEvent']) => {
       }
     }
   }
-  if (clickEvent.action === 'open_url') {
+  if (clickEvent.action === 'open_url' || clickEvent.action === 'open_file') {
     return {
-      onClick () {
-        const confirm = window.confirm(`Open ${clickEvent.value}?`)
-        if (confirm) {
+      async onClick () {
+        const promptMessageText = `Open "${clickEvent.value}"?`
+        const confirm = await showOptionsModal(promptMessageText, ['Open', 'Copy'], {
+          cancel: true
+        })
+        if (confirm === 'Open') {
           openURL(clickEvent.value)
+        } else if (confirm === 'Copy') {
+          void navigator.clipboard.writeText(clickEvent.value)
         }
       }
     }
   }
-  //@ts-expect-error todo
   if (clickEvent.action === 'copy_to_clipboard') {
     return {
       onClick () {
@@ -71,6 +76,7 @@ export const MessagePart = ({ part, ...props }: { part: MessageFormatPart } & Co
   const hoverItemText = hoverMessageRaw && typeof hoverMessageRaw !== 'string' ? render(hoverMessageRaw).children.map(child => child.component.text).join('') : hoverMessageRaw
 
   const applyStyles = [
+    clickProps && messageFormatStylesMap.clickEvent,
     color ? colorF(color.toLowerCase()) + `; text-shadow: 1px 1px 0px ${getColorShadow(colorF(color.toLowerCase()).replace('color:', ''))}` : messageFormatStylesMap.white,
     italic && messageFormatStylesMap.italic,
     bold && messageFormatStylesMap.bold,
@@ -80,7 +86,7 @@ export const MessagePart = ({ part, ...props }: { part: MessageFormatPart } & Co
     obfuscated && messageFormatStylesMap.obfuscated
   ].filter(a => a !== false && a !== undefined).filter(Boolean)
 
-  return <span title={hoverItemText} style={parseInlineStyle(applyStyles.join(' '))} {...clickProps} {...props}>{text}</span>
+  return <span title={hoverItemText} style={parseInlineStyle(applyStyles.join(';'))} {...clickProps} {...props}>{text}</span>
 }
 
 export default ({ parts, className }: { parts: readonly MessageFormatPart[], className?: string }) => {
@@ -138,4 +144,5 @@ export const messageFormatStylesMap = {
   underlined: 'text-decoration:underline',
   italic: 'font-style:italic',
   obfuscated: 'filter:blur(2px)',
+  clickEvent: 'cursor:pointer',
 }

From edad57a225c98809c7877039ffee01fafa1df516 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Feb 2025 22:56:02 +0300
Subject: [PATCH 290/753] feat: allow to load client without free space on
 device (or no write permissions)

---
 src/browserfs.ts                | 25 ++++++++++++++++++++++---
 src/dragndrop.ts                |  2 +-
 src/globalState.ts              |  1 +
 src/react/MainMenu.tsx          |  7 +++++--
 src/react/MainMenuRenderApp.tsx |  3 ++-
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/browserfs.ts b/src/browserfs.ts
index d38b13a2..41608e30 100644
--- a/src/browserfs.ts
+++ b/src/browserfs.ts
@@ -14,22 +14,41 @@ import { VALID_REPLAY_EXTENSIONS, openFile } from './packetsReplay/replayPackets
 import { getFixedFilesize } from './downloadAndOpenFile'
 import { packetsReplayState } from './react/state/packetsReplayState'
 import { createFullScreenProgressReporter } from './core/progressReporter'
+import { showNotification } from './react/NotificationProvider'
 const { GoogleDriveFileSystem } = require('google-drive-browserfs/src/backends/GoogleDrive')
 
 browserfs.install(window)
 const defaultMountablePoints = {
-  '/world': { fs: 'LocalStorage' }, // will be removed in future
   '/data': { fs: 'IndexedDB' },
   '/resourcepack': { fs: 'InMemory' }, // temporary storage for currently loaded resource pack
+  '/temp': { fs: 'InMemory' }
+}
+const fallbackMountablePoints = {
+  '/resourcepack': { fs: 'InMemory' }, // temporary storage for downloaded server resource pack
+  '/temp': { fs: 'InMemory' }
 }
 browserfs.configure({
   fs: 'MountableFileSystem',
   options: defaultMountablePoints,
 }, async (e) => {
-  // todo disable singleplayer button
-  if (e) throw e
+  if (e) {
+    browserfs.configure({
+      fs: 'MountableFileSystem',
+      options: fallbackMountablePoints,
+    }, async (e2) => {
+      if (e2) {
+        showNotification('Unknown FS error, cannot continue', e2.message, true)
+        throw e2
+      }
+      showNotification('Failed to access device storage', `Check you have free space. ${e.message}`, true)
+      miscUiState.appLoaded = true
+      miscUiState.singleplayerAvailable = false
+    })
+    return
+  }
   await updateTexturePackInstalledState()
   miscUiState.appLoaded = true
+  miscUiState.singleplayerAvailable = true
 })
 
 export const forceCachedDataPaths = {}
diff --git a/src/dragndrop.ts b/src/dragndrop.ts
index 6c8af856..6be90551 100644
--- a/src/dragndrop.ts
+++ b/src/dragndrop.ts
@@ -64,7 +64,7 @@ async function handleDroppedFile (file: File) {
     return
   }
   if (file.name.endsWith('.mca')) {
-    const tempPath = '/data/temp.mca'
+    const tempPath = '/temp/temp.mca'
     try {
       await fs.promises.writeFile(tempPath, Buffer.from(await file.arrayBuffer()) as any)
       const region = new RegionFile(tempPath)
diff --git a/src/globalState.ts b/src/globalState.ts
index cc9cd127..74e6c3ff 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -145,6 +145,7 @@ export const miscUiState = proxy({
   /** currently trying to load or loaded mc version, after all data is loaded */
   loadedDataVersion: null as string | null,
   appLoaded: false,
+  singleplayerAvailable: false,
   usingGamepadInput: false,
   appConfig: null as AppConfig | null,
   displaySearchInput: false,
diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index fc770ad1..09214af2 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -24,6 +24,7 @@ interface Props {
   bottomRightLinks?: string
   versionText?: string
   onVersionTextClick?: () => void
+  singleplayerAvailable?: boolean
 }
 
 const httpsRegex = /^https?:\/\//
@@ -41,7 +42,8 @@ export default ({
   versionStatus,
   versionTitle,
   onVersionStatusClick,
-  bottomRightLinks
+  bottomRightLinks,
+  singleplayerAvailable = true
 }: Props) => {
   if (!bottomRightLinks?.trim()) bottomRightLinks = undefined
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
@@ -107,6 +109,7 @@ export default ({
             style={{ width: 150 }}
             {...singleplayerLongPress}
             data-test-id='singleplayer-button'
+            disabled={!singleplayerAvailable}
             initialTooltip={{
               content: 'Create worlds and play offline',
               placement: 'left',
@@ -183,7 +186,7 @@ export default ({
               </div>
             })}
           </div>
-          <span>A Minecraft client in the browser!</span>
+          <span>A Minecraft client clone in the browser!</span>
         </span>
       </div>
     </div>
diff --git a/src/react/MainMenuRenderApp.tsx b/src/react/MainMenuRenderApp.tsx
index b12d9ba8..e06ced52 100644
--- a/src/react/MainMenuRenderApp.tsx
+++ b/src/react/MainMenuRenderApp.tsx
@@ -75,7 +75,7 @@ export const mainMenuState = proxy({
 let disableAnimation = false
 export default () => {
   const haveModals = useSnapshot(activeModalStack).length
-  const { gameLoaded, appLoaded, appConfig } = useSnapshot(miscUiState)
+  const { gameLoaded, appLoaded, appConfig, singleplayerAvailable } = useSnapshot(miscUiState)
 
   const noDisplay = haveModals || gameLoaded || !appLoaded
 
@@ -118,6 +118,7 @@ export default () => {
   return <Transition in={!noDisplay} timeout={disableAnimation ? 0 : 100} mountOnEnter unmountOnExit>
     {(state) => <div style={{ transition: state === 'exiting' || disableAnimation ? '' : '100ms opacity ease-in', ...state === 'entered' ? { opacity: 1 } : { opacity: 0 } }}>
       <MainMenu
+        singleplayerAvailable={singleplayerAvailable}
         connectToServerAction={() => showModal({ reactType: 'serversList' })}
         singleplayerAction={async () => {
           const oldFormatSave = fs.existsSync('./world/level.dat')

From 2414111b9cf24ebbe75948234ed33c20cc4c6e50 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Feb 2025 23:29:18 +0300
Subject: [PATCH 291/753] feat: add packets recording control to pause menu,
 display packets view after recording was started for in real time server
 packets debug, fix auto captured packets display

---
 package.json                             |  2 +-
 pnpm-lock.yaml                           | 12 ++---
 src/mineflayer/plugins/localRelay.ts     | 59 +++++++++++++++++++++---
 src/packetsReplay/packetsReplayLegacy.ts | 10 ++--
 src/react/AppStatusProvider.tsx          |  2 +-
 src/react/PauseScreen.tsx                | 25 ++++++++--
 6 files changed, 86 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index f3f2f644..b67a2b03 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "mojangson": "^2.0.4",
     "net-browserify": "github:zardoy/prismarinejs-net-browserify",
     "node-gzip": "^1.1.2",
-    "mcraft-fun-mineflayer": "^0.1.6",
+    "mcraft-fun-mineflayer": "^0.1.7",
     "peerjs": "^1.5.0",
     "pixelarticons": "^1.8.1",
     "pretty-bytes": "^6.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7060521d..3386ac03 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -135,8 +135,8 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       mcraft-fun-mineflayer:
-        specifier: ^0.1.6
-        version: 0.1.6(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13))
+        specifier: ^0.1.7
+        version: 0.1.7(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -6252,9 +6252,9 @@ packages:
     resolution: {integrity: sha512-49tk3shwxsDoV0PrrbORZEKg613vUQPULgusWjXNl8JEma5y41LEo57D6q4aHliXsV3Gb9ThrkFf6hIb0WlY1Q==}
     engines: {node: '>=18.0.0'}
 
-  mcraft-fun-mineflayer@0.1.6:
-    resolution: {integrity: sha512-ifaIL//NJtkGcYasEULy0KcJjwUA8BwcmC/KoIpTTj6Xmk5o8AYEVdUnR9jrir4kpiLBOIbHgG1QhY1Wbofl1g==}
-    version: 0.1.6
+  mcraft-fun-mineflayer@0.1.7:
+    resolution: {integrity: sha512-DJPpp1YFwztoscdIOwfqBV9lbotva621F9GEep3BlqG3l06UdTzX2ElkvwyTR0IurFFBX/YKsNfxwL5WtLytgw==}
+    version: 0.1.7
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       '@roamhq/wrtc': '*'
@@ -16691,7 +16691,7 @@ snapshots:
       apl-image-packer: 1.1.0
       zod: 3.24.1
 
-  mcraft-fun-mineflayer@0.1.6(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.7(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
diff --git a/src/mineflayer/plugins/localRelay.ts b/src/mineflayer/plugins/localRelay.ts
index e6c8cfe5..ab8527e5 100644
--- a/src/mineflayer/plugins/localRelay.ts
+++ b/src/mineflayer/plugins/localRelay.ts
@@ -3,9 +3,22 @@ import { PACKETS_REPLAY_FILE_EXTENSION, WORLD_STATE_FILE_EXTENSION } from 'mcraf
 import { Bot } from 'mineflayer'
 import CircularBuffer from 'flying-squid/dist/circularBuffer'
 import { PacketsLogger } from 'mcraft-fun-mineflayer/build/packetsLogger'
+import { subscribe } from 'valtio'
 import { lastConnectOptions } from '../../react/AppStatusProvider'
+import { packetsReplaceSessionState } from '../../packetsReplay/packetsReplayLegacy'
+import { packetsReplayState } from '../../react/state/packetsReplayState'
+
+const AUTO_CAPTURE_PACKETS_COUNT = 30
+let circularBuffer: CircularBuffer | undefined
+let lastConnectVersion = ''
 
 export const localRelayServerPlugin = (bot: Bot) => {
+  lastConnectVersion = bot.version
+  let ended = false
+  bot.on('end', () => {
+    ended = true
+  })
+
   bot.loadPlugin(
     viewerConnector({
       tcpEnabled: false,
@@ -28,28 +41,60 @@ export const localRelayServerPlugin = (bot: Bot) => {
   }
 
   circularBuffer = new CircularBuffer(AUTO_CAPTURE_PACKETS_COUNT)
+  let position = 0
   bot._client.on('writePacket' as any, (name, params) => {
-    circularBuffer!.add({ name, params, isFromServer: false })
+    circularBuffer!.add({ name, state: bot._client.state, params, isFromServer: false, timestamp: Date.now() })
+    if (packetsReplaceSessionState.active) {
+      packetsReplayState.packetsPlayback.push({
+        name,
+        data: params,
+        isFromClient: true,
+        isUpcoming: false,
+        position: position++,
+        timestamp: Date.now(),
+      })
+    }
   })
   bot._client.on('packet', (data, { name }) => {
-    circularBuffer!.add({ name, params: data, isFromServer: true })
+    if (name === 'map_chunk') data = { x: data.x, z: data.z }
+    circularBuffer!.add({ name, state: bot._client.state, params: data, isFromServer: true, timestamp: Date.now() })
+    if (packetsReplaceSessionState.active) {
+      packetsReplayState.packetsPlayback.push({
+        name,
+        data,
+        isFromClient: false,
+        isUpcoming: false,
+        position: position++,
+        timestamp: Date.now(),
+      })
+    }
   })
+
+  upPacketsReplayPanel()
 }
 
+const upPacketsReplayPanel = () => {
+  if (packetsReplaceSessionState.active && bot) {
+    packetsReplayState.isOpen = true
+    packetsReplayState.replayName = 'Recording all packets for ' + bot.username
+  }
+}
+
+subscribe(packetsReplaceSessionState, () => {
+  upPacketsReplayPanel()
+})
+
 declare module 'mineflayer' {
   interface Bot {
     downloadCurrentWorldState: () => void
   }
 }
 
-const AUTO_CAPTURE_PACKETS_COUNT = 30
-let circularBuffer: CircularBuffer | undefined
-
 export const getLastAutoCapturedPackets = () => circularBuffer?.size
 export const downloadAutoCapturedPackets = () => {
-  const logger = new PacketsLogger()
+  const logger = new PacketsLogger({ minecraftVersion: lastConnectVersion })
   for (const packet of circularBuffer?.getLastElements() ?? []) {
-    logger.log(packet.isFromServer, packet.name, packet.params)
+    logger.log(packet.isFromServer, { name: packet.name, state: packet.state, time: packet.timestamp }, packet.params)
   }
   const textContents = logger.contents
   const blob = new Blob([textContents], { type: 'text/plain' })
diff --git a/src/packetsReplay/packetsReplayLegacy.ts b/src/packetsReplay/packetsReplayLegacy.ts
index 0db97012..478bbc5d 100644
--- a/src/packetsReplay/packetsReplayLegacy.ts
+++ b/src/packetsReplay/packetsReplayLegacy.ts
@@ -7,7 +7,8 @@ export const packetsReplaceSessionState = proxy({
   hasRecordedPackets: false
 })
 
-export const replayLogger = new PacketsLogger()
+// eslint-disable-next-line import/no-mutable-exports
+export let replayLogger: PacketsLogger | undefined
 
 const isBufferData = (data: any): boolean => {
   if (Buffer.isBuffer(data) || data instanceof Uint8Array) return true
@@ -35,13 +36,14 @@ const processPacketData = (data: any): any => {
 
 export default () => {
   customEvents.on('mineflayerBotCreated', () => {
+    replayLogger = new PacketsLogger({ minecraftVersion: bot.version })
     replayLogger.contents = ''
     packetsReplaceSessionState.hasRecordedPackets = false
     const handleServerPacket = (data, { name, state = bot._client.state }) => {
       if (!packetsReplaceSessionState.active) {
         return
       }
-      replayLogger.log(true, { name, state }, processPacketData(data))
+      replayLogger!.log(true, { name, state }, processPacketData(data))
       packetsReplaceSessionState.hasRecordedPackets = true
     }
     bot._client.on('packet', handleServerPacket)
@@ -53,7 +55,7 @@ export default () => {
       if (!packetsReplaceSessionState.active) {
         return
       }
-      replayLogger.log(false, { name, state: bot._client.state }, processPacketData(data))
+      replayLogger!.log(false, { name, state: bot._client.state }, processPacketData(data))
       packetsReplaceSessionState.hasRecordedPackets = true
     })
   })
@@ -61,7 +63,7 @@ export default () => {
 
 export const downloadPacketsReplay = async () => {
   const a = document.createElement('a')
-  a.href = `data:text/plain;charset=utf-8,${encodeURIComponent(replayLogger.contents)}`
+  a.href = `data:text/plain;charset=utf-8,${encodeURIComponent(replayLogger!.contents)}`
   a.download = `packets-replay-${new Date().toISOString()}.txt`
   a.click()
 }
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index a3ef4c9d..e83416c1 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -147,7 +147,7 @@ export default () => {
         <>
           {displayAuthButton && <Button label='Authenticate' onClick={authReconnectAction} />}
           {displayVpnButton && <PossiblyVpnBypassProxyButton reconnect={reconnect} />}
-          {replayActive && <Button label={`Download Packets Replay ${replayLogger.contents.split('\n').length}L`} onClick={downloadPacketsReplay} />}
+          {replayActive && <Button label={`Download Packets Replay ${replayLogger?.contents.split('\n').length}L`} onClick={downloadPacketsReplay} />}
           {lastAutoCapturedPackets && <Button label={`Inspect Last ${lastAutoCapturedPackets} Packets`} onClick={() => downloadAutoCapturedPackets()} />}
         </>
       }
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index fad29d21..204bb3dd 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -23,6 +23,7 @@ import { setLoadingScreenStatus } from '../appStatus'
 import { closeWan, openToWanAndCopyJoinLink, getJoinLink } from '../localServerMultiplayer'
 import { collectFilesToCopy, fileExistsAsyncOptimized, mkdirRecursive, uniqueFileNameFromWorldName } from '../browserfs'
 import { appQueryParams } from '../appParams'
+import { downloadPacketsReplay, packetsReplaceSessionState } from '../packetsReplay/packetsReplayLegacy'
 import { useIsModalActive } from './utilsApp'
 import { showOptionsModal } from './SelectOption'
 import Button from './Button'
@@ -157,6 +158,7 @@ export default () => {
   const activeModalStackSnap = useSnapshot(activeModalStack)
   const { singleplayer, wanOpened, wanOpening } = useSnapshot(miscUiState)
   const { noConnection } = useSnapshot(gameAdditionalState)
+  const { active: packetsReplaceActive, hasRecordedPackets: packetsReplaceHasRecordedPackets } = useSnapshot(packetsReplaceSessionState)
 
   const handlePointerLockChange = () => {
     if (!pointerLock.hasPointerLock && activeModalStack.length === 0) {
@@ -243,11 +245,24 @@ export default () => {
   }
 
   return <Screen title='Game Menu'>
-    <Button
-      icon="pixelarticons:folder"
-      style={{ position: 'fixed', top: '5px', left: 'calc(env(safe-area-inset-left) + 5px)' }}
-      onClick={async () => openWorldActions()}
-    />
+    <div style={{ position: 'fixed', top: '5px', left: 'calc(env(safe-area-inset-left) + 5px)', display: 'flex', gap: '5px' }}>
+      <Button
+        icon="pixelarticons:folder"
+        onClick={async () => openWorldActions()}
+      />
+      <Button
+        icon={packetsReplaceActive ? 'pixelarticons:debug-stop' : 'pixelarticons:circle'}
+        onClick={() => {
+          packetsReplaceSessionState.active = !packetsReplaceSessionState.active
+        }}
+      />
+      {packetsReplaceHasRecordedPackets && (
+        <Button
+          icon="pixelarticons:download"
+          onClick={async () => downloadPacketsReplay()}
+        />
+      )}
+    </div>
     <ErrorBoundary renderError={() => <div>error</div>}>
       <div style={{ position: 'fixed', top: '5px', left: 'calc(env(safe-area-inset-left) + 35px)' }}>
         <NetworkStatus />

From dffadbb06c56ef9288d0ed61758f63724dd3d7e6 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Feb 2025 23:33:13 +0300
Subject: [PATCH 292/753] wip jei channel

---
 src/customChannels.ts              | 36 +++++++++++++++++++++++++++++-
 src/packetsReplay/replayPackets.ts |  2 +-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/customChannels.ts b/src/customChannels.ts
index 71dc7067..35922101 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -8,7 +8,10 @@ customEvents.on('mineflayerBotCreated', async () => {
       resolve(true)
     })
   })
+  registerBlockModelsChannel()
+})
 
+const registerBlockModelsChannel = () => {
   const CHANNEL_NAME = 'minecraft-web-client:blockmodels'
 
   const packetStructure = [
@@ -72,4 +75,35 @@ customEvents.on('mineflayerBotCreated', async () => {
   })
 
   console.debug(`registered custom channel ${CHANNEL_NAME} channel`)
-})
+}
+
+const registeredJeiChannel = () => {
+  const CHANNEL_NAME = 'minecraft-web-client:jei'
+  // id - string, categoryTitle - string, items - string (json array)
+  const packetStructure = [
+    'container',
+    [
+      {
+        name: 'id',
+        type: 'pstring',
+      },
+      {
+        name: 'categoryTitle',
+        type: 'pstring',
+      },
+      {
+        name: 'items',
+        type: 'pstring',
+      },
+    ]
+  ]
+
+  bot._client.registerChannel(CHANNEL_NAME, packetStructure, true)
+
+  bot._client.on(CHANNEL_NAME as any, (data) => {
+    const { id, categoryTitle, items } = data
+    // ...
+  })
+
+  console.debug(`registered custom channel ${CHANNEL_NAME} channel`)
+}
diff --git a/src/packetsReplay/replayPackets.ts b/src/packetsReplay/replayPackets.ts
index e3935258..9e777b38 100644
--- a/src/packetsReplay/replayPackets.ts
+++ b/src/packetsReplay/replayPackets.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import { createServer, ServerClient } from 'minecraft-protocol'
 import { ParsedReplayPacket, parseReplayContents } from 'mcraft-fun-mineflayer/build/packetsLogger'
-import { WorldStateHeader, PACKETS_REPLAY_FILE_EXTENSION, WORLD_STATE_FILE_EXTENSION } from 'mcraft-fun-mineflayer/build/worldState'
+import { PACKETS_REPLAY_FILE_EXTENSION, WORLD_STATE_FILE_EXTENSION } from 'mcraft-fun-mineflayer/build/worldState'
 import MinecraftData from 'minecraft-data'
 import { LocalServer } from '../customServer'
 import { UserError } from '../mineflayer/userError'

From d348a44bb86cb1678f7727b92c2018acbc0eaf51 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 27 Feb 2025 04:48:03 +0300
Subject: [PATCH 293/753] add a way to disable recording button on pause menu,
 refactor

---
 src/index.ts                                  |  2 +-
 .../{localRelay.ts => packetsRecording.ts}    | 10 +++---
 src/optionsGuiScheme.tsx                      |  8 ++---
 src/optionsStorage.ts                         |  2 +-
 src/packetsReplay/packetsReplayLegacy.ts      | 12 +++----
 src/react/AppStatusProvider.tsx               |  6 ++--
 src/react/Chat.tsx                            |  1 +
 src/react/PauseScreen.tsx                     | 34 +++++++++++--------
 8 files changed, 41 insertions(+), 34 deletions(-)
 rename src/mineflayer/plugins/{localRelay.ts => packetsRecording.ts} (92%)

diff --git a/src/index.ts b/src/index.ts
index 01912e94..249fbe9d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -115,7 +115,7 @@ import { UserError } from './mineflayer/userError'
 import ping from './mineflayer/plugins/ping'
 import { LocalServer } from './customServer'
 import { startLocalReplayServer } from './packetsReplay/replayPackets'
-import { localRelayServerPlugin } from './mineflayer/plugins/localRelay'
+import { localRelayServerPlugin } from './mineflayer/plugins/packetsRecording'
 import { createFullScreenProgressReporter } from './core/progressReporter'
 
 window.debug = debug
diff --git a/src/mineflayer/plugins/localRelay.ts b/src/mineflayer/plugins/packetsRecording.ts
similarity index 92%
rename from src/mineflayer/plugins/localRelay.ts
rename to src/mineflayer/plugins/packetsRecording.ts
index ab8527e5..f1ff18cf 100644
--- a/src/mineflayer/plugins/localRelay.ts
+++ b/src/mineflayer/plugins/packetsRecording.ts
@@ -5,7 +5,7 @@ import CircularBuffer from 'flying-squid/dist/circularBuffer'
 import { PacketsLogger } from 'mcraft-fun-mineflayer/build/packetsLogger'
 import { subscribe } from 'valtio'
 import { lastConnectOptions } from '../../react/AppStatusProvider'
-import { packetsReplaceSessionState } from '../../packetsReplay/packetsReplayLegacy'
+import { packetsRecordingState } from '../../packetsReplay/packetsReplayLegacy'
 import { packetsReplayState } from '../../react/state/packetsReplayState'
 
 const AUTO_CAPTURE_PACKETS_COUNT = 30
@@ -44,7 +44,7 @@ export const localRelayServerPlugin = (bot: Bot) => {
   let position = 0
   bot._client.on('writePacket' as any, (name, params) => {
     circularBuffer!.add({ name, state: bot._client.state, params, isFromServer: false, timestamp: Date.now() })
-    if (packetsReplaceSessionState.active) {
+    if (packetsRecordingState.active) {
       packetsReplayState.packetsPlayback.push({
         name,
         data: params,
@@ -58,7 +58,7 @@ export const localRelayServerPlugin = (bot: Bot) => {
   bot._client.on('packet', (data, { name }) => {
     if (name === 'map_chunk') data = { x: data.x, z: data.z }
     circularBuffer!.add({ name, state: bot._client.state, params: data, isFromServer: true, timestamp: Date.now() })
-    if (packetsReplaceSessionState.active) {
+    if (packetsRecordingState.active) {
       packetsReplayState.packetsPlayback.push({
         name,
         data,
@@ -74,13 +74,13 @@ export const localRelayServerPlugin = (bot: Bot) => {
 }
 
 const upPacketsReplayPanel = () => {
-  if (packetsReplaceSessionState.active && bot) {
+  if (packetsRecordingState.active && bot) {
     packetsReplayState.isOpen = true
     packetsReplayState.replayName = 'Recording all packets for ' + bot.username
   }
 }
 
-subscribe(packetsReplaceSessionState, () => {
+subscribe(packetsRecordingState, () => {
   upPacketsReplayPanel()
 })
 
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 6f4d4fea..7032e644 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -11,7 +11,7 @@ import { getScreenRefreshRate } from './utils'
 import { setLoadingScreenStatus } from './appStatus'
 import { openFilePicker, resetLocalStorageWithoutWorld } from './browserfs'
 import { completeResourcepackPackInstall, getResourcePackNames, resourcePackState, uninstallResourcePack } from './resourcePack'
-import { downloadPacketsReplay, packetsReplaceSessionState } from './packetsReplay/packetsReplayLegacy'
+import { downloadPacketsReplay, packetsRecordingState } from './packetsReplay/packetsReplayLegacy'
 import { showOptionsModal } from './react/SelectOption'
 import supportedVersions from './supportedVersions.mjs'
 import { getVersionAutoSelect } from './connect'
@@ -462,18 +462,18 @@ export const guiOptionsScheme: {
     },
     {
       custom () {
-        const { active } = useSnapshot(packetsReplaceSessionState)
+        const { active } = useSnapshot(packetsRecordingState)
         return <Button
           inScreen
           onClick={() => {
-            packetsReplaceSessionState.active = !active
+            packetsRecordingState.active = !active
           }}
         >{active ? 'Stop' : 'Start'} Packets Replay Logging</Button>
       },
     },
     {
       custom () {
-        const { active, hasRecordedPackets } = useSnapshot(packetsReplaceSessionState)
+        const { active, hasRecordedPackets } = useSnapshot(packetsRecordingState)
         return <Button
           disabled={!hasRecordedPackets}
           inScreen
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 6dc1608b..47109979 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -20,7 +20,6 @@ const defaultOptions = {
   localUsername: 'wanderer',
   mouseSensX: 50,
   mouseSensY: -1,
-  // mouseInvertX: false,
   chatWidth: 320,
   chatHeight: 180,
   chatScale: 100,
@@ -56,6 +55,7 @@ const defaultOptions = {
   serverResourcePacks: 'prompt' as 'prompt' | 'always' | 'never',
   showHand: true,
   viewBobbing: true,
+  displayRecordButton: true,
   packetsLoggerPreset: 'all' as 'all' | 'no-buffers',
   serversAutoVersionSelect: 'auto' as 'auto' | 'latest' | '1.20.4' | string,
   customChannels: false,
diff --git a/src/packetsReplay/packetsReplayLegacy.ts b/src/packetsReplay/packetsReplayLegacy.ts
index 478bbc5d..dc9b7a2d 100644
--- a/src/packetsReplay/packetsReplayLegacy.ts
+++ b/src/packetsReplay/packetsReplayLegacy.ts
@@ -2,7 +2,7 @@ import { proxy } from 'valtio'
 import { PacketsLogger } from 'mcraft-fun-mineflayer/build/packetsLogger'
 import { options } from '../optionsStorage'
 
-export const packetsReplaceSessionState = proxy({
+export const packetsRecordingState = proxy({
   active: options.packetsReplayAutoStart,
   hasRecordedPackets: false
 })
@@ -38,13 +38,13 @@ export default () => {
   customEvents.on('mineflayerBotCreated', () => {
     replayLogger = new PacketsLogger({ minecraftVersion: bot.version })
     replayLogger.contents = ''
-    packetsReplaceSessionState.hasRecordedPackets = false
+    packetsRecordingState.hasRecordedPackets = false
     const handleServerPacket = (data, { name, state = bot._client.state }) => {
-      if (!packetsReplaceSessionState.active) {
+      if (!packetsRecordingState.active) {
         return
       }
       replayLogger!.log(true, { name, state }, processPacketData(data))
-      packetsReplaceSessionState.hasRecordedPackets = true
+      packetsRecordingState.hasRecordedPackets = true
     }
     bot._client.on('packet', handleServerPacket)
     bot._client.on('packet_name' as any, (name, data) => {
@@ -52,11 +52,11 @@ export default () => {
     })
 
     bot._client.on('writePacket' as any, (name, data) => {
-      if (!packetsReplaceSessionState.active) {
+      if (!packetsRecordingState.active) {
         return
       }
       replayLogger!.log(false, { name, state: bot._client.state }, processPacketData(data))
-      packetsReplaceSessionState.hasRecordedPackets = true
+      packetsRecordingState.hasRecordedPackets = true
     })
   })
 }
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index e83416c1..2a9a5e4c 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -3,9 +3,9 @@ import { useEffect, useRef, useState } from 'react'
 import { activeModalStack, activeModalStacks, hideModal, insertActiveModalStack, miscUiState } from '../globalState'
 import { guessProblem } from '../errorLoadingScreenHelpers'
 import type { ConnectOptions } from '../connect'
-import { downloadPacketsReplay, packetsReplaceSessionState, replayLogger } from '../packetsReplay/packetsReplayLegacy'
+import { downloadPacketsReplay, packetsRecordingState, replayLogger } from '../packetsReplay/packetsReplayLegacy'
 import { getProxyDetails } from '../microsoftAuthflow'
-import { downloadAutoCapturedPackets, getLastAutoCapturedPackets } from '../mineflayer/plugins/localRelay'
+import { downloadAutoCapturedPackets, getLastAutoCapturedPackets } from '../mineflayer/plugins/packetsRecording'
 import AppStatus from './AppStatus'
 import DiveTransition from './DiveTransition'
 import { useDidUpdateEffect } from './utils'
@@ -56,7 +56,7 @@ export const reconnectReload = () => {
 export default () => {
   const lastState = useRef(JSON.parse(JSON.stringify(appStatusState)))
   const currentState = useSnapshot(appStatusState)
-  const { active: replayActive } = useSnapshot(packetsReplaceSessionState)
+  const { active: replayActive } = useSnapshot(packetsRecordingState)
 
   const isOpen = useIsModalActive('app-status')
 
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 5a775b7a..129bfee1 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -131,6 +131,7 @@ export default ({
 
       // Add keyboard event listener for letter keys and paste
       const handleKeyDown = (e: KeyboardEvent) => {
+        if (['input', 'textarea', 'select'].includes(document.activeElement?.tagName.toLowerCase() ?? '')) return
         // Check if it's a single character key (works with any layout) without modifiers except shift
         const isSingleChar = e.key.length === 1 && !e.ctrlKey && !e.altKey && !e.metaKey
         // Check if it's paste command
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 204bb3dd..d7aa2201 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -23,7 +23,8 @@ import { setLoadingScreenStatus } from '../appStatus'
 import { closeWan, openToWanAndCopyJoinLink, getJoinLink } from '../localServerMultiplayer'
 import { collectFilesToCopy, fileExistsAsyncOptimized, mkdirRecursive, uniqueFileNameFromWorldName } from '../browserfs'
 import { appQueryParams } from '../appParams'
-import { downloadPacketsReplay, packetsReplaceSessionState } from '../packetsReplay/packetsReplayLegacy'
+import { downloadPacketsReplay, packetsRecordingState } from '../packetsReplay/packetsReplayLegacy'
+import { options } from '../optionsStorage'
 import { useIsModalActive } from './utilsApp'
 import { showOptionsModal } from './SelectOption'
 import Button from './Button'
@@ -158,7 +159,8 @@ export default () => {
   const activeModalStackSnap = useSnapshot(activeModalStack)
   const { singleplayer, wanOpened, wanOpening } = useSnapshot(miscUiState)
   const { noConnection } = useSnapshot(gameAdditionalState)
-  const { active: packetsReplaceActive, hasRecordedPackets: packetsReplaceHasRecordedPackets } = useSnapshot(packetsReplaceSessionState)
+  const { active: packetsReplaceActive, hasRecordedPackets: packetsReplaceHasRecordedPackets } = useSnapshot(packetsRecordingState)
+  const { displayRecordButton } = useSnapshot(options)
 
   const handlePointerLockChange = () => {
     if (!pointerLock.hasPointerLock && activeModalStack.length === 0) {
@@ -245,22 +247,26 @@ export default () => {
   }
 
   return <Screen title='Game Menu'>
-    <div style={{ position: 'fixed', top: '5px', left: 'calc(env(safe-area-inset-left) + 5px)', display: 'flex', gap: '5px' }}>
+    <div style={{ position: 'fixed', top: '5px', left: 'calc(env(safe-area-inset-left) + 5px)', display: 'flex', flexDirection: 'column', gap: '5px' }}>
       <Button
         icon="pixelarticons:folder"
         onClick={async () => openWorldActions()}
       />
-      <Button
-        icon={packetsReplaceActive ? 'pixelarticons:debug-stop' : 'pixelarticons:circle'}
-        onClick={() => {
-          packetsReplaceSessionState.active = !packetsReplaceSessionState.active
-        }}
-      />
-      {packetsReplaceHasRecordedPackets && (
-        <Button
-          icon="pixelarticons:download"
-          onClick={async () => downloadPacketsReplay()}
-        />
+      {displayRecordButton && (
+        <>
+          <Button
+            icon={packetsReplaceActive ? 'pixelarticons:debug-stop' : 'pixelarticons:circle'}
+            onClick={() => {
+              packetsRecordingState.active = !packetsRecordingState.active
+            }}
+          />
+          {packetsReplaceHasRecordedPackets && (
+            <Button
+              icon="pixelarticons:download"
+              onClick={async () => downloadPacketsReplay()}
+            />
+          )}
+        </>
       )}
     </div>
     <ErrorBoundary renderError={() => <div>error</div>}>

From dec93c2b64c185b251ebb092c3b3519d206fb890 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 27 Feb 2025 04:48:16 +0300
Subject: [PATCH 294/753] fix react warning

---
 src/react/PauseScreen.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index d7aa2201..4c4dec03 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -227,19 +227,19 @@ export default () => {
 
   if (!isModalActive) return null
 
-  const pauseLinks: any[] = []
+  const pauseLinks: React.ReactNode[] = []
   const pauseLinksConfig = miscUiState.appConfig?.pauseLinks
   if (pauseLinksConfig) {
-    for (const row of pauseLinksConfig) {
-      const rowButtons: any[] = []
+    for (const [i, row] of pauseLinksConfig.entries()) {
+      const rowButtons: React.ReactNode[] = []
       for (const button of row) {
         const style = { width: (204 / row.length - (row.length > 1 ? 4 : 0)) + 'px' }
         if (button.type === 'discord') {
-          rowButtons.push(<DiscordButton style={style} text={button.text}/>)
+          rowButtons.push(<DiscordButton key={i} style={style} text={button.text}/>)
         } else if (button.type === 'github') {
-          rowButtons.push(<Button className="button" style={style} onClick={() => openGithub()}>{button.text ?? 'GitHub'}</Button>)
+          rowButtons.push(<Button key={i} className="button" style={style} onClick={() => openGithub()}>{button.text ?? 'GitHub'}</Button>)
         } else if (button.type === 'url' && button.text) {
-          rowButtons.push(<Button className="button" style={style} onClick={() => openURL(button.url)}>{button.text}</Button>)
+          rowButtons.push(<Button key={i} className="button" style={style} onClick={() => openURL(button.url)}>{button.text}</Button>)
         }
       }
       pauseLinks.push(<div className={styles.row}>{rowButtons}</div>)

From fa9c0813c3214cceea51de13ce844b6b86006260 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 27 Feb 2025 05:17:18 +0300
Subject: [PATCH 295/753] fix: seagrass and kelp are always waterlogged

---
 renderer/viewer/lib/mesher/models.ts | 15 ++++++++++-----
 renderer/viewer/lib/mesher/world.ts  | 13 -------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index 0dec4015..dd2952fb 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -43,10 +43,6 @@ function prepareTints (tints) {
   })
 }
 
-function mod (x: number, n: number) {
-  return ((x % n) + n) % n
-}
-
 const calculatedBlocksEntries = Object.entries(legacyJson.clientCalculatedBlocks)
 export function preflatBlockCalculation (block: Block, world: World, position: Vec3) {
   const type = calculatedBlocksEntries.find(([name, blocks]) => blocks.includes(block.name))?.[0]
@@ -439,7 +435,16 @@ function renderElement (world: World, cursor: Vec3, element: BlockElement, doAO:
   }
 }
 
-const isBlockWaterlogged = (block: Block) => block.getProperties().waterlogged === true || block.getProperties().waterlogged === 'true'
+const ALWAYS_WATERLOGGED = new Set([
+  'seagrass',
+  'tall_seagrass',
+  'kelp',
+  'kelp_plant',
+  'bubble_column'
+])
+const isBlockWaterlogged = (block: Block) => {
+  return block.getProperties().waterlogged === true || block.getProperties().waterlogged === 'true' || ALWAYS_WATERLOGGED.has(block.name)
+}
 
 let unknownBlockModel: BlockModelPartsResolved
 export function getSectionGeometry (sx, sy, sz, world: World) {
diff --git a/renderer/viewer/lib/mesher/world.ts b/renderer/viewer/lib/mesher/world.ts
index e13bf760..f2757ae6 100644
--- a/renderer/viewer/lib/mesher/world.ts
+++ b/renderer/viewer/lib/mesher/world.ts
@@ -10,14 +10,6 @@ import { INVISIBLE_BLOCKS } from './worldConstants'
 
 const ignoreAoBlocks = Object.keys(moreBlockDataGeneratedJson.noOcclusions)
 
-const ALWAYS_WATERLOGGED = new Set([
-  'seagrass',
-  'tall_seagrass',
-  'kelp',
-  'kelp_plant',
-  'bubble_column'
-])
-
 function columnKey (x, z) {
   return `${x},${z}`
 }
@@ -178,11 +170,6 @@ export class World {
       if (!attr) throw new Error('attr is required')
       const props = block.getProperties()
 
-      // Patch waterlogged property for ocean plants
-      if (ALWAYS_WATERLOGGED.has(block.name)) {
-        props.waterlogged = 'true'
-      }
-
       try {
         // fixme
         if (this.preflat) {

From ceb4cb0b66644962da2afbbf31d4faf6ec35cd76 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 27 Feb 2025 15:26:38 +0300
Subject: [PATCH 296/753] feat: Refactor mouse controls, fixing all false
 entity/item interaction issues (#286)

---
 package.json                         |   1 +
 pnpm-lock.yaml                       | 858 ++++++++++++++++++++++++++-
 src/cameraRotationControls.ts        |  14 +-
 src/devtools.ts                      |   5 +-
 src/globals.d.ts                     |   2 +-
 src/index.ts                         |  11 +-
 src/mineflayer/plugins/mouse.ts      | 204 +++++++
 src/optionsStorage.ts                |   1 +
 src/react/GameInteractionOverlay.tsx |   3 +-
 src/react/TouchAreasControls.tsx     |  10 +-
 src/worldInteractions.ts             | 551 -----------------
 11 files changed, 1066 insertions(+), 594 deletions(-)
 create mode 100644 src/mineflayer/plugins/mouse.ts
 delete mode 100644 src/worldInteractions.ts

diff --git a/package.json b/package.json
index b67a2b03..b0c5ee20 100644
--- a/package.json
+++ b/package.json
@@ -145,6 +145,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
+    "mineflayer-mouse": "^0.0.4",
     "mc-assets": "^0.2.37",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3386ac03..be7ce2e5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -282,7 +282,7 @@ importers:
         version: 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
       '@storybook/react-vite':
         specifier: ^7.4.6
-        version: 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.4)(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))
+        version: 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.4)(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))
       '@types/diff-match-patch':
         specifier: ^1.0.36
         version: 1.0.36
@@ -358,6 +358,9 @@ importers:
       mineflayer:
         specifier: github:zardoy/mineflayer
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)
+      mineflayer-mouse:
+        specifier: ^0.0.4
+        version: 0.0.4(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -1265,6 +1268,12 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/aix-ppc64@0.25.0':
+    resolution: {integrity: sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
   '@esbuild/android-arm64@0.18.20':
     resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
     engines: {node: '>=12'}
@@ -1277,6 +1286,12 @@ packages:
     cpu: [arm64]
     os: [android]
 
+  '@esbuild/android-arm64@0.25.0':
+    resolution: {integrity: sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
   '@esbuild/android-arm@0.18.20':
     resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==}
     engines: {node: '>=12'}
@@ -1289,6 +1304,12 @@ packages:
     cpu: [arm]
     os: [android]
 
+  '@esbuild/android-arm@0.25.0':
+    resolution: {integrity: sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
   '@esbuild/android-x64@0.18.20':
     resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==}
     engines: {node: '>=12'}
@@ -1301,6 +1322,12 @@ packages:
     cpu: [x64]
     os: [android]
 
+  '@esbuild/android-x64@0.25.0':
+    resolution: {integrity: sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
   '@esbuild/darwin-arm64@0.18.20':
     resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==}
     engines: {node: '>=12'}
@@ -1313,6 +1340,12 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@esbuild/darwin-arm64@0.25.0':
+    resolution: {integrity: sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@esbuild/darwin-x64@0.18.20':
     resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==}
     engines: {node: '>=12'}
@@ -1325,6 +1358,12 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@esbuild/darwin-x64@0.25.0':
+    resolution: {integrity: sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
   '@esbuild/freebsd-arm64@0.18.20':
     resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==}
     engines: {node: '>=12'}
@@ -1337,6 +1376,12 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
+  '@esbuild/freebsd-arm64@0.25.0':
+    resolution: {integrity: sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
   '@esbuild/freebsd-x64@0.18.20':
     resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==}
     engines: {node: '>=12'}
@@ -1349,6 +1394,12 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
+  '@esbuild/freebsd-x64@0.25.0':
+    resolution: {integrity: sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
   '@esbuild/linux-arm64@0.18.20':
     resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==}
     engines: {node: '>=12'}
@@ -1361,6 +1412,12 @@ packages:
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm64@0.25.0':
+    resolution: {integrity: sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
   '@esbuild/linux-arm@0.18.20':
     resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==}
     engines: {node: '>=12'}
@@ -1373,6 +1430,12 @@ packages:
     cpu: [arm]
     os: [linux]
 
+  '@esbuild/linux-arm@0.25.0':
+    resolution: {integrity: sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.18.20':
     resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==}
     engines: {node: '>=12'}
@@ -1385,6 +1448,12 @@ packages:
     cpu: [ia32]
     os: [linux]
 
+  '@esbuild/linux-ia32@0.25.0':
+    resolution: {integrity: sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
   '@esbuild/linux-loong64@0.18.20':
     resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==}
     engines: {node: '>=12'}
@@ -1397,6 +1466,12 @@ packages:
     cpu: [loong64]
     os: [linux]
 
+  '@esbuild/linux-loong64@0.25.0':
+    resolution: {integrity: sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
   '@esbuild/linux-mips64el@0.18.20':
     resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==}
     engines: {node: '>=12'}
@@ -1409,6 +1484,12 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
+  '@esbuild/linux-mips64el@0.25.0':
+    resolution: {integrity: sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
   '@esbuild/linux-ppc64@0.18.20':
     resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==}
     engines: {node: '>=12'}
@@ -1421,6 +1502,12 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
+  '@esbuild/linux-ppc64@0.25.0':
+    resolution: {integrity: sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
   '@esbuild/linux-riscv64@0.18.20':
     resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==}
     engines: {node: '>=12'}
@@ -1433,6 +1520,12 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
+  '@esbuild/linux-riscv64@0.25.0':
+    resolution: {integrity: sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
   '@esbuild/linux-s390x@0.18.20':
     resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==}
     engines: {node: '>=12'}
@@ -1445,6 +1538,12 @@ packages:
     cpu: [s390x]
     os: [linux]
 
+  '@esbuild/linux-s390x@0.25.0':
+    resolution: {integrity: sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
   '@esbuild/linux-x64@0.18.20':
     resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==}
     engines: {node: '>=12'}
@@ -1457,6 +1556,18 @@ packages:
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/linux-x64@0.25.0':
+    resolution: {integrity: sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/netbsd-arm64@0.25.0':
+    resolution: {integrity: sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
   '@esbuild/netbsd-x64@0.18.20':
     resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==}
     engines: {node: '>=12'}
@@ -1469,6 +1580,18 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
+  '@esbuild/netbsd-x64@0.25.0':
+    resolution: {integrity: sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/openbsd-arm64@0.25.0':
+    resolution: {integrity: sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.18.20':
     resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==}
     engines: {node: '>=12'}
@@ -1481,6 +1604,12 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
+  '@esbuild/openbsd-x64@0.25.0':
+    resolution: {integrity: sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
   '@esbuild/sunos-x64@0.18.20':
     resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==}
     engines: {node: '>=12'}
@@ -1493,6 +1622,12 @@ packages:
     cpu: [x64]
     os: [sunos]
 
+  '@esbuild/sunos-x64@0.25.0':
+    resolution: {integrity: sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
   '@esbuild/win32-arm64@0.18.20':
     resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==}
     engines: {node: '>=12'}
@@ -1505,6 +1640,12 @@ packages:
     cpu: [arm64]
     os: [win32]
 
+  '@esbuild/win32-arm64@0.25.0':
+    resolution: {integrity: sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
   '@esbuild/win32-ia32@0.18.20':
     resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==}
     engines: {node: '>=12'}
@@ -1517,6 +1658,12 @@ packages:
     cpu: [ia32]
     os: [win32]
 
+  '@esbuild/win32-ia32@0.25.0':
+    resolution: {integrity: sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
   '@esbuild/win32-x64@0.18.20':
     resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==}
     engines: {node: '>=12'}
@@ -1529,6 +1676,12 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@esbuild/win32-x64@0.25.0':
+    resolution: {integrity: sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
   '@eslint-community/eslint-utils@4.4.0':
     resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -1813,6 +1966,9 @@ packages:
   '@jridgewell/sourcemap-codec@1.4.15':
     resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
 
+  '@jridgewell/sourcemap-codec@1.5.0':
+    resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
+
   '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
@@ -2244,6 +2400,101 @@ packages:
       rollup:
         optional: true
 
+  '@rollup/rollup-android-arm-eabi@4.34.8':
+    resolution: {integrity: sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==}
+    cpu: [arm]
+    os: [android]
+
+  '@rollup/rollup-android-arm64@4.34.8':
+    resolution: {integrity: sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==}
+    cpu: [arm64]
+    os: [android]
+
+  '@rollup/rollup-darwin-arm64@4.34.8':
+    resolution: {integrity: sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rollup/rollup-darwin-x64@4.34.8':
+    resolution: {integrity: sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rollup/rollup-freebsd-arm64@4.34.8':
+    resolution: {integrity: sha512-IQNVXL9iY6NniYbTaOKdrlVP3XIqazBgJOVkddzJlqnCpRi/yAeSOa8PLcECFSQochzqApIOE1GHNu3pCz+BDA==}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@rollup/rollup-freebsd-x64@4.34.8':
+    resolution: {integrity: sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.34.8':
+    resolution: {integrity: sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==}
+    cpu: [arm]
+    os: [linux]
+
+  '@rollup/rollup-linux-arm-musleabihf@4.34.8':
+    resolution: {integrity: sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==}
+    cpu: [arm]
+    os: [linux]
+
+  '@rollup/rollup-linux-arm64-gnu@4.34.8':
+    resolution: {integrity: sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@rollup/rollup-linux-arm64-musl@4.34.8':
+    resolution: {integrity: sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@rollup/rollup-linux-loongarch64-gnu@4.34.8':
+    resolution: {integrity: sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==}
+    cpu: [loong64]
+    os: [linux]
+
+  '@rollup/rollup-linux-powerpc64le-gnu@4.34.8':
+    resolution: {integrity: sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@rollup/rollup-linux-riscv64-gnu@4.34.8':
+    resolution: {integrity: sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@rollup/rollup-linux-s390x-gnu@4.34.8':
+    resolution: {integrity: sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==}
+    cpu: [s390x]
+    os: [linux]
+
+  '@rollup/rollup-linux-x64-gnu@4.34.8':
+    resolution: {integrity: sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==}
+    cpu: [x64]
+    os: [linux]
+
+  '@rollup/rollup-linux-x64-musl@4.34.8':
+    resolution: {integrity: sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==}
+    cpu: [x64]
+    os: [linux]
+
+  '@rollup/rollup-win32-arm64-msvc@4.34.8':
+    resolution: {integrity: sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rollup/rollup-win32-ia32-msvc@4.34.8':
+    resolution: {integrity: sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==}
+    cpu: [ia32]
+    os: [win32]
+
+  '@rollup/rollup-win32-x64-msvc@4.34.8':
+    resolution: {integrity: sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==}
+    cpu: [x64]
+    os: [win32]
+
   '@rsbuild/core@1.0.1-beta.9':
     resolution: {integrity: sha512-F9npL47TFmNVhPBqoE6jBvKGxXEKNszBA7skhbi3opskmX7Ako9vfXvtgi2W2jQjq837/WUL8gG/ua9zRqKFEQ==}
     engines: {node: '>=16.7.0'}
@@ -2722,6 +2973,9 @@ packages:
   '@types/estree@1.0.5':
     resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
 
+  '@types/estree@1.0.6':
+    resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
+
   '@types/express-serve-static-core@4.17.37':
     resolution: {integrity: sha512-ZohaCYTgGFcOP7u6aJOhY9uIZQgZ2vxC2yWoArY+FeDXlqeH66ZVBjgvg+RLVAS/DWNq4Ap9ZXu1+SUQiiWYMg==}
 
@@ -3023,18 +3277,47 @@ packages:
   '@vitest/expect@0.34.6':
     resolution: {integrity: sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==}
 
+  '@vitest/expect@3.0.7':
+    resolution: {integrity: sha512-QP25f+YJhzPfHrHfYHtvRn+uvkCFCqFtW9CktfBxmB+25QqWsx7VB2As6f4GmwllHLDhXNHvqedwhvMmSnNmjw==}
+
+  '@vitest/mocker@3.0.7':
+    resolution: {integrity: sha512-qui+3BLz9Eonx4EAuR/i+QlCX6AUZ35taDQgwGkK/Tw6/WgwodSrjN1X2xf69IA/643ZX5zNKIn2svvtZDrs4w==}
+    peerDependencies:
+      msw: ^2.4.9
+      vite: ^5.0.0 || ^6.0.0
+    peerDependenciesMeta:
+      msw:
+        optional: true
+      vite:
+        optional: true
+
+  '@vitest/pretty-format@3.0.7':
+    resolution: {integrity: sha512-CiRY0BViD/V8uwuEzz9Yapyao+M9M008/9oMOSQydwbwb+CMokEq3XVaF3XK/VWaOK0Jm9z7ENhybg70Gtxsmg==}
+
   '@vitest/runner@0.34.6':
     resolution: {integrity: sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==}
 
+  '@vitest/runner@3.0.7':
+    resolution: {integrity: sha512-WeEl38Z0S2ZcuRTeyYqaZtm4e26tq6ZFqh5y8YD9YxfWuu0OFiGFUbnxNynwLjNRHPsXyee2M9tV7YxOTPZl2g==}
+
   '@vitest/snapshot@0.34.6':
     resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==}
 
+  '@vitest/snapshot@3.0.7':
+    resolution: {integrity: sha512-eqTUryJWQN0Rtf5yqCGTQWsCFOQe4eNz5Twsu21xYEcnFJtMU5XvmG0vgebhdLlrHQTSq5p8vWHJIeJQV8ovsA==}
+
   '@vitest/spy@0.34.6':
     resolution: {integrity: sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==}
 
+  '@vitest/spy@3.0.7':
+    resolution: {integrity: sha512-4T4WcsibB0B6hrKdAZTM37ekuyFZt2cGbEGd2+L0P8ov15J1/HUsUaqkXEQPNAWr4BtPPe1gI+FYfMHhEKfR8w==}
+
   '@vitest/utils@0.34.6':
     resolution: {integrity: sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==}
 
+  '@vitest/utils@3.0.7':
+    resolution: {integrity: sha512-xePVpCRfooFX3rANQjwoditoXgWb1MaFbzmGuPP59MK6i13mrnDw/yEIyJudLeW6/38mCNcwCiJIGmpDPibAIg==}
+
   '@webassemblyjs/ast@1.12.1':
     resolution: {integrity: sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==}
 
@@ -3418,6 +3701,10 @@ packages:
   assertion-error@1.1.0:
     resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
 
+  assertion-error@2.0.1:
+    resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
+    engines: {node: '>=12'}
+
   assign-symbols@1.0.0:
     resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
     engines: {node: '>=0.10.0'}
@@ -3777,6 +4064,10 @@ packages:
     resolution: {integrity: sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==}
     engines: {node: '>=4'}
 
+  chai@5.2.0:
+    resolution: {integrity: sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==}
+    engines: {node: '>=12'}
+
   chalk@2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
     engines: {node: '>=4'}
@@ -3795,6 +4086,9 @@ packages:
   change-case@5.1.2:
     resolution: {integrity: sha512-CAtbGEDulyjzs05RXy3uKcwqeztz/dMEuAc1Xu9NQBsbrhuGMneL0u9Dj5SoutLKBFYun8txxYIwhjtLNfUmCA==}
 
+  change-case@5.4.4:
+    resolution: {integrity: sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==}
+
   character-entities@2.0.2:
     resolution: {integrity: sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==}
 
@@ -3804,6 +4098,10 @@ packages:
   check-error@1.0.3:
     resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}
 
+  check-error@2.1.1:
+    resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==}
+    engines: {node: '>= 16'}
+
   check-more-types@2.24.0:
     resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==}
     engines: {node: '>= 0.8.0'}
@@ -4220,6 +4518,10 @@ packages:
     resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
     engines: {node: '>=6'}
 
+  deep-eql@5.0.2:
+    resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==}
+    engines: {node: '>=6'}
+
   deep-extend@0.6.0:
     resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
     engines: {node: '>=4.0.0'}
@@ -4541,6 +4843,9 @@ packages:
   es-module-lexer@1.5.4:
     resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==}
 
+  es-module-lexer@1.6.0:
+    resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==}
+
   es-object-atoms@1.1.1:
     resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
     engines: {node: '>= 0.4'}
@@ -4586,6 +4891,11 @@ packages:
     engines: {node: '>=12'}
     hasBin: true
 
+  esbuild@0.25.0:
+    resolution: {integrity: sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   escalade@3.1.2:
     resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}
     engines: {node: '>=6'}
@@ -4794,6 +5104,9 @@ packages:
   estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
 
+  estree-walker@3.0.3:
+    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
+
   esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
@@ -4849,6 +5162,10 @@ packages:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
     engines: {node: '>=6'}
 
+  expect-type@1.1.0:
+    resolution: {integrity: sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==}
+    engines: {node: '>=12.0.0'}
+
   exponential-backoff@3.1.1:
     resolution: {integrity: sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==}
 
@@ -6161,6 +6478,9 @@ packages:
     resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==}
     deprecated: Please upgrade to 2.3.7 which fixes GHSA-4q6p-r6v2-jvc5
 
+  loupe@3.1.3:
+    resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==}
+
   lower-case@2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
 
@@ -6189,6 +6509,9 @@ packages:
     resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}
     engines: {node: '>=12'}
 
+  magic-string@0.30.17:
+    resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
+
   magic-string@0.30.4:
     resolution: {integrity: sha512-Q/TKtsC5BPm0kGqgBIF9oXAs/xEf2vRKiIB4wCRQTJOQIByZ1d+NnUOotvJOvNpi5RNIgVOMC3pOuaP1ZTDlVg==}
     engines: {node: '>=12'}
@@ -6478,6 +6801,10 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
+  mineflayer-mouse@0.0.4:
+    resolution: {integrity: sha512-55GqQhJWCXnOnm30uOjtI7nsawPb0kA3cAv6a5n1NJjTWFR6hzMkiRT6xGLYrvYhdf6Er3nsE2Ok/Aysa/jtFQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
   mineflayer-pathfinder@2.4.4:
     resolution: {integrity: sha512-HAXakZrJRb1UC+5dv8EaDrqjW3ZnBnBk3nkb6x/YWyhHCUKn/E7VU0FO+UN9whuqPlkSaVumEdXJdydE6lSYxQ==}
 
@@ -6615,6 +6942,11 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
+  nanoid@3.3.8:
+    resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
   nanomatch@1.2.13:
     resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
     engines: {node: '>=0.10.0'}
@@ -7006,9 +7338,16 @@ packages:
   pathe@1.1.1:
     resolution: {integrity: sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==}
 
+  pathe@2.0.3:
+    resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
+
   pathval@1.1.1:
     resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
 
+  pathval@2.0.0:
+    resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==}
+    engines: {node: '>= 14.16'}
+
   pause-stream@0.0.11:
     resolution: {integrity: sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==}
 
@@ -7122,6 +7461,10 @@ packages:
     resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==}
     engines: {node: ^10 || ^12 || >=14}
 
+  postcss@8.5.3:
+    resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}
+    engines: {node: ^10 || ^12 || >=14}
+
   potpack@1.0.2:
     resolution: {integrity: sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ==}
 
@@ -7810,6 +8153,11 @@ packages:
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
 
+  rollup@4.34.8:
+    resolution: {integrity: sha512-489gTVMzAYdiZHFVA/ig/iYFllCcWFHMvUHI1rpFmkoUtRlQxqh6/yiNqnYibjMZ2b/+FUQwldG+aLsEt6bglQ==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
+    hasBin: true
+
   rope-sequence@1.3.4:
     resolution: {integrity: sha512-UT5EDe2cu2E/6O4igUr5PSFs23nvvukicWHx6GnOPlHAiiYbzNuCRQCuiUdHJQcqKalLKlrYJnjY0ySGsXNQXQ==}
 
@@ -8199,6 +8547,9 @@ packages:
   std-env@3.4.3:
     resolution: {integrity: sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==}
 
+  std-env@3.8.0:
+    resolution: {integrity: sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==}
+
   store2@2.14.2:
     resolution: {integrity: sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==}
 
@@ -8441,17 +8792,35 @@ packages:
   tinybench@2.5.1:
     resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==}
 
+  tinybench@2.9.0:
+    resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
+
   tinycolor2@1.6.0:
     resolution: {integrity: sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==}
 
+  tinyexec@0.3.2:
+    resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==}
+
   tinypool@0.7.0:
     resolution: {integrity: sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==}
     engines: {node: '>=14.0.0'}
 
+  tinypool@1.0.2:
+    resolution: {integrity: sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+
+  tinyrainbow@2.0.0:
+    resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
+    engines: {node: '>=14.0.0'}
+
   tinyspy@2.2.0:
     resolution: {integrity: sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==}
     engines: {node: '>=14.0.0'}
 
+  tinyspy@3.0.2:
+    resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
+    engines: {node: '>=14.0.0'}
+
   title-case@3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
 
@@ -8906,6 +9275,11 @@ packages:
     engines: {node: '>=v14.18.0'}
     hasBin: true
 
+  vite-node@3.0.7:
+    resolution: {integrity: sha512-2fX0QwX4GkkkpULXdT1Pf4q0tC1i1lFOyseKoonavXUNlQ77KpW2XqBGGNIm/J4Ows4KxgGJzDguYVPKwG/n5A==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+    hasBin: true
+
   vite@4.5.3:
     resolution: {integrity: sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -8934,6 +9308,46 @@ packages:
       terser:
         optional: true
 
+  vite@6.2.0:
+    resolution: {integrity: sha512-7dPxoo+WsT/64rDcwoOjk76XHj+TqNTIvHKcuMQ1k4/SeHDaQt5GFAeLYzrimZrMpn/O6DtdI03WUjdxuPM0oQ==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
+      jiti: '>=1.21.0'
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      sass-embedded: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+
   vitest@0.34.6:
     resolution: {integrity: sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==}
     engines: {node: '>=v14.18.0'}
@@ -8965,6 +9379,34 @@ packages:
       webdriverio:
         optional: true
 
+  vitest@3.0.7:
+    resolution: {integrity: sha512-IP7gPK3LS3Fvn44x30X1dM9vtawm0aesAa2yBIZ9vQf+qB69NXC5776+Qmcr7ohUXIQuLhk7xQR0aSUIDPqavg==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+    hasBin: true
+    peerDependencies:
+      '@edge-runtime/vm': '*'
+      '@types/debug': ^4.1.12
+      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
+      '@vitest/browser': 3.0.7
+      '@vitest/ui': 3.0.7
+      happy-dom: '*'
+      jsdom: '*'
+    peerDependenciesMeta:
+      '@edge-runtime/vm':
+        optional: true
+      '@types/debug':
+        optional: true
+      '@types/node':
+        optional: true
+      '@vitest/browser':
+        optional: true
+      '@vitest/ui':
+        optional: true
+      happy-dom:
+        optional: true
+      jsdom:
+        optional: true
+
   vm-browserify@1.1.2:
     resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==}
 
@@ -9067,6 +9509,11 @@ packages:
     engines: {node: '>=8'}
     hasBin: true
 
+  why-is-node-running@2.3.0:
+    resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
+    engines: {node: '>=8'}
+    hasBin: true
+
   wide-align@1.1.5:
     resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}
 
@@ -10255,138 +10702,213 @@ snapshots:
   '@esbuild/aix-ppc64@0.19.11':
     optional: true
 
+  '@esbuild/aix-ppc64@0.25.0':
+    optional: true
+
   '@esbuild/android-arm64@0.18.20':
     optional: true
 
   '@esbuild/android-arm64@0.19.11':
     optional: true
 
+  '@esbuild/android-arm64@0.25.0':
+    optional: true
+
   '@esbuild/android-arm@0.18.20':
     optional: true
 
   '@esbuild/android-arm@0.19.11':
     optional: true
 
+  '@esbuild/android-arm@0.25.0':
+    optional: true
+
   '@esbuild/android-x64@0.18.20':
     optional: true
 
   '@esbuild/android-x64@0.19.11':
     optional: true
 
+  '@esbuild/android-x64@0.25.0':
+    optional: true
+
   '@esbuild/darwin-arm64@0.18.20':
     optional: true
 
   '@esbuild/darwin-arm64@0.19.11':
     optional: true
 
+  '@esbuild/darwin-arm64@0.25.0':
+    optional: true
+
   '@esbuild/darwin-x64@0.18.20':
     optional: true
 
   '@esbuild/darwin-x64@0.19.11':
     optional: true
 
+  '@esbuild/darwin-x64@0.25.0':
+    optional: true
+
   '@esbuild/freebsd-arm64@0.18.20':
     optional: true
 
   '@esbuild/freebsd-arm64@0.19.11':
     optional: true
 
+  '@esbuild/freebsd-arm64@0.25.0':
+    optional: true
+
   '@esbuild/freebsd-x64@0.18.20':
     optional: true
 
   '@esbuild/freebsd-x64@0.19.11':
     optional: true
 
+  '@esbuild/freebsd-x64@0.25.0':
+    optional: true
+
   '@esbuild/linux-arm64@0.18.20':
     optional: true
 
   '@esbuild/linux-arm64@0.19.11':
     optional: true
 
+  '@esbuild/linux-arm64@0.25.0':
+    optional: true
+
   '@esbuild/linux-arm@0.18.20':
     optional: true
 
   '@esbuild/linux-arm@0.19.11':
     optional: true
 
+  '@esbuild/linux-arm@0.25.0':
+    optional: true
+
   '@esbuild/linux-ia32@0.18.20':
     optional: true
 
   '@esbuild/linux-ia32@0.19.11':
     optional: true
 
+  '@esbuild/linux-ia32@0.25.0':
+    optional: true
+
   '@esbuild/linux-loong64@0.18.20':
     optional: true
 
   '@esbuild/linux-loong64@0.19.11':
     optional: true
 
+  '@esbuild/linux-loong64@0.25.0':
+    optional: true
+
   '@esbuild/linux-mips64el@0.18.20':
     optional: true
 
   '@esbuild/linux-mips64el@0.19.11':
     optional: true
 
+  '@esbuild/linux-mips64el@0.25.0':
+    optional: true
+
   '@esbuild/linux-ppc64@0.18.20':
     optional: true
 
   '@esbuild/linux-ppc64@0.19.11':
     optional: true
 
+  '@esbuild/linux-ppc64@0.25.0':
+    optional: true
+
   '@esbuild/linux-riscv64@0.18.20':
     optional: true
 
   '@esbuild/linux-riscv64@0.19.11':
     optional: true
 
+  '@esbuild/linux-riscv64@0.25.0':
+    optional: true
+
   '@esbuild/linux-s390x@0.18.20':
     optional: true
 
   '@esbuild/linux-s390x@0.19.11':
     optional: true
 
+  '@esbuild/linux-s390x@0.25.0':
+    optional: true
+
   '@esbuild/linux-x64@0.18.20':
     optional: true
 
   '@esbuild/linux-x64@0.19.11':
     optional: true
 
+  '@esbuild/linux-x64@0.25.0':
+    optional: true
+
+  '@esbuild/netbsd-arm64@0.25.0':
+    optional: true
+
   '@esbuild/netbsd-x64@0.18.20':
     optional: true
 
   '@esbuild/netbsd-x64@0.19.11':
     optional: true
 
+  '@esbuild/netbsd-x64@0.25.0':
+    optional: true
+
+  '@esbuild/openbsd-arm64@0.25.0':
+    optional: true
+
   '@esbuild/openbsd-x64@0.18.20':
     optional: true
 
   '@esbuild/openbsd-x64@0.19.11':
     optional: true
 
+  '@esbuild/openbsd-x64@0.25.0':
+    optional: true
+
   '@esbuild/sunos-x64@0.18.20':
     optional: true
 
   '@esbuild/sunos-x64@0.19.11':
     optional: true
 
+  '@esbuild/sunos-x64@0.25.0':
+    optional: true
+
   '@esbuild/win32-arm64@0.18.20':
     optional: true
 
   '@esbuild/win32-arm64@0.19.11':
     optional: true
 
+  '@esbuild/win32-arm64@0.25.0':
+    optional: true
+
   '@esbuild/win32-ia32@0.18.20':
     optional: true
 
   '@esbuild/win32-ia32@0.19.11':
     optional: true
 
+  '@esbuild/win32-ia32@0.25.0':
+    optional: true
+
   '@esbuild/win32-x64@0.18.20':
     optional: true
 
   '@esbuild/win32-x64@0.19.11':
     optional: true
 
+  '@esbuild/win32-x64@0.25.0':
+    optional: true
+
   '@eslint-community/eslint-utils@4.4.0(eslint@8.50.0)':
     dependencies:
       eslint: 8.50.0
@@ -10814,13 +11336,13 @@ snapshots:
       regenerator-runtime: 0.13.11
     optional: true
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.2.1(typescript@5.5.4)(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))':
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.2.1(typescript@5.5.4)(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))':
     dependencies:
       glob: 7.2.3
       glob-promise: 4.2.2(glob@7.2.3)
       magic-string: 0.27.0
       react-docgen-typescript: 2.2.2(typescript@5.5.4)
-      vite: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
+      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
     optionalDependencies:
       typescript: 5.5.4
 
@@ -10841,6 +11363,8 @@ snapshots:
 
   '@jridgewell/sourcemap-codec@1.4.15': {}
 
+  '@jridgewell/sourcemap-codec@1.5.0': {}
+
   '@jridgewell/trace-mapping@0.3.25':
     dependencies:
       '@jridgewell/resolve-uri': 3.1.1
@@ -11299,6 +11823,63 @@ snapshots:
     optionalDependencies:
       rollup: 2.79.1
 
+  '@rollup/rollup-android-arm-eabi@4.34.8':
+    optional: true
+
+  '@rollup/rollup-android-arm64@4.34.8':
+    optional: true
+
+  '@rollup/rollup-darwin-arm64@4.34.8':
+    optional: true
+
+  '@rollup/rollup-darwin-x64@4.34.8':
+    optional: true
+
+  '@rollup/rollup-freebsd-arm64@4.34.8':
+    optional: true
+
+  '@rollup/rollup-freebsd-x64@4.34.8':
+    optional: true
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.34.8':
+    optional: true
+
+  '@rollup/rollup-linux-arm-musleabihf@4.34.8':
+    optional: true
+
+  '@rollup/rollup-linux-arm64-gnu@4.34.8':
+    optional: true
+
+  '@rollup/rollup-linux-arm64-musl@4.34.8':
+    optional: true
+
+  '@rollup/rollup-linux-loongarch64-gnu@4.34.8':
+    optional: true
+
+  '@rollup/rollup-linux-powerpc64le-gnu@4.34.8':
+    optional: true
+
+  '@rollup/rollup-linux-riscv64-gnu@4.34.8':
+    optional: true
+
+  '@rollup/rollup-linux-s390x-gnu@4.34.8':
+    optional: true
+
+  '@rollup/rollup-linux-x64-gnu@4.34.8':
+    optional: true
+
+  '@rollup/rollup-linux-x64-musl@4.34.8':
+    optional: true
+
+  '@rollup/rollup-win32-arm64-msvc@4.34.8':
+    optional: true
+
+  '@rollup/rollup-win32-ia32-msvc@4.34.8':
+    optional: true
+
+  '@rollup/rollup-win32-x64-msvc@4.34.8':
+    optional: true
+
   '@rsbuild/core@1.0.1-beta.9':
     dependencies:
       '@rspack/core': 1.0.0-beta.1(@swc/helpers@0.5.11)
@@ -11696,7 +12277,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@storybook/builder-vite@7.4.6(encoding@0.1.13)(typescript@5.5.4)(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))':
+  '@storybook/builder-vite@7.4.6(encoding@0.1.13)(typescript@5.5.4)(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))':
     dependencies:
       '@storybook/channels': 7.4.6
       '@storybook/client-logger': 7.4.6
@@ -11717,7 +12298,7 @@ snapshots:
       remark-external-links: 8.0.0
       remark-slug: 6.1.0
       rollup: 3.29.4
-      vite: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
+      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
     optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -12003,19 +12584,19 @@ snapshots:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
 
-  '@storybook/react-vite@7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.4)(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))':
+  '@storybook/react-vite@7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.4)(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))':
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.2.1(typescript@5.5.4)(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.2.1(typescript@5.5.4)(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))
       '@rollup/pluginutils': 5.0.5(rollup@2.79.1)
-      '@storybook/builder-vite': 7.4.6(encoding@0.1.13)(typescript@5.5.4)(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))
+      '@storybook/builder-vite': 7.4.6(encoding@0.1.13)(typescript@5.5.4)(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))
       '@storybook/react': 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
-      '@vitejs/plugin-react': 3.1.0(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))
+      '@vitejs/plugin-react': 3.1.0(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))
       ast-types: 0.14.2
       magic-string: 0.30.4
       react: 18.2.0
       react-docgen: 6.0.0-alpha.3
       react-dom: 18.2.0(react@18.2.0)
-      vite: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
+      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - encoding
@@ -12237,6 +12818,8 @@ snapshots:
 
   '@types/estree@1.0.5': {}
 
+  '@types/estree@1.0.6': {}
+
   '@types/express-serve-static-core@4.17.37':
     dependencies:
       '@types/node': 22.8.1
@@ -12582,14 +13165,14 @@ snapshots:
       '@typescript-eslint/types': 8.0.0
       eslint-visitor-keys: 3.4.3
 
-  '@vitejs/plugin-react@3.1.0(vite@4.5.3(@types/node@22.8.1)(terser@5.31.3))':
+  '@vitejs/plugin-react@3.1.0(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))':
     dependencies:
       '@babel/core': 7.22.11
       '@babel/plugin-transform-react-jsx-self': 7.22.5(@babel/core@7.22.11)
       '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.22.11)
       magic-string: 0.27.0
       react-refresh: 0.14.2
-      vite: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
+      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -12599,28 +13182,68 @@ snapshots:
       '@vitest/utils': 0.34.6
       chai: 4.3.10
 
+  '@vitest/expect@3.0.7':
+    dependencies:
+      '@vitest/spy': 3.0.7
+      '@vitest/utils': 3.0.7
+      chai: 5.2.0
+      tinyrainbow: 2.0.0
+
+  '@vitest/mocker@3.0.7(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))':
+    dependencies:
+      '@vitest/spy': 3.0.7
+      estree-walker: 3.0.3
+      magic-string: 0.30.17
+    optionalDependencies:
+      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+
+  '@vitest/pretty-format@3.0.7':
+    dependencies:
+      tinyrainbow: 2.0.0
+
   '@vitest/runner@0.34.6':
     dependencies:
       '@vitest/utils': 0.34.6
       p-limit: 4.0.0
       pathe: 1.1.1
 
+  '@vitest/runner@3.0.7':
+    dependencies:
+      '@vitest/utils': 3.0.7
+      pathe: 2.0.3
+
   '@vitest/snapshot@0.34.6':
     dependencies:
       magic-string: 0.30.4
       pathe: 1.1.1
       pretty-format: 29.7.0
 
+  '@vitest/snapshot@3.0.7':
+    dependencies:
+      '@vitest/pretty-format': 3.0.7
+      magic-string: 0.30.17
+      pathe: 2.0.3
+
   '@vitest/spy@0.34.6':
     dependencies:
       tinyspy: 2.2.0
 
+  '@vitest/spy@3.0.7':
+    dependencies:
+      tinyspy: 3.0.2
+
   '@vitest/utils@0.34.6':
     dependencies:
       diff-sequences: 29.6.3
       loupe: 2.3.6
       pretty-format: 29.7.0
 
+  '@vitest/utils@3.0.7':
+    dependencies:
+      '@vitest/pretty-format': 3.0.7
+      loupe: 3.1.3
+      tinyrainbow: 2.0.0
+
   '@webassemblyjs/ast@1.12.1':
     dependencies:
       '@webassemblyjs/helper-numbers': 1.11.6
@@ -13123,6 +13746,8 @@ snapshots:
 
   assertion-error@1.1.0: {}
 
+  assertion-error@2.0.1: {}
+
   assign-symbols@1.0.0: {}
 
   ast-types@0.14.2:
@@ -13603,6 +14228,14 @@ snapshots:
       pathval: 1.1.1
       type-detect: 4.0.8
 
+  chai@5.2.0:
+    dependencies:
+      assertion-error: 2.0.1
+      check-error: 2.1.1
+      deep-eql: 5.0.2
+      loupe: 3.1.3
+      pathval: 2.0.0
+
   chalk@2.4.2:
     dependencies:
       ansi-styles: 3.2.1
@@ -13633,6 +14266,8 @@ snapshots:
 
   change-case@5.1.2: {}
 
+  change-case@5.4.4: {}
+
   character-entities@2.0.2: {}
 
   charenc@0.0.2: {}
@@ -13641,6 +14276,8 @@ snapshots:
     dependencies:
       get-func-name: 2.0.2
 
+  check-error@2.1.1: {}
+
   check-more-types@2.24.0:
     optional: true
 
@@ -14154,6 +14791,8 @@ snapshots:
     dependencies:
       type-detect: 4.0.8
 
+  deep-eql@5.0.2: {}
+
   deep-extend@0.6.0: {}
 
   deep-is@0.1.4: {}
@@ -14600,6 +15239,8 @@ snapshots:
 
   es-module-lexer@1.5.4: {}
 
+  es-module-lexer@1.6.0: {}
+
   es-object-atoms@1.1.1:
     dependencies:
       es-errors: 1.3.0
@@ -14693,6 +15334,34 @@ snapshots:
       '@esbuild/win32-ia32': 0.19.11
       '@esbuild/win32-x64': 0.19.11
 
+  esbuild@0.25.0:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.25.0
+      '@esbuild/android-arm': 0.25.0
+      '@esbuild/android-arm64': 0.25.0
+      '@esbuild/android-x64': 0.25.0
+      '@esbuild/darwin-arm64': 0.25.0
+      '@esbuild/darwin-x64': 0.25.0
+      '@esbuild/freebsd-arm64': 0.25.0
+      '@esbuild/freebsd-x64': 0.25.0
+      '@esbuild/linux-arm': 0.25.0
+      '@esbuild/linux-arm64': 0.25.0
+      '@esbuild/linux-ia32': 0.25.0
+      '@esbuild/linux-loong64': 0.25.0
+      '@esbuild/linux-mips64el': 0.25.0
+      '@esbuild/linux-ppc64': 0.25.0
+      '@esbuild/linux-riscv64': 0.25.0
+      '@esbuild/linux-s390x': 0.25.0
+      '@esbuild/linux-x64': 0.25.0
+      '@esbuild/netbsd-arm64': 0.25.0
+      '@esbuild/netbsd-x64': 0.25.0
+      '@esbuild/openbsd-arm64': 0.25.0
+      '@esbuild/openbsd-x64': 0.25.0
+      '@esbuild/sunos-x64': 0.25.0
+      '@esbuild/win32-arm64': 0.25.0
+      '@esbuild/win32-ia32': 0.25.0
+      '@esbuild/win32-x64': 0.25.0
+
   escalade@3.1.2: {}
 
   escape-html@1.0.3: {}
@@ -14968,6 +15637,10 @@ snapshots:
 
   estree-walker@2.0.2: {}
 
+  estree-walker@3.0.3:
+    dependencies:
+      '@types/estree': 1.0.6
+
   esutils@2.0.3: {}
 
   etag@1.8.1: {}
@@ -15045,6 +15718,8 @@ snapshots:
 
   expand-template@2.0.3: {}
 
+  expect-type@1.1.0: {}
+
   exponential-backoff@3.1.1:
     optional: true
 
@@ -16586,6 +17261,8 @@ snapshots:
     dependencies:
       get-func-name: 2.0.2
 
+  loupe@3.1.3: {}
+
   lower-case@2.0.2:
     dependencies:
       tslib: 2.6.2
@@ -16613,6 +17290,10 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
 
+  magic-string@0.30.17:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.0
+
   magic-string@0.30.4:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
@@ -17061,6 +17742,33 @@ snapshots:
       - encoding
       - supports-color
 
+  mineflayer-mouse@0.0.4(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+    dependencies:
+      change-case: 5.4.4
+      debug: 4.4.0(supports-color@8.1.1)
+      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
+      vitest: 3.0.7(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+    transitivePeerDependencies:
+      - '@edge-runtime/vm'
+      - '@types/debug'
+      - '@types/node'
+      - '@vitest/browser'
+      - '@vitest/ui'
+      - happy-dom
+      - jiti
+      - jsdom
+      - less
+      - lightningcss
+      - msw
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+      - tsx
+      - yaml
+
   mineflayer-pathfinder@2.4.4:
     dependencies:
       minecraft-data: 3.83.1
@@ -17254,6 +17962,8 @@ snapshots:
 
   nanoid@3.3.7: {}
 
+  nanoid@3.3.8: {}
+
   nanomatch@1.2.13:
     dependencies:
       arr-diff: 4.0.0
@@ -17712,8 +18422,12 @@ snapshots:
 
   pathe@1.1.1: {}
 
+  pathe@2.0.3: {}
+
   pathval@1.1.1: {}
 
+  pathval@2.0.0: {}
+
   pause-stream@0.0.11:
     dependencies:
       through: 2.3.8
@@ -17821,6 +18535,12 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
+  postcss@8.5.3:
+    dependencies:
+      nanoid: 3.3.8
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
+
   potpack@1.0.2: {}
 
   prebuild-install@7.1.1:
@@ -18703,6 +19423,31 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.3
 
+  rollup@4.34.8:
+    dependencies:
+      '@types/estree': 1.0.6
+    optionalDependencies:
+      '@rollup/rollup-android-arm-eabi': 4.34.8
+      '@rollup/rollup-android-arm64': 4.34.8
+      '@rollup/rollup-darwin-arm64': 4.34.8
+      '@rollup/rollup-darwin-x64': 4.34.8
+      '@rollup/rollup-freebsd-arm64': 4.34.8
+      '@rollup/rollup-freebsd-x64': 4.34.8
+      '@rollup/rollup-linux-arm-gnueabihf': 4.34.8
+      '@rollup/rollup-linux-arm-musleabihf': 4.34.8
+      '@rollup/rollup-linux-arm64-gnu': 4.34.8
+      '@rollup/rollup-linux-arm64-musl': 4.34.8
+      '@rollup/rollup-linux-loongarch64-gnu': 4.34.8
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.34.8
+      '@rollup/rollup-linux-riscv64-gnu': 4.34.8
+      '@rollup/rollup-linux-s390x-gnu': 4.34.8
+      '@rollup/rollup-linux-x64-gnu': 4.34.8
+      '@rollup/rollup-linux-x64-musl': 4.34.8
+      '@rollup/rollup-win32-arm64-msvc': 4.34.8
+      '@rollup/rollup-win32-ia32-msvc': 4.34.8
+      '@rollup/rollup-win32-x64-msvc': 4.34.8
+      fsevents: 2.3.3
+
   rope-sequence@1.3.4: {}
 
   rtl-css-js@1.16.1:
@@ -19251,6 +19996,8 @@ snapshots:
 
   std-env@3.4.3: {}
 
+  std-env@3.8.0: {}
+
   store2@2.14.2: {}
 
   storybook@7.4.6(encoding@0.1.13):
@@ -19537,13 +20284,23 @@ snapshots:
 
   tinybench@2.5.1: {}
 
+  tinybench@2.9.0: {}
+
   tinycolor2@1.6.0:
     optional: true
 
+  tinyexec@0.3.2: {}
+
   tinypool@0.7.0: {}
 
+  tinypool@1.0.2: {}
+
+  tinyrainbow@2.0.0: {}
+
   tinyspy@2.2.0: {}
 
+  tinyspy@3.0.2: {}
+
   title-case@3.0.3:
     dependencies:
       tslib: 2.6.2
@@ -20014,6 +20771,27 @@ snapshots:
       - supports-color
       - terser
 
+  vite-node@3.0.7(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+    dependencies:
+      cac: 6.7.14
+      debug: 4.4.0(supports-color@8.1.1)
+      es-module-lexer: 1.6.0
+      pathe: 2.0.3
+      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+    transitivePeerDependencies:
+      - '@types/node'
+      - jiti
+      - less
+      - lightningcss
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+      - tsx
+      - yaml
+
   vite@4.5.3(@types/node@22.8.1)(terser@5.31.3):
     dependencies:
       esbuild: 0.18.20
@@ -20024,6 +20802,18 @@ snapshots:
       fsevents: 2.3.3
       terser: 5.31.3
 
+  vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+    dependencies:
+      esbuild: 0.25.0
+      postcss: 8.5.3
+      rollup: 4.34.8
+    optionalDependencies:
+      '@types/node': 22.8.1
+      fsevents: 2.3.3
+      terser: 5.31.3
+      tsx: 4.7.0
+      yaml: 2.4.1
+
   vitest@0.34.6(terser@5.31.3):
     dependencies:
       '@types/chai': 4.3.6
@@ -20059,6 +20849,45 @@ snapshots:
       - supports-color
       - terser
 
+  vitest@3.0.7(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+    dependencies:
+      '@vitest/expect': 3.0.7
+      '@vitest/mocker': 3.0.7(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))
+      '@vitest/pretty-format': 3.0.7
+      '@vitest/runner': 3.0.7
+      '@vitest/snapshot': 3.0.7
+      '@vitest/spy': 3.0.7
+      '@vitest/utils': 3.0.7
+      chai: 5.2.0
+      debug: 4.4.0(supports-color@8.1.1)
+      expect-type: 1.1.0
+      magic-string: 0.30.17
+      pathe: 2.0.3
+      std-env: 3.8.0
+      tinybench: 2.9.0
+      tinyexec: 0.3.2
+      tinypool: 1.0.2
+      tinyrainbow: 2.0.0
+      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+      vite-node: 3.0.7(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+      why-is-node-running: 2.3.0
+    optionalDependencies:
+      '@types/debug': 4.1.12
+      '@types/node': 22.8.1
+    transitivePeerDependencies:
+      - jiti
+      - less
+      - lightningcss
+      - msw
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+      - tsx
+      - yaml
+
   vm-browserify@1.1.2: {}
 
   w3c-keyname@2.2.8: {}
@@ -20212,6 +21041,11 @@ snapshots:
       siginfo: 2.0.0
       stackback: 0.0.2
 
+  why-is-node-running@2.3.0:
+    dependencies:
+      siginfo: 2.0.0
+      stackback: 0.0.2
+
   wide-align@1.1.5:
     dependencies:
       string-width: 4.2.3
diff --git a/src/cameraRotationControls.ts b/src/cameraRotationControls.ts
index b9bc5fe9..0c222dc6 100644
--- a/src/cameraRotationControls.ts
+++ b/src/cameraRotationControls.ts
@@ -3,20 +3,10 @@ import { activeModalStack, isGameActive, miscUiState, showModal } from './global
 import { options } from './optionsStorage'
 import { hideNotification, notificationProxy } from './react/NotificationProvider'
 import { pointerLock } from './utils'
-import worldInteractions from './worldInteractions'
 import { updateMotion, initMotionTracking } from './react/uiMotion'
 
 let lastMouseMove: number
 
-const MOTION_DAMPING = 0.92
-const MAX_MOTION_OFFSET = 30
-const motionVelocity = { x: 0, y: 0 }
-const lastUpdate = performance.now()
-
-export const updateCursor = () => {
-  worldInteractions.update()
-}
-
 export type CameraMoveEvent = {
   movementX: number
   movementY: number
@@ -30,7 +20,7 @@ export function onCameraMove (e: MouseEvent | CameraMoveEvent) {
   e.stopPropagation?.()
   const now = performance.now()
   // todo: limit camera movement for now to avoid unexpected jumps
-  if (now - lastMouseMove < 4) return
+  if (now - lastMouseMove < 4 && !options.preciseMouseInput) return
   lastMouseMove = now
   let { mouseSensX, mouseSensY } = options
   if (mouseSensY === -1) mouseSensY = mouseSensX
@@ -38,7 +28,7 @@ export function onCameraMove (e: MouseEvent | CameraMoveEvent) {
     x: e.movementX * mouseSensX * 0.0001,
     y: e.movementY * mouseSensY * 0.0001
   })
-  updateCursor()
+  bot.mouse.update()
   updateMotion()
 }
 
diff --git a/src/devtools.ts b/src/devtools.ts
index 5d0be20b..617a4440 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -3,7 +3,6 @@
 import fs from 'fs'
 import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
 import { enable, disable, enabled } from 'debug'
-import { getEntityCursor } from './worldInteractions'
 
 window.cursorBlockRel = (x = 0, y = 0, z = 0) => {
   const newPos = bot.blockAtCursor(5)?.position.offset(x, y, z)
@@ -11,8 +10,8 @@ window.cursorBlockRel = (x = 0, y = 0, z = 0) => {
   return bot.world.getBlock(newPos)
 }
 
-window.cursorEntity = () => {
-  return getEntityCursor()
+window.entityCursor = () => {
+  return bot.mouse.getCursorState().entity
 }
 
 // wanderer
diff --git a/src/globals.d.ts b/src/globals.d.ts
index 96b32916..6b2c6640 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -21,7 +21,7 @@ declare const loadedData: import('minecraft-data').IndexedData & { sounds: Recor
 declare const customEvents: import('typed-emitter').default<{
   /** Singleplayer load requested */
   singleplayer (): void
-  digStart ()
+  digStart (): void
   gameLoaded (): void
   mineflayerBotCreated (): void
   search (q: string): void
diff --git a/src/index.ts b/src/index.ts
index 249fbe9d..beb86aea 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -40,8 +40,6 @@ import { WorldDataEmitter, Viewer } from 'renderer/viewer'
 import pathfinder from 'mineflayer-pathfinder'
 import { Vec3 } from 'vec3'
 
-import worldInteractions from './worldInteractions'
-
 import * as THREE from 'three'
 import MinecraftData from 'minecraft-data'
 import debug from 'debug'
@@ -106,13 +104,12 @@ import { parseFormattedMessagePacket } from './botUtils'
 import { getViewerVersionData, getWsProtocolStream, handleCustomChannel } from './viewerConnector'
 import { getWebsocketStream } from './mineflayer/websocket-core'
 import { appQueryParams, appQueryParamsArray } from './appParams'
-import { updateCursor } from './cameraRotationControls'
-import { pingServerVersion } from './mineflayer/minecraft-protocol-extra'
 import { playerState, PlayerStateManager } from './mineflayer/playerState'
 import { states } from 'minecraft-protocol'
 import { initMotionTracking } from './react/uiMotion'
 import { UserError } from './mineflayer/userError'
 import ping from './mineflayer/plugins/ping'
+import mouse from './mineflayer/plugins/mouse'
 import { LocalServer } from './customServer'
 import { startLocalReplayServer } from './packetsReplay/replayPackets'
 import { localRelayServerPlugin } from './mineflayer/plugins/packetsRecording'
@@ -120,7 +117,6 @@ import { createFullScreenProgressReporter } from './core/progressReporter'
 
 window.debug = debug
 window.THREE = THREE
-window.worldInteractions = worldInteractions
 window.beforeRenderFrame = []
 
 // ACTUAL CODE
@@ -705,6 +701,7 @@ export async function connect (connectOptions: ConnectOptions) {
   if (connectOptions.server) {
     bot.loadPlugin(ping)
   }
+  bot.loadPlugin(mouse)
   if (!localReplaySession) {
     bot.loadPlugin(localRelayServerPlugin)
   }
@@ -754,8 +751,6 @@ export async function connect (connectOptions: ConnectOptions) {
   onBotCreate()
 
   bot.once('login', () => {
-    worldInteractions.initBot()
-
     setLoadingScreenStatus('Loading world')
 
     const mcData = MinecraftData(bot.version)
@@ -815,8 +810,6 @@ export async function connect (connectOptions: ConnectOptions) {
     const worldView = window.worldView = new WorldDataEmitter(bot.world, renderDistance, center)
     watchOptionsAfterWorldViewInit()
 
-    bot.on('physicsTick', () => updateCursor())
-
     void initVR()
     initMotionTracking()
 
diff --git a/src/mineflayer/plugins/mouse.ts b/src/mineflayer/plugins/mouse.ts
new file mode 100644
index 00000000..e5b5e283
--- /dev/null
+++ b/src/mineflayer/plugins/mouse.ts
@@ -0,0 +1,204 @@
+import { createMouse } from 'mineflayer-mouse'
+import * as THREE from 'three'
+import { Bot } from 'mineflayer'
+import { Block } from 'prismarine-block'
+import { Vec3 } from 'vec3'
+import { LineMaterial } from 'three-stdlib'
+import { subscribeKey } from 'valtio/utils'
+import { disposeObject } from 'renderer/viewer/lib/threeJsUtils'
+import { isGameActive, showModal } from '../../globalState'
+
+// wouldn't better to create atlas instead?
+import destroyStage0 from '../../../assets/destroy_stage_0.png'
+import destroyStage1 from '../../../assets/destroy_stage_1.png'
+import destroyStage2 from '../../../assets/destroy_stage_2.png'
+import destroyStage3 from '../../../assets/destroy_stage_3.png'
+import destroyStage4 from '../../../assets/destroy_stage_4.png'
+import destroyStage5 from '../../../assets/destroy_stage_5.png'
+import destroyStage6 from '../../../assets/destroy_stage_6.png'
+import destroyStage7 from '../../../assets/destroy_stage_7.png'
+import destroyStage8 from '../../../assets/destroy_stage_8.png'
+import destroyStage9 from '../../../assets/destroy_stage_9.png'
+import { options } from '../../optionsStorage'
+import { isCypress } from '../../standaloneUtils'
+import { playerState } from '../playerState'
+
+function createDisplayManager (bot: Bot, scene: THREE.Scene, renderer: THREE.WebGLRenderer) {
+  // State
+  const state = {
+    blockBreakMesh: null as THREE.Mesh | null,
+    breakTextures: [] as THREE.Texture[],
+  }
+
+  // Initialize break mesh and textures
+  const loader = new THREE.TextureLoader()
+  const destroyStagesImages = [
+    destroyStage0, destroyStage1, destroyStage2, destroyStage3, destroyStage4,
+    destroyStage5, destroyStage6, destroyStage7, destroyStage8, destroyStage9
+  ]
+
+  for (let i = 0; i < 10; i++) {
+    const texture = loader.load(destroyStagesImages[i])
+    texture.magFilter = THREE.NearestFilter
+    texture.minFilter = THREE.NearestFilter
+    state.breakTextures.push(texture)
+  }
+
+  const breakMaterial = new THREE.MeshBasicMaterial({
+    transparent: true,
+    blending: THREE.MultiplyBlending,
+    alphaTest: 0.5,
+  })
+  state.blockBreakMesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 1), breakMaterial)
+  state.blockBreakMesh.visible = false
+  state.blockBreakMesh.renderOrder = 999
+  state.blockBreakMesh.name = 'blockBreakMesh'
+  scene.add(state.blockBreakMesh)
+
+  // Update functions
+  function updateLineMaterial () {
+    const inCreative = bot.game.gameMode === 'creative'
+    const pixelRatio = viewer.renderer.getPixelRatio()
+
+    viewer.world.threejsCursorLineMaterial = new LineMaterial({
+      color: (() => {
+        switch (options.highlightBlockColor) {
+          case 'blue':
+            return 0x40_80_ff
+          case 'classic':
+            return 0x00_00_00
+          default:
+            return inCreative ? 0x40_80_ff : 0x00_00_00
+        }
+      })(),
+      linewidth: Math.max(pixelRatio * 0.7, 1) * 2,
+      // dashed: true,
+      // dashSize: 5,
+    })
+  }
+
+  function updateDisplay () {
+    if (viewer.world.threejsCursorLineMaterial) {
+      const { renderer } = viewer
+      viewer.world.threejsCursorLineMaterial.resolution.set(renderer.domElement.width, renderer.domElement.height)
+      viewer.world.threejsCursorLineMaterial.dashOffset = performance.now() / 750
+    }
+  }
+  beforeRenderFrame.push(updateDisplay)
+
+  // Update cursor line material on game mode change
+  bot.on('game', updateLineMaterial)
+  // Update material when highlight color setting changes
+  subscribeKey(options, 'highlightBlockColor', updateLineMaterial)
+
+  function updateBreakAnimation (block: Block | undefined, stage: number | null) {
+    hideBreakAnimation()
+    if (!state.blockBreakMesh) return // todo
+    if (stage === null || !block) return
+
+    const mergedShape = bot.mouse.getMergedCursorShape(block)
+    if (!mergedShape) return
+    const { position, width, height, depth } = bot.mouse.getDataFromShape(mergedShape)
+    state.blockBreakMesh.scale.set(width * 1.001, height * 1.001, depth * 1.001)
+    position.add(block.position)
+    state.blockBreakMesh.position.set(position.x, position.y, position.z)
+    state.blockBreakMesh.visible = true
+
+    //@ts-expect-error
+    state.blockBreakMesh.material.map = state.breakTextures[stage] ?? state.breakTextures.at(-1)
+    //@ts-expect-error
+    state.blockBreakMesh.material.needsUpdate = true
+  }
+
+  function hideBreakAnimation () {
+    if (state.blockBreakMesh) {
+      state.blockBreakMesh.visible = false
+    }
+  }
+
+  function updateCursorBlock (data?: { block: Block }) {
+    if (!data?.block) {
+      viewer.world.setHighlightCursorBlock(null)
+      return
+    }
+
+    const { block } = data
+    viewer.world.setHighlightCursorBlock(block.position, bot.mouse.getBlockCursorShapes(block).map(shape => {
+      return bot.mouse.getDataFromShape(shape)
+    }))
+  }
+
+  bot.on('highlightCursorBlock', updateCursorBlock)
+
+  bot.on('blockBreakProgressStage', updateBreakAnimation)
+
+  bot.on('end', () => {
+    disposeObject(state.blockBreakMesh!, true)
+    scene.remove(state.blockBreakMesh!)
+    viewer.world.setHighlightCursorBlock(null)
+  })
+}
+
+export default (bot: Bot) => {
+  bot.loadPlugin(createMouse({}))
+
+  domListeners(bot)
+  createDisplayManager(bot, viewer.scene, viewer.renderer)
+
+  otherListeners()
+}
+
+const otherListeners = () => {
+  bot.on('startDigging', (block) => {
+    customEvents.emit('digStart')
+  })
+
+  bot.on('goingToSleep', () => {
+    showModal({ reactType: 'bed' })
+  })
+
+  bot.on('botArmSwingStart', (hand) => {
+    viewer.world.changeHandSwingingState(true, hand === 'left')
+  })
+
+  bot.on('botArmSwingEnd', (hand) => {
+    viewer.world.changeHandSwingingState(false, hand === 'left')
+  })
+
+  bot.on('startUsingItem', (item, slot, isOffhand, duration) => {
+    customEvents.emit('activateItem', item, isOffhand ? 45 : bot.quickBarSlot, isOffhand)
+    playerState.startUsingItem()
+  })
+
+  bot.on('stopUsingItem', () => {
+    playerState.stopUsingItem()
+  })
+}
+
+const domListeners = (bot: Bot) => {
+  document.addEventListener('mousedown', (e) => {
+    if (e.isTrusted && !document.pointerLockElement && !isCypress()) return
+    if (!isGameActive(true)) return
+
+    if (e.button === 0) {
+      bot.leftClickStart()
+    } else if (e.button === 2) {
+      bot.rightClickStart()
+    }
+  })
+
+  document.addEventListener('mouseup', (e) => {
+    if (e.button === 0) {
+      bot.leftClickEnd()
+    } else if (e.button === 2) {
+      bot.rightClickEnd()
+    }
+  })
+
+  bot.mouse.beforeUpdateChecks = () => {
+    if (!document.hasFocus()) {
+      // deactive all buttons
+      bot.mouse.buttons.fill(false)
+    }
+  }
+}
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 47109979..b88b71c4 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -60,6 +60,7 @@ const defaultOptions = {
   serversAutoVersionSelect: 'auto' as 'auto' | 'latest' | '1.20.4' | string,
   customChannels: false,
   packetsReplayAutoStart: false,
+  preciseMouseInput: false,
   // todo ui setting, maybe enable by default?
   waitForChunksRender: 'sp-only' as 'sp-only' | boolean,
 
diff --git a/src/react/GameInteractionOverlay.tsx b/src/react/GameInteractionOverlay.tsx
index 503ca8b4..cb7a39f8 100644
--- a/src/react/GameInteractionOverlay.tsx
+++ b/src/react/GameInteractionOverlay.tsx
@@ -3,7 +3,6 @@ import { subscribe, useSnapshot } from 'valtio'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { options } from '../optionsStorage'
 import { activeModalStack, isGameActive, miscUiState } from '../globalState'
-import worldInteractions from '../worldInteractions'
 import { onCameraMove, CameraMoveEvent } from '../cameraRotationControls'
 import { pointerLock, isInRealGameSession } from '../utils'
 import { handleMovementStickDelta, joystickPointer } from './TouchAreasControls'
@@ -152,7 +151,7 @@ function GameInteractionOverlayInner ({
         virtualClickActive = false
       } else if (!capturedPointer.active.activateCameraMove && (Date.now() - capturedPointer.active.time < touchStartBreakingBlockMs)) {
         document.dispatchEvent(new MouseEvent('mousedown', { button: 2 }))
-        worldInteractions.update()
+        bot.mouse.update()
         document.dispatchEvent(new MouseEvent('mouseup', { button: 2 }))
       }
 
diff --git a/src/react/TouchAreasControls.tsx b/src/react/TouchAreasControls.tsx
index 981ebebb..6b34f9bc 100644
--- a/src/react/TouchAreasControls.tsx
+++ b/src/react/TouchAreasControls.tsx
@@ -1,7 +1,6 @@
 import { CSSProperties, PointerEvent, useEffect, useRef } from 'react'
 import { proxy, ref, useSnapshot } from 'valtio'
 import { contro } from '../controls'
-import worldInteractions from '../worldInteractions'
 import { options } from '../optionsStorage'
 import PixelartIcon from './PixelartIcon'
 import Button from './Button'
@@ -73,8 +72,9 @@ export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props)
     }[name]
     const holdDown = {
       action () {
+        if (!bot) return
         document.dispatchEvent(new MouseEvent('mousedown', { button: 2 }))
-        worldInteractions.update()
+        bot.mouse.update()
       },
       sneak () {
         void contro.emit('trigger', {
@@ -84,8 +84,9 @@ export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props)
         active = bot?.getControlState('sneak')
       },
       break () {
+        if (!bot) return
         document.dispatchEvent(new MouseEvent('mousedown', { button: 0 }))
-        worldInteractions.update()
+        bot.mouse.update()
         active = true
       },
       jump () {
@@ -108,8 +109,9 @@ export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props)
         active = bot?.getControlState('sneak')
       },
       break () {
+        if (!bot) return
         document.dispatchEvent(new MouseEvent('mouseup', { button: 0 }))
-        worldInteractions.update()
+        bot.mouse.update()
         active = false
       },
       jump () {
diff --git a/src/worldInteractions.ts b/src/worldInteractions.ts
deleted file mode 100644
index 5b03184c..00000000
--- a/src/worldInteractions.ts
+++ /dev/null
@@ -1,551 +0,0 @@
-//@ts-check
-
-import * as THREE from 'three'
-
-// wouldn't better to create atlas instead?
-import { Vec3 } from 'vec3'
-import { LineMaterial } from 'three-stdlib'
-import { Entity } from 'prismarine-entity'
-import { Block } from 'prismarine-block'
-import { subscribeKey } from 'valtio/utils'
-import destroyStage0 from '../assets/destroy_stage_0.png'
-import destroyStage1 from '../assets/destroy_stage_1.png'
-import destroyStage2 from '../assets/destroy_stage_2.png'
-import destroyStage3 from '../assets/destroy_stage_3.png'
-import destroyStage4 from '../assets/destroy_stage_4.png'
-import destroyStage5 from '../assets/destroy_stage_5.png'
-import destroyStage6 from '../assets/destroy_stage_6.png'
-import destroyStage7 from '../assets/destroy_stage_7.png'
-import destroyStage8 from '../assets/destroy_stage_8.png'
-import destroyStage9 from '../assets/destroy_stage_9.png'
-
-import { hideCurrentModal, isGameActive, showModal } from './globalState'
-import { assertDefined } from './utils'
-import { options } from './optionsStorage'
-import { itemBeingUsed } from './react/Crosshair'
-import { isCypress } from './standaloneUtils'
-import { displayClientChat } from './botUtils'
-import { playerState } from './mineflayer/playerState'
-
-function getViewDirection (pitch, yaw) {
-  const csPitch = Math.cos(pitch)
-  const snPitch = Math.sin(pitch)
-  const csYaw = Math.cos(yaw)
-  const snYaw = Math.sin(yaw)
-  return new Vec3(-snYaw * csPitch, snPitch, -csYaw * csPitch)
-}
-
-class WorldInteraction {
-  ready = false
-  cursorBlock: Block | null = null
-  prevBreakState: number | null = null
-  currentDigTime: number | null = null
-  prevOnGround: boolean | null = null
-  lastBlockPlaced: number
-  lastSwing = 0
-  buttons = [false, false, false]
-  lastButtons = [false, false, false]
-  breakStartTime: number | undefined = 0
-  lastDugBlock: Vec3 | null = null
-  blockBreakMesh: THREE.Mesh
-  breakTextures: THREE.Texture[]
-  lastDigged: number
-  debugDigStatus: string
-  currentBreakBlock: { block: any, stage: number } | null = null
-  swingTimeout: any = null
-
-  oneTimeInit () {
-    const loader = new THREE.TextureLoader()
-    this.breakTextures = []
-    const destroyStagesImages = [
-      destroyStage0,
-      destroyStage1,
-      destroyStage2,
-      destroyStage3,
-      destroyStage4,
-      destroyStage5,
-      destroyStage6,
-      destroyStage7,
-      destroyStage8,
-      destroyStage9
-    ]
-    for (let i = 0; i < 10; i++) {
-      const texture = loader.load(destroyStagesImages[i])
-      texture.magFilter = THREE.NearestFilter
-      texture.minFilter = THREE.NearestFilter
-      this.breakTextures.push(texture)
-    }
-    const breakMaterial = new THREE.MeshBasicMaterial({
-      transparent: true,
-      blending: THREE.MultiplyBlending,
-      alphaTest: 0.5,
-    })
-    this.blockBreakMesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 1), breakMaterial)
-    this.blockBreakMesh.visible = false
-    this.blockBreakMesh.renderOrder = 999
-    this.blockBreakMesh.name = 'blockBreakMesh'
-    viewer.scene.add(this.blockBreakMesh)
-
-    // Setup events
-    document.addEventListener('mouseup', (e) => {
-      this.buttons[e.button] = false
-    })
-
-    this.lastBlockPlaced = 4 // ticks since last placed
-    document.addEventListener('mousedown', (e) => {
-      if (e.isTrusted && !document.pointerLockElement && !isCypress()) return
-      if (!isGameActive(true)) return
-      this.buttons[e.button] = true
-
-      const entity = getEntityCursor()
-
-      if (entity) {
-        if (e.button === 0) { // left click
-          bot.attack(entity)
-        } else if (e.button === 2) { // right click
-          this.activateEntity(entity)
-        }
-      }
-    })
-    document.addEventListener('blur', (e) => {
-      this.buttons = [false, false, false]
-    })
-
-    beforeRenderFrame.push(() => {
-      if (viewer.world.threejsCursorLineMaterial) {
-        const { renderer } = viewer
-        viewer.world.threejsCursorLineMaterial.resolution.set(renderer.domElement.width, renderer.domElement.height)
-        viewer.world.threejsCursorLineMaterial.dashOffset = performance.now() / 750
-      }
-    })
-  }
-
-  initBot () {
-    if (!this.ready) {
-      this.ready = true
-      this.oneTimeInit()
-    }
-    assertDefined(viewer)
-    bot.on('physicsTick', () => { if (this.lastBlockPlaced < 4) this.lastBlockPlaced++ })
-    bot.on('diggingCompleted', (block) => {
-      this.breakStartTime = undefined
-      this.lastDugBlock = block.position
-      // TODO: If the tool and enchantments immediately exceed the hardness times 30, the block breaks with no delay; SO WE NEED TO CHECK THAT
-      // TODO: Any blocks with a breaking time of 0.05
-      this.lastDigged = Date.now()
-      this.debugDigStatus = 'done'
-      this.stopBreakAnimation()
-    })
-    bot.on('diggingAborted', (block) => {
-      if (!viewer.world.cursorBlock?.equals(block.position)) return
-      this.debugDigStatus = 'aborted'
-      this.breakStartTime = undefined
-      if (this.buttons[0]) {
-        this.buttons[0] = false
-        this.update()
-        this.buttons[0] = true // trigger again
-      }
-      this.lastDugBlock = null
-      this.stopBreakAnimation()
-    })
-    bot.on('heldItemChanged' as any, () => {
-      itemBeingUsed.name = null
-    })
-
-    // Add new event listeners for block breaking and swinging
-    bot.on('entitySwingArm', (entity: Entity) => {
-      if (entity.id === bot.entity.id) {
-        if (this.swingTimeout) {
-          clearTimeout(this.swingTimeout)
-        }
-        bot.swingArm('right')
-        viewer.world.changeHandSwingingState(true, false)
-        this.swingTimeout = setTimeout(() => {
-          viewer.world.changeHandSwingingState(false, false)
-          this.swingTimeout = null
-        }, 250)
-      }
-    })
-
-    //@ts-expect-error mineflayer types are wrong
-    bot.on('blockBreakProgressObserved', (block: Block, destroyStage: number, entity: Entity) => {
-      if (this.cursorBlock?.position.equals(block.position) && entity.id === bot.entity.id) {
-        if (!this.buttons[0]) {
-          // Simulate left mouse button press
-          this.buttons[0] = true
-          this.update()
-        }
-        // this.setBreakState(block, destroyStage)
-      }
-    })
-
-    //@ts-expect-error mineflayer types are wrong
-    bot.on('blockBreakProgressEnd', (block: Block, entity: Entity) => {
-      if (this.currentBreakBlock?.block.position.equals(block.position) && entity.id === bot.entity.id) {
-        if (!this.buttons[0]) {
-          // Simulate left mouse button press
-          this.buttons[0] = false
-          this.update()
-        }
-        // this.stopBreakAnimation()
-      }
-    })
-
-    // Handle acknowledge_player_digging packet
-    bot._client.on('acknowledge_player_digging', (data: { location: { x: number, y: number, z: number }, block: number, status: number, successful: boolean } | { sequenceId: number }) => {
-      if ('location' in data && !data.successful) {
-        const packetPos = new Vec3(data.location.x, data.location.y, data.location.z)
-        if (this.cursorBlock?.position.equals(packetPos)) {
-          this.buttons[0] = false
-          this.update()
-          this.stopBreakAnimation()
-        }
-      }
-    })
-
-    const upLineMaterial = () => {
-      const inCreative = bot.game.gameMode === 'creative'
-      const pixelRatio = viewer.renderer.getPixelRatio()
-      viewer.world.threejsCursorLineMaterial = new LineMaterial({
-        color: (() => {
-          switch (options.highlightBlockColor) {
-            case 'blue':
-              return 0x40_80_ff
-            case 'classic':
-              return 0x00_00_00
-            default:
-              return inCreative ? 0x40_80_ff : 0x00_00_00
-          }
-        })(),
-        linewidth: Math.max(pixelRatio * 0.7, 1) * 2,
-        // dashed: true,
-        // dashSize: 5,
-      })
-    }
-    upLineMaterial()
-    // todo use gamemode update only
-    bot.on('game', upLineMaterial)
-    // Update material when highlight color setting changes
-    subscribeKey(options, 'highlightBlockColor', upLineMaterial)
-  }
-
-  activateEntity (entity: Entity) {
-    // mineflayer has completely wrong implementation of this action
-    if (bot.supportFeature('armAnimationBeforeUse')) {
-      bot.swingArm('right')
-    }
-    bot._client.write('use_entity', {
-      target: entity.id,
-      mouse: 2,
-      // todo do not fake
-      x: 0.581_012_585_759_162_9,
-      y: 0.581_012_585_759_162_9,
-      z: 0.581_012_585_759_162_9,
-      // x: raycastPosition.x - entity.position.x,
-      // y: raycastPosition.y - entity.position.y,
-      // z: raycastPosition.z - entity.position.z
-      sneaking: bot.getControlState('sneak'),
-      hand: 0
-    })
-    bot._client.write('use_entity', {
-      target: entity.id,
-      mouse: 0,
-      sneaking: bot.getControlState('sneak'),
-      hand: 0
-    })
-    if (!bot.supportFeature('armAnimationBeforeUse')) {
-      bot.swingArm('right')
-    }
-  }
-
-  beforeUpdateChecks () {
-    if (!document.hasFocus()) {
-      // deactive all buttson
-      this.buttons.fill(false)
-    }
-  }
-
-  // todo this shouldnt be done in the render loop, migrate the code to dom events to avoid delays on lags
-  update () {
-    this.beforeUpdateChecks()
-    const inSpectator = bot.game.gameMode === 'spectator'
-    const inAdventure = bot.game.gameMode === 'adventure'
-    const entity = getEntityCursor()
-    let _cursorBlock = inSpectator && !options.showCursorBlockInSpectator ? null : bot.blockAtCursor(5)
-    if (entity) {
-      _cursorBlock = null
-    }
-    this.cursorBlock = _cursorBlock
-    const { cursorBlock } = this
-
-    let cursorBlockDiggable = cursorBlock
-    if (cursorBlock && (!bot.canDigBlock(cursorBlock) || inAdventure) && bot.game.gameMode !== 'creative') cursorBlockDiggable = null
-
-    const cursorChanged = cursorBlock && viewer.world.cursorBlock ? !viewer.world.cursorBlock.equals(cursorBlock.position) : viewer.world.cursorBlock !== cursorBlock
-
-    // Place / interact / activate
-    if (this.buttons[2] && this.lastBlockPlaced >= 4) {
-      const activatableItems = (itemName: string) => {
-        return ['egg', 'fishing_rod', 'firework_rocket',
-          'fire_charge', 'snowball', 'ender_pearl', 'experience_bottle', 'potion',
-          'glass_bottle', 'bucket', 'water_bucket', 'lava_bucket', 'milk_bucket',
-          'minecart', 'boat', 'tnt_minecart', 'chest_minecart', 'hopper_minecart',
-          'command_block_minecart', 'armor_stand', 'lead', 'name_tag',
-          //
-          'writable_book', 'written_book', 'compass', 'clock', 'filled_map', 'empty_map', 'map',
-          'shears', 'carrot_on_a_stick', 'warped_fungus_on_a_stick',
-          'spawn_egg', 'trident', 'crossbow', 'elytra', 'shield', 'turtle_helmet', 'bow', 'crossbow', 'bucket_of_cod',
-          ...loadedData.foodsArray.map((f) => f.name),
-        ].includes(itemName)
-      }
-      const activate = bot.heldItem && activatableItems(bot.heldItem.name)
-      let stop = false
-      if (!bot.controlState.sneak) {
-        if (cursorBlock?.name === 'bed' || cursorBlock?.name.endsWith('_bed')) {
-          stop = true
-          showModal({ reactType: 'bed' })
-          let cancelSleep = true
-          void bot.sleep(cursorBlock).catch((e) => {
-            if (cancelSleep) {
-              hideCurrentModal()
-            }
-            // if (e.message === 'bot is not sleeping') return
-            displayClientChat(e.message)
-          })
-          setTimeout(() => {
-            cancelSleep = false
-          })
-        }
-      }
-      // todo placing with offhand
-      if (cursorBlock && !activate && !stop) {
-        const vecArray = [new Vec3(0, -1, 0), new Vec3(0, 1, 0), new Vec3(0, 0, -1), new Vec3(0, 0, 1), new Vec3(-1, 0, 0), new Vec3(1, 0, 0)]
-        //@ts-expect-error
-        const delta = cursorBlock.intersect.minus(cursorBlock.position)
-
-        if (bot.heldItem) {
-          //@ts-expect-error todo
-          bot._placeBlockWithOptions(cursorBlock, vecArray[cursorBlock.face], { delta, forceLook: 'ignore' }).catch(console.warn)
-        } else {
-          // https://discord.com/channels/413438066984747026/413438150594265099/1198724637572477098
-          const oldLookAt = bot.lookAt
-          //@ts-expect-error
-          bot.lookAt = (pos) => { }
-          //@ts-expect-error
-          // TODO it still must 1. fire block place 2. swing arm (right)
-          bot.activateBlock(cursorBlock, vecArray[cursorBlock.face], delta).finally(() => {
-            bot.lookAt = oldLookAt
-          }).catch(console.warn)
-        }
-        viewer.world.changeHandSwingingState(true, false)
-        viewer.world.changeHandSwingingState(false, false)
-      } else if (!stop) {
-        const offhand = activate ? false : activatableItems(bot.inventory.slots[45]?.name ?? '')
-        bot.activateItem(offhand) // todo offhand
-        const item = offhand ? bot.inventory.slots[45] : bot.heldItem
-        if (item) {
-          customEvents.emit('activateItem', item, offhand ? 45 : bot.quickBarSlot, offhand)
-        }
-        playerState.startUsingItem()
-        itemBeingUsed.name = (offhand ? bot.inventory.slots[45]?.name : bot.heldItem?.name) ?? null
-        itemBeingUsed.hand = offhand ? 1 : 0
-      }
-      this.lastBlockPlaced = 0
-    }
-    // stop using activated item (cancel)
-    if (itemBeingUsed.name && !this.buttons[2]) {
-      itemBeingUsed.name = null
-      // "only foods and bow can be deactivated" - not true, shields also can be deactivated and client always sends this
-      // if (bot.heldItem && (loadedData.foodsArray.map((f) => f.name).includes(bot.heldItem.name) || bot.heldItem.name === 'bow')) {
-      bot.deactivateItem()
-      playerState.stopUsingItem()
-      // }
-    }
-
-    // Stop break
-    if ((!this.buttons[0] && this.lastButtons[0]) || cursorChanged) {
-      try {
-        bot.stopDigging() // this shouldnt throw anything...
-      } catch (e) { } // to be reworked in mineflayer, then remove the try here
-    }
-    // We stopped breaking
-    if ((!this.buttons[0] && this.lastButtons[0])) {
-      this.lastDugBlock = null
-      this.breakStartTime = undefined
-      this.debugDigStatus = 'cancelled'
-      this.stopBreakAnimation()
-    }
-
-    const onGround = bot.entity.onGround || bot.game.gameMode === 'creative'
-    this.prevOnGround ??= onGround // todo this should be fixed in mineflayer to involve correct calculations when this changes as this is very important when mining straight down // todo this should be fixed in mineflayer to involve correct calculations when this changes as this is very important when mining straight down // todo this should be fixed in mineflayer to involve correct calculations when this changes as this is very important when mining straight down
-    // Start break
-    // todo last check doesnt work as cursorChanged happens once (after that check is false)
-    if (
-      this.buttons[0]
-    ) {
-      if (cursorBlockDiggable
-        && (!this.lastButtons[0] || ((cursorChanged || (this.lastDugBlock && !this.lastDugBlock.equals(cursorBlock!.position))) && Date.now() - (this.lastDigged ?? 0) > 300) || onGround !== this.prevOnGround)
-        && onGround) {
-        this.lastDugBlock = null
-        this.debugDigStatus = 'breaking'
-        this.currentDigTime = bot.digTime(cursorBlockDiggable)
-        this.breakStartTime = performance.now()
-        const vecArray = [new Vec3(0, -1, 0), new Vec3(0, 1, 0), new Vec3(0, 0, -1), new Vec3(0, 0, 1), new Vec3(-1, 0, 0), new Vec3(1, 0, 0)]
-        bot.dig(
-          //@ts-expect-error
-          cursorBlockDiggable, 'ignore', vecArray[cursorBlockDiggable.face]
-        ).catch((err) => {
-          if (err.message === 'Digging aborted') return
-          throw err
-        })
-        customEvents.emit('digStart')
-        this.lastDigged = Date.now()
-        viewer.world.changeHandSwingingState(true, false)
-      } else if (performance.now() - this.lastSwing > 200) {
-        bot.swingArm('right')
-        this.lastSwing = performance.now()
-      }
-    }
-    if (!this.buttons[0] && this.lastButtons[0]) {
-      viewer.world.changeHandSwingingState(false, false)
-    }
-    this.prevOnGround = onGround
-
-    // Show cursor
-    const allShapes = [...cursorBlock?.shapes ?? [], ...cursorBlock?.['interactionShapes'] ?? []]
-    if (cursorBlock) {
-      // BREAK MESH
-      // union of all values
-      const breakShape = allShapes.reduce((acc, cur) => {
-        return [
-          Math.min(acc[0], cur[0]),
-          Math.min(acc[1], cur[1]),
-          Math.min(acc[2], cur[2]),
-          Math.max(acc[3], cur[3]),
-          Math.max(acc[4], cur[4]),
-          Math.max(acc[5], cur[5])
-        ]
-      })
-      const { position, width, height, depth } = getDataFromShape(breakShape)
-      this.blockBreakMesh.scale.set(width * 1.001, height * 1.001, depth * 1.001)
-      position.add(cursorBlock.position)
-      this.blockBreakMesh.position.set(position.x, position.y, position.z)
-    }
-
-    // Show break animation
-    if (cursorBlockDiggable && this.breakStartTime && bot.game.gameMode !== 'creative') {
-      const elapsed = performance.now() - this.breakStartTime
-      const time = bot.digTime(cursorBlockDiggable)
-      if (time !== this.currentDigTime) {
-        console.warn('dig time changed! cancelling!', time, 'from', this.currentDigTime) // todo
-        try { bot.stopDigging() } catch { }
-      }
-      const state = Math.floor((elapsed / time) * 10)
-      if (state !== this.prevBreakState) {
-        this.setBreakState(cursorBlockDiggable, Math.min(state, 9))
-      }
-      this.prevBreakState = state
-    } else {
-      this.blockBreakMesh.visible = false
-    }
-
-    // Update state
-    if (cursorChanged) {
-      viewer.world.setHighlightCursorBlock(cursorBlock?.position ?? null, allShapes.map(shape => {
-        return getDataFromShape(shape)
-      }))
-    }
-    this.lastButtons[0] = this.buttons[0]
-    this.lastButtons[1] = this.buttons[1]
-    this.lastButtons[2] = this.buttons[2]
-  }
-
-  setBreakState (block: Block, stage: number) {
-    this.currentBreakBlock = { block, stage }
-    this.blockBreakMesh.visible = true
-    //@ts-expect-error
-    this.blockBreakMesh.material.map = this.breakTextures[stage] ?? this.breakTextures.at(-1)
-    //@ts-expect-error
-    this.blockBreakMesh.material.needsUpdate = true
-  }
-
-  stopBreakAnimation () {
-    this.currentBreakBlock = null
-    this.blockBreakMesh.visible = false
-  }
-}
-
-const getDataFromShape = (shape) => {
-  const width = shape[3] - shape[0]
-  const height = shape[4] - shape[1]
-  const depth = shape[5] - shape[2]
-  const centerX = (shape[3] + shape[0]) / 2
-  const centerY = (shape[4] + shape[1]) / 2
-  const centerZ = (shape[5] + shape[2]) / 2
-  const position = new Vec3(centerX, centerY, centerZ)
-  return { position, width, height, depth }
-}
-
-// Blocks that can be interacted with in adventure mode
-const activatableBlockPatterns = [
-  // Containers
-  /^(chest|barrel|hopper|dispenser|dropper)$/,
-  /^.*shulker_box$/,
-  /^.*(furnace|smoker)$/,
-  /^(brewing_stand|beacon)$/,
-  // Crafting
-  /^.*table$/,
-  /^(grindstone|stonecutter|loom)$/,
-  /^.*anvil$/,
-  // Redstone
-  /^(lever|repeater|comparator|daylight_detector|observer|note_block|jukebox|bell)$/,
-  // Buttons
-  /^.*button$/,
-  // Doors and trapdoors
-  /^.*door$/,
-  /^.*trapdoor$/,
-  // Functional blocks
-  /^(enchanting_table|lectern|composter|respawn_anchor|lodestone|conduit)$/,
-  /^.*bee.*$/,
-  // Beds
-  /^.*bed$/,
-  // Misc
-  /^(cake|decorated_pot|crafter|trial_spawner|vault)$/
-]
-
-function isBlockActivatable (blockName: string) {
-  return activatableBlockPatterns.some(pattern => pattern.test(blockName))
-}
-
-function isLookingAtActivatableBlock (block: Block) {
-  return isBlockActivatable(block.name)
-}
-
-export const getEntityCursor = () => {
-  const entity = bot.nearestEntity((e) => {
-    if (e.position.distanceTo(bot.entity.position) <= (bot.game.gameMode === 'creative' ? 5 : 3)) {
-      const dir = getViewDirection(bot.entity.pitch, bot.entity.yaw)
-      const { width, height } = e
-      const { x: eX, y: eY, z: eZ } = e.position
-      const { x: bX, y: bY, z: bZ } = bot.entity.position
-      const box = new THREE.Box3(
-        new THREE.Vector3(eX - width / 2, eY, eZ - width / 2),
-        new THREE.Vector3(eX + width / 2, eY + height, eZ + width / 2)
-      )
-
-      const r = new THREE.Raycaster(
-        new THREE.Vector3(bX, bY + 1.52, bZ),
-        new THREE.Vector3(dir.x, dir.y, dir.z)
-      )
-      const int = r.ray.intersectBox(box, new THREE.Vector3(eX, eY, eZ))
-      return int !== null
-    }
-
-    return false
-  })
-  return entity
-}
-
-const worldInteraction = new WorldInteraction()
-globalThis.worldInteraction = worldInteraction
-export default worldInteraction

From 10f17063c06a5c45106c1cec01af9b0a4727ac51 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 3 Mar 2025 14:19:38 +0300
Subject: [PATCH 297/753] fix: fix whole pipeline of rendering custom items
 from rp: add them to atlas and update texture propertly. align behavior
 blocks vs items and gui vs hand/floor

---
 renderer/viewer/lib/viewer.ts              |  7 +----
 renderer/viewer/lib/worldrendererCommon.ts | 12 ++++++--
 src/index.ts                               | 17 ++++--------
 src/inventoryWindows.ts                    | 32 +++++++++-------------
 src/mineflayer/items.ts                    |  1 +
 src/resourcePack.ts                        | 23 +++++++++++-----
 src/resourcesManager.ts                    | 23 ++++++++++++++++
 7 files changed, 70 insertions(+), 45 deletions(-)
 create mode 100644 src/resourcesManager.ts

diff --git a/renderer/viewer/lib/viewer.ts b/renderer/viewer/lib/viewer.ts
index 7b951438..941f2182 100644
--- a/renderer/viewer/lib/viewer.ts
+++ b/renderer/viewer/lib/viewer.ts
@@ -86,12 +86,7 @@ export class Viewer {
     console.log('[viewer] Using version:', userVersion, 'textures:', texturesVersion)
     this.entities.clear()
     // this.primitives.clear()
-    return this.world.setVersion(userVersion, texturesVersion).then(async () => {
-      return new THREE.TextureLoader().loadAsync(this.world.itemsAtlasParser!.latestImage)
-    }).then((texture) => {
-      this.entities.itemsTexture = texture
-      this.world.renderUpdateEmitter.emit('itemsTextureDownloaded')
-    })
+    return this.world.setVersion(userVersion, texturesVersion)
   }
 
   addColumn (x, z, chunk, isLightUpdate = false) {
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 3ca100a2..a54f9fe8 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -365,6 +365,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
 
     const customBlockTextures = Object.keys(this.customTextures.blocks?.textures ?? {})
+    const customItemTextures = Object.keys(this.customTextures.items?.textures ?? {})
     console.time('createBlocksAtlas')
     const { atlas: blocksAtlas, canvas: blocksCanvas } = await blocksAssetsParser.makeNewAtlas(this.texturesVersion ?? this.version ?? 'latest', (textureName) => {
       const texture = this.customTextures?.blocks?.textures[textureName]
@@ -376,7 +377,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       const texture = this.customTextures?.items?.textures[textureName]
       if (!texture) return
       return texture
-    }, this.customTextures?.items?.tileSize)
+    }, this.customTextures?.items?.tileSize, undefined, customItemTextures)
     console.timeEnd('createItemsAtlas')
     this.blocksAtlasParser = new AtlasParser({ latest: blocksAtlas }, blocksCanvas.toDataURL())
     this.itemsAtlasParser = new AtlasParser({ latest: itemsAtlas }, itemsCanvas.toDataURL())
@@ -417,8 +418,15 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         config: this.mesherConfig,
       })
     }
+    const itemsTexture = await new THREE.TextureLoader().loadAsync(this.itemsAtlasParser.latestImage)
+    itemsTexture.magFilter = THREE.NearestFilter
+    itemsTexture.minFilter = THREE.NearestFilter
+    itemsTexture.flipY = false
+    viewer.entities.itemsTexture = itemsTexture
+
     this.renderUpdateEmitter.emit('textureDownloaded')
-    console.log('texture loaded')
+    this.renderUpdateEmitter.emit('itemsTextureDownloaded')
+    console.log('textures loaded')
   }
 
   async downloadDebugAtlas (isItems = false) {
diff --git a/src/index.ts b/src/index.ts
index beb86aea..8e586a8f 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -14,7 +14,7 @@ import './mineflayer/java-tester/index'
 import './external'
 import { getServerInfo } from './mineflayer/mc-protocol'
 import { onGameLoad, renderSlot } from './inventoryWindows'
-import { RenderItem } from './mineflayer/items'
+import { GeneralInputItem, RenderItem } from './mineflayer/items'
 import initCollisionShapes from './getCollisionInteractionShapes'
 import protocolMicrosoftAuth from 'minecraft-protocol/src/client/microsoftAuth'
 import microsoftAuthflow from './microsoftAuthflow'
@@ -114,6 +114,7 @@ import { LocalServer } from './customServer'
 import { startLocalReplayServer } from './packetsReplay/replayPackets'
 import { localRelayServerPlugin } from './mineflayer/plugins/packetsRecording'
 import { createFullScreenProgressReporter } from './core/progressReporter'
+import { getItemModelName } from './resourcesManager'
 
 window.debug = debug
 window.THREE = THREE
@@ -181,19 +182,13 @@ viewer.entities.getItemUv = (item, specificProps) => {
     const name = typeof idOrName === 'number' ? loadedData.items[idOrName]?.name : idOrName
     if (!name) throw new Error(`Item not found: ${idOrName}`)
 
-    const itemSelector = playerState.getItemSelector({
-      ...specificProps
-    })
-    const model = getItemDefinition(viewer.world.itemsDefinitionsStore, {
+    const model = getItemModelName({
+      ...item,
       name,
-      version: viewer.world.texturesVersion!,
-      properties: itemSelector
-    })?.model ?? name
+    } as GeneralInputItem, specificProps)
 
     const renderInfo = renderSlot({
-      ...item,
-      nbt: null,
-      name: model,
+      modelName: model,
     }, false, true)
 
     if (!renderInfo) throw new Error(`Failed to get render info for item ${name}`)
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 471f5be4..d473f5be 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -20,6 +20,7 @@ import { currentScaling } from './scaleInterface'
 import { getItemDescription } from './itemsDescriptions'
 import { MessageFormatPart } from './chatUtils'
 import { GeneralInputItem, getItemMetadata, getItemNameRaw, RenderItem } from './mineflayer/items'
+import { getItemModelName } from './resourcesManager'
 
 const loadedImagesCache = new Map<string, HTMLImageElement>()
 const cleanLoadedImagesCache = () => {
@@ -174,14 +175,18 @@ const getImage = ({ path = undefined as string | undefined, texture = undefined
   return loadedImagesCache.get(loadPath)
 }
 
-export const renderSlot = (slot: GeneralInputItem, debugIsQuickbar = false, fullBlockModelSupport = false): {
+export type ResolvedItemModelRender = {
+  modelName: string,
+}
+
+export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = false, fullBlockModelSupport = false): {
   texture: string,
   blockData?: Record<string, { slice, path }> & { resolvedModel: BlockModel },
   scale?: number,
   slice?: number[],
   modelName?: string
 } | undefined => {
-  let itemModelName = slot.name
+  let itemModelName = model.modelName
   const originalItemName = itemModelName
   const isItem = loadedData.itemsByName[itemModelName]
 
@@ -190,15 +195,12 @@ export const renderSlot = (slot: GeneralInputItem, debugIsQuickbar = false, full
   // #endregion
 
 
-  const { customModel } = getItemMetadata(slot)
-  if (customModel) {
-    itemModelName = customModel
-  }
-
   let itemTexture
   try {
     assertDefined(viewer.world.itemsRenderer)
-    itemTexture = viewer.world.itemsRenderer.getItemTexture(itemModelName, {}, false, fullBlockModelSupport) ?? viewer.world.itemsRenderer.getItemTexture('item/missing_texture')!
+    itemTexture =
+      viewer.world.itemsRenderer.getItemTexture(itemModelName, {}, false, fullBlockModelSupport)
+      ?? viewer.world.itemsRenderer.getItemTexture('item/missing_texture')!
   } catch (err) {
     inGameError(`Failed to render item ${itemModelName} (original: ${originalItemName}) on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
     itemTexture = viewer.world.itemsRenderer!.getItemTexture('block/errored')!
@@ -228,23 +230,15 @@ const getItemName = (slot: Item | RenderItem | null) => {
   return text.join('')
 }
 
-export const renderSlotExternal = (slot) => {
-  const data = renderSlot(slot)
-  if (!data) return
-  return {
-    imageDataUrl: data.texture === 'invsprite' ? undefined : getImage({ path: data.texture })?.src,
-    sprite: data.slice && data.texture !== 'invsprite' ? data.slice.map(x => x * 2) : data.slice,
-    displayName: getItemName(slot) ?? slot.displayName,
-  }
-}
-
 const mapSlots = (slots: Array<RenderItem | Item | null>) => {
   return slots.map((slot, i) => {
     // todo stateid
     if (!slot) return
 
     try {
-      const slotCustomProps = renderSlot(slot, i === bot.inventory.hotbarStart + bot.quickBarSlot)
+      const debugIsQuickbar = i === bot.inventory.hotbarStart + bot.quickBarSlot
+      const modelName = getItemModelName(slot, { 'minecraft:display_context': 'gui', })
+      const slotCustomProps = renderSlot({ modelName }, debugIsQuickbar)
       const itemCustomName = getItemName(slot)
       Object.assign(slot, { ...slotCustomProps, displayName: itemCustomName ?? slot.displayName })
       //@ts-expect-error
diff --git a/src/mineflayer/items.ts b/src/mineflayer/items.ts
index 2f1b2f8d..bb437ef4 100644
--- a/src/mineflayer/items.ts
+++ b/src/mineflayer/items.ts
@@ -19,6 +19,7 @@ export type RenderItem = Pick<import('prismarine-item').Item, 'name' | 'displayN
 export type GeneralInputItem = Pick<import('prismarine-item').Item, 'name' | 'nbt'> & {
   components?: RenderSlotComponent[],
   displayName?: string
+  modelResolved?: boolean
 }
 
 type JsonString = string
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index aef23e8f..6e9c28a4 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -314,7 +314,8 @@ export const getResourcepackTiles = async (type: 'blocks' | 'items' | 'armor', e
 const prepareBlockstatesAndModels = async (progressReporter: ProgressReporter) => {
   viewer.world.customBlockStates = {}
   viewer.world.customModels = {}
-  const usedTextures = new Set<string>()
+  const usedBlockTextures = new Set<string>()
+  const usedItemTextures = new Set<string>()
   const basePath = await getActiveResourcepackBasePath()
   if (!basePath) return
   progressReporter.beginStage('read-resource-pack-blockstates-and-models', 'Reading resource pack blockstates and models')
@@ -328,8 +329,9 @@ const prepareBlockstatesAndModels = async (progressReporter: ProgressReporter) =
       if (file.endsWith('.json')) {
         const contents = await fs.promises.readFile(filePath, 'utf8')
         let name = file.replace('.json', '')
+        const isBlock = path.endsWith('block')
         if (type === 'models') {
-          name = `${path.endsWith('block') ? 'block' : 'item'}/${name}`
+          name = `${isBlock ? 'block' : 'item'}/${name}`
         }
         const parsed = JSON.parse(contents)
         if (namespaceDir === 'minecraft') {
@@ -341,7 +343,11 @@ const prepareBlockstatesAndModels = async (progressReporter: ProgressReporter) =
             if (typeof texturePath !== 'string') continue
             if (texturePath.startsWith('#')) continue
             if (!texturePath.includes(':')) texturePath = `minecraft:${texturePath}`
-            usedTextures.add(texturePath as string)
+            if (isBlock) {
+              usedBlockTextures.add(texturePath as string)
+            } else {
+              usedItemTextures.add(texturePath as string)
+            }
           }
         }
       }
@@ -369,7 +375,10 @@ const prepareBlockstatesAndModels = async (progressReporter: ProgressReporter) =
     viewer.world.customBlockStates = undefined
     viewer.world.customModels = undefined
   }
-  return { usedTextures }
+  return {
+    usedBlockTextures,
+    usedItemTextures
+  }
 }
 
 const downloadAndUseResourcePack = async (url: string, progressReporter: ProgressReporter): Promise<void> => {
@@ -517,9 +526,9 @@ const updateTextures = async (progressReporter = createConsoleLogProgressReporte
   const origBlocksFiles = Object.keys(viewer.world.sourceData.blocksAtlases.latest.textures)
   const origItemsFiles = Object.keys(viewer.world.sourceData.itemsAtlases.latest.textures)
   const origArmorFiles = Object.keys(armorTextures)
-  const { usedTextures: extraBlockTextures = new Set<string>() } = await prepareBlockstatesAndModels(progressReporter) ?? {}
-  const blocksData = await getResourcepackTiles('blocks', [...origBlocksFiles, ...extraBlockTextures], progressReporter)
-  const itemsData = await getResourcepackTiles('items', origItemsFiles, progressReporter)
+  const { usedBlockTextures, usedItemTextures } = await prepareBlockstatesAndModels(progressReporter) ?? {}
+  const blocksData = await getResourcepackTiles('blocks', [...origBlocksFiles, ...usedBlockTextures ?? []], progressReporter)
+  const itemsData = await getResourcepackTiles('items', [...origItemsFiles, ...usedItemTextures ?? []], progressReporter)
   const armorData = await getResourcepackTiles('armor', origArmorFiles, progressReporter)
   await updateAllReplacableTextures()
   viewer.world.customTextures = {}
diff --git a/src/resourcesManager.ts b/src/resourcesManager.ts
new file mode 100644
index 00000000..fd92e58b
--- /dev/null
+++ b/src/resourcesManager.ts
@@ -0,0 +1,23 @@
+import { Item } from 'prismarine-item'
+import { ItemSpecificContextProperties } from 'renderer/viewer/lib/basePlayerState'
+import { getItemDefinition } from 'mc-assets/dist/itemDefinitions'
+import { playerState } from './mineflayer/playerState'
+import { GeneralInputItem, getItemMetadata } from './mineflayer/items'
+
+export const getItemModelName = (item: GeneralInputItem, specificProps: ItemSpecificContextProperties) => {
+  let itemModelName = item.name
+  const { customModel } = getItemMetadata(item)
+  if (customModel) {
+    itemModelName = customModel
+  }
+
+  const itemSelector = playerState.getItemSelector({
+    ...specificProps
+  })
+  const model = getItemDefinition(viewer.world.itemsDefinitionsStore, {
+    name: itemModelName,
+    version: viewer.world.texturesVersion!,
+    properties: itemSelector
+  })?.model ?? itemModelName
+  return model
+}

From b0da1e41d690d081636d320b8d29a1a80da58991 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 3 Mar 2025 15:31:25 +0300
Subject: [PATCH 298/753] fix: fix crashes on packets logging recording fix:
 make replay panel minmizable

---
 package.json                               |   4 +-
 pnpm-lock.yaml                             |  22 ++--
 src/appParams.ts                           |   3 +-
 src/core/progressReporter.ts               |   1 +
 src/index.ts                               |   3 +-
 src/optionsStorage.ts                      |   2 +-
 src/react/PauseScreen.tsx                  |   9 +-
 src/react/ReplayPanel.tsx                  | 119 +++++++++++++++------
 src/react/components/replay/PacketList.tsx |   8 +-
 9 files changed, 114 insertions(+), 57 deletions(-)

diff --git a/package.json b/package.json
index b0c5ee20..7cacae56 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "mojangson": "^2.0.4",
     "net-browserify": "github:zardoy/prismarinejs-net-browserify",
     "node-gzip": "^1.1.2",
-    "mcraft-fun-mineflayer": "^0.1.7",
+    "mcraft-fun-mineflayer": "^0.1.8",
     "peerjs": "^1.5.0",
     "pixelarticons": "^1.8.1",
     "pretty-bytes": "^6.1.1",
@@ -145,7 +145,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mineflayer-mouse": "^0.0.4",
+    "mineflayer-mouse": "^0.0.5",
     "mc-assets": "^0.2.37",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index be7ce2e5..dbbac60e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -135,8 +135,8 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       mcraft-fun-mineflayer:
-        specifier: ^0.1.7
-        version: 0.1.7(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13))
+        specifier: ^0.1.8
+        version: 0.1.8(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -359,8 +359,8 @@ importers:
         specifier: github:zardoy/mineflayer
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.0.4
-        version: 0.0.4(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+        specifier: ^0.0.5
+        version: 0.0.5(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -6575,9 +6575,9 @@ packages:
     resolution: {integrity: sha512-49tk3shwxsDoV0PrrbORZEKg613vUQPULgusWjXNl8JEma5y41LEo57D6q4aHliXsV3Gb9ThrkFf6hIb0WlY1Q==}
     engines: {node: '>=18.0.0'}
 
-  mcraft-fun-mineflayer@0.1.7:
-    resolution: {integrity: sha512-DJPpp1YFwztoscdIOwfqBV9lbotva621F9GEep3BlqG3l06UdTzX2ElkvwyTR0IurFFBX/YKsNfxwL5WtLytgw==}
-    version: 0.1.7
+  mcraft-fun-mineflayer@0.1.8:
+    resolution: {integrity: sha512-jyJTihNHfeToBPwVs3QMKBlVcaCABJ25YN2eoIBQEVTRVFzaXh13XRpElphLzTMj1Q5XFYqufHtMoR4tsb08qQ==}
+    version: 0.1.8
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       '@roamhq/wrtc': '*'
@@ -6801,8 +6801,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.0.4:
-    resolution: {integrity: sha512-55GqQhJWCXnOnm30uOjtI7nsawPb0kA3cAv6a5n1NJjTWFR6hzMkiRT6xGLYrvYhdf6Er3nsE2Ok/Aysa/jtFQ==}
+  mineflayer-mouse@0.0.5:
+    resolution: {integrity: sha512-0r/AOGTq+wZH9vrBcW93jH2dGRSlwlO6xc1Z67VJUFlZZ8oBefAOpiZq7LIGc7ROVbpcKEKjROdNv/iCFmzXYA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.4:
@@ -17372,7 +17372,7 @@ snapshots:
       apl-image-packer: 1.1.0
       zod: 3.24.1
 
-  mcraft-fun-mineflayer@0.1.7(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.8(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
@@ -17742,7 +17742,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.0.4(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  mineflayer-mouse@0.0.5(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
     dependencies:
       change-case: 5.4.4
       debug: 4.4.0(supports-color@8.1.1)
diff --git a/src/appParams.ts b/src/appParams.ts
index 50fbf055..962eb168 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -63,7 +63,8 @@ type AppQsParamsArrayTransformed = {
   [k in keyof AppQsParamsArray]: string[]
 }
 
-const initialAppConfig = process.env.INLINED_APP_CONFIG as AppConfig ?? {}
+globalThis.process ??= {} as any
+const initialAppConfig = process?.env?.INLINED_APP_CONFIG as AppConfig ?? {}
 
 export const appQueryParams = new Proxy<AppQsParams>({} as AppQsParams, {
   get (target, property) {
diff --git a/src/core/progressReporter.ts b/src/core/progressReporter.ts
index db1958da..e2bdf5bc 100644
--- a/src/core/progressReporter.ts
+++ b/src/core/progressReporter.ts
@@ -138,6 +138,7 @@ export const createFullScreenProgressReporter = (): ProgressReporter => {
       setLoadingScreenStatus(message)
     },
     end () {
+      if (appStatusState.isError) return
       fullScreenReporters.splice(fullScreenReporters.indexOf(reporter), 1)
       if (fullScreenReporters.length === 0) {
         setLoadingScreenStatus(undefined)
diff --git a/src/index.ts b/src/index.ts
index 8e586a8f..7269781d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -322,6 +322,7 @@ export async function connect (connectOptions: ConnectOptions) {
     if (ended) return
     ended = true
     viewer.resetAll()
+    progress.end()
     localServer = window.localServer = window.server = undefined
     gameAdditionalState.viewerConnection = false
 
@@ -692,6 +693,7 @@ export async function connect (connectOptions: ConnectOptions) {
   } catch (err) {
     handleError(err)
   }
+  if (!bot) return
 
   if (connectOptions.server) {
     bot.loadPlugin(ping)
@@ -700,7 +702,6 @@ export async function connect (connectOptions: ConnectOptions) {
   if (!localReplaySession) {
     bot.loadPlugin(localRelayServerPlugin)
   }
-  if (!bot) return
 
   const p2pConnectTimeout = p2pMultiplayer ? setTimeout(() => { throw new UserError('Spawn timeout. There might be error on the other side, check console.') }, 20_000) : undefined
 
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index b88b71c4..904b0a29 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -8,7 +8,7 @@ import { appQueryParamsArray } from './appParams'
 import type { AppConfig } from './globalState'
 
 const isDev = process.env.NODE_ENV === 'development'
-const initialAppConfig = process.env.INLINED_APP_CONFIG as AppConfig ?? {}
+const initialAppConfig = process.env?.INLINED_APP_CONFIG as AppConfig ?? {}
 const defaultOptions = {
   renderDistance: 3,
   keepChunksDistance: 1,
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 4c4dec03..35d873ea 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -232,14 +232,15 @@ export default () => {
   if (pauseLinksConfig) {
     for (const [i, row] of pauseLinksConfig.entries()) {
       const rowButtons: React.ReactNode[] = []
-      for (const button of row) {
+      for (const [k, button] of row.entries()) {
+        const key = `${i}-${k}`
         const style = { width: (204 / row.length - (row.length > 1 ? 4 : 0)) + 'px' }
         if (button.type === 'discord') {
-          rowButtons.push(<DiscordButton key={i} style={style} text={button.text}/>)
+          rowButtons.push(<DiscordButton key={key} style={style} text={button.text}/>)
         } else if (button.type === 'github') {
-          rowButtons.push(<Button key={i} className="button" style={style} onClick={() => openGithub()}>{button.text ?? 'GitHub'}</Button>)
+          rowButtons.push(<Button key={key} className="button" style={style} onClick={() => openGithub()}>{button.text ?? 'GitHub'}</Button>)
         } else if (button.type === 'url' && button.text) {
-          rowButtons.push(<Button key={i} className="button" style={style} onClick={() => openURL(button.url)}>{button.text}</Button>)
+          rowButtons.push(<Button key={key} className="button" style={style} onClick={() => openURL(button.url)}>{button.text}</Button>)
         }
       }
       pauseLinks.push(<div className={styles.row}>{rowButtons}</div>)
diff --git a/src/react/ReplayPanel.tsx b/src/react/ReplayPanel.tsx
index 59950555..fd4082af 100644
--- a/src/react/ReplayPanel.tsx
+++ b/src/react/ReplayPanel.tsx
@@ -41,31 +41,100 @@ export default function ReplayPanel ({
   style
 }: Props) {
   const [filter, setFilter] = useState(defaultFilter)
+  const [isMinimized, setIsMinimized] = useState(false)
   const { filtered: filteredPackets, hiddenCount } = filterPackets(packets.slice(-500), filter)
 
   useEffect(() => {
     onFilterChange(filter)
   }, [filter, onFilterChange])
 
+  const handlePlayPauseClick = () => {
+    if (isMinimized) {
+      setIsMinimized(false)
+    } else {
+      onPlayPause?.(!isPlaying)
+    }
+  }
+
+  const playPauseButton = (
+    <button
+      onClick={handlePlayPauseClick}
+      style={{
+        background: 'none',
+        border: 'none',
+        cursor: 'pointer',
+        padding: '4px',
+        color: DARK_COLORS.text
+      }}
+    >
+      <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
+        {isPlaying ? (
+          <path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/>
+        ) : (
+          <path d="M8 5v14l11-7z"/>
+        )}
+      </svg>
+    </button>
+  )
+
+  const baseContainerStyle = {
+    position: 'fixed',
+    top: 18,
+    right: 0,
+    zIndex: 1000,
+    background: DARK_COLORS.bg,
+    padding: '16px',
+    borderRadius: '0 0 8px 0',
+    boxShadow: '0 2px 8px rgba(0,0,0,0.3)',
+    display: 'flex',
+    flexDirection: 'column',
+    gap: '12px',
+    color: DARK_COLORS.text,
+    ...style
+  } as const
+
+  if (isMinimized) {
+    return (
+      <div style={{
+        ...baseContainerStyle,
+        width: 'auto'
+      }}>
+        {playPauseButton}
+      </div>
+    )
+  }
+
   return (
     <div style={{
-      position: 'fixed',
-      top: 18,
-      right: 0,
-      zIndex: 1000,
-      background: DARK_COLORS.bg,
-      padding: '16px',
-      borderRadius: '0 0 8px 0',
-      boxShadow: '0 2px 8px rgba(0,0,0,0.3)',
+      ...baseContainerStyle,
       width: '400px',
-      maxHeight: '80vh',
-      display: 'flex',
-      flexDirection: 'column',
-      gap: '12px',
-      color: DARK_COLORS.text,
-      ...style
+      maxHeight: '80vh'
     }}>
-      <div style={{ fontSize: '12px', fontWeight: 'bold' }}>{replayName || 'Unnamed Replay'}</div>
+      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+        <div style={{ fontSize: '12px', fontWeight: 'bold' }}>{replayName || 'Unnamed Replay'}</div>
+        <button
+          onClick={() => setIsMinimized(true)}
+          style={{
+            background: 'none',
+            border: 'none',
+            color: DARK_COLORS.text,
+            cursor: 'pointer',
+            padding: '4px',
+            fontSize: '14px',
+            opacity: 0.7,
+            transition: 'opacity 0.2s'
+          }}
+          onMouseEnter={e => {
+            e.currentTarget.style.opacity = '1'
+          }}
+          onMouseLeave={e => {
+            e.currentTarget.style.opacity = '0.7'
+          }}
+        >
+          ✕
+        </button>
+      </div>
+
       <div style={{ fontSize: '8px', color: '#888888', marginTop: '-8px' }}>Integrated server emulation. Testing client...</div>
 
       <FilterInput
@@ -85,25 +154,7 @@ export default function ReplayPanel ({
       />
 
       <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
-        <button
-          onClick={() => onPlayPause?.(!isPlaying)}
-          style={{
-            background: 'none',
-            border: 'none',
-            cursor: 'pointer',
-            padding: '4px',
-            color: DARK_COLORS.text
-          }}
-        >
-          <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
-            {isPlaying ? (
-              <path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/>
-            ) : (
-              <path d="M8 5v14l11-7z"/>
-            )}
-          </svg>
-        </button>
-
+        {playPauseButton}
         <ProgressBar current={progress.current} total={progress.total} />
       </div>
 
diff --git a/src/react/components/replay/PacketList.tsx b/src/react/components/replay/PacketList.tsx
index 484c42c9..5183bf3f 100644
--- a/src/react/components/replay/PacketList.tsx
+++ b/src/react/components/replay/PacketList.tsx
@@ -1,4 +1,5 @@
 import { useRef, useState } from 'react'
+import { processPacketDataForLogging } from 'mcraft-fun-mineflayer/build/packetsLogger'
 import { PacketData } from '../../ReplayPanel'
 import { useScrollBehavior } from '../../hooks/useScrollBehavior'
 import { ClientOnMap } from '../../../generatedServerPackets'
@@ -12,6 +13,7 @@ const formatters: Record<string, (data: any) => string> = {
     const blockEntitiesCount = data.blockEntities?.length
     return `x:${data.x} z:${data.z} C:${sizeOfChunk} E:${blockEntitiesCount}`
   },
+  default: (data) => processPacketDataForLogging(data)
 }
 
 const getPacketIcon = (name: string): string => {
@@ -115,7 +117,7 @@ export default function PacketList ({ packets, filter, maxHeight = 300 }: Props)
                     {packet.name}
                   </span>
                   <span style={{ color: DARK_COLORS.textDim, flex: 1, overflow: 'hidden', textOverflow: 'ellipsis' }}>
-                    {formatters[packet.name]?.(packet.data) ?? JSON.stringify(packet.data)}
+                    {formatters[packet.name]?.(packet.data) ?? formatters.default(packet.data)}
                   </span>
                 </div>
                 {expandedPacket === packet.position && (
@@ -123,14 +125,14 @@ export default function PacketList ({ packets, filter, maxHeight = 300 }: Props)
                     <div style={{ marginBottom: '8px' }}>
                       <strong>Data:</strong>
                       <pre style={{ margin: '4px 0', color: DARK_COLORS.textDim }}>
-                        {JSON.stringify(packet.data, null, 2)}
+                        {JSON.stringify(JSON.parse(formatters.default(packet.data)), null, 2)}
                       </pre>
                     </div>
                     {packet.actualVersion && (
                       <div>
                         <strong>Actual Version:</strong>
                         <pre style={{ margin: '4px 0', color: DARK_COLORS.textDim }}>
-                          {JSON.stringify(packet.actualVersion, null, 2)}
+                          {JSON.stringify(JSON.parse(formatters.default(packet.actualVersion)), null, 2)}
                         </pre>
                       </div>
                     )}

From 2619e5da89fc270297d3cc379758a95e13e01e0a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 3 Mar 2025 17:42:01 +0300
Subject: [PATCH 299/753] fix: was not possible to click notification, make
 error routing more strict & obvious

---
 src/core/progressReporter.ts       | 25 ++++++++++++++++++++++++-
 src/react/NotificationProvider.tsx | 11 +++++++----
 src/reactUi.tsx                    |  2 +-
 src/resourcePack.ts                |  4 +++-
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/core/progressReporter.ts b/src/core/progressReporter.ts
index e2bdf5bc..6ef6044f 100644
--- a/src/core/progressReporter.ts
+++ b/src/core/progressReporter.ts
@@ -13,12 +13,14 @@ export interface ProgressReporter {
 
   setMessage (message: string): void
 
-  end (): void
+  end(): void
+  error(message: string): void
 }
 
 interface ReporterDisplayImplementation {
   setMessage (message: string): void
   end (): void
+  error(message: string): void
 }
 
 interface StageInfo {
@@ -124,6 +126,10 @@ const createProgressReporter = (implementation: ReporterDisplayImplementation):
 
     get currentMessage () {
       return currentMessage
+    },
+
+    error (message: string): void {
+      implementation.error(message)
     }
   }
 
@@ -145,6 +151,11 @@ export const createFullScreenProgressReporter = (): ProgressReporter => {
       } else {
         setLoadingScreenStatus(fullScreenReporters.at(-1)!.currentMessage)
       }
+    },
+
+    error (message: string): void {
+      if (appStatusState.isError) return
+      setLoadingScreenStatus(message, true)
     }
   })
   fullScreenReporters.push(reporter)
@@ -162,6 +173,10 @@ export const createNotificationProgressReporter = (endMessage?: string): Progres
       } else {
         hideNotification()
       }
+    },
+
+    error (message: string): void {
+      showNotification(message, '', true, '', undefined, true)
     }
   })
 }
@@ -173,6 +188,10 @@ export const createConsoleLogProgressReporter = (): ProgressReporter => {
     },
     end () {
       console.log('done')
+    },
+
+    error (message: string): void {
+      console.error(message)
     }
   })
 }
@@ -191,6 +210,10 @@ export const createWrappedProgressReporter = (reporter: ProgressReporter, messag
       if (message) {
         reporter.endStage(stage)
       }
+    },
+
+    error (message: string): void {
+      reporter.error(message)
     }
   })
 }
diff --git a/src/react/NotificationProvider.tsx b/src/react/NotificationProvider.tsx
index 4c9661e0..6460c0e9 100644
--- a/src/react/NotificationProvider.tsx
+++ b/src/react/NotificationProvider.tsx
@@ -60,10 +60,13 @@ export default () => {
   // }, [])
   const scale = useAppScale()
 
-  return <div style={{
-    transform: `scale(${scale})`,
-    transformOrigin: 'top right',
-  }}>
+  return <div
+    className='notification-container'
+    style={{
+      // transform: `scale(${scale})`,
+      // transformOrigin: 'top right',
+    }}
+  >
     <Notification
       action={action}
       type={type}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index b6d4b6d2..ac2dbe74 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -207,6 +207,7 @@ const App = () => {
             <SignInMessageProvider />
             <NoModalFoundProvider />
             <PacketsReplayProvider />
+            <NotificationProvider />
           </RobustPortal>
           <RobustPortal to={document.body}>
             <div className='overlay-top-scaled'>
@@ -214,7 +215,6 @@ const App = () => {
             </div>
             <div />
             <DebugEdges />
-            <NotificationProvider />
           </RobustPortal>
         </ButtonAppProvider>
       </div>
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 6e9c28a4..fd01168a 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -392,7 +392,7 @@ const downloadAndUseResourcePack = async (url: string, progressReporter: Progres
     const response = await fetch(url).catch((err) => {
       console.log(`Ensure server on ${url} support CORS which is not required for regular client, but is required for the web client`)
       console.error(err)
-      showNotification('Failed to download resource pack: ' + err.message)
+      progressReporter.error('Failed to download resource pack: ' + err.message)
     })
     console.timeEnd('downloadServerResourcePack')
     if (!response) return
@@ -425,6 +425,8 @@ const downloadAndUseResourcePack = async (url: string, progressReporter: Progres
       console.error(err)
       showNotification('Failed to install resource pack: ' + err.message)
     })
+  } catch (err) {
+    progressReporter.error('Could not install resource pack: ' + err.message)
   } finally {
     progressReporter.endStage('download-resource-pack')
     resourcePackState.isServerInstalling = false

From 2a8f5140957be1e832a8b480c262cec5963f514e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 3 Mar 2025 18:24:06 +0300
Subject: [PATCH 300/753] add build zip workflow

---
 .github/workflows/build-zip.yml | 43 +++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 .github/workflows/build-zip.yml

diff --git a/.github/workflows/build-zip.yml b/.github/workflows/build-zip.yml
new file mode 100644
index 00000000..9f8a6292
--- /dev/null
+++ b/.github/workflows/build-zip.yml
@@ -0,0 +1,43 @@
+name: Build and Bundle
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build-and-bundle:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@master
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Build project
+        run: pnpm build
+
+      - name: Bundle server.js
+        run: |
+          pnpm esbuild server.js --bundle --platform=node --outfile=bundled-server.js
+
+      - name: Create distribution package
+        run: |
+          mkdir -p package
+          cp -r dist package/
+          cp bundled-server.js package/server.js
+          cd package
+          zip -r ../dist-package.zip .
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist-package
+          path: dist-package.zip

From 874cafc75e605688e9a7d745eed09859ff820154 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 3 Mar 2025 18:42:08 +0300
Subject: [PATCH 301/753] add self host zip publishing with release

---
 .github/workflows/build-zip.yml | 10 +++++-----
 .github/workflows/publish.yml   | 31 ++++++++++++++++++++++++-------
 package.json                    |  3 +++
 server.js                       |  2 +-
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-zip.yml b/.github/workflows/build-zip.yml
index 9f8a6292..e6ed334c 100644
--- a/.github/workflows/build-zip.yml
+++ b/.github/workflows/build-zip.yml
@@ -1,4 +1,4 @@
-name: Build and Bundle
+name: Make Self Host Zip
 
 on:
   workflow_dispatch:
@@ -26,7 +26,7 @@ jobs:
 
       - name: Bundle server.js
         run: |
-          pnpm esbuild server.js --bundle --platform=node --outfile=bundled-server.js
+          pnpm esbuild server.js --bundle --platform=node --outfile=bundled-server.js --define=process.env.NODE_ENV="production"
 
       - name: Create distribution package
         run: |
@@ -34,10 +34,10 @@ jobs:
           cp -r dist package/
           cp bundled-server.js package/server.js
           cd package
-          zip -r ../dist-package.zip .
+          zip -r ../self-host.zip .
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: dist-package
-          path: dist-package.zip
+          name: self-host
+          path: self-host.zip
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index eb765648..958aa50e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -43,19 +43,36 @@ jobs:
         with:
           run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} --prod
         id: deploy
-      - run: |
-          pnpx zardoy-release node --footer "This release URL: ${{ steps.deploy.outputs.stdout }}"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # has possible output: tag
-        id: release
-      # has output
+      # publish to github
       - run: cp vercel.json .vercel/output/static/vercel.json
       - uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: .vercel/output/static
           force_orphan: true
+
+      - name: Build self-host version
+        run: pnpm build
+      - name: Bundle server.js
+        run: |
+          pnpm esbuild server.js --bundle --platform=node --outfile=bundled-server.js --define=process.env.NODE_ENV="production"
+
+      - name: Create zip package
+        run: |
+          mkdir -p package
+          cp -r dist package/
+          cp bundled-server.js package/server.js
+          cd package
+          zip -r ../self-host.zip .
+
+      - run: |
+          pnpx zardoy-release node --footer "This release URL: ${{ steps.deploy.outputs.stdout }}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # has possible output: tag
+        id: release
+
+      # has output
       - name: Set publishing config
         run: pnpm config set '//registry.npmjs.org/:_authToken' "${NODE_AUTH_TOKEN}"
         env:
diff --git a/package.json b/package.json
index 7cacae56..0e0aa6a8 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,9 @@
     "web",
     "client"
   ],
+  "release": {
+    "attachReleaseFiles": "self-host.zip"
+  },
   "publish": {
     "preset": {
       "publishOnlyIfChanged": true,
diff --git a/server.js b/server.js
index 2dbb05b3..20e66051 100644
--- a/server.js
+++ b/server.js
@@ -15,7 +15,7 @@ try {
 // Create our app
 const app = express()
 
-const isProd = process.argv.includes('--prod')
+const isProd = process.argv.includes('--prod') || process.env.NODE_ENV === 'production'
 app.use(compression())
 app.use(cors())
 app.use(netApi({ allowOrigin: '*' }))

From 1d4dc0ddaa8fe203197c6c819f0223b551bcaeb9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 3 Mar 2025 18:45:25 +0300
Subject: [PATCH 302/753] fix define in arg build

---
 .github/workflows/build-zip.yml | 2 +-
 .github/workflows/publish.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-zip.yml b/.github/workflows/build-zip.yml
index e6ed334c..2e7e886d 100644
--- a/.github/workflows/build-zip.yml
+++ b/.github/workflows/build-zip.yml
@@ -26,7 +26,7 @@ jobs:
 
       - name: Bundle server.js
         run: |
-          pnpm esbuild server.js --bundle --platform=node --outfile=bundled-server.js --define=process.env.NODE_ENV="production"
+          pnpm esbuild server.js --bundle --platform=node --outfile=bundled-server.js --define:process.env.NODE_ENV="production"
 
       - name: Create distribution package
         run: |
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 958aa50e..7e0af8d2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -55,7 +55,7 @@ jobs:
         run: pnpm build
       - name: Bundle server.js
         run: |
-          pnpm esbuild server.js --bundle --platform=node --outfile=bundled-server.js --define=process.env.NODE_ENV="production"
+          pnpm esbuild server.js --bundle --platform=node --outfile=bundled-server.js --define:process.env.NODE_ENV="production"
 
       - name: Create zip package
         run: |

From 4b54be637d1917b87e51f8c8c03938141fbc3bfe Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 3 Mar 2025 18:48:27 +0300
Subject: [PATCH 303/753] ci: adjust esbuild build arg syntax for prod

---
 .github/workflows/build-zip.yml | 2 +-
 .github/workflows/publish.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-zip.yml b/.github/workflows/build-zip.yml
index 2e7e886d..cc472476 100644
--- a/.github/workflows/build-zip.yml
+++ b/.github/workflows/build-zip.yml
@@ -26,7 +26,7 @@ jobs:
 
       - name: Bundle server.js
         run: |
-          pnpm esbuild server.js --bundle --platform=node --outfile=bundled-server.js --define:process.env.NODE_ENV="production"
+          pnpm esbuild server.js --bundle --platform=node --outfile=bundled-server.js --define:process.env.NODE_ENV="'production'"
 
       - name: Create distribution package
         run: |
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7e0af8d2..4fbff15d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -55,7 +55,7 @@ jobs:
         run: pnpm build
       - name: Bundle server.js
         run: |
-          pnpm esbuild server.js --bundle --platform=node --outfile=bundled-server.js --define:process.env.NODE_ENV="production"
+          pnpm esbuild server.js --bundle --platform=node --outfile=bundled-server.js --define:process.env.NODE_ENV="'production'"
 
       - name: Create zip package
         run: |

From 1c700aac1e3b7d8592c3a0a60e1f27ad5ad80756 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 4 Mar 2025 19:00:20 +0300
Subject: [PATCH 304/753] feat(config-json): Only either bundle or load from
 remote (#291)

---
 .github/workflows/next-deploy.yml |  2 ++
 .github/workflows/preview.yml     |  2 ++
 .github/workflows/publish.yml     |  2 ++
 Dockerfile                        |  5 +--
 rsbuild.config.ts                 | 12 +++++--
 scripts/dockerPrepare.mjs         | 22 ++++++++++--
 src/appConfig.ts                  | 59 +++++++++++++++++++++++++++++++
 src/appParams.ts                  |  2 +-
 src/browserfs.ts                  |  4 +--
 src/customChannels.ts             |  6 ++--
 src/globalState.ts                | 41 ++-------------------
 src/index.ts                      | 17 +++------
 src/optionsStorage.ts             | 19 +++++++---
 src/panorama.ts                   |  2 +-
 src/react/MainMenuRenderApp.tsx   |  6 ++--
 15 files changed, 127 insertions(+), 74 deletions(-)
 create mode 100644 src/appConfig.ts

diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml
index 665abb30..042302a4 100644
--- a/.github/workflows/next-deploy.yml
+++ b/.github/workflows/next-deploy.yml
@@ -32,6 +32,8 @@ jobs:
           echo "{\"latestTag\": \"$(git rev-parse --short $GITHUB_SHA)\", \"isCommit\": true}" > assets/release.json
       - name: Build Project Artifacts
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
+        env:
+          CONFIG_JSON_SOURCE: BUNDLED
       - run: pnpm build-storybook
       - name: Copy playground files
         run: |
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 18c80e8c..6408c86a 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -61,6 +61,8 @@ jobs:
           echo "{\"latestTag\": \"$(git rev-parse --short ${{ github.event.pull_request.head.sha }})\", \"isCommit\": true}" > assets/release.json
       - name: Build Project Artifacts
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
+        env:
+          CONFIG_JSON_SOURCE: BUNDLED
       - run: pnpm build-storybook
       - name: Copy playground files
         run: |
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4fbff15d..5af8abab 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -30,6 +30,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod
+        env:
+          CONFIG_JSON_SOURCE: BUNDLED
       - run: pnpm build-storybook
       - name: Copy playground files
         run: |
diff --git a/Dockerfile b/Dockerfile
index 4769141f..34641353 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ RUN npm i -g pnpm@9.0.4
 # Build arguments
 ARG DOWNLOAD_SOUNDS=false
 ARG DISABLE_SERVICE_WORKER=false
+ARG CONFIG_JSON_SOURCE=REMOTE
 # TODO need flat --no-root-optional
 RUN node ./scripts/dockerPrepare.mjs
 RUN pnpm i
@@ -22,8 +23,8 @@ RUN if [ "$DOWNLOAD_SOUNDS" = "true" ] ; then node scripts/downloadSoundsMap.mjs
 # ENTRYPOINT ["pnpm", "run", "run-all"]
 
 # only for prod
-RUN GITHUB_REPOSITORY=zardoy/minecraft-web-client \
-    DISABLE_SERVICE_WORKER=$DISABLE_SERVICE_WORKER \
+RUN DISABLE_SERVICE_WORKER=$DISABLE_SERVICE_WORKER \
+    CONFIG_JSON_SOURCE=$CONFIG_JSON_SOURCE \
     pnpm run build
 
 # ---- Run Stage ----
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 4147ce7d..875d0e0c 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -25,12 +25,14 @@ const disableServiceWorker = process.env.DISABLE_SERVICE_WORKER === 'true'
 let releaseTag
 let releaseLink
 let releaseChangelog
+let githubRepositoryFallback
 
 if (fs.existsSync('./assets/release.json')) {
     const releaseJson = JSON.parse(fs.readFileSync('./assets/release.json', 'utf8'))
     releaseTag = releaseJson.latestTag
     releaseLink = releaseJson.isCommit ? `/commit/${releaseJson.latestTag}` : `/releases/${releaseJson.latestTag}`
     releaseChangelog = releaseJson.changelog?.replace(/<!-- bump-type:[\w]+ -->/, '')
+    githubRepositoryFallback = releaseJson.repository
 }
 
 const configJson = JSON.parse(fs.readFileSync('./config.json', 'utf8'))
@@ -41,6 +43,8 @@ if (dev) {
     configJson.defaultProxy = ':8080'
 }
 
+const configSource = process.env.CONFIG_JSON_SOURCE || 'REMOTE'
+
 // base options are in ./renderer/rsbuildSharedConfig.ts
 const appConfig = defineConfig({
     html: {
@@ -66,13 +70,13 @@ const appConfig = defineConfig({
             'process.env.BUILD_VERSION': JSON.stringify(!dev ? buildingVersion : 'undefined'),
             'process.env.MAIN_MENU_LINKS': JSON.stringify(process.env.MAIN_MENU_LINKS),
             'process.env.GITHUB_URL':
-                JSON.stringify(`https://github.com/${process.env.GITHUB_REPOSITORY || `${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}`}`),
+                JSON.stringify(`https://github.com/${process.env.GITHUB_REPOSITORY || `${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}` || githubRepositoryFallback}`),
             'process.env.DEPS_VERSIONS': JSON.stringify({}),
             'process.env.RELEASE_TAG': JSON.stringify(releaseTag),
             'process.env.RELEASE_LINK': JSON.stringify(releaseLink),
             'process.env.RELEASE_CHANGELOG': JSON.stringify(releaseChangelog),
             'process.env.DISABLE_SERVICE_WORKER': JSON.stringify(disableServiceWorker),
-            'process.env.INLINED_APP_CONFIG': JSON.stringify(configJson),
+            'process.env.INLINED_APP_CONFIG': JSON.stringify(configSource === 'BUNDLED' ? configJson : null),
         },
     },
     server: {
@@ -109,7 +113,9 @@ const appConfig = defineConfig({
                         fs.copyFileSync('./assets/release.json', './dist/release.json')
                     }
 
-                    fs.writeFileSync('./dist/config.json', JSON.stringify(configJson), 'utf8')
+                    if (configSource === 'REMOTE') {
+                        fs.writeFileSync('./dist/config.json', JSON.stringify(configJson), 'utf8')
+                    }
                     if (fs.existsSync('./generated/sounds.js')) {
                         fs.copyFileSync('./generated/sounds.js', './dist/sounds.js')
                     }
diff --git a/scripts/dockerPrepare.mjs b/scripts/dockerPrepare.mjs
index 37e57d01..62a4f5e4 100644
--- a/scripts/dockerPrepare.mjs
+++ b/scripts/dockerPrepare.mjs
@@ -4,9 +4,27 @@ import path from 'path'
 import { fileURLToPath } from 'url'
 import { execSync } from 'child_process'
 
-// write release tag
+// Get repository from git config
+const getGitRepository = () => {
+    try {
+        const gitConfig = fs.readFileSync('.git/config', 'utf8')
+        const originUrlMatch = gitConfig.match(/\[remote "origin"\][\s\S]*?url = .*?github\.com[:/](.*?)(\.git)?\n/m)
+        if (originUrlMatch) {
+            return originUrlMatch[1]
+        }
+    } catch (err) {
+        console.warn('Failed to read git repository from config:', err)
+    }
+    return null
+}
+
+// write release tag and repository info
 const commitShort = execSync('git rev-parse --short HEAD').toString().trim()
-fs.writeFileSync('./assets/release.json', JSON.stringify({ latestTag: `${commitShort} (docker)` }), 'utf8')
+const repository = getGitRepository()
+fs.writeFileSync('./assets/release.json', JSON.stringify({
+    latestTag: `${commitShort} (docker)`,
+    repository
+}), 'utf8')
 
 const packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'))
 delete packageJson.optionalDependencies
diff --git a/src/appConfig.ts b/src/appConfig.ts
new file mode 100644
index 00000000..3d6d8f93
--- /dev/null
+++ b/src/appConfig.ts
@@ -0,0 +1,59 @@
+import { disabledSettings, options, qsOptions } from './optionsStorage'
+import { miscUiState } from './globalState'
+import { setLoadingScreenStatus } from './appStatus'
+
+export type AppConfig = {
+  // defaultHost?: string
+  // defaultHostSave?: string
+  defaultProxy?: string
+  // defaultProxySave?: string
+  // defaultVersion?: string
+  peerJsServer?: string
+  peerJsServerFallback?: string
+  promoteServers?: Array<{ ip, description, version? }>
+  mapsProvider?: string
+
+  appParams?: Record<string, any> // query string params
+
+  defaultSettings?: Record<string, any>
+  forceSettings?: Record<string, boolean>
+  // hideSettings?: Record<string, boolean>
+  allowAutoConnect?: boolean
+  pauseLinks?: Array<Array<Record<string, any>>>
+}
+
+export const loadAppConfig = (appConfig: AppConfig) => {
+  if (miscUiState.appConfig) {
+    Object.assign(miscUiState.appConfig, appConfig)
+  } else {
+    miscUiState.appConfig = appConfig
+  }
+
+  if (appConfig.forceSettings) {
+    for (const [key, value] of Object.entries(appConfig.forceSettings)) {
+      if (value) {
+        disabledSettings.value.add(key)
+        // since the setting is forced, we need to set it to that value
+        if (appConfig.defaultSettings?.[key] && !qsOptions[key]) {
+          options[key] = appConfig.defaultSettings[key]
+        }
+      } else {
+        disabledSettings.value.delete(key)
+      }
+    }
+  }
+}
+
+export const isBundledConfigUsed = !!process.env.INLINED_APP_CONFIG
+
+if (isBundledConfigUsed) {
+  loadAppConfig(process.env.INLINED_APP_CONFIG as AppConfig ?? {})
+} else {
+  void window.fetch('config.json').then(async res => res.json()).then(c => c, (error) => {
+  // console.warn('Failed to load optional app config.json', error)
+  // return {}
+    setLoadingScreenStatus('Failed to load app config.json', true)
+  }).then((config: AppConfig) => {
+    loadAppConfig(config)
+  })
+}
diff --git a/src/appParams.ts b/src/appParams.ts
index 962eb168..98d6ff62 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -1,4 +1,4 @@
-import type { AppConfig } from './globalState'
+import type { AppConfig } from './appConfig'
 
 const qsParams = new URLSearchParams(window.location?.search ?? '')
 
diff --git a/src/browserfs.ts b/src/browserfs.ts
index 41608e30..0f4579b8 100644
--- a/src/browserfs.ts
+++ b/src/browserfs.ts
@@ -41,13 +41,13 @@ browserfs.configure({
         throw e2
       }
       showNotification('Failed to access device storage', `Check you have free space. ${e.message}`, true)
-      miscUiState.appLoaded = true
+      miscUiState.fsReady = true
       miscUiState.singleplayerAvailable = false
     })
     return
   }
   await updateTexturePackInstalledState()
-  miscUiState.appLoaded = true
+  miscUiState.fsReady = true
   miscUiState.singleplayerAvailable = true
 })
 
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 35922101..ff0f8a32 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -85,15 +85,15 @@ const registeredJeiChannel = () => {
     [
       {
         name: 'id',
-        type: 'pstring',
+        type: ['pstring', { countType: 'i16' }]
       },
       {
         name: 'categoryTitle',
-        type: 'pstring',
+        type: ['pstring', { countType: 'i16' }]
       },
       {
         name: 'items',
-        type: 'pstring',
+        type: ['pstring', { countType: 'i16' }]
       },
     ]
   ]
diff --git a/src/globalState.ts b/src/globalState.ts
index 74e6c3ff..0ee8671d 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -5,6 +5,7 @@ import type { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
 import type { OptionsGroupType } from './optionsGuiScheme'
 import { appQueryParams } from './appParams'
 import { options, disabledSettings } from './optionsStorage'
+import { AppConfig } from './appConfig'
 
 // todo: refactor structure with support of hideNext=false
 
@@ -110,26 +111,6 @@ export const showContextmenu = (items: ContextMenuItem[], { clientX, clientY })
 
 // ---
 
-export type AppConfig = {
-  // defaultHost?: string
-  // defaultHostSave?: string
-  defaultProxy?: string
-  // defaultProxySave?: string
-  // defaultVersion?: string
-  peerJsServer?: string
-  peerJsServerFallback?: string
-  promoteServers?: Array<{ ip, description, version? }>
-  mapsProvider?: string
-
-  appParams?: Record<string, any> // query string params
-
-  defaultSettings?: Record<string, any>
-  forceSettings?: Record<string, boolean>
-  // hideSettings?: Record<string, boolean>
-  allowAutoConnect?: boolean
-  pauseLinks?: Array<Array<Record<string, any>>>
-}
-
 export const miscUiState = proxy({
   currentDisplayQr: null as string | null,
   currentTouch: null as boolean | null,
@@ -144,7 +125,7 @@ export const miscUiState = proxy({
   loadedServerIndex: '',
   /** currently trying to load or loaded mc version, after all data is loaded */
   loadedDataVersion: null as string | null,
-  appLoaded: false,
+  fsReady: false,
   singleplayerAvailable: false,
   usingGamepadInput: false,
   appConfig: null as AppConfig | null,
@@ -152,24 +133,6 @@ export const miscUiState = proxy({
   displayFullmap: false
 })
 
-export const loadAppConfig = (appConfig: AppConfig) => {
-  if (miscUiState.appConfig) {
-    Object.assign(miscUiState.appConfig, appConfig)
-  } else {
-    miscUiState.appConfig = appConfig
-  }
-
-  if (appConfig.forceSettings) {
-    for (const [key, value] of Object.entries(appConfig.forceSettings)) {
-      if (value) {
-        disabledSettings.value.delete(key)
-      } else {
-        disabledSettings.value.add(key)
-      }
-    }
-  }
-}
-
 export const isGameActive = (foregroundCheck: boolean) => {
   if (foregroundCheck && activeModalStack.length) return false
   return miscUiState.gameLoaded
diff --git a/src/index.ts b/src/index.ts
index 7269781d..b8727395 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -12,6 +12,7 @@ import './mineflayer/cameraShake'
 import './shims/patchShims'
 import './mineflayer/java-tester/index'
 import './external'
+import './appConfig'
 import { getServerInfo } from './mineflayer/mc-protocol'
 import { onGameLoad, renderSlot } from './inventoryWindows'
 import { GeneralInputItem, RenderItem } from './mineflayer/items'
@@ -48,7 +49,6 @@ import initializePacketsReplay from './packetsReplay/packetsReplayLegacy'
 
 import { initVR } from './vr'
 import {
-  AppConfig,
   activeModalStack,
   activeModalStacks,
   hideModal,
@@ -57,7 +57,6 @@ import {
   miscUiState,
   showModal,
   gameAdditionalState,
-  loadAppConfig
 } from './globalState'
 
 import { parseServerAddress } from './parseServerAddress'
@@ -904,8 +903,9 @@ export async function connect (connectOptions: ConnectOptions) {
 const reconnectOptions = sessionStorage.getItem('reconnectOptions') ? JSON.parse(sessionStorage.getItem('reconnectOptions')!) : undefined
 
 listenGlobalEvents()
-watchValue(miscUiState, async s => {
-  if (s.appLoaded) { // fs ready
+const unsubscribe = watchValue(miscUiState, async s => {
+  if (s.fsReady && s.appConfig) {
+    unsubscribe()
     if (reconnectOptions) {
       sessionStorage.removeItem('reconnectOptions')
       if (Date.now() - reconnectOptions.timestamp < 1000 * 60 * 2) {
@@ -966,15 +966,6 @@ document.body.addEventListener('touchstart', (e) => {
 }, { passive: false })
 // #endregion
 
-loadAppConfig(process.env.INLINED_APP_CONFIG as AppConfig ?? {})
-// load maybe updated config on the server with updated params (just in case)
-void window.fetch('config.json').then(async res => res.json()).then(c => c, (error) => {
-  console.warn('Failed to load optional app config.json', error)
-  return {}
-}).then((config: AppConfig | {}) => {
-  loadAppConfig(config)
-})
-
 // qs open actions
 if (!reconnectOptions) {
   downloadAndOpenFile().then((downloadAction) => {
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 904b0a29..79748679 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -5,7 +5,7 @@ import { proxy, subscribe } from 'valtio/vanilla'
 import { subscribeKey } from 'valtio/utils'
 import { omitObj } from '@zardoy/utils'
 import { appQueryParamsArray } from './appParams'
-import type { AppConfig } from './globalState'
+import type { AppConfig } from './appConfig'
 
 const isDev = process.env.NODE_ENV === 'development'
 const initialAppConfig = process.env?.INLINED_APP_CONFIG as AppConfig ?? {}
@@ -188,7 +188,7 @@ subscribe(options, () => {
   localStorage.options = JSON.stringify(saveOptions)
 })
 
-type WatchValue = <T extends Record<string, any>>(proxy: T, callback: (p: T, isChanged: boolean) => void) => void
+type WatchValue = <T extends Record<string, any>>(proxy: T, callback: (p: T, isChanged: boolean) => void) => () => void
 
 export const watchValue: WatchValue = (proxy, callback) => {
   const watchedProps = new Set<string>()
@@ -198,10 +198,19 @@ export const watchValue: WatchValue = (proxy, callback) => {
       return Reflect.get(target, p, receiver)
     },
   }), false)
+  const unsubscribes = [] as Array<() => void>
   for (const prop of watchedProps) {
-    subscribeKey(proxy, prop, () => {
-      callback(proxy, true)
-    })
+    unsubscribes.push(
+      subscribeKey(proxy, prop, () => {
+        callback(proxy, true)
+      })
+    )
+  }
+
+  return () => {
+    for (const unsubscribe of unsubscribes) {
+      unsubscribe()
+    }
   }
 }
 
diff --git a/src/panorama.ts b/src/panorama.ts
index efc06e16..3c888246 100644
--- a/src/panorama.ts
+++ b/src/panorama.ts
@@ -48,7 +48,7 @@ const updateResourcePackSupportPanorama = async () => {
 }
 
 watchValue(miscUiState, m => {
-  if (m.appLoaded) {
+  if (m.fsReady) {
     // Also adds panorama on app load here
     watchValue(resourcePackState, async (s) => {
       const oldState = panoramaUsesResourcePack
diff --git a/src/react/MainMenuRenderApp.tsx b/src/react/MainMenuRenderApp.tsx
index e06ced52..30fd3047 100644
--- a/src/react/MainMenuRenderApp.tsx
+++ b/src/react/MainMenuRenderApp.tsx
@@ -75,12 +75,12 @@ export const mainMenuState = proxy({
 let disableAnimation = false
 export default () => {
   const haveModals = useSnapshot(activeModalStack).length
-  const { gameLoaded, appLoaded, appConfig, singleplayerAvailable } = useSnapshot(miscUiState)
+  const { gameLoaded, fsReady, appConfig, singleplayerAvailable } = useSnapshot(miscUiState)
 
-  const noDisplay = haveModals || gameLoaded || !appLoaded
+  const noDisplay = haveModals || gameLoaded || !fsReady
 
   useEffect(() => {
-    if (noDisplay && appLoaded) disableAnimation = true
+    if (noDisplay && fsReady) disableAnimation = true
   }, [noDisplay])
 
   const [versionStatus, setVersionStatus] = useState('')

From 465ce35e8314a0ddda93a39e733243b7763c49f3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 5 Mar 2025 13:02:55 +0300
Subject: [PATCH 305/753] feat: display motd/players info for ws servers (still
 no icon sadly) add new server

---
 config.json                                | 4 ++++
 src/mineflayer/minecraft-protocol-extra.ts | 2 +-
 src/react/ServersListProvider.tsx          | 6 +++++-
 src/react/Singleplayer.tsx                 | 4 +++-
 src/react/singleplayer.module.css          | 3 +++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/config.json b/config.json
index 6aa86397..e48d758b 100644
--- a/config.json
+++ b/config.json
@@ -6,6 +6,10 @@
   "peerJsServer": "",
   "peerJsServerFallback": "https://p2p.mcraft.fun",
   "promoteServers": [
+    {
+      "ip": "ws://mcraft.ryzyn.xyz",
+      "version": "1.19.4"
+    },
     {
       "ip": "ws://play.mcraft.fun"
     },
diff --git a/src/mineflayer/minecraft-protocol-extra.ts b/src/mineflayer/minecraft-protocol-extra.ts
index ef1bfbf2..e8216a00 100644
--- a/src/mineflayer/minecraft-protocol-extra.ts
+++ b/src/mineflayer/minecraft-protocol-extra.ts
@@ -13,7 +13,7 @@ export const pingServerVersion = async (ip: string, port?: number, mergeOptions:
     ...mergeOptions,
   }
   let latency = 0
-  let fullInfo = null
+  let fullInfo: any = null
   fakeClient.autoVersionHooks = [(res) => {
     latency = res.latency
     fullInfo = res
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 16c5ae8b..56ec75b6 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -17,6 +17,7 @@ import { useCopyKeybinding } from './simpleHooks'
 import { AuthenticatedAccount, getInitialServersList, getServerConnectionHistory, setNewServersList, StoreServerItem } from './serversStorage'
 
 type AdditionalDisplayData = {
+  textNameRightGrayed: string
   formattedText: string
   textNameRight: string
   icon?: string
@@ -143,9 +144,11 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
               let data
               if (isWebSocket) {
                 const pingResult = await getServerInfo(server.ip, undefined, undefined, true)
+                console.log('pingResult.fullInfo.description', pingResult.fullInfo.description)
                 data = {
-                  formattedText: `${pingResult.version} server with a direct websocket connection`,
+                  formattedText: pingResult.fullInfo.description,
                   textNameRight: `ws ${pingResult.latency}ms`,
+                  textNameRightGrayed: `${pingResult.fullInfo.players?.online ?? '??'}/${pingResult.fullInfo.players?.max ?? '??'}`,
                   offline: false
                 }
               } else {
@@ -364,6 +367,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         detail: (server.versionOverride ?? '') + ' ' + (server.usernameOverride ?? ''),
         formattedTextOverride: additional?.formattedText,
         worldNameRight: additional?.textNameRight ?? '',
+        worldNameRightGrayed: additional?.textNameRightGrayed ?? '',
         iconSrc: additional?.icon,
         offline: additional?.offline
       }
diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index 5effc269..6d7d6b0e 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -24,13 +24,14 @@ export interface WorldProps {
   detail?: string
   formattedTextOverride?: string
   worldNameRight?: string
+  worldNameRightGrayed?: string
   onFocus?: (name: string) => void
   onInteraction?(interaction: 'enter' | 'space')
   elemRef?: React.Ref<HTMLDivElement>
   offline?: boolean
 }
 
-const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus, onInteraction, iconSrc, formattedTextOverride, worldNameRight, elemRef, offline }: WorldProps & { ref?: React.Ref<HTMLDivElement> }) => {
+const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus, onInteraction, iconSrc, formattedTextOverride, worldNameRight, worldNameRightGrayed, elemRef, offline }: WorldProps & { ref?: React.Ref<HTMLDivElement> }) => {
   const timeRelativeFormatted = useMemo(() => {
     if (!lastPlayed) return ''
     const formatter = new Intl.RelativeTimeFormat('en', { numeric: 'auto' })
@@ -63,6 +64,7 @@ const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus,
       <div className={styles.world_title}>
         <div>{title}</div>
         <div className={styles.world_title_right}>
+          {worldNameRightGrayed && <span style={{ color: '#878787', fontSize: 8 }}>{worldNameRightGrayed}</span>}
           {offline ? (
             <span style={{ color: 'red', display: 'flex', alignItems: 'center', gap: 4 }}>
               <PixelartIcon iconName="signal-off" width={12} />
diff --git a/src/react/singleplayer.module.css b/src/react/singleplayer.module.css
index 0e69ea46..0de91735 100644
--- a/src/react/singleplayer.module.css
+++ b/src/react/singleplayer.module.css
@@ -36,6 +36,9 @@
 .world_title_right {
     color: #999;
     font-size: 9px;
+    display: flex;
+    align-items: end;
+    gap: 1px;
 }
 .world_info {
     margin-left: 3px;

From 998f0f0a85cd82cd3455b45d9866279000504298 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 5 Mar 2025 13:07:21 +0300
Subject: [PATCH 306/753] fix: fix sentry #6092213276 DataCloneError: Cannot
 decode detached ArrayBuffer

---
 src/basicSounds.ts | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/basicSounds.ts b/src/basicSounds.ts
index 6c2b5f4f..40428c6b 100644
--- a/src/basicSounds.ts
+++ b/src/basicSounds.ts
@@ -17,17 +17,30 @@ const convertedSounds = [] as string[]
 export async function loadSound (path: string, contents = path) {
   if (loadingSounds.includes(path)) return true
   loadingSounds.push(path)
-  const res = await window.fetch(contents)
-  if (!res.ok) {
-    const error = `Failed to load sound ${path}`
-    if (isCypress()) throw new Error(error)
-    else console.warn(error)
-    return
-  }
-  const data = await res.arrayBuffer()
 
-  sounds[path] = data
-  loadingSounds.splice(loadingSounds.indexOf(path), 1)
+  try {
+    audioContext ??= new window.AudioContext()
+
+    const res = await window.fetch(contents)
+    if (!res.ok) {
+      const error = `Failed to load sound ${path}`
+      if (isCypress()) throw new Error(error)
+      else console.warn(error)
+      return
+    }
+    const arrayBuffer = await res.arrayBuffer()
+
+    // Decode the audio data immediately
+    const audioBuffer = await audioContext.decodeAudioData(arrayBuffer)
+    sounds[path] = audioBuffer
+    convertedSounds.push(path) // Mark as converted immediately
+
+    loadingSounds.splice(loadingSounds.indexOf(path), 1)
+  } catch (err) {
+    console.warn(`Failed to load sound ${path}:`, err)
+    loadingSounds.splice(loadingSounds.indexOf(path), 1)
+    if (isCypress()) throw err
+  }
 }
 
 export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = 500) => {
@@ -53,13 +66,6 @@ export async function playSound (url, soundVolume = 1) {
     return
   }
 
-  for (const [soundName, sound] of Object.entries(sounds)) {
-    if (convertedSounds.includes(soundName)) continue
-    // eslint-disable-next-line no-await-in-loop
-    sounds[soundName] = await audioContext.decodeAudioData(sound)
-    convertedSounds.push(soundName)
-  }
-
   const soundBuffer = sounds[url]
   if (!soundBuffer) {
     console.warn(`Sound ${url} not loaded yet`)

From 0db49e78799021d90223f989abec11a99ff87f86 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 5 Mar 2025 15:11:42 +0300
Subject: [PATCH 307/753] feat: Full support for rendering blocks in inventory
 GUI powered by deeplsate (#292)

---
 package.json                               |   2 +-
 pnpm-lock.yaml                             |  22 +-
 renderer/viewer/lib/guiRenderer.ts         | 275 +++++++++++++++++++++
 renderer/viewer/lib/worldrendererCommon.ts |  13 +
 src/inventoryWindows.ts                    |  34 ++-
 src/react/EnterFullscreenButton.tsx        |   9 +-
 6 files changed, 336 insertions(+), 19 deletions(-)
 create mode 100644 renderer/viewer/lib/guiRenderer.ts

diff --git a/package.json b/package.json
index 0e0aa6a8..1a195884 100644
--- a/package.json
+++ b/package.json
@@ -148,8 +148,8 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
+    "mc-assets": "^0.2.42",
     "mineflayer-mouse": "^0.0.5",
-    "mc-assets": "^0.2.37",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dbbac60e..d5c2446f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -350,8 +350,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.37
-        version: 0.2.37
+        specifier: ^0.2.42
+        version: 0.2.42
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -3589,9 +3589,6 @@ packages:
     resolution: {integrity: sha512-FCAJojipPn0bXjuEpjOOOMN8FZDkxfWWp4JGN9mifU2IhxvKyXZYqpzPHdnTSUpmPDy+tsslB6Z1g+Vg6nVbYA==}
     engines: {node: '>=8'}
 
-  apl-image-packer@1.1.0:
-    resolution: {integrity: sha512-Pb1Q76cp8xpY8X4OqVrnk5v1/tB5kOtCzwgOnx8IxMNeekFh/eNUiUKeX5fvGNViZiLmuKAAQc5ICuBDspZ4cA==}
-
   app-root-dir@1.0.2:
     resolution: {integrity: sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g==}
 
@@ -6571,8 +6568,11 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.37:
-    resolution: {integrity: sha512-49tk3shwxsDoV0PrrbORZEKg613vUQPULgusWjXNl8JEma5y41LEo57D6q4aHliXsV3Gb9ThrkFf6hIb0WlY1Q==}
+  maxrects-packer@2.7.3:
+    resolution: {integrity: sha512-bG6qXujJ1QgttZVIH4WDanhoJtvbud/xP/XPyf6A69C9RdA61BM4TomFALCq2nrTa+tARRIBB4LuIFsnUQU2wA==}
+
+  mc-assets@0.2.42:
+    resolution: {integrity: sha512-j2D1RNYtB5Z9gFu9MVjyDBbiALI0mWZ3xW/A3PPefVAHm3HJ2T1vH+1XBov1spBGPl7u+Zo7mRXza3X0egbeOg==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.8:
@@ -13609,8 +13609,6 @@ snapshots:
 
   apache-md5@1.1.8: {}
 
-  apl-image-packer@1.1.0: {}
-
   app-root-dir@1.0.2: {}
 
   aproba@2.0.0:
@@ -17367,9 +17365,11 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.37:
+  maxrects-packer@2.7.3: {}
+
+  mc-assets@0.2.42:
     dependencies:
-      apl-image-packer: 1.1.0
+      maxrects-packer: 2.7.3
       zod: 3.24.1
 
   mcraft-fun-mineflayer@0.1.8(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)):
diff --git a/renderer/viewer/lib/guiRenderer.ts b/renderer/viewer/lib/guiRenderer.ts
new file mode 100644
index 00000000..b197040e
--- /dev/null
+++ b/renderer/viewer/lib/guiRenderer.ts
@@ -0,0 +1,275 @@
+// Import placeholders - replace with actual imports for your environment
+import { ItemRenderer, Identifier, ItemStack, NbtString, Structure, StructureRenderer, ItemRendererResources, BlockDefinition, BlockModel, TextureAtlas, Resources, ItemModel } from 'deepslate'
+import { mat4, vec3 } from 'gl-matrix'
+import { AssetsParser } from 'mc-assets/dist/assetsParser'
+import { getLoadedImage } from 'mc-assets/dist/utils'
+import { BlockModel as BlockModelMcAssets, AtlasParser } from 'mc-assets'
+import { getLoadedBlockstatesStore, getLoadedModelsStore } from 'mc-assets/dist/stores'
+import { makeTextureAtlas } from 'mc-assets/dist/atlasCreator'
+import { proxy, ref } from 'valtio'
+import { getItemDefinition } from 'mc-assets/dist/itemDefinitions'
+
+export const activeGuiAtlas = proxy({
+  atlas: null as null | { json, image },
+})
+
+export const getNonFullBlocksModels = () => {
+  const version = viewer.world.texturesVersion ?? 'latest'
+  const itemsDefinitions = viewer.world.itemsDefinitionsStore.data.latest
+  const blockModelsResolved = {} as Record<string, any>
+  const itemsModelsResolved = {} as Record<string, any>
+  const fullBlocksWithNonStandardDisplay = [] as string[]
+  const handledItemsWithDefinitions = new Set()
+  const assetsParser = new AssetsParser(version, getLoadedBlockstatesStore(viewer.world.blockstatesModels), getLoadedModelsStore(viewer.world.blockstatesModels))
+
+  const standardGuiDisplay = {
+    'rotation': [
+      30,
+      225,
+      0
+    ],
+    'translation': [
+      0,
+      0,
+      0
+    ],
+    'scale': [
+      0.625,
+      0.625,
+      0.625
+    ]
+  }
+
+  const arrEqual = (a: number[], b: number[]) => a.length === b.length && a.every((x, i) => x === b[i])
+  const addModelIfNotFullblock = (name: string, model: BlockModelMcAssets) => {
+    if (blockModelsResolved[name]) return
+    if (!model?.elements?.length) return
+    const isFullBlock = model.elements.length === 1 && arrEqual(model.elements[0].from, [0, 0, 0]) && arrEqual(model.elements[0].to, [16, 16, 16])
+    if (isFullBlock) return
+    model['display'] ??= {}
+    model['display']['gui'] ??= standardGuiDisplay
+    blockModelsResolved[name] = model
+  }
+
+  for (const [name, definition] of Object.entries(itemsDefinitions)) {
+    const item = getItemDefinition(viewer.world.itemsDefinitionsStore, {
+      version,
+      name,
+      properties: {
+        'minecraft:display_context': 'gui',
+      },
+    })
+    if (item) {
+      const { resolvedModel } = assetsParser.getResolvedModelsByModel((item.special ? name : item.model).replace('minecraft:', '')) ?? {}
+      if (resolvedModel) {
+        handledItemsWithDefinitions.add(name)
+      }
+      if (resolvedModel?.elements) {
+
+        let hasStandardDisplay = true
+        if (resolvedModel['display']?.gui) {
+          hasStandardDisplay =
+            arrEqual(resolvedModel['display'].gui.rotation, standardGuiDisplay.rotation)
+            && arrEqual(resolvedModel['display'].gui.translation, standardGuiDisplay.translation)
+            && arrEqual(resolvedModel['display'].gui.scale, standardGuiDisplay.scale)
+        }
+
+        addModelIfNotFullblock(name, resolvedModel)
+
+        if (!blockModelsResolved[name] && !hasStandardDisplay) {
+          fullBlocksWithNonStandardDisplay.push(name)
+        }
+        const notSideLight = resolvedModel['gui_light'] && resolvedModel['gui_light'] !== 'side'
+        if (!hasStandardDisplay || notSideLight) {
+          blockModelsResolved[name] = resolvedModel
+        }
+      }
+      if (!blockModelsResolved[name] && item.tints && resolvedModel) {
+        resolvedModel['tints'] = item.tints
+        if (resolvedModel.elements) {
+          blockModelsResolved[name] = resolvedModel
+        } else {
+          itemsModelsResolved[name] = resolvedModel
+        }
+      }
+    }
+  }
+
+  for (const [name, blockstate] of Object.entries(viewer.world.blockstatesModels.blockstates.latest)) {
+    if (handledItemsWithDefinitions.has(name)) {
+      continue
+    }
+    const resolvedModel = assetsParser.getResolvedModelFirst({ name: name.replace('minecraft:', ''), properties: {} }, true)
+    if (resolvedModel) {
+      addModelIfNotFullblock(name, resolvedModel[0])
+    }
+  }
+
+  return {
+    blockModelsResolved,
+    itemsModelsResolved
+  }
+}
+
+// customEvents.on('gameLoaded', () => {
+//   const res = getNonFullBlocksModels()
+// })
+
+const RENDER_SIZE = 64
+
+const generateItemsGui = async (models: Record<string, BlockModelMcAssets>, isItems = false) => {
+  const img = await getLoadedImage(isItems ? viewer.world.itemsAtlasParser!.latestImage : viewer.world.blocksAtlasParser!.latestImage)
+  const canvasTemp = document.createElement('canvas')
+  canvasTemp.width = img.width
+  canvasTemp.height = img.height
+  canvasTemp.style.imageRendering = 'pixelated'
+  const ctx = canvasTemp.getContext('2d')!
+  ctx.imageSmoothingEnabled = false
+  ctx.drawImage(img, 0, 0)
+
+  const atlasParser = isItems ? viewer.world.itemsAtlasParser! : viewer.world.blocksAtlasParser!
+  const textureAtlas = new TextureAtlas(
+    ctx.getImageData(0, 0, img.width, img.height),
+    Object.fromEntries(Object.entries(atlasParser.atlas.latest.textures).map(([key, value]) => {
+      return [key, [
+        value.u,
+        value.v,
+        (value.u + (value.su ?? atlasParser.atlas.latest.suSv)),
+        (value.v + (value.sv ?? atlasParser.atlas.latest.suSv)),
+      ]] as [string, [number, number, number, number]]
+    }))
+  )
+
+  const PREVIEW_ID = Identifier.parse('preview:preview')
+  const PREVIEW_DEFINITION = new BlockDefinition({ '': { model: PREVIEW_ID.toString() } }, undefined)
+
+  let modelData: any
+  let currentModelName: string | undefined
+  const resources: ItemRendererResources = {
+    getBlockModel (id) {
+      if (id.equals(PREVIEW_ID)) {
+        return BlockModel.fromJson(modelData ?? {})
+      }
+      return null
+    },
+    getTextureUV (texture) {
+      return textureAtlas.getTextureUV(texture.toString().slice(1).split('/').slice(1).join('/') as any)
+    },
+    getTextureAtlas () {
+      return textureAtlas.getTextureAtlas()
+    },
+    getItemComponents (id) {
+      return new Map()
+    },
+    getItemModel (id) {
+      // const isSpecial = currentModelName === 'shield' || currentModelName === 'conduit' || currentModelName === 'trident'
+      const isSpecial = false
+      if (id.equals(PREVIEW_ID)) {
+        return ItemModel.fromJson({
+          type: isSpecial ? 'minecraft:special' : 'minecraft:model',
+          model: isSpecial ? {
+            type: currentModelName,
+          } : PREVIEW_ID.toString(),
+          base: PREVIEW_ID.toString(),
+          tints: modelData?.tints,
+        })
+      }
+      return null
+    },
+  }
+
+  const canvas = document.createElement('canvas')
+  canvas.width = RENDER_SIZE
+  canvas.height = RENDER_SIZE
+  const gl = canvas.getContext('webgl2', { preserveDrawingBuffer: true })
+  if (!gl) {
+    throw new Error('Cannot get WebGL2 context')
+  }
+
+  function resetGLContext (gl) {
+    gl.clearColor(0, 0, 0, 0)
+    gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT | gl.STENCIL_BUFFER_BIT)
+  }
+
+  // const includeOnly = ['powered_repeater', 'wooden_door']
+  const includeOnly = [] as string[]
+
+  const images: Record<string, HTMLImageElement> = {}
+  const item = new ItemStack(PREVIEW_ID, 1, new Map(Object.entries({
+    'minecraft:item_model': new NbtString(PREVIEW_ID.toString()),
+  })))
+  const renderer = new ItemRenderer(gl, item, resources, { display_context: 'gui' })
+  const missingTextures = new Set()
+  for (const [modelName, model] of Object.entries(models)) {
+    if (includeOnly.length && !includeOnly.includes(modelName)) continue
+
+    const patchMissingTextures = () => {
+      for (const element of model.elements ?? []) {
+        for (const [faceName, face] of Object.entries(element.faces)) {
+          if (face.texture.startsWith('#')) {
+            missingTextures.add(`${modelName} ${faceName}: ${face.texture}`)
+            face.texture = 'block/unknown'
+          }
+        }
+      }
+    }
+    patchMissingTextures()
+    // TODO eggs
+
+    modelData = model
+    currentModelName = modelName
+    resetGLContext(gl)
+    if (!modelData) continue
+    renderer.setItem(item, { display_context: 'gui' })
+    renderer.drawItem()
+    const url = canvas.toDataURL()
+    // eslint-disable-next-line no-await-in-loop
+    const img = await getLoadedImage(url)
+    images[modelName] = img
+  }
+
+  if (missingTextures.size) {
+    console.warn(`[guiRenderer] Missing textures in ${[...missingTextures].join(', ')}`)
+  }
+
+  return images
+}
+
+const generateAtlas = async (images: Record<string, HTMLImageElement>) => {
+  const atlas = makeTextureAtlas({
+    input: Object.keys(images),
+    tileSize: RENDER_SIZE,
+    getLoadedImage (name) {
+      return {
+        image: images[name],
+      }
+    },
+  })
+
+  // const atlasParser = new AtlasParser({ latest: atlas.json }, atlas.canvas.toDataURL())
+  // const a = document.createElement('a')
+  // a.href = await atlasParser.createDebugImage(true)
+  // a.download = 'blocks_atlas.png'
+  // a.click()
+
+  activeGuiAtlas.atlas = {
+    json: atlas.json,
+    image: ref(await getLoadedImage(atlas.canvas.toDataURL())),
+  }
+
+  return atlas
+}
+
+export const generateGuiAtlas = async () => {
+  const { blockModelsResolved, itemsModelsResolved } = getNonFullBlocksModels()
+
+  // Generate blocks atlas
+  console.time('generate blocks gui atlas')
+  const blockImages = await generateItemsGui(blockModelsResolved, false)
+  console.timeEnd('generate blocks gui atlas')
+  console.time('generate items gui atlas')
+  const itemImages = await generateItemsGui(itemsModelsResolved, true)
+  console.timeEnd('generate items gui atlas')
+  await generateAtlas({ ...blockImages, ...itemImages })
+  // await generateAtlas(blockImages)
+}
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index a54f9fe8..261b18e6 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -24,6 +24,7 @@ import { chunkPos } from './simpleUtils'
 import { HandItemBlock } from './holdingBlock'
 import { updateStatText } from './ui/newStats'
 import { WorldRendererThree } from './worldrendererThree'
+import { generateGuiAtlas } from './guiRenderer'
 
 function mod (x, n) {
   return ((x % n) + n) % n
@@ -354,6 +355,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
   }
 
+  async generateGuiTextures () {
+    await generateGuiAtlas()
+  }
+
   async updateAssetsData (resourcePackUpdate = false, prioritizeBlockTextures?: string[]) {
     const blocksAssetsParser = new AtlasParser(this.sourceData.blocksAtlases, blocksAtlasLatest, blocksAtlasLegacy)
     const itemsAssetsParser = new AtlasParser(this.sourceData.itemsAtlases, itemsAtlasLatest, itemsAtlasLegacy)
@@ -379,6 +384,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       return texture
     }, this.customTextures?.items?.tileSize, undefined, customItemTextures)
     console.timeEnd('createItemsAtlas')
+
     this.blocksAtlasParser = new AtlasParser({ latest: blocksAtlas }, blocksCanvas.toDataURL())
     this.itemsAtlasParser = new AtlasParser({ latest: itemsAtlas }, itemsCanvas.toDataURL())
 
@@ -418,13 +424,20 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         config: this.mesherConfig,
       })
     }
+    if (!this.itemsAtlasParser) return
     const itemsTexture = await new THREE.TextureLoader().loadAsync(this.itemsAtlasParser.latestImage)
     itemsTexture.magFilter = THREE.NearestFilter
     itemsTexture.minFilter = THREE.NearestFilter
     itemsTexture.flipY = false
     viewer.entities.itemsTexture = itemsTexture
+    if (!this.itemsAtlasParser) return
 
     this.renderUpdateEmitter.emit('textureDownloaded')
+
+    console.time('generateGuiTextures')
+    await this.generateGuiTextures()
+    console.timeEnd('generateGuiTextures')
+    if (!this.itemsAtlasParser) return
     this.renderUpdateEmitter.emit('itemsTextureDownloaded')
     console.log('textures loaded')
   }
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index d473f5be..4e4616cd 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -10,6 +10,7 @@ import { versionToNumber } from 'renderer/viewer/prepare/utils'
 import { getRenamedData } from 'flying-squid/dist/blockRenames'
 import PrismarineChatLoader from 'prismarine-chat'
 import { BlockModel } from 'mc-assets'
+import { activeGuiAtlas } from 'renderer/viewer/lib/guiRenderer'
 import Generic95 from '../assets/generic_95.png'
 import { appReplacableResources } from './generated/resources'
 import { activeModalStack, hideCurrentModal, hideModal, miscUiState, showModal } from './globalState'
@@ -155,7 +156,10 @@ const getImageSrc = (path): string | HTMLImageElement => {
   return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII='
 }
 
-const getImage = ({ path = undefined as string | undefined, texture = undefined as string | undefined, blockData = undefined as any }, onLoad = () => { }) => {
+const getImage = ({ path = undefined as string | undefined, texture = undefined as string | undefined, blockData = undefined as any, image = undefined as HTMLImageElement | undefined }, onLoad = () => { }) => {
+  if (image) {
+    return image
+  }
   if (!path && !texture) throw new Error('Either pass path or texture')
   const loadPath = (blockData ? 'blocks' : path ?? texture)!
   if (loadedImagesCache.has(loadPath)) {
@@ -184,7 +188,8 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
   blockData?: Record<string, { slice, path }> & { resolvedModel: BlockModel },
   scale?: number,
   slice?: number[],
-  modelName?: string
+  modelName?: string,
+  image?: HTMLImageElement
 } | undefined => {
   let itemModelName = model.modelName
   const originalItemName = itemModelName
@@ -196,6 +201,23 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
 
 
   let itemTexture
+
+  if (!fullBlockModelSupport) {
+    const atlas = activeGuiAtlas.atlas?.json
+    // todo atlas holds all rendered blocks, not all possibly rendered item/block models, need to request this on demand instead (this is how vanilla works)
+    const item = atlas?.textures[itemModelName.replace('minecraft:', '').replace('block/', '').replace('blocks/', '').replace('item/', '').replace('items/', '')]
+    if (item) {
+      const x = item.u * atlas.width
+      const y = item.v * atlas.height
+      return {
+        texture: 'gui',
+        image: activeGuiAtlas.atlas!.image,
+        slice: [x, y, atlas.tileSize, atlas.tileSize],
+        scale: 0.25,
+      }
+    }
+  }
+
   try {
     assertDefined(viewer.world.itemsRenderer)
     itemTexture =
@@ -205,6 +227,8 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
     inGameError(`Failed to render item ${itemModelName} (original: ${originalItemName}) on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
     itemTexture = viewer.world.itemsRenderer!.getItemTexture('block/errored')!
   }
+
+
   if ('type' in itemTexture) {
     // is item
     return {
@@ -230,13 +254,13 @@ const getItemName = (slot: Item | RenderItem | null) => {
   return text.join('')
 }
 
-const mapSlots = (slots: Array<RenderItem | Item | null>) => {
+const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
   return slots.map((slot, i) => {
     // todo stateid
     if (!slot) return
 
     try {
-      const debugIsQuickbar = i === bot.inventory.hotbarStart + bot.quickBarSlot
+      const debugIsQuickbar = !isJei && i === bot.inventory.hotbarStart + bot.quickBarSlot
       const modelName = getItemModelName(slot, { 'minecraft:display_context': 'gui', })
       const slotCustomProps = renderSlot({ modelName }, debugIsQuickbar)
       const itemCustomName = getItemName(slot)
@@ -305,7 +329,7 @@ const upJei = (search: string) => {
     return new PrismarineItem(x.id, 1)
   }).filter(a => a !== null)
   lastWindow.pwindow.win.jeiSlotsPage = 0
-  lastWindow.pwindow.win.jeiSlots = mapSlots(matchedSlots)
+  lastWindow.pwindow.win.jeiSlots = mapSlots(matchedSlots, true)
 }
 
 export const openItemsCanvas = (type, _bot = bot as typeof bot | null) => {
diff --git a/src/react/EnterFullscreenButton.tsx b/src/react/EnterFullscreenButton.tsx
index 3901b9ae..0bc41632 100644
--- a/src/react/EnterFullscreenButton.tsx
+++ b/src/react/EnterFullscreenButton.tsx
@@ -4,6 +4,7 @@ import { activeModalStack, miscUiState } from '../globalState'
 import Button from './Button'
 import { useUsingTouch } from './utilsApp'
 import { pixelartIcons } from './PixelartIcon'
+import { showNotification } from './NotificationProvider'
 
 const hideOnModals = new Set(['chat'])
 
@@ -33,8 +34,12 @@ export default () => {
       left: inMainMenu ? 35 : 5,
       width: 22,
     }}
-    onClick={() => {
-      void document.documentElement.requestFullscreen()
+    onClick={async () => {
+      try {
+        await document.documentElement.requestFullscreen()
+      } catch (err) {
+        showNotification(`${err.message ?? err}`, undefined, true)
+      }
     }}
   />
 }

From b9df1bcf9ec4b099eede64fde721327c082a95b1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 5 Mar 2025 15:12:05 +0300
Subject: [PATCH 308/753] fix enabling lighting falsey when load for chunks is
 enabled

---
 src/watchOptions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 724fb2ba..3e607f49 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -75,7 +75,7 @@ export const watchOptionsAfterViewerInit = () => {
     viewer.world.mesherConfig.enableLighting = !bot.supportFeature('blockStateId') || options.newVersionsLighting;
     (viewer.world as WorldRendererThree).rerenderAllChunks()
   })
-  customEvents.on('gameLoaded', () => {
+  customEvents.on('mineflayerBotCreated', () => {
     viewer.world.mesherConfig.enableLighting = !bot.supportFeature('blockStateId') || options.newVersionsLighting
   })
 

From 6fb18d44382b729163fa5c7ca2fb96313ea6455b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 5 Mar 2025 15:26:59 +0300
Subject: [PATCH 309/753] fixes & workarounds rendering items in inventory
 (some were broken since last commit)

---
 src/inventoryWindows.ts | 2 +-
 src/resourcesManager.ts | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 4e4616cd..6a5ab0d6 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -205,7 +205,7 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
   if (!fullBlockModelSupport) {
     const atlas = activeGuiAtlas.atlas?.json
     // todo atlas holds all rendered blocks, not all possibly rendered item/block models, need to request this on demand instead (this is how vanilla works)
-    const item = atlas?.textures[itemModelName.replace('minecraft:', '').replace('block/', '').replace('blocks/', '').replace('item/', '').replace('items/', '')]
+    const item = atlas?.textures[itemModelName.replace('minecraft:', '').replace('block/', '').replace('blocks/', '').replace('item/', '').replace('items/', '').replace('_inventory', '').replace('_bottom', '')]
     if (item) {
       const x = item.u * atlas.width
       const y = item.v * atlas.height
diff --git a/src/resourcesManager.ts b/src/resourcesManager.ts
index fd92e58b..43c3882e 100644
--- a/src/resourcesManager.ts
+++ b/src/resourcesManager.ts
@@ -14,10 +14,11 @@ export const getItemModelName = (item: GeneralInputItem, specificProps: ItemSpec
   const itemSelector = playerState.getItemSelector({
     ...specificProps
   })
-  const model = getItemDefinition(viewer.world.itemsDefinitionsStore, {
+  const modelFromDef = getItemDefinition(viewer.world.itemsDefinitionsStore, {
     name: itemModelName,
     version: viewer.world.texturesVersion!,
     properties: itemSelector
-  })?.model ?? itemModelName
+  })?.model
+  const model = (modelFromDef === 'minecraft:special' ? undefined : modelFromDef) ?? itemModelName
   return model
 }

From a846eb4500912578742518878c57903d22a28cf4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 5 Mar 2025 20:45:34 +0300
Subject: [PATCH 310/753] hotfix: fix world interaction crashes

---
 package.json   |  2 +-
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 1a195884..1bc36f9c 100644
--- a/package.json
+++ b/package.json
@@ -149,7 +149,7 @@
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
     "mc-assets": "^0.2.42",
-    "mineflayer-mouse": "^0.0.5",
+    "mineflayer-mouse": "^0.0.7",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d5c2446f..491ef376 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -359,8 +359,8 @@ importers:
         specifier: github:zardoy/mineflayer
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.0.5
-        version: 0.0.5(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+        specifier: ^0.0.7
+        version: 0.0.7(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -6801,8 +6801,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.0.5:
-    resolution: {integrity: sha512-0r/AOGTq+wZH9vrBcW93jH2dGRSlwlO6xc1Z67VJUFlZZ8oBefAOpiZq7LIGc7ROVbpcKEKjROdNv/iCFmzXYA==}
+  mineflayer-mouse@0.0.7:
+    resolution: {integrity: sha512-/cSDsc2ZPlvakc3BX+/K9VD64HAIa+LGiz34RpQvUy7hwx3nXdZjJHDjzEdn86BBzRF5pZOxIoXm8hlZKCYeeQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.4:
@@ -17742,7 +17742,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.0.5(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  mineflayer-mouse@0.0.7(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
     dependencies:
       change-case: 5.4.4
       debug: 4.4.0(supports-color@8.1.1)

From c6b8efe4e8b4885ecaad7403b41bcbc33675e3a4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 5 Mar 2025 22:22:35 +0300
Subject: [PATCH 311/753] hotfix: should fix edge case when canvas was out of
 viewport bounds on ios

---
 src/react/DebugEdges.tsx | 10 +++++++++-
 src/styles.css           | 14 ++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/react/DebugEdges.tsx b/src/react/DebugEdges.tsx
index a65b9f92..150e1f16 100644
--- a/src/react/DebugEdges.tsx
+++ b/src/react/DebugEdges.tsx
@@ -2,7 +2,7 @@ import { useState } from 'react'
 import { useIsHashActive } from './simpleHooks'
 
 export default () => {
-  const MODES_COUNT = 4
+  const MODES_COUNT = 5
   const [mode, setMode] = useState(0)
   const isHashActive = useIsHashActive('#edges')
 
@@ -41,6 +41,14 @@ export default () => {
     styles.height = '100dvh'
     text = 'top 0 fixed 100dvh'
   }
+  if (mode === 4) {
+    styles.position = 'fixed'
+    styles.top = 0
+    styles.left = 0
+    styles.right = 0
+    styles.height = '100dvh'
+    text = 'top 0 bottom 0 fixed 100dvh'
+  }
 
   return <div
     style={styles}
diff --git a/src/styles.css b/src/styles.css
index 9e97ee31..786b1237 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -132,8 +132,8 @@ body {
   left: 0;
   transform-origin: top left;
   transform: scale(var(--guiScale));
-  width: calc(100% / var(--guiScale));
-  height: calc(100% / var(--guiScale));
+  width: calc(100dvw / var(--guiScale));
+  height: calc(100dvh / var(--guiScale));
   z-index: 8;
   image-rendering: optimizeSpeed;
   image-rendering: -moz-crisp-edges;
@@ -148,8 +148,8 @@ body {
   inset: 0;
   transform-origin: top left;
   transform: scale(var(--guiScale));
-  width: calc(100% / var(--guiScale));
-  height: calc(100% / var(--guiScale));
+  width: calc(100dvw / var(--guiScale));
+  height: calc(100dvh / var(--guiScale));
   z-index: 80;
   image-rendering: pixelated;
   pointer-events: none;
@@ -163,8 +163,10 @@ body {
   position: fixed;
   top: 0;
   left: 0;
-  height: 100%;
-  width: 100%;
+  bottom: 0;
+  right: 0;
+  height: 100dvh;
+  width: 100dvw;
   font-size: 0;
   margin: 0;
   padding: 0;

From a27fa4cd1d35bd7e36b57eb142a4f9276e7dfd52 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 5 Mar 2025 22:49:36 +0300
Subject: [PATCH 312/753] feat: Add interaction hint for touch-based entity
 targeting

---
 src/react/GameInteractionOverlay.tsx      |  8 +++--
 src/react/InteractionHint.module.css      | 19 ++++++++++
 src/react/InteractionHint.module.css.d.ts | 10 ++++++
 src/react/InteractionHint.tsx             | 44 +++++++++++++++++++++++
 src/reactUi.tsx                           |  2 ++
 5 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 src/react/InteractionHint.module.css
 create mode 100644 src/react/InteractionHint.module.css.d.ts
 create mode 100644 src/react/InteractionHint.tsx

diff --git a/src/react/GameInteractionOverlay.tsx b/src/react/GameInteractionOverlay.tsx
index cb7a39f8..7c406e8d 100644
--- a/src/react/GameInteractionOverlay.tsx
+++ b/src/react/GameInteractionOverlay.tsx
@@ -150,9 +150,13 @@ function GameInteractionOverlayInner ({
         document.dispatchEvent(new MouseEvent('mouseup', { button: 0 }))
         virtualClickActive = false
       } else if (!capturedPointer.active.activateCameraMove && (Date.now() - capturedPointer.active.time < touchStartBreakingBlockMs)) {
-        document.dispatchEvent(new MouseEvent('mousedown', { button: 2 }))
+        // single click action
+        const MOUSE_BUTTON_RIGHT = 2
+        const MOUSE_BUTTON_LEFT = 0
+        const gonnaAttack = !!bot.mouse.getCursorState().entity
+        document.dispatchEvent(new MouseEvent('mousedown', { button: gonnaAttack ? MOUSE_BUTTON_LEFT : MOUSE_BUTTON_RIGHT }))
         bot.mouse.update()
-        document.dispatchEvent(new MouseEvent('mouseup', { button: 2 }))
+        document.dispatchEvent(new MouseEvent('mouseup', { button: gonnaAttack ? MOUSE_BUTTON_LEFT : MOUSE_BUTTON_RIGHT }))
       }
 
       if (screenTouches > 0) {
diff --git a/src/react/InteractionHint.module.css b/src/react/InteractionHint.module.css
new file mode 100644
index 00000000..026b49c8
--- /dev/null
+++ b/src/react/InteractionHint.module.css
@@ -0,0 +1,19 @@
+.hint_container {
+  position: fixed;
+  top: 20%;
+  left: 0;
+  right: 0;
+  margin: 0 auto;
+  width: fit-content;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  pointer-events: none;
+  z-index: 1000;
+  text-shadow: 1px 1px 8px rgba(0, 0, 0, 1);
+}
+
+.hint_text {
+  color: white;
+  font-size: 10px;
+}
diff --git a/src/react/InteractionHint.module.css.d.ts b/src/react/InteractionHint.module.css.d.ts
new file mode 100644
index 00000000..45bdf30b
--- /dev/null
+++ b/src/react/InteractionHint.module.css.d.ts
@@ -0,0 +1,10 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  hintContainer: string;
+  hintText: string;
+  hint_container: string;
+  hint_text: string;
+}
+declare const cssExports: CssExports;
+export default cssExports;
diff --git a/src/react/InteractionHint.tsx b/src/react/InteractionHint.tsx
new file mode 100644
index 00000000..9121249e
--- /dev/null
+++ b/src/react/InteractionHint.tsx
@@ -0,0 +1,44 @@
+import { useEffect, useState } from 'react'
+import { useSnapshot } from 'valtio'
+import { options } from '../optionsStorage'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+import styles from './InteractionHint.module.css'
+import { useUsingTouch } from './utilsApp'
+
+export default () => {
+  const usingTouch = useUsingTouch()
+  const { touchInteractionType } = useSnapshot(options)
+  const [hintText, setHintText] = useState<string | null>(null)
+
+  useEffect(() => {
+    const update = () => {
+      const cursorState = bot.mouse.getCursorState()
+      if (cursorState.entity) {
+        const entityName = cursorState.entity.displayName ?? cursorState.entity.name
+        setHintText(`Attack ${entityName}`)
+      } else {
+        setHintText(null)
+      }
+    }
+
+    // Initial update
+    update()
+
+    // Subscribe to physics ticks
+    bot.on('physicsTick', update)
+
+    return () => {
+      bot.removeListener('physicsTick', update)
+    }
+  }, [])
+
+  if (!usingTouch || touchInteractionType !== 'classic') return null
+  if (!hintText) return null
+
+  return (
+    <div className={`${styles.hint_container} interaction-hint`}>
+      <PixelartIcon iconName={pixelartIcons['sun-alt']} width={14} />
+      <span className={styles.hint_text}>{hintText}</span>
+    </div>
+  )
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index ac2dbe74..f07c01ce 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -52,6 +52,7 @@ import MineflayerPluginConsole from './react/MineflayerPluginConsole'
 import { UIProvider } from './react/UIProvider'
 import { useAppScale } from './scaleInterface'
 import PacketsReplayProvider from './react/PacketsReplayProvider'
+import InteractionHint from './react/InteractionHint'
 
 const RobustPortal = ({ children, to }) => {
   return createPortal(<PerComponentErrorBoundary>{children}</PerComponentErrorBoundary>, to)
@@ -146,6 +147,7 @@ const InGameUi = () => {
       <PauseScreen />
       <MineflayerPluginHud />
       <MineflayerPluginConsole />
+      {showUI && <InteractionHint />}
       <div style={{ display: showUI ? 'block' : 'none' }}>
         {!disabledUiParts.includes('xp-bar') && <XPBarProvider />}
         {!disabledUiParts.includes('hud-bars') && <HudBarsProvider />}

From e7b012c08d270d813e365adb55fe3d99251c96f0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 5 Mar 2025 22:58:11 +0300
Subject: [PATCH 313/753] feat: Display players list on long chat button hold

---
 src/react/InteractionHint.tsx           |  4 ++-
 src/react/MobileTopButtons.tsx          | 33 +++++++++++++++++++------
 src/react/PlayerListOverlayProvider.tsx |  4 +++
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/react/InteractionHint.tsx b/src/react/InteractionHint.tsx
index 9121249e..5c60cdc8 100644
--- a/src/react/InteractionHint.tsx
+++ b/src/react/InteractionHint.tsx
@@ -1,12 +1,14 @@
 import { useEffect, useState } from 'react'
 import { useSnapshot } from 'valtio'
 import { options } from '../optionsStorage'
+import { activeModalStack } from '../globalState'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import styles from './InteractionHint.module.css'
 import { useUsingTouch } from './utilsApp'
 
 export default () => {
   const usingTouch = useUsingTouch()
+  const modalStack = useSnapshot(activeModalStack)
   const { touchInteractionType } = useSnapshot(options)
   const [hintText, setHintText] = useState<string | null>(null)
 
@@ -32,7 +34,7 @@ export default () => {
     }
   }, [])
 
-  if (!usingTouch || touchInteractionType !== 'classic') return null
+  if (!usingTouch || touchInteractionType !== 'classic' || modalStack.length > 0) return null
   if (!hintText) return null
 
   return (
diff --git a/src/react/MobileTopButtons.tsx b/src/react/MobileTopButtons.tsx
index f686d8af..4d18f817 100644
--- a/src/react/MobileTopButtons.tsx
+++ b/src/react/MobileTopButtons.tsx
@@ -33,6 +33,28 @@ export default () => {
   }
   const longPressEvent = useLongPress(onLongPress, () => {}, defaultOptions)
 
+
+  const onChatLongPress = () => {
+    document.dispatchEvent(new KeyboardEvent('keydown', { key: 'Tab' }))
+  }
+
+  const onChatClick = () => {
+    if (activeModalStack.at(-1)?.reactType === 'chat') {
+      hideCurrentModal()
+    } else {
+      showModal({ reactType: 'chat' })
+    }
+  }
+
+  const chatLongPressEvent = useLongPress(
+    onChatLongPress,
+    onChatClick,
+    {
+      shouldPreventDefault: true,
+      delay: 300,
+    }
+  )
+
   // ios note: just don't use <button>
   return <div ref={elRef} className={styles['mobile-top-btns']} id="mobile-top">
     <div
@@ -49,13 +71,10 @@ export default () => {
     >F3
     </div>
     <div
-      className={styles['chat-btn']} onPointerDown={(e) => {
-        e.stopPropagation()
-        if (activeModalStack.at(-1)?.reactType === 'chat') {
-          hideCurrentModal()
-        } else {
-          showModal({ reactType: 'chat' })
-        }
+      className={styles['chat-btn']}
+      {...chatLongPressEvent}
+      onPointerUp={(e) => {
+        document.dispatchEvent(new KeyboardEvent('keyup', { key: 'Tab' }))
       }}
     />
     <div
diff --git a/src/react/PlayerListOverlayProvider.tsx b/src/react/PlayerListOverlayProvider.tsx
index 50f2295c..5fb98c60 100644
--- a/src/react/PlayerListOverlayProvider.tsx
+++ b/src/react/PlayerListOverlayProvider.tsx
@@ -39,6 +39,10 @@ export default () => {
     bot.on('playerUpdated', () => requestUpdate())
     bot.on('playerJoined', () => requestUpdate())
     bot.on('playerLeft', () => requestUpdate())
+    const interval = setInterval(() => {
+      requestUpdate()
+    }, 1000)
+    return () => clearInterval(interval)
   }, [])
 
   useEffect(() => {

From d35bf41e8c14d3d812ad3b482ecf469e33e5c709 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 5 Mar 2025 23:12:19 +0300
Subject: [PATCH 314/753] fix: fix displaying of unsigned messages (still need
 to simplify weird mineflayer parsing)

---
 src/chatUtils.ts           | 1 +
 src/react/ChatProvider.tsx | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/chatUtils.ts b/src/chatUtils.ts
index a5e9e0f8..27ff2bf9 100644
--- a/src/chatUtils.ts
+++ b/src/chatUtils.ts
@@ -44,6 +44,7 @@ export const formatMessage = (message: MessageInput, mcData: IndexedData = globa
       obfuscated: !!msg.obfuscated
     }
 
+    if (!msg.text && typeof msg.json?.[''] === 'string') msg.text = msg.json['']
     if (msg.text) {
       msglist.push({
         ...msg,
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 90bc9c6d..e261c086 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -25,6 +25,9 @@ export default () => {
   useEffect(() => {
     bot.addListener('message', (jsonMsg, position) => {
       if (position === 'game_info') return // ignore action bar messages, they are handled by the TitleProvider
+      if (jsonMsg['unsigned']) {
+        jsonMsg = jsonMsg['unsigned']
+      }
       const parts = formatMessage(jsonMsg)
 
       setMessages(m => {

From 4cde65e63537f2b9da732c66772733918ebed39b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 6 Mar 2025 19:35:37 +0300
Subject: [PATCH 315/753] hotfix: fix old maps broken regression after gui
 renderer introduction, fix no connection indicator

---
 renderer/viewer/lib/guiRenderer.ts | 4 +++-
 src/mineflayer/mc-protocol.ts      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/renderer/viewer/lib/guiRenderer.ts b/renderer/viewer/lib/guiRenderer.ts
index b197040e..f4af3d20 100644
--- a/renderer/viewer/lib/guiRenderer.ts
+++ b/renderer/viewer/lib/guiRenderer.ts
@@ -8,13 +8,15 @@ import { getLoadedBlockstatesStore, getLoadedModelsStore } from 'mc-assets/dist/
 import { makeTextureAtlas } from 'mc-assets/dist/atlasCreator'
 import { proxy, ref } from 'valtio'
 import { getItemDefinition } from 'mc-assets/dist/itemDefinitions'
+import { versionToNumber } from '../prepare/utils'
 
 export const activeGuiAtlas = proxy({
   atlas: null as null | { json, image },
 })
 
 export const getNonFullBlocksModels = () => {
-  const version = viewer.world.texturesVersion ?? 'latest'
+  let version = viewer.world.texturesVersion ?? 'latest'
+  if (versionToNumber(version) < versionToNumber('1.13')) version = '1.13'
   const itemsDefinitions = viewer.world.itemsDefinitionsStore.data.latest
   const blockModelsResolved = {} as Record<string, any>
   const itemsModelsResolved = {} as Record<string, any>
diff --git a/src/mineflayer/mc-protocol.ts b/src/mineflayer/mc-protocol.ts
index c92fcaed..63a90fa4 100644
--- a/src/mineflayer/mc-protocol.ts
+++ b/src/mineflayer/mc-protocol.ts
@@ -26,7 +26,7 @@ setInterval(() => {
   } else {
     gameAdditionalState.poorConnection = false
   }
-  if (performance.now() - lastPacketTime < 1000) {
+  if (performance.now() - lastPacketTime < 2000) {
     gameAdditionalState.noConnection = false
     return
   }

From 28da4e60f08b4f9cac419c3d83e732e5f15ddc5e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 6 Mar 2025 20:12:05 +0300
Subject: [PATCH 316/753] hotfix for ui crash on disconnect

---
 ...ractionHint.module.css => TouchInteractionHint.module.css} | 0
 ...t.module.css.d.ts => TouchInteractionHint.module.css.d.ts} | 0
 src/react/{InteractionHint.tsx => TouchInteractionHint.tsx}   | 4 ++--
 src/reactUi.tsx                                               | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/react/{InteractionHint.module.css => TouchInteractionHint.module.css} (100%)
 rename src/react/{InteractionHint.module.css.d.ts => TouchInteractionHint.module.css.d.ts} (100%)
 rename src/react/{InteractionHint.tsx => TouchInteractionHint.tsx} (92%)

diff --git a/src/react/InteractionHint.module.css b/src/react/TouchInteractionHint.module.css
similarity index 100%
rename from src/react/InteractionHint.module.css
rename to src/react/TouchInteractionHint.module.css
diff --git a/src/react/InteractionHint.module.css.d.ts b/src/react/TouchInteractionHint.module.css.d.ts
similarity index 100%
rename from src/react/InteractionHint.module.css.d.ts
rename to src/react/TouchInteractionHint.module.css.d.ts
diff --git a/src/react/InteractionHint.tsx b/src/react/TouchInteractionHint.tsx
similarity index 92%
rename from src/react/InteractionHint.tsx
rename to src/react/TouchInteractionHint.tsx
index 5c60cdc8..d4bc3496 100644
--- a/src/react/InteractionHint.tsx
+++ b/src/react/TouchInteractionHint.tsx
@@ -3,7 +3,7 @@ import { useSnapshot } from 'valtio'
 import { options } from '../optionsStorage'
 import { activeModalStack } from '../globalState'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
-import styles from './InteractionHint.module.css'
+import styles from './TouchInteractionHint.module.css'
 import { useUsingTouch } from './utilsApp'
 
 export default () => {
@@ -30,7 +30,7 @@ export default () => {
     bot.on('physicsTick', update)
 
     return () => {
-      bot.removeListener('physicsTick', update)
+      bot?.removeListener('physicsTick', update)
     }
   }, [])
 
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index f07c01ce..3dfb0b98 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -52,7 +52,7 @@ import MineflayerPluginConsole from './react/MineflayerPluginConsole'
 import { UIProvider } from './react/UIProvider'
 import { useAppScale } from './scaleInterface'
 import PacketsReplayProvider from './react/PacketsReplayProvider'
-import InteractionHint from './react/InteractionHint'
+import TouchInteractionHint from './react/TouchInteractionHint'
 
 const RobustPortal = ({ children, to }) => {
   return createPortal(<PerComponentErrorBoundary>{children}</PerComponentErrorBoundary>, to)
@@ -147,7 +147,7 @@ const InGameUi = () => {
       <PauseScreen />
       <MineflayerPluginHud />
       <MineflayerPluginConsole />
-      {showUI && <InteractionHint />}
+      {showUI && <TouchInteractionHint />}
       <div style={{ display: showUI ? 'block' : 'none' }}>
         {!disabledUiParts.includes('xp-bar') && <XPBarProvider />}
         {!disabledUiParts.includes('hud-bars') && <HudBarsProvider />}

From a7e6f9772c42307724192011c63a05c4bec79c58 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Fri, 7 Mar 2025 13:18:54 +0100
Subject: [PATCH 317/753] feat: display items in hand of entities (#293)

---
 renderer/viewer/lib/entities.ts              |   75 +-
 renderer/viewer/lib/entity/armorModels.json  |   12 +-
 renderer/viewer/lib/entity/entities.json     | 1092 +++++++++++++++++-
 renderer/viewer/lib/entity/exportedModels.js |    2 -
 renderer/viewer/lib/entity/models/zombie.obj |  325 ------
 src/index.ts                                 |    2 +-
 6 files changed, 1147 insertions(+), 361 deletions(-)
 delete mode 100644 renderer/viewer/lib/entity/models/zombie.obj

diff --git a/renderer/viewer/lib/entities.ts b/renderer/viewer/lib/entities.ts
index b60a5fef..c6be8004 100644
--- a/renderer/viewer/lib/entities.ts
+++ b/renderer/viewer/lib/entities.ts
@@ -505,11 +505,13 @@ export class Entities extends EventEmitter {
 
     if (textureUv && 'resolvedModel' in textureUv) {
       const mesh = getBlockMeshFromModel(this.viewer.world.material, textureUv.resolvedModel, textureUv.modelName)
+      let SCALE = 1
       if (specificProps['minecraft:display_context'] === 'ground') {
-        const SCALE = 0.5
-        mesh.scale.set(SCALE, SCALE, SCALE)
-        mesh.position.set(0, 0.2, 0)
+        SCALE = 0.5
+      } else if (specificProps['minecraft:display_context'] === 'thirdperson') {
+        SCALE = 6
       }
+      mesh.scale.set(SCALE, SCALE, SCALE)
       const outerGroup = new THREE.Group()
       outerGroup.add(mesh)
       return {
@@ -554,6 +556,13 @@ export class Entities extends EventEmitter {
         new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
         material, materialFlipped,
       ])
+      let SCALE = 1
+      if (specificProps['minecraft:display_context'] === 'ground') {
+        SCALE = 0.5
+      } else if (specificProps['minecraft:display_context'] === 'thirdperson') {
+        SCALE = 6
+      }
+      mesh.scale.set(SCALE, SCALE, SCALE)
       return {
         mesh,
         isBlock: false,
@@ -589,6 +598,9 @@ export class Entities extends EventEmitter {
     if (entity.delete) {
       if (!e) return
       if (e.additionalCleanup) e.additionalCleanup()
+      e.traverse(c => {
+        if (c['additionalCleanup']) c['additionalCleanup']()
+      })
       this.emit('remove', entity)
       this.viewer.scene.remove(e)
       disposeObject(e)
@@ -702,6 +714,8 @@ export class Entities extends EventEmitter {
 
     // check if entity has armor
     if (entity.equipment) {
+      this.addItemModel(e, 'left', entity.equipment[0])
+      this.addItemModel(e, 'right', entity.equipment[1])
       addArmorModel(e, 'feet', entity.equipment[2])
       addArmorModel(e, 'legs', entity.equipment[3], 2)
       addArmorModel(e, 'chest', entity.equipment[4])
@@ -775,7 +789,7 @@ export class Entities extends EventEmitter {
               c.setRotationFromEuler(poseToEuler(armorStandMeta.body_pose))
             }
             break
-          case 'bone_leftarm':
+          case 'bone_rightarm':
             if (c.parent?.name !== 'bone_armor') {
               this.setVisible(c, hasArms)
             }
@@ -785,7 +799,7 @@ export class Entities extends EventEmitter {
               c.setRotationFromEuler(poseToEuler({ 'yaw': -10, 'pitch': -10, 'roll': 0 }))
             }
             break
-          case 'bone_rightarm':
+          case 'bone_leftarm':
             if (c.parent?.name !== 'bone_armor') {
               this.setVisible(c, hasArms)
             }
@@ -795,14 +809,14 @@ export class Entities extends EventEmitter {
               c.setRotationFromEuler(poseToEuler({ 'yaw': 10, 'pitch': -10, 'roll': 0 }))
             }
             break
-          case 'bone_leftleg':
+          case 'bone_rightleg':
             if (armorStandMeta.left_leg_pose) {
               c.setRotationFromEuler(poseToEuler(armorStandMeta.left_leg_pose))
             } else {
               c.setRotationFromEuler(poseToEuler({ 'yaw': -1, 'pitch': -1, 'roll': 0 }))
             }
             break
-          case 'bone_rightleg':
+          case 'bone_leftleg':
             if (armorStandMeta.right_leg_pose) {
               c.setRotationFromEuler(poseToEuler(armorStandMeta.right_leg_pose))
             } else {
@@ -852,9 +866,13 @@ export class Entities extends EventEmitter {
           })
           if (itemMesh) {
             itemMesh.mesh.position.set(0, 0, 0.43)
-            itemMesh.mesh.scale.set(0.5, 0.5, 0.5)
+            if (itemMesh.isBlock) {
+              itemMesh.mesh.scale.set(0.25, 0.25, 0.25)
+            } else {
+              itemMesh.mesh.scale.set(0.5, 0.5, 0.5)
+            }
             itemMesh.mesh.rotateY(Math.PI)
-            itemMesh.mesh.rotateZ(rotation * Math.PI / 4)
+            itemMesh.mesh.rotateZ(-rotation * Math.PI / 4)
             itemMesh.mesh.name = 'item'
             e.add(itemMesh.mesh)
           }
@@ -951,6 +969,45 @@ export class Entities extends EventEmitter {
     return texture
   }
 
+  addItemModel (entityMesh: SceneEntity, hand: 'left' | 'right', item: Item) {
+    const parentName = `bone_${hand}item`
+    // remove existing item
+    entityMesh.traverse(c => {
+      if (c.parent?.name.toLowerCase() === parentName) {
+        c.removeFromParent()
+        if (c['additionalCleanup']) c['additionalCleanup']()
+      }
+    })
+    if (!item) return
+
+    const itemObject = this.getItemMesh(item, {
+      'minecraft:display_context': 'thirdperson',
+    })
+    if (itemObject) {
+      entityMesh.traverse(c => {
+        if (c.name.toLowerCase() === parentName) {
+          const group = new THREE.Object3D()
+          group['additionalCleanup'] = () => {
+            // important: avoid texture memory leak and gpu slowdown
+            itemObject.itemsTexture?.dispose()
+            itemObject.itemsTextureFlipped?.dispose()
+          }
+          const itemMesh = itemObject.mesh
+          group.rotation.z = -Math.PI / 16
+          if (itemObject.isBlock) {
+            group.rotation.y = Math.PI / 4
+          } else {
+            itemMesh.rotation.z = -Math.PI / 4
+            group.rotation.y = Math.PI / 2
+            group.scale.multiplyScalar(2)
+          }
+          group.add(itemMesh)
+          c.add(group)
+        }
+      })
+    }
+  }
+
   handleDamageEvent (entityId, damageAmount) {
     const entityMesh = this.entities[entityId]?.children.find(c => c.name === 'mesh')
     if (entityMesh) {
diff --git a/renderer/viewer/lib/entity/armorModels.json b/renderer/viewer/lib/entity/armorModels.json
index 3e33939e..d7a77d4c 100644
--- a/renderer/viewer/lib/entity/armorModels.json
+++ b/renderer/viewer/lib/entity/armorModels.json
@@ -84,7 +84,7 @@
         ]
       },
       {
-        "name": "rightarm",
+        "name": "leftarm",
         "parent": "armor",
         "pivot": [5, 10, 0],
         "cubes": [
@@ -97,7 +97,7 @@
         ]
       },
       {
-        "name": "leftarm",
+        "name": "rightarm",
         "parent": "armor",
         "pivot": [-5, 10, 0],
         "cubes": [
@@ -133,7 +133,7 @@
         ]
       },
       {
-        "name": "rightleg",
+        "name": "leftleg",
         "parent": "armor",
         "pivot": [1.9, 1, 0],
         "cubes": [
@@ -146,7 +146,7 @@
         ]
       },
       {
-        "name": "leftleg",
+        "name": "rightleg",
         "parent": "armor",
         "pivot": [-1.9, 1, 0],
         "cubes": [
@@ -169,7 +169,7 @@
     "bones": [
       {"name": "armor", "pivot": [0, 12, 0]},
       {
-        "name": "rightleg",
+        "name": "leftleg",
         "parent": "armor",
         "pivot": [1.9, 1, 0],
         "cubes": [
@@ -182,7 +182,7 @@
         ]
       },
       {
-        "name": "leftleg",
+        "name": "rightleg",
         "parent": "armor",
         "pivot": [-1.9, 1, 0],
         "cubes": [
diff --git a/renderer/viewer/lib/entity/entities.json b/renderer/viewer/lib/entity/entities.json
index 645635b7..feca5dc7 100644
--- a/renderer/viewer/lib/entity/entities.json
+++ b/renderer/viewer/lib/entity/entities.json
@@ -41,7 +41,7 @@
             ]
           },
           {
-            "name": "rightarm",
+            "name": "leftarm",
             "parent": "waist",
             "mirror": true,
             "pivot": [5, 10, 0],
@@ -49,9 +49,9 @@
               {"origin": [5, 12, -1], "size": [2, 12, 2], "uv": [32, 16]}
             ]
           },
-          {"name": "rightitem", "parent": "leftarm", "pivot": [6, 15, 1]},
+          {"name": "leftitem", "parent": "leftarm", "pivot": [1, -9, -5]},
           {
-            "name": "rightleg",
+            "name": "leftleg",
             "parent": "waist",
             "mirror": true,
             "pivot": [1.9, 1, 0],
@@ -60,16 +60,16 @@
             ]
           },
           {
-            "name": "leftarm",
+            "name": "rightarm",
             "parent": "waist",
             "pivot": [-5, 10, 0],
             "cubes": [
               {"origin": [-7, 12, -1], "size": [2, 12, 2], "uv": [24, 0]}
             ]
           },
-          {"name": "leftitem", "parent": "rightarm", "pivot": [-6, 15, 1]},
+          {"name": "rightitem", "parent": "rightarm", "pivot": [-1, -9, -5]},
           {
-            "name": "leftleg",
+            "name": "rightleg",
             "parent": "waist",
             "pivot": [-1.9, 1, 0],
             "cubes": [
@@ -769,8 +769,8 @@
             ]
           },
           {"name": "waist", "parent": "body", "pivot": [0, 12, 0]},
-          {"name": "rightItem", "parent": "rightArm", "pivot": [-6, 15, 1]},
-          {"name": "leftItem", "parent": "leftArm", "pivot": [6, 15, 1]}
+          {"name": "rightItem", "parent": "rightArm", "pivot": [-1, -45, -5]},
+          {"name": "leftItem", "parent": "leftArm", "pivot": [1, -45, -5]}
         ],
         "visible_bounds_width": 2.5,
         "visible_bounds_height": 2.5,
@@ -1652,6 +1652,534 @@
     },
     "render_controllers": ["controller.render.minecart"]
   },
+  "husk": {
+    "identifier": "minecraft:husk",
+    "min_engine_version": "1.8.0",
+    "materials": {"default": "husk"},
+    "textures": {"default": "textures/entity/zombie/husk"},
+    "geometry": {
+      "default": {
+        "visible_bounds_width": 1.5,
+        "visible_bounds_height": 2.5,
+        "visible_bounds_offset": [0, 1.25, 0],
+        "texturewidth": 64,
+        "textureheight": 32,
+        "bones": [
+          {
+            "name": "body",
+            "pivot": [0, 24, 0],
+            "cubes": [
+              {"origin": [-4, 12, -2], "size": [8, 12, 4], "uv": [16, 16]}
+            ],
+            "parent": "waist"
+          },
+          {"name": "waist", "neverRender": true, "pivot": [0, 12, 0]},
+          {
+            "name": "head",
+            "pivot": [0, 24, 0],
+            "cubes": [
+              {"origin": [-4, 24, -4], "size": [8, 8, 8], "uv": [0, 0]}
+            ],
+            "parent": "body"
+          },
+          {
+            "name": "hat",
+            "pivot": [0, 24, 0],
+            "cubes": [
+              {
+                "origin": [-4, 24, -4],
+                "size": [8, 8, 8],
+                "uv": [32, 0],
+                "inflate": 0.5
+              }
+            ],
+            "neverRender": true,
+            "parent": "head"
+          },
+          {
+            "name": "rightArm",
+            "pivot": [-5, 22, 0],
+            "cubes": [
+              {"origin": [-8, 12, -2], "size": [4, 12, 4], "uv": [40, 16]}
+            ],
+            "parent": "body"
+          },
+          {
+            "name": "rightItem",
+            "pivot": [-1, -45, -5],
+            "neverRender": true,
+            "parent": "rightArm"
+          },
+          {
+            "name": "leftArm",
+            "pivot": [5, 22, 0],
+            "cubes": [
+              {"origin": [4, 12, -2], "size": [4, 12, 4], "uv": [40, 16]}
+            ],
+            "mirror": true,
+            "parent": "body"
+          },
+          {
+            "name": "leftItem",
+            "pivot": [1, -45, -5],
+            "neverRender": true,
+            "parent": "leftArm"
+          },
+          {
+            "name": "rightLeg",
+            "pivot": [-1.9, 12, 0],
+            "cubes": [
+              {"origin": [-3.9, 0, -2], "size": [4, 12, 4], "uv": [0, 16]}
+            ],
+            "parent": "body"
+          },
+          {
+            "name": "leftLeg",
+            "pivot": [1.9, 12, 0],
+            "cubes": [
+              {"origin": [-0.1, 0, -2], "size": [4, 12, 4], "uv": [0, 16]}
+            ],
+            "mirror": true,
+            "parent": "body"
+          }
+        ]
+      }
+    },
+    "scripts": {
+      "pre_animation": [
+        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;"
+      ]
+    },
+    "animations": {
+      "humanoid_big_head": {"loop": true, "bones": {"head": {"scale": 1.4}}},
+      "look_at_target_default": {
+        "loop": true,
+        "bones": {
+          "head": {
+            "relative_to": {"rotation": "entity"},
+            "rotation": [
+              "query.target_x_rotation",
+              "query.target_y_rotation",
+              0
+            ]
+          }
+        }
+      },
+      "look_at_target_gliding": {
+        "loop": true,
+        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
+      },
+      "look_at_target_swimming": {
+        "loop": true,
+        "bones": {
+          "head": {
+            "rotation": [
+              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
+              "query.target_y_rotation",
+              0
+            ]
+          }
+        }
+      },
+      "move": {
+        "loop": true,
+        "bones": {
+          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
+          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
+          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
+          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
+        }
+      },
+      "riding.arms": {
+        "loop": true,
+        "bones": {
+          "leftarm": {"rotation": [-36, 0, 0]},
+          "rightarm": {"rotation": [-36, 0, 0]}
+        }
+      },
+      "riding.legs": {
+        "loop": true,
+        "bones": {
+          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
+          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
+        }
+      },
+      "holding": {
+        "loop": true,
+        "bones": {
+          "leftarm": {
+            "rotation": [
+              "variable.is_holding_left ? (-this * 0.5 - 18.0) : 0.0",
+              0,
+              0
+            ]
+          },
+          "rightarm": {
+            "rotation": [
+              "variable.is_holding_right ? (-this * 0.5 - 18.0) : 0.0",
+              0,
+              0
+            ]
+          }
+        }
+      },
+      "brandish_spear": {
+        "loop": true,
+        "bones": {
+          "rightarm": {
+            "rotation": [
+              "this * -0.5 - 157.5 - 22.5 * variable.charge_amount",
+              "-this",
+              0
+            ]
+          }
+        }
+      },
+      "charging": {
+        "loop": true,
+        "bones": {
+          "rightarm": {
+            "rotation": ["22.5 * variable.charge_amount - this", "-this", 0]
+          }
+        }
+      },
+      "attack.rotations": {
+        "loop": true,
+        "bones": {
+          "body": {
+            "rotation": [
+              0,
+              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46 - this",
+              0
+            ]
+          },
+          "leftarm": {
+            "rotation": [
+              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46",
+              0,
+              0
+            ]
+          },
+          "rightarm": {
+            "rotation": [
+              "math.sin(1.0 - math.pow(1.0 - variable.attack_time, 3.0) * 180.0) * (variable.is_brandishing_spear ? -1.0 : 1.0 )",
+              "variable.is_brandishing_spear ? 0.0 : (math.sin(math.sqrt(variable.attack_time) * 360) * 11.46) * 2.0",
+              0
+            ]
+          }
+        }
+      },
+      "sneaking": {
+        "loop": true,
+        "bones": {
+          "body": {"rotation": ["0.5 - this", 0, 0]},
+          "head": {"position": [0, 1, 0]},
+          "leftarm": {"rotation": [72, 0, 0]},
+          "leftleg": {"position": [0, -3, 4]},
+          "rightarm": {"rotation": [72, 0, 0]},
+          "rightleg": {"position": [0, -3, 4]}
+        }
+      },
+      "bob": {
+        "loop": true,
+        "bones": {
+          "leftarm": {
+            "rotation": [
+              0,
+              0,
+              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
+            ]
+          },
+          "rightarm": {
+            "rotation": [
+              0,
+              0,
+              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
+            ]
+          }
+        }
+      },
+      "damage_nearby_mobs": {
+        "loop": true,
+        "bones": {
+          "leftarm": {"rotation": ["-45.0-this", "-this", "-this"]},
+          "leftleg": {"rotation": ["45.0-this", "-this", "-this"]},
+          "rightarm": {"rotation": ["45.0-this", "-this", "-this"]},
+          "rightleg": {"rotation": ["-45.0-this", "-this", "-this"]}
+        }
+      },
+      "bow_and_arrow": {
+        "loop": true,
+        "bones": {
+          "leftarm": {
+            "rotation": [
+              "query.target_x_rotation - 90.0 - math.sin(query.life_time * 76.8) * 2.865 - this",
+              "query.target_y_rotation + 28.65",
+              "-(math.cos(query.life_time * 103.2) * 2.865) - 2.865"
+            ]
+          },
+          "rightarm": {
+            "rotation": [
+              "query.target_x_rotation - 90.0 + math.sin(query.life_time * 76.8) * 2.865 - this",
+              "query.target_y_rotation - 5.73",
+              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
+            ]
+          }
+        }
+      },
+      "use_item_progress": {
+        "loop": true,
+        "bones": {
+          "rightarm": {
+            "rotation": [
+              "variable.use_item_startup_progress * -60.0 + variable.use_item_interval_progress * 11.25",
+              "variable.use_item_startup_progress * -22.5 + variable.use_item_interval_progress * 11.25",
+              "variable.use_item_startup_progress * -5.625 + variable.use_item_interval_progress * 11.25"
+            ]
+          }
+        }
+      },
+      "zombie_attack_bare_hand": {
+        "loop": true,
+        "bones": {
+          "leftarm": {
+            "rotation": [
+              "-90.0 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) - (math.sin(query.life_time * 76.776372) * 2.865) - this",
+              "5.73 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 0.6) - this",
+              "math.cos(query.life_time * 103.13244) * -2.865 - 2.865 - this"
+            ]
+          },
+          "rightarm": {
+            "rotation": [
+              "90.0 * (variable.is_brandishing_spear - 1.0) - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) + (math.sin(query.life_time * 76.776372) * 2.865) - this",
+              "(math.sin(variable.attack_time * 180.0) * 57.3) * 0.6 - 5.73 - this",
+              "math.cos(query.life_time * 103.13244) * 2.865 + 2.865 - this"
+            ]
+          }
+        }
+      },
+      "swimming": {
+        "loop": true,
+        "bones": {
+          "body": {
+            "position": [
+              0,
+              "variable.swim_amount * -10.0 - this",
+              "variable.swim_amount * 9.0 - this"
+            ],
+            "rotation": [
+              "variable.swim_amount * (90.0 + query.target_x_rotation)",
+              0,
+              0
+            ]
+          },
+          "leftarm": {
+            "rotation": [
+              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) - (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
+              "math.lerp(this, 14.325, variable.swim_amount) - this",
+              "math.lerp(this, 14.325, variable.swim_amount) - (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
+            ]
+          },
+          "leftleg": {
+            "rotation": [
+              "math.lerp(this, math.cos(query.life_time * 390.0 + 180.0) * 0.3, variable.swim_amount)",
+              0,
+              0
+            ]
+          },
+          "rightarm": {
+            "rotation": [
+              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) + (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
+              "math.lerp(this, 14.325, variable.swim_amount) - this",
+              "math.lerp(this, -14.325, variable.swim_amount) + (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
+            ]
+          },
+          "rightleg": {
+            "rotation": [
+              "math.lerp(this, math.cos(query.life_time * 390.0) * 0.3, variable.swim_amount)",
+              0,
+              0
+            ]
+          }
+        }
+      }
+    },
+    "animation_controllers": {
+      "humanoid_baby_big_head": {
+        "initial_state": "default",
+        "states": {
+          "baby": {
+            "animations": ["humanoid_big_head"],
+            "transitions": [{"default": "!query.is_baby"}]
+          },
+          "default": {"transitions": [{"baby": "query.is_baby"}]}
+        }
+      },
+      "look_at_target": {
+        "initial_state": "default",
+        "states": {
+          "default": {
+            "animations": ["look_at_target_default"],
+            "transitions": [
+              {"gliding": "query.is_gliding"},
+              {"swimming": "query.is_swimming"}
+            ]
+          },
+          "gliding": {
+            "animations": ["look_at_target_gliding"],
+            "transitions": [
+              {"swimming": "query.is_swimming"},
+              {"default": "!query.is_gliding"}
+            ]
+          },
+          "swimming": {
+            "animations": ["look_at_target_swimming"],
+            "transitions": [
+              {"gliding": "query.is_gliding"},
+              {"default": "!query.is_swimming"}
+            ]
+          }
+        }
+      },
+      "move": {
+        "initial_state": "default",
+        "states": {"default": {"animations": ["move"]}}
+      },
+      "riding": {
+        "initial_state": "default",
+        "states": {
+          "default": {"transitions": [{"riding": "query.is_riding"}]},
+          "riding": {
+            "animations": ["riding.arms", "riding.legs"],
+            "transitions": [{"default": "!query.is_riding"}]
+          }
+        }
+      },
+      "holding": {
+        "initial_state": "default",
+        "states": {"default": {"animations": ["holding"]}}
+      },
+      "brandish_spear": {
+        "initial_state": "default",
+        "states": {
+          "brandish_spear": {
+            "animations": ["brandish_spear"],
+            "transitions": [{"default": "!variable.is_brandishing_spear"}]
+          },
+          "default": {
+            "transitions": [{"brandish_spear": "variable.is_brandishing_spear"}]
+          }
+        }
+      },
+      "charging": {
+        "initial_state": "default",
+        "states": {
+          "charging": {
+            "animations": ["charging"],
+            "transitions": [{"default": "!query.is_charging"}]
+          },
+          "default": {"transitions": [{"charging": "query.is_charging"}]}
+        }
+      },
+      "attack": {
+        "initial_state": "default",
+        "states": {
+          "attacking": {
+            "animations": ["attack.rotations"],
+            "transitions": [{"default": "variable.attack_time < 0.0"}]
+          },
+          "default": {
+            "transitions": [{"attacking": "variable.attack_time >= 0.0"}]
+          }
+        }
+      },
+      "sneaking": {
+        "initial_state": "default",
+        "states": {
+          "default": {"transitions": [{"sneaking": "query.is_sneaking"}]},
+          "sneaking": {
+            "animations": ["sneaking"],
+            "transitions": [{"default": "!query.is_sneaking"}]
+          }
+        }
+      },
+      "bob": {
+        "initial_state": "default",
+        "states": {"default": {"animations": ["bob"]}}
+      },
+      "damage_nearby_mobs": {
+        "initial_state": "default",
+        "states": {
+          "damage_nearby_mobs": {
+            "animations": ["damage_nearby_mobs"],
+            "transitions": [{"default": "!variable.damage_nearby_mobs"}]
+          },
+          "default": {
+            "transitions": [
+              {"damage_nearby_mobs": "variable.damage_nearby_mobs"}
+            ]
+          }
+        }
+      },
+      "bow_and_arrow": {
+        "initial_state": "default",
+        "states": {
+          "bow_and_arrow": {
+            "animations": ["bow_and_arrow"],
+            "transitions": [{"default": "!query.has_target"}]
+          },
+          "default": {"transitions": [{"bow_and_arrow": "query.has_target"}]}
+        }
+      },
+      "use_item_progress": {
+        "initial_state": "default",
+        "states": {
+          "default": {
+            "transitions": [
+              {
+                "use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 )"
+              }
+            ]
+          },
+          "use_item_progress": {
+            "animations": ["use_item_progress"],
+            "transitions": [
+              {
+                "default": "( variable.use_item_interval_progress <= 0.0 ) && ( variable.use_item_startup_progress <= 0.0 )"
+              }
+            ]
+          }
+        }
+      },
+      "zombie_attack_bare_hand": {
+        "initial_state": "default",
+        "states": {
+          "default": {
+            "transitions": [{"is_bare_hand": "variable.is_holding_left != 1.0"}]
+          },
+          "is_bare_hand": {
+            "animations": ["zombie_attack_bare_hand"],
+            "transitions": [{"default": "variable.is_holding_left == 1.0"}]
+          }
+        }
+      },
+      "swimming": {
+        "initial_state": "default",
+        "states": {
+          "default": {
+            "transitions": [{"is_swimming": "variable.swim_amount > 0.0"}]
+          },
+          "is_swimming": {
+            "animations": ["swimming"],
+            "transitions": [{"default": "variable.swim_amount <= 0.0"}]
+          }
+        }
+      }
+    },
+    "render_controllers": ["controller.render.husk"],
+    "enable_attachables": true,
+    "spawn_egg": {"texture": "spawn_egg", "texture_index": 28}
+  },
   "iron_golem": {
     "identifier": "minecraft:iron_golem",
     "materials": {"default": "iron_golem"},
@@ -2262,7 +2790,7 @@
               }
             ]
           },
-          {"name": "rightItem", "parent": "rightarm", "pivot": [-6, 15, 1]},
+          {"name": "rightItem", "parent": "rightarm", "pivot": [-1, -45, -5]},
           {
             "name": "leftarm",
             "parent": "body",
@@ -2277,7 +2805,7 @@
               }
             ]
           },
-          {"name": "leftItem", "parent": "leftArm", "pivot": [6, 15, 1]},
+          {"name": "leftItem", "parent": "leftArm", "pivot": [1, -45, -5]},
           {
             "name": "rightleg",
             "parent": "body",
@@ -3187,7 +3715,7 @@
           },
           {
             "name": "rightItem",
-            "pivot": [-6, 15, 1],
+            "pivot": [-1, -45, -5],
             "neverRender": true,
             "parent": "rightArm"
           },
@@ -3202,7 +3730,7 @@
           },
           {
             "name": "leftItem",
-            "pivot": [6, 15, 1],
+            "pivot": [1, -45, -5],
             "neverRender": true,
             "parent": "leftArm"
           },
@@ -4012,7 +4540,7 @@
           },
           {
             "name": "rightItem",
-            "pivot": [-6, 15, 1],
+            "pivot": [-1, -45, -5],
             "neverRender": true,
             "parent": "rightArm"
           },
@@ -4027,7 +4555,7 @@
           },
           {
             "name": "leftItem",
-            "pivot": [6, 15, 1],
+            "pivot": [1, -45, -5],
             "neverRender": true,
             "parent": "leftArm"
           },
@@ -4894,7 +5422,7 @@
           {
             "name": "rightItem",
             "parent": "rightArm",
-            "pivot": [-5, 15, 1],
+            "pivot": [-1, -45, -5],
             "neverRender": true
           },
           {
@@ -4909,7 +5437,7 @@
           {
             "name": "leftItem",
             "parent": "leftArm",
-            "pivot": [6, 15, 1],
+            "pivot": [1, -45, -5],
             "neverRender": true
           },
           {
@@ -5046,6 +5574,534 @@
     "spawn_egg": {"base_color": "#c66e55", "overlay_color": "#e6e6e6"},
     "render_controllers": ["controller.render.zoglin"]
   },
+  "zombie": {
+    "identifier": "minecraft:zombie",
+    "min_engine_version": "1.8.0",
+    "materials": {"default": "zombie"},
+    "textures": {"default": "textures/entity/zombie/zombie"},
+    "geometry": {
+      "default": {
+        "visible_bounds_width": 2,
+        "visible_bounds_height": 2,
+        "visible_bounds_offset": [0, 1, 0],
+        "texturewidth": 64,
+        "textureheight": 32,
+        "bones": [
+          {
+            "name": "body",
+            "pivot": [0, 24, 0],
+            "cubes": [
+              {"origin": [-4, 12, -2], "size": [8, 12, 4], "uv": [16, 16]}
+            ],
+            "parent": "waist"
+          },
+          {"name": "waist", "neverRender": true, "pivot": [0, 12, 0]},
+          {
+            "name": "head",
+            "pivot": [0, 24, 0],
+            "cubes": [
+              {"origin": [-4, 24, -4], "size": [8, 8, 8], "uv": [0, 0]}
+            ],
+            "parent": "body"
+          },
+          {
+            "name": "hat",
+            "pivot": [0, 24, 0],
+            "cubes": [
+              {
+                "origin": [-4, 24, -4],
+                "size": [8, 8, 8],
+                "uv": [32, 0],
+                "inflate": 0.5
+              }
+            ],
+            "neverRender": true,
+            "parent": "head"
+          },
+          {
+            "name": "rightArm",
+            "pivot": [-5, 22, 0],
+            "cubes": [
+              {"origin": [-8, 12, -2], "size": [4, 12, 4], "uv": [40, 16]}
+            ],
+            "parent": "body"
+          },
+          {
+            "name": "rightItem",
+            "pivot": [-1, -45, -5],
+            "neverRender": true,
+            "parent": "rightArm"
+          },
+          {
+            "name": "leftArm",
+            "pivot": [5, 22, 0],
+            "cubes": [
+              {"origin": [4, 12, -2], "size": [4, 12, 4], "uv": [40, 16]}
+            ],
+            "mirror": true,
+            "parent": "body"
+          },
+          {
+            "name": "leftItem",
+            "pivot": [1, -45, -5],
+            "neverRender": true,
+            "parent": "leftArm"
+          },
+          {
+            "name": "rightLeg",
+            "pivot": [-1.9, 12, 0],
+            "cubes": [
+              {"origin": [-3.9, 0, -2], "size": [4, 12, 4], "uv": [0, 16]}
+            ],
+            "parent": "body"
+          },
+          {
+            "name": "leftLeg",
+            "pivot": [1.9, 12, 0],
+            "cubes": [
+              {"origin": [-0.1, 0, -2], "size": [4, 12, 4], "uv": [0, 16]}
+            ],
+            "mirror": true,
+            "parent": "body"
+          }
+        ]
+      }
+    },
+    "spawn_egg": {"texture": "spawn_egg", "texture_index": 12},
+    "scripts": {
+      "pre_animation": [
+        "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;"
+      ]
+    },
+    "animations": {
+      "humanoid_big_head": {"loop": true, "bones": {"head": {"scale": 1.4}}},
+      "look_at_target_default": {
+        "loop": true,
+        "bones": {
+          "head": {
+            "relative_to": {"rotation": "entity"},
+            "rotation": [
+              "query.target_x_rotation",
+              "query.target_y_rotation",
+              0
+            ]
+          }
+        }
+      },
+      "look_at_target_gliding": {
+        "loop": true,
+        "bones": {"head": {"rotation": [-45, "query.target_y_rotation", 0]}}
+      },
+      "look_at_target_swimming": {
+        "loop": true,
+        "bones": {
+          "head": {
+            "rotation": [
+              "math.lerp(query.target_x_rotation, -45.0, variable.swim_amount)",
+              "query.target_y_rotation",
+              0
+            ]
+          }
+        }
+      },
+      "move": {
+        "loop": true,
+        "bones": {
+          "leftarm": {"rotation": ["variable.tcos0", 0, 0]},
+          "leftleg": {"rotation": ["variable.tcos0 * -1.4", 0, 0]},
+          "rightarm": {"rotation": ["-variable.tcos0", 0, 0]},
+          "rightleg": {"rotation": ["variable.tcos0 * 1.4", 0, 0]}
+        }
+      },
+      "riding.arms": {
+        "loop": true,
+        "bones": {
+          "leftarm": {"rotation": [-36, 0, 0]},
+          "rightarm": {"rotation": [-36, 0, 0]}
+        }
+      },
+      "riding.legs": {
+        "loop": true,
+        "bones": {
+          "leftleg": {"rotation": ["-72.0 - this", "-18.0 - this", "-this"]},
+          "rightleg": {"rotation": ["-72.0 - this", "18.0 - this", "-this"]}
+        }
+      },
+      "holding": {
+        "loop": true,
+        "bones": {
+          "leftarm": {
+            "rotation": [
+              "variable.is_holding_left ? (-this * 0.5 - 18.0) : 0.0",
+              0,
+              0
+            ]
+          },
+          "rightarm": {
+            "rotation": [
+              "variable.is_holding_right ? (-this * 0.5 - 18.0) : 0.0",
+              0,
+              0
+            ]
+          }
+        }
+      },
+      "brandish_spear": {
+        "loop": true,
+        "bones": {
+          "rightarm": {
+            "rotation": [
+              "this * -0.5 - 157.5 - 22.5 * variable.charge_amount",
+              "-this",
+              0
+            ]
+          }
+        }
+      },
+      "charging": {
+        "loop": true,
+        "bones": {
+          "rightarm": {
+            "rotation": ["22.5 * variable.charge_amount - this", "-this", 0]
+          }
+        }
+      },
+      "attack.rotations": {
+        "loop": true,
+        "bones": {
+          "body": {
+            "rotation": [
+              0,
+              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46 - this",
+              0
+            ]
+          },
+          "leftarm": {
+            "rotation": [
+              "math.sin(math.sqrt(variable.attack_time) * 360) * 11.46",
+              0,
+              0
+            ]
+          },
+          "rightarm": {
+            "rotation": [
+              "math.sin(1.0 - math.pow(1.0 - variable.attack_time, 3.0) * 180.0) * (variable.is_brandishing_spear ? -1.0 : 1.0 )",
+              "variable.is_brandishing_spear ? 0.0 : (math.sin(math.sqrt(variable.attack_time) * 360) * 11.46) * 2.0",
+              0
+            ]
+          }
+        }
+      },
+      "sneaking": {
+        "loop": true,
+        "bones": {
+          "body": {"rotation": ["0.5 - this", 0, 0]},
+          "head": {"position": [0, 1, 0]},
+          "leftarm": {"rotation": [72, 0, 0]},
+          "leftleg": {"position": [0, -3, 4]},
+          "rightarm": {"rotation": [72, 0, 0]},
+          "rightleg": {"position": [0, -3, 4]}
+        }
+      },
+      "bob": {
+        "loop": true,
+        "bones": {
+          "leftarm": {
+            "rotation": [
+              0,
+              0,
+              "((math.cos(query.life_time * 103.2) * 2.865) + 2.865) *-1.0"
+            ]
+          },
+          "rightarm": {
+            "rotation": [
+              0,
+              0,
+              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
+            ]
+          }
+        }
+      },
+      "damage_nearby_mobs": {
+        "loop": true,
+        "bones": {
+          "leftarm": {"rotation": ["-45.0-this", "-this", "-this"]},
+          "leftleg": {"rotation": ["45.0-this", "-this", "-this"]},
+          "rightarm": {"rotation": ["45.0-this", "-this", "-this"]},
+          "rightleg": {"rotation": ["-45.0-this", "-this", "-this"]}
+        }
+      },
+      "bow_and_arrow": {
+        "loop": true,
+        "bones": {
+          "leftarm": {
+            "rotation": [
+              "query.target_x_rotation - 90.0 - math.sin(query.life_time * 76.8) * 2.865 - this",
+              "query.target_y_rotation + 28.65",
+              "-(math.cos(query.life_time * 103.2) * 2.865) - 2.865"
+            ]
+          },
+          "rightarm": {
+            "rotation": [
+              "query.target_x_rotation - 90.0 + math.sin(query.life_time * 76.8) * 2.865 - this",
+              "query.target_y_rotation - 5.73",
+              "(math.cos(query.life_time * 103.2) * 2.865) + 2.865"
+            ]
+          }
+        }
+      },
+      "use_item_progress": {
+        "loop": true,
+        "bones": {
+          "rightarm": {
+            "rotation": [
+              "variable.use_item_startup_progress * -60.0 + variable.use_item_interval_progress * 11.25",
+              "variable.use_item_startup_progress * -22.5 + variable.use_item_interval_progress * 11.25",
+              "variable.use_item_startup_progress * -5.625 + variable.use_item_interval_progress * 11.25"
+            ]
+          }
+        }
+      },
+      "zombie_attack_bare_hand": {
+        "loop": true,
+        "bones": {
+          "leftarm": {
+            "rotation": [
+              "-90.0 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) - (math.sin(query.life_time * 76.776372) * 2.865) - this",
+              "5.73 - ((math.sin(variable.attack_time * 180.0) * 57.3) * 0.6) - this",
+              "math.cos(query.life_time * 103.13244) * -2.865 - 2.865 - this"
+            ]
+          },
+          "rightarm": {
+            "rotation": [
+              "90.0 * (variable.is_brandishing_spear - 1.0) - ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4) + (math.sin(query.life_time * 76.776372) * 2.865) - this",
+              "(math.sin(variable.attack_time * 180.0) * 57.3) * 0.6 - 5.73 - this",
+              "math.cos(query.life_time * 103.13244) * 2.865 + 2.865 - this"
+            ]
+          }
+        }
+      },
+      "swimming": {
+        "loop": true,
+        "bones": {
+          "body": {
+            "position": [
+              0,
+              "variable.swim_amount * -10.0 - this",
+              "variable.swim_amount * 9.0 - this"
+            ],
+            "rotation": [
+              "variable.swim_amount * (90.0 + query.target_x_rotation)",
+              0,
+              0
+            ]
+          },
+          "leftarm": {
+            "rotation": [
+              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) - (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
+              "math.lerp(this, 14.325, variable.swim_amount) - this",
+              "math.lerp(this, 14.325, variable.swim_amount) - (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
+            ]
+          },
+          "leftleg": {
+            "rotation": [
+              "math.lerp(this, math.cos(query.life_time * 390.0 + 180.0) * 0.3, variable.swim_amount)",
+              0,
+              0
+            ]
+          },
+          "rightarm": {
+            "rotation": [
+              "math.lerp(this, -180.0, variable.swim_amount) - (variable.swim_amount * ((math.sin(variable.attack_time * 180.0) * 57.3) * 1.2 - (math.sin((1.0 - (1.0 - variable.attack_time) * (1.0 - variable.attack_time)) * 180.0) * 57.3) * 0.4)) + (variable.swim_amount * (math.sin(query.life_time * 76.776372) * 2.865)) - this",
+              "math.lerp(this, 14.325, variable.swim_amount) - this",
+              "math.lerp(this, -14.325, variable.swim_amount) + (variable.swim_amount * (math.cos(query.life_time * 103.13244) * 2.865 + 2.865)) - this"
+            ]
+          },
+          "rightleg": {
+            "rotation": [
+              "math.lerp(this, math.cos(query.life_time * 390.0) * 0.3, variable.swim_amount)",
+              0,
+              0
+            ]
+          }
+        }
+      }
+    },
+    "animation_controllers": {
+      "humanoid_baby_big_head": {
+        "initial_state": "default",
+        "states": {
+          "baby": {
+            "animations": ["humanoid_big_head"],
+            "transitions": [{"default": "!query.is_baby"}]
+          },
+          "default": {"transitions": [{"baby": "query.is_baby"}]}
+        }
+      },
+      "look_at_target": {
+        "initial_state": "default",
+        "states": {
+          "default": {
+            "animations": ["look_at_target_default"],
+            "transitions": [
+              {"gliding": "query.is_gliding"},
+              {"swimming": "query.is_swimming"}
+            ]
+          },
+          "gliding": {
+            "animations": ["look_at_target_gliding"],
+            "transitions": [
+              {"swimming": "query.is_swimming"},
+              {"default": "!query.is_gliding"}
+            ]
+          },
+          "swimming": {
+            "animations": ["look_at_target_swimming"],
+            "transitions": [
+              {"gliding": "query.is_gliding"},
+              {"default": "!query.is_swimming"}
+            ]
+          }
+        }
+      },
+      "move": {
+        "initial_state": "default",
+        "states": {"default": {"animations": ["move"]}}
+      },
+      "riding": {
+        "initial_state": "default",
+        "states": {
+          "default": {"transitions": [{"riding": "query.is_riding"}]},
+          "riding": {
+            "animations": ["riding.arms", "riding.legs"],
+            "transitions": [{"default": "!query.is_riding"}]
+          }
+        }
+      },
+      "holding": {
+        "initial_state": "default",
+        "states": {"default": {"animations": ["holding"]}}
+      },
+      "brandish_spear": {
+        "initial_state": "default",
+        "states": {
+          "brandish_spear": {
+            "animations": ["brandish_spear"],
+            "transitions": [{"default": "!variable.is_brandishing_spear"}]
+          },
+          "default": {
+            "transitions": [{"brandish_spear": "variable.is_brandishing_spear"}]
+          }
+        }
+      },
+      "charging": {
+        "initial_state": "default",
+        "states": {
+          "charging": {
+            "animations": ["charging"],
+            "transitions": [{"default": "!query.is_charging"}]
+          },
+          "default": {"transitions": [{"charging": "query.is_charging"}]}
+        }
+      },
+      "attack": {
+        "initial_state": "default",
+        "states": {
+          "attacking": {
+            "animations": ["attack.rotations"],
+            "transitions": [{"default": "variable.attack_time < 0.0"}]
+          },
+          "default": {
+            "transitions": [{"attacking": "variable.attack_time >= 0.0"}]
+          }
+        }
+      },
+      "sneaking": {
+        "initial_state": "default",
+        "states": {
+          "default": {"transitions": [{"sneaking": "query.is_sneaking"}]},
+          "sneaking": {
+            "animations": ["sneaking"],
+            "transitions": [{"default": "!query.is_sneaking"}]
+          }
+        }
+      },
+      "bob": {
+        "initial_state": "default",
+        "states": {"default": {"animations": ["bob"]}}
+      },
+      "damage_nearby_mobs": {
+        "initial_state": "default",
+        "states": {
+          "damage_nearby_mobs": {
+            "animations": ["damage_nearby_mobs"],
+            "transitions": [{"default": "!variable.damage_nearby_mobs"}]
+          },
+          "default": {
+            "transitions": [
+              {"damage_nearby_mobs": "variable.damage_nearby_mobs"}
+            ]
+          }
+        }
+      },
+      "bow_and_arrow": {
+        "initial_state": "default",
+        "states": {
+          "bow_and_arrow": {
+            "animations": ["bow_and_arrow"],
+            "transitions": [{"default": "!query.has_target"}]
+          },
+          "default": {"transitions": [{"bow_and_arrow": "query.has_target"}]}
+        }
+      },
+      "use_item_progress": {
+        "initial_state": "default",
+        "states": {
+          "default": {
+            "transitions": [
+              {
+                "use_item_progress": "( variable.use_item_interval_progress > 0.0 ) || ( variable.use_item_startup_progress > 0.0 )"
+              }
+            ]
+          },
+          "use_item_progress": {
+            "animations": ["use_item_progress"],
+            "transitions": [
+              {
+                "default": "( variable.use_item_interval_progress <= 0.0 ) && ( variable.use_item_startup_progress <= 0.0 )"
+              }
+            ]
+          }
+        }
+      },
+      "zombie_attack_bare_hand": {
+        "initial_state": "default",
+        "states": {
+          "default": {
+            "transitions": [{"is_bare_hand": "variable.is_holding_left != 1.0"}]
+          },
+          "is_bare_hand": {
+            "animations": ["zombie_attack_bare_hand"],
+            "transitions": [{"default": "variable.is_holding_left == 1.0"}]
+          }
+        }
+      },
+      "swimming": {
+        "initial_state": "default",
+        "states": {
+          "default": {
+            "transitions": [{"is_swimming": "variable.swim_amount > 0.0"}]
+          },
+          "is_swimming": {
+            "animations": ["swimming"],
+            "transitions": [{"default": "variable.swim_amount <= 0.0"}]
+          }
+        }
+      }
+    },
+    "render_controllers": ["controller.render.zombie"],
+    "enable_attachables": true
+  },
   "zombified_piglin": {
     "identifier": "minecraft:zombie_pigman",
     "min_engine_version": "1.8.0",
@@ -5115,7 +6171,7 @@
               }
             ]
           },
-          {"name": "rightItem", "parent": "rightarm", "pivot": [-6, 15, 1]},
+          {"name": "rightItem", "parent": "rightarm", "pivot": [-1, -45, -5]},
           {
             "name": "leftarm",
             "parent": "body",
@@ -5130,7 +6186,7 @@
               }
             ]
           },
-          {"name": "leftItem", "parent": "leftArm", "pivot": [6, 15, 1]},
+          {"name": "leftItem", "parent": "leftArm", "pivot": [1, -45, -5]},
           {
             "name": "rightleg",
             "parent": "body",
diff --git a/renderer/viewer/lib/entity/exportedModels.js b/renderer/viewer/lib/entity/exportedModels.js
index 60ac6723..fde9391f 100644
--- a/renderer/viewer/lib/entity/exportedModels.js
+++ b/renderer/viewer/lib/entity/exportedModels.js
@@ -35,6 +35,4 @@ export { default as warden } from './models/warden.obj'
 export { default as witch } from './models/witch.obj'
 export { default as wolf } from './models/wolf.obj'
 export { default as zombie_villager } from './models/zombie_villager.obj'
-export { default as zombie } from './models/zombie.obj'
-export { default as husk } from './models/zombie.obj'
 export { default as boat } from './models/boat.obj'
diff --git a/renderer/viewer/lib/entity/models/zombie.obj b/renderer/viewer/lib/entity/models/zombie.obj
deleted file mode 100644
index fa5d8f4d..00000000
--- a/renderer/viewer/lib/entity/models/zombie.obj
+++ /dev/null
@@ -1,325 +0,0 @@
-# Made in Blockbench 4.10.4
-mtllib materials.mtl
-
-o /head
-v 0.125 0.5 0.125
-v 0.125 0.5 -0.125
-v 0.125 0.25 0.125
-v 0.125 0.25 -0.125
-v -0.125 0.5 -0.125
-v -0.125 0.5 0.125
-v -0.125 0.25 -0.125
-v -0.125 0.25 0.125
-vt 0.125 0.875
-vt 0.25 0.875
-vt 0.25 0.75
-vt 0.125 0.75
-vt 0 0.875
-vt 0.125 0.875
-vt 0.125 0.75
-vt 0 0.75
-vt 0.375 0.875
-vt 0.5 0.875
-vt 0.5 0.75
-vt 0.375 0.75
-vt 0.25 0.875
-vt 0.375 0.875
-vt 0.375 0.75
-vt 0.25 0.75
-vt 0.25 0.875
-vt 0.125 0.875
-vt 0.125 1
-vt 0.25 1
-vt 0.25 1
-vt 0.375 1
-vt 0.375 0.875
-vt 0.25 0.875
-vn 0 0 -1
-vn 1 0 0
-vn 0 0 1
-vn -1 0 0
-vn 0 1 0
-vn 0 -1 0
-usemtl none
-f 4/4/1 7/3/1 5/2/1 2/1/1
-f 3/8/2 4/7/2 2/6/2 1/5/2
-f 8/12/3 3/11/3 1/10/3 6/9/3
-f 7/16/4 8/15/4 6/14/4 5/13/4
-f 6/20/5 1/19/5 2/18/5 5/17/5
-f 7/24/6 4/23/6 3/22/6 8/21/6
-o /right_arm
-v -0.125 0.25 0.0625
-v -0.125 0.25 -0.3125
-v -0.125 0.125 0.0625
-v -0.125 0.125 -0.3125
-v -0.25 0.25 -0.3125
-v -0.25 0.25 0.0625
-v -0.25 0.125 -0.3125
-v -0.25 0.125 0.0625
-vt 0.8125 0.6875
-vt 0.75 0.6875
-vt 0.75 0.75
-vt 0.8125 0.75
-vt 0.6875 0.6875
-vt 0.6875 0.5
-vt 0.625 0.5
-vt 0.625 0.6875
-vt 0.75 0.6875
-vt 0.6875 0.6875
-vt 0.6875 0.75
-vt 0.75 0.75
-vt 0.75 0.5
-vt 0.75 0.6875
-vt 0.8125 0.6875
-vt 0.8125 0.5
-vt 0.75 0.5
-vt 0.6875 0.5
-vt 0.6875 0.6875
-vt 0.75 0.6875
-vt 0.8125 0.6875
-vt 0.875 0.6875
-vt 0.875 0.5
-vt 0.8125 0.5
-vn 0 0 -1
-vn 1 0 0
-vn 0 0 1
-vn -1 0 0
-vn 0 1 0
-vn 0 -1 0
-usemtl none
-f 12/28/7 15/27/7 13/26/7 10/25/7
-f 11/32/8 12/31/8 10/30/8 9/29/8
-f 16/36/9 11/35/9 9/34/9 14/33/9
-f 15/40/10 16/39/10 14/38/10 13/37/10
-f 14/44/11 9/43/11 10/42/11 13/41/11
-f 15/48/12 12/47/12 11/46/12 16/45/12
-o /left_leg
-v 0.12187499999999996 -0.125 0.0625
-v 0.12187499999999996 -0.125 -0.0625
-v 0.12187499999999996 -0.5 0.0625
-v 0.12187499999999996 -0.5 -0.0625
-v -0.0031250000000000444 -0.125 -0.0625
-v -0.0031250000000000444 -0.125 0.0625
-v -0.0031250000000000444 -0.5 -0.0625
-v -0.0031250000000000444 -0.5 0.0625
-vt 0.0625 0.6875
-vt 0.125 0.6875
-vt 0.125 0.5
-vt 0.0625 0.5
-vt 0 0.6875
-vt 0.0625 0.6875
-vt 0.0625 0.5
-vt 0 0.5
-vt 0.1875 0.6875
-vt 0.25 0.6875
-vt 0.25 0.5
-vt 0.1875 0.5
-vt 0.125 0.6875
-vt 0.1875 0.6875
-vt 0.1875 0.5
-vt 0.125 0.5
-vt 0.125 0.6875
-vt 0.0625 0.6875
-vt 0.0625 0.75
-vt 0.125 0.75
-vt 0.125 0.75
-vt 0.1875 0.75
-vt 0.1875 0.6875
-vt 0.125 0.6875
-vn 0 0 -1
-vn 1 0 0
-vn 0 0 1
-vn -1 0 0
-vn 0 1 0
-vn 0 -1 0
-usemtl none
-f 20/52/13 23/51/13 21/50/13 18/49/13
-f 19/56/14 20/55/14 18/54/14 17/53/14
-f 24/60/15 19/59/15 17/58/15 22/57/15
-f 23/64/16 24/63/16 22/62/16 21/61/16
-f 22/68/17 17/67/17 18/66/17 21/65/17
-f 23/72/18 20/71/18 19/70/18 24/69/18
-o /left_arm
-v 0.25 0.25 0.0625
-v 0.25 0.25 -0.3125
-v 0.25 0.125 0.0625
-v 0.25 0.125 -0.3125
-v 0.125 0.25 -0.3125
-v 0.125 0.25 0.0625
-v 0.125 0.125 -0.3125
-v 0.125 0.125 0.0625
-vt 0.8125 0.6875
-vt 0.75 0.6875
-vt 0.75 0.75
-vt 0.8125 0.75
-vt 0.6875 0.6875
-vt 0.6875 0.5
-vt 0.625 0.5
-vt 0.625 0.6875
-vt 0.75 0.6875
-vt 0.6875 0.6875
-vt 0.6875 0.75
-vt 0.75 0.75
-vt 0.75 0.5
-vt 0.75 0.6875
-vt 0.8125 0.6875
-vt 0.8125 0.5
-vt 0.75 0.5
-vt 0.6875 0.5
-vt 0.6875 0.6875
-vt 0.75 0.6875
-vt 0.8125 0.6875
-vt 0.875 0.6875
-vt 0.875 0.5
-vt 0.8125 0.5
-vn 0 0 -1
-vn 1 0 0
-vn 0 0 1
-vn -1 0 0
-vn 0 1 0
-vn 0 -1 0
-usemtl none
-f 28/76/19 31/75/19 29/74/19 26/73/19
-f 27/80/20 28/79/20 26/78/20 25/77/20
-f 32/84/21 27/83/21 25/82/21 30/81/21
-f 31/88/22 32/87/22 30/86/22 29/85/22
-f 30/92/23 25/91/23 26/90/23 29/89/23
-f 31/96/24 28/95/24 27/94/24 32/93/24
-o /right_leg
-v 0.0031250000000000444 -0.125 0.0625
-v 0.0031250000000000444 -0.125 -0.0625
-v 0.0031250000000000444 -0.5 0.0625
-v 0.0031250000000000444 -0.5 -0.0625
-v -0.12187499999999996 -0.125 -0.0625
-v -0.12187499999999996 -0.125 0.0625
-v -0.12187499999999996 -0.5 -0.0625
-v -0.12187499999999996 -0.5 0.0625
-vt 0.0625 0.6875
-vt 0.125 0.6875
-vt 0.125 0.5
-vt 0.0625 0.5
-vt 0 0.6875
-vt 0.0625 0.6875
-vt 0.0625 0.5
-vt 0 0.5
-vt 0.1875 0.6875
-vt 0.25 0.6875
-vt 0.25 0.5
-vt 0.1875 0.5
-vt 0.125 0.6875
-vt 0.1875 0.6875
-vt 0.1875 0.5
-vt 0.125 0.5
-vt 0.125 0.6875
-vt 0.0625 0.6875
-vt 0.0625 0.75
-vt 0.125 0.75
-vt 0.125 0.75
-vt 0.1875 0.75
-vt 0.1875 0.6875
-vt 0.125 0.6875
-vn 0 0 -1
-vn 1 0 0
-vn 0 0 1
-vn -1 0 0
-vn 0 1 0
-vn 0 -1 0
-usemtl none
-f 36/100/25 39/99/25 37/98/25 34/97/25
-f 35/104/26 36/103/26 34/102/26 33/101/26
-f 40/108/27 35/107/27 33/106/27 38/105/27
-f 39/112/28 40/111/28 38/110/28 37/109/28
-f 38/116/29 33/115/29 34/114/29 37/113/29
-f 39/120/30 36/119/30 35/118/30 40/117/30
-o /hat
-v 0.140625 0.515625 0.140625
-v 0.140625 0.515625 -0.140625
-v 0.140625 0.234375 0.140625
-v 0.140625 0.234375 -0.140625
-v -0.140625 0.515625 -0.140625
-v -0.140625 0.515625 0.140625
-v -0.140625 0.234375 -0.140625
-v -0.140625 0.234375 0.140625
-vt 0.625 0.875
-vt 0.75 0.875
-vt 0.75 0.75
-vt 0.625 0.75
-vt 0.5 0.875
-vt 0.625 0.875
-vt 0.625 0.75
-vt 0.5 0.75
-vt 0.875 0.875
-vt 1 0.875
-vt 1 0.75
-vt 0.875 0.75
-vt 0.75 0.875
-vt 0.875 0.875
-vt 0.875 0.75
-vt 0.75 0.75
-vt 0.75 0.875
-vt 0.625 0.875
-vt 0.625 1
-vt 0.75 1
-vt 0.75 1
-vt 0.875 1
-vt 0.875 0.875
-vt 0.75 0.875
-vn 0 0 -1
-vn 1 0 0
-vn 0 0 1
-vn -1 0 0
-vn 0 1 0
-vn 0 -1 0
-usemtl none
-f 44/124/31 47/123/31 45/122/31 42/121/31
-f 43/128/32 44/127/32 42/126/32 41/125/32
-f 48/132/33 43/131/33 41/130/33 46/129/33
-f 47/136/34 48/135/34 46/134/34 45/133/34
-f 46/140/35 41/139/35 42/138/35 45/137/35
-f 47/144/36 44/143/36 43/142/36 48/141/36
-o /body
-v 0.125 0.25 0.0625
-v 0.125 0.25 -0.0625
-v 0.125 -0.125 0.0625
-v 0.125 -0.125 -0.0625
-v -0.125 0.25 -0.0625
-v -0.125 0.25 0.0625
-v -0.125 -0.125 -0.0625
-v -0.125 -0.125 0.0625
-vt 0.3125 0.6875
-vt 0.4375 0.6875
-vt 0.4375 0.5
-vt 0.3125 0.5
-vt 0.25 0.6875
-vt 0.3125 0.6875
-vt 0.3125 0.5
-vt 0.25 0.5
-vt 0.5 0.6875
-vt 0.625 0.6875
-vt 0.625 0.5
-vt 0.5 0.5
-vt 0.4375 0.6875
-vt 0.5 0.6875
-vt 0.5 0.5
-vt 0.4375 0.5
-vt 0.4375 0.6875
-vt 0.3125 0.6875
-vt 0.3125 0.75
-vt 0.4375 0.75
-vt 0.4375 0.75
-vt 0.5625 0.75
-vt 0.5625 0.6875
-vt 0.4375 0.6875
-vn 0 0 -1
-vn 1 0 0
-vn 0 0 1
-vn -1 0 0
-vn 0 1 0
-vn 0 -1 0
-usemtl none
-f 52/148/37 55/147/37 53/146/37 50/145/37
-f 51/152/38 52/151/38 50/150/38 49/149/38
-f 56/156/39 51/155/39 49/154/39 54/153/39
-f 55/160/40 56/159/40 54/158/40 53/157/40
-f 54/164/41 49/163/41 50/162/41 53/161/41
-f 55/168/42 52/167/42 51/166/42 56/165/42
diff --git a/src/index.ts b/src/index.ts
index b8727395..c1fa5fd5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -176,7 +176,7 @@ Object.defineProperty(window, 'world', {
 })
 // todo unify
 viewer.entities.getItemUv = (item, specificProps) => {
-  const idOrName = item.itemId ?? item.blockId
+  const idOrName = item.itemId ?? item.blockId ?? item.name
   try {
     const name = typeof idOrName === 'number' ? loadedData.items[idOrName]?.name : idOrName
     if (!name) throw new Error(`Item not found: ${idOrName}`)

From 1c2e2490310cff5efa4514d3aa824aba68c0585a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 10 Mar 2025 22:48:51 +0300
Subject: [PATCH 318/753] fix panorama direction

---
 src/panorama.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/panorama.ts b/src/panorama.ts
index 3c888246..cf7290ed 100644
--- a/src/panorama.ts
+++ b/src/panorama.ts
@@ -83,8 +83,13 @@ export async function addPanoramaCubeMap () {
   const panorMaterials = [] as THREE.MeshBasicMaterial[]
   await updateResourcePackSupportPanorama()
   for (const file of panoramaFiles) {
+    const texture = loader.load(await possiblyLoadPanoramaFromResourcePack(file))
+    texture.repeat.x = -1
+    texture.offset.x = 1
+    texture.wrapS = THREE.RepeatWrapping
+    texture.wrapT = THREE.RepeatWrapping
     panorMaterials.push(new THREE.MeshBasicMaterial({
-      map: loader.load(await possiblyLoadPanoramaFromResourcePack(file)),
+      map: texture,
       transparent: true,
       side: THREE.DoubleSide
     }))

From 8232737a75de27857fcbb8f0604954def5e11268 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Mar 2025 01:34:37 +0300
Subject: [PATCH 319/753] fix panorama files order

---
 src/panorama.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/panorama.ts b/src/panorama.ts
index cf7290ed..7459187f 100644
--- a/src/panorama.ts
+++ b/src/panorama.ts
@@ -14,12 +14,12 @@ let shouldDisplayPanorama = false
 let panoramaUsesResourcePack = null as boolean | null
 
 const panoramaFiles = [
-  'panorama_1.png', // WS
-  'panorama_3.png', // ES
-  'panorama_4.png', // Up
-  'panorama_5.png', // Down
-  'panorama_0.png', // NS
-  'panorama_2.png' // SS
+  'panorama_3.png', // right (+x)
+  'panorama_1.png', // left (-x)
+  'panorama_4.png', // top (+y)
+  'panorama_5.png', // bottom (-y)
+  'panorama_0.png', // front (+z)
+  'panorama_2.png', // back (-z)
 ]
 
 const panoramaResourcePackPath = 'assets/minecraft/textures/gui/title/background'

From e60d10e1216691c4780ec46579ceae8a13aa48c1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Mar 2025 01:40:56 +0300
Subject: [PATCH 320/753] fix panorama seams!

---
 src/panorama.ts | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/panorama.ts b/src/panorama.ts
index 7459187f..8def97c4 100644
--- a/src/panorama.ts
+++ b/src/panorama.ts
@@ -84,14 +84,23 @@ export async function addPanoramaCubeMap () {
   await updateResourcePackSupportPanorama()
   for (const file of panoramaFiles) {
     const texture = loader.load(await possiblyLoadPanoramaFromResourcePack(file))
-    texture.repeat.x = -1
-    texture.offset.x = 1
-    texture.wrapS = THREE.RepeatWrapping
-    texture.wrapT = THREE.RepeatWrapping
+
+    // Instead of using repeat/offset to flip, we'll use the texture matrix
+    texture.matrixAutoUpdate = false
+    texture.matrix.set(
+      -1, 0, 1, 0, 1, 0, 0, 0, 1
+    )
+
+    texture.wrapS = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
+    texture.wrapT = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
+    texture.minFilter = THREE.LinearFilter
+    texture.magFilter = THREE.LinearFilter
+
     panorMaterials.push(new THREE.MeshBasicMaterial({
       map: texture,
       transparent: true,
-      side: THREE.DoubleSide
+      side: THREE.DoubleSide,
+      depthWrite: false
     }))
   }
 

From 14d3bba5f51b3ba43384f1837fccc793de4c8099 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Mar 2025 02:04:22 +0300
Subject: [PATCH 321/753] rm serverslist storybook

---
 src/react/ServersList.stories.tsx | 57 -------------------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 src/react/ServersList.stories.tsx

diff --git a/src/react/ServersList.stories.tsx b/src/react/ServersList.stories.tsx
deleted file mode 100644
index 0a0ef151..00000000
--- a/src/react/ServersList.stories.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/react'
-
-import { useState } from 'react'
-import AddServerOrConnect from './AddServerOrConnect'
-import ServersList from './ServersList'
-
-const meta: Meta<typeof ServersList> = {
-  component: ServersList,
-  render (args) {
-    const [addOpen, setAddOpen] = useState(false)
-    const [username, setUsername] = useState('')
-
-    return addOpen ?
-      <AddServerOrConnect
-        onBack={() => {
-          setAddOpen(false)
-        }}
-        accounts={['testting']}
-        onConfirm={(info) => {
-          console.log('add server', info)
-        }}
-      /> :
-      <ServersList
-        worldData={[{
-          name: 'test',
-          title: 'Server',
-          formattedTextOverride: 'play yes',
-        }]}
-        joinServer={(ip) => {
-          console.log('joinServer', ip)
-        }}
-        initialProxies={{
-          proxies: ['localhost', 'mc.hypixel.net'],
-          selected: 'localhost',
-        }}
-        updateProxies={newData => {
-          console.log('setProxies', newData)
-        }}
-        onWorldAction={() => { }}
-        onGeneralAction={(action) => {
-          if (action === 'create') {
-            setAddOpen(true)
-          }
-        }}
-        username={username}
-        setUsername={setUsername}
-      />
-  },
-}
-
-export default meta
-type Story = StoryObj<typeof ServersList>
-
-export const Primary: Story = {
-  args: {
-  },
-}

From 734d195be00db5d39ba76593b038c884b83ee16e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Mar 2025 02:11:36 +0300
Subject: [PATCH 322/753] fix errors spamming from players list

---
 src/react/PlayerListOverlayProvider.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/react/PlayerListOverlayProvider.tsx b/src/react/PlayerListOverlayProvider.tsx
index 5fb98c60..2f2cac54 100644
--- a/src/react/PlayerListOverlayProvider.tsx
+++ b/src/react/PlayerListOverlayProvider.tsx
@@ -30,15 +30,15 @@ export default () => {
     }
   }
 
-  useMemo(() => {
+  useEffect(() => {
     function requestUpdate () {
-      // Placeholder for requestUpdate logic
-      setPlayers(bot.players)
+      setPlayers(bot?.players ?? {})
     }
 
     bot.on('playerUpdated', () => requestUpdate())
     bot.on('playerJoined', () => requestUpdate())
     bot.on('playerLeft', () => requestUpdate())
+    requestUpdate()
     const interval = setInterval(() => {
       requestUpdate()
     }, 1000)

From d5cc6d325ef8768ddd4003a47be84821d9049678 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Mar 2025 19:21:41 +0300
Subject: [PATCH 323/753] just casually doing a major client rename

---
 index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 50d96a6a..783ff50e 100644
--- a/index.html
+++ b/index.html
@@ -128,17 +128,17 @@
         window.loadedPlugins[pluginName] = await import(script)
       }
     </script> -->
-    <title>Prismarine Web Client</title>
+    <title>Minecraft Web Client</title>
     <link rel="favicon" href="favicon.png">
     <link rel="icon" type="image/png" href="favicon.png" />
-    <link rel="canonical" href="https://mcraft.fun">
+    <!-- <link rel="canonical" href="https://mcraft.fun"> -->
     <meta name="description" content="Minecraft web client running in your browser">
     <meta name="keywords" content="Play, Minecraft, Online, Web, Java, Server, Single player, Javascript, PrismarineJS, Voxel, WebGL, Three.js">
     <meta name="date" content="2024-07-11" scheme="YYYY-MM-DD">
     <meta name="language" content="English">
     <meta name="theme-color" content="#349474">
     <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover'>
-    <meta property="og:title" content="Prismarine Web Client" />
+    <meta property="og:title" content="Minecraft Web Client" />
     <meta property="og:type" content="website" />
     <meta property="og:image" content="favicon.png" />
     <meta name="format-detection" content="telephone=no">

From 6263c9ae66af86708e3b3140903dafb06c5f345a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Mar 2025 19:22:50 +0300
Subject: [PATCH 324/753] also rename in manifest

---
 assets/manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/manifest.json b/assets/manifest.json
index 9ec96f08..4310ae7f 100644
--- a/assets/manifest.json
+++ b/assets/manifest.json
@@ -1,6 +1,6 @@
 {
-    "name": "Prismarine Web Client",
-    "short_name": "Prismarine Web Client",
+    "name": "Minecraft Web Client",
+    "short_name": "Minecraft Web Client",
     "scope": "./",
     "start_url": "./",
     "icons": [

From ec953fd5d1e2f6c8bc76b57a35c4e281235ca90a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Mar 2025 19:37:34 +0300
Subject: [PATCH 325/753] feat: never force resort items in the list and allow
 to resort manually with shift+up/down

---
 src/react/ServersListProvider.tsx | 43 ++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 56ec75b6..de01c25c 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -86,6 +86,35 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
   const [serversList, setServersList] = useState<StoreServerItem[]>(() => (customServersList ? [] : getInitialServersList()))
   const [additionalData, setAdditionalData] = useState<Record<string, AdditionalDisplayData>>({})
 
+  // Add keyboard handler for moving servers
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      if (['input', 'textarea', 'select'].includes((e.target as HTMLElement)?.tagName?.toLowerCase())) return
+      if (!e.shiftKey || selectedIndex === undefined) return
+      if (e.key !== 'ArrowUp' && e.key !== 'ArrowDown') return
+      e.preventDefault()
+      e.stopImmediatePropagation()
+
+      const newIndex = e.key === 'ArrowUp'
+        ? Math.max(0, selectedIndex - 1)
+        : Math.min(serversList.length - 1, selectedIndex + 1)
+
+      if (newIndex === selectedIndex) return
+
+      // Move server in the list
+      const newList = [...serversList]
+      const oldItem = newList[selectedIndex]
+      newList[selectedIndex] = newList[newIndex]
+      newList[newIndex] = oldItem
+
+      setServersList(newList)
+      setSelectedIndex(newIndex)
+    }
+
+    document.addEventListener('keydown', handleKeyDown)
+    return () => document.removeEventListener('keydown', handleKeyDown)
+  }, [selectedIndex, serversList])
+
   useEffect(() => {
     if (customServersList) {
       setServersList(customServersList.map(row => {
@@ -105,10 +134,11 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
     setNewServersList(serversList)
   }, [serversList])
 
+  const serversListSorted = useMemo(() => serversList.map((server, index) => ({ ...server, index })), [serversList])
   // by lastJoined
-  const serversListSorted = useMemo(() => {
-    return serversList.map((server, index) => ({ ...server, index })).sort((a, b) => (b.lastJoined ?? 0) - (a.lastJoined ?? 0))
-  }, [serversList])
+  // const serversListSorted = useMemo(() => {
+  //   return serversList.map((server, index) => ({ ...server, index })).sort((a, b) => (b.lastJoined ?? 0) - (a.lastJoined ?? 0))
+  // }, [serversList])
 
   const isEditScreenModal = useIsModalActive('editServer')
 
@@ -313,6 +343,13 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
             // find and update
             const server = serversList.find(s => s.ip === ip)
             if (server) {
+              // move to top
+              const newList = [...serversList]
+              const index = newList.indexOf(server)
+              const thisItem = newList[index]
+              newList.splice(index, 1)
+              newList.unshift(thisItem)
+
               server.lastJoined = Date.now()
               server.numConnects = (server.numConnects || 0) + 1
               setNewServersList(serversList)

From a6018c6891a34e5667a702a8d59228fdf5aa1ff0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Mar 2025 19:42:13 +0300
Subject: [PATCH 326/753] remove not working google drive button to avoid
 confusion

---
 src/react/SingleplayerProvider.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/react/SingleplayerProvider.tsx b/src/react/SingleplayerProvider.tsx
index 6672de6e..36111fb5 100644
--- a/src/react/SingleplayerProvider.tsx
+++ b/src/react/SingleplayerProvider.tsx
@@ -283,10 +283,10 @@ const Inner = () => {
   return <Singleplayer
     error={error}
     isReadonly={selectedProvider === 'google' && (googleDriveReadonly || !isGoogleProviderReady || !selectedGoogleId)}
-    providers={{
-      local: 'Local',
-      google: 'Google Drive',
-    }}
+    // providers={{
+    //   local: 'Local',
+    //   google: 'Google Drive',
+    // }}
     disabledProviders={[...isGoogleDriveAvailable() ? [] : ['google']]}
     worldData={worlds}
     providerActions={providerActions}

From f9c042b00f28f14f47a1b0ad6c9e06605bf757a5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 11 Mar 2025 19:55:03 +0300
Subject: [PATCH 327/753] add groups into UI for future work

---
 src/react/ServersListProvider.tsx  |  3 +-
 src/react/Singleplayer.tsx         | 77 +++++++++++++++++++++++-------
 src/react/SingleplayerProvider.tsx |  1 +
 3 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index de01c25c..f0543e21 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -406,7 +406,8 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         worldNameRight: additional?.textNameRight ?? '',
         worldNameRightGrayed: additional?.textNameRightGrayed ?? '',
         iconSrc: additional?.icon,
-        offline: additional?.offline
+        offline: additional?.offline,
+        group: 'Custom Servers'
       }
     })}
     initialProxies={{
diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index 6d7d6b0e..d3a32423 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames'
-import { Fragment, useEffect, useMemo, useRef, useState } from 'react'
+import React, { Fragment, useEffect, useMemo, useRef, useState } from 'react'
 
 // todo optimize size
 import missingWorldPreview from 'mc-assets/dist/other-textures/latest/gui/presets/isles.png'
@@ -29,6 +29,21 @@ export interface WorldProps {
   onInteraction?(interaction: 'enter' | 'space')
   elemRef?: React.Ref<HTMLDivElement>
   offline?: boolean
+  group?: string
+}
+
+const GroupHeader = ({ name, count, expanded, onToggle }: { name: string, count: number, expanded: boolean, onToggle: () => void }) => {
+  return <div
+    className={styles.world_root}
+    style={{ background: 'none', cursor: 'pointer', height: 'auto', fontSize: '8px' }}
+    onClick={onToggle}
+  >
+    <div style={{ display: 'flex', alignItems: 'center', gap: '4px', color: '#bcbcbc' }}>
+      <span>{expanded ? '▼' : '▶'}</span>
+      <span>{name}</span>
+      <span>({count})</span>
+    </div>
+  </div>
 }
 
 const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus, onInteraction, iconSrc, formattedTextOverride, worldNameRight, worldNameRightGrayed, elemRef, offline }: WorldProps & { ref?: React.Ref<HTMLDivElement> }) => {
@@ -159,6 +174,7 @@ export default ({
 
   const [search, setSearch] = useState('')
   const [focusedWorld, setFocusedWorld] = useState(defaultSelectedRow === undefined ? '' : worldData?.[defaultSelectedRow]?.name ?? '')
+  const [expandedGroups, setExpandedGroups] = useState<Record<string, boolean>>({})
 
   useEffect(() => {
     setFocusedWorld('')
@@ -179,6 +195,13 @@ export default ({
   }
   const isSmallWidth = useIsSmallWidth()
 
+  const toggleGroup = (groupName: string) => {
+    setExpandedGroups(prev => ({
+      ...prev,
+      [groupName]: prev[groupName] === undefined ? false : !prev[groupName]
+    }))
+  }
+
   return <div ref={containerRef} hidden={hidden}>
     <div className="dirt-bg" />
     <div className={classNames('fullscreen', styles.root)}>
@@ -214,22 +237,42 @@ export default ({
           }
           {
             worldData
-              ? worldData.filter(data => data.title.toLowerCase().includes(search.toLowerCase())).map(({ name, size, detail, ...rest }, index) => (
-                <World
-                  {...rest}
-                  size={size}
-                  name={name}
-                  elemRef={el => { worldRefs.current[name] = el }}
-                  onFocus={row => onRowSelectHandler(row, index)}
-                  isFocused={focusedWorld === name}
-                  key={name}
-                  onInteraction={(interaction) => {
-                    if (interaction === 'enter') onWorldAction('load', name)
-                    else if (interaction === 'space') firstButton.current?.focus()
-                  }}
-                  detail={detail}
-                />
-              ))
+              ? (() => {
+                const filtered = worldData.filter(data => data.title.toLowerCase().includes(search.toLowerCase()))
+                const groups = filtered.reduce<Record<string, WorldProps[]>>((acc, world) => {
+                  const group = world.group || ''
+                  if (!acc[group]) acc[group] = []
+                  acc[group].push(world)
+                  return acc
+                }, {})
+
+                return Object.entries(groups).map(([groupName, worlds]) => (
+                  <React.Fragment key={groupName}>
+                    <GroupHeader
+                      name={groupName}
+                      count={worlds.length}
+                      expanded={expandedGroups[groupName] ?? true}
+                      onToggle={() => toggleGroup(groupName)}
+                    />
+                    {(expandedGroups[groupName] ?? true) && worlds.map(({ name, size, detail, ...rest }, index) => (
+                      <World
+                        {...rest}
+                        size={size}
+                        name={name}
+                        elemRef={el => { worldRefs.current[name] = el }}
+                        onFocus={row => onRowSelectHandler(row, index)}
+                        isFocused={focusedWorld === name}
+                        key={name}
+                        onInteraction={(interaction) => {
+                          if (interaction === 'enter') onWorldAction('load', name)
+                          else if (interaction === 'space') firstButton.current?.focus()
+                        }}
+                        detail={detail}
+                      />
+                    ))}
+                  </React.Fragment>
+                ))
+              })()
               : <div style={{
                 fontSize: 10,
                 color: error ? 'red' : 'lightgray',
diff --git a/src/react/SingleplayerProvider.tsx b/src/react/SingleplayerProvider.tsx
index 36111fb5..09639b8d 100644
--- a/src/react/SingleplayerProvider.tsx
+++ b/src/react/SingleplayerProvider.tsx
@@ -91,6 +91,7 @@ export const readWorlds = (abortController: AbortController) => {
           iconSrc: iconBase64 ? `data:image/png;base64,${iconBase64}` : undefined,
           size,
           lastModified: levelDatStat.mtimeMs,
+          group: 'IndexedDB Memory Worlds'
         } satisfies WorldProps & { lastModified?: number }
       }))).filter((x, i) => {
         if (x.status === 'rejected') {

From b8b1320258761ef83688b9a1296afafaf26e72a7 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 11 Mar 2025 23:58:52 +0300
Subject: [PATCH 328/753] feat: single file build! (#181)

---
 .github/workflows/build-single-file.yml    |  31 +++
 .github/workflows/publish.yml              |   2 +
 config.json                                |   2 +-
 index.html                                 |   4 -
 package.json                               |   7 +-
 pnpm-lock.yaml                             | 237 +++++++++++++++++++++
 renderer/rsbuildSharedConfig.ts            |  14 +-
 renderer/viewer/lib/worldrendererCommon.ts |   9 +-
 rsbuild.config.ts                          | 106 +++++++--
 scripts/genLargeDataAliases.ts             |  59 +++++
 scripts/genShims.ts                        |   1 +
 scripts/makeOptimizedMcData.mjs            | 125 +++++++++--
 scripts/testOptimizedMcdata.ts             |   8 +-
 src/connect.ts                             |  27 ++-
 src/devtools.ts                            |   2 +
 src/index.ts                               |  19 +-
 src/optimizeJson.ts                        | 106 ++++++++-
 src/optionsStorage.ts                      |   6 +-
 src/panorama.ts                            | 114 ++++++++--
 src/react/MainMenuRenderApp.tsx            |   4 +-
 src/react/SignEditor.stories.tsx           |   3 +-
 src/react/SignEditor.tsx                   |   7 +-
 src/react/SignEditorProvider.tsx           |   9 +-
 src/serviceWorker.ts                       |   2 +-
 src/shims/minecraftData.ts                 |   7 +-
 25 files changed, 816 insertions(+), 95 deletions(-)
 create mode 100644 .github/workflows/build-single-file.yml
 create mode 100644 scripts/genLargeDataAliases.ts

diff --git a/.github/workflows/build-single-file.yml b/.github/workflows/build-single-file.yml
new file mode 100644
index 00000000..93b1b77f
--- /dev/null
+++ b/.github/workflows/build-single-file.yml
@@ -0,0 +1,31 @@
+name: build-single-file
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build-and-bundle:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@master
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Build single-file version - minecraft.html
+        run: pnpm build-single-file && mv dist/single/index.html minecraft.html
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: minecraft.html
+          path: minecraft.html
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5af8abab..986bf6cc 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -53,6 +53,8 @@ jobs:
           publish_dir: .vercel/output/static
           force_orphan: true
 
+      - name: Build single-file version - minecraft.html
+        run: pnpm build-single-file && mv dist/single/index.html minecraft.html
       - name: Build self-host version
         run: pnpm build
       - name: Bundle server.js
diff --git a/config.json b/config.json
index e48d758b..4b3c1e69 100644
--- a/config.json
+++ b/config.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "defaultHost": "<from-proxy>",
-  "defaultProxy": "proxy.mcraft.fun",
+  "defaultProxy": "https://proxy.mcraft.fun",
   "mapsProvider": "https://maps.mcraft.fun/",
   "peerJsServer": "",
   "peerJsServerFallback": "https://p2p.mcraft.fun",
diff --git a/index.html b/index.html
index 783ff50e..891aeff3 100644
--- a/index.html
+++ b/index.html
@@ -129,8 +129,6 @@
       }
     </script> -->
     <title>Minecraft Web Client</title>
-    <link rel="favicon" href="favicon.png">
-    <link rel="icon" type="image/png" href="favicon.png" />
     <!-- <link rel="canonical" href="https://mcraft.fun"> -->
     <meta name="description" content="Minecraft web client running in your browser">
     <meta name="keywords" content="Play, Minecraft, Online, Web, Java, Server, Single player, Javascript, PrismarineJS, Voxel, WebGL, Three.js">
@@ -140,9 +138,7 @@
     <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover'>
     <meta property="og:title" content="Minecraft Web Client" />
     <meta property="og:type" content="website" />
-    <meta property="og:image" content="favicon.png" />
     <meta name="format-detection" content="telephone=no">
-    <link rel="manifest" href="manifest.json" crossorigin="use-credentials">
   </head>
   <body>
     <div id="react-root"></div>
diff --git a/package.json b/package.json
index 1bc36f9c..e0b90b8a 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,9 @@
     "start2": "run-p dev-rsbuild watch-mesher",
     "build": "pnpm build-other-workers && rsbuild build",
     "build-analyze": "BUNDLE_ANALYZE=true rsbuild build && pnpm build-other-workers",
-    "check-build": "tsx scripts/genShims.ts && tsc && pnpm build",
+    "build-single-file": "SINGLE_FILE_BUILD=true rsbuild build",
+    "prepare-project": "tsx scripts/genShims.ts && tsx scripts/makeOptimizedMcData.mjs && tsx scripts/genLargeDataAliases.ts",
+    "check-build": "pnpm prepare-project && tsc && pnpm build",
     "test:cypress": "cypress run",
     "test:cypress:open": "cypress open",
     "test-unit": "vitest",
@@ -36,7 +38,7 @@
     "client"
   ],
   "release": {
-    "attachReleaseFiles": "self-host.zip"
+    "attachReleaseFiles": "{self-host.zip,minecraft.html}"
   },
   "publish": {
     "preset": {
@@ -171,6 +173,7 @@
   "optionalDependencies": {
     "cypress": "^10.11.0",
     "cypress-plugin-snapshots": "^1.4.4",
+    "sharp": "^0.33.5",
     "systeminformation": "^5.21.22"
   },
   "browserslist": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 491ef376..a3979e38 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -249,6 +249,9 @@ importers:
       cypress-plugin-snapshots:
         specifier: ^1.4.4
         version: 1.4.4(cypress@10.11.0)
+      sharp:
+        specifier: ^0.33.5
+        version: 0.33.5
       systeminformation:
         specifier: ^5.21.22
         version: 5.22.7
@@ -1213,6 +1216,9 @@ packages:
     resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==}
     engines: {node: '>=10.0.0'}
 
+  '@emnapi/runtime@1.3.1':
+    resolution: {integrity: sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==}
+
   '@emotion/babel-plugin@11.12.0':
     resolution: {integrity: sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw==}
 
@@ -1750,6 +1756,111 @@ packages:
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
     deprecated: Use @eslint/object-schema instead
 
+  '@img/sharp-darwin-arm64@0.33.5':
+    resolution: {integrity: sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-darwin-x64@0.33.5':
+    resolution: {integrity: sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-arm64@1.0.4':
+    resolution: {integrity: sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-x64@1.0.4':
+    resolution: {integrity: sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-linux-arm64@1.0.4':
+    resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-arm@1.0.5':
+    resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==}
+    cpu: [arm]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-s390x@1.0.4':
+    resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==}
+    cpu: [s390x]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-x64@1.0.4':
+    resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
+    resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-libvips-linuxmusl-x64@1.0.4':
+    resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-linux-arm64@0.33.5':
+    resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-linux-arm@0.33.5':
+    resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@img/sharp-linux-s390x@0.33.5':
+    resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [s390x]
+    os: [linux]
+
+  '@img/sharp-linux-x64@0.33.5':
+    resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-linuxmusl-arm64@0.33.5':
+    resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-linuxmusl-x64@0.33.5':
+    resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-wasm32@0.33.5':
+    resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [wasm32]
+
+  '@img/sharp-win32-ia32@0.33.5':
+    resolution: {integrity: sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@img/sharp-win32-x64@0.33.5':
+    resolution: {integrity: sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [win32]
+
   '@isaacs/cliui@8.0.2':
     resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
     engines: {node: '>=12'}
@@ -4612,6 +4723,10 @@ packages:
     resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==}
     engines: {node: '>=8'}
 
+  detect-libc@2.0.3:
+    resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
+    engines: {node: '>=8'}
+
   detect-node-es@1.1.0:
     resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
 
@@ -8233,6 +8348,11 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  semver@7.7.1:
+    resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   send@0.18.0:
     resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
     engines: {node: '>= 0.8.0'}
@@ -8302,6 +8422,10 @@ packages:
     resolution: {integrity: sha512-G+MY2YW33jgflKPTXXptVO28HvNOo9G3j0MybYAHeEmby+QuD2U98dT6ueht9cv/XDqZspSpIhoSW+BAKJ7Hig==}
     engines: {node: '>=12.13.0'}
 
+  sharp@0.33.5:
+    resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+
   shebang-command@1.2.0:
     resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
     engines: {node: '>=0.10.0'}
@@ -10629,6 +10753,11 @@ snapshots:
 
   '@discoveryjs/json-ext@0.5.7': {}
 
+  '@emnapi/runtime@1.3.1':
+    dependencies:
+      tslib: 2.6.2
+    optional: true
+
   '@emotion/babel-plugin@11.12.0':
     dependencies:
       '@babel/helper-module-imports': 7.22.15
@@ -10982,6 +11111,81 @@ snapshots:
 
   '@humanwhocodes/object-schema@1.2.1': {}
 
+  '@img/sharp-darwin-arm64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-arm64': 1.0.4
+    optional: true
+
+  '@img/sharp-darwin-x64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-x64': 1.0.4
+    optional: true
+
+  '@img/sharp-libvips-darwin-arm64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-darwin-x64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-arm64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-arm@1.0.5':
+    optional: true
+
+  '@img/sharp-libvips-linux-s390x@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-x64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linuxmusl-x64@1.0.4':
+    optional: true
+
+  '@img/sharp-linux-arm64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm64': 1.0.4
+    optional: true
+
+  '@img/sharp-linux-arm@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm': 1.0.5
+    optional: true
+
+  '@img/sharp-linux-s390x@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-s390x': 1.0.4
+    optional: true
+
+  '@img/sharp-linux-x64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-x64': 1.0.4
+    optional: true
+
+  '@img/sharp-linuxmusl-arm64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
+    optional: true
+
+  '@img/sharp-linuxmusl-x64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-x64': 1.0.4
+    optional: true
+
+  '@img/sharp-wasm32@0.33.5':
+    dependencies:
+      '@emnapi/runtime': 1.3.1
+    optional: true
+
+  '@img/sharp-win32-ia32@0.33.5':
+    optional: true
+
+  '@img/sharp-win32-x64@0.33.5':
+    optional: true
+
   '@isaacs/cliui@8.0.2':
     dependencies:
       string-width: 5.1.2
@@ -14884,6 +15088,9 @@ snapshots:
 
   detect-libc@2.0.2: {}
 
+  detect-libc@2.0.3:
+    optional: true
+
   detect-node-es@1.1.0: {}
 
   detect-package-manager@2.0.1:
@@ -19524,6 +19731,9 @@ snapshots:
     dependencies:
       lru-cache: 6.0.0
 
+  semver@7.7.1:
+    optional: true
+
   send@0.18.0:
     dependencies:
       debug: 2.6.9
@@ -19654,6 +19864,33 @@ snapshots:
       tar-fs: 2.1.1
       tunnel-agent: 0.6.0
 
+  sharp@0.33.5:
+    dependencies:
+      color: 4.2.3
+      detect-libc: 2.0.3
+      semver: 7.7.1
+    optionalDependencies:
+      '@img/sharp-darwin-arm64': 0.33.5
+      '@img/sharp-darwin-x64': 0.33.5
+      '@img/sharp-libvips-darwin-arm64': 1.0.4
+      '@img/sharp-libvips-darwin-x64': 1.0.4
+      '@img/sharp-libvips-linux-arm': 1.0.5
+      '@img/sharp-libvips-linux-arm64': 1.0.4
+      '@img/sharp-libvips-linux-s390x': 1.0.4
+      '@img/sharp-libvips-linux-x64': 1.0.4
+      '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
+      '@img/sharp-libvips-linuxmusl-x64': 1.0.4
+      '@img/sharp-linux-arm': 0.33.5
+      '@img/sharp-linux-arm64': 0.33.5
+      '@img/sharp-linux-s390x': 0.33.5
+      '@img/sharp-linux-x64': 0.33.5
+      '@img/sharp-linuxmusl-arm64': 0.33.5
+      '@img/sharp-linuxmusl-x64': 0.33.5
+      '@img/sharp-wasm32': 0.33.5
+      '@img/sharp-win32-ia32': 0.33.5
+      '@img/sharp-win32-x64': 0.33.5
+    optional: true
+
   shebang-command@1.2.0:
     dependencies:
       shebang-regex: 1.0.0
diff --git a/renderer/rsbuildSharedConfig.ts b/renderer/rsbuildSharedConfig.ts
index 24a29a26..c39c4454 100644
--- a/renderer/rsbuildSharedConfig.ts
+++ b/renderer/rsbuildSharedConfig.ts
@@ -78,6 +78,12 @@ export const rspackViewerConfig = (config, { appendPlugins, addRules, rspack }:
         if (absolute.endsWith('/minecraft-data/data.js')) {
             resource.request = path.join(__dirname, `../src/shims/minecraftData.ts`)
         }
+        if (absolute.endsWith('/minecraft-data/data/bedrock/common/legacy.json')) {
+            resource.request = path.join(__dirname, `../src/shims/empty.ts`)
+        }
+        if (absolute.endsWith('/minecraft-data/data/pc/common/legacy.json')) {
+            resource.request = path.join(__dirname, `../src/preflatMap.json`)
+        }
     }))
     addRules([
         {
@@ -91,11 +97,17 @@ export const rspackViewerConfig = (config, { appendPlugins, addRules, rspack }:
         {
             test: /\.mp3$/,
             type: 'asset/source',
+        },
+        {
+            test: /\.txt$/,
+            type: 'asset/source',
         }
     ])
     config.ignoreWarnings = [
         /the request of a dependency is an expression/,
         /Unsupported pseudo class or element: xr-overlay/
     ]
-
+    if (process.env.SINGLE_FILE_BUILD === 'true') {
+        config.module!.parser!.javascript!.dynamicImportMode = 'eager'
+    }
 }
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 261b18e6..3852e535 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -191,7 +191,14 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       // eslint-disable-next-line node/no-path-concat
       const src = typeof window === 'undefined' ? `${__dirname}/${workerName}` : workerName
 
-      const worker: any = new Worker(src)
+      let worker: any
+      if (process.env.SINGLE_FILE_BUILD) {
+        const workerCode = document.getElementById('mesher-worker-code')!.textContent!
+        const blob = new Blob([workerCode], { type: 'text/javascript' })
+        worker = new Worker(window.URL.createObjectURL(blob))
+      } else {
+        worker = new Worker(src)
+      }
       const handleMessage = (data) => {
         if (!this.active) return
         if (data.type !== 'geometry' || !this.debugStopGeometryUpdate) {
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 875d0e0c..fede0309 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -11,6 +11,17 @@ import { promisify } from 'util'
 import { generateSW } from 'workbox-build'
 import { getSwAdditionalEntries } from './scripts/build'
 import { appAndRendererSharedConfig } from './renderer/rsbuildSharedConfig'
+import { genLargeDataAliases } from './scripts/genLargeDataAliases'
+import sharp from 'sharp'
+import supportedVersions from './src/supportedVersions.mjs'
+
+const SINGLE_FILE_BUILD = process.env.SINGLE_FILE_BUILD === 'true'
+
+if (SINGLE_FILE_BUILD) {
+    const patchCssFile = 'node_modules/pixelarticons/fonts/pixelart-icons-font.css'
+    const text = fs.readFileSync(patchCssFile, 'utf8')
+    fs.writeFileSync(patchCssFile, text.replaceAll("url('pixelart-icons-font.ttf?t=1711815892278') format('truetype'),", ""), 'utf8')
+}
 
 //@ts-ignore
 try { require('./localSettings.js') } catch { }
@@ -43,12 +54,54 @@ if (dev) {
     configJson.defaultProxy = ':8080'
 }
 
-const configSource = process.env.CONFIG_JSON_SOURCE || 'REMOTE'
+const configSource = (SINGLE_FILE_BUILD ? 'BUNDLED' : (process.env.CONFIG_JSON_SOURCE || 'REMOTE')) as 'BUNDLED' | 'REMOTE'
+
+const faviconPath = 'favicon.png'
 
 // base options are in ./renderer/rsbuildSharedConfig.ts
 const appConfig = defineConfig({
     html: {
         template: './index.html',
+        inject: 'body',
+        tags: [
+            ...SINGLE_FILE_BUILD ? [] : [
+                {
+                    tag: 'link',
+                    attrs: {
+                        rel: 'manifest',
+                        crossorigin: 'use-credentials',
+                        href: 'manifest.json'
+                    },
+                }
+            ],
+            // <link rel="favicon" href="favicon.png">
+            // <link rel="icon" type="image/png" href="favicon.png" />
+            // <meta property="og:image" content="favicon.png" />
+            {
+                tag: 'link',
+                attrs: {
+                    rel: 'favicon',
+                    href: faviconPath
+                }
+            },
+            ...SINGLE_FILE_BUILD ? [] : [
+                {
+                    tag: 'link',
+                    attrs: {
+                        rel: 'icon',
+                        type: 'image/png',
+                        href: faviconPath
+                    }
+                },
+                {
+                    tag: 'meta',
+                    attrs: {
+                        property: 'og:image',
+                        content: faviconPath
+                    }
+                }
+            ]
+        ]
     },
     output: {
         externals: [
@@ -58,6 +111,13 @@ const appConfig = defineConfig({
             js: 'source-map',
             css: true,
         },
+        distPath: SINGLE_FILE_BUILD ? {
+            html: './single',
+        } : undefined,
+        inlineScripts: SINGLE_FILE_BUILD,
+        inlineStyles: SINGLE_FILE_BUILD,
+        // 50kb limit for data uri
+        dataUriLimit: SINGLE_FILE_BUILD ? 1 * 1024 * 1024 * 1024 : 50 * 1024
     },
     source: {
         entry: {
@@ -69,6 +129,9 @@ const appConfig = defineConfig({
         define: {
             'process.env.BUILD_VERSION': JSON.stringify(!dev ? buildingVersion : 'undefined'),
             'process.env.MAIN_MENU_LINKS': JSON.stringify(process.env.MAIN_MENU_LINKS),
+            'process.env.SINGLE_FILE_BUILD': JSON.stringify(process.env.SINGLE_FILE_BUILD),
+            'process.env.SINGLE_FILE_BUILD_MODE': JSON.stringify(process.env.SINGLE_FILE_BUILD),
+            'process.platform': '"browser"',
             'process.env.GITHUB_URL':
                 JSON.stringify(`https://github.com/${process.env.GITHUB_REPOSITORY || `${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}` || githubRepositoryFallback}`),
             'process.env.DEPS_VERSIONS': JSON.stringify({}),
@@ -92,17 +155,19 @@ const appConfig = defineConfig({
         pluginTypedCSSModules(),
         {
             name: 'test',
-            setup (build: RsbuildPluginAPI) {
+            setup(build: RsbuildPluginAPI) {
                 const prep = async () => {
                     console.time('total-prep')
                     fs.mkdirSync('./generated', { recursive: true })
-                    if (!fs.existsSync('./generated/minecraft-data-optimized.json') || require('./generated/minecraft-data-optimized.json').versionKey !== require('minecraft-data/package.json').version) {
+                    if (!fs.existsSync('./generated/minecraft-data-optimized.json') || !fs.existsSync('./generated/mc-assets-compressed.js') || require('./generated/minecraft-data-optimized.json').versionKey !== require('minecraft-data/package.json').version) {
                         childProcess.execSync('tsx ./scripts/makeOptimizedMcData.mjs', { stdio: 'inherit' })
                     }
                     childProcess.execSync('tsx ./scripts/genShims.ts', { stdio: 'inherit' })
                     if (!fs.existsSync('./generated/latestBlockCollisionsShapes.json') || require('./generated/latestBlockCollisionsShapes.json').versionKey !== require('minecraft-data/package.json').version) {
                         childProcess.execSync('tsx ./scripts/optimizeBlockCollisions.ts', { stdio: 'inherit' })
                     }
+                    // childProcess.execSync(['tsx', './scripts/genLargeDataAliases.ts', ...(SINGLE_FILE_BUILD ? ['--compressed'] : [])].join(' '), { stdio: 'inherit' })
+                    genLargeDataAliases(SINGLE_FILE_BUILD)
                     fsExtra.copySync('./node_modules/mc-assets/dist/other-textures/latest/entity', './dist/textures/entity')
                     fsExtra.copySync('./assets/background', './dist/background')
                     fs.copyFileSync('./assets/favicon.png', './dist/favicon.png')
@@ -137,16 +202,33 @@ const appConfig = defineConfig({
                         prep()
                     })
                     build.onAfterBuild(async () => {
-                        if (!disableServiceWorker) {
+                        if (SINGLE_FILE_BUILD) {
+                            // process index.html
+                            const singleBuildHtml = './dist/single/index.html'
+                            let html = fs.readFileSync(singleBuildHtml, 'utf8')
+                            const verToMajor = (ver: string) => ver.split('.').slice(0, 2).join('.')
+                            const supportedMajorVersions = [...new Set(supportedVersions.map(a => verToMajor(a)))].join(', ')
+                            html = `<!DOCTYPE html><!-- MINECRAFT WEB CLIENT ${releaseTag} -->\n<!-- A true SINGLE FILE BUILD with built-in server -->\n<!-- All textures, assets and Minecraft data for ${supportedMajorVersions} inlined into one file. -->\n${html}`
+
+                            const resizedImage = (await (sharp('./assets/favicon.png') as any).resize(64).toBuffer()).toString('base64')
+                            html = html.replace('favicon.png', `data:image/png;base64,${resizedImage}`)
+                            html = html.replace('src="./loading-bg.jpg"', `src="data:image/png;base64,${fs.readFileSync('./assets/loading-bg.jpg', 'base64')}"`)
+                            html += '<script id="mesher-worker-code">' + fs.readFileSync('./dist/mesher.js', 'utf8') + '</script>'
+                            fs.writeFileSync(singleBuildHtml, html, 'utf8')
+                            // write output file size
+                            console.log('single file size', (fs.statSync(singleBuildHtml).size / 1024 / 1024).toFixed(2), 'mb')
+                        } else {
+                            if (!disableServiceWorker) {
                             const { count, size, warnings } = await generateSW({
-                                // dontCacheBustURLsMatching: [new RegExp('...')],
-                                globDirectory: 'dist',
-                                skipWaiting: true,
-                                clientsClaim: true,
-                                additionalManifestEntries: getSwAdditionalEntries(),
-                                globPatterns: [],
-                                swDest: './dist/service-worker.js',
-                            })
+                                    // dontCacheBustURLsMatching: [new RegExp('...')],
+                                    globDirectory: 'dist',
+                                    skipWaiting: true,
+                                    clientsClaim: true,
+                                    additionalManifestEntries: getSwAdditionalEntries(),
+                                    globPatterns: [],
+                                    swDest: './dist/service-worker.js',
+                                })
+                            }
                         }
                     })
                 }
diff --git a/scripts/genLargeDataAliases.ts b/scripts/genLargeDataAliases.ts
new file mode 100644
index 00000000..0cf206df
--- /dev/null
+++ b/scripts/genLargeDataAliases.ts
@@ -0,0 +1,59 @@
+import * as fs from 'fs'
+
+export const genLargeDataAliases = async (isCompressed: boolean) => {
+    const modules = {
+        mcData: {
+            raw: '../generated/minecraft-data-optimized.json',
+            compressed: '../generated/mc-data-compressed.js',
+        },
+        blockStatesModels: {
+            raw: 'mc-assets/dist/blockStatesModels.json',
+            compressed: '../generated/mc-assets-compressed.js',
+        }
+    }
+
+    const OUT_FILE = './generated/large-data-aliases.ts'
+
+    let str = `${decoderCode}\nexport const importLargeData = async (mod: ${Object.keys(modules).map(x => `'${x}'`).join(' | ')}) => {\n`
+    for (const [module, { compressed, raw }] of Object.entries(modules)) {
+        let importCode = `(await import('${isCompressed ? compressed : raw}')).default`;
+        if (isCompressed) {
+            importCode = `JSON.parse(decompressFromBase64(${importCode}))`
+        }
+        str += `  if (mod === '${module}') return ${importCode}\n`
+    }
+    str += `}\n`
+
+    fs.writeFileSync(OUT_FILE, str, 'utf8')
+}
+
+const decoderCode = /* ts */ `
+import pako from 'pako';
+
+function decompressFromBase64(input) {
+    console.time('decompressFromBase64')
+    // Decode the Base64 string
+    const binaryString = atob(input);
+    const len = binaryString.length;
+    const bytes = new Uint8Array(len);
+
+    // Convert the binary string to a byte array
+    for (let i = 0; i < len; i++) {
+        bytes[i] = binaryString.charCodeAt(i);
+    }
+
+    // Decompress the byte array
+    const decompressedData = pako.inflate(bytes, { to: 'string' });
+
+    console.timeEnd('decompressFromBase64')
+    return decompressedData;
+}
+`
+
+// execute if run directly
+if (require.main === module) {
+    console.log('running...')
+    const isCompressed = process.argv.includes('--compressed')
+    genLargeDataAliases(isCompressed)
+    console.log('done generating large data aliases')
+}
diff --git a/scripts/genShims.ts b/scripts/genShims.ts
index 0ee8d91e..2916044a 100644
--- a/scripts/genShims.ts
+++ b/scripts/genShims.ts
@@ -15,6 +15,7 @@ for (const resource of appReplacableResources) {
   const name = path.split('/').slice(-4).join('_').replace('.png', '').replaceAll('-', '_').replaceAll('.', '_')
   keys.push(name)
   headerImports += `import ${name} from '${path.replace('../node_modules/', '')}'\n`
+
   resourcesContent += `
   '${name}': {
     content: ${name},
diff --git a/scripts/makeOptimizedMcData.mjs b/scripts/makeOptimizedMcData.mjs
index eae0444b..05948cf2 100644
--- a/scripts/makeOptimizedMcData.mjs
+++ b/scripts/makeOptimizedMcData.mjs
@@ -42,14 +42,20 @@ const versionToNumber = (ver) => {
   return +`${x.padStart(2, '0')}${y.padStart(2, '0')}${z.padStart(2, '0')}`
 }
 
-const compressedOutput = false
 // if not included here (even as {}) will not be bundled & accessible!
-// const dataTypeBundling = {
-//   protocol: {
-//     // ignoreRemoved: true,
-//     // ignoreChanges: true
-//   }
-// }
+// const compressedOutput = !!process.env.SINGLE_FILE_BUILD
+const compressedOutput = true
+const dataTypeBundling2 = {
+  blocks: {
+    arrKey: 'name',
+  },
+  items: {
+    arrKey: 'name',
+  },
+  recipes: {
+    processData: processRecipes
+  }
+}
 const dataTypeBundling = {
   language: {
     ignoreRemoved: true,
@@ -132,7 +138,8 @@ const dataTypeBundling = {
   },
   recipes: {
     raw: true
-  }, // todo we can do better
+    // processData: processRecipes
+  },
   blockCollisionShapes: {},
   loginPacket: {},
   protocol: {
@@ -143,6 +150,84 @@ const dataTypeBundling = {
   // }
 }
 
+function processRecipes (current, prev, getData, version) {
+  // can require the same multiple times per different versions
+  if (current._proccessed) return
+  const items = getData('items')
+  const blocks = getData('blocks')
+  const itemsIdsMap = Object.fromEntries(items.map((b) => [b.id, b.name]))
+  const blocksIdsMap = Object.fromEntries(blocks.map((b) => [b.id, b.name]))
+  for (const key of Object.keys(current)) {
+    const mapId = (id) => {
+      if (typeof id !== 'string' && typeof id !== 'number') throw new Error('Incorrect type')
+      const mapped = itemsIdsMap[id] ?? blocksIdsMap[id]
+      if (!mapped) {
+        throw new Error(`No item/block name with id ${id}`)
+      }
+      return mapped
+    }
+    const processRecipe = (obj) => {
+      // if (!obj) return
+      // if (Array.isArray(obj)) {
+      //   obj.forEach((id, i) => {
+      //     obj[i] = mapId(obj[id])
+      //   })
+      // } else if (obj && typeof obj === 'object') {
+      //   if (!'count metadata id'.split(' ').every(x => x in obj)) {
+      //     throw new Error(`process error: Unknown deep object pattern: ${JSON.stringify(obj)}`)
+      //   }
+      //   obj.id = mapId(obj.id)
+      // } else {
+      //   throw new Error('unknown type')
+      // }
+      const parseRecipeItem = (item) => {
+        if (typeof item === 'number') return mapId(item)
+        if (Array.isArray(item)) return [mapId(item), ...item.slice(1)]
+        if (!item) {
+          return item
+        }
+        if ('id' in item) {
+          item.id = mapId(item.id)
+          return item
+        }
+        throw new Error('unhandled')
+      }
+      const maybeProccessShape = (shape) => {
+        if (!shape) return
+        for (const shapeRow of shape) {
+          for (const [i, item] of shapeRow.entries()) {
+            shapeRow[i] = parseRecipeItem(item)
+          }
+        }
+      }
+      if (obj.result) obj.result = parseRecipeItem(obj.result)
+      maybeProccessShape(obj.inShape)
+      maybeProccessShape(obj.outShape)
+      if (obj.ingredients) {
+        for (const [i, ingredient] of obj.ingredients.entries()) {
+          obj.ingredients[i] = parseRecipeItem(ingredient)
+        }
+      }
+    }
+    try {
+      const name = mapId(key)
+      for (const [i, recipe] of current[key].entries()) {
+        try {
+          processRecipe(recipe)
+        } catch (err) {
+          console.warn(`${version} [warn] Removing incorrect recipe: ${err}`)
+          delete current[i]
+        }
+      }
+      current[name] = current[key]
+    } catch (err) {
+      console.warn(`${version} [warn] Removing incorrect recipe: ${err}`)
+    }
+    delete current[key]
+  }
+  current._proccessed = true
+}
+
 const notBundling = [...dataTypes.keys()].filter(x => !Object.keys(dataTypeBundling).includes(x))
 console.log("Not bundling minecraft-data data:", notBundling)
 
@@ -161,11 +246,15 @@ for (const [i, [version, dataSet]] of versionsArr.reverse().entries()) {
       // contents += `      get ${dataType} () { return window.globalGetCollisionShapes?.("${version}") },\n`
       continue
     }
-    const loc = `minecraft-data/data/${dataPath}/`
-    const dataPathAbsolute = require.resolve(`minecraft-data/${loc}${dataType}`)
-    // const data = fs.readFileSync(dataPathAbsolute, 'utf8')
-    const dataRaw = require(dataPathAbsolute)
     let injectCode = ''
+    const getData = (type) => {
+      const loc = `minecraft-data/data/${dataSet[type]}/`
+      const dataPathAbsolute = require.resolve(`minecraft-data/${loc}${type}`)
+      // const data = fs.readFileSync(dataPathAbsolute, 'utf8')
+      const dataRaw = require(dataPathAbsolute)
+      return dataRaw
+    }
+    const dataRaw = getData(dataType)
     let rawData = dataRaw
     if (config.raw) {
       rawDataVersions[dataType] ??= {}
@@ -176,7 +265,7 @@ for (const [i, [version, dataSet]] of versionsArr.reverse().entries()) {
         diffSources[dataType] = new JsonOptimizer(config.arrKey, config.ignoreChanges, config.ignoreRemoved)
       }
       try {
-        config.processData?.(dataRaw, previousData[dataType])
+        config.processData?.(dataRaw, previousData[dataType], getData, version)
         diffSources[dataType].recordDiff(version, dataRaw)
         injectCode = `restoreDiff(sources, ${JSON.stringify(dataType)}, ${JSON.stringify(version)})`
       } catch (err) {
@@ -225,8 +314,14 @@ fs.writeFileSync(filePath, JSON.stringify(sources), 'utf8')
 if (compressedOutput) {
   const minizedCompressed = compressToBase64(fs.readFileSync(filePath))
   console.log('size of compressed', Buffer.byteLength(minizedCompressed, 'utf8') / 1000 / 1000)
-  const compressedFilePath = './experiments/compressed.js'
-  fs.writeFileSync(compressedFilePath, minizedCompressed, 'utf8')
+  const compressedFilePath = './generated/mc-data-compressed.js'
+  fs.writeFileSync(compressedFilePath, `export default ${JSON.stringify(minizedCompressed)}`, 'utf8')
+
+  const mcAssets = JSON.stringify(require('mc-assets/dist/blockStatesModels.json'))
+  fs.writeFileSync('./generated/mc-assets-compressed.js', `export default ${JSON.stringify(compressToBase64(mcAssets))}`, 'utf8')
+
+  // const modelsObj = fs.readFileSync('./prismarine-renderer/viewer/lib/entity/exportedModels.js')
+  // const models =
 }
 
 console.log('size', fs.lstatSync(filePath).size / 1000 / 1000, gzipSizeFromFileSync(filePath) / 1000 / 1000)
diff --git a/scripts/testOptimizedMcdata.ts b/scripts/testOptimizedMcdata.ts
index d6c74384..7c94fac2 100644
--- a/scripts/testOptimizedMcdata.ts
+++ b/scripts/testOptimizedMcdata.ts
@@ -1,5 +1,5 @@
 import assert from 'assert'
-import JsonOptimizer from '../src/optimizeJson';
+import JsonOptimizer, { restoreMinecraftData } from '../src/optimizeJson';
 import fs from 'fs'
 import minecraftData from 'minecraft-data'
 
@@ -8,7 +8,7 @@ const json = JSON.parse(fs.readFileSync('./generated/minecraft-data-optimized.js
 const dataPaths = require('minecraft-data/minecraft-data/data/dataPaths.json')
 
 const validateData = (ver, type) => {
-  const target = JsonOptimizer.restoreData(structuredClone(json[type]), ver)
+  const target = restoreMinecraftData(structuredClone(json), type, ver)
   const arrKey = json[type].arrKey
   const originalPath = dataPaths.pc[ver][type]
   const original = require(`minecraft-data/minecraft-data/data/${originalPath}/${type}.json`)
@@ -92,8 +92,8 @@ const checkKeys = (source, diffing, isUniq = true, msg = '', redundantIsOk = fal
 }
 
 // const data = minecraftData('1.20.4')
-const oldId = JsonOptimizer.restoreData(json['blocks'], '1.20').find(x => x.name === 'brown_stained_glass').id;
-const newId = JsonOptimizer.restoreData(json['blocks'], '1.20.4').find(x => x.name === 'brown_stained_glass').id;
+const oldId = JsonOptimizer.restoreData(json['blocks'], '1.20', undefined).find(x => x.name === 'brown_stained_glass').id;
+const newId = JsonOptimizer.restoreData(json['blocks'], '1.20.4', undefined).find(x => x.name === 'brown_stained_glass').id;
 assert(oldId !== newId)
 // test all types + all versions
 
diff --git a/src/connect.ts b/src/connect.ts
index a67e6a62..7557bf5b 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -1,9 +1,15 @@
 // import { versionsByMinecraftVersion } from 'minecraft-data'
 // import minecraftInitialDataJson from '../generated/minecraft-initial-data.json'
-import { AuthenticatedAccount } from './react/serversStorage'
-import { downloadSoundsIfNeeded } from './sounds/botSoundSystem'
-import { options } from './optionsStorage'
+import MinecraftData from 'minecraft-data'
+import PrismarineBlock from 'prismarine-block'
+import PrismarineItem from 'prismarine-item'
+import pathfinder from 'mineflayer-pathfinder'
+import { importLargeData } from '../generated/large-data-aliases'
+import { miscUiState } from './globalState'
 import supportedVersions from './supportedVersions.mjs'
+import { options } from './optionsStorage'
+import { downloadSoundsIfNeeded } from './sounds/botSoundSystem'
+import { AuthenticatedAccount } from './react/serversStorage'
 
 export type ConnectOptions = {
   server?: string
@@ -38,7 +44,8 @@ export const getVersionAutoSelect = (autoVersionSelect = options.serversAutoVers
   return autoVersionSelect
 }
 
-export const downloadMcDataOnConnect = async (version: string) => {
+export const loadMinecraftData = async (version: string, importBlockstatesModels = false) => {
+  await window._LOAD_MC_DATA()
   // setLoadingScreenStatus(`Loading data for ${version}`)
   // // todo expose cache
   // // const initialDataVersion = Object.keys(minecraftInitialDataJson)[0]!
@@ -47,8 +54,16 @@ export const downloadMcDataOnConnect = async (version: string) => {
   // //   versionsByMinecraftVersion.pc[initialDataVersion]!.dataVersion!++
   // // }
 
-  // await window._MC_DATA_RESOLVER.promise // ensure data is loaded
-  // miscUiState.loadedDataVersion = version
+  const mcData = MinecraftData(version)
+  window.PrismarineBlock = PrismarineBlock(mcData.version.minecraftVersion!)
+  window.PrismarineItem = PrismarineItem(mcData.version.minecraftVersion!)
+  window.loadedData = mcData
+  window.pathfinder = pathfinder
+  miscUiState.loadedDataVersion = version
+
+  if (importBlockstatesModels) {
+    viewer.world.blockstatesModels = await importLargeData('blockStatesModels')
+  }
 }
 
 export const downloadAllMinecraftData = async () => {
diff --git a/src/devtools.ts b/src/devtools.ts
index 617a4440..daaf1a35 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -3,7 +3,9 @@
 import fs from 'fs'
 import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
 import { enable, disable, enabled } from 'debug'
+import { Vec3 } from 'vec3'
 
+window.Vec3 = Vec3
 window.cursorBlockRel = (x = 0, y = 0, z = 0) => {
   const newPos = bot.blockAtCursor(5)?.position.offset(x, y, z)
   if (!newPos) return
diff --git a/src/index.ts b/src/index.ts
index c1fa5fd5..812b8c51 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -23,8 +23,6 @@ import { Duplex } from 'stream'
 
 import './scaleInterface'
 import { initWithRenderer } from './topRightStats'
-import PrismarineBlock from 'prismarine-block'
-import PrismarineItem from 'prismarine-item'
 
 import { options, watchValue } from './optionsStorage'
 import './reactUi'
@@ -39,7 +37,6 @@ import net from 'net'
 import mineflayer from 'mineflayer'
 import { WorldDataEmitter, Viewer } from 'renderer/viewer'
 import pathfinder from 'mineflayer-pathfinder'
-import { Vec3 } from 'vec3'
 
 import * as THREE from 'three'
 import MinecraftData from 'minecraft-data'
@@ -90,7 +87,7 @@ import { saveToBrowserMemory } from './react/PauseScreen'
 import { ViewerWrapper } from 'renderer/viewer/lib/viewerWrapper'
 import './devReload'
 import './water'
-import { ConnectOptions, downloadMcDataOnConnect, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData } from './connect'
+import { ConnectOptions, loadMinecraftData, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData } from './connect'
 import { ref, subscribe } from 'valtio'
 import { signInMessageState } from './react/SignInMessageProvider'
 import { updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/serversStorage'
@@ -114,6 +111,7 @@ import { startLocalReplayServer } from './packetsReplay/replayPackets'
 import { localRelayServerPlugin } from './mineflayer/plugins/packetsRecording'
 import { createFullScreenProgressReporter } from './core/progressReporter'
 import { getItemModelName } from './resourcesManager'
+import { importLargeData } from '../generated/large-data-aliases'
 
 window.debug = debug
 window.THREE = THREE
@@ -416,7 +414,7 @@ export async function connect (connectOptions: ConnectOptions) {
       await progress.executeWithMessage(
         'Applying user-installed resource pack',
         async () => {
-          await downloadMcDataOnConnect(version)
+          await loadMinecraftData(version)
           try {
             await resourcepackReload(version)
           } catch (err) {
@@ -432,7 +430,7 @@ export async function connect (connectOptions: ConnectOptions) {
       await progress.executeWithMessage(
         'Loading minecraft models',
         async () => {
-          viewer.world.blockstatesModels = await import('mc-assets/dist/blockStatesModels.json')
+          viewer.world.blockstatesModels = await importLargeData('blockStatesModels')
           void viewer.setVersion(version, options.useVersionsTextures === 'latest' ? version : options.useVersionsTextures)
           miscUiState.loadedDataVersion = version
         }
@@ -747,13 +745,6 @@ export async function connect (connectOptions: ConnectOptions) {
 
   bot.once('login', () => {
     setLoadingScreenStatus('Loading world')
-
-    const mcData = MinecraftData(bot.version)
-    window.PrismarineBlock = PrismarineBlock(mcData.version.minecraftVersion!)
-    window.PrismarineItem = PrismarineItem(mcData.version.minecraftVersion!)
-    window.loadedData = mcData
-    window.Vec3 = Vec3
-    window.pathfinder = pathfinder
   })
 
   const start = Date.now()
@@ -880,8 +871,8 @@ export async function connect (connectOptions: ConnectOptions) {
     miscUiState.gameLoaded = true
     miscUiState.loadedServerIndex = connectOptions.serverIndex ?? ''
     customEvents.emit('gameLoaded')
-    setLoadingScreenStatus(undefined)
     progress.end()
+    setLoadingScreenStatus(undefined)
   })
 
   if (singleplayer && connectOptions.serverOverrides.worldFolder) {
diff --git a/src/optimizeJson.ts b/src/optimizeJson.ts
index d19d25d5..8c23dac0 100644
--- a/src/optimizeJson.ts
+++ b/src/optimizeJson.ts
@@ -18,6 +18,102 @@ type SourceData = {
   __IS_OPTIMIZED__: true
 }
 
+function getRecipesProcessorProcessRecipes (items, blocks) {
+  return (current) => {
+    // can require the same multiple times per different versions
+    const itemsIdsMap = Object.fromEntries(items.map((b) => [b.name, b.id]))
+    const blocksIdsMap = Object.fromEntries(blocks.map((b) => [b.name, b.id]))
+    const keys = Object.keys(current)
+    for (const key of keys) {
+      if (key === '_proccessed') {
+        delete current[key]
+        continue
+      }
+      const mapId = (id) => {
+        if (typeof id !== 'string' && typeof id !== 'number') throw new Error('Incorrect type')
+        const mapped = itemsIdsMap[id] ?? blocksIdsMap[id]
+        if (!mapped) {
+          throw new Error(`No item/block name with id ${id}`)
+        }
+        return mapped
+      }
+      const processRecipe = (obj) => {
+        // if (!obj) return
+        // if (Array.isArray(obj)) {
+        //   obj.forEach((id, i) => {
+        //     obj[i] = mapId(obj[id])
+        //   })
+        // } else if (obj && typeof obj === 'object') {
+        //   if (!'count metadata id'.split(' ').every(x => x in obj)) {
+        //     throw new Error(`process error: Unknown deep object pattern: ${JSON.stringify(obj)}`)
+        //   }
+        //   obj.id = mapId(obj.id)
+        // } else {
+        //   throw new Error('unknown type')
+        // }
+        const parseRecipeItem = (item) => {
+          if (typeof item === 'number' || typeof item === 'string') return mapId(item)
+          if (Array.isArray(item)) return [mapId(item), ...item.slice(1)]
+          if (!item) {
+            return item
+          }
+          if ('id' in item) {
+            item.id = mapId(item.id)
+            return item
+          }
+          throw new Error('unhandled')
+        }
+        const maybeProccessShape = (shape) => {
+          if (!shape) return
+          for (const shapeRow of shape) {
+            for (const [i, item] of shapeRow.entries()) {
+              shapeRow[i] = parseRecipeItem(item)
+            }
+          }
+        }
+        if (obj.result) obj.result = parseRecipeItem(obj.result)
+        maybeProccessShape(obj.inShape)
+        maybeProccessShape(obj.outShape)
+        if (obj.ingredients) {
+          for (const [i, ingredient] of obj.ingredients.entries()) {
+            obj.ingredients[i] = parseRecipeItem(ingredient)
+          }
+        }
+      }
+      // eslint-disable-next-line no-useless-catch
+      try {
+        const name = mapId(key)
+        for (const [i, recipe] of current[key].entries()) {
+          // eslint-disable-next-line no-useless-catch
+          try {
+            processRecipe(recipe)
+          } catch (err) {
+            // console.warn(`${version} [warn] Removing incorrect recipe: ${err}`)
+            // delete current[i]
+            throw err
+          }
+        }
+        current[name] = current[key]
+      } catch (err) {
+        // console.warn(`${version} [warn] Removing incorrect recipe: ${err}`)
+        throw err
+      }
+      delete current[key]
+    }
+  }
+}
+
+export const restoreMinecraftData = (allVersionData: any, type: string, version: string) => {
+  let restorer
+  if (type === 'recipes') {
+    restorer = getRecipesProcessorProcessRecipes(
+      JsonOptimizer.restoreData(allVersionData.items, version, undefined),
+      JsonOptimizer.restoreData(allVersionData.blocks, version, undefined),
+    )
+  }
+  return JsonOptimizer.restoreData(allVersionData[type], version, restorer)
+}
+
 export default class JsonOptimizer {
   keys = {} as IdMap
   idToKey = {} as Record<number, string>
@@ -146,6 +242,7 @@ export default class JsonOptimizer {
 
   recordDiff (key: string, diffObj: string) {
     const diff = this.diffObj(diffObj)
+    // problem is that 274 key 10.20.6 no removed keys in diff created
     this.diffs[key] = diff
   }
 
@@ -158,7 +255,7 @@ export default class JsonOptimizer {
     return true
   }
 
-  static restoreData ({ keys, properties, source, arrKey, diffs }: SourceData, targetKey: string) {
+  static restoreData ({ keys, properties, source, arrKey, diffs }: SourceData, targetKey: string, dataRestorer: ((data) => void) | undefined) {
     // if (!diffs[targetKey]) throw new Error(`The requested data to restore with key ${targetKey} does not exist`)
     source = structuredClone(source)
     const keysById = Object.fromEntries(Object.entries(keys).map(x => [x[1], x[0]]))
@@ -204,11 +301,14 @@ export default class JsonOptimizer {
         break
       }
     }
+    let data
     if (arrKey) {
-      return Object.values(dataByKeys)
+      data = Object.values(dataByKeys)
     } else {
-      return Object.fromEntries(Object.entries(dataByKeys).map(([key, val]) => [keysById[key], val]))
+      data = Object.fromEntries(Object.entries(dataByKeys).map(([key, val]) => [keysById[key], val]))
     }
+    dataRestorer?.(data)
+    return data
   }
 
   static getByArrKey (item: any, arrKey: string) {
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 79748679..1c5c999e 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -163,10 +163,12 @@ const migrateOptions = (options: Partial<AppOptions & Record<string, any>>) => {
 
 export type AppOptions = typeof defaultOptions
 
+// when opening html file locally in browser, localStorage is shared between all ever opened html files, so we try to avoid conflicts
+const localStorageKey = process.env.SINGLE_FILE_BUILD ? 'minecraftWebClientOptions' : 'options'
 export const options: AppOptions = proxy({
   ...defaultOptions,
   ...initialAppConfig.defaultSettings,
-  ...migrateOptions(JSON.parse(localStorage.options || '{}')),
+  ...migrateOptions(JSON.parse(localStorage[localStorageKey] || '{}')),
   ...qsOptions
 })
 
@@ -185,7 +187,7 @@ Object.defineProperty(window, 'debugChangedOptions', {
 subscribe(options, () => {
   // Don't save disabled settings to localStorage
   const saveOptions = omitObj(options, [...disabledSettings.value] as any)
-  localStorage.options = JSON.stringify(saveOptions)
+  localStorage[localStorageKey] = JSON.stringify(saveOptions)
 })
 
 type WatchValue = <T extends Record<string, any>>(proxy: T, callback: (p: T, isChanged: boolean) => void) => () => void
diff --git a/src/panorama.ts b/src/panorama.ts
index 8def97c4..24ad0384 100644
--- a/src/panorama.ts
+++ b/src/panorama.ts
@@ -5,9 +5,14 @@ import fs from 'fs'
 import * as THREE from 'three'
 import { subscribeKey } from 'valtio/utils'
 import { EntityMesh } from 'renderer/viewer/lib/entity/EntityMesh'
+import { WorldDataEmitter } from 'renderer/viewer'
+import { Vec3 } from 'vec3'
+import { getSyncWorld } from 'renderer/playground/shared'
+import * as tweenJs from '@tweenjs/tween.js'
 import { fromTexturePackPath, resourcePackState } from './resourcePack'
 import { options, watchValue } from './optionsStorage'
 import { miscUiState } from './globalState'
+import { loadMinecraftData } from './connect'
 
 let panoramaCubeMap
 let shouldDisplayPanorama = false
@@ -41,38 +46,33 @@ const updateResourcePackSupportPanorama = async () => {
   try {
     // TODO!
     // await fs.promises.readFile(fromTexturePackPath(join(panoramaResourcePackPath, panoramaFiles[0])), 'base64')
-    panoramaUsesResourcePack = true
+    // panoramaUsesResourcePack = true
   } catch (err) {
     panoramaUsesResourcePack = false
   }
 }
 
-watchValue(miscUiState, m => {
-  if (m.fsReady) {
-    // Also adds panorama on app load here
-    watchValue(resourcePackState, async (s) => {
-      const oldState = panoramaUsesResourcePack
-      const newState = s.resourcePackInstalled && (await updateResourcePackSupportPanorama(), panoramaUsesResourcePack)
-      if (newState === oldState) return
-      removePanorama()
-      void addPanoramaCubeMap()
-    })
-  }
-})
+setTimeout(() => {
+  // after viewer is initialized
+  void addPanoramaCubeMap()
+}, 0)
 
-subscribeKey(miscUiState, 'loadedDataVersion', () => {
-  if (miscUiState.loadedDataVersion) removePanorama()
-  else void addPanoramaCubeMap()
-})
+let unloadPanoramaCallbacks = [] as Array<() => void>
 
 // Menu panorama background
 // TODO-low use abort controller
 export async function addPanoramaCubeMap () {
   if (panoramaCubeMap || miscUiState.loadedDataVersion || options.disableAssets) return
+  viewer.camera.fov = 85
+  await updateResourcePackSupportPanorama()
+  if (process.env.SINGLE_FILE_BUILD_MODE && !panoramaUsesResourcePack) {
+    void initDemoWorld()
+    return
+  }
+
   shouldDisplayPanorama = true
 
   let time = 0
-  viewer.camera.fov = 85
   viewer.camera.near = 0.05
   viewer.camera.updateProjectionMatrix()
   viewer.camera.position.set(0, 0, 0)
@@ -81,7 +81,6 @@ export async function addPanoramaCubeMap () {
 
   const loader = new THREE.TextureLoader()
   const panorMaterials = [] as THREE.MeshBasicMaterial[]
-  await updateResourcePackSupportPanorama()
   for (const file of panoramaFiles) {
     const texture = loader.load(await possiblyLoadPanoramaFromResourcePack(file))
 
@@ -135,11 +134,86 @@ export async function addPanoramaCubeMap () {
 }
 
 export function removePanorama () {
+  for (const unloadPanoramaCallback of unloadPanoramaCallbacks) {
+    unloadPanoramaCallback()
+  }
+  unloadPanoramaCallbacks = []
+  viewer.camera.fov = options.fov
   shouldDisplayPanorama = false
   if (!panoramaCubeMap) return
-  viewer.camera.fov = options.fov
   viewer.camera.near = 0.1
   viewer.camera.updateProjectionMatrix()
   viewer.scene.remove(panoramaCubeMap)
   panoramaCubeMap = null
 }
+
+const initDemoWorld = async () => {
+  const abortController = new AbortController()
+  unloadPanoramaCallbacks.push(() => {
+    abortController.abort()
+  })
+  const version = '1.21.4'
+  console.time(`load ${version} mc-data`)
+  await loadMinecraftData(version, true)
+  console.timeEnd(`load ${version} mc-data`)
+  if (abortController.signal.aborted) return
+  console.time('load scene')
+  const world = getSyncWorld(version)
+  const PrismarineBlock = require('prismarine-block')
+  const Block = PrismarineBlock(version)
+  const fullBlocks = loadedData.blocksArray.filter(block => {
+    // if (block.name.includes('leaves')) return false
+    if (/* !block.name.includes('wool') &&  */!block.name.includes('stained_glass')/*  && !block.name.includes('terracotta') */) return false
+    const b = Block.fromStateId(block.defaultState, 0)
+    if (b.shapes?.length !== 1) return false
+    const shape = b.shapes[0]
+    return shape[0] === 0 && shape[1] === 0 && shape[2] === 0 && shape[3] === 1 && shape[4] === 1 && shape[5] === 1
+  })
+  const Z = -15
+  const sizeX = 100
+  const sizeY = 100
+  for (let x = -sizeX; x < sizeX; x++) {
+    for (let y = -sizeY; y < sizeY; y++) {
+      const block = fullBlocks[Math.floor(Math.random() * fullBlocks.length)]
+      world.setBlockStateId(new Vec3(x, y, Z), block.defaultState)
+    }
+  }
+  viewer.camera.updateProjectionMatrix()
+  viewer.camera.position.set(0.5, sizeY / 2 + 0.5, 0.5)
+  viewer.camera.rotation.set(0, 0, 0)
+  const initPos = new Vec3(...viewer.camera.position.toArray())
+  const worldView = new WorldDataEmitter(world, 2, initPos)
+  // worldView.addWaitTime = 0
+  await viewer.world.setVersion(version)
+  if (abortController.signal.aborted) return
+  viewer.connect(worldView)
+  void worldView.init(initPos)
+  await viewer.world.waitForChunksToRender()
+  if (abortController.signal.aborted) return
+  // add small camera rotation to side on mouse move depending on absolute position of the cursor
+  const { camera } = viewer
+  const initX = camera.position.x
+  const initY = camera.position.y
+  let prevTwin: tweenJs.Tween<THREE.Vector3> | undefined
+  document.body.addEventListener('pointermove', (e) => {
+    if (e.pointerType !== 'mouse') return
+    const pos = new THREE.Vector2(e.clientX, e.clientY)
+    const SCALE = 0.2
+    /* -0.5 - 0.5 */
+    const xRel = pos.x / window.innerWidth - 0.5
+    const yRel = -(pos.y / window.innerHeight - 0.5)
+    prevTwin?.stop()
+    const to = {
+      x: initX + (xRel * SCALE),
+      y: initY + (yRel * SCALE)
+    }
+    prevTwin = new tweenJs.Tween(camera.position).to(to, 0) // todo use the number depending on diff // todo use the number depending on diff
+    // prevTwin.easing(tweenJs.Easing.Exponential.InOut)
+    prevTwin.start()
+    camera.updateProjectionMatrix()
+  }, {
+    signal: abortController.signal
+  })
+
+  console.timeEnd('load scene')
+}
diff --git a/src/react/MainMenuRenderApp.tsx b/src/react/MainMenuRenderApp.tsx
index 30fd3047..cdcfc096 100644
--- a/src/react/MainMenuRenderApp.tsx
+++ b/src/react/MainMenuRenderApp.tsx
@@ -87,7 +87,9 @@ export default () => {
   const [versionTitle, setVersionTitle] = useState('')
 
   useEffect(() => {
-    if (process.env.NODE_ENV === 'development') {
+    if (process.env.SINGLE_FILE_BUILD_MODE) {
+      setVersionStatus('(single file build)')
+    } else if (process.env.NODE_ENV === 'development') {
       setVersionStatus('(dev)')
     } else {
       fetch('./version.txt').then(async (f) => {
diff --git a/src/react/SignEditor.stories.tsx b/src/react/SignEditor.stories.tsx
index e7bcdd40..00f9404a 100644
--- a/src/react/SignEditor.stories.tsx
+++ b/src/react/SignEditor.stories.tsx
@@ -1,4 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react'
+import { ProseMirrorView } from './prosemirror-markdown'
 
 import SignEditor from './SignEditor'
 
@@ -19,7 +20,7 @@ type Story = StoryObj<typeof SignEditor>
 export const Primary: Story = {
   args: {
     handleInput () {},
-    isWysiwyg: false
+    ProseMirrorView
   },
   parameters: {
     noScaling: true
diff --git a/src/react/SignEditor.tsx b/src/react/SignEditor.tsx
index 1d3be96e..1af100c0 100644
--- a/src/react/SignEditor.tsx
+++ b/src/react/SignEditor.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useRef } from 'react'
 import { focusable } from 'tabbable'
 import markdownToFormattedText from '../markdownToFormattedText'
-import { ProseMirrorView } from './prosemirror-markdown'
+import type { ProseMirrorView } from './prosemirror-markdown'
 import Button from './Button'
 import 'prosemirror-view/style/prosemirror.css'
 import 'prosemirror-menu/style/menu.css'
@@ -12,7 +12,7 @@ const imageSource = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAMCAYAA
 
 type Props = {
   handleInput: (target: HTMLInputElement) => void,
-  isWysiwyg: boolean,
+  ProseMirrorView: typeof ProseMirrorView,
   handleClick?: (view: ResultType) => void
 }
 
@@ -22,7 +22,8 @@ export type ResultType = {
   dataText: string[]
 }
 
-export default ({ handleInput, isWysiwyg, handleClick }: Props) => {
+export default ({ handleInput, ProseMirrorView, handleClick }: Props) => {
+  const isWysiwyg = !!ProseMirrorView
   const prosemirrorContainer = useRef(null)
   const editorView = useRef<ProseMirrorView | null>(null)
 
diff --git a/src/react/SignEditorProvider.tsx b/src/react/SignEditorProvider.tsx
index 676c7ff5..68c5abd0 100644
--- a/src/react/SignEditorProvider.tsx
+++ b/src/react/SignEditorProvider.tsx
@@ -22,6 +22,7 @@ export default () => {
   const text = useRef<string[]>(['', '', '', ''])
   const [enableWysiwyg, setEnableWysiwyg] = useState(false)
   const isModalActive = useIsModalActive('signs-editor-screen')
+  const [proseMirrorView, setProseMirrorView] = useState(null as any)
 
   const handleClick = (result: ResultType) => {
     hideModal({ reactType: 'signs-editor-screen' })
@@ -72,8 +73,14 @@ export default () => {
         setEnableWysiwyg(false)
       }
     })
+
+    if (!process.env.SINGLE_FILE_BUILD) {
+      void import('./prosemirror-markdown').then(({ ProseMirrorView }) => {
+        setProseMirrorView(() => ProseMirrorView)
+      })
+    }
   }, [])
 
   if (!isModalActive) return null
-  return <SignEditor isWysiwyg={enableWysiwyg} handleInput={handleInput} handleClick={handleClick} />
+  return <SignEditor ProseMirrorView={enableWysiwyg ? proseMirrorView : undefined} handleInput={handleInput} handleClick={handleClick} />
 }
diff --git a/src/serviceWorker.ts b/src/serviceWorker.ts
index 1cec6863..321fc607 100644
--- a/src/serviceWorker.ts
+++ b/src/serviceWorker.ts
@@ -2,8 +2,8 @@ import { isCypress } from './standaloneUtils'
 
 // might not resolve at all
 export const registerServiceWorker = async () => {
+  if (!('serviceWorker' in navigator) || process.env.SINGLE_FILE_BUILD) return
   if (process.env.DISABLE_SERVICE_WORKER) return
-  if (!('serviceWorker' in navigator)) return
   if (!isCypress() && process.env.NODE_ENV !== 'development') {
     return new Promise<void>(resolve => {
       window.addEventListener('load', async () => {
diff --git a/src/shims/minecraftData.ts b/src/shims/minecraftData.ts
index c25bcfb0..e5097d0f 100644
--- a/src/shims/minecraftData.ts
+++ b/src/shims/minecraftData.ts
@@ -1,7 +1,8 @@
 import { versionToNumber } from 'renderer/viewer/prepare/utils'
-import JsonOptimizer from '../optimizeJson'
+import { restoreMinecraftData } from '../optimizeJson'
 // import minecraftInitialDataJson from '../../generated/minecraft-initial-data.json'
 import { toMajorVersion } from '../utils'
+import { importLargeData } from '../../generated/large-data-aliases'
 
 const customResolver = () => {
   const resolver = Promise.withResolvers()
@@ -22,7 +23,7 @@ const optimizedDataResolver = customResolver()
 window._MC_DATA_RESOLVER = optimizedDataResolver
 window._LOAD_MC_DATA = async () => {
   if (optimizedDataResolver.resolvedData) return
-  optimizedDataResolver.resolve(await import('../../generated/minecraft-data-optimized.json'))
+  optimizedDataResolver.resolve(await importLargeData('mcData'))
 }
 
 // 30 seconds
@@ -53,7 +54,7 @@ const possiblyGetFromCache = (version: string) => {
 
       const data = optimizedDataResolver.resolvedData[dataType]
       if (data.__IS_OPTIMIZED__) {
-        allRestored[dataType] = JsonOptimizer.restoreData(data, version)
+        allRestored[dataType] = restoreMinecraftData(optimizedDataResolver.resolvedData, dataType, version)
       } else {
         allRestored[dataType] = data[version] ?? data[toMajorVersion(version)]
       }

From 87e5ae253db20685b6e8e68378f06ec317a72c30 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 12 Mar 2025 00:14:16 +0300
Subject: [PATCH 329/753] simplify panorama, sfp fixes!

---
 renderer/viewer/lib/worldrendererCommon.ts |  8 ++++
 rsbuild.config.ts                          |  2 +-
 src/panorama.ts                            | 52 ++++++----------------
 3 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 3852e535..6ccbdca5 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -339,6 +339,14 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.version = version
     this.texturesVersion = texturesVersion
     this.resetWorld()
+
+    // for workers in single file build
+    if (document.readyState === 'loading') {
+      await new Promise(resolve => {
+        document.addEventListener('DOMContentLoaded', resolve)
+      })
+    }
+
     this.initWorkers()
     this.active = true
     this.mesherConfig.outputFormat = this.outputFormat
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index fede0309..1701fc5c 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -208,7 +208,7 @@ const appConfig = defineConfig({
                             let html = fs.readFileSync(singleBuildHtml, 'utf8')
                             const verToMajor = (ver: string) => ver.split('.').slice(0, 2).join('.')
                             const supportedMajorVersions = [...new Set(supportedVersions.map(a => verToMajor(a)))].join(', ')
-                            html = `<!DOCTYPE html><!-- MINECRAFT WEB CLIENT ${releaseTag} -->\n<!-- A true SINGLE FILE BUILD with built-in server -->\n<!-- All textures, assets and Minecraft data for ${supportedMajorVersions} inlined into one file. -->\n${html}`
+                            html = `<!DOCTYPE html><!-- MINECRAFT WEB CLIENT ${releaseTag ?? ''} -->\n<!-- A true SINGLE FILE BUILD with built-in server -->\n<!-- All textures, assets and Minecraft data for ${supportedMajorVersions} inlined into one file. -->\n${html}`
 
                             const resizedImage = (await (sharp('./assets/favicon.png') as any).resize(64).toBuffer()).toString('base64')
                             html = html.replace('favicon.png', `data:image/png;base64,${resizedImage}`)
diff --git a/src/panorama.ts b/src/panorama.ts
index 24ad0384..65678a6a 100644
--- a/src/panorama.ts
+++ b/src/panorama.ts
@@ -1,22 +1,19 @@
 //@ts-check
 
 import { join } from 'path'
-import fs from 'fs'
 import * as THREE from 'three'
-import { subscribeKey } from 'valtio/utils'
 import { EntityMesh } from 'renderer/viewer/lib/entity/EntityMesh'
 import { WorldDataEmitter } from 'renderer/viewer'
 import { Vec3 } from 'vec3'
 import { getSyncWorld } from 'renderer/playground/shared'
 import * as tweenJs from '@tweenjs/tween.js'
-import { fromTexturePackPath, resourcePackState } from './resourcePack'
-import { options, watchValue } from './optionsStorage'
+import { subscribeKey } from 'valtio/utils'
+import { options } from './optionsStorage'
 import { miscUiState } from './globalState'
 import { loadMinecraftData } from './connect'
 
 let panoramaCubeMap
 let shouldDisplayPanorama = false
-let panoramaUsesResourcePack = null as boolean | null
 
 const panoramaFiles = [
   'panorama_3.png', // right (+x)
@@ -27,45 +24,17 @@ const panoramaFiles = [
   'panorama_2.png', // back (-z)
 ]
 
-const panoramaResourcePackPath = 'assets/minecraft/textures/gui/title/background'
-const possiblyLoadPanoramaFromResourcePack = async (file) => {
-  let base64Texture
-  if (panoramaUsesResourcePack) {
-    try {
-      // TODO!
-      // base64Texture = await fs.promises.readFile(fromTexturePackPath(join(panoramaResourcePackPath, file)), 'base64')
-    } catch (err) {
-      panoramaUsesResourcePack = false
-    }
-  }
-  if (base64Texture) return `data:image/png;base64,${base64Texture}`
-  else return join('background', file)
-}
-
-const updateResourcePackSupportPanorama = async () => {
-  try {
-    // TODO!
-    // await fs.promises.readFile(fromTexturePackPath(join(panoramaResourcePackPath, panoramaFiles[0])), 'base64')
-    // panoramaUsesResourcePack = true
-  } catch (err) {
-    panoramaUsesResourcePack = false
-  }
-}
-
-setTimeout(() => {
-  // after viewer is initialized
-  void addPanoramaCubeMap()
-}, 0)
-
 let unloadPanoramaCallbacks = [] as Array<() => void>
 
 // Menu panorama background
 // TODO-low use abort controller
 export async function addPanoramaCubeMap () {
   if (panoramaCubeMap || miscUiState.loadedDataVersion || options.disableAssets) return
+  await new Promise(resolve => {
+    setTimeout(resolve, 0) // wait for viewer to be initialized
+  })
   viewer.camera.fov = 85
-  await updateResourcePackSupportPanorama()
-  if (process.env.SINGLE_FILE_BUILD_MODE && !panoramaUsesResourcePack) {
+  if (process.env.SINGLE_FILE_BUILD_MODE) {
     void initDemoWorld()
     return
   }
@@ -82,7 +51,7 @@ export async function addPanoramaCubeMap () {
   const loader = new THREE.TextureLoader()
   const panorMaterials = [] as THREE.MeshBasicMaterial[]
   for (const file of panoramaFiles) {
-    const texture = loader.load(await possiblyLoadPanoramaFromResourcePack(file))
+    const texture = loader.load(join('background', file))
 
     // Instead of using repeat/offset to flip, we'll use the texture matrix
     texture.matrixAutoUpdate = false
@@ -133,6 +102,13 @@ export async function addPanoramaCubeMap () {
   panoramaCubeMap = group
 }
 
+subscribeKey(miscUiState, 'fsReady', () => {
+  if (miscUiState.fsReady) {
+    // don't do it earlier to load fs and display menu faster
+    void addPanoramaCubeMap()
+  }
+})
+
 export function removePanorama () {
   for (const unloadPanoramaCallback of unloadPanoramaCallbacks) {
     unloadPanoramaCallback()

From 10ed5b6dfb1fc637014335e9985101c9162471a0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 12 Mar 2025 00:17:24 +0300
Subject: [PATCH 330/753] update to wss

---
 config.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.json b/config.json
index 4b3c1e69..532ed9c7 100644
--- a/config.json
+++ b/config.json
@@ -7,14 +7,14 @@
   "peerJsServerFallback": "https://p2p.mcraft.fun",
   "promoteServers": [
     {
-      "ip": "ws://mcraft.ryzyn.xyz",
+      "ip": "wss://mcraft.ryzyn.xyz",
       "version": "1.19.4"
     },
     {
-      "ip": "ws://play.mcraft.fun"
+      "ip": "wss://play.mcraft.fun"
     },
     {
-      "ip": "ws://play2.mcraft.fun"
+      "ip": "wss://play2.mcraft.fun"
     },
     {
       "ip": "kaboom.pw",

From 78313ee225ad1eed1c300344f0e964f7c8ad8e16 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 12 Mar 2025 01:55:18 +0300
Subject: [PATCH 331/753] fix more annoying crash edge cases

---
 package.json            |  2 +-
 pnpm-lock.yaml          | 10 +++++-----
 src/react/AppStatus.tsx | 11 ++++++++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index e0b90b8a..36fe2218 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
     "mc-assets": "^0.2.42",
-    "mineflayer-mouse": "^0.0.7",
+    "mineflayer-mouse": "^0.0.8",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a3979e38..c5a4459e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -362,8 +362,8 @@ importers:
         specifier: github:zardoy/mineflayer
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.0.7
-        version: 0.0.7(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+        specifier: ^0.0.8
+        version: 0.0.8(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -6916,8 +6916,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.0.7:
-    resolution: {integrity: sha512-/cSDsc2ZPlvakc3BX+/K9VD64HAIa+LGiz34RpQvUy7hwx3nXdZjJHDjzEdn86BBzRF5pZOxIoXm8hlZKCYeeQ==}
+  mineflayer-mouse@0.0.8:
+    resolution: {integrity: sha512-Y6TfclMjx7ndV+ISznJsQ4SMwzjhYvwvkj8kKBsQXx9/bG6fDtkgfnAroO/f2ppV52WNrtERQlVXYs35gHtIFg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.4:
@@ -17949,7 +17949,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.0.7(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  mineflayer-mouse@0.0.8(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
     dependencies:
       change-case: 5.4.4
       debug: 4.4.0(supports-color@8.1.1)
diff --git a/src/react/AppStatus.tsx b/src/react/AppStatus.tsx
index 4f981ade..d44e973a 100644
--- a/src/react/AppStatus.tsx
+++ b/src/react/AppStatus.tsx
@@ -71,7 +71,16 @@ export default ({
         <>
           {showReconnect && onReconnect && <Button label="Reconnect" onClick={onReconnect} />}
           {actionsSlot}
-          <Button onClick={() => window.location.reload()} label="Reset App (recommended)" />
+          <Button
+            onClick={() => {
+              if (location.search) {
+                location.search = ''
+              } else {
+                window.location.reload()
+              }
+            }}
+            label="Reset App (recommended)"
+          />
           {!lockConnect && backAction && <Button label="Back" onClick={backAction} />}
         </>
       )}

From fbb3d08bfa8317b19270d7edbf83884352bbe894 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 12 Mar 2025 15:59:26 +0300
Subject: [PATCH 332/753] use 1.19.4 as version by default because of known
 issues of configuration stage (like auth doesnt work with some bungee setups,
 incorrect re-login handling)

---
 src/connect.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/connect.ts b/src/connect.ts
index 7557bf5b..278c2925 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -36,7 +36,7 @@ export type ConnectOptions = {
 
 export const getVersionAutoSelect = (autoVersionSelect = options.serversAutoVersionSelect) => {
   if (autoVersionSelect === 'auto') {
-    return '1.20.4'
+    return '1.19.4'
   }
   if (autoVersionSelect === 'latest') {
     return supportedVersions.at(-1)!

From ad13ab83f2457f689f92cc260bf5aba60613089b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 12 Mar 2025 19:17:02 +0300
Subject: [PATCH 333/753] load panorama earlier

---
 src/panorama.ts | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/panorama.ts b/src/panorama.ts
index 65678a6a..a0d30fb4 100644
--- a/src/panorama.ts
+++ b/src/panorama.ts
@@ -102,12 +102,16 @@ export async function addPanoramaCubeMap () {
   panoramaCubeMap = group
 }
 
-subscribeKey(miscUiState, 'fsReady', () => {
-  if (miscUiState.fsReady) {
-    // don't do it earlier to load fs and display menu faster
-    void addPanoramaCubeMap()
-  }
-})
+if (process.env.SINGLE_FILE_BUILD_MODE) {
+  subscribeKey(miscUiState, 'fsReady', () => {
+    if (miscUiState.fsReady) {
+      // don't do it earlier to load fs and display menu faster
+      void addPanoramaCubeMap()
+    }
+  })
+} else {
+  void addPanoramaCubeMap()
+}
 
 export function removePanorama () {
   for (const unloadPanoramaCallback of unloadPanoramaCallbacks) {
@@ -124,6 +128,7 @@ export function removePanorama () {
 }
 
 const initDemoWorld = async () => {
+  if (!shouldDisplayPanorama) return
   const abortController = new AbortController()
   unloadPanoramaCallbacks.push(() => {
     abortController.abort()

From 214828df0c0df7a6782b66feb023e2cc7aa3633e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 13 Mar 2025 20:46:48 +0300
Subject: [PATCH 334/753] add option to enable/disable jei even depending on
 gamemode

---
 src/inventoryWindows.ts | 29 +++++++++++++++++++----------
 src/optionsStorage.ts   |  1 +
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 6a5ab0d6..f6737a12 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -458,16 +458,25 @@ const openWindow = (type: string | undefined) => {
     }
   }
 
-  // if (bot.game.gameMode !== 'spectator') {
-  lastWindow.pwindow.win.jeiSlotsPage = 0
-  // todo workaround so inventory opens immediately (though it still lags)
-  setTimeout(() => {
-    upJei('')
-  })
-  miscUiState.displaySearchInput = true
-  // } else {
-  //   lastWindow.pwindow.win.jeiSlots = []
-  // }
+  const isJeiEnabled = () => {
+    if (typeof options.jeiEnabled === 'boolean') return options.jeiEnabled
+    if (Array.isArray(options.jeiEnabled)) {
+      return options.jeiEnabled.includes(bot.game?.gameMode as any)
+    }
+    return false
+  }
+
+  if (isJeiEnabled()) {
+    lastWindow.pwindow.win.jeiSlotsPage = 0
+    // todo workaround so inventory opens immediately (though it still lags)
+    setTimeout(() => {
+      upJei('')
+    })
+    miscUiState.displaySearchInput = true
+  } else {
+    lastWindow.pwindow.win.jeiSlots = []
+    miscUiState.displaySearchInput = false
+  }
 
   if (type === undefined) {
     // player inventory
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 1c5c999e..ef397238 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -63,6 +63,7 @@ const defaultOptions = {
   preciseMouseInput: false,
   // todo ui setting, maybe enable by default?
   waitForChunksRender: 'sp-only' as 'sp-only' | boolean,
+  jeiEnabled: true as boolean | Array<'creative' | 'survival' | 'adventure' | 'spectator'>,
 
   // antiAliasing: false,
 

From e1831eea38278244556f5c47c935e56adb93c535 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 13 Mar 2025 20:59:07 +0300
Subject: [PATCH 335/753] fix placing panorama after login (again)

---
 src/panorama.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/panorama.ts b/src/panorama.ts
index a0d30fb4..7fdd72b7 100644
--- a/src/panorama.ts
+++ b/src/panorama.ts
@@ -13,7 +13,7 @@ import { miscUiState } from './globalState'
 import { loadMinecraftData } from './connect'
 
 let panoramaCubeMap
-let shouldDisplayPanorama = false
+let shouldDisplayPanorama = true
 
 const panoramaFiles = [
   'panorama_3.png', // right (+x)
@@ -34,13 +34,12 @@ export async function addPanoramaCubeMap () {
     setTimeout(resolve, 0) // wait for viewer to be initialized
   })
   viewer.camera.fov = 85
+  if (!shouldDisplayPanorama) return
   if (process.env.SINGLE_FILE_BUILD_MODE) {
     void initDemoWorld()
     return
   }
 
-  shouldDisplayPanorama = true
-
   let time = 0
   viewer.camera.near = 0.05
   viewer.camera.updateProjectionMatrix()
@@ -128,7 +127,6 @@ export function removePanorama () {
 }
 
 const initDemoWorld = async () => {
-  if (!shouldDisplayPanorama) return
   const abortController = new AbortController()
   unloadPanoramaCallbacks.push(() => {
     abortController.abort()

From 09e61c9aa010a548b38c696eb3ff4380e24fb713 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 13 Mar 2025 21:57:50 +0300
Subject: [PATCH 336/753] fix: cancel block placements in adventure and when
 interaction is expected eg crafting table!

---
 package.json   |  2 +-
 pnpm-lock.yaml | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 36fe2218..a1fcff61 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
     "mc-assets": "^0.2.42",
-    "mineflayer-mouse": "^0.0.8",
+    "mineflayer-mouse": "^0.0.9",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c5a4459e..02a0a671 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -362,8 +362,8 @@ importers:
         specifier: github:zardoy/mineflayer
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.0.8
-        version: 0.0.8(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+        specifier: ^0.0.9
+        version: 0.0.9(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -6916,8 +6916,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.0.8:
-    resolution: {integrity: sha512-Y6TfclMjx7ndV+ISznJsQ4SMwzjhYvwvkj8kKBsQXx9/bG6fDtkgfnAroO/f2ppV52WNrtERQlVXYs35gHtIFg==}
+  mineflayer-mouse@0.0.9:
+    resolution: {integrity: sha512-oViJrou2tziPuox/ZFJWZJMCnaF5+KPEsrbBgKmXVr3eK35iPohdhYwoKgqgBY8uXS/bNaFnkCR0K7ZDqyBF8g==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.4:
@@ -17949,10 +17949,11 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.0.8(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  mineflayer-mouse@0.0.9(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
     dependencies:
       change-case: 5.4.4
       debug: 4.4.0(supports-color@8.1.1)
+      prismarine-item: 1.16.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vitest: 3.0.7(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
     transitivePeerDependencies:

From c947b285ea01890ef228e67928f33e7c9b890600 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 13 Mar 2025 23:06:41 +0300
Subject: [PATCH 337/753] fix: fix action bar text was not visible on ios (when
 landscape)

---
 src/react/HudBarsProvider.tsx | 2 +-
 src/react/Title.css           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/react/HudBarsProvider.tsx b/src/react/HudBarsProvider.tsx
index ea78ae08..db061500 100644
--- a/src/react/HudBarsProvider.tsx
+++ b/src/react/HudBarsProvider.tsx
@@ -90,7 +90,7 @@ export default () => {
     upArmour()
   }, [])
 
-  return <div>
+  return <div className='hud-bars-container'>
     <HealthBar
       gameMode={gameMode}
       isHardcore={isHardcore}
diff --git a/src/react/Title.css b/src/react/Title.css
index 3f078a1d..289b3a2a 100644
--- a/src/react/Title.css
+++ b/src/react/Title.css
@@ -34,7 +34,7 @@
 
 .action-bar {
     position: fixed;
-    bottom: 20%;
+    bottom: calc(var(--safe-area-inset-bottom)  + 60px);
     left: 0;
     right: 0;
     font-size: 0.7rem;

From 1267dcceae18ef71e3308cee106ed3d11688caa3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 13 Mar 2025 23:11:12 +0300
Subject: [PATCH 338/753] fix: reconnect button sometimes was not displayed

---
 src/builtinCommands.ts     |  9 +++++----
 src/index.ts               |  6 ++++--
 src/inventoryWindows.ts    | 12 ++++++++++--
 src/react/ChatProvider.tsx |  2 +-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts
index 4bc21a73..278ff57f 100644
--- a/src/builtinCommands.ts
+++ b/src/builtinCommands.ts
@@ -79,8 +79,9 @@ const writeText = (text) => {
   displayClientChat(text)
 }
 
-const commands: Array<{
+export const commands: Array<{
   command: string[],
+  alwaysAvailable?: boolean,
   invoke (args: string[]): Promise<void> | void
   //@ts-format-ignore-region
 }> = [
@@ -111,6 +112,7 @@ const commands: Array<{
   },
   {
     command: ['/pos'],
+    alwaysAvailable: true,
     async invoke ([type]) {
       let pos: { x: number, y: number, z: number } | undefined
       if (type === 'block') {
@@ -131,13 +133,12 @@ const commands: Array<{
 ]
 //@ts-format-ignore-endregion
 
-export const getBuiltinCommandsList = () => commands.flatMap(command => command.command)
+export const getBuiltinCommandsList = () => commands.filter(command => command.alwaysAvailable || localServer).flatMap(command => command.command)
 
 export const tryHandleBuiltinCommand = (message: string) => {
-  if (!localServer) return
   const [userCommand, ...args] = message.split(' ')
 
-  for (const command of commands) {
+  for (const command of commands.filter(command => command.alwaysAvailable || localServer)) {
     if (command.command.includes(userCommand)) {
       void command.invoke(args) // ignoring for now
       return true
diff --git a/src/index.ts b/src/index.ts
index 812b8c51..ab055ce6 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -362,6 +362,7 @@ export async function connect (connectOptions: ConnectOptions) {
     miscUiState.hasErrors = true
     if (miscUiState.gameLoaded) return
 
+    appStatusState.showReconnect = true
     setLoadingScreenStatus(`Error encountered. ${err}`, true)
     onPossibleErrorDisconnect()
     destroyAll()
@@ -711,6 +712,7 @@ export async function connect (connectOptions: ConnectOptions) {
   bot.on('kicked', (kickReason) => {
     console.log('You were kicked!', kickReason)
     const { formatted: kickReasonFormatted, plain: kickReasonString } = parseFormattedMessagePacket(kickReason)
+    appStatusState.showReconnect = true
     setLoadingScreenStatus(`The Minecraft server kicked you. Kick reason: ${kickReasonString}`, true, undefined, undefined, kickReasonFormatted)
     destroyAll()
   })
@@ -894,8 +896,8 @@ export async function connect (connectOptions: ConnectOptions) {
 const reconnectOptions = sessionStorage.getItem('reconnectOptions') ? JSON.parse(sessionStorage.getItem('reconnectOptions')!) : undefined
 
 listenGlobalEvents()
-const unsubscribe = watchValue(miscUiState, async s => {
-  if (s.fsReady && s.appConfig) {
+const unsubscribe = subscribe(miscUiState, async () => {
+  if (miscUiState.fsReady && miscUiState.appConfig) {
     unsubscribe()
     if (reconnectOptions) {
       sessionStorage.removeItem('reconnectOptions')
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index f6737a12..6fd35611 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -37,6 +37,10 @@ export const allImagesLoadedState = proxy({
   value: false
 })
 
+export const jeiCustomCategories = proxy({
+  value: [] as Array<{ id: string, categoryTitle: string, items: any[] }>
+})
+
 export const onGameLoad = (onLoad) => {
   allImagesLoadedState.value = false
   version = bot.version
@@ -324,9 +328,13 @@ const implementedContainersGuiMap = {
 const upJei = (search: string) => {
   search = search.toLowerCase()
   // todo fix pre flat
-  const matchedSlots = loadedData.itemsArray.map(x => {
+  const itemsArray = [
+    ...jeiCustomCategories.value.flatMap(x => x.items).filter(x => x !== null),
+    ...loadedData.itemsArray.filter(x => x.displayName.toLowerCase().includes(search)).map(item => new PrismarineItem(item.id, 1)).filter(x => x !== null)
+  ]
+  const matchedSlots = itemsArray.map(x => {
     if (!x.displayName.toLowerCase().includes(search)) return null
-    return new PrismarineItem(x.id, 1)
+    return x
   }).filter(a => a !== null)
   lastWindow.pwindow.win.jeiSlotsPage = 0
   lastWindow.pwindow.win.jeiSlots = mapSlots(matchedSlots, true)
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index e261c086..cf849df7 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -88,7 +88,7 @@ export default () => {
             // normalize
             items = items.map(item => `/${item}`)
           }
-          if (localServer) {
+          if (items.length) {
             items = [...items, ...getBuiltinCommandsList()]
           }
         }

From d921977cafc28a46749c738692e43f45b8ecee90 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 13 Mar 2025 23:21:50 +0300
Subject: [PATCH 339/753] on item giving preserve all metadata & nbt

---
 src/inventoryWindows.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 6fd35611..c2a1d353 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -456,7 +456,15 @@ const openWindow = (type: string | undefined) => {
       inGameError(`Item for block ${slotItem.name} not found`)
       return
     }
-    const item = new PrismarineItem(itemId, isRightclick ? 64 : 1, slotItem.metadata)
+    const item = PrismarineItem.fromNotch({
+      ...slotItem,
+      itemId,
+      itemCount: isRightclick ? 64 : 1,
+      components: slotItem.components ?? [],
+      removeComponents: slotItem.removedComponents ?? [],
+      itemDamage: slotItem.metadata ?? 0,
+      nbt: slotItem.nbt,
+    })
     if (bot.game.gameMode === 'creative') {
       const freeSlot = bot.inventory.firstEmptyInventorySlot()
       if (freeSlot === null) return

From 91dc4d1007c92aabe4c0dd2083e326990994ed5a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 13 Mar 2025 23:27:44 +0300
Subject: [PATCH 340/753] fix build info alert

---
 src/react/MainMenu.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 09214af2..267e5c4b 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -62,8 +62,9 @@ export default ({
 
   const versionLongPress = useLongPress(
     () => {
-      const buildDate = process.env.BUILD_VERSION ? new Date(process.env.BUILD_VERSION) : null
-      alert(`BUILD INFO:\n${buildDate?.toLocaleString() || 'Development build'}`)
+      const buildDate = process.env.BUILD_VERSION ? new Date(process.env.BUILD_VERSION + ':00:00.000Z') : null
+      const hoursAgo = buildDate ? Math.round((Date.now() - buildDate.getTime()) / (1000 * 60 * 60)) : null
+      alert(`BUILD DATE:\n${buildDate?.toLocaleString() || 'Development build'}${hoursAgo ? `\nBuilt ${hoursAgo} hours ago` : ''}`)
     },
     () => onVersionTextClick?.(),
   )

From a8564232f7189a01b92e1a37d2b74b9849c8eed6 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 14 Mar 2025 01:36:14 +0300
Subject: [PATCH 341/753] fix: make chat arrows work on ios fix: disable
 annoying in many cases auto correct on ios (more annoying than useful
 especially in commands) fix: make stats dont overlap with chat fix: fix
 edgecases when focusing on chat was not possible on mobile

---
 renderer/viewer/lib/ui/newStats.ts |  2 +-
 src/index.ts                       |  1 +
 src/optionsStorage.ts              |  2 +-
 src/react/Chat.css                 | 23 +++++++++----
 src/react/Chat.tsx                 | 54 ++++++++++++++++++++----------
 5 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/renderer/viewer/lib/ui/newStats.ts b/renderer/viewer/lib/ui/newStats.ts
index fff4d28c..d18ad16c 100644
--- a/renderer/viewer/lib/ui/newStats.ts
+++ b/renderer/viewer/lib/ui/newStats.ts
@@ -3,7 +3,7 @@ const rightOffset = 0
 
 const stats = {}
 
-let lastY = 20
+let lastY = 40
 export const addNewStat = (id: string, width = 80, x = rightOffset, y = lastY) => {
   const pane = document.createElement('div')
   pane.style.position = 'fixed'
diff --git a/src/index.ts b/src/index.ts
index ab055ce6..67187c1c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -829,6 +829,7 @@ export async function connect (connectOptions: ConnectOptions) {
     if (appStatusState.isError) return
 
     const waitForChunks = async () => {
+      if (appQueryParams.sp === '1') return //todo
       const waitForChunks = options.waitForChunksRender === 'sp-only' ? !!singleplayer : options.waitForChunksRender
       if (viewer.world.allChunksFinished || !waitForChunks) {
         return
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index ef397238..d8d72809 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -165,7 +165,7 @@ const migrateOptions = (options: Partial<AppOptions & Record<string, any>>) => {
 export type AppOptions = typeof defaultOptions
 
 // when opening html file locally in browser, localStorage is shared between all ever opened html files, so we try to avoid conflicts
-const localStorageKey = process.env.SINGLE_FILE_BUILD ? 'minecraftWebClientOptions' : 'options'
+const localStorageKey = process.env?.SINGLE_FILE_BUILD ? 'minecraftWebClientOptions' : 'options'
 export const options: AppOptions = proxy({
   ...defaultOptions,
   ...initialAppConfig.defaultSettings,
diff --git a/src/react/Chat.css b/src/react/Chat.css
index 141524af..601e4ce3 100644
--- a/src/react/Chat.css
+++ b/src/react/Chat.css
@@ -29,6 +29,12 @@ div.chat-wrapper {
   gap: 1px;
 }
 
+.chat-submit-button {
+  visibility: hidden;
+  position: absolute;
+  pointer-events: none !important;
+}
+
 .chat-input-wrapper form {
   display: flex;
 }
@@ -157,17 +163,22 @@ input[type=text],
   height: 15px;
 }
 
-.chat-mobile-hidden {
-  width: 8px;
-  height: 0;
+.chat-mobile-input-hidden {
   position: absolute;
+  width: 8px;
+  height: 1px !important;
   display: block !important;
   opacity: 0;
-  pointer-events: none;
+  height: 1px !important;
+  /* ios: using z-index, pointer-events: none or top below -10px breaks arrows */
 }
 
-.chat-mobile-hidden:nth-last-child(1) {
-  height: 8px;
+.chat-mobile-input-hidden-up {
+  top: -10px;
+}
+
+.chat-mobile-input-hidden-down {
+  top: -5px;
 }
 
 #chatinput:focus {
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 129bfee1..78c69bec 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -71,6 +71,8 @@ export default ({
 }: Props) => {
   const sendHistoryRef = useRef(JSON.parse(window.sessionStorage.chatHistory || '[]'))
   const [isInputFocused, setIsInputFocused] = useState(false)
+  // const [spellCheckEnabled, setSpellCheckEnabled] = useState(false)
+  const spellCheckEnabled = false
 
   const [completePadText, setCompletePadText] = useState('')
   const completeRequestValue = useRef('')
@@ -107,9 +109,28 @@ export default ({
     }, 0)
   }
 
-  const auxInputFocus = (fireKey: string) => {
+  const handleArrowUp = () => {
+    if (chatHistoryPos.current === 0) return
+    if (chatHistoryPos.current === sendHistoryRef.current.length) { // started navigating history
+      inputCurrentlyEnteredValue.current = chatInput.current.value
+    }
+    chatHistoryPos.current--
+    updateInputValue(sendHistoryRef.current[chatHistoryPos.current] || '')
+  }
+
+  const handleArrowDown = () => {
+    if (chatHistoryPos.current === sendHistoryRef.current.length) return
+    chatHistoryPos.current++
+    updateInputValue(sendHistoryRef.current[chatHistoryPos.current] || inputCurrentlyEnteredValue.current || '')
+  }
+
+  const auxInputFocus = (direction: 'up' | 'down') => {
     chatInput.current.focus()
-    chatInput.current.dispatchEvent(new KeyboardEvent('keydown', { code: fireKey, bubbles: true }))
+    if (direction === 'up') {
+      handleArrowUp()
+    } else {
+      handleArrowDown()
+    }
   }
 
   useEffect(() => {
@@ -125,6 +146,7 @@ export default ({
     if (opened) {
       updateInputValue(chatInputValueGlobal.value)
       chatInputValueGlobal.value = ''
+      chatHistoryPos.current = sendHistoryRef.current.length
       if (!usingTouch) {
         chatInput.current.focus()
       }
@@ -167,6 +189,8 @@ export default ({
   const onMainInputChange = () => {
     const completeValue = getCompleteValue()
     setCompletePadText(completeValue === '/' ? '' : completeValue)
+    // not sure if enabling would be useful at all (maybe make as a setting in the future?)
+    // setSpellCheckEnabled(!chatInput.current.value.startsWith('/'))
     if (completeRequestValue.current === completeValue) {
       updateFilteredCompleteItems(completionItemsSource)
       return
@@ -271,20 +295,23 @@ export default ({
             {isIos && <input
               value=''
               type="text"
-              className="chat-mobile-hidden"
+              className="chat-mobile-input-hidden chat-mobile-input-hidden-up"
               id="chatinput-next-command"
               spellCheck={false}
               autoComplete="off"
-              onFocus={() => auxInputFocus('ArrowUp')}
+              onFocus={() => auxInputFocus('up')}
               onChange={() => { }}
             />}
             <input
               defaultValue=''
+              // ios doesn't support toggling autoCorrect on the fly so we need to re-create the input
+              key={spellCheckEnabled ? 'true' : 'false'}
               ref={chatInput}
               type="text"
               className="chat-input"
               id="chatinput"
-              spellCheck={false}
+              spellCheck={spellCheckEnabled}
+              autoCorrect={spellCheckEnabled ? 'on' : 'off'}
               autoComplete="off"
               aria-autocomplete="both"
               onChange={onMainInputChange}
@@ -294,16 +321,9 @@ export default ({
               onBlur={() => setIsInputFocused(false)}
               onKeyDown={(e) => {
                 if (e.code === 'ArrowUp') {
-                  if (chatHistoryPos.current === 0) return
-                  if (chatHistoryPos.current === sendHistoryRef.current.length) { // started navigating history
-                    inputCurrentlyEnteredValue.current = e.currentTarget.value
-                  }
-                  chatHistoryPos.current--
-                  updateInputValue(sendHistoryRef.current[chatHistoryPos.current] || '')
+                  handleArrowUp()
                 } else if (e.code === 'ArrowDown') {
-                  if (chatHistoryPos.current === sendHistoryRef.current.length) return
-                  chatHistoryPos.current++
-                  updateInputValue(sendHistoryRef.current[chatHistoryPos.current] || inputCurrentlyEnteredValue.current || '')
+                  handleArrowDown()
                 }
                 if (e.code === 'Tab') {
                   if (completionItemsSource.length) {
@@ -327,15 +347,15 @@ export default ({
             {isIos && <input
               value=''
               type="text"
-              className="chat-mobile-hidden"
+              className="chat-mobile-input-hidden chat-mobile-input-hidden-down"
               id="chatinput-prev-command"
               spellCheck={false}
               autoComplete="off"
-              onFocus={() => auxInputFocus('ArrowDown')}
+              onFocus={() => auxInputFocus('down')}
               onChange={() => { }}
             />}
             {/* for some reason this is needed to make Enter work on android chrome */}
-            <button type='submit' style={{ visibility: 'hidden' }} />
+            <button type='submit' className="chat-submit-button" />
           </form>
         </div>
       </div>

From 09cd2c3f644c0cd52d53778aaa167a3c050e06ad Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 14 Mar 2025 01:50:54 +0300
Subject: [PATCH 342/753] fix(guiRenderer): dont break textures with custom
 namespaces rendering

---
 renderer/viewer/lib/guiRenderer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/guiRenderer.ts b/renderer/viewer/lib/guiRenderer.ts
index f4af3d20..d2987ce6 100644
--- a/renderer/viewer/lib/guiRenderer.ts
+++ b/renderer/viewer/lib/guiRenderer.ts
@@ -155,7 +155,7 @@ const generateItemsGui = async (models: Record<string, BlockModelMcAssets>, isIt
       return null
     },
     getTextureUV (texture) {
-      return textureAtlas.getTextureUV(texture.toString().slice(1).split('/').slice(1).join('/') as any)
+      return textureAtlas.getTextureUV(texture.toString().replace('minecraft:', '').replace('block/', '').replace('item/', '').replace('blocks/', '').replace('items/', '') as any)
     },
     getTextureAtlas () {
       return textureAtlas.getTextureAtlas()

From 518d6ad8661079eb84d948917a1fbb9a80a14130 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 14 Mar 2025 02:13:04 +0300
Subject: [PATCH 343/753] fix always display reconnect and better last packets
 display (time)

---
 package.json                               |  2 +-
 pnpm-lock.yaml                             | 12 ++++++------
 src/index.ts                               |  4 ++--
 src/mineflayer/plugins/packetsRecording.ts |  2 ++
 src/packetsReplay/replayPackets.ts         | 11 +++++++++++
 src/react/ServersListProvider.tsx          |  2 +-
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index a1fcff61..f6ae254e 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "mojangson": "^2.0.4",
     "net-browserify": "github:zardoy/prismarinejs-net-browserify",
     "node-gzip": "^1.1.2",
-    "mcraft-fun-mineflayer": "^0.1.8",
+    "mcraft-fun-mineflayer": "^0.1.10",
     "peerjs": "^1.5.0",
     "pixelarticons": "^1.8.1",
     "pretty-bytes": "^6.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 02a0a671..2b09f583 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -135,8 +135,8 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       mcraft-fun-mineflayer:
-        specifier: ^0.1.8
-        version: 0.1.8(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13))
+        specifier: ^0.1.10
+        version: 0.1.10(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -6690,9 +6690,9 @@ packages:
     resolution: {integrity: sha512-j2D1RNYtB5Z9gFu9MVjyDBbiALI0mWZ3xW/A3PPefVAHm3HJ2T1vH+1XBov1spBGPl7u+Zo7mRXza3X0egbeOg==}
     engines: {node: '>=18.0.0'}
 
-  mcraft-fun-mineflayer@0.1.8:
-    resolution: {integrity: sha512-jyJTihNHfeToBPwVs3QMKBlVcaCABJ25YN2eoIBQEVTRVFzaXh13XRpElphLzTMj1Q5XFYqufHtMoR4tsb08qQ==}
-    version: 0.1.8
+  mcraft-fun-mineflayer@0.1.10:
+    resolution: {integrity: sha512-KHzPts82I39nTDZlGwqJo1JXLwaIUHphBbmGWv7oYztUrq3iPiJDEIFgst0ROO/apjtHjzbCM9eb19qWw1JM3Q==}
+    version: 0.1.10
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       '@roamhq/wrtc': '*'
@@ -17579,7 +17579,7 @@ snapshots:
       maxrects-packer: 2.7.3
       zod: 3.24.1
 
-  mcraft-fun-mineflayer@0.1.8(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.10(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
diff --git a/src/index.ts b/src/index.ts
index 67187c1c..83f9f289 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -362,8 +362,8 @@ export async function connect (connectOptions: ConnectOptions) {
     miscUiState.hasErrors = true
     if (miscUiState.gameLoaded) return
 
-    appStatusState.showReconnect = true
     setLoadingScreenStatus(`Error encountered. ${err}`, true)
+    appStatusState.showReconnect = true
     onPossibleErrorDisconnect()
     destroyAll()
   }
@@ -712,8 +712,8 @@ export async function connect (connectOptions: ConnectOptions) {
   bot.on('kicked', (kickReason) => {
     console.log('You were kicked!', kickReason)
     const { formatted: kickReasonFormatted, plain: kickReasonString } = parseFormattedMessagePacket(kickReason)
-    appStatusState.showReconnect = true
     setLoadingScreenStatus(`The Minecraft server kicked you. Kick reason: ${kickReasonString}`, true, undefined, undefined, kickReasonFormatted)
+    appStatusState.showReconnect = true
     destroyAll()
   })
 
diff --git a/src/mineflayer/plugins/packetsRecording.ts b/src/mineflayer/plugins/packetsRecording.ts
index f1ff18cf..a6b761e7 100644
--- a/src/mineflayer/plugins/packetsRecording.ts
+++ b/src/mineflayer/plugins/packetsRecording.ts
@@ -93,6 +93,8 @@ declare module 'mineflayer' {
 export const getLastAutoCapturedPackets = () => circularBuffer?.size
 export const downloadAutoCapturedPackets = () => {
   const logger = new PacketsLogger({ minecraftVersion: lastConnectVersion })
+  logger.relativeTime = false
+  logger.formattedTime = true
   for (const packet of circularBuffer?.getLastElements() ?? []) {
     logger.log(packet.isFromServer, { name: packet.name, state: packet.state, time: packet.timestamp }, packet.params)
   }
diff --git a/src/packetsReplay/replayPackets.ts b/src/packetsReplay/replayPackets.ts
index 9e777b38..13891899 100644
--- a/src/packetsReplay/replayPackets.ts
+++ b/src/packetsReplay/replayPackets.ts
@@ -188,6 +188,10 @@ const mainPacketsReplayer = async (client: ServerClient, packets: ParsedReplayPa
       }
 
       if (packet.isFromServer) {
+        if (packet.params === null) {
+          console.warn('packet.params is null', packet)
+          continue
+        }
         playServerPacket(packet.name, packet.params)
         await new Promise(resolve => {
           setTimeout(resolve, packet.diff * packetsReplayState.speed + ADDITIONAL_DELAY * (packetsReplayState.customButtons.packetsSenderDelay.state ? 1 : 0))
@@ -216,6 +220,7 @@ const mainPacketsReplayer = async (client: ServerClient, packets: ParsedReplayPa
               setTimeout(resolve, 1000)
             })] : [])
           ])
+          clientsPacketsWaiter.stopWaiting()
           clientPackets = []
         }
       }
@@ -236,6 +241,7 @@ interface PacketsWaiterOptions {
 interface PacketsWaiter {
   addPacket(name: string, params: any): void
   waitForPackets(packets: string[]): Promise<void>
+  stopWaiting(): void
 }
 
 const createPacketsWaiter = (options: PacketsWaiterOptions = {}): PacketsWaiter => {
@@ -296,6 +302,11 @@ const createPacketsWaiter = (options: PacketsWaiterOptions = {}): PacketsWaiter
         isWaiting = false
         packetHandler = null
       }
+    },
+    stopWaiting () {
+      isWaiting = false
+      packetHandler = null
+      queuedPackets.length = 0
     }
   }
 }
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index f0543e21..bf440c69 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -407,7 +407,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         worldNameRightGrayed: additional?.textNameRightGrayed ?? '',
         iconSrc: additional?.icon,
         offline: additional?.offline,
-        group: 'Custom Servers'
+        group: 'Your Servers'
       }
     })}
     initialProxies={{

From a67b9d7aa215bb8de6fd5c23b2cfd58e0ac14fea Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 14 Mar 2025 19:11:14 +0300
Subject: [PATCH 344/753] active back all vanilla mechanics like hotbar wheel
 when replay window is minimized

---
 src/react/ReplayPanel.tsx             | 8 +++++---
 src/react/state/packetsReplayState.ts | 1 +
 src/utils.ts                          | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/react/ReplayPanel.tsx b/src/react/ReplayPanel.tsx
index fd4082af..3b709882 100644
--- a/src/react/ReplayPanel.tsx
+++ b/src/react/ReplayPanel.tsx
@@ -1,9 +1,11 @@
 import { useState, useEffect } from 'react'
+import { useSnapshot } from 'valtio'
 import { filterPackets } from './packetsFilter'
 import { DARK_COLORS } from './components/replay/constants'
 import FilterInput from './components/replay/FilterInput'
 import PacketList from './components/replay/PacketList'
 import ProgressBar from './components/replay/ProgressBar'
+import { packetsReplayState } from './state/packetsReplayState'
 
 interface Props {
   replayName: string
@@ -41,7 +43,7 @@ export default function ReplayPanel ({
   style
 }: Props) {
   const [filter, setFilter] = useState(defaultFilter)
-  const [isMinimized, setIsMinimized] = useState(false)
+  const { isMinimized } = useSnapshot(packetsReplayState)
   const { filtered: filteredPackets, hiddenCount } = filterPackets(packets.slice(-500), filter)
 
   useEffect(() => {
@@ -50,7 +52,7 @@ export default function ReplayPanel ({
 
   const handlePlayPauseClick = () => {
     if (isMinimized) {
-      setIsMinimized(false)
+      packetsReplayState.isMinimized = false
     } else {
       onPlayPause?.(!isPlaying)
     }
@@ -113,7 +115,7 @@ export default function ReplayPanel ({
       <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
         <div style={{ fontSize: '12px', fontWeight: 'bold' }}>{replayName || 'Unnamed Replay'}</div>
         <button
-          onClick={() => setIsMinimized(true)}
+          onClick={() => { packetsReplayState.isMinimized = true }}
           style={{
             background: 'none',
             border: 'none',
diff --git a/src/react/state/packetsReplayState.ts b/src/react/state/packetsReplayState.ts
index 0ff475a9..5a612f43 100644
--- a/src/react/state/packetsReplayState.ts
+++ b/src/react/state/packetsReplayState.ts
@@ -5,6 +5,7 @@ import { appQueryParams, updateQsParam } from '../../appParams'
 export const packetsReplayState = proxy({
   packetsPlayback: [] as PacketData[],
   isOpen: false,
+  isMinimized: false,
   replayName: '',
   isPlaying: false,
   progress: {
diff --git a/src/utils.ts b/src/utils.ts
index 8039d403..6399a5c4 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -66,7 +66,7 @@ export const pointerLock = {
 }
 
 export const isInRealGameSession = () => {
-  return isGameActive(true) && !packetsReplayState.isOpen && !gameAdditionalState.viewerConnection
+  return isGameActive(true) && (!packetsReplayState.isOpen || packetsReplayState.isMinimized) && !gameAdditionalState.viewerConnection
 }
 
 window.getScreenRefreshRate = getScreenRefreshRate

From baa615887281fbcc25e9bdf48625d00d19e854c5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 14 Mar 2025 19:32:02 +0300
Subject: [PATCH 345/753] fix: support custom names search & display in jei

---
 src/inventoryWindows.ts | 1 +
 src/mineflayer/items.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index c2a1d353..052fc664 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -333,6 +333,7 @@ const upJei = (search: string) => {
     ...loadedData.itemsArray.filter(x => x.displayName.toLowerCase().includes(search)).map(item => new PrismarineItem(item.id, 1)).filter(x => x !== null)
   ]
   const matchedSlots = itemsArray.map(x => {
+    x.displayName = getItemName(x) ?? x.displayName
     if (!x.displayName.toLowerCase().includes(search)) return null
     return x
   }).filter(a => a !== null)
diff --git a/src/mineflayer/items.ts b/src/mineflayer/items.ts
index bb437ef4..3c2134f1 100644
--- a/src/mineflayer/items.ts
+++ b/src/mineflayer/items.ts
@@ -39,7 +39,7 @@ export const getItemMetadata = (item: GeneralInputItem) => {
 
     const customTextComponent = componentMap.get('custom_name') || componentMap.get('item_name')
     if (customTextComponent) {
-      customText = nbt.simplify(customTextComponent.data)
+      customText = typeof customTextComponent.data === 'string' ? customTextComponent.data : nbt.simplify(customTextComponent.data)
     }
     const customModelComponent = componentMap.get('item_model')
     if (customModelComponent) {

From 897c991a0eee6855ae9f89d6cb0c743616b660db Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 14 Mar 2025 19:53:59 +0300
Subject: [PATCH 346/753] fix: respect main menu links display from config
 (#308)

---
 src/react/MainMenu.tsx          | 14 ++-------
 src/react/MainMenuRenderApp.tsx |  2 --
 src/react/PauseLinkButtons.tsx  | 50 +++++++++++++++++++++++++++++++++
 src/react/PauseScreen.tsx       | 23 ++-------------
 4 files changed, 54 insertions(+), 35 deletions(-)
 create mode 100644 src/react/PauseLinkButtons.tsx

diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 267e5c4b..85c5367e 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -7,6 +7,7 @@ import Button from './Button'
 import ButtonWithTooltip from './ButtonWithTooltip'
 import { pixelartIcons } from './PixelartIcon'
 import useLongPress from './useLongPress'
+import PauseLinkButtons from './PauseLinkButtons'
 
 type Action = (e: React.MouseEvent<HTMLButtonElement>) => void
 
@@ -15,7 +16,6 @@ interface Props {
   singleplayerAction?: Action
   optionsAction?: Action
   githubAction?: Action
-  linksButton?: JSX.Element
   openFileAction?: Action
   mapsProvider?: string
   versionStatus?: string
@@ -35,7 +35,6 @@ export default ({
   singleplayerAction,
   optionsAction,
   githubAction,
-  linksButton,
   openFileAction,
   versionText,
   onVersionTextClick,
@@ -144,16 +143,7 @@ export default ({
           Options
         </Button>
         <div className={styles['menu-row']}>
-          <ButtonWithTooltip
-            initialTooltip={{
-              content: 'Report bugs or request features!',
-            }}
-            style={{ width: '98px' }}
-            onClick={githubAction}
-          >
-            GitHub
-          </ButtonWithTooltip>
-          {linksButton}
+          <PauseLinkButtons />
         </div>
       </div>
 
diff --git a/src/react/MainMenuRenderApp.tsx b/src/react/MainMenuRenderApp.tsx
index cdcfc096..c112cb0e 100644
--- a/src/react/MainMenuRenderApp.tsx
+++ b/src/react/MainMenuRenderApp.tsx
@@ -8,7 +8,6 @@ import { setLoadingScreenStatus } from '../appStatus'
 import { openFilePicker, copyFilesAsync, mkdirRecursive, openWorldDirectory, removeFileRecursiveAsync } from '../browserfs'
 
 import MainMenu from './MainMenu'
-import { DiscordButton } from './DiscordButton'
 
 const isMainMenu = () => {
   return activeModalStack.length === 0 && !miscUiState.gameLoaded
@@ -145,7 +144,6 @@ export default () => {
         }}
         githubAction={() => openGithub()}
         optionsAction={() => openOptionsMenu('main')}
-        linksButton={<DiscordButton />}
         bottomRightLinks={process.env.MAIN_MENU_LINKS}
         openFileAction={e => {
           if (!!window.showDirectoryPicker && !e.shiftKey) {
diff --git a/src/react/PauseLinkButtons.tsx b/src/react/PauseLinkButtons.tsx
new file mode 100644
index 00000000..18331f2d
--- /dev/null
+++ b/src/react/PauseLinkButtons.tsx
@@ -0,0 +1,50 @@
+import { useSnapshot } from 'valtio'
+import { openURL } from 'renderer/viewer/lib/simpleUtils'
+import { ErrorBoundary } from '@zardoy/react-util'
+import { miscUiState } from '../globalState'
+import { openGithub } from '../utils'
+import Button from './Button'
+import { DiscordButton } from './DiscordButton'
+import styles from './PauseScreen.module.css'
+
+function PauseLinkButtonsInner () {
+  const { appConfig } = useSnapshot(miscUiState)
+  const pauseLinksConfig = appConfig?.pauseLinks
+
+  if (!pauseLinksConfig) return null
+
+  const renderButton = (button: Record<string, any>, style: React.CSSProperties, key: number) => {
+    if (button.type === 'discord') {
+      return <DiscordButton key={key} style={style} text={button.text}/>
+    }
+    if (button.type === 'github') {
+      return <Button key={key} className="button" style={style} onClick={() => openGithub()}>{button.text ?? 'GitHub'}</Button>
+    }
+    if (button.type === 'url' && button.text) {
+      return <Button key={key} className="button" style={style} onClick={() => openURL(button.url)}>{button.text}</Button>
+    }
+    return null
+  }
+
+  return (
+    <>
+      {pauseLinksConfig.map((row, i) => {
+        const style = { width: (204 / row.length - (row.length > 1 ? 4 : 0)) + 'px' }
+        return (
+          <div key={i} className={styles.row}>
+            {row.map((button, k) => renderButton(button, style, k))}
+          </div>
+        )
+      })}
+    </>
+  )
+}
+
+export default () => {
+  return <ErrorBoundary renderError={(error) => {
+    console.error(error)
+    return null
+  }}>
+    <PauseLinkButtonsInner />
+  </ErrorBoundary>
+}
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 35d873ea..55ffe47f 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -34,6 +34,7 @@ import { DiscordButton } from './DiscordButton'
 import { showNotification } from './NotificationProvider'
 import { appStatusState, reconnectReload } from './AppStatusProvider'
 import NetworkStatus from './NetworkStatus'
+import PauseLinkButtons from './PauseLinkButtons'
 
 const waitForPotentialRender = async () => {
   return new Promise<void>(resolve => {
@@ -227,26 +228,6 @@ export default () => {
 
   if (!isModalActive) return null
 
-  const pauseLinks: React.ReactNode[] = []
-  const pauseLinksConfig = miscUiState.appConfig?.pauseLinks
-  if (pauseLinksConfig) {
-    for (const [i, row] of pauseLinksConfig.entries()) {
-      const rowButtons: React.ReactNode[] = []
-      for (const [k, button] of row.entries()) {
-        const key = `${i}-${k}`
-        const style = { width: (204 / row.length - (row.length > 1 ? 4 : 0)) + 'px' }
-        if (button.type === 'discord') {
-          rowButtons.push(<DiscordButton key={key} style={style} text={button.text}/>)
-        } else if (button.type === 'github') {
-          rowButtons.push(<Button key={key} className="button" style={style} onClick={() => openGithub()}>{button.text ?? 'GitHub'}</Button>)
-        } else if (button.type === 'url' && button.text) {
-          rowButtons.push(<Button key={key} className="button" style={style} onClick={() => openURL(button.url)}>{button.text}</Button>)
-        }
-      }
-      pauseLinks.push(<div className={styles.row}>{rowButtons}</div>)
-    }
-  }
-
   return <Screen title='Game Menu'>
     <div style={{ position: 'fixed', top: '5px', left: 'calc(env(safe-area-inset-left) + 5px)', display: 'flex', flexDirection: 'column', gap: '5px' }}>
       <Button
@@ -277,7 +258,7 @@ export default () => {
     </ErrorBoundary>
     <div className={styles.pause_container}>
       <Button className="button" style={{ width: '204px' }} onClick={onReturnPress}>Back to Game</Button>
-      {pauseLinks}
+      <PauseLinkButtons />
       <Button className="button" style={{ width: '204px' }} onClick={() => openOptionsMenu('main')}>Options</Button>
       {singleplayer ? (
         <div className={styles.row}>

From 72028d925d4f01be0094ceb2badbe4a839006046 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 14 Mar 2025 23:25:13 +0300
Subject: [PATCH 347/753] feat: revamp right click experience by reworking
 block placing prediction and extending activatble items list

---
 package.json   |  2 +-
 pnpm-lock.yaml | 35 ++++++++++++++++++++++-------------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index f6ae254e..6485c25e 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
     "mc-assets": "^0.2.42",
-    "mineflayer-mouse": "^0.0.9",
+    "mineflayer-mouse": "^0.1.0",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2b09f583..dc4b1555 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,7 +136,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.10
-        version: 0.1.10(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13))
+        version: 0.1.10(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -360,10 +360,10 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
       mineflayer:
         specifier: github:zardoy/mineflayer
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.0.9
-        version: 0.0.9(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+        specifier: ^0.1.0
+        version: 0.1.0(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -4129,6 +4129,10 @@ packages:
     resolution: {integrity: sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==}
     engines: {node: '>= 0.4'}
 
+  call-bound@1.0.4:
+    resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
+    engines: {node: '>= 0.4'}
+
   callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
@@ -6916,8 +6920,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.0.9:
-    resolution: {integrity: sha512-oViJrou2tziPuox/ZFJWZJMCnaF5+KPEsrbBgKmXVr3eK35iPohdhYwoKgqgBY8uXS/bNaFnkCR0K7ZDqyBF8g==}
+  mineflayer-mouse@0.1.0:
+    resolution: {integrity: sha512-NFfHASMo3iZOECoYOHVqGBFROVapzDJRlgANMiWnynO/oPUZkOJF6oRrcE33FCVHGlwMCT2S6N7TcqCYqF21Uw==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.4:
@@ -6927,8 +6931,8 @@ packages:
     resolution: {integrity: sha512-q7cmpZFaSI6sodcMJxc2GkV8IO84HbsUP+xNipGKfGg+FMISKabzdJ838Axb60qRtZrp6ny7LluQE7lesHvvxQ==}
     engines: {node: '>=18'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d}
     version: 4.25.0
     engines: {node: '>=18'}
 
@@ -14365,6 +14369,11 @@ snapshots:
       call-bind-apply-helpers: 1.0.2
       get-intrinsic: 1.3.0
 
+  call-bound@1.0.4:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      get-intrinsic: 1.3.0
+
   callsites@3.1.0: {}
 
   camel-case@4.1.2:
@@ -15424,7 +15433,7 @@ snapshots:
   es-iterator-helpers@1.2.1:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-properties: 1.2.1
       es-abstract: 1.23.9
       es-errors: 1.3.0
@@ -17579,12 +17588,12 @@ snapshots:
       maxrects-packer: 2.7.3
       zod: 3.24.1
 
-  mcraft-fun-mineflayer@0.1.10(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.10(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.0
     transitivePeerDependencies:
@@ -17949,7 +17958,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.0.9(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  mineflayer-mouse@0.1.0(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
     dependencies:
       change-case: 5.4.4
       debug: 4.4.0(supports-color@8.1.1)
@@ -18010,7 +18019,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/748163e536abe94f3dc8ada7a542bcd689bbbf49(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)

From 3e056946ec07c45e30182a7d012604564f5ab188 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 15 Mar 2025 02:20:47 +0300
Subject: [PATCH 348/753] add world download button

---
 src/react/PauseScreen.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 55ffe47f..f051f9e1 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -35,6 +35,7 @@ import { showNotification } from './NotificationProvider'
 import { appStatusState, reconnectReload } from './AppStatusProvider'
 import NetworkStatus from './NetworkStatus'
 import PauseLinkButtons from './PauseLinkButtons'
+import { pixelartIcons } from './PixelartIcon'
 
 const waitForPotentialRender = async () => {
   return new Promise<void>(resolve => {
@@ -161,7 +162,7 @@ export default () => {
   const { singleplayer, wanOpened, wanOpening } = useSnapshot(miscUiState)
   const { noConnection } = useSnapshot(gameAdditionalState)
   const { active: packetsReplaceActive, hasRecordedPackets: packetsReplaceHasRecordedPackets } = useSnapshot(packetsRecordingState)
-  const { displayRecordButton } = useSnapshot(options)
+  const { displayRecordButton: displayPacketsButtons } = useSnapshot(options)
 
   const handlePointerLockChange = () => {
     if (!pointerLock.hasPointerLock && activeModalStack.length === 0) {
@@ -234,7 +235,7 @@ export default () => {
         icon="pixelarticons:folder"
         onClick={async () => openWorldActions()}
       />
-      {displayRecordButton && (
+      {displayPacketsButtons && (
         <>
           <Button
             icon={packetsReplaceActive ? 'pixelarticons:debug-stop' : 'pixelarticons:circle'}
@@ -244,10 +245,14 @@ export default () => {
           />
           {packetsReplaceHasRecordedPackets && (
             <Button
-              icon="pixelarticons:download"
+              icon={pixelartIcons['briefcase-download']}
               onClick={async () => downloadPacketsReplay()}
             />
           )}
+          <Button
+            icon={pixelartIcons['download']}
+            onClick={async () => bot.downloadCurrentWorldState()}
+          />
         </>
       )}
     </div>

From da35cfb8a23aa3978ad53bdca0e6bcf45e697a03 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 15 Mar 2025 16:46:51 +0300
Subject: [PATCH 349/753] up mouse

---
 package.json   |  4 ++--
 pnpm-lock.yaml | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 6485c25e..9dd43eaf 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "mojangson": "^2.0.4",
     "net-browserify": "github:zardoy/prismarinejs-net-browserify",
     "node-gzip": "^1.1.2",
-    "mcraft-fun-mineflayer": "^0.1.10",
+    "mcraft-fun-mineflayer": "^0.1.12",
     "peerjs": "^1.5.0",
     "pixelarticons": "^1.8.1",
     "pretty-bytes": "^6.1.1",
@@ -151,7 +151,7 @@
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
     "mc-assets": "^0.2.42",
-    "mineflayer-mouse": "^0.1.0",
+    "mineflayer-mouse": "^0.1.1",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dc4b1555..d8d28545 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -135,8 +135,8 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       mcraft-fun-mineflayer:
-        specifier: ^0.1.10
-        version: 0.1.10(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13))
+        specifier: ^0.1.12
+        version: 0.1.12(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -362,8 +362,8 @@ importers:
         specifier: github:zardoy/mineflayer
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.0
-        version: 0.1.0(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+        specifier: ^0.1.1
+        version: 0.1.1(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -6694,9 +6694,9 @@ packages:
     resolution: {integrity: sha512-j2D1RNYtB5Z9gFu9MVjyDBbiALI0mWZ3xW/A3PPefVAHm3HJ2T1vH+1XBov1spBGPl7u+Zo7mRXza3X0egbeOg==}
     engines: {node: '>=18.0.0'}
 
-  mcraft-fun-mineflayer@0.1.10:
-    resolution: {integrity: sha512-KHzPts82I39nTDZlGwqJo1JXLwaIUHphBbmGWv7oYztUrq3iPiJDEIFgst0ROO/apjtHjzbCM9eb19qWw1JM3Q==}
-    version: 0.1.10
+  mcraft-fun-mineflayer@0.1.12:
+    resolution: {integrity: sha512-BhfkagVJX+QmD/dt3qNQS5f7g3/7NI//OfSW4VnRolCnZtrLU8ekr59bLRcNmUWsvtTjkg+wbMeXwclHshSWOA==}
+    version: 0.1.12
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       '@roamhq/wrtc': '*'
@@ -6920,8 +6920,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.0:
-    resolution: {integrity: sha512-NFfHASMo3iZOECoYOHVqGBFROVapzDJRlgANMiWnynO/oPUZkOJF6oRrcE33FCVHGlwMCT2S6N7TcqCYqF21Uw==}
+  mineflayer-mouse@0.1.1:
+    resolution: {integrity: sha512-7jKN+6pIGtQVfYxEIm4tA9CYwTS8Mgn/qJ2wyhrAoIEW8smCHUu0kj5Sdo0TwTCdlOQClKt8aEBZ13E7MGqOhg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.4:
@@ -17588,7 +17588,7 @@ snapshots:
       maxrects-packer: 2.7.3
       zod: 3.24.1
 
-  mcraft-fun-mineflayer@0.1.10(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.12(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
@@ -17958,7 +17958,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.0(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  mineflayer-mouse@0.1.1(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
     dependencies:
       change-case: 5.4.4
       debug: 4.4.0(supports-color@8.1.1)

From 36bf18b02f616b900852016a93ab22f79061f39b Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Mon, 17 Mar 2025 16:05:04 +0300
Subject: [PATCH 350/753] feat: refactor all app storage managment (#310)

---
 src/appConfig.ts                  |   3 +
 src/browserfs.ts                  |  20 +---
 src/controls.ts                   |   5 +-
 src/optionsGuiScheme.tsx          | 112 ++++++++++++++++++-
 src/optionsStorage.ts             |  33 ++++--
 src/react/AddServerOrConnect.tsx  |  18 +--
 src/react/Chat.css                |   5 +-
 src/react/Input.tsx               |  18 ++-
 src/react/MainMenuRenderApp.tsx   |  18 ---
 src/react/SelectOption.tsx        | 131 +++++++++++++++++++---
 src/react/ServersList.tsx         |  79 +++++++------
 src/react/ServersListProvider.tsx | 177 +++++++++---------------------
 src/react/appStorageProvider.ts   | 135 +++++++++++++++++++++++
 src/react/serversStorage.ts       |  62 +++--------
 src/react/storageProvider.ts      |  13 ---
 15 files changed, 525 insertions(+), 304 deletions(-)
 create mode 100644 src/react/appStorageProvider.ts
 delete mode 100644 src/react/storageProvider.ts

diff --git a/src/appConfig.ts b/src/appConfig.ts
index 3d6d8f93..b8f83ad1 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -1,6 +1,7 @@
 import { disabledSettings, options, qsOptions } from './optionsStorage'
 import { miscUiState } from './globalState'
 import { setLoadingScreenStatus } from './appStatus'
+import { setStorageDataOnAppConfigLoad } from './react/appStorageProvider'
 
 export type AppConfig = {
   // defaultHost?: string
@@ -42,6 +43,8 @@ export const loadAppConfig = (appConfig: AppConfig) => {
       }
     }
   }
+
+  setStorageDataOnAppConfigLoad()
 }
 
 export const isBundledConfigUsed = !!process.env.INLINED_APP_CONFIG
diff --git a/src/browserfs.ts b/src/browserfs.ts
index 0f4579b8..9fb0771f 100644
--- a/src/browserfs.ts
+++ b/src/browserfs.ts
@@ -15,6 +15,7 @@ import { getFixedFilesize } from './downloadAndOpenFile'
 import { packetsReplayState } from './react/state/packetsReplayState'
 import { createFullScreenProgressReporter } from './core/progressReporter'
 import { showNotification } from './react/NotificationProvider'
+import { resetAppStorage } from './react/appStorageProvider'
 const { GoogleDriveFileSystem } = require('google-drive-browserfs/src/backends/GoogleDrive')
 
 browserfs.install(window)
@@ -620,24 +621,13 @@ export const openWorldZip = async (...args: Parameters<typeof openWorldZipInner>
   }
 }
 
-export const resetLocalStorageWorld = () => {
-  for (const key of Object.keys(localStorage)) {
-    if (/^[\da-fA-F]{8}(?:\b-[\da-fA-F]{4}){3}\b-[\da-fA-F]{12}$/g.test(key) || key === '/') {
-      localStorage.removeItem(key)
-    }
-  }
-}
-
-export const resetLocalStorageWithoutWorld = () => {
-  for (const key of Object.keys(localStorage)) {
-    if (!/^[\da-fA-F]{8}(?:\b-[\da-fA-F]{4}){3}\b-[\da-fA-F]{12}$/g.test(key) && key !== '/') {
-      localStorage.removeItem(key)
-    }
-  }
+export const resetLocalStorage = () => {
   resetOptions()
+  resetAppStorage()
 }
 
-window.resetLocalStorageWorld = resetLocalStorageWorld
+window.resetLocalStorage = resetLocalStorage
+
 export const openFilePicker = (specificCase?: 'resourcepack') => {
   // create and show input picker
   let picker: HTMLInputElement = document.body.querySelector('input#file-zip-picker')!
diff --git a/src/controls.ts b/src/controls.ts
index a3a54ffb..69b94636 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -25,11 +25,12 @@ import { showNotification } from './react/NotificationProvider'
 import { lastConnectOptions } from './react/AppStatusProvider'
 import { onCameraMove, onControInit } from './cameraRotationControls'
 import { createNotificationProgressReporter } from './core/progressReporter'
+import { appStorage } from './react/appStorageProvider'
 
 
-export const customKeymaps = proxy(JSON.parse(localStorage.keymap || '{}')) as UserOverridesConfig
+export const customKeymaps = proxy(appStorage.keybindings)
 subscribe(customKeymaps, () => {
-  localStorage.keymap = JSON.stringify(customKeymaps)
+  appStorage.keybindings = customKeymaps
 })
 
 const controlOptions = {
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 7032e644..5851dd8d 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -3,19 +3,21 @@ import { useSnapshot } from 'valtio'
 import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { noCase } from 'change-case'
 import { gameAdditionalState, miscUiState, openOptionsMenu, showModal } from './globalState'
-import { AppOptions, options } from './optionsStorage'
+import { AppOptions, getChangedSettings, options, resetOptions } from './optionsStorage'
 import Button from './react/Button'
 import { OptionMeta, OptionSlider } from './react/OptionsItems'
 import Slider from './react/Slider'
 import { getScreenRefreshRate } from './utils'
 import { setLoadingScreenStatus } from './appStatus'
-import { openFilePicker, resetLocalStorageWithoutWorld } from './browserfs'
+import { openFilePicker, resetLocalStorage } from './browserfs'
 import { completeResourcepackPackInstall, getResourcePackNames, resourcePackState, uninstallResourcePack } from './resourcePack'
 import { downloadPacketsReplay, packetsRecordingState } from './packetsReplay/packetsReplayLegacy'
-import { showOptionsModal } from './react/SelectOption'
+import { showInputsModal, showOptionsModal } from './react/SelectOption'
 import supportedVersions from './supportedVersions.mjs'
 import { getVersionAutoSelect } from './connect'
 import { createNotificationProgressReporter } from './core/progressReporter'
+import { customKeymaps } from './controls'
+import { appStorage } from './react/appStorageProvider'
 
 export const guiOptionsScheme: {
   [t in OptionsGroupType]: Array<{ [K in keyof AppOptions]?: Partial<OptionMeta<AppOptions[K]>> } & { custom? }>
@@ -450,9 +452,19 @@ export const guiOptionsScheme: {
         return <Button
           inScreen
           onClick={() => {
-            if (confirm('Are you sure you want to reset all settings?')) resetLocalStorageWithoutWorld()
+            if (confirm('Are you sure you want to reset all settings?')) resetOptions()
           }}
-        >Reset all settings</Button>
+        >Reset settings</Button>
+      },
+    },
+    {
+      custom () {
+        return <Button
+          inScreen
+          onClick={() => {
+            if (confirm('Are you sure you want to remove all data (settings, keybindings, servers, username, auth, proxies)?')) resetLocalStorage()
+          }}
+        >Remove all data</Button>
       },
     },
     {
@@ -460,6 +472,11 @@ export const guiOptionsScheme: {
         return <Category>Developer</Category>
       },
     },
+    {
+      custom () {
+        return <Button label='Export/Import...' onClick={() => openOptionsMenu('export-import')} inScreen />
+      }
+    },
     {
       custom () {
         const { active } = useSnapshot(packetsRecordingState)
@@ -521,8 +538,91 @@ export const guiOptionsScheme: {
       },
     },
   ],
+  'export-import': [
+    {
+      custom () {
+        return <Category>Export/Import Data</Category>
+      }
+    },
+    {
+      custom () {
+        return <Button
+          inScreen
+          disabled={true}
+          onClick={() => {}}
+        >Import Data</Button>
+      }
+    },
+    {
+      custom () {
+        return <Button
+          inScreen
+          onClick={async () => {
+            const data = await showInputsModal('Export Profile', {
+              profileName: {
+                type: 'text',
+              },
+              exportSettings: {
+                type: 'checkbox',
+                defaultValue: true,
+              },
+              exportKeybindings: {
+                type: 'checkbox',
+                defaultValue: true,
+              },
+              exportServers: {
+                type: 'checkbox',
+                defaultValue: true,
+              },
+              saveUsernameAndProxy: {
+                type: 'checkbox',
+                defaultValue: true,
+              },
+            })
+            const fileName = `${data.profileName ? `${data.profileName}-` : ''}web-client-profile.json`
+            const json = {
+              _about: 'Minecraft Web Client (mcraft.fun) Profile',
+              ...data.exportSettings ? {
+                options: getChangedSettings(),
+              } : {},
+              ...data.exportKeybindings ? {
+                keybindings: customKeymaps,
+              } : {},
+              ...data.saveUsernameAndProxy ? {
+                username: appStorage.username,
+                proxy: appStorage.proxiesData?.selected,
+              } : {},
+            }
+            const blob = new Blob([JSON.stringify(json, null, 2)], { type: 'application/json' })
+            const url = URL.createObjectURL(blob)
+            const a = document.createElement('a')
+            a.href = url
+            a.download = fileName
+            a.click()
+            URL.revokeObjectURL(url)
+          }}
+        >Export Data</Button>
+      }
+    },
+    {
+      custom () {
+        return <Button
+          inScreen
+          disabled
+        >Export Worlds</Button>
+      }
+    },
+    {
+      custom () {
+        return <Button
+          inScreen
+          disabled
+        >Export Resource Pack</Button>
+      }
+    }
+  ],
 }
-export type OptionsGroupType = 'main' | 'render' | 'interface' | 'controls' | 'sound' | 'advanced' | 'VR'
+export type OptionsGroupType = 'main' | 'render' | 'interface' | 'controls' | 'sound' | 'advanced' | 'VR' | 'export-import'
 
 const Category = ({ children }) => <div style={{
   fontSize: 9,
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index d8d72809..e0de6d4a 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -1,11 +1,9 @@
-// todo implement async options storage
-
 import { proxy, subscribe } from 'valtio/vanilla'
-// weird webpack configuration bug: it cant import valtio/utils in this file
 import { subscribeKey } from 'valtio/utils'
 import { omitObj } from '@zardoy/utils'
 import { appQueryParamsArray } from './appParams'
 import type { AppConfig } from './appConfig'
+import { appStorage } from './react/appStorageProvider'
 
 const isDev = process.env.NODE_ENV === 'development'
 const initialAppConfig = process.env?.INLINED_APP_CONFIG as AppConfig ?? {}
@@ -164,12 +162,31 @@ const migrateOptions = (options: Partial<AppOptions & Record<string, any>>) => {
 
 export type AppOptions = typeof defaultOptions
 
-// when opening html file locally in browser, localStorage is shared between all ever opened html files, so we try to avoid conflicts
-const localStorageKey = process.env?.SINGLE_FILE_BUILD ? 'minecraftWebClientOptions' : 'options'
+const isDeepEqual = (a: any, b: any): boolean => {
+  if (a === b) return true
+  if (typeof a !== typeof b) return false
+  if (typeof a !== 'object') return false
+  if (a === null || b === null) return a === b
+  if (Array.isArray(a) && Array.isArray(b)) {
+    if (a.length !== b.length) return false
+    return a.every((item, index) => isDeepEqual(item, b[index]))
+  }
+  const keysA = Object.keys(a)
+  const keysB = Object.keys(b)
+  if (keysA.length !== keysB.length) return false
+  return keysA.every(key => isDeepEqual(a[key], b[key]))
+}
+
+export const getChangedSettings = () => {
+  return Object.fromEntries(
+    Object.entries(options).filter(([key, value]) => !isDeepEqual(defaultOptions[key], value))
+  )
+}
+
 export const options: AppOptions = proxy({
   ...defaultOptions,
   ...initialAppConfig.defaultSettings,
-  ...migrateOptions(JSON.parse(localStorage[localStorageKey] || '{}')),
+  ...migrateOptions(appStorage.options),
   ...qsOptions
 })
 
@@ -181,14 +198,14 @@ export const resetOptions = () => {
 
 Object.defineProperty(window, 'debugChangedOptions', {
   get () {
-    return Object.fromEntries(Object.entries(options).filter(([key, v]) => defaultOptions[key] !== v))
+    return getChangedSettings()
   },
 })
 
 subscribe(options, () => {
   // Don't save disabled settings to localStorage
   const saveOptions = omitObj(options, [...disabledSettings.value] as any)
-  localStorage[localStorageKey] = JSON.stringify(saveOptions)
+  appStorage.options = saveOptions
 })
 
 type WatchValue = <T extends Record<string, any>>(proxy: T, callback: (p: T, isChanged: boolean) => void) => () => void
diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index 1186fd9a..c25db793 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -3,7 +3,7 @@ import { appQueryParams } from '../appParams'
 import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
 import { parseServerAddress } from '../parseServerAddress'
 import Screen from './Screen'
-import Input from './Input'
+import Input, { INPUT_LABEL_WIDTH, InputWithLabel } from './Input'
 import Button from './Button'
 import SelectGameVersion from './SelectGameVersion'
 import { usePassesScaledDimensions } from './UIProvider'
@@ -32,8 +32,6 @@ interface Props {
   allowAutoConnect?: boolean
 }
 
-const ELEMENTS_WIDTH = 190
-
 export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions, allowAutoConnect }: Props) => {
   const isSmallHeight = !usePassesScaledDimensions(null, 350)
   const qsParamName = parseQs ? appQueryParams.name : undefined
@@ -256,20 +254,8 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
 
 const ButtonWrapper = ({ ...props }: React.ComponentProps<typeof Button>) => {
   props.style ??= {}
-  props.style.width = ELEMENTS_WIDTH
+  props.style.width = INPUT_LABEL_WIDTH
   return <Button {...props} />
 }
 
-const InputWithLabel = ({ label, span, ...props }: React.ComponentProps<typeof Input> & { label, span? }) => {
-  return <div style={{
-    display: 'flex',
-    flexDirection: 'column',
-    gridRow: span ? 'span 2 / span 2' : undefined,
-  }}
-  >
-    <label style={{ fontSize: 12, marginBottom: 1, color: 'lightgray' }}>{label}</label>
-    <Input rootStyles={{ width: ELEMENTS_WIDTH }} {...props} />
-  </div>
-}
-
 const fallbackIfNotFound = (index: number) => (index === -1 ? undefined : index)
diff --git a/src/react/Chat.css b/src/react/Chat.css
index 601e4ce3..e6a62ab2 100644
--- a/src/react/Chat.css
+++ b/src/react/Chat.css
@@ -90,11 +90,11 @@ div.chat-wrapper {
 ::-webkit-scrollbar {
   width: 5px;
   height: 5px;
-  background-color: rgb(24, 24, 24);
+  background-color: #272727;
 }
 
 ::-webkit-scrollbar-thumb {
-  background-color: rgb(50, 50, 50);
+  background-color: #747474;
 }
 
 .chat-completions-items>div {
@@ -160,7 +160,6 @@ input[type=text],
   padding-bottom: 1px;
   padding-left: 2px;
   padding-right: 2px;
-  height: 15px;
 }
 
 .chat-mobile-input-hidden {
diff --git a/src/react/Input.tsx b/src/react/Input.tsx
index 790d6c8d..169e880d 100644
--- a/src/react/Input.tsx
+++ b/src/react/Input.tsx
@@ -10,7 +10,7 @@ interface Props extends Omit<React.ComponentProps<'input'>, 'width'> {
   width?: number
 }
 
-export default ({ autoFocus, rootStyles, inputRef, validateInput, defaultValue, width, ...inputProps }: Props) => {
+const Input = ({ autoFocus, rootStyles, inputRef, validateInput, defaultValue, width, ...inputProps }: Props) => {
   if (width) rootStyles = { ...rootStyles, width }
 
   const ref = useRef<HTMLInputElement>(null!)
@@ -51,3 +51,19 @@ export default ({ autoFocus, rootStyles, inputRef, validateInput, defaultValue,
     />
   </div>
 }
+
+export default Input
+
+export const INPUT_LABEL_WIDTH = 190
+
+export const InputWithLabel = ({ label, span, ...props }: React.ComponentProps<typeof Input> & { label, span? }) => {
+  return <div style={{
+    display: 'flex',
+    flexDirection: 'column',
+    gridRow: span ? 'span 2 / span 2' : undefined,
+  }}
+  >
+    <label style={{ fontSize: 12, marginBottom: 1, color: 'lightgray' }}>{label}</label>
+    <Input rootStyles={{ width: INPUT_LABEL_WIDTH }} {...props} />
+  </div>
+}
diff --git a/src/react/MainMenuRenderApp.tsx b/src/react/MainMenuRenderApp.tsx
index c112cb0e..f678e7f7 100644
--- a/src/react/MainMenuRenderApp.tsx
+++ b/src/react/MainMenuRenderApp.tsx
@@ -122,24 +122,6 @@ export default () => {
         singleplayerAvailable={singleplayerAvailable}
         connectToServerAction={() => showModal({ reactType: 'serversList' })}
         singleplayerAction={async () => {
-          const oldFormatSave = fs.existsSync('./world/level.dat')
-          if (oldFormatSave) {
-            setLoadingScreenStatus('Migrating old save, don\'t close the page')
-            try {
-              await mkdirRecursive('/data/worlds/local')
-              await copyFilesAsync('/world/', '/data/worlds/local')
-              try {
-                await removeFileRecursiveAsync('/world/')
-              } catch (err) {
-                console.error(err)
-              }
-            } catch (err) {
-              console.warn(err)
-              alert('Failed to migrate world from localStorage')
-            } finally {
-              setLoadingScreenStatus(undefined)
-            }
-          }
           showModal({ reactType: 'singleplayer' })
         }}
         githubAction={() => openGithub()}
diff --git a/src/react/SelectOption.tsx b/src/react/SelectOption.tsx
index 9db20c86..4df471c0 100644
--- a/src/react/SelectOption.tsx
+++ b/src/react/SelectOption.tsx
@@ -1,10 +1,14 @@
 import { proxy, useSnapshot } from 'valtio'
+import { useEffect, useRef } from 'react'
+import { noCase } from 'change-case'
+import { titleCase } from 'title-case'
 import { hideCurrentModal, showModal } from '../globalState'
 import { parseFormattedMessagePacket } from '../botUtils'
 import Screen from './Screen'
 import { useIsModalActive } from './utilsApp'
 import Button from './Button'
 import MessageFormattedString from './MessageFormattedString'
+import Input, { InputWithLabel } from './Input'
 
 const state = proxy({
   title: '',
@@ -12,6 +16,8 @@ const state = proxy({
   showCancel: true,
   minecraftJsonMessage: null as null | Record<string, any>,
   behavior: 'resolve-close' as 'resolve-close' | 'close-resolve',
+  inputs: {} as Record<string, InputOption>,
+  inputsConfirmButton: ''
 })
 
 let resolve
@@ -35,17 +41,63 @@ export const showOptionsModal = async <T extends string> (
       title,
       options,
       showCancel: cancel,
-      minecraftJsonMessage: minecraftJsonMessageParsed
+      minecraftJsonMessage: minecraftJsonMessageParsed,
+      inputs: {},
+      inputsConfirmButton: ''
+    })
+  })
+}
+
+type InputOption = {
+  type: 'text' | 'checkbox'
+  defaultValue?: string | boolean
+  label?: string
+}
+export const showInputsModal = async <T extends Record<string, InputOption>>(
+  title: string,
+  inputs: T,
+  { cancel = true, minecraftJsonMessage }: { cancel?: boolean, minecraftJsonMessage? } = {}
+): Promise<{
+  [K in keyof T]: T[K] extends { type: 'text' }
+    ? string
+    : T[K] extends { type: 'checkbox' }
+      ? boolean
+      : never
+}> => {
+  showModal({ reactType: 'general-select' })
+  let minecraftJsonMessageParsed
+  if (minecraftJsonMessage) {
+    const parseResult = parseFormattedMessagePacket(minecraftJsonMessage)
+    minecraftJsonMessageParsed = parseResult.formatted
+    if (parseResult.plain) {
+      title += ` (${parseResult.plain})`
+    }
+  }
+  return new Promise((_resolve) => {
+    resolve = _resolve
+    Object.assign(state, {
+      title,
+      inputs,
+      showCancel: cancel,
+      minecraftJsonMessage: minecraftJsonMessageParsed,
+      options: [],
+      inputsConfirmButton: 'Confirm'
     })
   })
 }
 
 export default () => {
-  const { title, options, showCancel, minecraftJsonMessage } = useSnapshot(state)
+  const { title, options, showCancel, minecraftJsonMessage, inputs, inputsConfirmButton } = useSnapshot(state)
   const isModalActive = useIsModalActive('general-select')
+  const inputValues = useRef({})
+
+  useEffect(() => {
+    inputValues.current = Object.fromEntries(Object.entries(inputs).map(([key, input]) => [key, input.defaultValue ?? (input.type === 'checkbox' ? false : '')]))
+  }, [inputs])
+
   if (!isModalActive) return
 
-  const resolveClose = (value: string | undefined) => {
+  const resolveClose = (value: any) => {
     if (state.behavior === 'resolve-close') {
       resolve(value)
       hideCurrentModal()
@@ -59,17 +111,66 @@ export default () => {
     {minecraftJsonMessage && <div style={{ textAlign: 'center', }}>
       <MessageFormattedString message={minecraftJsonMessage} />
     </div>}
-    {options.map(option => <Button
-      key={option} onClick={() => {
-        resolveClose(option)
-      }}
-    >{option}
-    </Button>)}
-    {showCancel && <Button
-      style={{ marginTop: 30 }} onClick={() => {
-        resolveClose(undefined)
-      }}
-    >Cancel
-    </Button>}
+    <div style={{ display: 'flex', flexDirection: 'column', gap: 9 }}>
+      {options.length > 0 && <div style={{ display: 'flex', flexDirection: 'column', gap: 5 }}>
+        {options.map(option => <Button
+          key={option} onClick={() => {
+            resolveClose(option)
+          }}
+        >{option}
+        </Button>)}
+      </div>}
+      <div style={{ display: 'flex', flexDirection: 'column', gap: 3 }}>
+        {Object.entries(inputs).map(([key, input]) => {
+          const label = input.label ?? titleCase(noCase(key))
+          return <div key={key}>
+            {input.type === 'text' && (
+              <InputWithLabel
+                label={label}
+                autoFocus
+                type='text'
+                defaultValue={input.defaultValue as string}
+                onChange={(e) => {
+                  inputValues.current[key] = e.target.value
+                }}
+              />
+            )}
+            {input.type === 'checkbox' && (
+              <label style={{ display: 'flex', alignItems: 'center', gap: 4, fontSize: 12 }}>
+                <input
+                  type='checkbox'
+                  style={{ marginBottom: -1, }}
+                  defaultChecked={input.defaultValue as boolean}
+                  onChange={(e) => {
+                    inputValues.current[key] = e.target.checked
+                  }}
+                />
+                {label}
+              </label>
+            )}
+          </div>
+        })}
+      </div>
+      {inputs && inputsConfirmButton && (
+        <Button
+          // style={{ marginTop: 30 }}
+          onClick={() => {
+            resolveClose(inputValues.current)
+          }}
+        >
+          {inputsConfirmButton}
+        </Button>
+      )}
+      {showCancel && (
+        <Button
+          // style={{ marginTop: 30 }}
+          onClick={() => {
+            resolveClose(undefined)
+          }}
+        >
+          Cancel
+        </Button>
+      )}
+    </div>
   </Screen>
 }
diff --git a/src/react/ServersList.tsx b/src/react/ServersList.tsx
index 46541af6..7b34f016 100644
--- a/src/react/ServersList.tsx
+++ b/src/react/ServersList.tsx
@@ -1,64 +1,61 @@
-import React from 'react'
+import React, { useMemo } from 'react'
+import { useSnapshot } from 'valtio'
+import { miscUiState } from '../globalState'
+import { appQueryParams } from '../appParams'
 import Singleplayer from './Singleplayer'
 import Input from './Input'
 import Button from './Button'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
-
 import Select from './Select'
 import { BaseServerInfo } from './AddServerOrConnect'
 import { useIsSmallWidth } from './simpleHooks'
+import { appStorage, SavedProxiesData, ServerHistoryEntry } from './appStorageProvider'
+
+const getInitialProxies = () => {
+  const proxies = [] as string[]
+  if (miscUiState.appConfig?.defaultProxy) {
+    proxies.push(miscUiState.appConfig.defaultProxy)
+  }
+  return proxies
+}
+
+export const getCurrentProxy = (): string | undefined => {
+  return appQueryParams.proxy ?? appStorage.proxiesData?.selected ?? getInitialProxies()[0]
+}
+
+export const getCurrentUsername = () => {
+  return appQueryParams.username ?? appStorage.username
+}
 
 interface Props extends React.ComponentProps<typeof Singleplayer> {
   joinServer: (info: BaseServerInfo | string, additional: {
     shouldSave?: boolean
     index?: number
   }) => void
-  initialProxies: SavedProxiesLocalStorage
-  updateProxies: (proxies: SavedProxiesLocalStorage) => void
-  username: string
-  setUsername: (username: string) => void
   onProfileClick?: () => void
   setQuickConnectIp?: (ip: string) => void
-  serverHistory?: Array<{
-    ip: string
-    versionOverride?: string
-    numConnects: number
-  }>
-}
-
-export interface SavedProxiesLocalStorage {
-  proxies: readonly string[]
-  selected: string
-}
-
-type ProxyStatusResult = {
-  time: number
-  ping: number
-  status: 'success' | 'error' | 'unknown'
 }
 
 export default ({
-  initialProxies,
-  updateProxies: updateProxiesProp,
   joinServer,
-  username,
-  setUsername,
   onProfileClick,
   setQuickConnectIp,
-  serverHistory,
   ...props
 }: Props) => {
-  const [proxies, setProxies] = React.useState(initialProxies)
-
-  const updateProxies = (newData: SavedProxiesLocalStorage) => {
-    setProxies(newData)
-    updateProxiesProp(newData)
-  }
-
+  const snap = useSnapshot(appStorage)
+  const username = useMemo(() => getCurrentUsername(), [appQueryParams.username, appStorage.username])
   const [serverIp, setServerIp] = React.useState('')
   const [save, setSave] = React.useState(true)
   const [activeHighlight, setActiveHighlight] = React.useState(undefined as 'quick-connect' | 'server-list' | undefined)
 
+  const updateProxies = (newData: SavedProxiesData) => {
+    appStorage.proxiesData = newData
+  }
+
+  const setUsername = (username: string) => {
+    appStorage.username = username
+  }
+
   const getActiveHighlightStyles = (type: typeof activeHighlight) => {
     const styles: React.CSSProperties = {
       transition: 'filter 0.2s',
@@ -71,6 +68,8 @@ export default ({
 
   const isSmallWidth = useIsSmallWidth()
 
+  const initialProxies = getInitialProxies()
+  const proxiesData = snap.proxiesData ?? { proxies: initialProxies, selected: initialProxies[0] }
   return <Singleplayer
     {...props}
     firstRowChildrenOverride={<form
@@ -85,7 +84,6 @@ export default ({
         onMouseEnter={() => setActiveHighlight('quick-connect')}
         onMouseLeave={() => setActiveHighlight(undefined)}
       >
-        {/* todo history */}
         <Input
           required
           placeholder='Quick Connect IP (:version)'
@@ -102,8 +100,8 @@ export default ({
           spellCheck="false"
         />
         <datalist id="server-history">
-          {serverHistory?.map((server) => (
-            <option key={server.ip} value={`${server.ip}${server.versionOverride ? `:${server.versionOverride}` : ''}`} />
+          {[...(snap.serversHistory ?? [])].sort((a, b) => b.numConnects - a.numConnects).map((server) => (
+            <option key={server.ip} value={`${server.ip}${server.version ? `:${server.version}` : ''}`} />
           ))}
         </datalist>
         <label style={{ fontSize: 10, display: 'flex', alignItems: 'center', gap: 5, height: '100%', marginTop: '-1px' }}>
@@ -126,10 +124,10 @@ export default ({
             ? <PixelartIcon iconName={pixelartIcons.server} styles={{ fontSize: 14, color: 'lightgray', marginLeft: 2 }} onClick={onProfileClick} />
             : <span style={{ color: 'lightgray', fontSize: 14 }}>Proxy:</span>}
           <Select
-            initialOptions={proxies.proxies.map(p => { return { value: p, label: p } })}
-            defaultValue={{ value: proxies.selected, label: proxies.selected }}
+            initialOptions={proxiesData.proxies.map(p => { return { value: p, label: p } })}
+            defaultValue={{ value: proxiesData.selected, label: proxiesData.selected }}
             updateOptions={(newSel) => {
-              updateProxies({ proxies: [...proxies.proxies], selected: newSel })
+              updateProxies({ proxies: [...proxiesData.proxies], selected: newSel })
             }}
             containerStyle={{
               width: isSmallWidth ? 140 : 180,
@@ -139,6 +137,7 @@ export default ({
           <Input
             rootStyles={{ width: 80 }}
             value={username}
+            disabled={appQueryParams.username !== undefined}
             onChange={({ target: { value } }) => setUsername(value)}
             autoCorrect="off"
             autoCapitalize="off"
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index bf440c69..d107770f 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -8,13 +8,14 @@ import { appQueryParams } from '../appParams'
 import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
 import { getServerInfo } from '../mineflayer/mc-protocol'
 import { parseServerAddress } from '../parseServerAddress'
-import ServersList from './ServersList'
+import ServersList, { getCurrentProxy, getCurrentUsername } from './ServersList'
 import AddServerOrConnect, { BaseServerInfo } from './AddServerOrConnect'
 import { useDidUpdateEffect } from './utils'
 import { useIsModalActive } from './utilsApp'
 import { showOptionsModal } from './SelectOption'
 import { useCopyKeybinding } from './simpleHooks'
-import { AuthenticatedAccount, getInitialServersList, getServerConnectionHistory, setNewServersList, StoreServerItem } from './serversStorage'
+import { AuthenticatedAccount, getInitialServersList, getServerConnectionHistory, setNewServersList } from './serversStorage'
+import { appStorage, StoreServerItem } from './appStorageProvider'
 
 type AdditionalDisplayData = {
   textNameRightGrayed: string
@@ -25,19 +26,6 @@ type AdditionalDisplayData = {
 }
 
 const serversListQs = appQueryParams.serversList
-const proxyQs = appQueryParams.proxy
-
-const getInitialProxies = () => {
-  const proxies = [] as string[]
-  if (miscUiState.appConfig?.defaultProxy) {
-    proxies.push(miscUiState.appConfig.defaultProxy)
-  }
-  if (localStorage['proxy']) {
-    proxies.push(localStorage['proxy'])
-    localStorage.removeItem('proxy')
-  }
-  return proxies
-}
 
 // todo move to base
 const normalizeIp = (ip: string) => ip.replace(/https?:\/\//, '').replace(/\/(:|$)/, '')
@@ -46,45 +34,30 @@ const FETCH_DELAY = 100 // ms between each request
 const MAX_CONCURRENT_REQUESTS = 10
 
 const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersList?: string[] }) => {
-  const [proxies, setProxies] = useState<readonly string[]>(localStorage['proxies'] ? JSON.parse(localStorage['proxies']) : getInitialProxies())
-  const [selectedProxy, setSelectedProxy] = useState(proxyQs ?? localStorage.getItem('selectedProxy') ?? proxies?.[0] ?? '')
   const [serverEditScreen, setServerEditScreen] = useState<StoreServerItem | true | null>(null) // true for add
-  const [defaultUsername, _setDefaultUsername] = useState(localStorage['username'] ?? (`mcrafter${Math.floor(Math.random() * 1000)}`))
-  const [authenticatedAccounts, _setAuthenticatedAccounts] = useState<AuthenticatedAccount[]>(JSON.parse(localStorage['authenticatedAccounts'] || '[]'))
+  const { authenticatedAccounts } = useSnapshot(appStorage)
   const [quickConnectIp, setQuickConnectIp] = useState('')
   const [selectedIndex, setSelectedIndex] = useState(0)
 
-  // Save username to localStorage when component mounts if it doesn't exist
-  useEffect(() => {
-    if (!localStorage['username']) {
-      localStorage.setItem('username', defaultUsername)
-    }
-  }, [])
+  const { serversList: savedServersList } = useSnapshot(appStorage)
 
-  const setAuthenticatedAccounts = (newState: typeof authenticatedAccounts) => {
-    _setAuthenticatedAccounts(newState)
-    localStorage.setItem('authenticatedAccounts', JSON.stringify(newState))
-  }
+  const serversListDisplay = useMemo(() => {
+    return (
+      customServersList
+        ? customServersList.map((row): StoreServerItem => {
+          const [ip, name] = row.split(' ')
+          const [_ip, _port, version] = ip.split(':')
+          return {
+            ip,
+            versionOverride: version,
+            name,
+          }
+        })
+        : [...getInitialServersList()]
+    )
+  }, [customServersList, savedServersList])
 
-  const setDefaultUsername = (newState: typeof defaultUsername) => {
-    _setDefaultUsername(newState)
-    localStorage.setItem('username', newState)
-  }
-
-  const saveNewProxy = () => {
-    if (!selectedProxy || proxyQs) return
-    localStorage.setItem('selectedProxy', selectedProxy)
-  }
-
-  useEffect(() => {
-    if (proxies.length) {
-      localStorage.setItem('proxies', JSON.stringify(proxies))
-    }
-    saveNewProxy()
-  }, [proxies])
-
-  const [serversList, setServersList] = useState<StoreServerItem[]>(() => (customServersList ? [] : getInitialServersList()))
-  const [additionalData, setAdditionalData] = useState<Record<string, AdditionalDisplayData>>({})
+  const [additionalServerData, setAdditionalServerData] = useState<Record<string, AdditionalDisplayData>>({})
 
   // Add keyboard handler for moving servers
   useEffect(() => {
@@ -92,49 +65,31 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
       if (['input', 'textarea', 'select'].includes((e.target as HTMLElement)?.tagName?.toLowerCase())) return
       if (!e.shiftKey || selectedIndex === undefined) return
       if (e.key !== 'ArrowUp' && e.key !== 'ArrowDown') return
+      if (customServersList) return
       e.preventDefault()
       e.stopImmediatePropagation()
 
       const newIndex = e.key === 'ArrowUp'
         ? Math.max(0, selectedIndex - 1)
-        : Math.min(serversList.length - 1, selectedIndex + 1)
+        : Math.min(serversListDisplay.length - 1, selectedIndex + 1)
 
       if (newIndex === selectedIndex) return
 
       // Move server in the list
-      const newList = [...serversList]
+      const newList = [...serversListDisplay]
       const oldItem = newList[selectedIndex]
       newList[selectedIndex] = newList[newIndex]
       newList[newIndex] = oldItem
 
-      setServersList(newList)
+      appStorage.serversList = newList
       setSelectedIndex(newIndex)
     }
 
     document.addEventListener('keydown', handleKeyDown)
     return () => document.removeEventListener('keydown', handleKeyDown)
-  }, [selectedIndex, serversList])
+  }, [selectedIndex, serversListDisplay])
 
-  useEffect(() => {
-    if (customServersList) {
-      setServersList(customServersList.map(row => {
-        const [ip, name] = row.split(' ')
-        const [_ip, _port, version] = ip.split(':')
-        return {
-          ip,
-          versionOverride: version,
-          name,
-        }
-      }))
-    }
-  }, [customServersList])
-
-  useDidUpdateEffect(() => {
-    // save data only on user changes
-    setNewServersList(serversList)
-  }, [serversList])
-
-  const serversListSorted = useMemo(() => serversList.map((server, index) => ({ ...server, index })), [serversList])
+  const serversListSorted = useMemo(() => serversListDisplay.map((server, index) => ({ ...server, index })), [serversListDisplay])
   // by lastJoined
   // const serversListSorted = useMemo(() => {
   //   return serversList.map((server, index) => ({ ...server, index })).sort((a, b) => (b.lastJoined ?? 0) - (a.lastJoined ?? 0))
@@ -185,7 +140,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
                 data = await fetchServerStatus(server.ip/* , signal */) // DONT ADD SIGNAL IT WILL CRUSH JS RUNTIME
               }
               if (data) {
-                setAdditionalData(old => ({
+                setAdditionalServerData(old => ({
                   ...old,
                   [server.ip]: data
                 }))
@@ -224,7 +179,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
   }, [isEditScreenModal])
 
   useCopyKeybinding(() => {
-    const item = serversList[selectedIndex]
+    const item = serversListDisplay[selectedIndex]
     if (!item) return
     let str = `${item.ip}`
     if (item.versionOverride) {
@@ -236,8 +191,8 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
   const editModalJsx = isEditScreenModal ? <AddServerOrConnect
     allowAutoConnect={miscUiState.appConfig?.allowAutoConnect}
     placeholders={{
-      proxyOverride: selectedProxy,
-      usernameOverride: defaultUsername,
+      proxyOverride: getCurrentProxy(),
+      usernameOverride: getCurrentUsername(),
     }}
     parseQs={!serverEditScreen}
     onBack={() => {
@@ -247,12 +202,13 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
       if (!serverEditScreen) return
       if (serverEditScreen === true) {
         const server: StoreServerItem = { ...info, lastJoined: Date.now() } // so it appears first
-        setServersList(old => [...old, server])
+        appStorage.serversList = [...(appStorage.serversList ?? []), server]
       } else {
-        const index = serversList.indexOf(serverEditScreen)
-        const { lastJoined } = serversList[index]
-        serversList[index] = { ...info, lastJoined }
-        setServersList([...serversList])
+        const index = appStorage.serversList?.indexOf(serverEditScreen)
+        if (index !== undefined) {
+          const { lastJoined } = appStorage.serversList![index]
+          appStorage.serversList![index] = { ...info, lastJoined }
+        }
       }
       setServerEditScreen(null)
     }}
@@ -262,9 +218,9 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
     } : serverEditScreen}
     onQsConnect={(info) => {
       const connectOptions: ConnectOptions = {
-        username: info.usernameOverride || defaultUsername,
+        username: info.usernameOverride || getCurrentUsername() || '',
         server: normalizeIp(info.ip),
-        proxy: info.proxyOverride || selectedProxy,
+        proxy: info.proxyOverride || getCurrentProxy(),
         botVersion: info.versionOverride,
         ignoreQs: true,
       }
@@ -304,11 +260,11 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
       }
 
       const lastJoinedUsername = serversListSorted.find(s => s.usernameOverride)?.usernameOverride
-      let username = overrides.usernameOverride || defaultUsername
+      let username = overrides.usernameOverride || getCurrentUsername() || ''
       if (!username) {
-        username = prompt('Username', lastJoinedUsername || '')
-        if (!username) return
-        setDefaultUsername(username)
+        const promptUsername = prompt('Enter username', lastJoinedUsername || '')
+        if (!promptUsername) return
+        username = promptUsername
       }
       let authenticatedAccount: AuthenticatedAccount | true | undefined
       if (overrides.authenticatedAccountOverride) {
@@ -321,15 +277,15 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
       const options = {
         username,
         server: normalizeIp(ip),
-        proxy: overrides.proxyOverride || selectedProxy,
+        proxy: overrides.proxyOverride || getCurrentProxy(),
         botVersion: overrides.versionOverride ?? /* legacy */ overrides['version'],
         ignoreQs: true,
         autoLoginPassword: server?.autoLogin?.[username],
         authenticatedAccount,
         saveServerToHistory: shouldSave,
         onSuccessfulPlay () {
-          if (shouldSave && !serversList.some(s => s.ip === ip)) {
-            const newServersList: StoreServerItem[] = [...serversList, {
+          if (shouldSave && !serversListDisplay.some(s => s.ip === ip)) {
+            const newServersList: StoreServerItem[] = [...serversListDisplay, {
               ip,
               lastJoined: Date.now(),
               versionOverride: overrides.versionOverride,
@@ -341,10 +297,10 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
 
           if (shouldSave === undefined) { // loading saved
             // find and update
-            const server = serversList.find(s => s.ip === ip)
+            const server = serversListDisplay.find(s => s.ip === ip)
             if (server) {
               // move to top
-              const newList = [...serversList]
+              const newList = [...serversListDisplay]
               const index = newList.indexOf(server)
               const thisItem = newList[index]
               newList.splice(index, 1)
@@ -352,40 +308,31 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
 
               server.lastJoined = Date.now()
               server.numConnects = (server.numConnects || 0) + 1
-              setNewServersList(serversList)
+              setNewServersList(newList)
             }
           }
-
-          // save new selected proxy (if new)
-          if (!proxies.includes(selectedProxy)) {
-            // setProxies([...proxies, selectedProxy])
-            localStorage.setItem('proxies', JSON.stringify([...proxies, selectedProxy]))
-          }
-          saveNewProxy()
         },
-        serverIndex: shouldSave ? serversList.length.toString() : indexOrIp // assume last
+        serverIndex: shouldSave ? serversListDisplay.length.toString() : indexOrIp // assume last
       } satisfies ConnectOptions
       dispatchEvent(new CustomEvent('connect', { detail: options }))
       // qsOptions
     }}
     lockedEditing={!!customServersList}
-    username={defaultUsername}
-    setUsername={setDefaultUsername}
     setQuickConnectIp={setQuickConnectIp}
     onProfileClick={async () => {
       const username = await showOptionsModal('Select authenticated account to remove', authenticatedAccounts.map(a => a.username))
       if (!username) return
-      setAuthenticatedAccounts(authenticatedAccounts.filter(a => a.username !== username))
+      appStorage.authenticatedAccounts = authenticatedAccounts.filter(a => a.username !== username)
     }}
     onWorldAction={(action, index) => {
-      const server = serversList[index]
+      const server = serversListDisplay[index]
       if (!server) return
 
       if (action === 'edit') {
         setServerEditScreen(server)
       }
       if (action === 'delete') {
-        setServersList(old => old.filter(s => s !== server))
+        appStorage.serversList = appStorage.serversList!.filter(s => s !== server)
       }
     }}
     onGeneralAction={(action) => {
@@ -397,7 +344,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
       }
     }}
     worldData={serversListSorted.map(server => {
-      const additional = additionalData[server.ip]
+      const additional = additionalServerData[server.ip]
       return {
         name: server.index.toString(),
         title: server.name || server.ip,
@@ -410,27 +357,11 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         group: 'Your Servers'
       }
     })}
-    initialProxies={{
-      proxies,
-      selected: selectedProxy,
-    }}
-    updateProxies={({ proxies, selected }) => {
-      // new proxy is saved in joinServer
-      setProxies(proxies)
-      setSelectedProxy(selected)
-    }}
     hidden={hidden}
     onRowSelect={(_, i) => {
       setSelectedIndex(i)
     }}
     selectedRow={selectedIndex}
-    serverHistory={getServerConnectionHistory()
-      .sort((a, b) => b.numConnects - a.numConnects)
-      .map(server => ({
-        ip: server.ip,
-        versionOverride: server.version,
-        numConnects: server.numConnects
-      }))}
   />
   return <>
     {serversListJsx}
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
new file mode 100644
index 00000000..30caa0ec
--- /dev/null
+++ b/src/react/appStorageProvider.ts
@@ -0,0 +1,135 @@
+import { proxy, ref, subscribe } from 'valtio'
+import { UserOverridesConfig } from 'contro-max/build/types/store'
+import { subscribeKey } from 'valtio/utils'
+import { CustomCommand } from './KeybindingsCustom'
+import { AuthenticatedAccount } from './serversStorage'
+import type { BaseServerInfo } from './AddServerOrConnect'
+
+// when opening html file locally in browser, localStorage is shared between all ever opened html files, so we try to avoid conflicts
+const localStoragePrefix = process.env?.SINGLE_FILE_BUILD ? 'minecraft-web-client:' : ''
+
+export interface SavedProxiesData {
+  proxies: string[]
+  selected: string
+}
+
+export interface ServerHistoryEntry {
+  ip: string
+  version?: string
+  numConnects: number
+  lastConnected: number
+}
+
+export interface StoreServerItem extends BaseServerInfo {
+  lastJoined?: number
+  description?: string
+  optionsOverride?: Record<string, any>
+  autoLogin?: Record<string, string>
+  numConnects?: number // Track number of connections
+}
+
+type StorageData = {
+  customCommands: Record<string, CustomCommand> | undefined
+  username: string | undefined
+  keybindings: UserOverridesConfig | undefined
+  options: any
+  proxiesData: SavedProxiesData | undefined
+  serversHistory: ServerHistoryEntry[]
+  authenticatedAccounts: AuthenticatedAccount[]
+  serversList: StoreServerItem[] | undefined
+}
+
+const oldKeysAliases: Partial<Record<keyof StorageData, string>> = {
+  serversHistory: 'serverConnectionHistory',
+}
+
+const migrateLegacyData = () => {
+  const proxies = localStorage.getItem('proxies')
+  const selectedProxy = localStorage.getItem('selectedProxy')
+  if (proxies && selectedProxy) {
+    appStorage.proxiesData = {
+      proxies: JSON.parse(proxies),
+      selected: selectedProxy,
+    }
+  }
+
+  const username = localStorage.getItem('username')
+  if (username && !username.startsWith('"')) {
+    appStorage.username = username
+  }
+
+  const serversHistoryLegacy = localStorage.getItem('serverConnectionHistory')
+  if (serversHistoryLegacy) {
+    appStorage.serversHistory = JSON.parse(serversHistoryLegacy)
+  }
+  localStorage.removeItem('proxies')
+  localStorage.removeItem('selectedProxy')
+  localStorage.removeItem('serverConnectionHistory')
+}
+
+const defaultStorageData: StorageData = {
+  customCommands: undefined,
+  username: undefined,
+  keybindings: undefined,
+  options: {},
+  proxiesData: undefined,
+  serversHistory: [],
+  authenticatedAccounts: [],
+  serversList: undefined,
+}
+
+export const setStorageDataOnAppConfigLoad = () => {
+  appStorage.username ??= `mcrafter${Math.floor(Math.random() * 1000)}`
+}
+
+export const appStorage = proxy({ ...defaultStorageData })
+window.appStorage = appStorage
+
+// Restore data from localStorage
+for (const key of Object.keys(defaultStorageData)) {
+  const prefixedKey = `${localStoragePrefix}${key}`
+  const aliasedKey = oldKeysAliases[key]
+  const storedValue = localStorage.getItem(prefixedKey) ?? (aliasedKey ? localStorage.getItem(aliasedKey) : undefined)
+  if (storedValue) {
+    try {
+      const parsed = JSON.parse(storedValue)
+      // appStorage[key] = parsed && typeof parsed === 'object' ? ref(parsed) : parsed
+      appStorage[key] = parsed
+    } catch (e) {
+      console.error(`Failed to parse stored value for ${key}:`, e)
+    }
+  }
+}
+
+const saveKey = (key: keyof StorageData) => {
+  const prefixedKey = `${localStoragePrefix}${key}`
+  const value = appStorage[key]
+  if (value === undefined) {
+    localStorage.removeItem(prefixedKey)
+  } else {
+    localStorage.setItem(prefixedKey, JSON.stringify(value))
+  }
+}
+
+subscribe(appStorage, (ops) => {
+  for (const op of ops) {
+    const [type, path, value] = op
+    const key = path[0]
+    saveKey(key as keyof StorageData)
+  }
+})
+// Subscribe to changes and save to localStorage
+
+export const resetAppStorage = () => {
+  for (const key of Object.keys(appStorage)) {
+    appStorage[key as keyof StorageData] = defaultStorageData[key as keyof StorageData]
+  }
+
+  for (const key of Object.keys(localStorage)) {
+    if (key.startsWith(localStoragePrefix)) {
+      localStorage.removeItem(key)
+    }
+  }
+}
+
+migrateLegacyData()
diff --git a/src/react/serversStorage.ts b/src/react/serversStorage.ts
index 74f51a8d..b2edb6ea 100644
--- a/src/react/serversStorage.ts
+++ b/src/react/serversStorage.ts
@@ -1,16 +1,10 @@
 import { appQueryParams } from '../appParams'
 import { miscUiState } from '../globalState'
 import { BaseServerInfo } from './AddServerOrConnect'
+import { appStorage, StoreServerItem } from './appStorageProvider'
 
 const serversListQs = appQueryParams.serversList
 
-export interface StoreServerItem extends BaseServerInfo {
-  lastJoined?: number
-  description?: string
-  optionsOverride?: Record<string, any>
-  autoLogin?: Record<string, string>
-  numConnects?: number // Track number of connections
-}
 export interface AuthenticatedAccount {
   // type: 'microsoft'
   username: string
@@ -19,6 +13,7 @@ export interface AuthenticatedAccount {
     expiresOn: number
   }
 }
+
 export interface ServerConnectionHistory {
   ip: string
   numConnects: number
@@ -28,7 +23,7 @@ export interface ServerConnectionHistory {
 
 export function updateServerConnectionHistory (ip: string, version?: string) {
   try {
-    const history: ServerConnectionHistory[] = JSON.parse(localStorage.getItem('serverConnectionHistory') || '[]')
+    const history = [...(appStorage.serversHistory ?? [])]
     const existingServer = history.find(s => s.ip === ip)
     if (existingServer) {
       existingServer.numConnects++
@@ -42,53 +37,35 @@ export function updateServerConnectionHistory (ip: string, version?: string) {
         version
       })
     }
-    localStorage.setItem('serverConnectionHistory', JSON.stringify(history))
+    appStorage.serversHistory = history
   } catch (err) {
     console.error('Failed to update server connection history:', err)
   }
 }
+
 export const updateLoadedServerData = (callback: (data: StoreServerItem) => StoreServerItem, index = miscUiState.loadedServerIndex) => {
   if (!index) index = miscUiState.loadedServerIndex
   if (!index) return
-  // function assumes component is not mounted to avoid sync issues after save
-  const servers = getInitialServersList()
+
+  const servers = [...(appStorage.serversList ?? [])]
   const server = servers[index]
   servers[index] = callback(server)
   setNewServersList(servers)
 }
+
 export const setNewServersList = (serversList: StoreServerItem[], force = false) => {
   if (serversListQs && !force) return
-  localStorage['serversList'] = JSON.stringify(serversList)
-
-  // cleanup legacy
-  localStorage.removeItem('serverHistory')
-  localStorage.removeItem('server')
-  localStorage.removeItem('password')
-  localStorage.removeItem('version')
+  appStorage.serversList = serversList
 }
+
 export const getInitialServersList = () => {
-  if (localStorage['serversList']) return JSON.parse(localStorage['serversList']) as StoreServerItem[]
+  // If we already have servers in appStorage, use those
+  if (appStorage.serversList) return appStorage.serversList
 
   const servers = [] as StoreServerItem[]
 
-  const legacyServersList = localStorage['serverHistory'] ? JSON.parse(localStorage['serverHistory']) as string[] : null
-  if (legacyServersList) {
-    for (const server of legacyServersList) {
-      if (!server || localStorage['server'] === server) continue
-      servers.push({ ip: server, lastJoined: Date.now() })
-    }
-  }
-
-  if (localStorage['server']) {
-    const legacyLastJoinedServer: StoreServerItem = {
-      ip: localStorage['server'],
-      versionOverride: localStorage['version'],
-      lastJoined: Date.now()
-    }
-    servers.push(legacyLastJoinedServer)
-  }
-
-  if (servers.length === 0) { // server list is empty, let's suggest some
+  if (servers.length === 0) {
+    // server list is empty, let's suggest some
     for (const server of miscUiState.appConfig?.promoteServers ?? []) {
       servers.push({
         ip: server.ip,
@@ -100,16 +77,13 @@ export const getInitialServersList = () => {
 
   return servers
 }
+
 export const updateAuthenticatedAccountData = (callback: (data: AuthenticatedAccount[]) => AuthenticatedAccount[]) => {
-  const accounts = JSON.parse(localStorage['authenticatedAccounts'] || '[]') as AuthenticatedAccount[]
+  const accounts = appStorage.authenticatedAccounts
   const newAccounts = callback(accounts)
-  localStorage['authenticatedAccounts'] = JSON.stringify(newAccounts)
+  appStorage.authenticatedAccounts = newAccounts
 }
 
 export function getServerConnectionHistory (): ServerConnectionHistory[] {
-  try {
-    return JSON.parse(localStorage.getItem('serverConnectionHistory') || '[]')
-  } catch {
-    return []
-  }
+  return appStorage.serversHistory ?? []
 }
diff --git a/src/react/storageProvider.ts b/src/react/storageProvider.ts
deleted file mode 100644
index df97d228..00000000
--- a/src/react/storageProvider.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { CustomCommand } from './KeybindingsCustom'
-
-type StorageData = {
-  customCommands: Record<string, CustomCommand>
-  // ...
-}
-
-export const getStoredValue = <T extends keyof StorageData> (name: T): StorageData[T] | undefined => {
-  return localStorage[name] ? JSON.parse(localStorage[name]) : undefined
-}
-export const setStoredValue = <T extends keyof StorageData> (name: T, value: StorageData[T]) => {
-  localStorage[name] = JSON.stringify(value)
-}

From 5bb09a88bcb10ea61727ca0d18e55ae512e22840 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 17 Mar 2025 20:08:32 +0300
Subject: [PATCH 351/753] fix: dont confuse with incorrect version display,
 allow to use config values as params in real time

---
 src/api/mcStatusApi.ts            |  4 ++--
 src/appParams.ts                  |  5 +++--
 src/globalState.ts                |  7 +------
 src/react/ServersListProvider.tsx | 13 ++++++++-----
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/api/mcStatusApi.ts b/src/api/mcStatusApi.ts
index 20d27813..8ac429dd 100644
--- a/src/api/mcStatusApi.ts
+++ b/src/api/mcStatusApi.ts
@@ -15,7 +15,7 @@ export const isServerValid = (ip: string) => {
   return !isInLocalNetwork && VALID_IP_OR_DOMAIN
 }
 
-export async function fetchServerStatus (ip: string, signal?: AbortSignal) {
+export async function fetchServerStatus (ip: string, signal?: AbortSignal, versionOverride?: string) {
   if (!isServerValid(ip)) return
 
   const response = await fetch(`https://api.mcstatus.io/v2/status/java/${ip}`, { signal })
@@ -25,7 +25,7 @@ export async function fetchServerStatus (ip: string, signal?: AbortSignal) {
   return {
     formattedText: data.motd?.raw ?? '',
     textNameRight: data.online ?
-            `${versionClean} ${data.players?.online ?? '??'}/${data.players?.max ?? '??'}` :
+      `${versionOverride ?? versionClean} ${data.players?.online ?? '??'}/${data.players?.max ?? '??'}` :
       '',
     icon: data.icon,
     offline: !data.online,
diff --git a/src/appParams.ts b/src/appParams.ts
index 98d6ff62..b550ea02 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -1,4 +1,5 @@
 import type { AppConfig } from './appConfig'
+import { miscUiState } from './globalState'
 
 const qsParams = new URLSearchParams(window.location?.search ?? '')
 
@@ -73,7 +74,7 @@ export const appQueryParams = new Proxy<AppQsParams>({} as AppQsParams, {
     }
     const qsParam = qsParams.get(property)
     if (qsParam) return qsParam
-    return initialAppConfig.appParams?.[property]
+    return miscUiState.appConfig?.appParams?.[property]
   },
 })
 
@@ -84,7 +85,7 @@ export const appQueryParamsArray = new Proxy({} as AppQsParamsArrayTransformed,
     }
     const qsParam = qsParams.getAll(property)
     if (qsParam.length) return qsParam
-    return initialAppConfig.appParams?.[property] ?? []
+    return miscUiState.appConfig?.appParams?.[property] ?? []
   },
 })
 
diff --git a/src/globalState.ts b/src/globalState.ts
index 0ee8671d..2d77b720 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -3,17 +3,12 @@
 import { proxy, ref, subscribe } from 'valtio'
 import type { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
 import type { OptionsGroupType } from './optionsGuiScheme'
-import { appQueryParams } from './appParams'
 import { options, disabledSettings } from './optionsStorage'
 import { AppConfig } from './appConfig'
 
 // todo: refactor structure with support of hideNext=false
 
-const notHideableModalsWithoutForce = new Set(['app-status'])
-
-if (appQueryParams.lockConnect) {
-  notHideableModalsWithoutForce.add('editServer')
-}
+export const notHideableModalsWithoutForce = new Set(['app-status'])
 
 type Modal = ({ elem?: HTMLElement & Record<string, any> } & { reactType: string })
 
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index d107770f..2d1628a9 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from 'react'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { useSnapshot } from 'valtio'
 import { ConnectOptions } from '../connect'
-import { activeModalStack, hideCurrentModal, miscUiState, showModal } from '../globalState'
+import { activeModalStack, hideCurrentModal, miscUiState, notHideableModalsWithoutForce, showModal } from '../globalState'
 import supportedVersions from '../supportedVersions.mjs'
 import { appQueryParams } from '../appParams'
 import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
@@ -17,6 +17,10 @@ import { useCopyKeybinding } from './simpleHooks'
 import { AuthenticatedAccount, getInitialServersList, getServerConnectionHistory, setNewServersList } from './serversStorage'
 import { appStorage, StoreServerItem } from './appStorageProvider'
 
+if (appQueryParams.lockConnect) {
+  notHideableModalsWithoutForce.add('editServer')
+}
+
 type AdditionalDisplayData = {
   textNameRightGrayed: string
   formattedText: string
@@ -25,8 +29,6 @@ type AdditionalDisplayData = {
   offline?: boolean
 }
 
-const serversListQs = appQueryParams.serversList
-
 // todo move to base
 const normalizeIp = (ip: string) => ip.replace(/https?:\/\//, '').replace(/\/(:|$)/, '')
 
@@ -137,7 +139,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
                   offline: false
                 }
               } else {
-                data = await fetchServerStatus(server.ip/* , signal */) // DONT ADD SIGNAL IT WILL CRUSH JS RUNTIME
+                data = await fetchServerStatus(server.ip, /* signal */undefined, server.versionOverride) // DONT ADD SIGNAL IT WILL CRUSH JS RUNTIME
               }
               if (data) {
                 setAdditionalServerData(old => ({
@@ -370,6 +372,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
 }
 
 export default () => {
+  const serversListQs = appQueryParams.serversList
   const [customServersList, setCustomServersList] = useState<string[] | undefined>(serversListQs ? [] : undefined)
 
   useEffect(() => {
@@ -386,7 +389,7 @@ export default () => {
         setCustomServersList(serversListQs.split(','))
       }
     }
-  }, [])
+  }, [serversListQs])
 
   const modalStack = useSnapshot(activeModalStack)
   const hasServersListModal = modalStack.some(x => x.reactType === 'serversList')

From 1b96577402b75af77c8876b0456c570c03be3ef4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 17 Mar 2025 20:09:57 +0300
Subject: [PATCH 352/753] update group name

---
 src/react/ServersListProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 2d1628a9..d7662864 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -356,7 +356,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         worldNameRightGrayed: additional?.textNameRightGrayed ?? '',
         iconSrc: additional?.icon,
         offline: additional?.offline,
-        group: 'Your Servers'
+        group: customServersList ? 'Provided Servers' : 'Saved Servers'
       }
     })}
     hidden={hidden}

From c1012a77d0e03b16cdf2198cef40d1336e859fa9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 17 Mar 2025 20:14:39 +0300
Subject: [PATCH 353/753] should also export servers list when requested, fix
 versions slider

---
 src/optionsGuiScheme.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 5851dd8d..ac0503ca 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -2,6 +2,7 @@ import { useRef, useState } from 'react'
 import { useSnapshot } from 'valtio'
 import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { noCase } from 'change-case'
+import { versionToNumber } from 'mc-assets/dist/utils'
 import { gameAdditionalState, miscUiState, openOptionsMenu, showModal } from './globalState'
 import { AppOptions, getChangedSettings, options, resetOptions } from './optionsStorage'
 import Button from './react/Button'
@@ -512,7 +513,7 @@ export const guiOptionsScheme: {
     {
       custom () {
         const { serversAutoVersionSelect } = useSnapshot(options)
-        const allVersions = [...supportedVersions, 'latest', 'auto']
+        const allVersions = [...[...supportedVersions].sort((a, b) => versionToNumber(a) - versionToNumber(b)), 'latest', 'auto']
         const currentIndex = allVersions.indexOf(serversAutoVersionSelect)
 
         const getDisplayValue = (version: string) => {
@@ -525,10 +526,11 @@ export const guiOptionsScheme: {
         return <div style={{ display: 'flex', justifyContent: 'space-between' }}>
           <Slider
             style={{ width: 150 }}
-            label='Server Version'
+            label='Prefer Server Version'
             value={currentIndex}
             min={0}
             max={allVersions.length - 1}
+            unit=''
             valueDisplay={getDisplayValue(serversAutoVersionSelect)}
             updateValue={(newVal) => {
               options.serversAutoVersionSelect = allVersions[newVal]
@@ -588,6 +590,9 @@ export const guiOptionsScheme: {
               ...data.exportKeybindings ? {
                 keybindings: customKeymaps,
               } : {},
+              ...data.exportServers ? {
+                servers: appStorage.serversList,
+              } : {},
               ...data.saveUsernameAndProxy ? {
                 username: appStorage.username,
                 proxy: appStorage.proxiesData?.selected,

From 2277020de7cdc59b31c77f404721481a4b1dd2c0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 18 Mar 2025 21:46:44 +0300
Subject: [PATCH 354/753] fix swing animations and improve replay server
 functions

---
 package.json                        |  4 +-
 pnpm-lock.yaml                      | 57 ++++++++++++++++++++++-------
 src/controls.ts                     | 19 +++++++---
 src/downloadAndOpenFile.ts          | 34 ++++++++++++++++-
 src/index.ts                        |  8 ++--
 src/packetsReplay/replayPackets.ts  | 20 ++++++++++
 src/react/PacketsReplayProvider.tsx |  2 +-
 7 files changed, 118 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index 9dd43eaf..cd8c25ff 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "mojangson": "^2.0.4",
     "net-browserify": "github:zardoy/prismarinejs-net-browserify",
     "node-gzip": "^1.1.2",
-    "mcraft-fun-mineflayer": "^0.1.12",
+    "mcraft-fun-mineflayer": "^0.1.14",
     "peerjs": "^1.5.0",
     "pixelarticons": "^1.8.1",
     "pretty-bytes": "^6.1.1",
@@ -151,7 +151,7 @@
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
     "mc-assets": "^0.2.42",
-    "mineflayer-mouse": "^0.1.1",
+    "mineflayer-mouse": "^0.1.2",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d8d28545..9093dfc0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -135,8 +135,8 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       mcraft-fun-mineflayer:
-        specifier: ^0.1.12
-        version: 0.1.12(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13))
+        specifier: ^0.1.14
+        version: 0.1.14(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -362,8 +362,8 @@ importers:
         specifier: github:zardoy/mineflayer
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.1
-        version: 0.1.1(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+        specifier: ^0.1.2
+        version: 0.1.2(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -6694,9 +6694,9 @@ packages:
     resolution: {integrity: sha512-j2D1RNYtB5Z9gFu9MVjyDBbiALI0mWZ3xW/A3PPefVAHm3HJ2T1vH+1XBov1spBGPl7u+Zo7mRXza3X0egbeOg==}
     engines: {node: '>=18.0.0'}
 
-  mcraft-fun-mineflayer@0.1.12:
-    resolution: {integrity: sha512-BhfkagVJX+QmD/dt3qNQS5f7g3/7NI//OfSW4VnRolCnZtrLU8ekr59bLRcNmUWsvtTjkg+wbMeXwclHshSWOA==}
-    version: 0.1.12
+  mcraft-fun-mineflayer@0.1.14:
+    resolution: {integrity: sha512-q/qXQaNbkGJIvXjRvudUT7/k0EsJgphFcvYjrSRWYyGDJeb61MKRVqq1hhMjqx7UK7FMfBKvjfPSxq/QlAP7WQ==}
+    version: 0.1.14
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       '@roamhq/wrtc': '*'
@@ -6904,6 +6904,11 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8}
     version: 1.0.1
 
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1}
+    version: 1.54.0
+    engines: {node: '>=22'}
+
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d:
     resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d}
     version: 1.54.0
@@ -6920,8 +6925,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.1:
-    resolution: {integrity: sha512-7jKN+6pIGtQVfYxEIm4tA9CYwTS8Mgn/qJ2wyhrAoIEW8smCHUu0kj5Sdo0TwTCdlOQClKt8aEBZ13E7MGqOhg==}
+  mineflayer-mouse@0.1.2:
+    resolution: {integrity: sha512-QPGEXkF9PurZEpRq0xakKE8SV6sMY/6kCM9cdMeFbtq95IpYeh8ZJdD/twX2A3g3s8MooxlGovfxbpeHdWcOEQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.4:
@@ -13607,7 +13612,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.2.3
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -17588,11 +17593,11 @@ snapshots:
       maxrects-packer: 2.7.3
       zod: 3.24.1
 
-  mcraft-fun-mineflayer@0.1.12(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.14(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.0
@@ -17901,6 +17906,32 @@ snapshots:
       - '@types/react'
       - react
 
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13):
+    dependencies:
+      '@types/node-rsa': 1.1.4
+      '@types/readable-stream': 4.0.12
+      aes-js: 3.1.2
+      buffer-equal: 1.0.1
+      debug: 4.4.0(supports-color@8.1.1)
+      endian-toggle: 0.0.0
+      lodash.get: 4.4.2
+      lodash.merge: 4.6.2
+      minecraft-data: 3.83.1
+      minecraft-folder-path: 1.2.0
+      node-fetch: 2.7.0(encoding@0.1.13)
+      node-rsa: 0.4.2
+      prismarine-auth: 2.4.2(encoding@0.1.13)
+      prismarine-chat: 1.10.1
+      prismarine-nbt: 2.5.0
+      prismarine-realms: 1.3.2(encoding@0.1.13)
+      protodef: 1.18.0
+      readable-stream: 4.5.2
+      uuid-1345: 1.0.2
+      yggdrasil: 1.7.0(encoding@0.1.13)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
@@ -17958,7 +17989,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.1(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  mineflayer-mouse@0.1.2(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
     dependencies:
       change-case: 5.4.4
       debug: 4.4.0(supports-color@8.1.1)
diff --git a/src/controls.ts b/src/controls.ts
index 69b94636..98d32062 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -8,6 +8,7 @@ import { ControMax } from 'contro-max/build/controMax'
 import { CommandEventArgument, SchemaCommandInput } from 'contro-max/build/types'
 import { stringStartsWith } from 'contro-max/build/stringUtils'
 import { UserOverrideCommand, UserOverridesConfig } from 'contro-max/build/types/store'
+import { GameMode } from 'mineflayer'
 import { isGameActive, showModal, gameAdditionalState, activeModalStack, hideCurrentModal, miscUiState, hideModal, hideAllModals } from './globalState'
 import { goFullscreen, isInRealGameSession, pointerLock, reloadChunks } from './utils'
 import { options } from './optionsStorage'
@@ -26,6 +27,7 @@ import { lastConnectOptions } from './react/AppStatusProvider'
 import { onCameraMove, onControInit } from './cameraRotationControls'
 import { createNotificationProgressReporter } from './core/progressReporter'
 import { appStorage } from './react/appStorageProvider'
+import { switchGameMode } from './packetsReplay/replayPackets'
 
 
 export const customKeymaps = proxy(appStorage.keybindings)
@@ -637,29 +639,35 @@ export const f3Keybinds: Array<{
   {
     key: 'F4',
     async action () {
+      let nextGameMode: GameMode
       switch (bot.game.gameMode) {
         case 'creative': {
-          bot.chat('/gamemode survival')
+          nextGameMode = 'survival'
 
           break
         }
         case 'survival': {
-          bot.chat('/gamemode adventure')
+          nextGameMode = 'adventure'
 
           break
         }
         case 'adventure': {
-          bot.chat('/gamemode spectator')
+          nextGameMode = 'spectator'
 
           break
         }
         case 'spectator': {
-          bot.chat('/gamemode creative')
+          nextGameMode = 'creative'
 
           break
         }
       // No default
       }
+      if (lastConnectOptions.value?.worldStateFileContents) {
+        switchGameMode(nextGameMode)
+      } else {
+        bot.chat(`/gamemode ${nextGameMode}`)
+      }
     },
     mobileTitle: 'Cycle Game Mode'
   },
@@ -810,15 +818,16 @@ let allowFlying = false
 export const onBotCreate = () => {
   let wasSpectatorFlying = false
   bot._client.on('abilities', ({ flags }) => {
+    allowFlying = !!(flags & 4)
     if (flags & 2) { // flying
       toggleFly(true, false)
     } else {
       toggleFly(false, false)
     }
-    allowFlying = !!(flags & 4)
   })
   const gamemodeCheck = () => {
     if (bot.game.gameMode === 'spectator') {
+      allowFlying = true
       toggleFly(true, false)
       wasSpectatorFlying = true
     } else if (wasSpectatorFlying) {
diff --git a/src/downloadAndOpenFile.ts b/src/downloadAndOpenFile.ts
index 870a70b1..78cd6984 100644
--- a/src/downloadAndOpenFile.ts
+++ b/src/downloadAndOpenFile.ts
@@ -13,13 +13,43 @@ export const getFixedFilesize = (bytes: number) => {
 const inner = async () => {
   const { replayFileUrl } = appQueryParams
   if (replayFileUrl) {
-    setLoadingScreenStatus('Downloading replay file...')
+    setLoadingScreenStatus('Downloading replay file')
     const response = await fetch(replayFileUrl)
     const contentLength = response.headers?.get('Content-Length')
     const size = contentLength ? +contentLength : undefined
     const filename = replayFileUrl.split('/').pop()
 
-    const contents = await response.text()
+    let downloadedBytes = 0
+    const buffer = await new Response(new ReadableStream({
+      async start (controller) {
+        if (!response.body) throw new Error('Server returned no response!')
+        const reader = response.body.getReader()
+
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+          const { done, value } = await reader.read()
+
+          if (done) {
+            controller.close()
+            break
+          }
+
+          downloadedBytes += value.byteLength
+
+          // Calculate download progress as a percentage
+          const progress = size ? (downloadedBytes / size) * 100 : undefined
+          setLoadingScreenStatus(`Download replay file progress: ${progress === undefined ? '?' : Math.floor(progress)}% (${getFixedFilesize(downloadedBytes)} / ${size && getFixedFilesize(size)})`, false, true)
+
+          // Pass the received data to the controller
+          controller.enqueue(value)
+        }
+      },
+    })).arrayBuffer()
+
+    // Convert buffer to text, handling any compression automatically
+    const decoder = new TextDecoder()
+    const contents = decoder.decode(buffer)
+
     openFile({
       contents,
       filename,
diff --git a/src/index.ts b/src/index.ts
index 83f9f289..45593447 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -781,11 +781,13 @@ export async function connect (connectOptions: ConnectOptions) {
     setLoadingScreenStatus('Placing blocks (starting viewer)')
     if (!connectOptions.worldStateFileContents || connectOptions.worldStateFileContents.length < 3 * 1024 * 1024) {
       localStorage.lastConnectOptions = JSON.stringify(connectOptions)
+      if (process.env.NODE_ENV === 'development' && !localStorage.lockUrl && !Object.keys(window.debugQueryParams).length) {
+        lockUrl()
+      }
+    } else {
+      localStorage.removeItem('lastConnectOptions')
     }
     connectOptions.onSuccessfulPlay?.()
-    if (process.env.NODE_ENV === 'development' && !localStorage.lockUrl && !Object.keys(window.debugQueryParams).length) {
-      lockUrl()
-    }
     updateDataAfterJoin()
     if (connectOptions.autoLoginPassword) {
       bot.chat(`/login ${connectOptions.autoLoginPassword}`)
diff --git a/src/packetsReplay/replayPackets.ts b/src/packetsReplay/replayPackets.ts
index 13891899..f1c85a94 100644
--- a/src/packetsReplay/replayPackets.ts
+++ b/src/packetsReplay/replayPackets.ts
@@ -3,6 +3,7 @@ import { createServer, ServerClient } from 'minecraft-protocol'
 import { ParsedReplayPacket, parseReplayContents } from 'mcraft-fun-mineflayer/build/packetsLogger'
 import { PACKETS_REPLAY_FILE_EXTENSION, WORLD_STATE_FILE_EXTENSION } from 'mcraft-fun-mineflayer/build/worldState'
 import MinecraftData from 'minecraft-data'
+import { GameMode } from 'mineflayer'
 import { LocalServer } from '../customServer'
 import { UserError } from '../mineflayer/userError'
 import { packetsReplayState } from '../react/state/packetsReplayState'
@@ -231,6 +232,25 @@ const mainPacketsReplayer = async (client: ServerClient, packets: ParsedReplayPa
   }
 }
 
+export const switchGameMode = (gameMode: GameMode) => {
+  const gamemodes = {
+    survival: 0,
+    creative: 1,
+    adventure: 2,
+    spectator: 3
+  }
+  if (gameMode === 'spectator') {
+    bot._client.emit('abilities', {
+    // can fly + is flying
+      flags: 6
+    })
+  }
+  bot._client.emit('game_state_change', {
+    reason: 3,
+    gameMode: gamemodes[gameMode]
+  })
+}
+
 interface PacketsWaiterOptions {
   unexpectedPacketReceived?: (name: string, params: any) => void
   expectedPacketReceived?: (name: string, params: any) => void
diff --git a/src/react/PacketsReplayProvider.tsx b/src/react/PacketsReplayProvider.tsx
index 782134c2..8ffd1f6b 100644
--- a/src/react/PacketsReplayProvider.tsx
+++ b/src/react/PacketsReplayProvider.tsx
@@ -22,7 +22,7 @@ export default function PacketsReplayProvider () {
   return (
     <ReplayPanel
       style={{
-        transform: 'scale(0.5)',
+        transform: 'scale(0.4)',
         transformOrigin: 'top right'
       }}
       replayName={state.replayName}

From ba0287f278216fdcc68302cb993f2701c77e2db1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 20 Mar 2025 04:19:11 +0300
Subject: [PATCH 355/753] fix: preserve list of initial servers when adding
 server, add always to top feat: focus server ip input on adding or editing

---
 src/react/AddServerOrConnect.tsx  | 1 +
 src/react/ServersListProvider.tsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index c25db793..08ef7f29 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -157,6 +157,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
         <InputWithLabel
           required
           label="Server IP"
+          autoFocus={!lockConnect}
           value={serverIp}
           disabled={lockConnect && parsedQsIp.host !== null}
           onChange={({ target: { value } }) => {
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index d7662864..fd4cdead 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -204,7 +204,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
       if (!serverEditScreen) return
       if (serverEditScreen === true) {
         const server: StoreServerItem = { ...info, lastJoined: Date.now() } // so it appears first
-        appStorage.serversList = [...(appStorage.serversList ?? []), server]
+        appStorage.serversList = [server, ...(appStorage.serversList ?? serversListDisplay)]
       } else {
         const index = appStorage.serversList?.indexOf(serverEditScreen)
         if (index !== undefined) {

From 8714fd484b5d5be34301e0751f2f9ee3d913808d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 20 Mar 2025 04:23:12 +0300
Subject: [PATCH 356/753] fix: fix resource pack = never

---
 src/resourcePack.ts | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index fd01168a..81bd3ac6 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -449,26 +449,34 @@ export const onAppLoad = () => {
   customEvents.on('mineflayerBotCreated', () => {
     // todo also handle resourcePack
     const handleResourcePackRequest = async (packet) => {
+      const start = Date.now()
       console.log('Received resource pack request', packet)
-      if (options.serverResourcePacks === 'never') return
       const promptMessagePacket = ('promptMessage' in packet && packet.promptMessage) ? packet.promptMessage : undefined
       const promptMessageText = promptMessagePacket ? '' : 'Do you want to use server resource pack?'
       // TODO!
       const hash = 'hash' in packet ? packet.hash : '-'
       const forced = 'forced' in packet ? packet.forced : false
-      const choice = options.serverResourcePacks === 'always'
-        ? true
-        : await showOptionsModal(promptMessageText, ['Download & Install (recommended)', 'Pretend Installed (not recommended)'], {
-          cancel: !forced,
-          minecraftJsonMessage: promptMessagePacket,
+      const choice = options.serverResourcePacks === 'never'
+        ? false
+        : options.serverResourcePacks === 'always'
+          ? true
+          : await showOptionsModal(promptMessageText, ['Download & Install (recommended)', 'Pretend Installed (not recommended)'], {
+            cancel: !forced,
+            minecraftJsonMessage: promptMessagePacket,
+          })
+      if (Date.now() - start < 700) { // wait for state protocol switch
+        await new Promise(resolve => {
+          setTimeout(resolve, 700)
         })
+      }
+      if (choice === false) {
+        bot.acceptResourcePack()
+        return
+      }
       if (!choice) {
         bot.denyResourcePack()
         return
       }
-      await new Promise(resolve => {
-        setTimeout(resolve, 500)
-      })
       console.log('accepting resource pack')
       bot.acceptResourcePack()
       if (choice === true || choice === 'Download & Install (recommended)') {

From b0eb73cd76092c2d369adbe64e7496e578eb2b84 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 20 Mar 2025 04:33:26 +0300
Subject: [PATCH 357/753] proper functionality for packets recording at any
 time: only via console for now

---
 src/mineflayer/plugins/packetsRecording.ts | 35 +++++++++++++++++-----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/mineflayer/plugins/packetsRecording.ts b/src/mineflayer/plugins/packetsRecording.ts
index a6b761e7..53a63bd8 100644
--- a/src/mineflayer/plugins/packetsRecording.ts
+++ b/src/mineflayer/plugins/packetsRecording.ts
@@ -26,20 +26,39 @@ export const localRelayServerPlugin = (bot: Bot) => {
     })
   )
 
-  bot.downloadCurrentWorldState = () => {
-    const worldState = bot.webViewer._unstable.createStateCaptureFile()
+  const downloadFile = (contents: string, filename: string) => {
     const a = document.createElement('a')
-    const textContents = worldState.contents
-    const blob = new Blob([textContents], { type: 'text/plain' })
+    const blob = new Blob([contents], { type: 'text/plain' })
     const url = URL.createObjectURL(blob)
     a.href = url
-    // add readable timestamp to filename
-    const timestamp = new Date().toISOString().replaceAll(/[-:Z]/g, '')
-    a.download = `${bot.username}-world-state-${timestamp}.${WORLD_STATE_FILE_EXTENSION}`
+    a.download = filename
     a.click()
     URL.revokeObjectURL(url)
   }
 
+  bot.downloadCurrentWorldState = () => {
+    const worldState = bot.webViewer._unstable.createStateCaptureFile()
+    // add readable timestamp to filename
+    const timestamp = new Date().toISOString().replaceAll(/[-:Z]/g, '')
+    downloadFile(worldState.contents, `${bot.username}-world-state-${timestamp}.${WORLD_STATE_FILE_EXTENSION}`)
+  }
+
+  let logger: PacketsLogger | undefined
+  bot.startPacketsRecording = () => {
+    bot.webViewer._unstable.startRecording((l) => {
+      logger = l
+    })
+  }
+
+  bot.stopPacketsRecording = () => {
+    if (!logger) return
+    const packets = logger?.contents
+    logger = undefined
+    const timestamp = new Date().toISOString().replaceAll(/[-:Z]/g, '')
+    downloadFile(packets, `${bot.username}-packets-${timestamp}.${PACKETS_REPLAY_FILE_EXTENSION}`)
+    bot.webViewer._unstable.stopRecording()
+  }
+
   circularBuffer = new CircularBuffer(AUTO_CAPTURE_PACKETS_COUNT)
   let position = 0
   bot._client.on('writePacket' as any, (name, params) => {
@@ -87,6 +106,8 @@ subscribe(packetsRecordingState, () => {
 declare module 'mineflayer' {
   interface Bot {
     downloadCurrentWorldState: () => void
+    startPacketsRecording: () => void
+    stopPacketsRecording: () => void
   }
 }
 

From 6b1a82a6b38b71f1aeed0b65e803630e2ccc3aba Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 20 Mar 2025 04:37:42 +0300
Subject: [PATCH 358/753] fix possible crash on non existing server data update

---
 src/react/serversStorage.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/react/serversStorage.ts b/src/react/serversStorage.ts
index b2edb6ea..b320e2f3 100644
--- a/src/react/serversStorage.ts
+++ b/src/react/serversStorage.ts
@@ -44,11 +44,12 @@ export function updateServerConnectionHistory (ip: string, version?: string) {
 }
 
 export const updateLoadedServerData = (callback: (data: StoreServerItem) => StoreServerItem, index = miscUiState.loadedServerIndex) => {
-  if (!index) index = miscUiState.loadedServerIndex
-  if (!index) return
+  if (index === undefined) index = miscUiState.loadedServerIndex
+  if (index === undefined) return
 
   const servers = [...(appStorage.serversList ?? [])]
   const server = servers[index]
+  if (!server) return
   servers[index] = callback(server)
   setNewServersList(servers)
 }

From abe75c7b8de371ed57dc7a775a40a71a677d5fd5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 20 Mar 2025 04:53:44 +0300
Subject: [PATCH 359/753] 10x inventory performance improvements in freq
 updated inventories eg roulettes

---
 src/inventoryWindows.ts | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 052fc664..303e91be 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -258,12 +258,25 @@ const getItemName = (slot: Item | RenderItem | null) => {
   return text.join('')
 }
 
+let lastMappedSots = [] as any[]
+const itemToVisualKey = (slot: RenderItem | Item | null) => {
+  if (!slot) return null
+  return slot.name + (slot['metadata'] ?? '-') + (slot.nbt ? JSON.stringify(slot.nbt) : '') + (slot['components'] ? JSON.stringify(slot['components']) : '')
+}
 const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
-  return slots.map((slot, i) => {
+  const newSlots = slots.map((slot, i) => {
     // todo stateid
     if (!slot) return
 
+    if (!isJei) {
+      const oldKey = itemToVisualKey(lastMappedSots[i])
+      if (oldKey && oldKey === itemToVisualKey(slot)) {
+        return lastMappedSots[i]
+      }
+    }
+
     try {
+      if (slot.durabilityUsed && slot.maxDurability) slot.durabilityUsed = Math.min(slot.durabilityUsed, slot.maxDurability)
       const debugIsQuickbar = !isJei && i === bot.inventory.hotbarStart + bot.quickBarSlot
       const modelName = getItemModelName(slot, { 'minecraft:display_context': 'gui', })
       const slotCustomProps = renderSlot({ modelName }, debugIsQuickbar)
@@ -281,6 +294,8 @@ const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
     }
     return slot
   })
+  lastMappedSots = newSlots
+  return newSlots
 }
 
 export const upInventoryItems = (isInventory: boolean, invWindow = lastWindow) => {
@@ -353,7 +368,7 @@ export const openItemsCanvas = (type, _bot = bot as typeof bot | null) => {
     return [...allRecipes ?? [], ...itemDescription ? [
       [
         'GenericDescription',
-        mapSlots([item])[0],
+        mapSlots([item], true)[0],
         [],
         itemDescription
       ]
@@ -471,7 +486,7 @@ const openWindow = (type: string | undefined) => {
       if (freeSlot === null) return
       void bot.creative.setInventorySlot(freeSlot, item)
     } else {
-      inv.canvasManager.children[0].showRecipesOrUsages(!isRightclick, mapSlots([item])[0])
+      inv.canvasManager.children[0].showRecipesOrUsages(!isRightclick, mapSlots([item], true)[0])
     }
   }
 
@@ -600,8 +615,8 @@ const getAllItemRecipes = (itemName: string) => {
   return results.map(({ result, ingredients, description }) => {
     return [
       'CraftingTableGuide',
-      mapSlots([result])[0],
-      mapSlots(ingredients),
+      mapSlots([result], true)[0],
+      mapSlots(ingredients, true),
       description
     ]
   })

From fdd770eeb9866606d0896927b5ed68cc0251e0ef Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 20 Mar 2025 05:07:55 +0300
Subject: [PATCH 360/753] fix: per component error boundary was not working
 properly crashing whole HUD gui when only component was going out of order

---
 src/reactUi.tsx | 52 ++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 3dfb0b98..213c92b9 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -128,32 +128,36 @@ const InGameUi = () => {
     <RobustPortal to={document.querySelector('#ui-root')}>
       {/* apply scaling */}
       <div style={{ display: showUI ? 'block' : 'none' }}>
-        <GameInteractionOverlay zIndex={7} />
-        {!disabledUiParts.includes('death-screen') && <DeathScreenProvider />}
-        {!disabledUiParts.includes('debug-overlay') && <DebugOverlay />}
-        {!disabledUiParts.includes('mobile-top-buttons') && <MobileTopButtons />}
-        {!disabledUiParts.includes('players-list') && <PlayerListOverlayProvider />}
-        {!disabledUiParts.includes('chat') && <ChatProvider />}
-        <SoundMuffler />
-        {showMinimap !== 'never' && <MinimapProvider adapter={adapter} displayMode='minimapOnly' />}
-        {!disabledUiParts.includes('title') && <TitleProvider />}
-        {!disabledUiParts.includes('scoreboard') && <ScoreboardProvider />}
-        {!disabledUiParts.includes('effects-indicators') && <IndicatorEffectsProvider />}
-        {!disabledUiParts.includes('crosshair') && <Crosshair />}
-        {!disabledUiParts.includes('books') && <BookProvider />}
-        {!disabledUiParts.includes('bossbars') && displayBossBars && <BossBarOverlayProvider />}
+        <PerComponentErrorBoundary>
+          <GameInteractionOverlay zIndex={7} />
+          {!disabledUiParts.includes('death-screen') && <DeathScreenProvider />}
+          {!disabledUiParts.includes('debug-overlay') && <DebugOverlay />}
+          {!disabledUiParts.includes('mobile-top-buttons') && <MobileTopButtons />}
+          {!disabledUiParts.includes('players-list') && <PlayerListOverlayProvider />}
+          {!disabledUiParts.includes('chat') && <ChatProvider />}
+          <SoundMuffler />
+          {showMinimap !== 'never' && <MinimapProvider adapter={adapter} displayMode='minimapOnly' />}
+          {!disabledUiParts.includes('title') && <TitleProvider />}
+          {!disabledUiParts.includes('scoreboard') && <ScoreboardProvider />}
+          {!disabledUiParts.includes('effects-indicators') && <IndicatorEffectsProvider />}
+          {!disabledUiParts.includes('crosshair') && <Crosshair />}
+          {!disabledUiParts.includes('books') && <BookProvider />}
+          {!disabledUiParts.includes('bossbars') && displayBossBars && <BossBarOverlayProvider />}
+        </PerComponentErrorBoundary>
       </div>
 
-      <PauseScreen />
-      <MineflayerPluginHud />
-      <MineflayerPluginConsole />
-      {showUI && <TouchInteractionHint />}
-      <div style={{ display: showUI ? 'block' : 'none' }}>
-        {!disabledUiParts.includes('xp-bar') && <XPBarProvider />}
-        {!disabledUiParts.includes('hud-bars') && <HudBarsProvider />}
-        <BedTime />
-      </div>
-      {showUI && !disabledUiParts.includes('hotbar') && <HotbarRenderApp />}
+      <PerComponentErrorBoundary>
+        <PauseScreen />
+        <MineflayerPluginHud />
+        <MineflayerPluginConsole />
+        {showUI && <TouchInteractionHint />}
+        <div style={{ display: showUI ? 'block' : 'none' }}>
+          {!disabledUiParts.includes('xp-bar') && <XPBarProvider />}
+          {!disabledUiParts.includes('hud-bars') && <HudBarsProvider />}
+          <BedTime />
+        </div>
+        {showUI && !disabledUiParts.includes('hotbar') && <HotbarRenderApp />}
+      </PerComponentErrorBoundary>
     </RobustPortal>
     <PerComponentErrorBoundary>
       <SignEditorProvider />

From e1758a84d033213ee02f6d6c0830944c8e19ab6e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 20 Mar 2025 05:14:23 +0300
Subject: [PATCH 361/753] fix bossbar crash when server tries to upate/remove
 non existent one

---
 src/react/BossBarOverlayProvider.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/react/BossBarOverlayProvider.tsx b/src/react/BossBarOverlayProvider.tsx
index 2605e521..7f8364ac 100644
--- a/src/react/BossBarOverlayProvider.tsx
+++ b/src/react/BossBarOverlayProvider.tsx
@@ -28,9 +28,11 @@ export default () => {
       addBossBar(bossBar as BossBarType)
     })
     bot.on('bossBarUpdated', (bossBar) => {
+      if (!bossBar) return
       addBossBar(bossBar as BossBarType)
     })
     bot.on('bossBarDeleted', (bossBar) => {
+      if (!bossBar) return
       removeBossBar(bossBar as BossBarType)
     })
   }, [])

From f87e7850ec9732202420e56360cc7d6502d376c7 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 20 Mar 2025 22:32:37 +0300
Subject: [PATCH 362/753] fix: fix false `hurt_animation` packet handlings

---
 src/globals.d.ts              |  2 +-
 src/mineflayer/cameraShake.ts | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/globals.d.ts b/src/globals.d.ts
index 6b2c6640..1dfb0255 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -26,7 +26,7 @@ declare const customEvents: import('typed-emitter').default<{
   mineflayerBotCreated (): void
   search (q: string): void
   activateItem (item: Item, slot: number, offhand: boolean): void
-  hurtAnimation (): void
+  hurtAnimation (yaw?: number): void
 }>
 declare const beforeRenderFrame: Array<() => void>
 
diff --git a/src/mineflayer/cameraShake.ts b/src/mineflayer/cameraShake.ts
index 043eb207..b2c7f273 100644
--- a/src/mineflayer/cameraShake.ts
+++ b/src/mineflayer/cameraShake.ts
@@ -10,10 +10,10 @@ class CameraShake {
     this.rollAngle = 0
   }
 
-  shakeFromDamage () {
+  shakeFromDamage (yaw?: number) {
     // Add roll animation
     const startRoll = this.rollAngle
-    const targetRoll = startRoll + (Math.random() < 0.5 ? -1 : 1) * this.damageRollAmount
+    const targetRoll = startRoll + (yaw ?? (Math.random() < 0.5 ? -1 : 1)) * this.damageRollAmount
 
     this.rollAnimation = {
       startTime: performance.now(),
@@ -85,12 +85,14 @@ customEvents.on('mineflayerBotCreated', () => {
     })
   }
 
-  customEvents.on('hurtAnimation', () => {
-    cameraShake.shakeFromDamage()
+  customEvents.on('hurtAnimation', (yaw) => {
+    cameraShake.shakeFromDamage(yaw)
   })
 
-  bot._client.on('hurt_animation', () => {
-    customEvents.emit('hurtAnimation')
+  bot._client.on('hurt_animation', ({ entityId, yaw }) => {
+    if (entityId === bot.entity.id) {
+      customEvents.emit('hurtAnimation', yaw)
+    }
   })
   bot.on('entityHurt', ({ id }) => {
     if (id === bot.entity.id) {

From 4a4823fd6a476730b22555da937f31907bbc0bdf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 21 Mar 2025 04:18:24 +0300
Subject: [PATCH 363/753] highlight main actions

---
 src/react/AppStatus.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/react/AppStatus.tsx b/src/react/AppStatus.tsx
index d44e973a..4aa5da42 100644
--- a/src/react/AppStatus.tsx
+++ b/src/react/AppStatus.tsx
@@ -69,7 +69,9 @@ export default ({
     >
       {isError && (
         <>
-          {showReconnect && onReconnect && <Button label="Reconnect" onClick={onReconnect} />}
+          {showReconnect && onReconnect && <Button onClick={onReconnect}>
+            <b>Reconnect</b>
+          </Button>}
           {actionsSlot}
           <Button
             onClick={() => {
@@ -79,8 +81,9 @@ export default ({
                 window.location.reload()
               }
             }}
-            label="Reset App (recommended)"
-          />
+          >
+            <b>Reset App (recommended)</b>
+          </Button>
           {!lockConnect && backAction && <Button label="Back" onClick={backAction} />}
         </>
       )}

From 563f5fa0071566313aedfd74926c6eba984e1362 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Mon, 24 Mar 2025 20:17:54 +0300
Subject: [PATCH 364/753] feat: Add videos/images from source with protocol
 extension (#301)

---
 renderer/viewer/lib/worldrendererThree.ts | 411 ++++++++++++++++++++++
 src/customChannels.ts                     | 282 ++++++++++++++-
 src/mineflayer/plugins/mouse.ts           |   7 +
 src/optionsStorage.ts                     |   1 +
 src/react/GameInteractionOverlay.tsx      |   3 +-
 src/react/TouchInteractionHint.tsx        |  16 +-
 6 files changed, 712 insertions(+), 8 deletions(-)

diff --git a/renderer/viewer/lib/worldrendererThree.ts b/renderer/viewer/lib/worldrendererThree.ts
index 697717c9..c181d43c 100644
--- a/renderer/viewer/lib/worldrendererThree.ts
+++ b/renderer/viewer/lib/worldrendererThree.ts
@@ -16,6 +16,18 @@ import { IPlayerState } from './basePlayerState'
 import { getMesh } from './entity/EntityMesh'
 import { armorModel } from './entity/armorModels'
 
+interface MediaProperties {
+  position: { x: number, y: number, z: number }
+  size: { width: number, height: number }
+  src: string
+  rotation?: 0 | 1 | 2 | 3 // 0-3 for 0°, 90°, 180°, 270°
+  doubleSide?: boolean
+  background?: number // Hexadecimal color (e.g., 0x000000 for black)
+  opacity?: number // 0-1 value for transparency
+  uvMapping?: { startU: number, endU: number, startV: number, endV: number }
+  allowOrigins?: string[] | boolean
+}
+
 export class WorldRendererThree extends WorldRendererCommon {
   interactionLines: null | { blockPos; mesh } = null
   outputFormat = 'threeJs' as const
@@ -28,6 +40,12 @@ export class WorldRendererThree extends WorldRendererCommon {
   holdingBlock: HoldingBlock
   holdingBlockLeft: HoldingBlock
   rendererDevice = '...'
+  customMedia = new Map<string, {
+    mesh: THREE.Object3D
+    video: HTMLVideoElement | undefined
+    texture: THREE.Texture
+    updateUVMapping: (config: { startU: number, endU: number, startV: number, endV: number }) => void
+  }>()
 
   get tilesRendered () {
     return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).tilesCount, 0)
@@ -457,6 +475,399 @@ export class WorldRendererThree extends WorldRendererCommon {
       console.warn('Failed to get renderer info', err)
     }
   }
+
+  private createErrorTexture (width: number, height: number, background = 0x00_00_00): THREE.CanvasTexture {
+    const canvas = document.createElement('canvas')
+    // Scale up the canvas size for better text quality
+    canvas.width = width * 100
+    canvas.height = height * 100
+
+    const ctx = canvas.getContext('2d')
+    if (!ctx) return new THREE.CanvasTexture(canvas)
+
+    // Clear with transparent background
+    ctx.clearRect(0, 0, canvas.width, canvas.height)
+
+    // Add background color
+    ctx.fillStyle = `rgba(${background >> 16 & 255}, ${background >> 8 & 255}, ${background & 255}, 0.5)`
+    ctx.fillRect(0, 0, canvas.width, canvas.height)
+
+    // Add red text
+    ctx.fillStyle = '#ff0000'
+    ctx.font = 'bold 10px sans-serif'
+    ctx.textAlign = 'center'
+    ctx.textBaseline = 'middle'
+    ctx.fillText('Failed to load', canvas.width / 2, canvas.height / 2, canvas.width)
+
+    const texture = new THREE.CanvasTexture(canvas)
+    texture.minFilter = THREE.LinearFilter
+    texture.magFilter = THREE.LinearFilter
+    return texture
+  }
+
+  private createBackgroundTexture (width: number, height: number, color = 0x00_00_00, opacity = 1): THREE.CanvasTexture {
+    const canvas = document.createElement('canvas')
+    canvas.width = 1
+    canvas.height = 1
+
+    const ctx = canvas.getContext('2d')
+    if (!ctx) return new THREE.CanvasTexture(canvas)
+
+    // Convert hex color to rgba
+    const r = (color >> 16) & 255
+    const g = (color >> 8) & 255
+    const b = color & 255
+
+    ctx.fillStyle = `rgba(${r}, ${g}, ${b}, ${opacity})`
+    ctx.fillRect(0, 0, 1, 1)
+
+    const texture = new THREE.CanvasTexture(canvas)
+    texture.minFilter = THREE.NearestFilter
+    texture.magFilter = THREE.NearestFilter
+    return texture
+  }
+
+  validateOrigin (src: string, allowOrigins: string[] | boolean) {
+    if (allowOrigins === true) return true
+    if (allowOrigins === false) return false
+    const url = new URL(src)
+    return allowOrigins.some(origin => url.origin.endsWith(origin))
+  }
+
+  addMedia (id: string, props: MediaProperties) {
+    this.destroyMedia(id)
+
+    const originSecurityError = props.allowOrigins !== undefined && !this.validateOrigin(props.src, props.allowOrigins)
+    if (originSecurityError) {
+      console.warn('Remote resource blocked due to security policy', props.src, 'allowed origins:', props.allowOrigins, 'you can control it with `remoteContentNotSameOrigin` option')
+      props.src = ''
+    }
+
+    const isImage = props.src.endsWith('.png') || props.src.endsWith('.jpg') || props.src.endsWith('.jpeg')
+
+    let video: HTMLVideoElement | undefined
+    if (!isImage) {
+      video = document.createElement('video')
+      video.src = props.src
+      video.loop = true
+      video.muted = true
+      video.playsInline = true
+      video.crossOrigin = 'anonymous'
+    }
+
+    // Create background texture first
+    const backgroundTexture = this.createBackgroundTexture(
+      props.size.width,
+      props.size.height,
+      props.background,
+      // props.opacity ?? 1
+    )
+
+    const handleError = () => {
+      const errorTexture = this.createErrorTexture(props.size.width, props.size.height, props.background)
+      material.map = errorTexture
+      material.needsUpdate = true
+    }
+
+    // Create a plane geometry with configurable UV mapping
+    const geometry = new THREE.PlaneGeometry(1, 1)
+
+    // Create material with initial properties using background texture
+    const material = new THREE.MeshBasicMaterial({
+      map: backgroundTexture,
+      transparent: true,
+      side: props.doubleSide ? THREE.DoubleSide : THREE.FrontSide
+    })
+
+    const texture = video
+      ? new THREE.VideoTexture(video)
+      : new THREE.TextureLoader().load(props.src, () => {
+        if (this.customMedia.get(id)?.texture === texture) {
+          material.map = texture
+          material.needsUpdate = true
+        }
+      }, undefined, handleError) // todo cache
+    texture.minFilter = THREE.NearestFilter
+    texture.magFilter = THREE.NearestFilter
+    texture.format = THREE.RGBAFormat
+    texture.generateMipmaps = false
+
+    // Create inner mesh for offsets
+    const mesh = new THREE.Mesh(geometry, material)
+
+    const { mesh: panel } = this.positionMeshExact(mesh, THREE.MathUtils.degToRad((props.rotation ?? 0) * 90), props.position, props.size.width, props.size.height)
+
+    this.scene.add(panel)
+
+    if (video) {
+      // Start playing the video
+      video.play().catch(err => {
+        console.error('Failed to play video:', err)
+        handleError()
+      })
+
+      // Update texture in animation loop
+      mesh.onBeforeRender = () => {
+        if (video.readyState === video.HAVE_ENOUGH_DATA) {
+          if (material.map !== texture) {
+            material.map = texture
+            material.needsUpdate = true
+          }
+          texture.needsUpdate = true
+        }
+      }
+    }
+
+    // UV mapping configuration
+    const updateUVMapping = (config: { startU: number, endU: number, startV: number, endV: number }) => {
+      const uvs = geometry.attributes.uv.array as Float32Array
+      uvs[0] = config.startU
+      uvs[1] = config.startV
+      uvs[2] = config.endU
+      uvs[3] = config.startV
+      uvs[4] = config.endU
+      uvs[5] = config.endV
+      uvs[6] = config.startU
+      uvs[7] = config.endV
+      geometry.attributes.uv.needsUpdate = true
+    }
+
+    // Apply initial UV mapping if provided
+    if (props.uvMapping) {
+      updateUVMapping(props.uvMapping)
+    }
+
+    // Store video data
+    this.customMedia.set(id, {
+      mesh: panel,
+      video,
+      texture,
+      updateUVMapping
+    })
+
+    return id
+  }
+
+  setVideoPlaying (id: string, playing: boolean) {
+    const videoData = this.customMedia.get(id)
+    if (videoData?.video) {
+      if (playing) {
+        videoData.video.play().catch(console.error)
+      } else {
+        videoData.video.pause()
+      }
+    }
+  }
+
+  setVideoSeeking (id: string, seconds: number) {
+    const videoData = this.customMedia.get(id)
+    if (videoData?.video) {
+      videoData.video.currentTime = seconds
+    }
+  }
+
+  setVideoVolume (id: string, volume: number) {
+    const videoData = this.customMedia.get(id)
+    if (videoData?.video) {
+      videoData.video.volume = volume
+    }
+  }
+
+  setVideoSpeed (id: string, speed: number) {
+    const videoData = this.customMedia.get(id)
+    if (videoData?.video) {
+      videoData.video.playbackRate = speed
+    }
+  }
+
+  destroyMedia (id: string) {
+    const media = this.customMedia.get(id)
+    if (media) {
+      if (media.video) {
+        media.video.pause()
+        media.video.src = ''
+      }
+      this.scene.remove(media.mesh)
+      media.texture.dispose()
+
+      // Get the inner mesh from the group
+      const mesh = media.mesh.children[0] as THREE.Mesh
+      if (mesh) {
+        mesh.geometry.dispose()
+        if (mesh.material instanceof THREE.Material) {
+          mesh.material.dispose()
+        }
+      }
+
+      this.customMedia.delete(id)
+    }
+  }
+
+  /**
+   * Positions a mesh exactly at startPosition and extends it along the rotation direction
+   * with the specified width and height
+   *
+   * @param mesh The mesh to position
+   * @param rotation Rotation in radians (applied to Y axis)
+   * @param startPosition The exact starting position (corner) of the mesh
+   * @param width Width of the mesh
+   * @param height Height of the mesh
+   * @param depth Depth of the mesh (default: 1)
+   * @returns The positioned mesh for chaining
+   */
+  positionMeshExact (
+    mesh: THREE.Mesh,
+    rotation: number,
+    startPosition: { x: number, y: number, z: number },
+    width: number,
+    height: number,
+    depth = 1
+  ) {
+    // avoid z-fighting with the ground plane
+    if (rotation === 0) {
+      startPosition.z += 0.001
+    }
+    if (rotation === Math.PI / 2) {
+      startPosition.x -= 0.001
+    }
+    if (rotation === Math.PI) {
+      startPosition.z -= 0.001
+    }
+    if (rotation === 3 * Math.PI / 2) {
+      startPosition.x += 0.001
+    }
+
+    // rotation normalize coordinates
+    if (rotation === 0) {
+      startPosition.z += 1
+    }
+    if (rotation === Math.PI) {
+      startPosition.x += 1
+    }
+    if (rotation === 3 * Math.PI / 2) {
+      startPosition.z += 1
+      startPosition.x += 1
+    }
+
+
+    // First, clean up any previous transformations
+    mesh.matrix.identity()
+    mesh.position.set(0, 0, 0)
+    mesh.rotation.set(0, 0, 0)
+    mesh.scale.set(1, 1, 1)
+
+    // By default, PlaneGeometry creates a plane in the XY plane (facing +Z)
+    // We need to set up the proper orientation for our use case
+    // Rotate the plane to face the correct direction based on the rotation parameter
+    mesh.rotateY(rotation)
+    if (rotation === Math.PI / 2 || rotation === 3 * Math.PI / 2) {
+      mesh.rotateZ(-Math.PI)
+      mesh.rotateX(-Math.PI)
+    }
+
+    // Scale it to the desired size
+    mesh.scale.set(width, height, depth)
+
+    // For a PlaneGeometry, if we want the corner at the origin, we need to offset
+    // by half the dimensions after scaling
+    mesh.geometry.translate(0.5, 0.5, 0)
+    mesh.geometry.attributes.position.needsUpdate = true
+
+    // Now place the mesh at the start position
+    mesh.position.set(startPosition.x, startPosition.y, startPosition.z)
+
+    // Create a group to hold our mesh and markers
+    const debugGroup = new THREE.Group()
+    debugGroup.add(mesh)
+
+    // Add a marker at the starting position (should be exactly at pos)
+    const startMarker = new THREE.Mesh(
+      new THREE.BoxGeometry(0.1, 0.1, 0.1),
+      new THREE.MeshBasicMaterial({ color: 0xff_00_00 })
+    )
+    startMarker.position.copy(new THREE.Vector3(startPosition.x, startPosition.y, startPosition.z))
+    debugGroup.add(startMarker)
+
+    // Add a marker at the end position (width units away in the rotated direction)
+    const endX = startPosition.x + Math.cos(rotation) * width
+    const endZ = startPosition.z + Math.sin(rotation) * width
+    const endYMarker = new THREE.Mesh(
+      new THREE.BoxGeometry(0.1, 0.1, 0.1),
+      new THREE.MeshBasicMaterial({ color: 0x00_00_ff })
+    )
+    endYMarker.position.set(startPosition.x, startPosition.y + height, startPosition.z)
+    debugGroup.add(endYMarker)
+
+    // Add a marker at the width endpoint
+    const endWidthMarker = new THREE.Mesh(
+      new THREE.BoxGeometry(0.1, 0.1, 0.1),
+      new THREE.MeshBasicMaterial({ color: 0xff_ff_00 })
+    )
+    endWidthMarker.position.set(endX, startPosition.y, endZ)
+    debugGroup.add(endWidthMarker)
+
+    // Add a marker at the corner diagonal endpoint (both width and height)
+    const endCornerMarker = new THREE.Mesh(
+      new THREE.BoxGeometry(0.1, 0.1, 0.1),
+      new THREE.MeshBasicMaterial({ color: 0xff_00_ff })
+    )
+    endCornerMarker.position.set(endX, startPosition.y + height, endZ)
+    debugGroup.add(endCornerMarker)
+
+    // Also add a visual helper to show the rotation direction
+    const directionHelper = new THREE.ArrowHelper(
+      new THREE.Vector3(Math.cos(rotation), 0, Math.sin(rotation)),
+      new THREE.Vector3(startPosition.x, startPosition.y, startPosition.z),
+      1,
+      0xff_00_00
+    )
+    debugGroup.add(directionHelper)
+
+    return {
+      mesh,
+      debugGroup
+    }
+  }
+
+  createTestCanvasTexture () {
+    const canvas = document.createElement('canvas')
+    canvas.width = 100
+    canvas.height = 100
+    const ctx = canvas.getContext('2d')
+    if (!ctx) return null
+    ctx.font = '10px Arial'
+    ctx.fillStyle = 'red'
+    ctx.fillText('Hello World', 0, 10) // at
+    return new THREE.CanvasTexture(canvas)
+  }
+
+  /**
+   * Creates a test mesh that demonstrates the exact positioning
+   */
+  addTestMeshExact (rotationNum: number) {
+    const pos = window.cursorBlockRel().position
+    console.log('Creating exact positioned test mesh at:', pos)
+
+    // Create a plane mesh with a wireframe to visualize boundaries
+    const plane = new THREE.Mesh(
+      new THREE.PlaneGeometry(1, 1),
+      new THREE.MeshBasicMaterial({
+        // side: THREE.DoubleSide,
+        map: this.createTestCanvasTexture()
+      })
+    )
+
+    const width = 2
+    const height = 1
+    const rotation = THREE.MathUtils.degToRad(rotationNum * 90) // 90 degrees in radians
+
+    // Position the mesh exactly where we want it
+    const { debugGroup } = this.positionMeshExact(plane, rotation, pos, width, height)
+
+    viewer.scene.add(debugGroup)
+    console.log('Exact test mesh added with dimensions:', width, height, 'and rotation:', rotation)
+
+  }
 }
 
 class StarField {
diff --git a/src/customChannels.ts b/src/customChannels.ts
index ff0f8a32..ede62876 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -1,5 +1,9 @@
 import { Vec3 } from 'vec3'
+import PItem from 'prismarine-item'
+import * as THREE from 'three'
+import { WorldRendererThree } from '../renderer/viewer/lib/worldrendererThree'
 import { options } from './optionsStorage'
+import { jeiCustomCategories } from './inventoryWindows'
 
 customEvents.on('mineflayerBotCreated', async () => {
   if (!options.customChannels) return
@@ -9,6 +13,8 @@ customEvents.on('mineflayerBotCreated', async () => {
     })
   })
   registerBlockModelsChannel()
+  registerMediaChannels()
+  registeredJeiChannel()
 })
 
 const registerBlockModelsChannel = () => {
@@ -88,7 +94,7 @@ const registeredJeiChannel = () => {
         type: ['pstring', { countType: 'i16' }]
       },
       {
-        name: 'categoryTitle',
+        name: '_categoryTitle',
         type: ['pstring', { countType: 'i16' }]
       },
       {
@@ -102,8 +108,280 @@ const registeredJeiChannel = () => {
 
   bot._client.on(CHANNEL_NAME as any, (data) => {
     const { id, categoryTitle, items } = data
-    // ...
+    if (items === '') {
+      // remove category
+      jeiCustomCategories.value = jeiCustomCategories.value.filter(x => x.id !== id)
+      return
+    }
+    const PrismarineItem = PItem(bot.version)
+    jeiCustomCategories.value.push({
+      id,
+      categoryTitle,
+      items: JSON.parse(items).map(x => {
+        const itemString = x.itemName || x.item_name || x.item || x.itemId
+        const itemId = loadedData.itemsByName[itemString.replace('minecraft:', '')]
+        if (!itemId) {
+          console.warn(`Could not add item ${itemString} to JEI category ${categoryTitle} because it was not found`)
+          return null
+        }
+        // const item = new PrismarineItem(itemId.id, x.itemCount || x.item_count || x.count || 1, x.itemDamage || x.item_damage || x.damage || 0, x.itemNbt || x.item_nbt || x.nbt || null)
+        return PrismarineItem.fromNotch({
+          ...x,
+          itemId: itemId.id,
+        })
+      })
+    })
   })
 
   console.debug(`registered custom channel ${CHANNEL_NAME} channel`)
 }
+
+const registerMediaChannels = () => {
+  // Media Add Channel
+  const ADD_CHANNEL = 'minecraft-web-client:media-add'
+  const addPacketStructure = [
+    'container',
+    [
+      { name: 'id', type: ['pstring', { countType: 'i16' }] },
+      { name: 'x', type: 'f32' },
+      { name: 'y', type: 'f32' },
+      { name: 'z', type: 'f32' },
+      { name: 'width', type: 'f32' },
+      { name: 'height', type: 'f32' },
+      // N, 0
+      // W, 3
+      // S, 2
+      // E, 1
+      { name: 'rotation', type: 'i16' }, // 0: 0° - towards positive z, 1: 90° - positive x, 2: 180° - negative z, 3: 270° - negative x (3-6 is same but double side)
+      { name: 'source', type: ['pstring', { countType: 'i16' }] },
+      { name: 'loop', type: 'bool' },
+      { name: '_volume', type: 'f32' }, // 0
+      { name: '_aspectRatioMode', type: 'i16' }, // 0
+      { name: '_background', type: 'i16' }, // 0
+      { name: '_opacity', type: 'i16' }, // 1
+      { name: '_cropXStart', type: 'f32' }, // 0
+      { name: '_cropYStart', type: 'f32' }, // 0
+      { name: '_cropXEnd', type: 'f32' }, // 0
+      { name: '_cropYEnd', type: 'f32' }, // 0
+    ]
+  ]
+
+  // Media Control Channels
+  const PLAY_CHANNEL = 'minecraft-web-client:media-play'
+  const PAUSE_CHANNEL = 'minecraft-web-client:media-pause'
+  const SEEK_CHANNEL = 'minecraft-web-client:media-seek'
+  const VOLUME_CHANNEL = 'minecraft-web-client:media-volume'
+  const SPEED_CHANNEL = 'minecraft-web-client:media-speed'
+  const DESTROY_CHANNEL = 'minecraft-web-client:media-destroy'
+
+  const noDataPacketStructure = [
+    'container',
+    [
+      { name: 'id', type: ['pstring', { countType: 'i16' }] }
+    ]
+  ]
+
+  const setNumberPacketStructure = [
+    'container',
+    [
+      { name: 'id', type: ['pstring', { countType: 'i16' }] },
+      { name: 'seconds', type: 'f32' }
+    ]
+  ]
+
+  // Register channels
+  bot._client.registerChannel(ADD_CHANNEL, addPacketStructure, true)
+  bot._client.registerChannel(PLAY_CHANNEL, noDataPacketStructure, true)
+  bot._client.registerChannel(PAUSE_CHANNEL, noDataPacketStructure, true)
+  bot._client.registerChannel(SEEK_CHANNEL, setNumberPacketStructure, true)
+  bot._client.registerChannel(VOLUME_CHANNEL, setNumberPacketStructure, true)
+  bot._client.registerChannel(SPEED_CHANNEL, setNumberPacketStructure, true)
+  bot._client.registerChannel(DESTROY_CHANNEL, noDataPacketStructure, true)
+
+  // Handle media add
+  bot._client.on(ADD_CHANNEL as any, (data) => {
+    const { id, x, y, z, width, height, rotation, source, loop, background, opacity } = data
+
+    const worldRenderer = viewer.world as WorldRendererThree
+
+    // Destroy existing video if it exists
+    worldRenderer.destroyMedia(id)
+
+    // Add new video
+    worldRenderer.addMedia(id, {
+      position: { x, y, z },
+      size: { width, height },
+      // side: 'towards',
+      src: source,
+      rotation: rotation as 0 | 1 | 2 | 3,
+      doubleSide: false,
+      background,
+      opacity: opacity / 100,
+      allowOrigins: options.remoteContentNotSameOrigin === false ? [getCurrentTopDomain()] : options.remoteContentNotSameOrigin
+    })
+
+    // Set loop state
+    if (!loop) {
+      const videoData = worldRenderer.customMedia.get(id)
+      if (videoData?.video) {
+        videoData.video.loop = false
+      }
+    }
+  })
+
+  // Handle media play
+  bot._client.on(PLAY_CHANNEL as any, (data) => {
+    const { id } = data
+    const worldRenderer = viewer.world as WorldRendererThree
+    worldRenderer.setVideoPlaying(id, true)
+  })
+
+  // Handle media pause
+  bot._client.on(PAUSE_CHANNEL as any, (data) => {
+    const { id } = data
+    const worldRenderer = viewer.world as WorldRendererThree
+    worldRenderer.setVideoPlaying(id, false)
+  })
+
+  // Handle media seek
+  bot._client.on(SEEK_CHANNEL as any, (data) => {
+    const { id, seconds } = data
+    const worldRenderer = viewer.world as WorldRendererThree
+    worldRenderer.setVideoSeeking(id, seconds)
+  })
+
+  // Handle media destroy
+  bot._client.on(DESTROY_CHANNEL as any, (data) => {
+    const { id } = data
+    const worldRenderer = viewer.world as WorldRendererThree
+    worldRenderer.destroyMedia(id)
+  })
+
+  // Handle media volume
+  bot._client.on(VOLUME_CHANNEL as any, (data) => {
+    const { id, volume } = data
+    const worldRenderer = viewer.world as WorldRendererThree
+    worldRenderer.setVideoVolume(id, volume)
+  })
+
+  // Handle media speed
+  bot._client.on(SPEED_CHANNEL as any, (data) => {
+    const { id, speed } = data
+    const worldRenderer = viewer.world as WorldRendererThree
+    worldRenderer.setVideoSpeed(id, speed)
+  })
+
+  // ---
+
+  // Video interaction channel
+  const interactionPacketStructure = [
+    'container',
+    [
+      { name: 'id', type: ['pstring', { countType: 'i16' }] },
+      { name: 'x', type: 'f32' },
+      { name: 'y', type: 'f32' },
+      { name: 'isRightClick', type: 'bool' }
+    ]
+  ]
+
+  bot._client.registerChannel(MEDIA_INTERACTION_CHANNEL, interactionPacketStructure, true)
+
+  console.debug('Registered media channels')
+}
+
+const MEDIA_INTERACTION_CHANNEL = 'minecraft-web-client:media-interaction'
+
+export const sendVideoInteraction = (id: string, x: number, y: number, isRightClick: boolean) => {
+  bot._client.writeChannel(MEDIA_INTERACTION_CHANNEL, { id, x, y, isRightClick })
+}
+
+export const videoCursorInteraction = () => {
+  const worldRenderer = viewer.world as WorldRendererThree
+  const { camera } = worldRenderer
+  const raycaster = new THREE.Raycaster()
+
+  // Get mouse position at center of screen
+  const mouse = new THREE.Vector2(0, 0)
+
+  // Update the raycaster
+  raycaster.setFromCamera(mouse, camera)
+
+  // Check intersection with all video meshes
+  for (const [id, videoData] of worldRenderer.customMedia.entries()) {
+    // Get the actual mesh (first child of the group)
+    const mesh = videoData.mesh.children[0] as THREE.Mesh
+    if (!mesh) continue
+
+    const intersects = raycaster.intersectObject(mesh, false)
+    if (intersects.length > 0) {
+      const intersection = intersects[0]
+      const { uv } = intersection
+      if (!uv) return null
+
+      return {
+        id,
+        x: uv.x,
+        y: uv.y
+      }
+    }
+  }
+
+  return null
+}
+window.videoCursorInteraction = videoCursorInteraction
+
+const addTestVideo = (rotation = 0 as 0 | 1 | 2 | 3, scale = 1, isImage = false) => {
+  const block = window.cursorBlockRel()
+  if (!block) return
+  const { position: startPosition } = block
+
+  const worldRenderer = viewer.world as WorldRendererThree
+
+  // Add video with proper positioning
+  worldRenderer.addMedia('test-video', {
+    position: {
+      x: startPosition.x,
+      y: startPosition.y + 1,
+      z: startPosition.z
+    },
+    size: {
+      width: scale,
+      height: scale
+    },
+    src: isImage ? 'https://bucket.mcraft.fun/test_image.png' : 'https://bucket.mcraft.fun/test_video.mp4',
+    rotation,
+    // doubleSide: true,
+    background: 0x00_00_00, // Black color
+    // TODO broken
+    // uvMapping: {
+    //   startU: 0,
+    //   endU: 1,
+    //   startV: 0,
+    //   endV: 1
+    // },
+    opacity: 1,
+    allowOrigins: true,
+  })
+}
+window.addTestVideo = addTestVideo
+
+function getCurrentTopDomain (): string {
+  const { hostname } = location
+  // Split hostname into parts
+  const parts = hostname.split('.')
+
+  // Handle special cases like co.uk, com.br, etc.
+  if (parts.length > 2) {
+    // Check for common country codes with additional segments
+    if (parts.at(-2) === 'co' ||
+      parts.at(-2) === 'com' ||
+      parts.at(-2) === 'org' ||
+      parts.at(-2) === 'gov') {
+      // Return last 3 parts (e.g., example.co.uk)
+      return parts.slice(-3).join('.')
+    }
+  }
+
+  // Return last 2 parts (e.g., example.com)
+  return parts.slice(-2).join('.')
+}
diff --git a/src/mineflayer/plugins/mouse.ts b/src/mineflayer/plugins/mouse.ts
index e5b5e283..6841424f 100644
--- a/src/mineflayer/plugins/mouse.ts
+++ b/src/mineflayer/plugins/mouse.ts
@@ -22,6 +22,7 @@ import destroyStage9 from '../../../assets/destroy_stage_9.png'
 import { options } from '../../optionsStorage'
 import { isCypress } from '../../standaloneUtils'
 import { playerState } from '../playerState'
+import { sendVideoInteraction, videoCursorInteraction } from '../../customChannels'
 
 function createDisplayManager (bot: Bot, scene: THREE.Scene, renderer: THREE.WebGLRenderer) {
   // State
@@ -180,6 +181,12 @@ const domListeners = (bot: Bot) => {
     if (e.isTrusted && !document.pointerLockElement && !isCypress()) return
     if (!isGameActive(true)) return
 
+    const videoInteraction = videoCursorInteraction()
+    if (videoInteraction) {
+      sendVideoInteraction(videoInteraction.id, videoInteraction.x, videoInteraction.y, e.button === 0)
+      return
+    }
+
     if (e.button === 0) {
       bot.leftClickStart()
     } else if (e.button === 2) {
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index e0de6d4a..b5025ab4 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -57,6 +57,7 @@ const defaultOptions = {
   packetsLoggerPreset: 'all' as 'all' | 'no-buffers',
   serversAutoVersionSelect: 'auto' as 'auto' | 'latest' | '1.20.4' | string,
   customChannels: false,
+  remoteContentNotSameOrigin: false as boolean | string[],
   packetsReplayAutoStart: false,
   preciseMouseInput: false,
   // todo ui setting, maybe enable by default?
diff --git a/src/react/GameInteractionOverlay.tsx b/src/react/GameInteractionOverlay.tsx
index 7c406e8d..90f7655c 100644
--- a/src/react/GameInteractionOverlay.tsx
+++ b/src/react/GameInteractionOverlay.tsx
@@ -5,6 +5,7 @@ import { options } from '../optionsStorage'
 import { activeModalStack, isGameActive, miscUiState } from '../globalState'
 import { onCameraMove, CameraMoveEvent } from '../cameraRotationControls'
 import { pointerLock, isInRealGameSession } from '../utils'
+import { videoCursorInteraction } from '../customChannels'
 import { handleMovementStickDelta, joystickPointer } from './TouchAreasControls'
 
 /** after what time of holding the finger start breaking the block */
@@ -153,7 +154,7 @@ function GameInteractionOverlayInner ({
         // single click action
         const MOUSE_BUTTON_RIGHT = 2
         const MOUSE_BUTTON_LEFT = 0
-        const gonnaAttack = !!bot.mouse.getCursorState().entity
+        const gonnaAttack = !!bot.mouse.getCursorState().entity || !!videoCursorInteraction()
         document.dispatchEvent(new MouseEvent('mousedown', { button: gonnaAttack ? MOUSE_BUTTON_LEFT : MOUSE_BUTTON_RIGHT }))
         bot.mouse.update()
         document.dispatchEvent(new MouseEvent('mouseup', { button: gonnaAttack ? MOUSE_BUTTON_LEFT : MOUSE_BUTTON_RIGHT }))
diff --git a/src/react/TouchInteractionHint.tsx b/src/react/TouchInteractionHint.tsx
index d4bc3496..e08e4634 100644
--- a/src/react/TouchInteractionHint.tsx
+++ b/src/react/TouchInteractionHint.tsx
@@ -2,6 +2,7 @@ import { useEffect, useState } from 'react'
 import { useSnapshot } from 'valtio'
 import { options } from '../optionsStorage'
 import { activeModalStack } from '../globalState'
+import { videoCursorInteraction } from '../customChannels'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import styles from './TouchInteractionHint.module.css'
 import { useUsingTouch } from './utilsApp'
@@ -14,12 +15,17 @@ export default () => {
 
   useEffect(() => {
     const update = () => {
-      const cursorState = bot.mouse.getCursorState()
-      if (cursorState.entity) {
-        const entityName = cursorState.entity.displayName ?? cursorState.entity.name
-        setHintText(`Attack ${entityName}`)
+      const videoInteraction = videoCursorInteraction()
+      if (videoInteraction) {
+        setHintText(`Interact with video`)
       } else {
-        setHintText(null)
+        const cursorState = bot.mouse.getCursorState()
+        if (cursorState.entity) {
+          const entityName = cursorState.entity.displayName ?? cursorState.entity.name
+          setHintText(`Attack ${entityName}`)
+        } else {
+          setHintText(null)
+        }
       }
     }
 

From b6842508ae69767eccf26bc6bb4bceeb1277c810 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 24 Mar 2025 23:58:16 +0300
Subject: [PATCH 365/753] fix(blockPlacing): fix packets order on latest
 version. Fix placing end crystals. Fix using hoe and axe. Fix offhand
 placing. Validate sending placing packets so its 90% accurate fixes #316

---
 package.json   |  4 ++--
 pnpm-lock.yaml | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index cd8c25ff..8f9935bc 100644
--- a/package.json
+++ b/package.json
@@ -150,8 +150,8 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.42",
-    "mineflayer-mouse": "^0.1.2",
+    "mc-assets": "^0.2.45",
+    "mineflayer-mouse": "^0.1.5",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9093dfc0..5942745d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -353,8 +353,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.42
-        version: 0.2.42
+        specifier: ^0.2.45
+        version: 0.2.45
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -362,8 +362,8 @@ importers:
         specifier: github:zardoy/mineflayer
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.2
-        version: 0.1.2(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+        specifier: ^0.1.5
+        version: 0.1.5(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -6690,8 +6690,8 @@ packages:
   maxrects-packer@2.7.3:
     resolution: {integrity: sha512-bG6qXujJ1QgttZVIH4WDanhoJtvbud/xP/XPyf6A69C9RdA61BM4TomFALCq2nrTa+tARRIBB4LuIFsnUQU2wA==}
 
-  mc-assets@0.2.42:
-    resolution: {integrity: sha512-j2D1RNYtB5Z9gFu9MVjyDBbiALI0mWZ3xW/A3PPefVAHm3HJ2T1vH+1XBov1spBGPl7u+Zo7mRXza3X0egbeOg==}
+  mc-assets@0.2.45:
+    resolution: {integrity: sha512-M1qnX73h/fW+mj9+A+jGtPaWDlq449DzPziZJxeLxmS1nSh/TSydKkLkWX967LaevVA1YtxNpA/SJ1N4jaW48w==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.14:
@@ -6925,8 +6925,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.2:
-    resolution: {integrity: sha512-QPGEXkF9PurZEpRq0xakKE8SV6sMY/6kCM9cdMeFbtq95IpYeh8ZJdD/twX2A3g3s8MooxlGovfxbpeHdWcOEQ==}
+  mineflayer-mouse@0.1.5:
+    resolution: {integrity: sha512-ypTDcFpuqmGoVFQrlBtaLPCVVVcCsCpjOR9+xeTnODecGL7t4UnPCKtddjebouurVBRehZym2XGFEdjb7bzKvw==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.4:
@@ -17588,7 +17588,7 @@ snapshots:
 
   maxrects-packer@2.7.3: {}
 
-  mc-assets@0.2.42:
+  mc-assets@0.2.45:
     dependencies:
       maxrects-packer: 2.7.3
       zod: 3.24.1
@@ -17989,7 +17989,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.2(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  mineflayer-mouse@0.1.5(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
     dependencies:
       change-case: 5.4.4
       debug: 4.4.0(supports-color@8.1.1)

From 89a8584060a2eb896e45a183e3074286440244c5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Mar 2025 00:48:15 +0300
Subject: [PATCH 366/753] fix test

---
 package.json                                  |  2 +-
 pnpm-lock.yaml                                | 10 +++++-----
 renderer/viewer/lib/mesher/test/tests.test.ts |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 8f9935bc..531f5370 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
     "mc-assets": "^0.2.45",
-    "mineflayer-mouse": "^0.1.5",
+    "mineflayer-mouse": "^0.1.6",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5942745d..97cd6664 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -362,8 +362,8 @@ importers:
         specifier: github:zardoy/mineflayer
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.5
-        version: 0.1.5(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+        specifier: ^0.1.6
+        version: 0.1.6(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -6925,8 +6925,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.5:
-    resolution: {integrity: sha512-ypTDcFpuqmGoVFQrlBtaLPCVVVcCsCpjOR9+xeTnODecGL7t4UnPCKtddjebouurVBRehZym2XGFEdjb7bzKvw==}
+  mineflayer-mouse@0.1.6:
+    resolution: {integrity: sha512-BvLPo4I8egSJcI99TBUgtnm4qAN3WLSwn7jZw99lq4TD9e2cOAKHEPr04nrTnywrx1PsPf6cuVN1i/E7+vzzdA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.4:
@@ -17989,7 +17989,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.5(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  mineflayer-mouse@0.1.6(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
     dependencies:
       change-case: 5.4.4
       debug: 4.4.0(supports-color@8.1.1)
diff --git a/renderer/viewer/lib/mesher/test/tests.test.ts b/renderer/viewer/lib/mesher/test/tests.test.ts
index 9ebd6604..7959f573 100644
--- a/renderer/viewer/lib/mesher/test/tests.test.ts
+++ b/renderer/viewer/lib/mesher/test/tests.test.ts
@@ -49,6 +49,7 @@ test('Known blocks are not rendered', () => {
   // TODO resolve creaking_heart issue (1.21.3)
   expect(missingBlocks).toMatchInlineSnapshot(`
     {
+      "creaking_heart": true,
       "end_gateway": true,
       "end_portal": true,
       "structure_void": true,

From df10bc6f1b3221ea693940f509261f825a4608db Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Mar 2025 00:50:17 +0300
Subject: [PATCH 367/753] feat: add client tps info to f3

---
 src/react/DebugOverlay.tsx | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index d7fc16d7..d0768583 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -37,6 +37,7 @@ export default () => {
   const [entitiesCount, setEntitiesCount] = useState('0')
   const [dimension, setDimension] = useState('')
   const [cursorBlock, setCursorBlock] = useState<Block | null>(null)
+  const [clientTps, setClientTps] = useState(0)
   const minecraftYaw = useRef(0)
   const minecraftQuad = useRef(0)
   const { rendererDevice } = viewer.world
@@ -85,6 +86,23 @@ export default () => {
   }
 
   useEffect(() => {
+    let lastTpsReset = 0
+    let lastTps = 0
+    let lastTickDate = 0
+    const updateTps = (increment = false) => {
+      if (Date.now() - lastTpsReset >= 1000) {
+        setClientTps(lastTps)
+        window.lastTpsArray ??= []
+        window.lastTpsArray.push(lastTps)
+        lastTps = 0
+        lastTpsReset = Date.now()
+      }
+      if (increment) {
+        lastTickDate = Date.now()
+        lastTps++
+      }
+    }
+
     document.addEventListener('keydown', handleF3)
     let update = 0
     const packetsUpdateInterval = setInterval(() => {
@@ -97,8 +115,16 @@ export default () => {
         packetsCountByNamePer10Sec.current.received = {}
         packetsCountByNamePer10Sec.current.sent = {}
       }
+      updateTps(false)
     }, 1000)
 
+    bot.on('physicsTick', () => {
+      updateTps(true)
+    })
+    bot._client.on('packet', () => {
+      updateTps(false)
+    })
+
     const freqUpdateInterval = setInterval(() => {
       setPos({ ...bot.entity.position })
       setSkyL(bot.world.getSkyLight(bot.entity.position))
@@ -123,6 +149,7 @@ export default () => {
       document.removeEventListener('keydown', handleF3)
       clearInterval(packetsUpdateInterval)
       clearInterval(freqUpdateInterval)
+      console.log('Last physics tick before disconnect was', Date.now() - lastTickDate, 'ms ago')
     }
   }, [])
 
@@ -142,6 +169,7 @@ export default () => {
       <p>XYZ: {pos.x.toFixed(3)} / {pos.y.toFixed(3)} / {pos.z.toFixed(3)}</p>
       <p>Chunk: {Math.floor(pos.x % 16)} ~ {Math.floor(pos.z % 16)} in {Math.floor(pos.x / 16)} ~ {Math.floor(pos.z / 16)}</p>
       <p>Packets: {packetsString}</p>
+      <p>Client TPS: {clientTps}</p>
       <p>Facing (viewer): {bot.entity.yaw.toFixed(3)} {bot.entity.pitch.toFixed(3)}</p>
       <p>Facing (minecraft): {quadsDescription[minecraftQuad.current]} ({minecraftYaw.current.toFixed(1)} {(bot.entity.pitch * -180 / Math.PI).toFixed(1)})</p>
       <p>Light: {blockL} ({skyL} sky)</p>

From 0f3145bb8e26fe7a04a727c08fdcf93ad0bf74e5 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 25 Mar 2025 02:08:32 +0300
Subject: [PATCH 368/753] feat: app <-> renderer REWORK. Add new layers for
 stability (#315)

---
 .gitignore                                    |   2 +-
 README.MD                                     |   1 +
 renderer/playground/baseScene.ts              |   1 +
 renderer/playground/playground.ts             |  19 +-
 renderer/playground/scenes/allEntities.ts     |   1 +
 renderer/playground/scenes/entities.ts        |   1 +
 renderer/playground/scenes/frequentUpdates.ts |   1 +
 .../playground/scenes/lightingStarfield.ts    |   1 +
 renderer/playground/scenes/main.ts            |   2 +-
 renderer/viewer/baseGraphicsBackend.ts        |  15 +
 renderer/viewer/{prepare => common}/utils.ts  |   0
 renderer/viewer/index.js                      |   6 -
 renderer/viewer/lib/basePlayerState.ts        |  17 +-
 renderer/viewer/lib/entities.ts               | 151 +++---
 renderer/viewer/lib/entity/EntityMesh.ts      |   8 +-
 renderer/viewer/lib/guiRenderer.ts            |  18 +-
 renderer/viewer/lib/holdingBlock.ts           |  15 +-
 renderer/viewer/lib/mesher/mesher.ts          |   4 +-
 renderer/viewer/lib/mesher/shared.ts          |   1 +
 renderer/viewer/lib/threeJsSound.ts           |  61 +++
 renderer/viewer/lib/ui/newStats.ts            |  13 +
 renderer/viewer/lib/viewer.ts                 | 325 -------------
 renderer/viewer/lib/viewerWrapper.ts          | 122 -----
 renderer/viewer/lib/worldDataEmitter.ts       |  40 +-
 renderer/viewer/lib/worldrendererCommon.ts    | 449 +++++++++++-------
 renderer/viewer/lib/worldrendererThree.ts     | 338 +++++++++----
 renderer/viewer/three/appShared.ts            |  70 +++
 renderer/viewer/three/documentRenderer.ts     | 236 +++++++++
 renderer/viewer/three/graphicsBackend.ts      | 119 +++++
 renderer/viewer/three/panorama.ts             | 207 ++++++++
 renderer/viewer/three/threeJsMethods.ts       |  15 +
 renderer/viewer/three/world/cursorBlock.ts    | 144 ++++++
 {src => renderer/viewer/three/world}/vr.ts    |  55 +--
 src/appViewer.ts                              | 250 ++++++++++
 src/botUtils.ts                               |   2 +-
 src/cameraRotationControls.ts                 |  17 +-
 src/chatUtils.ts                              |   2 +-
 src/connect.ts                                |   8 +-
 src/controls.ts                               |  74 +--
 src/core/progressReporter.ts                  |  17 +-
 src/customChannels.ts                         | 174 +++----
 src/dayCycle.ts                               |   5 +-
 src/devtools.ts                               |  51 +-
 src/entities.ts                               |  63 +--
 src/globals.d.ts                              |   2 +-
 src/index.ts                                  | 267 +++--------
 src/inventoryWindows.ts                       |  23 +-
 src/loadSave.ts                               |   2 +-
 src/mineflayer/cameraShake.ts                 |  28 +-
 src/mineflayer/items.ts                       |  22 +
 src/mineflayer/maps.ts                        |   3 +-
 src/mineflayer/playerState.ts                 |  17 +-
 src/mineflayer/plugins/mouse.ts               | 132 +----
 src/mineflayer/plugins/ping.ts                |   2 +-
 src/optimizeJson.ts                           |   2 +-
 src/optionsGuiScheme.tsx                      |   3 +-
 src/panorama.ts                               | 198 --------
 src/react/AppStatus.tsx                       |   3 +-
 src/react/AppStatusProvider.tsx               |  44 +-
 src/react/BookProvider.tsx                    |   2 +-
 src/react/DebugOverlay.tsx                    |  37 +-
 src/react/HotbarRenderApp.tsx                 |   6 +-
 src/react/IndicatorEffectsProvider.tsx        |  27 +-
 src/react/MinimapProvider.tsx                 |  34 +-
 src/react/ModuleSignsViewer.tsx               |  31 +-
 src/reactUi.tsx                               |  13 +
 src/rendererUtils.ts                          |   5 +-
 src/resourcePack.ts                           |  49 +-
 src/resourcesManager.ts                       | 217 ++++++++-
 src/shims/minecraftData.ts                    |   2 +-
 src/sounds/botSoundSystem.ts                  |   4 +-
 src/sounds/soundsMap.ts                       |   2 +-
 src/topRightStats.ts                          | 129 -----
 src/watchOptions.ts                           | 107 +++--
 src/water.ts                                  |   7 +-
 75 files changed, 2615 insertions(+), 1926 deletions(-)
 create mode 100644 renderer/viewer/baseGraphicsBackend.ts
 rename renderer/viewer/{prepare => common}/utils.ts (100%)
 delete mode 100644 renderer/viewer/index.js
 create mode 100644 renderer/viewer/lib/threeJsSound.ts
 delete mode 100644 renderer/viewer/lib/viewer.ts
 delete mode 100644 renderer/viewer/lib/viewerWrapper.ts
 create mode 100644 renderer/viewer/three/appShared.ts
 create mode 100644 renderer/viewer/three/documentRenderer.ts
 create mode 100644 renderer/viewer/three/graphicsBackend.ts
 create mode 100644 renderer/viewer/three/panorama.ts
 create mode 100644 renderer/viewer/three/threeJsMethods.ts
 create mode 100644 renderer/viewer/three/world/cursorBlock.ts
 rename {src => renderer/viewer/three/world}/vr.ts (85%)
 create mode 100644 src/appViewer.ts
 delete mode 100644 src/panorama.ts
 delete mode 100644 src/topRightStats.ts

diff --git a/.gitignore b/.gitignore
index f2a0006e..bd774315 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ localSettings.mjs
 dist*
 .DS_Store
 .idea/
-world
+/world
 data*.json
 out
 *.iml
diff --git a/README.MD b/README.MD
index 90e8f35f..67e46333 100644
--- a/README.MD
+++ b/README.MD
@@ -24,6 +24,7 @@ For building the project yourself / contributing, see [Development, Debugging &
 - Custom protocol channel extensions (eg for custom block models in the world)
 - Play with friends over internet! (P2P is powered by Peer.js discovery servers)
 - ~~Google Drive support for reading / saving worlds back to the cloud~~
+- Support for custom rendering 3D engines. Modular architecture.
 - even even more!
 
 All components that are in [Storybook](https://mcraft.fun/storybook) are published as npm module and can be used in other projects: [`minecraft-react`](https://npmjs.com/minecraft-react)
diff --git a/renderer/playground/baseScene.ts b/renderer/playground/baseScene.ts
index 02a6432f..b9e7791d 100644
--- a/renderer/playground/baseScene.ts
+++ b/renderer/playground/baseScene.ts
@@ -1,3 +1,4 @@
+//@ts-nocheck
 import { Vec3 } from 'vec3'
 import * as THREE from 'three'
 import '../../src/getCollisionShapes'
diff --git a/renderer/playground/playground.ts b/renderer/playground/playground.ts
index a233bca2..de201d8f 100644
--- a/renderer/playground/playground.ts
+++ b/renderer/playground/playground.ts
@@ -1,11 +1,12 @@
-import { BasePlaygroundScene } from './baseScene'
-import { playgroundGlobalUiState } from './playgroundUi'
-import * as scenes from './scenes'
+if (!new URL(location.href).searchParams.get('playground')) location.href = '/?playground=true'
+// import { BasePlaygroundScene } from './baseScene'
+// import { playgroundGlobalUiState } from './playgroundUi'
+// import * as scenes from './scenes'
 
-const qsScene = new URLSearchParams(window.location.search).get('scene')
-const Scene: typeof BasePlaygroundScene = qsScene ? scenes[qsScene] : scenes.main
-playgroundGlobalUiState.scenes = ['main', 'railsCobweb', 'floorRandom', 'lightingStarfield', 'transparencyIssue', 'entities', 'frequentUpdates', 'slabsOptimization', 'allEntities']
-playgroundGlobalUiState.selected = qsScene ?? 'main'
+// const qsScene = new URLSearchParams(window.location.search).get('scene')
+// const Scene: typeof BasePlaygroundScene = qsScene ? scenes[qsScene] : scenes.main
+// playgroundGlobalUiState.scenes = ['main', 'railsCobweb', 'floorRandom', 'lightingStarfield', 'transparencyIssue', 'entities', 'frequentUpdates', 'slabsOptimization', 'allEntities']
+// playgroundGlobalUiState.selected = qsScene ?? 'main'
 
-const scene = new Scene()
-globalThis.scene = scene
+// const scene = new Scene()
+// globalThis.scene = scene
diff --git a/renderer/playground/scenes/allEntities.ts b/renderer/playground/scenes/allEntities.ts
index 7fa0b6eb..c7a270ae 100644
--- a/renderer/playground/scenes/allEntities.ts
+++ b/renderer/playground/scenes/allEntities.ts
@@ -1,3 +1,4 @@
+//@ts-nocheck
 import { BasePlaygroundScene } from '../baseScene'
 import { EntityDebugFlags, EntityMesh, rendererSpecialHandled } from '../../viewer/lib/entity/EntityMesh'
 
diff --git a/renderer/playground/scenes/entities.ts b/renderer/playground/scenes/entities.ts
index 11b1591a..ef4035a9 100644
--- a/renderer/playground/scenes/entities.ts
+++ b/renderer/playground/scenes/entities.ts
@@ -1,3 +1,4 @@
+//@ts-nocheck
 import * as THREE from 'three'
 import { Vec3 } from 'vec3'
 import { BasePlaygroundScene } from '../baseScene'
diff --git a/renderer/playground/scenes/frequentUpdates.ts b/renderer/playground/scenes/frequentUpdates.ts
index bc401255..caaf7207 100644
--- a/renderer/playground/scenes/frequentUpdates.ts
+++ b/renderer/playground/scenes/frequentUpdates.ts
@@ -1,3 +1,4 @@
+//@ts-nocheck
 import { Vec3 } from 'vec3'
 import { BasePlaygroundScene } from '../baseScene'
 
diff --git a/renderer/playground/scenes/lightingStarfield.ts b/renderer/playground/scenes/lightingStarfield.ts
index 4b259b89..48669d79 100644
--- a/renderer/playground/scenes/lightingStarfield.ts
+++ b/renderer/playground/scenes/lightingStarfield.ts
@@ -1,3 +1,4 @@
+//@ts-nocheck
 import * as THREE from 'three'
 import { Vec3 } from 'vec3'
 import { BasePlaygroundScene } from '../baseScene'
diff --git a/renderer/playground/scenes/main.ts b/renderer/playground/scenes/main.ts
index 73a36762..057fe2ed 100644
--- a/renderer/playground/scenes/main.ts
+++ b/renderer/playground/scenes/main.ts
@@ -1,3 +1,4 @@
+//@ts-nocheck
 // eslint-disable-next-line import/no-named-as-default
 import GUI, { Controller } from 'lil-gui'
 import * as THREE from 'three'
@@ -173,7 +174,6 @@ class MainScene extends BasePlaygroundScene {
     canvas.height = size
     renderer.setSize(size, size)
 
-    //@ts-expect-error
     viewer.camera = new THREE.OrthographicCamera(-1, 1, 1, -1, 0, 10)
     viewer.scene.background = null
 
diff --git a/renderer/viewer/baseGraphicsBackend.ts b/renderer/viewer/baseGraphicsBackend.ts
new file mode 100644
index 00000000..79607695
--- /dev/null
+++ b/renderer/viewer/baseGraphicsBackend.ts
@@ -0,0 +1,15 @@
+import { RendererReactiveState } from '../../src/appViewer'
+
+export const getDefaultRendererState = (): RendererReactiveState => {
+  return {
+    world: {
+      chunksLoaded: [],
+      chunksTotalNumber: 0,
+      allChunksLoaded: true,
+      mesherWork: false,
+      intersectMedia: null
+    },
+    renderer: '',
+    preventEscapeMenu: false
+  }
+}
diff --git a/renderer/viewer/prepare/utils.ts b/renderer/viewer/common/utils.ts
similarity index 100%
rename from renderer/viewer/prepare/utils.ts
rename to renderer/viewer/common/utils.ts
diff --git a/renderer/viewer/index.js b/renderer/viewer/index.js
deleted file mode 100644
index 3e263db9..00000000
--- a/renderer/viewer/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-  Viewer: require('./lib/viewer').Viewer,
-  WorldDataEmitter: require('./lib/worldDataEmitter').WorldDataEmitter,
-  Entity: require('./lib/entity/EntityMesh'),
-  getBufferFromStream: require('./lib/simpleUtils').getBufferFromStream
-}
diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index 1bbb690f..180ede3a 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -3,6 +3,7 @@ import { Vec3 } from 'vec3'
 import TypedEmitter from 'typed-emitter'
 import { ItemSelector } from 'mc-assets/dist/itemDefinitions'
 import { proxy } from 'valtio'
+import { GameMode } from 'mineflayer'
 import { HandItemBlock } from './holdingBlock'
 
 export type MovementState = 'NOT_MOVING' | 'WALKING' | 'SPRINTING' | 'SNEAKING'
@@ -22,6 +23,7 @@ export interface IPlayerState {
   isFlying(): boolean
   isSprinting (): boolean
   getItemUsageTicks?(): number
+  getPosition(): Vec3
   // isUsingItem?(): boolean
   getHeldItem?(isLeftHand: boolean): HandItemBlock | undefined
   username?: string
@@ -31,12 +33,21 @@ export interface IPlayerState {
 
   reactive: {
     playerSkin: string | undefined
+    inWater: boolean
+    backgroundColor: [number, number, number]
+    ambientLight: number
+    directionalLight: number
+    gameMode?: GameMode
   }
 }
 
 export class BasePlayerState implements IPlayerState {
   reactive = proxy({
-    playerSkin: undefined
+    playerSkin: undefined as string | undefined,
+    inWater: false,
+    backgroundColor: [0, 0, 0] as [number, number, number],
+    ambientLight: 0,
+    directionalLight: 0,
   })
   protected movementState: MovementState = 'NOT_MOVING'
   protected velocity = new Vec3(0, 0, 0)
@@ -74,6 +85,10 @@ export class BasePlayerState implements IPlayerState {
     return this.sprinting
   }
 
+  getPosition (): Vec3 {
+    return new Vec3(0, 0, 0)
+  }
+
   // For testing purposes
   setState (state: Partial<{
     movementState: MovementState
diff --git a/renderer/viewer/lib/entities.ts b/renderer/viewer/lib/entities.ts
index c6be8004..daeb090e 100644
--- a/renderer/viewer/lib/entities.ts
+++ b/renderer/viewer/lib/entities.ts
@@ -14,17 +14,19 @@ import mojangson from 'mojangson'
 import { snakeCase } from 'change-case'
 import { Item } from 'prismarine-item'
 import { BlockModel } from 'mc-assets'
+import { isEntityAttackable } from 'mineflayer-mouse/dist/attackableEntity'
+import { Vec3 } from 'vec3'
 import { EntityMetadataVersions } from '../../../src/mcDataTypes'
 import * as Entity from './entity/EntityMesh'
 import { getMesh } from './entity/EntityMesh'
 import { WalkingGeneralSwing } from './entity/animations'
 import { disposeObject } from './threeJsUtils'
 import { armorModel, armorTextures } from './entity/armorModels'
-import { Viewer } from './viewer'
 import { getBlockMeshFromModel } from './holdingBlock'
 import { ItemSpecificContextProperties } from './basePlayerState'
 import { loadSkinImage, getLookupUrl, stevePngUrl, steveTexture } from './utils/skins'
 import { loadTexture } from './utils'
+import { WorldRendererThree } from './worldrendererThree'
 
 export const TWEEN_DURATION = 120
 
@@ -167,7 +169,7 @@ const nametags = {}
 
 const isFirstUpperCase = (str) => str.charAt(0) === str.charAt(0).toUpperCase()
 
-function getEntityMesh (entity, world, options, overrides) {
+function getEntityMesh (entity: import('prismarine-entity').Entity & { delete?: any; pos: any; name: any }, world: WorldRendererThree | undefined, options: { fontFamily: string }, overrides) {
   if (entity.name) {
     try {
       // https://github.com/PrismarineJS/prismarine-viewer/pull/410
@@ -183,6 +185,7 @@ function getEntityMesh (entity, world, options, overrides) {
     }
   }
 
+  if (!isEntityAttackable(loadedData, entity)) return
   const geometry = new THREE.BoxGeometry(entity.width, entity.height, entity.width)
   geometry.translate(0, entity.height / 2, 0)
   const material = new THREE.MeshBasicMaterial({ color: 0xff_00_ff })
@@ -206,30 +209,17 @@ export type SceneEntity = THREE.Object3D & {
   additionalCleanup?: () => void
 }
 
-export class Entities extends EventEmitter {
+export class Entities {
   entities = {} as Record<string, SceneEntity>
-  entitiesOptions: {
-    fontFamily?: string
-  } = {}
+  entitiesOptions = {
+    fontFamily: 'mojangles'
+  }
   debugMode: string
   onSkinUpdate: () => void
   clock = new THREE.Clock()
-  rendering = true
-  itemsTexture: THREE.Texture | null = null
+  currentlyRendering = true
   cachedMapsImages = {} as Record<number, string>
   itemFrameMaps = {} as Record<number, Array<THREE.Mesh<THREE.PlaneGeometry, THREE.MeshLambertMaterial>>>
-  getItemUv: undefined | ((item: Record<string, any>, specificProps: ItemSpecificContextProperties) => {
-    texture: THREE.Texture;
-    u: number;
-    v: number;
-    su?: number;
-    sv?: number;
-    size?: number;
-    modelName?: string;
-  } | {
-    resolvedModel: BlockModel
-    modelName: string
-  } | undefined)
 
   get entitiesByName (): Record<string, SceneEntity[]> {
     const byName: Record<string, SceneEntity[]> = {}
@@ -245,16 +235,14 @@ export class Entities extends EventEmitter {
     return Object.values(this.entities).filter(entity => entity.visible).length
   }
 
-  constructor (public viewer: Viewer) {
-    super()
-    this.entitiesOptions = {}
+  constructor (public worldRenderer: WorldRendererThree) {
     this.debugMode = 'none'
     this.onSkinUpdate = () => { }
   }
 
   clear () {
     for (const mesh of Object.values(this.entities)) {
-      this.viewer.scene.remove(mesh)
+      this.worldRenderer.scene.remove(mesh)
       disposeObject(mesh)
     }
     this.entities = {}
@@ -273,19 +261,24 @@ export class Entities extends EventEmitter {
   }
 
   setRendering (rendering: boolean, entity: THREE.Object3D | null = null) {
-    this.rendering = rendering
+    this.currentlyRendering = rendering
     for (const ent of entity ? [entity] : Object.values(this.entities)) {
       if (rendering) {
-        if (!this.viewer.scene.children.includes(ent)) this.viewer.scene.add(ent)
+        if (!this.worldRenderer.scene.children.includes(ent)) this.worldRenderer.scene.add(ent)
       } else {
-        this.viewer.scene.remove(ent)
+        this.worldRenderer.scene.remove(ent)
       }
     }
   }
 
   render () {
+    const renderEntitiesConfig = this.worldRenderer.worldRendererConfig.renderEntities
+    if (renderEntitiesConfig !== this.currentlyRendering) {
+      this.setRendering(renderEntitiesConfig)
+    }
+
     const dt = this.clock.getDelta()
-    const botPos = this.viewer.world.viewerPosition
+    const botPos = this.worldRenderer.viewerPosition
     const VISIBLE_DISTANCE = 8 * 8
 
     for (const entityId of Object.keys(this.entities)) {
@@ -310,7 +303,7 @@ export class Entities extends EventEmitter {
         const chunkKey = `${chunkX},${chunkZ}`
 
         // Entity is visible if within 16 blocks OR in a finished chunk
-        entity.visible = !!(distanceSquared < VISIBLE_DISTANCE || this.viewer.world.finishedChunks[chunkKey])
+        entity.visible = !!(distanceSquared < VISIBLE_DISTANCE || this.worldRenderer.finishedChunks[chunkKey])
       }
     }
   }
@@ -349,7 +342,7 @@ export class Entities extends EventEmitter {
     }
 
     if (typeof skinUrl !== 'string') throw new Error('Invalid skin url')
-    const renderEars = this.viewer.world.config.renderEars || username === 'deadmau5'
+    const renderEars = this.worldRenderer.worldRendererConfig.renderEars || username === 'deadmau5'
     void this.loadAndApplySkin(entityId, skinUrl, renderEars).then(() => {
       if (capeUrl) {
         if (capeUrl === true && username) {
@@ -500,11 +493,11 @@ export class Entities extends EventEmitter {
   }
 
   getItemMesh (item, specificProps: ItemSpecificContextProperties, previousModel?: string) {
-    const textureUv = this.getItemUv?.(item, specificProps)
+    const textureUv = this.worldRenderer.getItemRenderData(item, specificProps)
     if (previousModel && previousModel === textureUv?.modelName) return undefined
 
     if (textureUv && 'resolvedModel' in textureUv) {
-      const mesh = getBlockMeshFromModel(this.viewer.world.material, textureUv.resolvedModel, textureUv.modelName)
+      const mesh = getBlockMeshFromModel(this.worldRenderer.material, textureUv.resolvedModel, textureUv.modelName, this.worldRenderer.resourcesManager.currentResources!.worldBlockProvider)
       let SCALE = 1
       if (specificProps['minecraft:display_context'] === 'ground') {
         SCALE = 0.5
@@ -525,9 +518,11 @@ export class Entities extends EventEmitter {
 
     // TODO: Render proper model (especially for blocks) instead of flat texture
     if (textureUv) {
+      const textureThree = textureUv.renderInfo?.texture === 'blocks' ? this.worldRenderer.material.map! : this.worldRenderer.itemsTexture
       // todo use geometry buffer uv instead!
-      const { u, v, size, su, sv, texture } = textureUv
-      const itemsTexture = texture.clone()
+      const { u, v, su, sv } = textureUv
+      const size = undefined
+      const itemsTexture = textureThree.clone()
       itemsTexture.flipY = true
       const sizeY = (sv ?? size)!
       const sizeX = (su ?? size)!
@@ -584,6 +579,8 @@ export class Entities extends EventEmitter {
   }
 
   update (entity: import('prismarine-entity').Entity & { delete?; pos, name }, overrides) {
+    const justAdded = !this.entities[entity.id]
+
     const isPlayerModel = entity.name === 'player'
     if (entity.name === 'zombie_villager' || entity.name === 'husk') {
       overrides.texture = `textures/1.16.4/entity/${entity.name === 'zombie_villager' ? 'zombie_villager/zombie_villager.png' : `zombie/${entity.name}.png`}`
@@ -601,8 +598,8 @@ export class Entities extends EventEmitter {
       e.traverse(c => {
         if (c['additionalCleanup']) c['additionalCleanup']()
       })
-      this.emit('remove', entity)
-      this.viewer.scene.remove(e)
+      this.onRemoveEntity(entity)
+      this.worldRenderer.scene.remove(e)
       disposeObject(e)
       // todo dispose textures as well ?
       delete this.entities[entity.id]
@@ -675,7 +672,7 @@ export class Entities extends EventEmitter {
         //@ts-expect-error
         playerObject.animation.isMoving = false
       } else {
-        mesh = getEntityMesh(entity, this.viewer.world, this.entitiesOptions, overrides)
+        mesh = getEntityMesh(entity, this.worldRenderer, this.entitiesOptions, overrides)
       }
       if (!mesh) return
       mesh.name = 'mesh'
@@ -694,20 +691,20 @@ export class Entities extends EventEmitter {
       group.add(mesh)
       group.add(boxHelper)
       boxHelper.visible = false
-      this.viewer.scene.add(group)
+      this.worldRenderer.scene.add(group)
 
       e = group
       e.name = 'entity'
       e['realName'] = entity.name
       this.entities[entity.id] = e
 
-      this.emit('add', entity)
+      this.onAddEntity(entity)
 
       if (isPlayerModel) {
         this.updatePlayerSkin(entity.id, entity.username, entity.uuid, overrides?.texture || stevePngUrl)
       }
       this.setDebugMode(this.debugMode, group)
-      this.setRendering(this.rendering, group)
+      this.setRendering(this.currentlyRendering, group)
     } else {
       mesh = e.children.find(c => c.name === 'mesh')
     }
@@ -716,10 +713,10 @@ export class Entities extends EventEmitter {
     if (entity.equipment) {
       this.addItemModel(e, 'left', entity.equipment[0])
       this.addItemModel(e, 'right', entity.equipment[1])
-      addArmorModel(e, 'feet', entity.equipment[2])
-      addArmorModel(e, 'legs', entity.equipment[3], 2)
-      addArmorModel(e, 'chest', entity.equipment[4])
-      addArmorModel(e, 'head', entity.equipment[5])
+      addArmorModel(this.worldRenderer, e, 'feet', entity.equipment[2])
+      addArmorModel(this.worldRenderer, e, 'legs', entity.equipment[3], 2)
+      addArmorModel(this.worldRenderer, e, 'chest', entity.equipment[4])
+      addArmorModel(this.worldRenderer, e, 'head', entity.equipment[5])
     }
 
     const meta = getGeneralEntitiesMetadata(entity)
@@ -884,6 +881,30 @@ export class Entities extends EventEmitter {
       e.username = entity.username
     }
 
+    if (entity.type === 'player' && entity.equipment && e.playerObject) {
+      const { playerObject } = e
+      playerObject.backEquipment = entity.equipment.some((item) => item?.name === 'elytra') ? 'elytra' : 'cape'
+      if (playerObject.cape.map === null) {
+        playerObject.cape.visible = false
+      }
+    }
+
+    this.updateEntityPosition(entity, justAdded, overrides)
+  }
+
+  updateEntityPosition (entity: import('prismarine-entity').Entity, justAdded: boolean, overrides: { rotation?: { head?: { y: number, x: number } } }) {
+    const e = this.entities[entity.id]
+    if (!e) return
+    const ANIMATION_DURATION = justAdded ? 0 : TWEEN_DURATION
+    if (entity.position) {
+      new TWEEN.Tween(e.position).to({ x: entity.position.x, y: entity.position.y, z: entity.position.z }, ANIMATION_DURATION).start()
+    }
+    if (entity.yaw) {
+      const da = (entity.yaw - e.rotation.y) % (Math.PI * 2)
+      const dy = 2 * da % (Math.PI * 2) - da
+      new TWEEN.Tween(e.rotation).to({ y: e.rotation.y + dy }, ANIMATION_DURATION).start()
+    }
+
     if (e?.playerObject && overrides?.rotation?.head) {
       const playerObject = e.playerObject as PlayerObjectType
       const headRotationDiff = overrides.rotation.head.y ? overrides.rotation.head.y - entity.yaw : 0
@@ -891,16 +912,34 @@ export class Entities extends EventEmitter {
       playerObject.skin.head.rotation.x = overrides.rotation.head.x ? - overrides.rotation.head.x : 0
     }
 
-    if (entity.pos) {
-      new TWEEN.Tween(e.position).to({ x: entity.pos.x, y: entity.pos.y, z: entity.pos.z }, TWEEN_DURATION).start()
-    }
-    if (entity.yaw) {
-      const da = (entity.yaw - e.rotation.y) % (Math.PI * 2)
-      const dy = 2 * da % (Math.PI * 2) - da
-      new TWEEN.Tween(e.rotation).to({ y: e.rotation.y + dy }, TWEEN_DURATION).start()
+    this.maybeRenderPlayerSkin(entity)
+  }
+
+  onAddEntity (entity: import('prismarine-entity').Entity) {
+  }
+
+  loadedSkinEntityIds = new Set<number>()
+  maybeRenderPlayerSkin (entity: import('prismarine-entity').Entity) {
+    const mesh = this.entities[entity.id]
+    if (!mesh) return
+    if (!mesh.playerObject || !this.worldRenderer.worldRendererConfig.fetchPlayerSkins) return
+    const MAX_DISTANCE_SKIN_LOAD = 128
+    const cameraPos = this.worldRenderer.camera.position
+    const distance = entity.position.distanceTo(new Vec3(cameraPos.x, cameraPos.y, cameraPos.z))
+    if (distance < MAX_DISTANCE_SKIN_LOAD && distance < (this.worldRenderer.viewDistance * 16)) {
+      if (this.entities[entity.id]) {
+        if (this.loadedSkinEntityIds.has(entity.id)) return
+        this.loadedSkinEntityIds.add(entity.id)
+        this.updatePlayerSkin(entity.id, entity.username, entity.uuid, true, true)
+      }
     }
   }
 
+  playerPerAnimation = {} as Record<number, string>
+  onRemoveEntity (entity: import('prismarine-entity').Entity) {
+    this.loadedSkinEntityIds.delete(entity.id)
+  }
+
   updateMap (mapNumber: string | number, data: string) {
     this.cachedMapsImages[mapNumber] = data
     let itemFrameMeshes = this.itemFrameMaps[mapNumber]
@@ -983,7 +1022,7 @@ export class Entities extends EventEmitter {
     const itemObject = this.getItemMesh(item, {
       'minecraft:display_context': 'thirdperson',
     })
-    if (itemObject) {
+    if (itemObject?.mesh) {
       entityMesh.traverse(c => {
         if (c.name.toLowerCase() === parentName) {
           const group = new THREE.Object3D()
@@ -1043,7 +1082,7 @@ function getSpecificEntityMetadata<T extends keyof EntityMetadataVersions> (name
   return getGeneralEntitiesMetadata(entity) as any
 }
 
-function addArmorModel (entityMesh: THREE.Object3D, slotType: string, item: Item, layer = 1, overlay = false) {
+function addArmorModel (worldRenderer: WorldRendererThree, entityMesh: THREE.Object3D, slotType: string, item: Item, layer = 1, overlay = false) {
   if (!item) {
     removeArmorModel(entityMesh, slotType)
     return
@@ -1077,7 +1116,7 @@ function addArmorModel (entityMesh: THREE.Object3D, slotType: string, item: Item
   if (!texturePath) {
     // TODO: Support mirroring on certain parts of the model
     const armorTextureName = `${armorMaterial}_layer_${layer}${overlay ? '_overlay' : ''}`
-    texturePath = viewer.world.customTextures.armor?.textures[armorTextureName]?.src ?? armorTextures[armorTextureName]
+    texturePath = worldRenderer.resourcesManager.currentResources!.customTextures.armor?.textures[armorTextureName]?.src ?? armorTextures[armorTextureName]
   }
   if (!texturePath || !armorModel[slotType]) {
     removeArmorModel(entityMesh, slotType)
@@ -1098,7 +1137,7 @@ function addArmorModel (entityMesh: THREE.Object3D, slotType: string, item: Item
       material.map = texture
     })
   } else {
-    mesh = getMesh(viewer.world, texturePath, armorModel[slotType])
+    mesh = getMesh(worldRenderer, texturePath, armorModel[slotType])
     mesh.name = meshName
     material = mesh.material
     if (!isPlayerHead) {
@@ -1115,7 +1154,7 @@ function addArmorModel (entityMesh: THREE.Object3D, slotType: string, item: Item
     } else {
       material.color.setHex(0xB5_6D_51) // default brown color
     }
-    addArmorModel(entityMesh, slotType, item, layer, true)
+    addArmorModel(worldRenderer, entityMesh, slotType, item, layer, true)
   } else {
     material.color.setHex(0xFF_FF_FF)
   }
diff --git a/renderer/viewer/lib/entity/EntityMesh.ts b/renderer/viewer/lib/entity/EntityMesh.ts
index 74023794..a6381c4b 100644
--- a/renderer/viewer/lib/entity/EntityMesh.ts
+++ b/renderer/viewer/lib/entity/EntityMesh.ts
@@ -5,8 +5,8 @@ import { Vec3 } from 'vec3'
 import arrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/arrow.png'
 import spectralArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/spectral_arrow.png'
 import tippedArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/tipped_arrow.png'
-import { WorldRendererCommon } from '../worldrendererCommon'
 import { loadTexture } from '../utils'
+import { WorldRendererThree } from '../worldrendererThree'
 import entities from './entities.json'
 import { externalModels } from './objModels'
 import externalTexturesJson from './externalTextures.json'
@@ -223,7 +223,7 @@ function addCube (
 }
 
 export function getMesh (
-  worldRenderer: WorldRendererCommon | undefined,
+  worldRenderer: WorldRendererThree | undefined,
   texture: string,
   jsonModel: JsonModel,
   overrides: EntityOverrides = {},
@@ -237,7 +237,7 @@ export function getMesh (
   if (useBlockTexture) {
     if (!worldRenderer) throw new Error('worldRenderer is required for block textures')
     const blockName = texture.slice(6)
-    const textureInfo = worldRenderer.blocksAtlasParser!.getTextureInfo(blockName)
+    const textureInfo = worldRenderer.resourcesManager.currentResources!.blocksAtlasParser.getTextureInfo(blockName)
     if (textureInfo) {
       textureWidth = blocksTexture!.image.width
       textureHeight = blocksTexture!.image.height
@@ -437,7 +437,7 @@ export class EntityMesh {
   constructor (
     version: string,
     type: string,
-    worldRenderer?: WorldRendererCommon,
+    worldRenderer?: WorldRendererThree,
     overrides: EntityOverrides = {},
     debugFlags: EntityDebugFlags = {}
   ) {
diff --git a/renderer/viewer/lib/guiRenderer.ts b/renderer/viewer/lib/guiRenderer.ts
index d2987ce6..2360e104 100644
--- a/renderer/viewer/lib/guiRenderer.ts
+++ b/renderer/viewer/lib/guiRenderer.ts
@@ -2,27 +2,26 @@
 import { ItemRenderer, Identifier, ItemStack, NbtString, Structure, StructureRenderer, ItemRendererResources, BlockDefinition, BlockModel, TextureAtlas, Resources, ItemModel } from 'deepslate'
 import { mat4, vec3 } from 'gl-matrix'
 import { AssetsParser } from 'mc-assets/dist/assetsParser'
-import { getLoadedImage } from 'mc-assets/dist/utils'
+import { getLoadedImage, versionToNumber } from 'mc-assets/dist/utils'
 import { BlockModel as BlockModelMcAssets, AtlasParser } from 'mc-assets'
 import { getLoadedBlockstatesStore, getLoadedModelsStore } from 'mc-assets/dist/stores'
 import { makeTextureAtlas } from 'mc-assets/dist/atlasCreator'
 import { proxy, ref } from 'valtio'
 import { getItemDefinition } from 'mc-assets/dist/itemDefinitions'
-import { versionToNumber } from '../prepare/utils'
 
 export const activeGuiAtlas = proxy({
   atlas: null as null | { json, image },
 })
 
 export const getNonFullBlocksModels = () => {
-  let version = viewer.world.texturesVersion ?? 'latest'
+  let version = appViewer.resourcesManager.currentResources!.version ?? 'latest'
   if (versionToNumber(version) < versionToNumber('1.13')) version = '1.13'
-  const itemsDefinitions = viewer.world.itemsDefinitionsStore.data.latest
+  const itemsDefinitions = appViewer.resourcesManager.itemsDefinitionsStore.data.latest
   const blockModelsResolved = {} as Record<string, any>
   const itemsModelsResolved = {} as Record<string, any>
   const fullBlocksWithNonStandardDisplay = [] as string[]
   const handledItemsWithDefinitions = new Set()
-  const assetsParser = new AssetsParser(version, getLoadedBlockstatesStore(viewer.world.blockstatesModels), getLoadedModelsStore(viewer.world.blockstatesModels))
+  const assetsParser = new AssetsParser(version, getLoadedBlockstatesStore(appViewer.resourcesManager.currentResources!.blockstatesModels), getLoadedModelsStore(appViewer.resourcesManager.currentResources!.blockstatesModels))
 
   const standardGuiDisplay = {
     'rotation': [
@@ -54,7 +53,7 @@ export const getNonFullBlocksModels = () => {
   }
 
   for (const [name, definition] of Object.entries(itemsDefinitions)) {
-    const item = getItemDefinition(viewer.world.itemsDefinitionsStore, {
+    const item = getItemDefinition(appViewer.resourcesManager.itemsDefinitionsStore, {
       version,
       name,
       properties: {
@@ -97,7 +96,7 @@ export const getNonFullBlocksModels = () => {
     }
   }
 
-  for (const [name, blockstate] of Object.entries(viewer.world.blockstatesModels.blockstates.latest)) {
+  for (const [name, blockstate] of Object.entries(appViewer.resourcesManager.currentResources!.blockstatesModels.blockstates.latest)) {
     if (handledItemsWithDefinitions.has(name)) {
       continue
     }
@@ -120,7 +119,8 @@ export const getNonFullBlocksModels = () => {
 const RENDER_SIZE = 64
 
 const generateItemsGui = async (models: Record<string, BlockModelMcAssets>, isItems = false) => {
-  const img = await getLoadedImage(isItems ? viewer.world.itemsAtlasParser!.latestImage : viewer.world.blocksAtlasParser!.latestImage)
+  const { currentResources } = appViewer.resourcesManager
+  const img = await getLoadedImage(isItems ? currentResources!.itemsAtlasParser.latestImage : currentResources!.blocksAtlasParser.latestImage)
   const canvasTemp = document.createElement('canvas')
   canvasTemp.width = img.width
   canvasTemp.height = img.height
@@ -129,7 +129,7 @@ const generateItemsGui = async (models: Record<string, BlockModelMcAssets>, isIt
   ctx.imageSmoothingEnabled = false
   ctx.drawImage(img, 0, 0)
 
-  const atlasParser = isItems ? viewer.world.itemsAtlasParser! : viewer.world.blocksAtlasParser!
+  const atlasParser = isItems ? currentResources!.itemsAtlasParser : currentResources!.blocksAtlasParser
   const textureAtlas = new TextureAtlas(
     ctx.getImageData(0, 0, img.width, img.height),
     Object.fromEntries(Object.entries(atlasParser.atlas.latest.textures).map(([key, value]) => {
diff --git a/renderer/viewer/lib/holdingBlock.ts b/renderer/viewer/lib/holdingBlock.ts
index 084953fd..8b75b02a 100644
--- a/renderer/viewer/lib/holdingBlock.ts
+++ b/renderer/viewer/lib/holdingBlock.ts
@@ -1,6 +1,6 @@
 import * as THREE from 'three'
 import * as tweenJs from '@tweenjs/tween.js'
-import worldBlockProvider from 'mc-assets/dist/worldBlockProvider'
+import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import { BlockModel } from 'mc-assets'
 import { getThreeBlockModelGroup, renderBlockThree, setBlockPosition } from './mesher/standaloneRenderer'
 import { getMyHand } from './hand'
@@ -10,6 +10,7 @@ import { SmoothSwitcher } from './smoothSwitcher'
 import { watchProperty } from './utils/proxy'
 import { disposeObject } from './threeJsUtils'
 import { WorldRendererConfig } from './worldrendererCommon'
+import { WorldRendererThree } from './worldrendererThree'
 
 export type HandItemBlock = {
   name?
@@ -114,14 +115,17 @@ export default class HoldingBlock {
   offHandModeLegacy = false
 
   swingAnimator: HandSwingAnimator | undefined
+  playerState: IPlayerState
+  config: WorldRendererConfig
 
-  constructor (public playerState: IPlayerState, public config: WorldRendererConfig, public offHand = false) {
+  constructor (public worldRenderer: WorldRendererThree, public offHand = false) {
     this.initCameraGroup()
-
+    this.playerState = worldRenderer.displayOptions.playerState
     this.playerState.events.on('heldItemChanged', (_, isOffHand) => {
       if (this.offHand !== isOffHand) return
       this.updateItem()
     })
+    this.config = worldRenderer.displayOptions.inWorldRenderingConfig
 
     this.offHandDisplay = this.offHand
     // this.offHandDisplay = true
@@ -327,7 +331,7 @@ export default class HoldingBlock {
 
     let blockInner: THREE.Object3D | undefined
     if (handItem.type === 'item' || handItem.type === 'block') {
-      const result = viewer.entities.getItemMesh({
+      const result = this.worldRenderer.entities.getItemMesh({
         ...handItem.fullItem,
         itemId: handItem.id,
       }, {
@@ -901,8 +905,7 @@ class HandSwingAnimator {
   }
 }
 
-export const getBlockMeshFromModel = (material: THREE.Material, model: BlockModel, name: string) => {
-  const blockProvider = worldBlockProvider(viewer.world.blockstatesModels, viewer.world.blocksAtlasParser!.atlas, 'latest')
+export const getBlockMeshFromModel = (material: THREE.Material, model: BlockModel, name: string, blockProvider: WorldBlockProvider) => {
   const worldRenderModel = blockProvider.transformModel(model, {
     name,
     properties: {}
diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index 9afcfeb3..42432a6d 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -121,7 +121,9 @@ const handleMessage = data => {
     }
     case 'blockUpdate': {
       const loc = new Vec3(data.pos.x, data.pos.y, data.pos.z).floored()
-      world.setBlockStateId(loc, data.stateId)
+      if (data.stateId !== undefined && data.stateId !== null) {
+        world.setBlockStateId(loc, data.stateId)
+      }
 
       const chunkKey = `${Math.floor(loc.x / 16) * 16},${Math.floor(loc.z / 16) * 16}`
       if (data.customBlockModels) {
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index 92ea2c82..d8d89042 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -1,5 +1,6 @@
 import { BlockType } from '../../../playground/shared'
 
+// only here for easier testing
 export const defaultMesherConfig = {
   version: '',
   enableLighting: true,
diff --git a/renderer/viewer/lib/threeJsSound.ts b/renderer/viewer/lib/threeJsSound.ts
new file mode 100644
index 00000000..64105423
--- /dev/null
+++ b/renderer/viewer/lib/threeJsSound.ts
@@ -0,0 +1,61 @@
+import { Vec3 } from 'vec3'
+import * as THREE from 'three'
+import { WorldRendererThree } from './worldrendererThree'
+
+export interface SoundSystem {
+  playSound: (position: Vec3, path: string, volume?: number, pitch?: number) => void
+  destroy: () => void
+}
+
+export class ThreeJsSound implements SoundSystem {
+  audioListener: THREE.AudioListener | undefined
+  private readonly activeSounds = new Set<THREE.PositionalAudio>()
+
+  constructor (public worldRenderer: WorldRendererThree) {
+  }
+
+  playSound (position: Vec3, path: string, volume = 1, pitch = 1) {
+    if (!this.audioListener) {
+      this.audioListener = new THREE.AudioListener()
+      this.worldRenderer.camera.add(this.audioListener)
+    }
+
+    const sound = new THREE.PositionalAudio(this.audioListener)
+    this.activeSounds.add(sound)
+
+    const audioLoader = new THREE.AudioLoader()
+    const start = Date.now()
+    void audioLoader.loadAsync(path).then((buffer) => {
+      if (Date.now() - start > 500) return
+      // play
+      sound.setBuffer(buffer)
+      sound.setRefDistance(20)
+      sound.setVolume(volume)
+      sound.setPlaybackRate(pitch) // set the pitch
+      this.worldRenderer.scene.add(sound)
+      // set sound position
+      sound.position.set(position.x, position.y, position.z)
+      sound.onEnded = () => {
+        this.worldRenderer.scene.remove(sound)
+        sound.disconnect()
+        this.activeSounds.delete(sound)
+        audioLoader.manager.itemEnd(path)
+      }
+      sound.play()
+    })
+  }
+
+  destroy () {
+    // Stop and clean up all active sounds
+    for (const sound of this.activeSounds) {
+      sound.stop()
+      sound.disconnect()
+    }
+
+    // Remove and cleanup audio listener
+    if (this.audioListener) {
+      this.audioListener.removeFromParent()
+      this.audioListener = undefined
+    }
+  }
+}
diff --git a/renderer/viewer/lib/ui/newStats.ts b/renderer/viewer/lib/ui/newStats.ts
index d18ad16c..6c84ef69 100644
--- a/renderer/viewer/lib/ui/newStats.ts
+++ b/renderer/viewer/lib/ui/newStats.ts
@@ -40,6 +40,19 @@ export const updateStatText = (id, text) => {
   stats[id].innerText = text
 }
 
+export const removeAllStats = () => {
+  // eslint-disable-next-line guard-for-in
+  for (const id in stats) {
+    removeStat(id)
+  }
+}
+
+export const removeStat = (id) => {
+  if (!stats[id]) return
+  stats[id].remove()
+  delete stats[id]
+}
+
 if (typeof customEvents !== 'undefined') {
   customEvents.on('gameLoaded', () => {
     const chunksLoaded = addNewStat('chunks-loaded', 80, 0, 0)
diff --git a/renderer/viewer/lib/viewer.ts b/renderer/viewer/lib/viewer.ts
deleted file mode 100644
index 941f2182..00000000
--- a/renderer/viewer/lib/viewer.ts
+++ /dev/null
@@ -1,325 +0,0 @@
-import EventEmitter from 'events'
-import * as THREE from 'three'
-import { Vec3 } from 'vec3'
-import { generateSpiralMatrix } from 'flying-squid/dist/utils'
-import worldBlockProvider from 'mc-assets/dist/worldBlockProvider'
-import { Entities } from './entities'
-import { Primitives } from './primitives'
-import { WorldRendererThree } from './worldrendererThree'
-import { WorldRendererCommon, WorldRendererConfig, defaultWorldRendererConfig } from './worldrendererCommon'
-import { getThreeBlockModelGroup, renderBlockThree, setBlockPosition } from './mesher/standaloneRenderer'
-import { addNewStat } from './ui/newStats'
-import { getMyHand } from './hand'
-import { IPlayerState, BasePlayerState } from './basePlayerState'
-import { CameraBobbing } from './cameraBobbing'
-
-export class Viewer {
-  scene: THREE.Scene
-  ambientLight: THREE.AmbientLight
-  directionalLight: THREE.DirectionalLight
-  world: WorldRendererCommon
-  entities: Entities
-  // primitives: Primitives
-  domElement: HTMLCanvasElement
-  playerHeight = 1.62
-  threeJsWorld: WorldRendererThree
-  cameraObjectOverride?: THREE.Object3D // for xr
-  audioListener: THREE.AudioListener
-  renderingUntilNoUpdates = false
-  processEntityOverrides = (e, overrides) => overrides
-  private readonly cameraBobbing: CameraBobbing
-
-  get camera () {
-    return this.world.camera
-  }
-
-  set camera (camera) {
-    this.world.camera = camera
-  }
-
-  constructor (public renderer: THREE.WebGLRenderer, worldConfig = defaultWorldRendererConfig, public playerState: IPlayerState = new BasePlayerState()) {
-    // https://discourse.threejs.org/t/updates-to-color-management-in-three-js-r152/50791
-    THREE.ColorManagement.enabled = false
-    renderer.outputColorSpace = THREE.LinearSRGBColorSpace
-
-    this.scene = new THREE.Scene()
-    this.scene.matrixAutoUpdate = false // for perf
-    this.threeJsWorld = new WorldRendererThree(this.scene, this.renderer, worldConfig, this.playerState)
-    this.setWorld()
-    this.resetScene()
-    this.entities = new Entities(this)
-    // this.primitives = new Primitives(this.scene, this.camera)
-    this.cameraBobbing = new CameraBobbing()
-
-    this.domElement = renderer.domElement
-  }
-
-  setWorld () {
-    this.world = this.threeJsWorld
-  }
-
-  resetScene () {
-    this.scene.background = new THREE.Color('lightblue')
-
-    if (this.ambientLight) this.scene.remove(this.ambientLight)
-    this.ambientLight = new THREE.AmbientLight(0xcc_cc_cc)
-    this.scene.add(this.ambientLight)
-
-    if (this.directionalLight) this.scene.remove(this.directionalLight)
-    this.directionalLight = new THREE.DirectionalLight(0xff_ff_ff, 0.5)
-    this.directionalLight.position.set(1, 1, 0.5).normalize()
-    this.directionalLight.castShadow = true
-    this.scene.add(this.directionalLight)
-
-    const size = this.renderer.getSize(new THREE.Vector2())
-    this.camera = new THREE.PerspectiveCamera(75, size.x / size.y, 0.1, 1000)
-  }
-
-  resetAll () {
-    this.resetScene()
-    this.world.resetWorld()
-    this.entities.clear()
-    // this.primitives.clear()
-  }
-
-  setVersion (userVersion: string, texturesVersion = userVersion): void | Promise<void> {
-    console.log('[viewer] Using version:', userVersion, 'textures:', texturesVersion)
-    this.entities.clear()
-    // this.primitives.clear()
-    return this.world.setVersion(userVersion, texturesVersion)
-  }
-
-  addColumn (x, z, chunk, isLightUpdate = false) {
-    this.world.addColumn(x, z, chunk, isLightUpdate)
-  }
-
-  removeColumn (x: string, z: string) {
-    this.world.removeColumn(x, z)
-  }
-
-  setBlockStateId (pos: Vec3, stateId: number) {
-    const set = async () => {
-      const sectionX = Math.floor(pos.x / 16) * 16
-      const sectionZ = Math.floor(pos.z / 16) * 16
-      if (this.world.queuedChunks.has(`${sectionX},${sectionZ}`)) {
-        await new Promise<void>(resolve => {
-          this.world.queuedFunctions.push(() => {
-            resolve()
-          })
-        })
-      }
-      if (!this.world.loadedChunks[`${sectionX},${sectionZ}`]) {
-        // console.debug('[should be unreachable] setBlockStateId called for unloaded chunk', pos)
-      }
-      this.world.setBlockStateId(pos, stateId)
-    }
-    void set()
-  }
-
-  async demoModel () {
-    //@ts-expect-error
-    const pos = cursorBlockRel(0, 1, 0).position
-
-    const mesh = await getMyHand()
-    // mesh.rotation.y = THREE.MathUtils.degToRad(90)
-    setBlockPosition(mesh, pos)
-    const helper = new THREE.BoxHelper(mesh, 0xff_ff_00)
-    mesh.add(helper)
-    this.scene.add(mesh)
-  }
-
-  demoItem () {
-    //@ts-expect-error
-    const pos = cursorBlockRel(0, 1, 0).position
-    const { mesh } = this.entities.getItemMesh({
-      itemId: 541,
-    }, {})!
-    mesh.position.set(pos.x + 0.5, pos.y + 0.5, pos.z + 0.5)
-    // mesh.scale.set(0.5, 0.5, 0.5)
-    const helper = new THREE.BoxHelper(mesh, 0xff_ff_00)
-    mesh.add(helper)
-    this.scene.add(mesh)
-  }
-
-  updateEntity (e) {
-    this.entities.update(e, this.processEntityOverrides(e, {
-      rotation: {
-        head: {
-          x: e.headPitch ?? e.pitch,
-          y: e.headYaw,
-          z: 0
-        }
-      }
-    }))
-  }
-
-  setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number) {
-    const cam = this.cameraObjectOverride || this.camera
-    const yOffset = this.playerState.getEyeHeight()
-    // if (this.playerState.isSneaking()) yOffset -= 0.3
-
-    this.world.camera = cam as THREE.PerspectiveCamera
-    this.world.updateCamera(pos?.offset(0, yOffset, 0) ?? null, yaw, pitch)
-
-    // // Update camera bobbing based on movement state
-    // const velocity = this.playerState.getVelocity()
-    // const movementState = this.playerState.getMovementState()
-    // const isMoving = movementState === 'SPRINTING' || movementState === 'WALKING'
-    // const speed = Math.hypot(velocity.x, velocity.z)
-
-    // // Update bobbing state
-    // this.cameraBobbing.updateWalkDistance(speed)
-    // this.cameraBobbing.updateBobAmount(isMoving)
-
-    // // Get bobbing offsets
-    // const bobbing = isMoving ? this.cameraBobbing.getBobbing() : { position: { x: 0, y: 0 }, rotation: { x: 0, z: 0 } }
-
-    // // Apply camera position with bobbing
-    // const finalPos = pos ? pos.offset(bobbing.position.x, yOffset + bobbing.position.y, 0) : null
-    // this.world.updateCamera(finalPos, yaw + bobbing.rotation.x, pitch)
-
-    // // Apply roll rotation separately since updateCamera doesn't handle it
-    // this.camera.rotation.z = bobbing.rotation.z
-  }
-
-  playSound (position: Vec3, path: string, volume = 1, pitch = 1) {
-    if (!this.audioListener) {
-      this.audioListener = new THREE.AudioListener()
-      this.camera.add(this.audioListener)
-    }
-
-    const sound = new THREE.PositionalAudio(this.audioListener)
-
-    const audioLoader = new THREE.AudioLoader()
-    const start = Date.now()
-    void audioLoader.loadAsync(path).then((buffer) => {
-      if (Date.now() - start > 500) return
-      // play
-      sound.setBuffer(buffer)
-      sound.setRefDistance(20)
-      sound.setVolume(volume)
-      sound.setPlaybackRate(pitch) // set the pitch
-      this.scene.add(sound)
-      // set sound position
-      sound.position.set(position.x, position.y, position.z)
-      sound.onEnded = () => {
-        this.scene.remove(sound)
-        sound.disconnect()
-        audioLoader.manager.itemEnd(path)
-      }
-      sound.play()
-    })
-  }
-
-  addChunksBatchWaitTime = 200
-
-  connect (worldEmitter: EventEmitter) {
-    worldEmitter.on('entity', (e) => {
-      this.updateEntity(e)
-    })
-
-    worldEmitter.on('primitive', (p) => {
-      // this.updatePrimitive(p)
-    })
-
-    let currentLoadChunkBatch = null as {
-      timeout
-      data
-    } | null
-    worldEmitter.on('loadChunk', ({ x, z, chunk, worldConfig, isLightUpdate }) => {
-      this.world.worldConfig = worldConfig
-      this.world.queuedChunks.add(`${x},${z}`)
-      const args = [x, z, chunk, isLightUpdate]
-      if (!currentLoadChunkBatch) {
-        // add a setting to use debounce instead
-        currentLoadChunkBatch = {
-          data: [],
-          timeout: setTimeout(() => {
-            for (const args of currentLoadChunkBatch!.data) {
-              this.world.queuedChunks.delete(`${args[0]},${args[1]}`)
-              this.addColumn(...args as Parameters<typeof this.addColumn>)
-            }
-            for (const fn of this.world.queuedFunctions) {
-              fn()
-            }
-            this.world.queuedFunctions = []
-            currentLoadChunkBatch = null
-          }, this.addChunksBatchWaitTime)
-        }
-      }
-      currentLoadChunkBatch.data.push(args)
-    })
-    // todo remove and use other architecture instead so data flow is clear
-    worldEmitter.on('blockEntities', (blockEntities) => {
-      if (this.world instanceof WorldRendererThree) (this.world).blockEntities = blockEntities
-    })
-
-    worldEmitter.on('unloadChunk', ({ x, z }) => {
-      this.removeColumn(x, z)
-    })
-
-    worldEmitter.on('blockUpdate', ({ pos, stateId }) => {
-      this.setBlockStateId(new Vec3(pos.x, pos.y, pos.z), stateId)
-    })
-
-    worldEmitter.on('chunkPosUpdate', ({ pos }) => {
-      this.world.updateViewerPosition(pos)
-    })
-
-
-    worldEmitter.on('renderDistance', (d) => {
-      this.world.viewDistance = d
-      this.world.chunksLength = d === 0 ? 1 : generateSpiralMatrix(d).length
-    })
-
-    worldEmitter.on('renderDistance', (d) => {
-      this.world.viewDistance = d
-      this.world.chunksLength = d === 0 ? 1 : generateSpiralMatrix(d).length
-      this.world.allChunksFinished = Object.keys(this.world.finishedChunks).length === this.world.chunksLength
-    })
-
-    worldEmitter.on('markAsLoaded', ({ x, z }) => {
-      this.world.markAsLoaded(x, z)
-    })
-
-    worldEmitter.on('updateLight', ({ pos }) => {
-      if (this.world instanceof WorldRendererThree) (this.world).updateLight(pos.x, pos.z)
-    })
-
-    worldEmitter.on('time', (timeOfDay) => {
-      this.world.timeUpdated?.(timeOfDay)
-
-      let skyLight = 15
-      if (timeOfDay < 0 || timeOfDay > 24_000) {
-        throw new Error('Invalid time of day. It should be between 0 and 24000.')
-      } else if (timeOfDay <= 6000 || timeOfDay >= 18_000) {
-        skyLight = 15
-      } else if (timeOfDay > 6000 && timeOfDay < 12_000) {
-        skyLight = 15 - ((timeOfDay - 6000) / 6000) * 15
-      } else if (timeOfDay >= 12_000 && timeOfDay < 18_000) {
-        skyLight = ((timeOfDay - 12_000) / 6000) * 15
-      }
-
-      skyLight = Math.floor(skyLight) // todo: remove this after optimization
-
-      if (this.world.mesherConfig.skyLight === skyLight) return
-      this.world.mesherConfig.skyLight = skyLight
-      if (this.world instanceof WorldRendererThree) {
-        (this.world).rerenderAllChunks?.()
-      }
-    })
-
-    worldEmitter.emit('listening')
-  }
-
-  render () {
-    if (this.world instanceof WorldRendererThree) {
-      (this.world).render()
-      this.entities.render()
-    }
-  }
-
-  async waitForChunksToRender () {
-    await this.world.waitForChunksToRender()
-  }
-}
diff --git a/renderer/viewer/lib/viewerWrapper.ts b/renderer/viewer/lib/viewerWrapper.ts
deleted file mode 100644
index 6b2fb562..00000000
--- a/renderer/viewer/lib/viewerWrapper.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import * as THREE from 'three'
-import { statsEnd, statsStart } from '../../../src/topRightStats'
-import { activeModalStack } from '../../../src/globalState'
-
-// wrapper for now
-export class ViewerWrapper {
-  previousWindowWidth: number
-  previousWindowHeight: number
-  globalObject = globalThis as any
-  stopRenderOnBlur = false
-  addedToPage = false
-  renderInterval = 0
-  renderIntervalUnfocused: number | undefined
-  fpsInterval
-
-  constructor (public canvas: HTMLCanvasElement, public renderer?: THREE.WebGLRenderer) {
-    if (this.renderer) this.globalObject.renderer = this.renderer
-  }
-
-  addToPage (startRendering = true) {
-    if (this.addedToPage) throw new Error('Already added to page')
-    let pixelRatio = window.devicePixelRatio || 1 // todo this value is too high on ios, need to check, probably we should use avg, also need to make it configurable
-    if (this.renderer) {
-      if (!this.renderer.capabilities.isWebGL2) pixelRatio = 1 // webgl1 has issues with high pixel ratio (sometimes screen is clipped)
-      this.renderer.setPixelRatio(pixelRatio)
-      this.renderer.setSize(window.innerWidth, window.innerHeight)
-    } else {
-      this.canvas.width = window.innerWidth * pixelRatio
-      this.canvas.height = window.innerHeight * pixelRatio
-    }
-    this.previousWindowWidth = window.innerWidth
-    this.previousWindowHeight = window.innerHeight
-
-    this.canvas.id = 'viewer-canvas'
-    document.body.appendChild(this.canvas)
-
-    this.addedToPage = true
-
-    let max = 0
-    this.fpsInterval = setInterval(() => {
-      if (max > 0) {
-        viewer.world.droppedFpsPercentage = this.renderedFps / max
-      }
-      max = Math.max(this.renderedFps, max)
-      this.renderedFps = 0
-    }, 1000)
-    if (startRendering) {
-      this.globalObject.requestAnimationFrame(this.render.bind(this))
-    }
-    if (typeof window !== 'undefined') {
-      this.trackWindowFocus()
-    }
-  }
-
-  windowFocused = true
-  trackWindowFocus () {
-    window.addEventListener('focus', () => {
-      this.windowFocused = true
-    })
-    window.addEventListener('blur', () => {
-      this.windowFocused = false
-    })
-  }
-
-  dispose () {
-    if (!this.addedToPage) throw new Error('Not added to page')
-    this.canvas.remove()
-    this.renderer?.dispose()
-    // this.addedToPage = false
-    clearInterval(this.fpsInterval)
-  }
-
-
-  renderedFps = 0
-  lastTime = performance.now()
-  delta = 0
-  preRender = () => { }
-  postRender = () => { }
-  render (time: DOMHighResTimeStamp) {
-    if (this.globalObject.stopLoop) return
-    this.globalObject.requestAnimationFrame(this.render.bind(this))
-    if (activeModalStack.some(m => m.reactType === 'app-status')) return
-    if (!viewer || this.globalObject.stopRender || this.renderer?.xr.isPresenting || (this.stopRenderOnBlur && !this.windowFocused)) return
-    const renderInterval = (this.windowFocused ? this.renderInterval : this.renderIntervalUnfocused) ?? this.renderInterval
-    if (renderInterval) {
-      this.delta += time - this.lastTime
-      this.lastTime = time
-      if (this.delta > renderInterval) {
-        this.delta %= renderInterval
-        // continue rendering
-      } else {
-        return
-      }
-    }
-    for (const fn of beforeRenderFrame) fn()
-    this.preRender()
-    statsStart()
-    // ios bug: viewport dimensions are updated after the resize event
-    if (this.previousWindowWidth !== window.innerWidth || this.previousWindowHeight !== window.innerHeight) {
-      this.resizeHandler()
-      this.previousWindowWidth = window.innerWidth
-      this.previousWindowHeight = window.innerHeight
-    }
-    viewer.render()
-    this.renderedFps++
-    statsEnd()
-    this.postRender()
-  }
-
-  resizeHandler () {
-    const width = window.innerWidth
-    const height = window.innerHeight
-
-    viewer.camera.aspect = width / height
-    viewer.camera.updateProjectionMatrix()
-
-    if (this.renderer) {
-      this.renderer.setSize(width, height)
-    }
-    viewer.world.handleResize()
-  }
-}
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 7c2be715..eb491748 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -5,6 +5,8 @@ import { EventEmitter } from 'events'
 import { generateSpiralMatrix, ViewRect } from 'flying-squid/dist/utils'
 import { Vec3 } from 'vec3'
 import { BotEvents } from 'mineflayer'
+import { proxy } from 'valtio'
+import TypedEmitter from 'typed-emitter'
 import { getItemFromBlock } from '../../../src/chatUtils'
 import { delayedIterator } from '../../playground/shared'
 import { playerState } from '../../../src/mineflayer/playerState'
@@ -13,11 +15,26 @@ import { chunkPos } from './simpleUtils'
 export type ChunkPosKey = string
 type ChunkPos = { x: number, z: number }
 
+export type WorldDataEmitterEvents = {
+  chunkPosUpdate: (data: { pos: Vec3 }) => void
+  blockUpdate: (data: { pos: Vec3, stateId: number }) => void
+  entity: (data: any) => void
+  entityMoved: (data: any) => void
+  time: (data: number) => void
+  renderDistance: (viewDistance: number) => void
+  blockEntities: (data: Record<string, any> | { blockEntities: Record<string, any> }) => void
+  listening: () => void
+  markAsLoaded: (data: { x: number, z: number }) => void
+  unloadChunk: (data: { x: number, z: number }) => void
+  loadChunk: (data: { x: number, z: number, chunk: any, blockEntities: any, worldConfig: any, isLightUpdate: boolean }) => void
+  updateLight: (data: { pos: Vec3 }) => void
+}
+
 /**
  * Usually connects to mineflayer bot and emits world data (chunks, entities)
  * It's up to the consumer to serialize the data if needed
  */
-export class WorldDataEmitter extends EventEmitter {
+export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<WorldDataEmitterEvents>) {
   private loadedChunks: Record<ChunkPosKey, boolean>
   private readonly lastPos: Vec3
   private eventListeners: Record<string, any> = {}
@@ -26,20 +43,18 @@ export class WorldDataEmitter extends EventEmitter {
   addWaitTime = 1
   isPlayground = false
 
+  public reactive = proxy({
+    cursorBlock: null as Vec3 | null,
+    cursorBlockBreakingStage: null as number | null,
+  })
+
   constructor (public world: typeof __type_bot['world'], public viewDistance: number, position: Vec3 = new Vec3(0, 0, 0)) {
+    // eslint-disable-next-line constructor-super
     super()
     this.loadedChunks = {}
     this.lastPos = new Vec3(0, 0, 0).update(position)
     // todo
     this.emitter = this
-
-    this.emitter.on('mouseClick', async (click) => {
-      const ori = new Vec3(click.origin.x, click.origin.y, click.origin.z)
-      const dir = new Vec3(click.direction.x, click.direction.y, click.direction.z)
-      const block = this.world.raycast(ori, dir, 256)
-      if (!block) return
-      this.emit('blockClicked', block, block.face, click.button)
-    })
   }
 
   setBlockStateId (position: Vec3, stateId: number) {
@@ -61,9 +76,10 @@ export class WorldDataEmitter extends EventEmitter {
   }
 
   listenToBot (bot: typeof __type_bot) {
-    const emitEntity = (e) => {
+    const emitEntity = (e, name = 'entity') => {
       if (!e || e === bot.entity) return
-      this.emitter.emit('entity', {
+      if (!e.name) return // mineflayer received update for not spawned entity
+      this.emitter.emit(name as any, {
         ...e,
         pos: e.position,
         username: e.username,
@@ -86,7 +102,7 @@ export class WorldDataEmitter extends EventEmitter {
         emitEntity(e)
       },
       entityMoved (e: any) {
-        emitEntity(e)
+        emitEntity(e, 'entityMoved')
       },
       entityGone: (e: any) => {
         this.emitter.emit('entity', { id: e.id, delete: true })
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 6ccbdca5..71a1dca7 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -3,28 +3,21 @@ import { EventEmitter } from 'events'
 import { Vec3 } from 'vec3'
 import * as THREE from 'three'
 import mcDataRaw from 'minecraft-data/data.js' // note: using alias
-import blocksAtlases from 'mc-assets/dist/blocksAtlases.json'
-import blocksAtlasLatest from 'mc-assets/dist/blocksAtlasLatest.png'
-import blocksAtlasLegacy from 'mc-assets/dist/blocksAtlasLegacy.png'
-import itemsAtlases from 'mc-assets/dist/itemsAtlases.json'
-import itemsAtlasLatest from 'mc-assets/dist/itemsAtlasLatest.png'
-import itemsAtlasLegacy from 'mc-assets/dist/itemsAtlasLegacy.png'
-import { AtlasParser, getLoadedItemDefinitionsStore } from 'mc-assets'
 import TypedEmitter from 'typed-emitter'
-import { LineMaterial } from 'three-stdlib'
-import christmasPack from 'mc-assets/dist/textureReplacements/christmas'
 import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
-import itemDefinitionsJson from 'mc-assets/dist/itemDefinitions.json'
-import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
+import { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
+import { generateSpiralMatrix } from 'flying-squid/dist/utils'
 import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
 import { toMajorVersion } from '../../../src/utils'
+import { ResourcesManager } from '../../../src/resourcesManager'
+import { DisplayWorldOptions, RendererReactiveState } from '../../../src/appViewer'
 import { buildCleanupDecorator } from './cleanupDecorator'
-import { defaultMesherConfig, HighestBlockInfo, MesherGeometryOutput, CustomBlockModels, BlockStateModelInfo } from './mesher/shared'
+import { HighestBlockInfo, MesherGeometryOutput, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig } from './mesher/shared'
 import { chunkPos } from './simpleUtils'
-import { HandItemBlock } from './holdingBlock'
-import { updateStatText } from './ui/newStats'
-import { WorldRendererThree } from './worldrendererThree'
-import { generateGuiAtlas } from './guiRenderer'
+import { removeStat, updateStatText } from './ui/newStats'
+import { WorldDataEmitter } from './worldDataEmitter'
+import { SoundSystem } from './threeJsSound'
+import { IPlayerState } from './basePlayerState'
 
 function mod (x, n) {
   return ((x % n) + n) % n
@@ -34,38 +27,37 @@ export const worldCleanup = buildCleanupDecorator('resetWorld')
 
 export const defaultWorldRendererConfig = {
   showChunkBorders: false,
-  numWorkers: 4,
+  mesherWorkers: 4,
   isPlayground: false,
   renderEars: true,
   // game renderer setting actually
   showHand: false,
-  viewBobbing: false
+  viewBobbing: false,
+  extraBlockRenderers: true,
+  clipWorldBelowY: undefined as number | undefined,
+  smoothLighting: true,
+  enableLighting: true,
+  starfield: true,
+  addChunksBatchWaitTime: 200,
+  vrSupport: true,
+  renderEntities: true,
+  fov: 75,
+  fetchPlayerSkins: true,
+  highlightBlockColor: 'blue',
+  foreground: true
 }
 
 export type WorldRendererConfig = typeof defaultWorldRendererConfig
 
-type CustomTexturesData = {
-  tileSize: number | undefined
-  textures: Record<string, HTMLImageElement>
-}
-
 export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any> {
-  // todo
-  @worldCleanup()
-  threejsCursorLineMaterial: LineMaterial
-  @worldCleanup()
-  cursorBlock = null as Vec3 | null
   displayStats = true
   @worldCleanup()
-  worldConfig = { minY: 0, worldHeight: 256 }
-  // todo need to cleanup
-  material = new THREE.MeshLambertMaterial({ vertexColors: true, transparent: true, alphaTest: 0.1 })
+  worldSizeParams = { minY: 0, worldHeight: 256 }
   cameraRoll = 0
 
   @worldCleanup()
   active = false
 
-  version = undefined as string | undefined
   // #region CHUNK & SECTIONS TRACKING
   @worldCleanup()
   loadedChunks = {} as Record<string, boolean> // data is added for these chunks and they might be still processing
@@ -89,13 +81,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   renderUpdateEmitter = new EventEmitter() as unknown as TypedEmitter<{
     dirty (pos: Vec3, value: boolean): void
     update (/* pos: Vec3, value: boolean */): void
-    textureDownloaded (): void
-    itemsTextureDownloaded (): void
     chunkFinished (key: string): void
   }>
   customTexturesDataUrl = undefined as string | undefined
   @worldCleanup()
-  currentTextureImage = undefined as any
   workers: any[] = []
   @worldCleanup()
   viewerPosition?: Vec3
@@ -113,32 +102,15 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   allChunksFinished = false
 
   handleResize = () => { }
-  mesherConfig = defaultMesherConfig
   camera: THREE.PerspectiveCamera
   highestBlocks = new Map<string, HighestBlockInfo>()
-  blockstatesModels: any
-  customBlockStates: Record<string, any> | undefined
-  customModels: Record<string, any> | undefined
-  itemsAtlasParser: AtlasParser | undefined
-  blocksAtlasParser: AtlasParser | undefined
+  blockEntities = {}
 
-  sourceData = {
-    blocksAtlases,
-    itemsAtlases,
-    itemDefinitionsJson
-  }
-  customTextures: {
-    items?: CustomTexturesData
-    blocks?: CustomTexturesData
-    armor?: CustomTexturesData
-  } = {}
-  itemsDefinitionsStore = getLoadedItemDefinitionsStore(this.sourceData.itemDefinitionsJson)
   workersProcessAverageTime = 0
   workersProcessAverageTimeCount = 0
   maxWorkersProcessTime = 0
   geometryReceiveCount = {}
   allLoadedIn: undefined | number
-  rendererDevice = '...'
 
   edgeChunks = {} as Record<string, boolean>
   lastAddChunk = null as null | {
@@ -150,14 +122,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   lastChunkDistance = 0
   debugStopGeometryUpdate = false
 
-  @worldCleanup()
-  freeFlyMode = false
-  @worldCleanup()
-  freeFlyState = {
-    yaw: 0,
-    pitch: 0,
-    position: new Vec3(0, 0, 0)
-  }
   @worldCleanup()
   itemsRenderer: ItemsRenderer | undefined
 
@@ -168,22 +132,77 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   abstract outputFormat: 'threeJs' | 'webgpu'
   worldBlockProvider: WorldBlockProvider
+  soundSystem: SoundSystem | undefined
 
   abstract changeBackgroundColor (color: [number, number, number]): void
 
-  constructor (public config: WorldRendererConfig) {
+  worldRendererConfig: WorldRendererConfig
+  playerState: IPlayerState
+  reactiveState: RendererReactiveState
+
+  abortController = new AbortController()
+
+  constructor (public readonly resourcesManager: ResourcesManager, public displayOptions: DisplayWorldOptions, public version: string) {
     // this.initWorkers(1) // preload script on page load
     this.snapshotInitialValues()
+    this.worldRendererConfig = displayOptions.inWorldRenderingConfig
+    this.playerState = displayOptions.playerState
+    this.reactiveState = displayOptions.rendererState
 
     this.renderUpdateEmitter.on('update', () => {
       const loadedChunks = Object.keys(this.finishedChunks).length
       updateStatText('loaded-chunks', `${loadedChunks}/${this.chunksLength} chunks (${this.lastChunkDistance}/${this.viewDistance})`)
     })
+
+    this.connect(this.displayOptions.worldView)
+  }
+
+  init () {
+    if (this.active) throw new Error('WorldRendererCommon is already initialized')
+    void this.setVersion(this.version).then(() => {
+      this.resourcesManager.on('assetsTexturesUpdated', () => {
+        if (!this.active) return
+        void this.updateAssetsData()
+      })
+      if (this.resourcesManager.currentResources) {
+        void this.updateAssetsData()
+      }
+    })
   }
 
   snapshotInitialValues () { }
 
-  initWorkers (numWorkers = this.config.numWorkers) {
+  wasChunkSentToWorker (chunkKey: string) {
+    return this.loadedChunks[chunkKey]
+  }
+
+  async getHighestBlocks () {
+    return this.highestBlocks
+  }
+
+  updateCustomBlock (chunkKey: string, blockPos: string, model: string) {
+    this.protocolCustomBlocks.set(chunkKey, {
+      ...this.protocolCustomBlocks.get(chunkKey),
+      [blockPos]: model
+    })
+    if (this.wasChunkSentToWorker(chunkKey)) {
+      const [x, y, z] = blockPos.split(',').map(Number)
+      this.setBlockStateId(new Vec3(x, y, z), undefined)
+    }
+  }
+
+  async getBlockInfo (blockPos: { x: number, y: number, z: number }, stateId: number) {
+    const chunkKey = `${Math.floor(blockPos.x / 16) * 16},${Math.floor(blockPos.z / 16) * 16}`
+    const customBlockName = this.protocolCustomBlocks.get(chunkKey)?.[`${blockPos.x},${blockPos.y},${blockPos.z}`]
+    const cacheKey = getBlockAssetsCacheKey(stateId, customBlockName)
+    const modelInfo = this.blockStateModelInfo.get(cacheKey)
+    return {
+      customBlockName,
+      modelInfo
+    }
+  }
+
+  initWorkers (numWorkers = this.worldRendererConfig.mesherWorkers) {
     // init workers
     for (let i = 0; i < numWorkers + 1; i++) {
       // Node environment needs an absolute path, but browser needs the url of the file
@@ -273,13 +292,16 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   checkAllFinished () {
     if (this.sectionsWaiting.size === 0) {
-      const allFinished = Object.keys(this.finishedChunks).length === this.chunksLength
-      if (allFinished) {
-        this.allChunksLoaded?.()
-        this.allChunksFinished = true
-        this.allLoadedIn ??= Date.now() - this.initialChunkLoadWasStartedIn!
-      }
+      this.reactiveState.world.mesherWork = false
     }
+    // todo check exact surrounding chunks
+    const allFinished = Object.keys(this.finishedChunks).length >= this.chunksLength
+    if (allFinished) {
+      this.allChunksLoaded?.()
+      this.allChunksFinished = true
+      this.allLoadedIn ??= Date.now() - this.initialChunkLoadWasStartedIn!
+    }
+    this.updateChunksStats()
   }
 
   changeHandSwingingState (isAnimationPlaying: boolean, isLeftHand: boolean): void { }
@@ -328,20 +350,15 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       worker.terminate()
     }
     this.workers = []
-    this.currentTextureImage = undefined
-    this.blocksAtlasParser = undefined
-    this.itemsAtlasParser = undefined
   }
 
   // new game load happens here
-  async setVersion (version, texturesVersion = version) {
-    if (!this.blockstatesModels) throw new Error('Blockstates models is not loaded yet')
+  async setVersion (version: string) {
     this.version = version
-    this.texturesVersion = texturesVersion
     this.resetWorld()
 
     // for workers in single file build
-    if (document.readyState === 'loading') {
+    if (document?.readyState === 'loading') {
       await new Promise(resolve => {
         document.addEventListener('DOMContentLoaded', resolve)
       })
@@ -349,11 +366,26 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
     this.initWorkers()
     this.active = true
-    this.mesherConfig.outputFormat = this.outputFormat
-    this.mesherConfig.version = this.version!
 
+    await this.resourcesManager.loadMcData(version)
     this.sendMesherMcData()
-    await this.updateAssetsData()
+    if (!this.resourcesManager.currentResources) {
+      await this.resourcesManager.updateAssetsData({ })
+    }
+  }
+
+  getMesherConfig (): MesherConfig {
+    return {
+      version: this.version,
+      enableLighting: this.worldRendererConfig.enableLighting,
+      skyLight: 15,
+      smoothLighting: this.worldRendererConfig.smoothLighting,
+      outputFormat: this.outputFormat,
+      textureSize: this.resourcesManager.currentResources!.blocksAtlasParser.atlas.latest.width,
+      debugModelVariant: undefined,
+      clipWorldBelowY: this.worldRendererConfig.clipWorldBelowY,
+      disableSignsMapsSupport: !this.worldRendererConfig.extraBlockRenderers
+    }
   }
 
   sendMesherMcData () {
@@ -366,111 +398,40 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
 
     for (const worker of this.workers) {
-      worker.postMessage({ type: 'mcData', mcData, config: this.mesherConfig })
+      worker.postMessage({ type: 'mcData', mcData, config: this.getMesherConfig() })
     }
   }
 
-  async generateGuiTextures () {
-    await generateGuiAtlas()
-  }
-
-  async updateAssetsData (resourcePackUpdate = false, prioritizeBlockTextures?: string[]) {
-    const blocksAssetsParser = new AtlasParser(this.sourceData.blocksAtlases, blocksAtlasLatest, blocksAtlasLegacy)
-    const itemsAssetsParser = new AtlasParser(this.sourceData.itemsAtlases, itemsAtlasLatest, itemsAtlasLegacy)
-
-    const blockTexturesChanges = {} as Record<string, string>
-    const date = new Date()
-    if ((date.getMonth() === 11 && date.getDate() >= 24) || (date.getMonth() === 0 && date.getDate() <= 6)) {
-      Object.assign(blockTexturesChanges, christmasPack)
-    }
-
-    const customBlockTextures = Object.keys(this.customTextures.blocks?.textures ?? {})
-    const customItemTextures = Object.keys(this.customTextures.items?.textures ?? {})
-    console.time('createBlocksAtlas')
-    const { atlas: blocksAtlas, canvas: blocksCanvas } = await blocksAssetsParser.makeNewAtlas(this.texturesVersion ?? this.version ?? 'latest', (textureName) => {
-      const texture = this.customTextures?.blocks?.textures[textureName]
-      return blockTexturesChanges[textureName] ?? texture
-    }, /* this.customTextures?.blocks?.tileSize */undefined, prioritizeBlockTextures, customBlockTextures)
-    console.timeEnd('createBlocksAtlas')
-    console.time('createItemsAtlas')
-    const { atlas: itemsAtlas, canvas: itemsCanvas } = await itemsAssetsParser.makeNewAtlas(this.texturesVersion ?? this.version ?? 'latest', (textureName) => {
-      const texture = this.customTextures?.items?.textures[textureName]
-      if (!texture) return
-      return texture
-    }, this.customTextures?.items?.tileSize, undefined, customItemTextures)
-    console.timeEnd('createItemsAtlas')
-
-    this.blocksAtlasParser = new AtlasParser({ latest: blocksAtlas }, blocksCanvas.toDataURL())
-    this.itemsAtlasParser = new AtlasParser({ latest: itemsAtlas }, itemsCanvas.toDataURL())
-
-    this.itemsRenderer = new ItemsRenderer(this.version!, this.blockstatesModels, this.itemsAtlasParser, this.blocksAtlasParser)
-    this.worldBlockProvider = worldBlockProvider(this.blockstatesModels, this.blocksAtlasParser.atlas, 'latest')
-
-    const texture = await new THREE.TextureLoader().loadAsync(this.blocksAtlasParser.latestImage)
-    texture.magFilter = THREE.NearestFilter
-    texture.minFilter = THREE.NearestFilter
-    texture.flipY = false
-    this.material.map = texture
-    this.currentTextureImage = this.material.map.image
-    this.mesherConfig.textureSize = this.material.map.image.width
+  async updateAssetsData () {
+    const resources = this.resourcesManager.currentResources!
 
+    if (this.workers.length === 0) throw new Error('workers not initialized yet')
     for (const [i, worker] of this.workers.entries()) {
-      const { blockstatesModels } = this
-      if (this.customBlockStates) {
-        // TODO! remove from other versions as well
-        blockstatesModels.blockstates.latest = {
-          ...blockstatesModels.blockstates.latest,
-          ...this.customBlockStates
-        }
-      }
-      if (this.customModels) {
-        blockstatesModels.models.latest = {
-          ...blockstatesModels.models.latest,
-          ...this.customModels
-        }
-      }
+      const { blockstatesModels } = resources
+
       worker.postMessage({
         type: 'mesherData',
         workerIndex: i,
         blocksAtlas: {
-          latest: blocksAtlas
+          latest: resources.blocksAtlasParser.atlas.latest
         },
         blockstatesModels,
-        config: this.mesherConfig,
+        config: this.getMesherConfig(),
       })
     }
-    if (!this.itemsAtlasParser) return
-    const itemsTexture = await new THREE.TextureLoader().loadAsync(this.itemsAtlasParser.latestImage)
-    itemsTexture.magFilter = THREE.NearestFilter
-    itemsTexture.minFilter = THREE.NearestFilter
-    itemsTexture.flipY = false
-    viewer.entities.itemsTexture = itemsTexture
-    if (!this.itemsAtlasParser) return
 
-    this.renderUpdateEmitter.emit('textureDownloaded')
-
-    console.time('generateGuiTextures')
-    await this.generateGuiTextures()
-    console.timeEnd('generateGuiTextures')
-    if (!this.itemsAtlasParser) return
-    this.renderUpdateEmitter.emit('itemsTextureDownloaded')
     console.log('textures loaded')
   }
 
-  async downloadDebugAtlas (isItems = false) {
-    const atlasParser = (isItems ? this.itemsAtlasParser : this.blocksAtlasParser)!
-    const dataUrl = await atlasParser.createDebugImage(true)
-    const a = document.createElement('a')
-    a.href = dataUrl
-    a.download = `atlas-debug-${isItems ? 'items' : 'blocks'}.png`
-    a.click()
-  }
-
   get worldMinYRender () {
-    return Math.floor(Math.max(this.worldConfig.minY, this.mesherConfig.clipWorldBelowY ?? -Infinity) / 16) * 16
+    return Math.floor(Math.max(this.worldSizeParams.minY, this.worldRendererConfig.clipWorldBelowY ?? -Infinity) / 16) * 16
   }
 
-  updateChunksStatsText () {
+  updateChunksStats () {
+    const loadedChunks = Object.keys(this.finishedChunks)
+    this.reactiveState.world.chunksLoaded = loadedChunks
+    this.reactiveState.world.chunksTotalNumber = this.chunksLength
+    this.reactiveState.world.allChunksLoaded = this.allChunksFinished
     updateStatText('downloaded-chunks', `${Object.keys(this.loadedChunks).length}/${this.chunksLength} chunks D (${this.workers.length}:${this.workersProcessAverageTime.toFixed(0)}ms/${this.allLoadedIn?.toFixed(1) ?? '-'}s)`)
   }
 
@@ -480,7 +441,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.initialChunksLoad = false
     this.initialChunkLoadWasStartedIn ??= Date.now()
     this.loadedChunks[`${x},${z}`] = true
-    this.updateChunksStatsText()
+    this.updateChunksStats()
 
     const chunkKey = `${x},${z}`
     const customBlockModels = this.protocolCustomBlocks.get(chunkKey)
@@ -494,10 +455,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         customBlockModels: customBlockModels || undefined
       })
     }
-    for (let y = this.worldMinYRender; y < this.worldConfig.worldHeight; y += 16) {
+    for (let y = this.worldMinYRender; y < this.worldSizeParams.worldHeight; y += 16) {
       const loc = new Vec3(x, y, z)
       this.setSectionDirty(loc)
-      if (this.neighborChunkUpdates && (!isLightUpdate || this.mesherConfig.smoothLighting)) {
+      if (this.neighborChunkUpdates && (!isLightUpdate || this.worldRendererConfig.smoothLighting)) {
         this.setSectionDirty(loc.offset(-16, 0, 0))
         this.setSectionDirty(loc.offset(16, 0, 0))
         this.setSectionDirty(loc.offset(0, 0, -16))
@@ -513,6 +474,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   removeColumn (x, z) {
+    this.updateChunksStats()
     delete this.loadedChunks[`${x},${z}`]
     for (const worker of this.workers) {
       worker.postMessage({ type: 'unloadChunk', x, z })
@@ -523,7 +485,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       this.allLoadedIn = undefined
       this.initialChunkLoadWasStartedIn = undefined
     }
-    for (let y = this.worldConfig.minY; y < this.worldConfig.worldHeight; y += 16) {
+    for (let y = this.worldSizeParams.minY; y < this.worldSizeParams.worldHeight; y += 16) {
       this.setSectionDirty(new Vec3(x, y, z), false)
       delete this.finishedSections[`${x},${y},${z}`]
     }
@@ -540,7 +502,130 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
   }
 
-  setBlockStateId (pos: Vec3, stateId: number) {
+  setBlockStateId (pos: Vec3, stateId: number | undefined) {
+    const set = async () => {
+      const sectionX = Math.floor(pos.x / 16) * 16
+      const sectionZ = Math.floor(pos.z / 16) * 16
+      if (this.queuedChunks.has(`${sectionX},${sectionZ}`)) {
+        await new Promise<void>(resolve => {
+          this.queuedFunctions.push(() => {
+            resolve()
+          })
+        })
+      }
+      if (!this.loadedChunks[`${sectionX},${sectionZ}`]) {
+        // console.debug('[should be unreachable] setBlockStateId called for unloaded chunk', pos)
+      }
+      this.setBlockStateIdInner(pos, stateId)
+    }
+    void set()
+  }
+
+  updateEntity (e: any, isUpdate = false) { }
+
+  lightUpdate (chunkX: number, chunkZ: number) { }
+
+  connect (worldView: WorldDataEmitter) {
+    const worldEmitter = worldView
+
+    worldEmitter.on('entity', (e) => {
+      this.updateEntity(e, false)
+    })
+    worldEmitter.on('entityMoved', (e) => {
+      this.updateEntity(e, true)
+    })
+
+    let currentLoadChunkBatch = null as {
+      timeout
+      data
+    } | null
+    worldEmitter.on('loadChunk', ({ x, z, chunk, worldConfig, isLightUpdate }) => {
+      this.worldSizeParams = worldConfig
+      this.queuedChunks.add(`${x},${z}`)
+      const args = [x, z, chunk, isLightUpdate]
+      if (!currentLoadChunkBatch) {
+        // add a setting to use debounce instead
+        currentLoadChunkBatch = {
+          data: [],
+          timeout: setTimeout(() => {
+            for (const args of currentLoadChunkBatch!.data) {
+              this.queuedChunks.delete(`${args[0]},${args[1]}`)
+              this.addColumn(...args as Parameters<typeof this.addColumn>)
+            }
+            for (const fn of this.queuedFunctions) {
+              fn()
+            }
+            this.queuedFunctions = []
+            currentLoadChunkBatch = null
+          }, this.worldRendererConfig.addChunksBatchWaitTime)
+        }
+      }
+      currentLoadChunkBatch.data.push(args)
+    })
+    // todo remove and use other architecture instead so data flow is clear
+    worldEmitter.on('blockEntities', (blockEntities) => {
+      this.blockEntities = blockEntities
+    })
+
+    worldEmitter.on('unloadChunk', ({ x, z }) => {
+      this.removeColumn(x, z)
+    })
+
+    worldEmitter.on('blockUpdate', ({ pos, stateId }) => {
+      this.setBlockStateId(new Vec3(pos.x, pos.y, pos.z), stateId)
+    })
+
+    worldEmitter.on('chunkPosUpdate', ({ pos }) => {
+      this.updateViewerPosition(pos)
+    })
+
+
+    worldEmitter.on('renderDistance', (d) => {
+      this.viewDistance = d
+      this.chunksLength = d === 0 ? 1 : generateSpiralMatrix(d).length
+    })
+
+    worldEmitter.on('renderDistance', (d) => {
+      this.viewDistance = d
+      this.chunksLength = d === 0 ? 1 : generateSpiralMatrix(d).length
+      this.allChunksFinished = Object.keys(this.finishedChunks).length === this.chunksLength
+    })
+
+    worldEmitter.on('markAsLoaded', ({ x, z }) => {
+      this.markAsLoaded(x, z)
+    })
+
+    worldEmitter.on('updateLight', ({ pos }) => {
+      this.lightUpdate(pos.x, pos.z)
+    })
+
+    worldEmitter.on('time', (timeOfDay) => {
+      this.timeUpdated?.(timeOfDay)
+
+      let skyLight = 15
+      if (timeOfDay < 0 || timeOfDay > 24_000) {
+        throw new Error('Invalid time of day. It should be between 0 and 24000.')
+      } else if (timeOfDay <= 6000 || timeOfDay >= 18_000) {
+        skyLight = 15
+      } else if (timeOfDay > 6000 && timeOfDay < 12_000) {
+        skyLight = 15 - ((timeOfDay - 6000) / 6000) * 15
+      } else if (timeOfDay >= 12_000 && timeOfDay < 18_000) {
+        skyLight = ((timeOfDay - 12_000) / 6000) * 15
+      }
+
+      skyLight = Math.floor(skyLight) // todo: remove this after optimization
+
+      // if (this.worldRendererConfig.skyLight === skyLight) return
+      // this.worldRendererConfig.skyLight = skyLight
+      // if (this instanceof WorldRendererThree) {
+      //   (this).rerenderAllChunks?.()
+      // }
+    })
+
+    worldEmitter.emit('listening')
+  }
+
+  setBlockStateIdInner (pos: Vec3, stateId: number | undefined) {
     const needAoRecalculation = true
     const chunkKey = `${Math.floor(pos.x / 16) * 16},${Math.floor(pos.z / 16) * 16}`
     const blockPosKey = `${pos.x},${pos.y},${pos.z}`
@@ -604,7 +689,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   setSectionDirty (pos: Vec3, value = true, useChangeWorker = false) { // value false is used for unloading chunks
     if (this.viewDistance === -1) throw new Error('viewDistance not set')
-    this.allChunksFinished = false
+    this.reactiveState.world.mesherWork = true
     const distance = this.getDistance(pos)
     if (!this.workers.length || distance[0] > this.viewDistance || distance[1] > this.viewDistance) return
     const key = `${Math.floor(pos.x / 16) * 16},${Math.floor(pos.y / 16) * 16},${Math.floor(pos.z / 16) * 16}`
@@ -623,7 +708,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       y: pos.y,
       z: pos.z,
       value,
-      config: this.mesherConfig,
+      config: this.getMesherConfig(),
     })
     this.dispatchMessages()
   }
@@ -679,8 +764,24 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   destroy () {
-    console.warn('world destroy is not implemented')
-  }
+    // Stop all workers
+    for (const worker of this.workers) {
+      worker.terminate()
+    }
+    this.workers = []
 
-  abstract setHighlightCursorBlock (block: typeof this.cursorBlock, shapePositions?: Array<{ position; width; height; depth }>): void
+    // Stop and destroy sound system
+    if (this.soundSystem) {
+      this.soundSystem.destroy()
+      this.soundSystem = undefined
+    }
+
+    this.active = false
+
+    this.renderUpdateEmitter.removeAllListeners()
+    this.displayOptions.worldView.removeAllListeners() // todo
+    this.abortController.abort()
+    removeStat('chunks-loaded')
+    removeStat('chunks-read')
+  }
 }
diff --git a/renderer/viewer/lib/worldrendererThree.ts b/renderer/viewer/lib/worldrendererThree.ts
index c181d43c..d5e1750e 100644
--- a/renderer/viewer/lib/worldrendererThree.ts
+++ b/renderer/viewer/lib/worldrendererThree.ts
@@ -3,18 +3,25 @@ import { Vec3 } from 'vec3'
 import nbt from 'prismarine-nbt'
 import PrismarineChatLoader from 'prismarine-chat'
 import * as tweenJs from '@tweenjs/tween.js'
-import { BloomPass, RenderPass, UnrealBloomPass, EffectComposer, WaterPass, GlitchPass, LineSegmentsGeometry, Wireframe, LineMaterial } from 'three-stdlib'
-import worldBlockProvider from 'mc-assets/dist/worldBlockProvider'
+import { subscribeKey } from 'valtio/utils'
 import { renderSign } from '../sign-renderer'
+import { DisplayWorldOptions, GraphicsInitOptions, RendererReactiveState } from '../../../src/appViewer'
+import { initVR } from '../three/world/vr'
+import { getItemUv } from '../three/appShared'
+import { CursorBlock } from '../three/world/cursorBlock'
 import { chunkPos, sectionPos } from './simpleUtils'
-import { WorldRendererCommon, WorldRendererConfig } from './worldrendererCommon'
+import { WorldRendererCommon } from './worldrendererCommon'
 import { disposeObject } from './threeJsUtils'
-import HoldingBlock, { HandItemBlock } from './holdingBlock'
-import { addNewStat } from './ui/newStats'
+import HoldingBlock from './holdingBlock'
+import { addNewStat, removeAllStats } from './ui/newStats'
 import { MesherGeometryOutput } from './mesher/shared'
-import { IPlayerState } from './basePlayerState'
+import { ItemSpecificContextProperties } from './basePlayerState'
 import { getMesh } from './entity/EntityMesh'
 import { armorModel } from './entity/armorModels'
+import { getMyHand } from './hand'
+import { setBlockPosition } from './mesher/standaloneRenderer'
+import { Entities } from './entities'
+import { ThreeJsSound } from './threeJsSound'
 
 interface MediaProperties {
   position: { x: number, y: number, z: number }
@@ -26,12 +33,12 @@ interface MediaProperties {
   opacity?: number // 0-1 value for transparency
   uvMapping?: { startU: number, endU: number, startV: number, endV: number }
   allowOrigins?: string[] | boolean
+  loop?: boolean
+  volume?: number
 }
 
 export class WorldRendererThree extends WorldRendererCommon {
-  interactionLines: null | { blockPos; mesh } = null
   outputFormat = 'threeJs' as const
-  blockEntities = {}
   sectionObjects: Record<string, THREE.Object3D> = {}
   chunkTextures = new Map<string, { [pos: string]: THREE.Texture }>()
   signsCache = new Map<string, any>()
@@ -39,7 +46,16 @@ export class WorldRendererThree extends WorldRendererCommon {
   cameraSectionPos: Vec3 = new Vec3(0, 0, 0)
   holdingBlock: HoldingBlock
   holdingBlockLeft: HoldingBlock
-  rendererDevice = '...'
+  cameraRoll = 0
+  scene = new THREE.Scene()
+  ambientLight = new THREE.AmbientLight(0xcc_cc_cc)
+  directionalLight = new THREE.DirectionalLight(0xff_ff_ff, 0.5)
+  entities = new Entities(this)
+  cameraObjectOverride?: THREE.Object3D // for xr
+  material = new THREE.MeshLambertMaterial({ vertexColors: true, transparent: true, alphaTest: 0.1 })
+  itemsTexture: THREE.Texture
+  cursorBlock = new CursorBlock(this)
+  onRender: Array<() => void> = []
   customMedia = new Map<string, {
     mesh: THREE.Object3D
     video: HTMLVideoElement | undefined
@@ -55,21 +71,72 @@ export class WorldRendererThree extends WorldRendererCommon {
     return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).blocksCount, 0)
   }
 
-  constructor (public scene: THREE.Scene, public renderer: THREE.WebGLRenderer, public config: WorldRendererConfig, public playerState: IPlayerState) {
-    super(config)
-    this.rendererDevice = `${WorldRendererThree.getRendererInfo(this.renderer)} powered by three.js r${THREE.REVISION}`
-    this.starField = new StarField(scene)
-    this.holdingBlock = new HoldingBlock(playerState, this.config)
-    this.holdingBlockLeft = new HoldingBlock(playerState, this.config, true)
+  constructor (public renderer: THREE.WebGLRenderer, public initOptions: GraphicsInitOptions, public displayOptions: DisplayWorldOptions) {
+    if (!initOptions.resourcesManager) throw new Error('resourcesManager is required')
+    super(initOptions.resourcesManager, displayOptions, displayOptions.version)
 
-    this.renderUpdateEmitter.on('itemsTextureDownloaded', () => {
-      this.holdingBlock.ready = true
-      this.holdingBlock.updateItem()
-      this.holdingBlockLeft.ready = true
-      this.holdingBlockLeft.updateItem()
-    })
+    displayOptions.rendererState.renderer = WorldRendererThree.getRendererInfo(renderer) ?? '...'
+    this.starField = new StarField(this.scene)
+    this.holdingBlock = new HoldingBlock(this)
+    this.holdingBlockLeft = new HoldingBlock(this, true)
+
+    this.soundSystem = new ThreeJsSound(this)
 
     this.addDebugOverlay()
+    this.resetScene()
+    this.watchReactivePlayerState()
+    this.init()
+    void initVR(this)
+  }
+
+  updateEntity (e, isPosUpdate = false) {
+    const overrides = {
+      rotation: {
+        head: {
+          x: e.headPitch ?? e.pitch,
+          y: e.headYaw,
+          z: 0
+        }
+      }
+    }
+    if (isPosUpdate) {
+      this.entities.updateEntityPosition(e, false, overrides)
+    } else {
+      this.entities.update(e, overrides)
+    }
+  }
+
+  resetScene () {
+    this.scene.matrixAutoUpdate = false // for perf
+    this.scene.background = new THREE.Color(this.initOptions.config.sceneBackground)
+    this.scene.add(this.ambientLight)
+    this.directionalLight.position.set(1, 1, 0.5).normalize()
+    this.directionalLight.castShadow = true
+    this.scene.add(this.directionalLight)
+
+    const size = this.renderer.getSize(new THREE.Vector2())
+    this.camera = new THREE.PerspectiveCamera(75, size.x / size.y, 0.1, 1000)
+  }
+
+  watchReactivePlayerState () {
+    const updateValue = <T extends keyof typeof this.displayOptions.playerState.reactive>(key: T, callback: (value: typeof this.displayOptions.playerState.reactive[T]) => void) => {
+      callback(this.displayOptions.playerState.reactive[key])
+      subscribeKey(this.displayOptions.playerState.reactive, key, callback)
+    }
+    updateValue('backgroundColor', (value) => {
+      this.changeBackgroundColor(value)
+    })
+    updateValue('inWater', (value) => {
+      this.scene.fog = value ? new THREE.Fog(0x00_00_ff, 0.1, 100) : null
+    })
+    updateValue('ambientLight', (value) => {
+      if (!value) return
+      this.ambientLight.intensity = value
+    })
+    updateValue('directionalLight', (value) => {
+      if (!value) return
+      this.directionalLight.intensity = value
+    })
   }
 
   changeHandSwingingState (isAnimationPlaying: boolean, isLeft = false) {
@@ -81,6 +148,46 @@ export class WorldRendererThree extends WorldRendererCommon {
     }
   }
 
+  async updateAssetsData (): Promise<void> {
+    const resources = this.resourcesManager.currentResources!
+
+    const oldTexture = this.material.map
+    const oldItemsTexture = this.itemsTexture
+
+    const texture = await new THREE.TextureLoader().loadAsync(resources.blocksAtlasParser.latestImage)
+    texture.magFilter = THREE.NearestFilter
+    texture.minFilter = THREE.NearestFilter
+    texture.flipY = false
+    this.material.map = texture
+
+    const itemsTexture = await new THREE.TextureLoader().loadAsync(resources.itemsAtlasParser.latestImage)
+    itemsTexture.magFilter = THREE.NearestFilter
+    itemsTexture.minFilter = THREE.NearestFilter
+    itemsTexture.flipY = false
+    this.itemsTexture = itemsTexture
+
+    if (oldTexture) {
+      oldTexture.dispose()
+    }
+    if (oldItemsTexture) {
+      oldItemsTexture.dispose()
+    }
+
+    await super.updateAssetsData()
+    this.onAllTexturesLoaded()
+    if (Object.keys(this.loadedChunks).length > 0) {
+      console.log('rerendering chunks because of texture update')
+      this.rerenderAllChunks()
+    }
+  }
+
+  onAllTexturesLoaded () {
+    this.holdingBlock.ready = true
+    this.holdingBlock.updateItem()
+    this.holdingBlockLeft.ready = true
+    this.holdingBlockLeft.updateItem()
+  }
+
   changeBackgroundColor (color: [number, number, number]): void {
     this.scene.background = new THREE.Color(color[0], color[1], color[2])
   }
@@ -96,6 +203,35 @@ export class WorldRendererThree extends WorldRendererCommon {
     }
   }
 
+  getItemRenderData (item: Record<string, any>, specificProps: ItemSpecificContextProperties) {
+    return getItemUv(item, specificProps, this.resourcesManager)
+  }
+
+  async demoModel () {
+    //@ts-expect-error
+    const pos = cursorBlockRel(0, 1, 0).position
+
+    const mesh = await getMyHand()
+    // mesh.rotation.y = THREE.MathUtils.degToRad(90)
+    setBlockPosition(mesh, pos)
+    const helper = new THREE.BoxHelper(mesh, 0xff_ff_00)
+    mesh.add(helper)
+    this.scene.add(mesh)
+  }
+
+  demoItem () {
+    //@ts-expect-error
+    const pos = cursorBlockRel(0, 1, 0).position
+    const { mesh } = this.entities.getItemMesh({
+      itemId: 541,
+    }, {})!
+    mesh.position.set(pos.x + 0.5, pos.y + 0.5, pos.z + 0.5)
+    // mesh.scale.set(0.5, 0.5, 0.5)
+    const helper = new THREE.BoxHelper(mesh, 0xff_ff_00)
+    mesh.add(helper)
+    this.scene.add(mesh)
+  }
+
   debugOverlayAdded = false
   addDebugOverlay () {
     if (this.debugOverlayAdded) return
@@ -106,7 +242,7 @@ export class WorldRendererThree extends WorldRendererCommon {
       if (this.displayStats) {
         pane.updateText(`C: ${this.renderer.info.render.calls} TR: ${this.renderer.info.render.triangles} TE: ${this.renderer.info.memory.textures} F: ${this.tilesRendered} B: ${this.blocksRendered}`)
       }
-    }, 100)
+    }, 200)
   }
 
   /**
@@ -184,7 +320,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     object.name = 'chunk';
     (object as any).tilesCount = data.geometry.positions.length / 3 / 4;
     (object as any).blocksCount = data.geometry.blocksCount
-    if (!this.config.showChunkBorders) {
+    if (!this.displayOptions.inWorldRenderingConfig.showChunkBorders) {
       boxHelper.visible = false
     }
     // should not compute it once
@@ -229,7 +365,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     // todo investigate bug and remove this so don't need to clean in section dirty
     if (textures[texturekey]) return textures[texturekey]
 
-    const PrismarineChat = PrismarineChatLoader(this.version!)
+    const PrismarineChat = PrismarineChatLoader(this.version)
     const canvas = renderSign(blockEntity, PrismarineChat)
     if (!canvas) return
     const tex = new THREE.Texture(canvas)
@@ -240,28 +376,86 @@ export class WorldRendererThree extends WorldRendererCommon {
     return tex
   }
 
-  updateCamera (pos: Vec3 | null, yaw: number, pitch: number): void {
-    if (this.freeFlyMode) {
-      pos = this.freeFlyState.position
-      pitch = this.freeFlyState.pitch
-      yaw = this.freeFlyState.yaw
+  tryIntersectMedia () {
+    const { camera } = this
+    const raycaster = new THREE.Raycaster()
+
+    // Get mouse position at center of screen
+    const mouse = new THREE.Vector2(0, 0)
+
+    // Update the raycaster
+    raycaster.setFromCamera(mouse, camera)
+
+    let result = null as { id: string, x: number, y: number } | null
+    // Check intersection with all video meshes
+    for (const [id, videoData] of this.customMedia.entries()) {
+      // Get the actual mesh (first child of the group)
+      const mesh = videoData.mesh.children[0] as THREE.Mesh
+      if (!mesh) continue
+
+      const intersects = raycaster.intersectObject(mesh, false)
+      if (intersects.length > 0) {
+        const intersection = intersects[0]
+        const { uv } = intersection
+        if (uv) {
+          result = {
+            id,
+            x: uv.x,
+            y: uv.y
+          }
+          break
+        }
+      }
     }
+    this.reactiveState.world.intersectMedia = result
+  }
+
+  setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number) {
+    const cam = this.cameraObjectOverride || this.camera
+    const yOffset = this.displayOptions.playerState.getEyeHeight()
+
+    this.camera = cam as THREE.PerspectiveCamera
+    this.updateCamera(pos?.offset(0, yOffset, 0) ?? null, yaw, pitch)
+    this.tryIntersectMedia()
+  }
+
+  updateCamera (pos: Vec3 | null, yaw: number, pitch: number): void {
+    // if (this.freeFlyMode) {
+    //   pos = this.freeFlyState.position
+    //   pitch = this.freeFlyState.pitch
+    //   yaw = this.freeFlyState.yaw
+    // }
 
     if (pos) {
       new tweenJs.Tween(this.camera.position).to({ x: pos.x, y: pos.y, z: pos.z }, 50).start()
-      this.freeFlyState.position = pos
+      // this.freeFlyState.position = pos
     }
     this.camera.rotation.set(pitch, yaw, this.cameraRoll, 'ZYX')
   }
 
-  render () {
-    tweenJs.update()
+  render (sizeChanged = false) {
+    this.cursorBlock.render()
+
+    const sizeOrFovChanged = sizeChanged || this.displayOptions.inWorldRenderingConfig.fov !== this.camera.fov
+    if (sizeOrFovChanged) {
+      this.camera.aspect = window.innerWidth / window.innerHeight
+      this.camera.fov = this.displayOptions.inWorldRenderingConfig.fov
+      this.camera.updateProjectionMatrix()
+    }
+
+    this.entities.render()
+
     // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
     const cam = this.camera instanceof THREE.Group ? this.camera.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
-    if (this.config.showHand && !this.freeFlyMode) {
-      this.holdingBlock.render(this.camera, this.renderer, viewer.ambientLight, viewer.directionalLight)
-      this.holdingBlockLeft.render(this.camera, this.renderer, viewer.ambientLight, viewer.directionalLight)
+
+    if (this.displayOptions.inWorldRenderingConfig.showHand/*  && !this.freeFlyMode */) {
+      this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
+      this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
+    }
+
+    for (const onRender of this.onRender) {
+      onRender()
     }
   }
 
@@ -336,25 +530,13 @@ export class WorldRendererThree extends WorldRendererCommon {
     return group
   }
 
-  updateLight (chunkX: number, chunkZ: number) {
+  lightUpdate (chunkX: number, chunkZ: number) {
     // set all sections in the chunk dirty
-    for (let y = this.worldConfig.minY; y < this.worldConfig.worldHeight; y += 16) {
+    for (let y = this.worldSizeParams.minY; y < this.worldSizeParams.worldHeight; y += 16) {
       this.setSectionDirty(new Vec3(chunkX, y, chunkZ))
     }
   }
 
-  async doHmr () {
-    const oldSections = { ...this.sectionObjects }
-    this.sectionObjects = {} // skip clearing
-    worldView!.unloadAllChunks()
-    void this.setVersion(this.version, this.texturesVersion)
-    this.sectionObjects = oldSections
-    // this.rerenderAllChunks()
-
-    // supply new data
-    await worldView!.updatePosition(bot.entity.position, true)
-  }
-
   rerenderAllChunks () { // todo not clear what to do with loading chunks
     for (const key of Object.keys(this.sectionObjects)) {
       const [x, y, z] = key.split(',').map(Number)
@@ -363,7 +545,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   updateShowChunksBorder (value: boolean) {
-    this.config.showChunkBorders = value
+    this.displayOptions.inWorldRenderingConfig.showChunkBorders = value
     for (const object of Object.values(this.sectionObjects)) {
       for (const child of object.children) {
         if (child.name === 'helper') {
@@ -421,7 +603,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     super.removeColumn(x, z)
 
     this.cleanChunkTextures(x, z)
-    for (let y = this.worldConfig.minY; y < this.worldConfig.worldHeight; y += 16) {
+    for (let y = this.worldSizeParams.minY; y < this.worldSizeParams.worldHeight; y += 16) {
       this.setSectionDirty(new Vec3(x, y, z), false)
       const key = `${x},${y},${z}`
       const mesh = this.sectionObjects[key]
@@ -439,34 +621,6 @@ export class WorldRendererThree extends WorldRendererCommon {
     super.setSectionDirty(...args)
   }
 
-  setHighlightCursorBlock (blockPos: typeof this.cursorBlock, shapePositions?: Array<{ position: any; width: any; height: any; depth: any; }>): void {
-    this.cursorBlock = blockPos
-    if (blockPos && this.interactionLines && blockPos.equals(this.interactionLines.blockPos)) {
-      return
-    }
-    if (this.interactionLines !== null) {
-      this.scene.remove(this.interactionLines.mesh)
-      this.interactionLines = null
-    }
-    if (blockPos === null) {
-      return
-    }
-
-    const group = new THREE.Group()
-    for (const { position, width, height, depth } of shapePositions ?? []) {
-      const scale = [1.0001 * width, 1.0001 * height, 1.0001 * depth] as const
-      const geometry = new THREE.BoxGeometry(...scale)
-      const lines = new LineSegmentsGeometry().fromEdgesGeometry(new THREE.EdgesGeometry(geometry))
-      const wireframe = new Wireframe(lines, this.threejsCursorLineMaterial)
-      const pos = blockPos.plus(position)
-      wireframe.position.set(pos.x, pos.y, pos.z)
-      wireframe.computeLineDistances()
-      group.add(wireframe)
-    }
-    this.scene.add(group)
-    this.interactionLines = { blockPos, mesh: group }
-  }
-
   static getRendererInfo (renderer: THREE.WebGLRenderer) {
     try {
       const gl = renderer.getContext()
@@ -549,8 +703,9 @@ export class WorldRendererThree extends WorldRendererCommon {
     if (!isImage) {
       video = document.createElement('video')
       video.src = props.src
-      video.loop = true
-      video.muted = true
+      video.loop = props.loop ?? true
+      video.volume = props.volume ?? 1
+      video.muted = !props.volume
       video.playsInline = true
       video.crossOrigin = 'anonymous'
     }
@@ -864,10 +1019,29 @@ export class WorldRendererThree extends WorldRendererCommon {
     // Position the mesh exactly where we want it
     const { debugGroup } = this.positionMeshExact(plane, rotation, pos, width, height)
 
-    viewer.scene.add(debugGroup)
+    this.scene.add(debugGroup)
     console.log('Exact test mesh added with dimensions:', width, height, 'and rotation:', rotation)
 
   }
+
+  setCameraRoll (roll: number) {
+    this.cameraRoll = roll
+    const rollQuat = new THREE.Quaternion()
+    rollQuat.setFromAxisAngle(new THREE.Vector3(0, 0, 1), THREE.MathUtils.degToRad(roll))
+
+    // Get camera's current rotation
+    const camQuat = new THREE.Quaternion()
+    this.camera.getWorldQuaternion(camQuat)
+
+    // Apply roll after camera rotation
+    const finalQuat = camQuat.multiply(rollQuat)
+    this.camera.setRotationFromQuaternion(finalQuat)
+  }
+
+  destroy (): void {
+    removeAllStats()
+    super.destroy()
+  }
 }
 
 class StarField {
diff --git a/renderer/viewer/three/appShared.ts b/renderer/viewer/three/appShared.ts
new file mode 100644
index 00000000..b41d32db
--- /dev/null
+++ b/renderer/viewer/three/appShared.ts
@@ -0,0 +1,70 @@
+import { BlockModel } from 'mc-assets/dist/types'
+import { ItemSpecificContextProperties } from 'renderer/viewer/lib/basePlayerState'
+import { renderSlot } from '../../../src/inventoryWindows'
+import { GeneralInputItem, getItemModelName } from '../../../src/mineflayer/items'
+import { ResourcesManager } from '../../../src/resourcesManager'
+
+export const getItemUv = (item: Record<string, any>, specificProps: ItemSpecificContextProperties, resourcesManager: ResourcesManager): {
+  u: number
+  v: number
+  su: number
+  sv: number
+  renderInfo?: ReturnType<typeof renderSlot>
+  texture: HTMLImageElement
+  modelName: string
+} | {
+  resolvedModel: BlockModel
+  modelName: string
+} => {
+  const resources = resourcesManager.currentResources
+  if (!resources) throw new Error('Resources not loaded')
+  const idOrName = item.itemId ?? item.blockId ?? item.name
+  try {
+    const name = typeof idOrName === 'number' ? loadedData.items[idOrName]?.name : idOrName
+    if (!name) throw new Error(`Item not found: ${idOrName}`)
+
+    const model = getItemModelName({
+      ...item,
+      name,
+    } as GeneralInputItem, specificProps)
+
+    const renderInfo = renderSlot({
+      modelName: model,
+    }, false, true)
+
+    if (!renderInfo) throw new Error(`Failed to get render info for item ${name}`)
+
+    const img = renderInfo.texture === 'blocks' ? resources.blocksAtlasImage : resources.itemsAtlasImage
+
+    if (renderInfo.blockData) {
+      return {
+        resolvedModel: renderInfo.blockData.resolvedModel,
+        modelName: renderInfo.modelName!
+      }
+    }
+    if (renderInfo.slice) {
+      // Get slice coordinates from either block or item texture
+      const [x, y, w, h] = renderInfo.slice
+      const [u, v, su, sv] = [x / img.width, y / img.height, (w / img.width), (h / img.height)]
+      return {
+        u, v, su, sv,
+        renderInfo,
+        texture: img,
+        modelName: renderInfo.modelName!
+      }
+    }
+
+    throw new Error(`Invalid render info for item ${name}`)
+  } catch (err) {
+    reportError?.(err)
+    // Return default UV coordinates for missing texture
+    return {
+      u: 0,
+      v: 0,
+      su: 16 / resources.blocksAtlasImage.width,
+      sv: 16 / resources.blocksAtlasImage.width,
+      texture: resources.blocksAtlasImage,
+      modelName: 'missing'
+    }
+  }
+}
diff --git a/renderer/viewer/three/documentRenderer.ts b/renderer/viewer/three/documentRenderer.ts
new file mode 100644
index 00000000..29e43ee9
--- /dev/null
+++ b/renderer/viewer/three/documentRenderer.ts
@@ -0,0 +1,236 @@
+import * as THREE from 'three'
+import Stats from 'stats.js'
+import StatsGl from 'stats-gl'
+import * as tween from '@tweenjs/tween.js'
+import { GraphicsBackendConfig, GraphicsInitOptions } from '../../../src/appViewer'
+
+export class DocumentRenderer {
+  readonly canvas = document.createElement('canvas')
+  readonly renderer: THREE.WebGLRenderer
+  private animationFrameId?: number
+  private lastRenderTime = 0
+  private previousWindowWidth = window.innerWidth
+  private previousWindowHeight = window.innerHeight
+  private renderedFps = 0
+  private fpsInterval: any
+  private readonly stats: TopRightStats
+  private paused = false
+  disconnected = false
+  preRender = () => { }
+  render = (sizeChanged: boolean) => { }
+  postRender = () => { }
+  sizeChanged = () => { }
+  droppedFpsPercentage: number
+  config: GraphicsBackendConfig
+
+  constructor (initOptions: GraphicsInitOptions) {
+    this.config = initOptions.config
+
+    try {
+      this.renderer = new THREE.WebGLRenderer({
+        canvas: this.canvas,
+        preserveDrawingBuffer: true,
+        logarithmicDepthBuffer: true,
+        powerPreference: this.config.powerPreference
+      })
+    } catch (err) {
+      initOptions.displayCriticalError(new Error(`Failed to create WebGL context, not possible to render (restart browser): ${err.message}`))
+      throw err
+    }
+    this.renderer.outputColorSpace = THREE.LinearSRGBColorSpace
+    this.updatePixelRatio()
+    this.updateSize()
+    this.addToPage()
+
+    this.stats = new TopRightStats(this.canvas, this.config.statsVisible)
+
+    this.setupFpsTracking()
+    this.startRenderLoop()
+  }
+
+  updatePixelRatio () {
+    let pixelRatio = window.devicePixelRatio || 1 // todo this value is too high on ios, need to check, probably we should use avg, also need to make it configurable
+    if (!this.renderer.capabilities.isWebGL2) {
+      pixelRatio = 1 // webgl1 has issues with high pixel ratio (sometimes screen is clipped)
+    }
+    this.renderer.setPixelRatio(pixelRatio)
+  }
+
+  updateSize () {
+    this.renderer.setSize(window.innerWidth, window.innerHeight)
+  }
+
+  private addToPage () {
+    this.canvas.id = 'viewer-canvas'
+    this.canvas.style.width = '100%'
+    this.canvas.style.height = '100%'
+    document.body.appendChild(this.canvas)
+  }
+
+  private setupFpsTracking () {
+    let max = 0
+    this.fpsInterval = setInterval(() => {
+      if (max > 0) {
+        this.droppedFpsPercentage = this.renderedFps / max
+      }
+      max = Math.max(this.renderedFps, max)
+      this.renderedFps = 0
+    }, 1000)
+  }
+
+  // private handleResize () {
+  //   const width = window.innerWidth
+  //   const height = window.innerHeight
+
+  //   viewer.camera.aspect = width / height
+  //   viewer.camera.updateProjectionMatrix()
+  //   this.renderer.setSize(width, height)
+  //   viewer.world.handleResize()
+  // }
+
+  private startRenderLoop () {
+    const animate = () => {
+      if (this.disconnected) return
+      this.animationFrameId = requestAnimationFrame(animate)
+
+      if (this.paused) return
+
+      // Handle FPS limiting
+      if (this.config.fpsLimit) {
+        const now = performance.now()
+        const elapsed = now - this.lastRenderTime
+        const fpsInterval = 1000 / this.config.fpsLimit
+
+        if (elapsed < fpsInterval) {
+          return
+        }
+
+        this.lastRenderTime = now - (elapsed % fpsInterval)
+      }
+
+      let sizeChanged = false
+      if (this.previousWindowWidth !== window.innerWidth || this.previousWindowHeight !== window.innerHeight) {
+        this.previousWindowWidth = window.innerWidth
+        this.previousWindowHeight = window.innerHeight
+        this.updateSize()
+        sizeChanged = true
+      }
+
+      this.preRender()
+      this.stats.markStart()
+      tween.update()
+      this.render(sizeChanged)
+      this.renderedFps++
+      this.stats.markEnd()
+      this.postRender()
+
+      // Update stats visibility each frame
+      if (this.config.statsVisible !== undefined) {
+        this.stats.setVisibility(this.config.statsVisible)
+      }
+    }
+
+    animate()
+  }
+
+  setPaused (paused: boolean) {
+    this.paused = paused
+  }
+
+  dispose () {
+    this.disconnected = true
+    if (this.animationFrameId) {
+      cancelAnimationFrame(this.animationFrameId)
+    }
+    this.canvas.remove()
+    this.renderer.dispose()
+    clearInterval(this.fpsInterval)
+    this.stats.dispose()
+  }
+}
+
+class TopRightStats {
+  private readonly stats: Stats
+  private readonly stats2: Stats
+  private readonly statsGl: StatsGl
+  private total = 0
+  private readonly denseMode: boolean
+
+  constructor (private readonly canvas: HTMLCanvasElement, initialStatsVisible = 0) {
+    this.stats = new Stats()
+    this.stats2 = new Stats()
+    this.statsGl = new StatsGl({ minimal: true })
+    this.stats2.showPanel(2)
+    this.denseMode = process.env.NODE_ENV === 'production' || window.innerHeight < 500
+
+    this.initStats()
+    this.setVisibility(initialStatsVisible)
+  }
+
+  private addStat (dom: HTMLElement, size = 80) {
+    dom.style.position = 'absolute'
+    if (this.denseMode) dom.style.height = '12px'
+    dom.style.overflow = 'hidden'
+    dom.style.left = ''
+    dom.style.top = '0'
+    dom.style.right = `${this.total}px`
+    dom.style.width = '80px'
+    dom.style.zIndex = '1'
+    dom.style.opacity = '0.8'
+    document.body.appendChild(dom)
+    this.total += size
+  }
+
+  private initStats () {
+    const hasRamPanel = this.stats2.dom.children.length === 3
+
+    this.addStat(this.stats.dom)
+    if (hasRamPanel) {
+      this.addStat(this.stats2.dom)
+    }
+
+    this.statsGl.init(this.canvas)
+    this.statsGl.container.style.display = 'flex'
+    this.statsGl.container.style.justifyContent = 'flex-end'
+
+    let i = 0
+    for (const _child of this.statsGl.container.children) {
+      const child = _child as HTMLElement
+      if (i++ === 0) {
+        child.style.display = 'none'
+      }
+      child.style.position = ''
+    }
+  }
+
+  setVisibility (level: number) {
+    const visible = level > 0
+    if (visible) {
+      this.stats.dom.style.display = 'block'
+      this.stats2.dom.style.display = level >= 2 ? 'block' : 'none'
+      this.statsGl.container.style.display = level >= 2 ? 'block' : 'none'
+    } else {
+      this.stats.dom.style.display = 'none'
+      this.stats2.dom.style.display = 'none'
+      this.statsGl.container.style.display = 'none'
+    }
+  }
+
+  markStart () {
+    this.stats.begin()
+    this.stats2.begin()
+    this.statsGl.begin()
+  }
+
+  markEnd () {
+    this.stats.end()
+    this.stats2.end()
+    this.statsGl.end()
+  }
+
+  dispose () {
+    this.stats.dom.remove()
+    this.stats2.dom.remove()
+    this.statsGl.container.remove()
+  }
+}
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
new file mode 100644
index 00000000..54c3faaf
--- /dev/null
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -0,0 +1,119 @@
+import * as THREE from 'three'
+import { Vec3 } from 'vec3'
+import { proxy } from 'valtio'
+import { GraphicsBackendLoader, GraphicsBackend, GraphicsInitOptions, DisplayWorldOptions, RendererReactiveState } from '../../../src/appViewer'
+import { ProgressReporter } from '../../../src/core/progressReporter'
+import { WorldRendererThree } from '../lib/worldrendererThree'
+import { DocumentRenderer } from './documentRenderer'
+import { PanoramaRenderer } from './panorama'
+
+// https://discourse.threejs.org/t/updates-to-color-management-in-three-js-r152/50791
+THREE.ColorManagement.enabled = false
+window.THREE = THREE
+
+const getBackendMethods = (worldRenderer: WorldRendererThree) => {
+  return {
+    updateMap: worldRenderer.entities.updateMap.bind(worldRenderer.entities),
+    updateCustomBlock: worldRenderer.updateCustomBlock.bind(worldRenderer),
+    getBlockInfo: worldRenderer.getBlockInfo.bind(worldRenderer),
+    playEntityAnimation: worldRenderer.entities.playAnimation.bind(worldRenderer.entities),
+    damageEntity: worldRenderer.entities.handleDamageEvent.bind(worldRenderer.entities),
+    updatePlayerSkin: worldRenderer.entities.updatePlayerSkin.bind(worldRenderer.entities),
+    setHighlightCursorBlock: worldRenderer.cursorBlock.setHighlightCursorBlock.bind(worldRenderer.cursorBlock),
+    updateBreakAnimation: worldRenderer.cursorBlock.updateBreakAnimation.bind(worldRenderer.cursorBlock),
+    changeHandSwingingState: worldRenderer.changeHandSwingingState.bind(worldRenderer),
+    getHighestBlocks: worldRenderer.getHighestBlocks.bind(worldRenderer),
+    rerenderAllChunks: worldRenderer.rerenderAllChunks.bind(worldRenderer),
+    addMedia: worldRenderer.addMedia.bind(worldRenderer),
+    destroyMedia: worldRenderer.destroyMedia.bind(worldRenderer),
+    setVideoPlaying: worldRenderer.setVideoPlaying.bind(worldRenderer),
+    setVideoSeeking: worldRenderer.setVideoSeeking.bind(worldRenderer),
+    setVideoVolume: worldRenderer.setVideoVolume.bind(worldRenderer),
+    setVideoSpeed: worldRenderer.setVideoSpeed.bind(worldRenderer),
+  }
+}
+
+export type ThreeJsBackendMethods = ReturnType<typeof getBackendMethods>
+
+const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitOptions) => {
+  // Private state
+  const documentRenderer = new DocumentRenderer(initOptions)
+  globalThis.renderer = documentRenderer.renderer
+
+  let panoramaRenderer: PanoramaRenderer | null = null
+  let worldRenderer: WorldRendererThree | null = null
+
+  const startPanorama = () => {
+    if (worldRenderer) return
+    if (!panoramaRenderer) {
+      panoramaRenderer = new PanoramaRenderer(documentRenderer, initOptions, !!process.env.SINGLE_FILE_BUILD_MODE)
+      void panoramaRenderer.start()
+      window.panoramaRenderer = panoramaRenderer
+    }
+  }
+
+  let version = ''
+  const prepareResources = async (ver: string, progressReporter: ProgressReporter): Promise<void> => {
+    version = ver
+    await initOptions.resourcesManager.updateAssetsData({ })
+  }
+
+  const startWorld = (displayOptions: DisplayWorldOptions) => {
+    if (panoramaRenderer) {
+      panoramaRenderer.dispose()
+      panoramaRenderer = null
+    }
+    worldRenderer = new WorldRendererThree(documentRenderer.renderer, initOptions, displayOptions)
+    documentRenderer.render = (sizeChanged: boolean) => {
+      worldRenderer?.render(sizeChanged)
+    }
+    window.world = worldRenderer
+  }
+
+  const disconnect = () => {
+    if (panoramaRenderer) {
+      panoramaRenderer.dispose()
+      panoramaRenderer = null
+    }
+    if (documentRenderer) {
+      documentRenderer.dispose()
+    }
+    if (worldRenderer) {
+      worldRenderer.destroy()
+      worldRenderer = null
+    }
+  }
+
+  // Public interface
+  const backend: GraphicsBackend = {
+    //@ts-expect-error mark as three.js renderer
+    __isThreeJsRenderer: true,
+    NAME: `three.js ${THREE.REVISION}`,
+    startPanorama,
+    prepareResources,
+    startWorld,
+    disconnect,
+    setRendering (rendering) {
+      documentRenderer.setPaused(!rendering)
+    },
+    getDebugOverlay: () => ({
+    }),
+    updateCamera (pos: Vec3 | null, yaw: number, pitch: number) {
+      worldRenderer?.setFirstPersonCamera(pos, yaw, pitch)
+    },
+    setRoll (roll: number) {
+      worldRenderer?.setCameraRoll(roll)
+    },
+    get soundSystem () {
+      return worldRenderer?.soundSystem
+    },
+    get backendMethods () {
+      if (!worldRenderer) return undefined
+      return getBackendMethods(worldRenderer)
+    }
+  }
+
+  return backend
+}
+
+export default createGraphicsBackend
diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
new file mode 100644
index 00000000..1eb3c9fa
--- /dev/null
+++ b/renderer/viewer/three/panorama.ts
@@ -0,0 +1,207 @@
+import { join } from 'path'
+import * as THREE from 'three'
+import { getSyncWorld } from 'renderer/playground/shared'
+import { Vec3 } from 'vec3'
+import * as tweenJs from '@tweenjs/tween.js'
+import { EntityMesh } from '../lib/entity/EntityMesh'
+import type { GraphicsInitOptions } from '../../../src/appViewer'
+import { WorldDataEmitter } from '../lib/worldDataEmitter'
+import { WorldRendererThree } from '../lib/worldrendererThree'
+import { defaultWorldRendererConfig } from '../lib/worldrendererCommon'
+import { BasePlayerState } from '../lib/basePlayerState'
+import { getDefaultRendererState } from '../baseGraphicsBackend'
+import { DocumentRenderer } from './documentRenderer'
+
+const panoramaFiles = [
+  'panorama_3.png', // right (+x)
+  'panorama_1.png', // left (-x)
+  'panorama_4.png', // top (+y)
+  'panorama_5.png', // bottom (-y)
+  'panorama_0.png', // front (+z)
+  'panorama_2.png', // back (-z)
+]
+
+export class PanoramaRenderer {
+  private readonly camera: THREE.PerspectiveCamera
+  private scene: THREE.Scene
+  private readonly ambientLight: THREE.AmbientLight
+  private readonly directionalLight: THREE.DirectionalLight
+  private panoramaGroup: THREE.Object3D | null = null
+  private time = 0
+  private readonly abortController = new AbortController()
+  private worldRenderer: WorldRendererThree | undefined
+
+  constructor (private readonly documentRenderer: DocumentRenderer, private readonly options: GraphicsInitOptions, private readonly doWorldBlocksPanorama = false) {
+    this.scene = new THREE.Scene()
+    this.scene.background = new THREE.Color(this.options.config.sceneBackground)
+
+    // Add ambient light
+    this.ambientLight = new THREE.AmbientLight(0xcc_cc_cc)
+    this.scene.add(this.ambientLight)
+
+    // Add directional light
+    this.directionalLight = new THREE.DirectionalLight(0xff_ff_ff, 0.5)
+    this.directionalLight.position.set(1, 1, 0.5).normalize()
+    this.directionalLight.castShadow = true
+    this.scene.add(this.directionalLight)
+
+    this.camera = new THREE.PerspectiveCamera(85, window.innerWidth / window.innerHeight, 0.05, 1000)
+    this.camera.position.set(0, 0, 0)
+    this.camera.rotation.set(0, 0, 0)
+  }
+
+  async start () {
+    if (this.doWorldBlocksPanorama) {
+      await this.worldBlocksPanorama()
+    } else {
+      this.addClassicPanorama()
+    }
+
+
+    this.documentRenderer.render = (sizeChanged = false) => {
+      if (sizeChanged) {
+        this.camera.aspect = window.innerWidth / window.innerHeight
+        this.camera.updateProjectionMatrix()
+      }
+      this.documentRenderer.renderer.render(this.scene, this.camera)
+    }
+  }
+
+  addClassicPanorama () {
+    const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000)
+    const loader = new THREE.TextureLoader()
+    const panorMaterials = [] as THREE.MeshBasicMaterial[]
+
+    for (const file of panoramaFiles) {
+      const texture = loader.load(join('background', file))
+
+      // Instead of using repeat/offset to flip, we'll use the texture matrix
+      texture.matrixAutoUpdate = false
+      texture.matrix.set(
+        -1, 0, 1, 0, 1, 0, 0, 0, 1
+      )
+
+      texture.wrapS = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
+      texture.wrapT = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
+      texture.minFilter = THREE.LinearFilter
+      texture.magFilter = THREE.LinearFilter
+
+      panorMaterials.push(new THREE.MeshBasicMaterial({
+        map: texture,
+        transparent: true,
+        side: THREE.DoubleSide,
+        depthWrite: false,
+      }))
+    }
+
+    const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials)
+    panoramaBox.onBeforeRender = () => {
+      this.time += 0.01
+      panoramaBox.rotation.y = Math.PI + this.time * 0.01
+      panoramaBox.rotation.z = Math.sin(-this.time * 0.001) * 0.001
+    }
+
+    const group = new THREE.Object3D()
+    group.add(panoramaBox)
+
+    // Add squids
+    for (let i = 0; i < 20; i++) {
+      const m = new EntityMesh('1.16.4', 'squid').mesh
+      m.position.set(Math.random() * 30 - 15, Math.random() * 20 - 10, Math.random() * 10 - 17)
+      m.rotation.set(0, Math.PI + Math.random(), -Math.PI / 4, 'ZYX')
+      const v = Math.random() * 0.01
+      m.children[0].onBeforeRender = () => {
+        m.rotation.y += v
+        m.rotation.z = Math.cos(panoramaBox.rotation.y * 3) * Math.PI / 4 - Math.PI / 2
+      }
+      group.add(m)
+    }
+
+    this.scene.add(group)
+    this.panoramaGroup = group
+  }
+
+  async worldBlocksPanorama () {
+    const version = '1.21.4'
+    this.options.resourcesManager.currentConfig = { version }
+    await this.options.resourcesManager.updateAssetsData({ })
+    if (this.abortController.signal.aborted) return
+    console.time('load panorama scene')
+    const world = getSyncWorld(version)
+    const PrismarineBlock = require('prismarine-block')
+    const Block = PrismarineBlock(version)
+    const fullBlocks = loadedData.blocksArray.filter(block => {
+    // if (block.name.includes('leaves')) return false
+      if (/* !block.name.includes('wool') &&  */!block.name.includes('stained_glass')/*  && !block.name.includes('terracotta') */) return false
+      const b = Block.fromStateId(block.defaultState, 0)
+      if (b.shapes?.length !== 1) return false
+      const shape = b.shapes[0]
+      return shape[0] === 0 && shape[1] === 0 && shape[2] === 0 && shape[3] === 1 && shape[4] === 1 && shape[5] === 1
+    })
+    const Z = -15
+    const sizeX = 100
+    const sizeY = 100
+    for (let x = -sizeX; x < sizeX; x++) {
+      for (let y = -sizeY; y < sizeY; y++) {
+        const block = fullBlocks[Math.floor(Math.random() * fullBlocks.length)]
+        world.setBlockStateId(new Vec3(x, y, Z), block.defaultState)
+      }
+    }
+    this.camera.updateProjectionMatrix()
+    this.camera.position.set(0.5, sizeY / 2 + 0.5, 0.5)
+    this.camera.rotation.set(0, 0, 0)
+    const initPos = new Vec3(...this.camera.position.toArray())
+    const worldView = new WorldDataEmitter(world, 2, initPos)
+    // worldView.addWaitTime = 0
+    if (this.abortController.signal.aborted) return
+
+    this.worldRenderer = new WorldRendererThree(
+      this.documentRenderer.renderer,
+      this.options,
+      {
+        version,
+        worldView,
+        inWorldRenderingConfig: defaultWorldRendererConfig,
+        playerState: new BasePlayerState(),
+        rendererState: getDefaultRendererState()
+      }
+    )
+    this.scene = this.worldRenderer.scene
+    void worldView.init(initPos)
+
+    await this.worldRenderer.waitForChunksToRender()
+    if (this.abortController.signal.aborted) return
+    // add small camera rotation to side on mouse move depending on absolute position of the cursor
+    const { camera } = this
+    const initX = camera.position.x
+    const initY = camera.position.y
+    let prevTwin: tweenJs.Tween<THREE.Vector3> | undefined
+    document.body.addEventListener('pointermove', (e) => {
+      if (e.pointerType !== 'mouse') return
+      const pos = new THREE.Vector2(e.clientX, e.clientY)
+      const SCALE = 0.2
+      /* -0.5 - 0.5 */
+      const xRel = pos.x / window.innerWidth - 0.5
+      const yRel = -(pos.y / window.innerHeight - 0.5)
+      prevTwin?.stop()
+      const to = {
+        x: initX + (xRel * SCALE),
+        y: initY + (yRel * SCALE)
+      }
+      prevTwin = new tweenJs.Tween(camera.position).to(to, 0) // todo use the number depending on diff // todo use the number depending on diff
+      // prevTwin.easing(tweenJs.Easing.Exponential.InOut)
+      prevTwin.start()
+      camera.updateProjectionMatrix()
+    }, {
+      signal: this.abortController.signal
+    })
+
+    console.timeEnd('load panorama scene')
+  }
+
+  dispose () {
+    this.scene.clear()
+    this.worldRenderer?.destroy()
+    this.abortController.abort()
+  }
+}
diff --git a/renderer/viewer/three/threeJsMethods.ts b/renderer/viewer/three/threeJsMethods.ts
new file mode 100644
index 00000000..0dc7bf79
--- /dev/null
+++ b/renderer/viewer/three/threeJsMethods.ts
@@ -0,0 +1,15 @@
+import type { GraphicsBackend } from '../../../src/appViewer'
+import type { ThreeJsBackendMethods } from './graphicsBackend'
+
+export function getThreeJsRendererMethods (): ThreeJsBackendMethods | undefined {
+  const renderer = appViewer.backend
+  if (!renderer?.['__isThreeJsRenderer'] || !renderer.backendMethods) return
+  return new Proxy(renderer.backendMethods, {
+    get (target, prop) {
+      return async (...args) => {
+        const result = await (target[prop as any] as any)(...args)
+        return result
+      }
+    }
+  }) as ThreeJsBackendMethods
+}
diff --git a/renderer/viewer/three/world/cursorBlock.ts b/renderer/viewer/three/world/cursorBlock.ts
new file mode 100644
index 00000000..cddfc5df
--- /dev/null
+++ b/renderer/viewer/three/world/cursorBlock.ts
@@ -0,0 +1,144 @@
+import * as THREE from 'three'
+import { LineMaterial, LineSegmentsGeometry, Wireframe } from 'three-stdlib'
+import { Vec3 } from 'vec3'
+import { subscribeKey } from 'valtio/utils'
+import { Block } from 'prismarine-block'
+import { WorldRendererThree } from '../../lib/worldrendererThree'
+import destroyStage0 from '../../../../assets/destroy_stage_0.png'
+import destroyStage1 from '../../../../assets/destroy_stage_1.png'
+import destroyStage2 from '../../../../assets/destroy_stage_2.png'
+import destroyStage3 from '../../../../assets/destroy_stage_3.png'
+import destroyStage4 from '../../../../assets/destroy_stage_4.png'
+import destroyStage5 from '../../../../assets/destroy_stage_5.png'
+import destroyStage6 from '../../../../assets/destroy_stage_6.png'
+import destroyStage7 from '../../../../assets/destroy_stage_7.png'
+import destroyStage8 from '../../../../assets/destroy_stage_8.png'
+import destroyStage9 from '../../../../assets/destroy_stage_9.png'
+
+export class CursorBlock {
+  cursorLineMaterial: LineMaterial
+  interactionLines: null | { blockPos; mesh } = null
+  prevColor
+  blockBreakMesh: THREE.Mesh
+  breakTextures: THREE.Texture[] = []
+
+  constructor (public readonly worldRenderer: WorldRendererThree) {
+    // Initialize break mesh and textures
+    const loader = new THREE.TextureLoader()
+    const destroyStagesImages = [
+      destroyStage0, destroyStage1, destroyStage2, destroyStage3, destroyStage4,
+      destroyStage5, destroyStage6, destroyStage7, destroyStage8, destroyStage9
+    ]
+
+    for (let i = 0; i < 10; i++) {
+      const texture = loader.load(destroyStagesImages[i])
+      texture.magFilter = THREE.NearestFilter
+      texture.minFilter = THREE.NearestFilter
+      this.breakTextures.push(texture)
+    }
+
+    const breakMaterial = new THREE.MeshBasicMaterial({
+      transparent: true,
+      blending: THREE.MultiplyBlending,
+      alphaTest: 0.5,
+    })
+    this.blockBreakMesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 1), breakMaterial)
+    this.blockBreakMesh.visible = false
+    this.blockBreakMesh.renderOrder = 999
+    this.blockBreakMesh.name = 'blockBreakMesh'
+    this.worldRenderer.scene.add(this.blockBreakMesh)
+
+    subscribeKey(this.worldRenderer.playerState.reactive, 'gameMode', () => {
+      this.updateLineMaterial()
+    })
+
+    this.updateLineMaterial()
+  }
+
+  // Update functions
+  updateLineMaterial () {
+    const inCreative = this.worldRenderer.displayOptions.playerState.reactive.gameMode === 'creative'
+    const pixelRatio = this.worldRenderer.renderer.getPixelRatio()
+
+    this.cursorLineMaterial = new LineMaterial({
+      color: (() => {
+        switch (this.worldRenderer.worldRendererConfig.highlightBlockColor) {
+          case 'blue':
+            return 0x40_80_ff
+          case 'classic':
+            return 0x00_00_00
+          default:
+            return inCreative ? 0x40_80_ff : 0x00_00_00
+        }
+      })(),
+      linewidth: Math.max(pixelRatio * 0.7, 1) * 2,
+      // dashed: true,
+      // dashSize: 5,
+    })
+    this.prevColor = this.worldRenderer.worldRendererConfig.highlightBlockColor
+  }
+
+  updateBreakAnimation (block: Block | undefined, stage: number | null) {
+    this.hideBreakAnimation()
+    if (stage === null || !block) return
+
+    const mergedShape = bot.mouse.getMergedCursorShape(block)
+    if (!mergedShape) return
+    const { position, width, height, depth } = bot.mouse.getDataFromShape(mergedShape)
+    this.blockBreakMesh.scale.set(width * 1.001, height * 1.001, depth * 1.001)
+    position.add(block.position)
+    this.blockBreakMesh.position.set(position.x, position.y, position.z)
+    this.blockBreakMesh.visible = true;
+
+    (this.blockBreakMesh.material as THREE.MeshBasicMaterial).map = this.breakTextures[stage] ?? this.breakTextures.at(-1);
+    (this.blockBreakMesh.material as THREE.MeshBasicMaterial).needsUpdate = true
+  }
+
+  hideBreakAnimation () {
+    if (this.blockBreakMesh) {
+      this.blockBreakMesh.visible = false
+    }
+  }
+
+  updateDisplay () {
+    if (this.cursorLineMaterial) {
+      const { renderer } = this.worldRenderer
+      this.cursorLineMaterial.resolution.set(renderer.domElement.width, renderer.domElement.height)
+      this.cursorLineMaterial.dashOffset = performance.now() / 750
+    }
+  }
+
+  setHighlightCursorBlock (blockPos: Vec3 | null, shapePositions?: Array<{ position: any; width: any; height: any; depth: any; }>): void {
+    if (blockPos && this.interactionLines && blockPos.equals(this.interactionLines.blockPos)) {
+      return
+    }
+    if (this.interactionLines !== null) {
+      this.worldRenderer.scene.remove(this.interactionLines.mesh)
+      this.interactionLines = null
+    }
+    if (blockPos === null) {
+      return
+    }
+
+    const group = new THREE.Group()
+    for (const { position, width, height, depth } of shapePositions ?? []) {
+      const scale = [1.0001 * width, 1.0001 * height, 1.0001 * depth] as const
+      const geometry = new THREE.BoxGeometry(...scale)
+      const lines = new LineSegmentsGeometry().fromEdgesGeometry(new THREE.EdgesGeometry(geometry))
+      const wireframe = new Wireframe(lines, this.cursorLineMaterial)
+      const pos = blockPos.plus(position)
+      wireframe.position.set(pos.x, pos.y, pos.z)
+      wireframe.computeLineDistances()
+      group.add(wireframe)
+    }
+    this.worldRenderer.scene.add(group)
+    this.interactionLines = { blockPos, mesh: group }
+  }
+
+  render () {
+    if (this.prevColor !== this.worldRenderer.worldRendererConfig.highlightBlockColor) {
+      this.updateLineMaterial()
+    }
+    this.updateDisplay()
+  }
+}
diff --git a/src/vr.ts b/renderer/viewer/three/world/vr.ts
similarity index 85%
rename from src/vr.ts
rename to renderer/viewer/three/world/vr.ts
index dd97560e..2d1f3cdd 100644
--- a/src/vr.ts
+++ b/renderer/viewer/three/world/vr.ts
@@ -3,41 +3,38 @@ import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js'
 import { XRControllerModelFactory } from 'three/examples/jsm/webxr/XRControllerModelFactory.js'
 import { buttonMap as standardButtonsMap } from 'contro-max/build/gamepad'
 import * as THREE from 'three'
-import { subscribeKey } from 'valtio/utils'
-import { subscribe } from 'valtio'
-import { activeModalStack, hideModal } from './globalState'
-import { watchUnloadForCleanup } from './gameUnload'
-import { options } from './optionsStorage'
+import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
 
-export async function initVR () {
-  options.vrSupport = true
-  const { renderer } = viewer
-  if (!('xr' in navigator)) return
+export async function initVR (worldRenderer: WorldRendererThree) {
+  if (!('xr' in navigator) || !worldRenderer.worldRendererConfig.vrSupport) return
+  const { renderer } = worldRenderer
 
   const isSupported = await checkVRSupport()
   if (!isSupported) return
 
-  enableVr(renderer)
+  enableVr()
 
   const vrButtonContainer = createVrButtonContainer(renderer)
   const updateVrButtons = () => {
-    vrButtonContainer.hidden = !options.vrSupport || activeModalStack.length !== 0
+    const newHidden = !worldRenderer.worldRendererConfig.vrSupport || !worldRenderer.worldRendererConfig.foreground
+    if (vrButtonContainer.hidden !== newHidden) {
+      vrButtonContainer.hidden = newHidden
+    }
   }
 
-  const unsubWatchSetting = subscribeKey(options, 'vrSupport', updateVrButtons)
-  const unsubWatchModals = subscribe(activeModalStack, updateVrButtons)
+  worldRenderer.onRender.push(updateVrButtons)
 
-  function enableVr (renderer) {
+  function enableVr () {
     renderer.xr.enabled = true
+    worldRenderer.reactiveState.preventEscapeMenu = true
   }
 
   function disableVr () {
     renderer.xr.enabled = false
-    viewer.cameraObjectOverride = undefined
-    viewer.scene.remove(user)
+    worldRenderer.cameraObjectOverride = undefined
+    worldRenderer.reactiveState.preventEscapeMenu = false
+    worldRenderer.scene.remove(user)
     vrButtonContainer.hidden = true
-    unsubWatchSetting()
-    unsubWatchModals()
   }
 
   function createVrButtonContainer (renderer) {
@@ -84,7 +81,7 @@ export async function initVR () {
 
     closeButton.addEventListener('click', () => {
       container.hidden = true
-      options.vrSupport = false
+      worldRenderer.worldRendererConfig.vrSupport = false
     })
 
     return closeButton
@@ -103,8 +100,8 @@ export async function initVR () {
 
   // hack for vr camera
   const user = new THREE.Group()
-  user.add(viewer.camera)
-  viewer.scene.add(user)
+  user.add(worldRenderer.camera)
+  worldRenderer.scene.add(user)
   const controllerModelFactory = new XRControllerModelFactory(new GLTFLoader())
   const controller1 = renderer.xr.getControllerGrip(0)
   const controller2 = renderer.xr.getControllerGrip(1)
@@ -191,8 +188,8 @@ export async function initVR () {
       rotSnapReset = true
     }
 
-    // viewer.setFirstPersonCamera(null, yawOffset, 0)
-    viewer.setFirstPersonCamera(null, bot.entity.yaw, bot.entity.pitch)
+    // appViewer.backend?.updateCamera(null, yawOffset, 0)
+    worldRenderer.updateCamera(null, bot.entity.yaw, bot.entity.pitch)
 
     // todo restore this logic (need to preserve ability to move camera)
     // const xrCamera = renderer.xr.getCamera()
@@ -203,20 +200,16 @@ export async function initVR () {
     // todo ?
     // bot.physics.stepHeight = 1
 
-    viewer.render()
+    worldRenderer.render()
   })
   renderer.xr.addEventListener('sessionstart', () => {
-    viewer.cameraObjectOverride = user
-    // close all modals to be in game
-    for (const _modal of activeModalStack) {
-      hideModal(undefined, {}, { force: true })
-    }
+    worldRenderer.cameraObjectOverride = user
   })
   renderer.xr.addEventListener('sessionend', () => {
-    viewer.cameraObjectOverride = undefined
+    worldRenderer.cameraObjectOverride = undefined
   })
 
-  watchUnloadForCleanup(disableVr)
+  worldRenderer.abortController.signal.addEventListener('abort', disableVr)
 }
 
 const xrStandardRightButtonsMap = [
diff --git a/src/appViewer.ts b/src/appViewer.ts
new file mode 100644
index 00000000..de18ab67
--- /dev/null
+++ b/src/appViewer.ts
@@ -0,0 +1,250 @@
+import { WorldDataEmitter } from 'renderer/viewer/lib/worldDataEmitter'
+import { IPlayerState } from 'renderer/viewer/lib/basePlayerState'
+import { subscribeKey } from 'valtio/utils'
+import { defaultWorldRendererConfig, WorldRendererConfig } from 'renderer/viewer/lib/worldrendererCommon'
+import { Vec3 } from 'vec3'
+import { SoundSystem } from 'renderer/viewer/lib/threeJsSound'
+import { proxy } from 'valtio'
+import { getDefaultRendererState } from 'renderer/viewer/baseGraphicsBackend'
+import { playerState } from './mineflayer/playerState'
+import { createNotificationProgressReporter, ProgressReporter } from './core/progressReporter'
+import { setLoadingScreenStatus } from './appStatus'
+import { activeModalStack, miscUiState } from './globalState'
+import { options } from './optionsStorage'
+import { ResourcesManager } from './resourcesManager'
+import { watchOptionsAfterWorldViewInit } from './watchOptions'
+
+export interface RendererReactiveState {
+  world: {
+    chunksLoaded: string[]
+    chunksTotalNumber: number
+    allChunksLoaded: boolean
+    mesherWork: boolean
+    intersectMedia: { id: string, x: number, y: number } | null
+  }
+  renderer: string
+  preventEscapeMenu: boolean
+}
+
+export interface GraphicsBackendConfig {
+  fpsLimit?: number
+  powerPreference?: 'high-performance' | 'low-power'
+  statsVisible?: number
+  sceneBackground: string
+}
+
+const defaultGraphicsBackendConfig: GraphicsBackendConfig = {
+  fpsLimit: undefined,
+  powerPreference: undefined,
+  sceneBackground: 'lightblue'
+}
+
+export interface GraphicsInitOptions {
+  resourcesManager: ResourcesManager
+  config: GraphicsBackendConfig
+
+  displayCriticalError: (error: Error) => void
+}
+
+export interface DisplayWorldOptions {
+  version: string
+  worldView: WorldDataEmitter
+  inWorldRenderingConfig: WorldRendererConfig
+  playerState: IPlayerState
+  rendererState: RendererReactiveState
+}
+
+export type GraphicsBackendLoader = (options: GraphicsInitOptions) => GraphicsBackend
+
+// no sync methods
+export interface GraphicsBackend {
+  NAME: string
+  startPanorama: () => void
+  // prepareResources: (version: string, progressReporter: ProgressReporter) => Promise<void>
+  startWorld: (options: DisplayWorldOptions) => void
+  disconnect: () => void
+  setRendering: (rendering: boolean) => void
+  getDebugOverlay: () => Record<string, any>
+  updateCamera: (pos: Vec3 | null, yaw: number, pitch: number) => void
+  setRoll: (roll: number) => void
+  soundSystem: SoundSystem | undefined
+
+  backendMethods: Record<string, unknown> | undefined
+}
+
+export class AppViewer {
+  resourcesManager = new ResourcesManager()
+  worldView: WorldDataEmitter | undefined
+  readonly config: GraphicsBackendConfig = {
+    ...defaultGraphicsBackendConfig,
+    powerPreference: options.gpuPreference === 'default' ? undefined : options.gpuPreference
+  }
+  backend?: GraphicsBackend
+  backendLoader?: GraphicsBackendLoader
+  private currentState?: {
+    method: string
+    args: any[]
+  }
+  currentDisplay = null as 'menu' | 'world' | null
+  inWorldRenderingConfig: WorldRendererConfig = proxy(defaultWorldRendererConfig)
+  lastCamUpdate = 0
+  playerState = playerState
+  rendererState = proxy(getDefaultRendererState())
+  worldReady: Promise<void>
+  private resolveWorldReady: () => void
+
+  constructor () {
+    this.disconnectBackend()
+  }
+
+  loadBackend (loader: GraphicsBackendLoader) {
+    if (this.backend) {
+      this.disconnectBackend()
+    }
+
+    this.backendLoader = loader
+    const loaderOptions: GraphicsInitOptions = {
+      resourcesManager: this.resourcesManager,
+      config: this.config,
+      displayCriticalError (error) {
+        console.error(error)
+        setLoadingScreenStatus(error.message, true)
+      },
+    }
+    this.backend = loader(loaderOptions)
+
+    // if (this.resourcesManager.currentResources) {
+    //   void this.prepareResources(this.resourcesManager.currentResources.version, createNotificationProgressReporter())
+    // }
+
+    // Execute queued action if exists
+    if (this.currentState) {
+      const { method, args } = this.currentState
+      this.backend[method](...args)
+      if (method === 'startWorld') {
+        void this.worldView!.init(args[0].playerState.getPosition())
+      }
+    }
+  }
+
+  startWorld (world, renderDistance: number, playerStateSend: IPlayerState = playerState) {
+    if (this.currentDisplay === 'world') throw new Error('World already started')
+    this.currentDisplay = 'world'
+    const startPosition = playerStateSend.getPosition()
+    this.worldView = new WorldDataEmitter(world, renderDistance, startPosition)
+    window.worldView = this.worldView
+    watchOptionsAfterWorldViewInit(this.worldView)
+
+    const displayWorldOptions: DisplayWorldOptions = {
+      version: this.resourcesManager.currentConfig!.version,
+      worldView: this.worldView,
+      inWorldRenderingConfig: this.inWorldRenderingConfig,
+      playerState: playerStateSend,
+      rendererState: this.rendererState
+    }
+    if (this.backend) {
+      this.backend.startWorld(displayWorldOptions)
+      void this.worldView.init(startPosition)
+    }
+    this.currentState = { method: 'startWorld', args: [displayWorldOptions] }
+
+    // Resolve the promise after world is started
+    this.resolveWorldReady()
+  }
+
+  resetBackend (cleanState = false) {
+    if (cleanState) {
+      this.currentState = undefined
+      this.currentDisplay = null
+      this.worldView = undefined
+    }
+    if (this.backendLoader) {
+      this.loadBackend(this.backendLoader)
+    }
+  }
+
+  startPanorama () {
+    if (this.currentDisplay === 'menu') return
+    this.currentDisplay = 'menu'
+    if (options.disableAssets) return
+    if (this.backend) {
+      this.backend.startPanorama()
+    }
+    this.currentState = { method: 'startPanorama', args: [] }
+  }
+
+  // async prepareResources (version: string, progressReporter: ProgressReporter) {
+  //   if (this.backend) {
+  //     await this.backend.prepareResources(version, progressReporter)
+  //   }
+  // }
+
+  destroyAll () {
+    this.disconnectBackend()
+    this.resourcesManager.destroy()
+  }
+
+  disconnectBackend () {
+    if (this.backend) {
+      this.backend.disconnect()
+      this.backend = undefined
+    }
+    this.currentDisplay = null
+    const { promise, resolve } = Promise.withResolvers<void>()
+    this.worldReady = promise
+    this.resolveWorldReady = resolve
+    Object.assign(this.rendererState, getDefaultRendererState())
+    // this.queuedDisplay = undefined
+  }
+
+  get utils () {
+    return {
+      async waitingForChunks () {
+        if (this.backend?.worldState.allChunksLoaded) return
+        return new Promise((resolve) => {
+          const interval = setInterval(() => {
+            if (this.backend?.worldState.allChunksLoaded) {
+              clearInterval(interval)
+              resolve(true)
+            }
+          }, 100)
+        })
+      }
+    }
+  }
+}
+
+export const appViewer = new AppViewer()
+window.appViewer = appViewer
+
+const initialMenuStart = async () => {
+  if (appViewer.currentDisplay === 'world') {
+    appViewer.resetBackend(true)
+  }
+  appViewer.startPanorama()
+
+  // await appViewer.resourcesManager.loadMcData('1.21.4')
+  // const world = getSyncWorld('1.21.4')
+  // await appViewer.prepareResources('1.21.4', createNullProgressReporter())
+  // world.setBlockStateId(new Vec3(0, 64, 0), 1)
+  // appViewer.startWorld(world, 3, new Vec3(0, 64, 0), new BasePlayerState())
+  // appViewer.backend?.updateCamera(new Vec3(0, 64, 2), 0, 0)
+  // void appViewer.worldView.init(new Vec3(0, 64, 0))
+}
+window.initialMenuStart = initialMenuStart
+
+const modalStackUpdateChecks = () => {
+  // maybe start panorama
+  if (activeModalStack.length === 0 && !miscUiState.gameLoaded) {
+    void initialMenuStart()
+  }
+
+  if (appViewer.backend) {
+    const hasAppStatus = activeModalStack.some(m => m.reactType === 'app-status')
+    appViewer.backend.setRendering(!hasAppStatus)
+  }
+
+  appViewer.inWorldRenderingConfig.foreground = activeModalStack.length === 0
+}
+subscribeKey(activeModalStack, 'length', modalStackUpdateChecks)
+modalStackUpdateChecks()
diff --git a/src/botUtils.ts b/src/botUtils.ts
index ac2deb02..5a6f92f7 100644
--- a/src/botUtils.ts
+++ b/src/botUtils.ts
@@ -1,4 +1,4 @@
-import { versionToNumber } from 'renderer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/common/utils'
 import * as nbt from 'prismarine-nbt'
 
 export const displayClientChat = (text: string) => {
diff --git a/src/cameraRotationControls.ts b/src/cameraRotationControls.ts
index 0c222dc6..8b21e53d 100644
--- a/src/cameraRotationControls.ts
+++ b/src/cameraRotationControls.ts
@@ -37,18 +37,19 @@ export const moveCameraRawHandler = ({ x, y }: { x: number; y: number }) => {
   const maxPitch = 0.5 * Math.PI
   const minPitch = -0.5 * Math.PI
 
-  viewer.world.lastCamUpdate = Date.now()
+  appViewer.lastCamUpdate = Date.now()
 
-  if (viewer.world.freeFlyMode) {
-    // Update freeFlyState directly
-    viewer.world.freeFlyState.yaw = (viewer.world.freeFlyState.yaw - x) % (2 * Math.PI)
-    viewer.world.freeFlyState.pitch = Math.max(minPitch, Math.min(maxPitch, viewer.world.freeFlyState.pitch - y))
-    return
-  }
+  // if (viewer.world.freeFlyMode) {
+  //   // Update freeFlyState directly
+  //   viewer.world.freeFlyState.yaw = (viewer.world.freeFlyState.yaw - x) % (2 * Math.PI)
+  //   viewer.world.freeFlyState.pitch = Math.max(minPitch, Math.min(maxPitch, viewer.world.freeFlyState.pitch - y))
+  //   return
+  // }
 
   if (!bot?.entity) return
   const pitch = bot.entity.pitch - y
   void bot.look(bot.entity.yaw - x, Math.max(minPitch, Math.min(maxPitch, pitch)), true)
+  appViewer.backend?.updateCamera(null, bot.entity.yaw, pitch)
 }
 
 window.addEventListener('mousemove', (e: MouseEvent) => {
@@ -76,7 +77,7 @@ function pointerLockChangeCallback () {
   if (notificationProxy.id === 'pointerlockchange') {
     hideNotification()
   }
-  if (viewer.renderer.xr.isPresenting) return // todo
+  if (appViewer.rendererState.preventEscapeMenu) return
   if (!pointerLock.hasPointerLock && activeModalStack.length === 0 && miscUiState.gameLoaded) {
     showModal({ reactType: 'pause-screen' })
   }
diff --git a/src/chatUtils.ts b/src/chatUtils.ts
index 27ff2bf9..5143c10f 100644
--- a/src/chatUtils.ts
+++ b/src/chatUtils.ts
@@ -2,7 +2,7 @@
 
 import { fromFormattedString, TextComponent } from '@xmcl/text-component'
 import type { IndexedData } from 'minecraft-data'
-import { versionToNumber } from 'renderer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/common/utils'
 
 export type MessageFormatPart = Pick<TextComponent, 'hoverEvent' | 'clickEvent'> & {
   text: string
diff --git a/src/connect.ts b/src/connect.ts
index 278c2925..5afdb0f6 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -4,7 +4,6 @@ import MinecraftData from 'minecraft-data'
 import PrismarineBlock from 'prismarine-block'
 import PrismarineItem from 'prismarine-item'
 import pathfinder from 'mineflayer-pathfinder'
-import { importLargeData } from '../generated/large-data-aliases'
 import { miscUiState } from './globalState'
 import supportedVersions from './supportedVersions.mjs'
 import { options } from './optionsStorage'
@@ -44,7 +43,7 @@ export const getVersionAutoSelect = (autoVersionSelect = options.serversAutoVers
   return autoVersionSelect
 }
 
-export const loadMinecraftData = async (version: string, importBlockstatesModels = false) => {
+export const loadMinecraftData = async (version: string) => {
   await window._LOAD_MC_DATA()
   // setLoadingScreenStatus(`Loading data for ${version}`)
   // // todo expose cache
@@ -58,12 +57,9 @@ export const loadMinecraftData = async (version: string, importBlockstatesModels
   window.PrismarineBlock = PrismarineBlock(mcData.version.minecraftVersion!)
   window.PrismarineItem = PrismarineItem(mcData.version.minecraftVersion!)
   window.loadedData = mcData
+  window.mcData = mcData
   window.pathfinder = pathfinder
   miscUiState.loadedDataVersion = version
-
-  if (importBlockstatesModels) {
-    viewer.world.blockstatesModels = await importLargeData('blockStatesModels')
-  }
 }
 
 export const downloadAllMinecraftData = async () => {
diff --git a/src/controls.ts b/src/controls.ts
index 98d32062..b91ae7ab 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -2,12 +2,10 @@
 
 import { Vec3 } from 'vec3'
 import { proxy, subscribe } from 'valtio'
-import * as THREE from 'three'
 
 import { ControMax } from 'contro-max/build/controMax'
 import { CommandEventArgument, SchemaCommandInput } from 'contro-max/build/types'
 import { stringStartsWith } from 'contro-max/build/stringUtils'
-import { UserOverrideCommand, UserOverridesConfig } from 'contro-max/build/types/store'
 import { GameMode } from 'mineflayer'
 import { isGameActive, showModal, gameAdditionalState, activeModalStack, hideCurrentModal, miscUiState, hideModal, hideAllModals } from './globalState'
 import { goFullscreen, isInRealGameSession, pointerLock, reloadChunks } from './utils'
@@ -133,21 +131,21 @@ contro.on('movementUpdate', ({ vector, soleVector, gamepadIndex }) => {
   miscUiState.usingGamepadInput = gamepadIndex !== undefined
   if (!bot || !isGameActive(false)) return
 
-  if (viewer.world.freeFlyMode) {
-    // Create movement vector from input
-    const direction = new THREE.Vector3(0, 0, 0)
-    if (vector.z !== undefined) direction.z = vector.z
-    if (vector.x !== undefined) direction.x = vector.x
+  // if (viewer.world.freeFlyMode) {
+  //   // Create movement vector from input
+  //   const direction = new THREE.Vector3(0, 0, 0)
+  //   if (vector.z !== undefined) direction.z = vector.z
+  //   if (vector.x !== undefined) direction.x = vector.x
 
-    // Apply camera rotation to movement direction
-    direction.applyQuaternion(viewer.camera.quaternion)
+  //   // Apply camera rotation to movement direction
+  //   direction.applyQuaternion(viewer.camera.quaternion)
 
-    // Update freeFlyState position with normalized direction
-    const moveSpeed = 1
-    direction.multiplyScalar(moveSpeed)
-    viewer.world.freeFlyState.position.add(new Vec3(direction.x, direction.y, direction.z))
-    return
-  }
+  //   // Update freeFlyState position with normalized direction
+  //   const moveSpeed = 1
+  //   direction.multiplyScalar(moveSpeed)
+  //   viewer.world.freeFlyState.position.add(new Vec3(direction.x, direction.y, direction.z))
+  //   return
+  // }
 
   // gamepadIndex will be used for splitscreen in future
   const coordToAction = [
@@ -355,20 +353,20 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
     // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
     switch (command) {
       case 'general.jump':
-        if (viewer.world.freeFlyMode) {
-          const moveSpeed = 0.5
-          viewer.world.freeFlyState.position.add(new Vec3(0, pressed ? moveSpeed : 0, 0))
-        } else {
-          bot.setControlState('jump', pressed)
-        }
+        // if (viewer.world.freeFlyMode) {
+        //   const moveSpeed = 0.5
+        //   viewer.world.freeFlyState.position.add(new Vec3(0, pressed ? moveSpeed : 0, 0))
+        // } else {
+        bot.setControlState('jump', pressed)
+        // }
         break
       case 'general.sneak':
-        if (viewer.world.freeFlyMode) {
-          const moveSpeed = 0.5
-          viewer.world.freeFlyState.position.add(new Vec3(0, pressed ? -moveSpeed : 0, 0))
-        } else {
-          setSneaking(pressed)
-        }
+        // if (viewer.world.freeFlyMode) {
+        //   const moveSpeed = 0.5
+        //   viewer.world.freeFlyState.position.add(new Vec3(0, pressed ? -moveSpeed : 0, 0))
+        // } else {
+        setSneaking(pressed)
+        // }
         break
       case 'general.sprint':
         // todo add setting to change behavior
@@ -592,12 +590,12 @@ export const f3Keybinds: Array<{
       for (const [x, z] of loadedChunks) {
         worldView!.unloadChunk({ x, z })
       }
-      for (const child of viewer.scene.children) {
-        if (child.name === 'chunk') { // should not happen
-          viewer.scene.remove(child)
-          console.warn('forcefully removed chunk from scene')
-        }
-      }
+      // for (const child of viewer.scene.children) {
+      //   if (child.name === 'chunk') { // should not happen
+      //     viewer.scene.remove(child)
+      //     console.warn('forcefully removed chunk from scene')
+      //   }
+      // }
       if (localServer) {
         //@ts-expect-error not sure why it is private... maybe revisit api?
         localServer.players[0].world.columns = {}
@@ -610,7 +608,6 @@ export const f3Keybinds: Array<{
     key: 'KeyG',
     action () {
       options.showChunkBorders = !options.showChunkBorders
-      viewer.world.updateShowChunksBorder(options.showChunkBorders)
     },
     mobileTitle: 'Toggle chunk borders',
   },
@@ -926,9 +923,16 @@ window.addEventListener('keydown', (e) => {
 
 // #region experimental debug things
 window.addEventListener('keydown', (e) => {
-  if (e.code === 'KeyL' && e.altKey) {
+  if (e.code === 'KeyL' && e.altKey && !e.shiftKey && !e.ctrlKey && !e.metaKey) {
     console.clear()
   }
+  if (e.code === 'KeyK' && e.altKey && !e.shiftKey && !e.ctrlKey && !e.metaKey) {
+    if (sessionStorage.delayLoadUntilFocus) {
+      sessionStorage.removeItem('delayLoadUntilFocus')
+    } else {
+      sessionStorage.setItem('delayLoadUntilFocus', 'true')
+    }
+  }
 })
 // #endregion
 
diff --git a/src/core/progressReporter.ts b/src/core/progressReporter.ts
index 6ef6044f..f4e4e701 100644
--- a/src/core/progressReporter.ts
+++ b/src/core/progressReporter.ts
@@ -181,13 +181,13 @@ export const createNotificationProgressReporter = (endMessage?: string): Progres
   })
 }
 
-export const createConsoleLogProgressReporter = (): ProgressReporter => {
+export const createConsoleLogProgressReporter = (group?: string): ProgressReporter => {
   return createProgressReporter({
     setMessage (message: string) {
-      console.log(message)
+      console.log(group ? `[${group}] ${message}` : message)
     },
     end () {
-      console.log('done')
+      console.log(group ? `[${group}] done` : 'done')
     },
 
     error (message: string): void {
@@ -217,3 +217,14 @@ export const createWrappedProgressReporter = (reporter: ProgressReporter, messag
     }
   })
 }
+
+export const createNullProgressReporter = (): ProgressReporter => {
+  return createProgressReporter({
+    setMessage (message: string) {
+    },
+    end () {
+    },
+    error (message: string) {
+    }
+  })
+}
diff --git a/src/customChannels.ts b/src/customChannels.ts
index ede62876..fabe71ec 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -1,21 +1,35 @@
-import { Vec3 } from 'vec3'
 import PItem from 'prismarine-item'
-import * as THREE from 'three'
-import { WorldRendererThree } from '../renderer/viewer/lib/worldrendererThree'
+import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import { options } from './optionsStorage'
 import { jeiCustomCategories } from './inventoryWindows'
 
-customEvents.on('mineflayerBotCreated', async () => {
-  if (!options.customChannels) return
-  await new Promise(resolve => {
-    bot.once('login', () => {
-      resolve(true)
+export default () => {
+  customEvents.on('mineflayerBotCreated', async () => {
+    if (!options.customChannels) return
+    await new Promise(resolve => {
+      bot.once('login', () => {
+        resolve(true)
+      })
     })
+    registerBlockModelsChannel()
+    registerMediaChannels()
+    registeredJeiChannel()
   })
-  registerBlockModelsChannel()
-  registerMediaChannels()
-  registeredJeiChannel()
-})
+}
+
+const registerChannel = (channelName: string, packetStructure: any[], handler: (data: any) => void, waitForWorld = true) => {
+  bot._client.registerChannel(channelName, packetStructure, true)
+  bot._client.on(channelName as any, async (data) => {
+    if (waitForWorld) {
+      await appViewer.worldReady
+      handler(data)
+    } else {
+      handler(data)
+    }
+  })
+
+  console.debug(`registered custom channel ${channelName} channel`)
+}
 
 const registerBlockModelsChannel = () => {
   const CHANNEL_NAME = 'minecraft-web-client:blockmodels'
@@ -46,9 +60,7 @@ const registerBlockModelsChannel = () => {
     ]
   ]
 
-  bot._client.registerChannel(CHANNEL_NAME, packetStructure, true)
-
-  bot._client.on(CHANNEL_NAME as any, (data) => {
+  registerChannel(CHANNEL_NAME, packetStructure, (data) => {
     const { worldName, x, y, z, model } = data
 
     const chunkX = Math.floor(x / 16) * 16
@@ -56,31 +68,8 @@ const registerBlockModelsChannel = () => {
     const chunkKey = `${chunkX},${chunkZ}`
     const blockPosKey = `${x},${y},${z}`
 
-    const chunkModels = viewer.world.protocolCustomBlocks.get(chunkKey) || {}
-
-    if (model) {
-      chunkModels[blockPosKey] = model
-    } else {
-      delete chunkModels[blockPosKey]
-    }
-
-    if (Object.keys(chunkModels).length > 0) {
-      viewer.world.protocolCustomBlocks.set(chunkKey, chunkModels)
-    } else {
-      viewer.world.protocolCustomBlocks.delete(chunkKey)
-    }
-
-    // Trigger update
-    if (worldView) {
-      const block = worldView.world.getBlock(new Vec3(x, y, z))
-      if (block) {
-        worldView.world.setBlockStateId(new Vec3(x, y, z), block.stateId)
-      }
-    }
-
-  })
-
-  console.debug(`registered custom channel ${CHANNEL_NAME} channel`)
+    getThreeJsRendererMethods()?.updateCustomBlock(chunkKey, blockPosKey, model)
+  }, true)
 }
 
 const registeredJeiChannel = () => {
@@ -155,7 +144,7 @@ const registerMediaChannels = () => {
       { name: 'rotation', type: 'i16' }, // 0: 0° - towards positive z, 1: 90° - positive x, 2: 180° - negative z, 3: 270° - negative x (3-6 is same but double side)
       { name: 'source', type: ['pstring', { countType: 'i16' }] },
       { name: 'loop', type: 'bool' },
-      { name: '_volume', type: 'f32' }, // 0
+      { name: 'volume', type: 'f32' }, // 0
       { name: '_aspectRatioMode', type: 'i16' }, // 0
       { name: '_background', type: 'i16' }, // 0
       { name: '_opacity', type: 'i16' }, // 1
@@ -199,16 +188,11 @@ const registerMediaChannels = () => {
   bot._client.registerChannel(DESTROY_CHANNEL, noDataPacketStructure, true)
 
   // Handle media add
-  bot._client.on(ADD_CHANNEL as any, (data) => {
-    const { id, x, y, z, width, height, rotation, source, loop, background, opacity } = data
-
-    const worldRenderer = viewer.world as WorldRendererThree
-
-    // Destroy existing video if it exists
-    worldRenderer.destroyMedia(id)
+  registerChannel(ADD_CHANNEL, addPacketStructure, (data) => {
+    const { id, x, y, z, width, height, rotation, source, loop, volume, background, opacity } = data
 
     // Add new video
-    worldRenderer.addMedia(id, {
+    getThreeJsRendererMethods()?.addMedia(id, {
       position: { x, y, z },
       size: { width, height },
       // side: 'towards',
@@ -217,59 +201,47 @@ const registerMediaChannels = () => {
       doubleSide: false,
       background,
       opacity: opacity / 100,
-      allowOrigins: options.remoteContentNotSameOrigin === false ? [getCurrentTopDomain()] : options.remoteContentNotSameOrigin
+      allowOrigins: options.remoteContentNotSameOrigin === false ? [getCurrentTopDomain()] : options.remoteContentNotSameOrigin,
+      loop,
+      volume
     })
-
-    // Set loop state
-    if (!loop) {
-      const videoData = worldRenderer.customMedia.get(id)
-      if (videoData?.video) {
-        videoData.video.loop = false
-      }
-    }
   })
 
   // Handle media play
-  bot._client.on(PLAY_CHANNEL as any, (data) => {
+  registerChannel(PLAY_CHANNEL, noDataPacketStructure, (data) => {
     const { id } = data
-    const worldRenderer = viewer.world as WorldRendererThree
-    worldRenderer.setVideoPlaying(id, true)
-  })
+    getThreeJsRendererMethods()?.setVideoPlaying(id, true)
+  }, true)
 
   // Handle media pause
-  bot._client.on(PAUSE_CHANNEL as any, (data) => {
+  registerChannel(PAUSE_CHANNEL, noDataPacketStructure, (data) => {
     const { id } = data
-    const worldRenderer = viewer.world as WorldRendererThree
-    worldRenderer.setVideoPlaying(id, false)
-  })
+    getThreeJsRendererMethods()?.setVideoPlaying(id, false)
+  }, true)
 
   // Handle media seek
-  bot._client.on(SEEK_CHANNEL as any, (data) => {
+  registerChannel(SEEK_CHANNEL, setNumberPacketStructure, (data) => {
     const { id, seconds } = data
-    const worldRenderer = viewer.world as WorldRendererThree
-    worldRenderer.setVideoSeeking(id, seconds)
-  })
+    getThreeJsRendererMethods()?.setVideoSeeking(id, seconds)
+  }, true)
 
   // Handle media destroy
-  bot._client.on(DESTROY_CHANNEL as any, (data) => {
+  registerChannel(DESTROY_CHANNEL, noDataPacketStructure, (data) => {
     const { id } = data
-    const worldRenderer = viewer.world as WorldRendererThree
-    worldRenderer.destroyMedia(id)
-  })
+    getThreeJsRendererMethods()?.destroyMedia(id)
+  }, true)
 
   // Handle media volume
-  bot._client.on(VOLUME_CHANNEL as any, (data) => {
+  registerChannel(VOLUME_CHANNEL, setNumberPacketStructure, (data) => {
     const { id, volume } = data
-    const worldRenderer = viewer.world as WorldRendererThree
-    worldRenderer.setVideoVolume(id, volume)
-  })
+    getThreeJsRendererMethods()?.setVideoVolume(id, volume)
+  }, true)
 
   // Handle media speed
-  bot._client.on(SPEED_CHANNEL as any, (data) => {
+  registerChannel(SPEED_CHANNEL, setNumberPacketStructure, (data) => {
     const { id, speed } = data
-    const worldRenderer = viewer.world as WorldRendererThree
-    worldRenderer.setVideoSpeed(id, speed)
-  })
+    getThreeJsRendererMethods()?.setVideoSpeed(id, speed)
+  }, true)
 
   // ---
 
@@ -296,37 +268,9 @@ export const sendVideoInteraction = (id: string, x: number, y: number, isRightCl
 }
 
 export const videoCursorInteraction = () => {
-  const worldRenderer = viewer.world as WorldRendererThree
-  const { camera } = worldRenderer
-  const raycaster = new THREE.Raycaster()
-
-  // Get mouse position at center of screen
-  const mouse = new THREE.Vector2(0, 0)
-
-  // Update the raycaster
-  raycaster.setFromCamera(mouse, camera)
-
-  // Check intersection with all video meshes
-  for (const [id, videoData] of worldRenderer.customMedia.entries()) {
-    // Get the actual mesh (first child of the group)
-    const mesh = videoData.mesh.children[0] as THREE.Mesh
-    if (!mesh) continue
-
-    const intersects = raycaster.intersectObject(mesh, false)
-    if (intersects.length > 0) {
-      const intersection = intersects[0]
-      const { uv } = intersection
-      if (!uv) return null
-
-      return {
-        id,
-        x: uv.x,
-        y: uv.y
-      }
-    }
-  }
-
-  return null
+  const { intersectMedia } = appViewer.rendererState.world
+  if (!intersectMedia) return null
+  return intersectMedia
 }
 window.videoCursorInteraction = videoCursorInteraction
 
@@ -335,10 +279,8 @@ const addTestVideo = (rotation = 0 as 0 | 1 | 2 | 3, scale = 1, isImage = false)
   if (!block) return
   const { position: startPosition } = block
 
-  const worldRenderer = viewer.world as WorldRendererThree
-
   // Add video with proper positioning
-  worldRenderer.addMedia('test-video', {
+  getThreeJsRendererMethods()?.addMedia('test-video', {
     position: {
       x: startPosition.x,
       y: startPosition.y + 1,
diff --git a/src/dayCycle.ts b/src/dayCycle.ts
index f092c465..50e63a21 100644
--- a/src/dayCycle.ts
+++ b/src/dayCycle.ts
@@ -4,7 +4,6 @@ import { updateBackground } from './water'
 
 export default () => {
   const timeUpdated = () => {
-    assertDefined(viewer)
     // 0 morning
     const dayTotal = 24_000
     const evening = 11_500
@@ -37,8 +36,8 @@ export default () => {
     const colorInt = Math.max(int, 0.1)
     updateBackground({ r: dayColor.r * colorInt, g: dayColor.g * colorInt, b: dayColor.b * colorInt })
     if (!options.newVersionsLighting && bot.supportFeature('blockStateId')) {
-      viewer.ambientLight.intensity = Math.max(int, 0.25)
-      viewer.directionalLight.intensity = Math.min(int, 0.5)
+      appViewer.playerState.reactive.ambientLight = Math.max(int, 0.25)
+      appViewer.playerState.reactive.directionalLight = Math.min(int, 0.5)
     }
   }
 
diff --git a/src/devtools.ts b/src/devtools.ts
index daaf1a35..ff944dfb 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -21,7 +21,7 @@ window.inspectPlayer = () => require('fs').promises.readFile('/world/playerdata/
 
 Object.defineProperty(window, 'debugSceneChunks', {
   get () {
-    return (viewer.world as WorldRendererThree).getLoadedChunksRelative?.(bot.entity.position, true)
+    return (window.world as WorldRendererThree)?.getLoadedChunksRelative?.(bot.entity.position, true)
   },
 })
 
@@ -149,7 +149,7 @@ Object.defineProperty(window, 'debugToggle', {
 })
 
 customEvents.on('gameLoaded', () => {
-  window.holdingBlock = (viewer.world as WorldRendererThree).holdingBlock
+  window.holdingBlock = (window.world as WorldRendererThree).holdingBlock
 })
 
 window.clearStorage = (...keysToKeep: string[]) => {
@@ -161,3 +161,50 @@ window.clearStorage = (...keysToKeep: string[]) => {
   }
   return `Cleared ${localStorage.length - keysToKeep.length} items from localStorage. Kept: ${keysToKeep.join(', ')}`
 }
+
+
+// PERF DEBUG
+
+// for advanced debugging, use with watch expression
+
+window.statsPerSecAvg = {}
+let currentStatsPerSec = {} as Record<string, number[]>
+const waitingStatsPerSec = {}
+window.markStart = (label) => {
+  waitingStatsPerSec[label] ??= []
+  waitingStatsPerSec[label][0] = performance.now()
+}
+window.markEnd = (label) => {
+  if (!waitingStatsPerSec[label]?.[0]) return
+  currentStatsPerSec[label] ??= []
+  currentStatsPerSec[label].push(performance.now() - waitingStatsPerSec[label][0])
+  delete waitingStatsPerSec[label]
+}
+const updateStatsPerSecAvg = () => {
+  window.statsPerSecAvg = Object.fromEntries(Object.entries(currentStatsPerSec).map(([key, value]) => {
+    return [key, {
+      avg: value.reduce((a, b) => a + b, 0) / value.length,
+      count: value.length
+    }]
+  }))
+  currentStatsPerSec = {}
+}
+
+
+window.statsPerSec = {}
+let statsPerSecCurrent = {}
+let lastReset = performance.now()
+window.addStatPerSec = (name) => {
+  statsPerSecCurrent[name] ??= 0
+  statsPerSecCurrent[name]++
+}
+window.statsPerSecCurrent = statsPerSecCurrent
+setInterval(() => {
+  window.statsPerSec = { duration: Math.floor(performance.now() - lastReset), ...statsPerSecCurrent, }
+  statsPerSecCurrent = {}
+  window.statsPerSecCurrent = statsPerSecCurrent
+  updateStatsPerSecAvg()
+  lastReset = performance.now()
+}, 1000)
+
+// ---
diff --git a/src/entities.ts b/src/entities.ts
index 774ce32e..9ba31f2e 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -1,8 +1,9 @@
 import { Entity } from 'prismarine-entity'
-import { versionToNumber } from 'renderer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/common/utils'
 import tracker from '@nxg-org/mineflayer-tracker'
 import { loader as autoJumpPlugin } from '@nxg-org/mineflayer-auto-jump'
 import { subscribeKey } from 'valtio/utils'
+import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import { options, watchValue } from './optionsStorage'
 import { miscUiState } from './globalState'
 
@@ -40,23 +41,13 @@ customEvents.on('gameLoaded', () => {
   bot.loadPlugin(autoJumpPlugin)
   updateAutoJump()
 
-  // todo cleanup (move to viewer, also shouldnt be used at all)
   const playerPerAnimation = {} as Record<string, string>
   const entityData = (e: Entity) => {
     if (!e.username) return
     window.debugEntityMetadata ??= {}
     window.debugEntityMetadata[e.username] = e
-    // todo entity spawn timing issue, check perf
-    const playerObject = viewer.entities.entities[e.id]?.playerObject
-    if (playerObject) {
-      // todo throttle!
+    if (e.type === 'player') {
       bot.tracker.trackEntity(e)
-      playerObject.backEquipment = e.equipment.some((item) => item?.name === 'elytra') ? 'elytra' : 'cape'
-      if (playerObject.cape.map === null) {
-        playerObject.cape.visible = false
-      }
-      // todo (easy, important) elytra flying animation
-      // todo cleanup states
     }
   }
 
@@ -76,57 +67,34 @@ customEvents.on('gameLoaded', () => {
       const isSprinting = Math.abs(speed.x) > SPRINTING_SPEED || Math.abs(speed.z) > SPRINTING_SPEED
       const newAnimation = isWalking ? (isSprinting ? 'running' : 'walking') : 'idle'
       if (newAnimation !== playerPerAnimation[id]) {
-        viewer.entities.playAnimation(e.id, newAnimation)
+        getThreeJsRendererMethods()?.playEntityAnimation(e.id, newAnimation)
         playerPerAnimation[id] = newAnimation
       }
     }
   })
 
   bot.on('entitySwingArm', (e) => {
-    if (viewer.entities.entities[e.id]?.playerObject) {
-      viewer.entities.playAnimation(e.id, 'oneSwing')
-    }
+    getThreeJsRendererMethods()?.playEntityAnimation(e.id, 'oneSwing')
   })
 
   bot._client.on('damage_event', (data) => {
     const { entityId, sourceTypeId: damage } = data
-    if (viewer.entities.entities[entityId]) {
-      viewer.entities.handleDamageEvent(entityId, damage)
-    }
+    getThreeJsRendererMethods()?.damageEntity(entityId, damage)
   })
 
   bot._client.on('entity_status', (data) => {
     if (versionToNumber(bot.version) >= versionToNumber('1.19.4')) return
     const { entityId, entityStatus } = data
-    if (entityStatus === 2 && viewer.entities.entities[entityId]) {
-      viewer.entities.handleDamageEvent(entityId, entityStatus)
+    if (entityStatus === 2) {
+      getThreeJsRendererMethods()?.damageEntity(entityId, entityStatus)
     }
   })
 
-  const loadedSkinEntityIds = new Set<number>()
-
-  const playerRenderSkin = (e: Entity) => {
-    const mesh = viewer.entities.entities[e.id]
-    if (!mesh) return
-    if (!mesh.playerObject || !options.loadPlayerSkins) return
-    const MAX_DISTANCE_SKIN_LOAD = 128
-    const distance = e.position.distanceTo(bot.entity.position)
-    if (distance < MAX_DISTANCE_SKIN_LOAD && distance < (bot.settings.viewDistance as number) * 16) {
-      if (viewer.entities.entities[e.id]) {
-        if (loadedSkinEntityIds.has(e.id)) return
-        loadedSkinEntityIds.add(e.id)
-        viewer.entities.updatePlayerSkin(e.id, e.username, e.uuid, true, true)
-      }
-    }
-  }
-  viewer.entities.addListener('remove', (e) => {
-    loadedSkinEntityIds.delete(e.id)
-    playerPerAnimation[e.id] = ''
-    bot.tracker.stopTrackingEntity(e, true)
+  bot.on('entityGone', (entity) => {
+    bot.tracker.stopTrackingEntity(entity, true)
   })
 
   bot.on('entityMoved', (e) => {
-    playerRenderSkin(e)
     entityData(e)
   })
   bot._client.on('entity_velocity', (packet) => {
@@ -135,11 +103,6 @@ customEvents.on('gameLoaded', () => {
     entityData(e)
   })
 
-  viewer.entities.addListener('add', (e) => {
-    if (!viewer.entities.entities[e.id]) throw new Error('mesh still not loaded')
-    playerRenderSkin(e)
-  })
-
   for (const entity of Object.values(bot.entities)) {
     if (entity !== bot.entity) {
       entityData(entity)
@@ -150,10 +113,6 @@ customEvents.on('gameLoaded', () => {
   bot.on('entityUpdate', entityData)
   bot.on('entityEquip', entityData)
 
-  watchValue(options, o => {
-    viewer.entities.setDebugMode(o.showChunkBorders ? 'basic' : 'none')
-  })
-
   // Texture override from packet properties
   bot._client.on('player_info', (packet) => {
     for (const playerEntry of packet.data) {
@@ -177,7 +136,7 @@ customEvents.on('gameLoaded', () => {
             }
           }
           // even if not found, still record to cache
-          viewer.entities.updatePlayerSkin(entityId, playerEntry.player?.name, playerEntry.uuid, skinUrl, capeUrl)
+          getThreeJsRendererMethods()?.updatePlayerSkin(entityId, playerEntry.player?.name, playerEntry.uuid, skinUrl, capeUrl)
         } catch (err) {
           console.error('Error decoding player texture:', err)
         }
diff --git a/src/globals.d.ts b/src/globals.d.ts
index 1dfb0255..2a854f16 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -11,7 +11,7 @@ declare const bot: Omit<import('mineflayer').Bot, 'world' | '_client'> & {
   }
 }
 declare const __type_bot: typeof bot
-declare const viewer: import('renderer/viewer/lib/viewer').Viewer
+declare const appViewer: import('./appViewer').AppViewer
 declare const worldView: import('renderer/viewer/lib/worldDataEmitter').WorldDataEmitter | undefined
 declare const addStatPerSec: (name: string) => void
 declare const localServer: import('flying-squid/dist/index').FullServer & { options } | undefined
diff --git a/src/index.ts b/src/index.ts
index 45593447..f11cee11 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -14,17 +14,15 @@ import './mineflayer/java-tester/index'
 import './external'
 import './appConfig'
 import { getServerInfo } from './mineflayer/mc-protocol'
-import { onGameLoad, renderSlot } from './inventoryWindows'
-import { GeneralInputItem, RenderItem } from './mineflayer/items'
+import { onGameLoad } from './inventoryWindows'
 import initCollisionShapes from './getCollisionInteractionShapes'
 import protocolMicrosoftAuth from 'minecraft-protocol/src/client/microsoftAuth'
 import microsoftAuthflow from './microsoftAuthflow'
 import { Duplex } from 'stream'
 
 import './scaleInterface'
-import { initWithRenderer } from './topRightStats'
 
-import { options, watchValue } from './optionsStorage'
+import { options } from './optionsStorage'
 import './reactUi'
 import { lockUrl, onBotCreate } from './controls'
 import './dragndrop'
@@ -35,16 +33,11 @@ import downloadAndOpenFile from './downloadAndOpenFile'
 import fs from 'fs'
 import net from 'net'
 import mineflayer from 'mineflayer'
-import { WorldDataEmitter, Viewer } from 'renderer/viewer'
-import pathfinder from 'mineflayer-pathfinder'
 
-import * as THREE from 'three'
-import MinecraftData from 'minecraft-data'
 import debug from 'debug'
 import { defaultsDeep } from 'lodash-es'
 import initializePacketsReplay from './packetsReplay/packetsReplayLegacy'
 
-import { initVR } from './vr'
 import {
   activeModalStack,
   activeModalStacks,
@@ -60,11 +53,6 @@ import { parseServerAddress } from './parseServerAddress'
 import { setLoadingScreenStatus } from './appStatus'
 import { isCypress } from './standaloneUtils'
 
-import {
-  removePanorama
-} from './panorama'
-import { getItemDefinition } from 'mc-assets/dist/itemDefinitions'
-
 import { startLocalServer, unsupportedLocalServerFeatures } from './createLocalServer'
 import defaultServerOptions from './defaultLocalServerOptions'
 import dayCycle from './dayCycle'
@@ -79,42 +67,37 @@ import { fsState } from './loadSave'
 import { watchFov } from './rendererUtils'
 import { loadInMemorySave } from './react/SingleplayerProvider'
 
-import { ua } from './react/utils'
 import { possiblyHandleStateVariable } from './googledrive'
 import flyingSquidEvents from './flyingSquidEvents'
-import { hideNotification, notificationProxy, showNotification } from './react/NotificationProvider'
+import { showNotification } from './react/NotificationProvider'
 import { saveToBrowserMemory } from './react/PauseScreen'
-import { ViewerWrapper } from 'renderer/viewer/lib/viewerWrapper'
 import './devReload'
 import './water'
 import { ConnectOptions, loadMinecraftData, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData } from './connect'
 import { ref, subscribe } from 'valtio'
 import { signInMessageState } from './react/SignInMessageProvider'
 import { updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/serversStorage'
-import { versionToNumber } from 'renderer/viewer/prepare/utils'
 import packetsPatcher from './mineflayer/plugins/packetsPatcher'
 import { mainMenuState } from './react/MainMenuRenderApp'
-import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
 import { getViewerVersionData, getWsProtocolStream, handleCustomChannel } from './viewerConnector'
 import { getWebsocketStream } from './mineflayer/websocket-core'
 import { appQueryParams, appQueryParamsArray } from './appParams'
-import { playerState, PlayerStateManager } from './mineflayer/playerState'
+import { playerState } from './mineflayer/playerState'
 import { states } from 'minecraft-protocol'
 import { initMotionTracking } from './react/uiMotion'
 import { UserError } from './mineflayer/userError'
 import ping from './mineflayer/plugins/ping'
 import mouse from './mineflayer/plugins/mouse'
-import { LocalServer } from './customServer'
 import { startLocalReplayServer } from './packetsReplay/replayPackets'
 import { localRelayServerPlugin } from './mineflayer/plugins/packetsRecording'
-import { createFullScreenProgressReporter } from './core/progressReporter'
-import { getItemModelName } from './resourcesManager'
-import { importLargeData } from '../generated/large-data-aliases'
+import { createConsoleLogProgressReporter, createFullScreenProgressReporter, ProgressReporter } from './core/progressReporter'
+import { appViewer } from './appViewer'
+import createGraphicsBackend from 'renderer/viewer/three/graphicsBackend'
+import { subscribeKey } from 'valtio/utils'
 
 window.debug = debug
-window.THREE = THREE
 window.beforeRenderFrame = []
 
 // ACTUAL CODE
@@ -128,105 +111,30 @@ initializePacketsReplay()
 packetsPatcher()
 onAppLoad()
 
-// Create three.js context, add to page
-let renderer: THREE.WebGLRenderer
-try {
-  renderer = new THREE.WebGLRenderer({
-    powerPreference: options.gpuPreference,
-    preserveDrawingBuffer: true,
-    logarithmicDepthBuffer: true,
-  })
-} catch (err) {
-  console.error(err)
-  throw new Error(`Failed to create WebGL context, not possible to render (restart browser): ${err.message}`)
-}
-
-// renderer.localClippingEnabled = true
-initWithRenderer(renderer.domElement)
-const renderWrapper = new ViewerWrapper(renderer.domElement, renderer)
-renderWrapper.addToPage()
-watchValue(options, (o) => {
-  renderWrapper.renderInterval = o.frameLimit ? 1000 / o.frameLimit : 0
-  renderWrapper.renderIntervalUnfocused = o.backgroundRendering === '5fps' ? 1000 / 5 : o.backgroundRendering === '20fps' ? 1000 / 20 : undefined
-})
-
-const isFirefox = ua.getBrowser().name === 'Firefox'
-if (isFirefox) {
-  // set custom property
-  document.body.style.setProperty('--thin-if-firefox', 'thin')
-}
-
-const isIphone = ua.getDevice().model === 'iPhone' // todo ipad?
-
-if (isIphone) {
-  document.documentElement.style.setProperty('--hud-bottom-max', '21px') // env-safe-aria-inset-bottom
-}
-
 if (appQueryParams.testCrashApp === '2') throw new Error('test')
 
-// Create viewer
-const viewer: import('renderer/viewer/lib/viewer').Viewer = new Viewer(renderer, undefined, playerState)
-window.viewer = viewer
-Object.defineProperty(window, 'world', {
-  get () {
-    return viewer.world
-  },
-})
-// todo unify
-viewer.entities.getItemUv = (item, specificProps) => {
-  const idOrName = item.itemId ?? item.blockId ?? item.name
-  try {
-    const name = typeof idOrName === 'number' ? loadedData.items[idOrName]?.name : idOrName
-    if (!name) throw new Error(`Item not found: ${idOrName}`)
-
-    const model = getItemModelName({
-      ...item,
-      name,
-    } as GeneralInputItem, specificProps)
-
-    const renderInfo = renderSlot({
-      modelName: model,
-    }, false, true)
-
-    if (!renderInfo) throw new Error(`Failed to get render info for item ${name}`)
-
-    const textureThree = renderInfo.texture === 'blocks' ? viewer.world.material.map! : viewer.entities.itemsTexture!
-    const img = textureThree.image
-
-    if (renderInfo.blockData) {
-      return {
-        resolvedModel: renderInfo.blockData.resolvedModel,
-        modelName: renderInfo.modelName!
-      }
+const loadBackend = () => {
+  appViewer.loadBackend(createGraphicsBackend)
+}
+window.loadBackend = loadBackend
+if (process.env.SINGLE_FILE_BUILD_MODE) {
+  const unsub = subscribeKey(miscUiState, 'fsReady', () => {
+    if (miscUiState.fsReady) {
+      // don't do it earlier to load fs and display menu faster
+      loadBackend()
+      unsub()
     }
-    if (renderInfo.slice) {
-      // Get slice coordinates from either block or item texture
-      const [x, y, w, h] = renderInfo.slice
-      const [u, v, su, sv] = [x / img.width, y / img.height, (w / img.width), (h / img.height)]
-      return {
-        u, v, su, sv,
-        texture: textureThree,
-        modelName: renderInfo.modelName
-      }
-    }
-
-    throw new Error(`Invalid render info for item ${name}`)
-  } catch (err) {
-    reportError?.(err)
-    // Return default UV coordinates for missing texture
-    return {
-      u: 0,
-      v: 0,
-      su: 16 / viewer.world.material.map!.image.width,
-      sv: 16 / viewer.world.material.map!.image.width,
-      texture: viewer.world.material.map!
-    }
-  }
+  })
+} else {
+  loadBackend()
 }
 
-viewer.entities.entitiesOptions = {
-  fontFamily: 'mojangles'
+const animLoop = () => {
+  for (const fn of beforeRenderFrame) fn()
+  requestAnimationFrame(animLoop)
 }
+requestAnimationFrame(animLoop)
+
 watchOptionsAfterViewerInit()
 
 function hideCurrentScreens () {
@@ -252,30 +160,21 @@ function listenGlobalEvents () {
   })
 }
 
-let listeners = [] as Array<{ target, event, callback }>
-let cleanupFunctions = [] as Array<() => void>
-// only for dom listeners (no removeAllListeners)
-// todo refactor them out of connect fn instead
-const registerListener: import('./utilsTs').RegisterListener = (target, event, callback) => {
-  target.addEventListener(event, callback)
-  listeners.push({ target, event, callback })
-}
-const removeAllListeners = () => {
-  for (const { target, event, callback } of listeners) {
-    target.removeEventListener(event, callback)
-  }
-  for (const cleanupFunction of cleanupFunctions) {
-    cleanupFunction()
-  }
-  cleanupFunctions = []
-  listeners = []
-}
-
 export async function connect (connectOptions: ConnectOptions) {
   if (miscUiState.gameLoaded) return
+
+  if (sessionStorage.delayLoadUntilFocus) {
+    await new Promise(resolve => {
+      if (document.hasFocus()) {
+        resolve(undefined)
+      } else {
+        window.addEventListener('focus', resolve)
+      }
+    })
+  }
+
   miscUiState.hasErrors = false
   lastConnectOptions.value = connectOptions
-  removePanorama()
 
   const { singleplayer } = connectOptions
   const p2pMultiplayer = !!connectOptions.peerId
@@ -318,12 +217,11 @@ export async function connect (connectOptions: ConnectOptions) {
   const destroyAll = () => {
     if (ended) return
     ended = true
-    viewer.resetAll()
     progress.end()
+    // dont reset viewer so we can still do debugging
     localServer = window.localServer = window.server = undefined
     gameAdditionalState.viewerConnection = false
 
-    renderWrapper.postRender = () => { }
     if (bot) {
       bot.end()
       // ensure mineflayer plugins receive this event for cleanup
@@ -337,7 +235,6 @@ export async function connect (connectOptions: ConnectOptions) {
     }
     resetStateAfterDisconnect()
     cleanFs()
-    removeAllListeners()
   }
   const cleanFs = () => {
     if (singleplayer && !fsState.inMemorySave) {
@@ -411,13 +308,20 @@ export async function connect (connectOptions: ConnectOptions) {
     const downloadMcData = async (version: string) => {
       if (dataDownloaded) return
       dataDownloaded = true
+      appViewer.resourcesManager.currentConfig = { version, texturesVersion: options.useVersionsTextures || undefined }
+
+      await progress.executeWithMessage(
+        'Loading minecraft data',
+        async () => {
+          await appViewer.resourcesManager.loadSourceData(version)
+        }
+      )
 
       await progress.executeWithMessage(
         'Applying user-installed resource pack',
         async () => {
-          await loadMinecraftData(version)
           try {
-            await resourcepackReload(version)
+            await resourcepackReload(true)
           } catch (err) {
             console.error(err)
             const doContinue = confirm('Failed to apply texture pack. See errors in the console. Continue?')
@@ -429,11 +333,9 @@ export async function connect (connectOptions: ConnectOptions) {
       )
 
       await progress.executeWithMessage(
-        'Loading minecraft models',
+        'Preparing textures',
         async () => {
-          viewer.world.blockstatesModels = await importLargeData('blockStatesModels')
-          void viewer.setVersion(version, options.useVersionsTextures === 'latest' ? version : options.useVersionsTextures)
-          miscUiState.loadedDataVersion = version
+          await appViewer.resourcesManager.updateAssetsData({})
         }
       )
     }
@@ -749,14 +651,26 @@ export async function connect (connectOptions: ConnectOptions) {
     setLoadingScreenStatus('Loading world')
   })
 
-  const start = Date.now()
+  const loadStart = Date.now()
   let worldWasReady = false
-  void viewer.world.renderUpdateEmitter.on('update', () => {
-    // todo might not emit as servers simply don't send chunk if it's empty
-    if (!viewer.world.allChunksFinished || worldWasReady) return
-    worldWasReady = true
-    console.log('All chunks done and ready! Time from renderer open to ready', (Date.now() - start) / 1000, 's')
-    viewer.render() // ensure the last state is rendered
+  const waitForChunksToLoad = async (progress?: ProgressReporter) => {
+    await new Promise<void>(resolve => {
+      const unsub = subscribe(appViewer.rendererState, () => {
+        if (worldWasReady) return
+        if (appViewer.rendererState.world.allChunksLoaded) {
+          worldWasReady = true
+          resolve()
+          unsub()
+        } else {
+          const perc = Math.round(appViewer.rendererState.world.chunksLoaded.length / appViewer.rendererState.world.chunksTotalNumber * 100)
+          progress?.reportProgress('chunks', perc / 100)
+        }
+      })
+    })
+  }
+
+  void waitForChunksToLoad().then(() => {
+    console.log('All chunks done and ready! Time from renderer connect to ready', (Date.now() - loadStart) / 1000, 's')
     document.dispatchEvent(new Event('cypress-world-ready'))
   })
 
@@ -778,7 +692,7 @@ export async function connect (connectOptions: ConnectOptions) {
     if (p2pConnectTimeout) clearTimeout(p2pConnectTimeout)
     playerState.onlineMode = !!connectOptions.authenticatedAccount
 
-    setLoadingScreenStatus('Placing blocks (starting viewer)')
+    progress.setMessage('Placing blocks (starting viewer)')
     if (!connectOptions.worldStateFileContents || connectOptions.worldStateFileContents.length < 3 * 1024 * 1024) {
       localStorage.lastConnectOptions = JSON.stringify(connectOptions)
       if (process.env.NODE_ENV === 'development' && !localStorage.lockUrl && !Object.keys(window.debugQueryParams).length) {
@@ -793,38 +707,25 @@ export async function connect (connectOptions: ConnectOptions) {
       bot.chat(`/login ${connectOptions.autoLoginPassword}`)
     }
 
+
     console.log('bot spawned - starting viewer')
+    appViewer.startWorld(bot.world, renderDistance)
+    appViewer.worldView!.listenToBot(bot)
 
-    const center = bot.entity.position
-
-    const worldView = window.worldView = new WorldDataEmitter(bot.world, renderDistance, center)
-    watchOptionsAfterWorldViewInit()
-
-    void initVR()
     initMotionTracking()
-
-    renderWrapper.postRender = () => {
-      viewer.setFirstPersonCamera(null, bot.entity.yaw, bot.entity.pitch)
-    }
-
-    // Link WorldDataEmitter and Viewer
-    viewer.connect(worldView)
-    worldView.listenToBot(bot)
-    void worldView.init(bot.entity.position)
-
     dayCycle()
 
     // Bot position callback
     function botPosition () {
-      viewer.world.lastCamUpdate = Date.now()
+      appViewer.lastCamUpdate = Date.now()
       // this might cause lag, but not sure
-      viewer.setFirstPersonCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch)
-      void worldView.updatePosition(bot.entity.position)
+      appViewer.backend?.updateCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch)
+      void appViewer.worldView?.updatePosition(bot.entity.position)
     }
     bot.on('move', botPosition)
     botPosition()
 
-    setLoadingScreenStatus('Setting callbacks')
+    progress.setMessage('Setting callbacks')
 
     onGameLoad(() => {})
 
@@ -833,7 +734,7 @@ export async function connect (connectOptions: ConnectOptions) {
     const waitForChunks = async () => {
       if (appQueryParams.sp === '1') return //todo
       const waitForChunks = options.waitForChunksRender === 'sp-only' ? !!singleplayer : options.waitForChunksRender
-      if (viewer.world.allChunksFinished || !waitForChunks) {
+      if (!appViewer.backend || appViewer.rendererState.world.allChunksLoaded || !waitForChunks) {
         return
       }
 
@@ -841,19 +742,7 @@ export async function connect (connectOptions: ConnectOptions) {
         'Loading chunks',
         'chunks',
         async () => {
-          await new Promise<void>(resolve => {
-            let wasFinished = false
-            void viewer.world.renderUpdateEmitter.on('update', () => {
-              if (wasFinished) return
-              if (viewer.world.allChunksFinished) {
-                wasFinished = true
-                resolve()
-              } else {
-                const perc = Math.round(Object.keys(viewer.world.finishedChunks).length / viewer.world.chunksLength * 100)
-                progress.reportProgress('chunks', perc / 100)
-              }
-            })
-          })
+          await waitForChunksToLoad(progress)
         }
       )
     }
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 303e91be..a6cd4a3e 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -6,7 +6,7 @@ import { RecipeItem } from 'minecraft-data'
 import { flat, fromFormattedString } from '@xmcl/text-component'
 import { splitEvery, equals } from 'rambda'
 import PItem, { Item } from 'prismarine-item'
-import { versionToNumber } from 'renderer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/common/utils'
 import { getRenamedData } from 'flying-squid/dist/blockRenames'
 import PrismarineChatLoader from 'prismarine-chat'
 import { BlockModel } from 'mc-assets'
@@ -20,8 +20,7 @@ import { displayClientChat } from './botUtils'
 import { currentScaling } from './scaleInterface'
 import { getItemDescription } from './itemsDescriptions'
 import { MessageFormatPart } from './chatUtils'
-import { GeneralInputItem, getItemMetadata, getItemNameRaw, RenderItem } from './mineflayer/items'
-import { getItemModelName } from './resourcesManager'
+import { GeneralInputItem, getItemMetadata, getItemModelName, getItemNameRaw, RenderItem } from './mineflayer/items'
 
 const loadedImagesCache = new Map<string, HTMLImageElement>()
 const cleanLoadedImagesCache = () => {
@@ -46,7 +45,7 @@ export const onGameLoad = (onLoad) => {
   version = bot.version
 
   const checkIfLoaded = () => {
-    if (!viewer.world.itemsAtlasParser) return
+    if (!appViewer.resourcesManager.currentResources?.itemsAtlasParser) return
     if (!allImagesLoadedState.value) {
       onLoad?.()
     }
@@ -55,7 +54,8 @@ export const onGameLoad = (onLoad) => {
       allImagesLoadedState.value = true
     }, 0)
   }
-  viewer.world.renderUpdateEmitter.on('textureDownloaded', checkIfLoaded)
+  appViewer.resourcesManager.on('assetsTexturesUpdated', checkIfLoaded)
+  appViewer.resourcesManager.on('assetsInventoryReady', checkIfLoaded)
   checkIfLoaded()
 
   PrismarineItem = PItem(version)
@@ -137,11 +137,10 @@ export const onGameLoad = (onLoad) => {
 }
 
 const getImageSrc = (path): string | HTMLImageElement => {
-  assertDefined(viewer)
   switch (path) {
     case 'gui/container/inventory': return appReplacableResources.latest_gui_container_inventory.content
-    case 'blocks': return viewer.world.blocksAtlasParser!.latestImage
-    case 'items': return viewer.world.itemsAtlasParser!.latestImage
+    case 'blocks': return appViewer.resourcesManager.currentResources!.blocksAtlasParser.latestImage
+    case 'items': return appViewer.resourcesManager.currentResources!.itemsAtlasParser.latestImage
     case 'gui/container/dispenser': return appReplacableResources.latest_gui_container_dispenser.content
     case 'gui/container/furnace': return appReplacableResources.latest_gui_container_furnace.content
     case 'gui/container/crafting_table': return appReplacableResources.latest_gui_container_crafting_table.content
@@ -223,13 +222,13 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
   }
 
   try {
-    assertDefined(viewer.world.itemsRenderer)
+    assertDefined(appViewer.resourcesManager.currentResources?.itemsRenderer)
     itemTexture =
-      viewer.world.itemsRenderer.getItemTexture(itemModelName, {}, false, fullBlockModelSupport)
-      ?? viewer.world.itemsRenderer.getItemTexture('item/missing_texture')!
+      appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture(itemModelName, {}, false, fullBlockModelSupport)
+      ?? appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture('item/missing_texture')!
   } catch (err) {
     inGameError(`Failed to render item ${itemModelName} (original: ${originalItemName}) on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
-    itemTexture = viewer.world.itemsRenderer!.getItemTexture('block/errored')!
+    itemTexture = appViewer.resourcesManager.currentResources!.itemsRenderer.getItemTexture('block/errored')!
   }
 
 
diff --git a/src/loadSave.ts b/src/loadSave.ts
index 861cc212..4746a95c 100644
--- a/src/loadSave.ts
+++ b/src/loadSave.ts
@@ -3,7 +3,7 @@ import path from 'path'
 import * as nbt from 'prismarine-nbt'
 import { proxy } from 'valtio'
 import { gzip } from 'node-gzip'
-import { versionToNumber } from 'renderer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/common/utils'
 import { options } from './optionsStorage'
 import { nameToMcOfflineUUID, disconnect } from './flyingSquidUtils'
 import { existsViaStats, forceCachedDataPaths, forceRedirectPaths, mkdirRecursive } from './browserfs'
diff --git a/src/mineflayer/cameraShake.ts b/src/mineflayer/cameraShake.ts
index b2c7f273..4b447aeb 100644
--- a/src/mineflayer/cameraShake.ts
+++ b/src/mineflayer/cameraShake.ts
@@ -1,5 +1,3 @@
-import * as THREE from 'three'
-
 class CameraShake {
   private rollAngle = 0
   private get damageRollAmount () { return 5 }
@@ -10,10 +8,10 @@ class CameraShake {
     this.rollAngle = 0
   }
 
-  shakeFromDamage (yaw?: number) {
+  shakeFromDamage () {
     // Add roll animation
     const startRoll = this.rollAngle
-    const targetRoll = startRoll + (yaw ?? (Math.random() < 0.5 ? -1 : 1)) * this.damageRollAmount
+    const targetRoll = startRoll + (Math.random() < 0.5 ? -1 : 1) * this.damageRollAmount
 
     this.rollAnimation = {
       startTime: performance.now(),
@@ -52,18 +50,8 @@ class CameraShake {
       }
     }
 
-    // Apply roll in camera's local space to maintain consistent left/right roll
-    const { camera } = viewer
-    const rollQuat = new THREE.Quaternion()
-    rollQuat.setFromAxisAngle(new THREE.Vector3(0, 0, 1), THREE.MathUtils.degToRad(this.rollAngle))
-
-    // Get camera's current rotation
-    const camQuat = new THREE.Quaternion()
-    camera.getWorldQuaternion(camQuat)
-
-    // Apply roll after camera rotation
-    const finalQuat = camQuat.multiply(rollQuat)
-    camera.setRotationFromQuaternion(finalQuat)
+    // Apply roll to camera
+    appViewer.backend?.setRoll(this.rollAngle)
   }
 
   private easeOut (t: number): number {
@@ -77,6 +65,10 @@ class CameraShake {
 
 let cameraShake: CameraShake
 
+customEvents.on('hurtAnimation', () => {
+  cameraShake.shakeFromDamage()
+})
+
 customEvents.on('mineflayerBotCreated', () => {
   if (!cameraShake) {
     cameraShake = new CameraShake()
@@ -85,8 +77,8 @@ customEvents.on('mineflayerBotCreated', () => {
     })
   }
 
-  customEvents.on('hurtAnimation', (yaw) => {
-    cameraShake.shakeFromDamage(yaw)
+  customEvents.on('hurtAnimation', () => {
+    cameraShake.shakeFromDamage()
   })
 
   bot._client.on('hurt_animation', ({ entityId, yaw }) => {
diff --git a/src/mineflayer/items.ts b/src/mineflayer/items.ts
index 3c2134f1..8ddb476c 100644
--- a/src/mineflayer/items.ts
+++ b/src/mineflayer/items.ts
@@ -1,7 +1,10 @@
 import mojangson from 'mojangson'
 import nbt from 'prismarine-nbt'
 import { fromFormattedString } from '@xmcl/text-component'
+import { ItemSpecificContextProperties } from 'renderer/viewer/lib/basePlayerState'
+import { getItemDefinition } from 'mc-assets/dist/itemDefinitions'
 import { MessageFormatPart } from '../chatUtils'
+import { playerState } from './playerState'
 
 type RenderSlotComponent = {
   type: string,
@@ -86,3 +89,22 @@ export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'>
     }
   }
 }
+
+export const getItemModelName = (item: GeneralInputItem, specificProps: ItemSpecificContextProperties) => {
+  let itemModelName = item.name
+  const { customModel } = getItemMetadata(item)
+  if (customModel) {
+    itemModelName = customModel
+  }
+
+  const itemSelector = playerState.getItemSelector({
+    ...specificProps
+  })
+  const modelFromDef = getItemDefinition(appViewer.resourcesManager.itemsDefinitionsStore, {
+    name: itemModelName,
+    version: appViewer.resourcesManager.currentResources!.version,
+    properties: itemSelector
+  })?.model
+  const model = (modelFromDef === 'minecraft:special' ? undefined : modelFromDef) ?? itemModelName
+  return model
+}
diff --git a/src/mineflayer/maps.ts b/src/mineflayer/maps.ts
index c5d4f716..5e968205 100644
--- a/src/mineflayer/maps.ts
+++ b/src/mineflayer/maps.ts
@@ -1,5 +1,6 @@
 import { mapDownloader } from 'mineflayer-item-map-downloader'
 import { setImageConverter } from 'mineflayer-item-map-downloader/lib/util'
+import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 
 setImageConverter((buf: Uint8Array) => {
   const canvas = document.createElement('canvas')
@@ -17,7 +18,7 @@ customEvents.on('mineflayerBotCreated', () => {
   bot.on('login', () => {
     bot.loadPlugin(mapDownloader)
     bot.mapDownloader.on('new_map', ({ png, id }) => {
-      viewer.entities.updateMap(id, png)
+      getThreeJsRendererMethods()?.updateMap(id, png)
     })
   })
 })
diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
index 260f8e53..6ef9a90d 100644
--- a/src/mineflayer/playerState.ts
+++ b/src/mineflayer/playerState.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events'
 import { Vec3 } from 'vec3'
-import { IPlayerState, ItemSpecificContextProperties, MovementState, PlayerStateEvents } from 'renderer/viewer/lib/basePlayerState'
+import { BasePlayerState, IPlayerState, ItemSpecificContextProperties, MovementState, PlayerStateEvents } from 'renderer/viewer/lib/basePlayerState'
 import { HandItemBlock } from 'renderer/viewer/lib/holdingBlock'
 import TypedEmitter from 'typed-emitter'
 import { ItemSelector } from 'mc-assets/dist/itemDefinitions'
@@ -29,9 +29,7 @@ export class PlayerStateManager implements IPlayerState {
     return bot.player?.username ?? ''
   }
 
-  reactive = proxy({
-    playerSkin: undefined as string | undefined,
-  })
+  reactive: IPlayerState['reactive'] = new BasePlayerState().reactive
 
   static getInstance (): PlayerStateManager {
     if (!this.instance) {
@@ -40,7 +38,7 @@ export class PlayerStateManager implements IPlayerState {
     return this.instance
   }
 
-  private constructor () {
+  constructor () {
     this.updateState = this.updateState.bind(this)
     customEvents.on('mineflayerBotCreated', () => {
       this.ready = false
@@ -70,6 +68,11 @@ export class PlayerStateManager implements IPlayerState {
     // Initial held items setup
     this.updateHeldItem(false)
     this.updateHeldItem(true)
+
+    bot.on('game', () => {
+      this.reactive.gameMode = bot.game.gameMode
+    })
+    this.reactive.gameMode = bot.game?.gameMode
   }
 
   // #region Movement and Physics State
@@ -133,6 +136,10 @@ export class PlayerStateManager implements IPlayerState {
   isSprinting (): boolean {
     return gameAdditionalState.isSprinting
   }
+
+  getPosition (): Vec3 {
+    return bot.player?.entity.position ?? new Vec3(0, 0, 0)
+  }
   // #endregion
 
   // #region Held Item State
diff --git a/src/mineflayer/plugins/mouse.ts b/src/mineflayer/plugins/mouse.ts
index 6841424f..a0ae60ec 100644
--- a/src/mineflayer/plugins/mouse.ts
+++ b/src/mineflayer/plugins/mouse.ts
@@ -1,142 +1,30 @@
 import { createMouse } from 'mineflayer-mouse'
-import * as THREE from 'three'
 import { Bot } from 'mineflayer'
 import { Block } from 'prismarine-block'
-import { Vec3 } from 'vec3'
-import { LineMaterial } from 'three-stdlib'
-import { subscribeKey } from 'valtio/utils'
-import { disposeObject } from 'renderer/viewer/lib/threeJsUtils'
+import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import { isGameActive, showModal } from '../../globalState'
 
-// wouldn't better to create atlas instead?
-import destroyStage0 from '../../../assets/destroy_stage_0.png'
-import destroyStage1 from '../../../assets/destroy_stage_1.png'
-import destroyStage2 from '../../../assets/destroy_stage_2.png'
-import destroyStage3 from '../../../assets/destroy_stage_3.png'
-import destroyStage4 from '../../../assets/destroy_stage_4.png'
-import destroyStage5 from '../../../assets/destroy_stage_5.png'
-import destroyStage6 from '../../../assets/destroy_stage_6.png'
-import destroyStage7 from '../../../assets/destroy_stage_7.png'
-import destroyStage8 from '../../../assets/destroy_stage_8.png'
-import destroyStage9 from '../../../assets/destroy_stage_9.png'
-import { options } from '../../optionsStorage'
 import { isCypress } from '../../standaloneUtils'
 import { playerState } from '../playerState'
 import { sendVideoInteraction, videoCursorInteraction } from '../../customChannels'
 
-function createDisplayManager (bot: Bot, scene: THREE.Scene, renderer: THREE.WebGLRenderer) {
-  // State
-  const state = {
-    blockBreakMesh: null as THREE.Mesh | null,
-    breakTextures: [] as THREE.Texture[],
-  }
-
-  // Initialize break mesh and textures
-  const loader = new THREE.TextureLoader()
-  const destroyStagesImages = [
-    destroyStage0, destroyStage1, destroyStage2, destroyStage3, destroyStage4,
-    destroyStage5, destroyStage6, destroyStage7, destroyStage8, destroyStage9
-  ]
-
-  for (let i = 0; i < 10; i++) {
-    const texture = loader.load(destroyStagesImages[i])
-    texture.magFilter = THREE.NearestFilter
-    texture.minFilter = THREE.NearestFilter
-    state.breakTextures.push(texture)
-  }
-
-  const breakMaterial = new THREE.MeshBasicMaterial({
-    transparent: true,
-    blending: THREE.MultiplyBlending,
-    alphaTest: 0.5,
-  })
-  state.blockBreakMesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 1), breakMaterial)
-  state.blockBreakMesh.visible = false
-  state.blockBreakMesh.renderOrder = 999
-  state.blockBreakMesh.name = 'blockBreakMesh'
-  scene.add(state.blockBreakMesh)
-
-  // Update functions
-  function updateLineMaterial () {
-    const inCreative = bot.game.gameMode === 'creative'
-    const pixelRatio = viewer.renderer.getPixelRatio()
-
-    viewer.world.threejsCursorLineMaterial = new LineMaterial({
-      color: (() => {
-        switch (options.highlightBlockColor) {
-          case 'blue':
-            return 0x40_80_ff
-          case 'classic':
-            return 0x00_00_00
-          default:
-            return inCreative ? 0x40_80_ff : 0x00_00_00
-        }
-      })(),
-      linewidth: Math.max(pixelRatio * 0.7, 1) * 2,
-      // dashed: true,
-      // dashSize: 5,
-    })
-  }
-
-  function updateDisplay () {
-    if (viewer.world.threejsCursorLineMaterial) {
-      const { renderer } = viewer
-      viewer.world.threejsCursorLineMaterial.resolution.set(renderer.domElement.width, renderer.domElement.height)
-      viewer.world.threejsCursorLineMaterial.dashOffset = performance.now() / 750
-    }
-  }
-  beforeRenderFrame.push(updateDisplay)
-
-  // Update cursor line material on game mode change
-  bot.on('game', updateLineMaterial)
-  // Update material when highlight color setting changes
-  subscribeKey(options, 'highlightBlockColor', updateLineMaterial)
-
-  function updateBreakAnimation (block: Block | undefined, stage: number | null) {
-    hideBreakAnimation()
-    if (!state.blockBreakMesh) return // todo
-    if (stage === null || !block) return
-
-    const mergedShape = bot.mouse.getMergedCursorShape(block)
-    if (!mergedShape) return
-    const { position, width, height, depth } = bot.mouse.getDataFromShape(mergedShape)
-    state.blockBreakMesh.scale.set(width * 1.001, height * 1.001, depth * 1.001)
-    position.add(block.position)
-    state.blockBreakMesh.position.set(position.x, position.y, position.z)
-    state.blockBreakMesh.visible = true
-
-    //@ts-expect-error
-    state.blockBreakMesh.material.map = state.breakTextures[stage] ?? state.breakTextures.at(-1)
-    //@ts-expect-error
-    state.blockBreakMesh.material.needsUpdate = true
-  }
-
-  function hideBreakAnimation () {
-    if (state.blockBreakMesh) {
-      state.blockBreakMesh.visible = false
-    }
-  }
-
-  function updateCursorBlock (data?: { block: Block }) {
+function cursorBlockDisplay (bot: Bot) {
+  const updateCursorBlock = (data?: { block: Block }) => {
     if (!data?.block) {
-      viewer.world.setHighlightCursorBlock(null)
+      getThreeJsRendererMethods()?.setHighlightCursorBlock(null)
       return
     }
 
     const { block } = data
-    viewer.world.setHighlightCursorBlock(block.position, bot.mouse.getBlockCursorShapes(block).map(shape => {
+    getThreeJsRendererMethods()?.setHighlightCursorBlock(block.position, bot.mouse.getBlockCursorShapes(block).map(shape => {
       return bot.mouse.getDataFromShape(shape)
     }))
   }
 
   bot.on('highlightCursorBlock', updateCursorBlock)
 
-  bot.on('blockBreakProgressStage', updateBreakAnimation)
-
-  bot.on('end', () => {
-    disposeObject(state.blockBreakMesh!, true)
-    scene.remove(state.blockBreakMesh!)
-    viewer.world.setHighlightCursorBlock(null)
+  bot.on('blockBreakProgressStage', (block, stage) => {
+    getThreeJsRendererMethods()?.updateBreakAnimation(block, stage)
   })
 }
 
@@ -144,7 +32,7 @@ export default (bot: Bot) => {
   bot.loadPlugin(createMouse({}))
 
   domListeners(bot)
-  createDisplayManager(bot, viewer.scene, viewer.renderer)
+  cursorBlockDisplay(bot)
 
   otherListeners()
 }
@@ -159,11 +47,11 @@ const otherListeners = () => {
   })
 
   bot.on('botArmSwingStart', (hand) => {
-    viewer.world.changeHandSwingingState(true, hand === 'left')
+    getThreeJsRendererMethods()?.changeHandSwingingState(true, hand === 'left')
   })
 
   bot.on('botArmSwingEnd', (hand) => {
-    viewer.world.changeHandSwingingState(false, hand === 'left')
+    getThreeJsRendererMethods()?.changeHandSwingingState(false, hand === 'left')
   })
 
   bot.on('startUsingItem', (item, slot, isOffhand, duration) => {
diff --git a/src/mineflayer/plugins/ping.ts b/src/mineflayer/plugins/ping.ts
index 47af8986..9753e4ed 100644
--- a/src/mineflayer/plugins/ping.ts
+++ b/src/mineflayer/plugins/ping.ts
@@ -1,4 +1,4 @@
-import { versionToNumber } from 'renderer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/common/utils'
 
 export default () => {
   let i = 0
diff --git a/src/optimizeJson.ts b/src/optimizeJson.ts
index 8c23dac0..a7fe7d4e 100644
--- a/src/optimizeJson.ts
+++ b/src/optimizeJson.ts
@@ -1,4 +1,4 @@
-import { versionToNumber } from 'renderer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/common/utils'
 
 type IdMap = Record<string, number>
 
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index ac0503ca..f308caef 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -11,7 +11,7 @@ import Slider from './react/Slider'
 import { getScreenRefreshRate } from './utils'
 import { setLoadingScreenStatus } from './appStatus'
 import { openFilePicker, resetLocalStorage } from './browserfs'
-import { completeResourcepackPackInstall, getResourcePackNames, resourcePackState, uninstallResourcePack } from './resourcePack'
+import { completeResourcepackPackInstall, getResourcePackNames, resourcepackReload, resourcePackState, uninstallResourcePack } from './resourcePack'
 import { downloadPacketsReplay, packetsRecordingState } from './packetsReplay/packetsReplayLegacy'
 import { showInputsModal, showOptionsModal } from './react/SelectOption'
 import supportedVersions from './supportedVersions.mjs'
@@ -181,6 +181,7 @@ export const guiOptionsScheme: {
               if (!choice) return
               if (choice === 'Disable') {
                 options.enabledResourcepack = null
+                await resourcepackReload()
                 return
               }
               if (choice === 'Enable') {
diff --git a/src/panorama.ts b/src/panorama.ts
deleted file mode 100644
index 7fdd72b7..00000000
--- a/src/panorama.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-//@ts-check
-
-import { join } from 'path'
-import * as THREE from 'three'
-import { EntityMesh } from 'renderer/viewer/lib/entity/EntityMesh'
-import { WorldDataEmitter } from 'renderer/viewer'
-import { Vec3 } from 'vec3'
-import { getSyncWorld } from 'renderer/playground/shared'
-import * as tweenJs from '@tweenjs/tween.js'
-import { subscribeKey } from 'valtio/utils'
-import { options } from './optionsStorage'
-import { miscUiState } from './globalState'
-import { loadMinecraftData } from './connect'
-
-let panoramaCubeMap
-let shouldDisplayPanorama = true
-
-const panoramaFiles = [
-  'panorama_3.png', // right (+x)
-  'panorama_1.png', // left (-x)
-  'panorama_4.png', // top (+y)
-  'panorama_5.png', // bottom (-y)
-  'panorama_0.png', // front (+z)
-  'panorama_2.png', // back (-z)
-]
-
-let unloadPanoramaCallbacks = [] as Array<() => void>
-
-// Menu panorama background
-// TODO-low use abort controller
-export async function addPanoramaCubeMap () {
-  if (panoramaCubeMap || miscUiState.loadedDataVersion || options.disableAssets) return
-  await new Promise(resolve => {
-    setTimeout(resolve, 0) // wait for viewer to be initialized
-  })
-  viewer.camera.fov = 85
-  if (!shouldDisplayPanorama) return
-  if (process.env.SINGLE_FILE_BUILD_MODE) {
-    void initDemoWorld()
-    return
-  }
-
-  let time = 0
-  viewer.camera.near = 0.05
-  viewer.camera.updateProjectionMatrix()
-  viewer.camera.position.set(0, 0, 0)
-  viewer.camera.rotation.set(0, 0, 0)
-  const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000)
-
-  const loader = new THREE.TextureLoader()
-  const panorMaterials = [] as THREE.MeshBasicMaterial[]
-  for (const file of panoramaFiles) {
-    const texture = loader.load(join('background', file))
-
-    // Instead of using repeat/offset to flip, we'll use the texture matrix
-    texture.matrixAutoUpdate = false
-    texture.matrix.set(
-      -1, 0, 1, 0, 1, 0, 0, 0, 1
-    )
-
-    texture.wrapS = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
-    texture.wrapT = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
-    texture.minFilter = THREE.LinearFilter
-    texture.magFilter = THREE.LinearFilter
-
-    panorMaterials.push(new THREE.MeshBasicMaterial({
-      map: texture,
-      transparent: true,
-      side: THREE.DoubleSide,
-      depthWrite: false
-    }))
-  }
-
-  if (!shouldDisplayPanorama) return
-
-  const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials)
-
-  panoramaBox.onBeforeRender = () => {
-    time += 0.01
-    panoramaBox.rotation.y = Math.PI + time * 0.01
-    panoramaBox.rotation.z = Math.sin(-time * 0.001) * 0.001
-  }
-
-  const group = new THREE.Object3D()
-  group.add(panoramaBox)
-
-  // should be rewritten entirely
-  for (let i = 0; i < 20; i++) {
-    const m = new EntityMesh('1.16.4', 'squid', viewer.world).mesh
-    m.position.set(Math.random() * 30 - 15, Math.random() * 20 - 10, Math.random() * 10 - 17)
-    m.rotation.set(0, Math.PI + Math.random(), -Math.PI / 4, 'ZYX')
-    const v = Math.random() * 0.01
-    m.children[0].onBeforeRender = () => {
-      m.rotation.y += v
-      m.rotation.z = Math.cos(panoramaBox.rotation.y * 3) * Math.PI / 4 - Math.PI / 2
-    }
-    group.add(m)
-  }
-
-  viewer.scene.add(group)
-  panoramaCubeMap = group
-}
-
-if (process.env.SINGLE_FILE_BUILD_MODE) {
-  subscribeKey(miscUiState, 'fsReady', () => {
-    if (miscUiState.fsReady) {
-      // don't do it earlier to load fs and display menu faster
-      void addPanoramaCubeMap()
-    }
-  })
-} else {
-  void addPanoramaCubeMap()
-}
-
-export function removePanorama () {
-  for (const unloadPanoramaCallback of unloadPanoramaCallbacks) {
-    unloadPanoramaCallback()
-  }
-  unloadPanoramaCallbacks = []
-  viewer.camera.fov = options.fov
-  shouldDisplayPanorama = false
-  if (!panoramaCubeMap) return
-  viewer.camera.near = 0.1
-  viewer.camera.updateProjectionMatrix()
-  viewer.scene.remove(panoramaCubeMap)
-  panoramaCubeMap = null
-}
-
-const initDemoWorld = async () => {
-  const abortController = new AbortController()
-  unloadPanoramaCallbacks.push(() => {
-    abortController.abort()
-  })
-  const version = '1.21.4'
-  console.time(`load ${version} mc-data`)
-  await loadMinecraftData(version, true)
-  console.timeEnd(`load ${version} mc-data`)
-  if (abortController.signal.aborted) return
-  console.time('load scene')
-  const world = getSyncWorld(version)
-  const PrismarineBlock = require('prismarine-block')
-  const Block = PrismarineBlock(version)
-  const fullBlocks = loadedData.blocksArray.filter(block => {
-    // if (block.name.includes('leaves')) return false
-    if (/* !block.name.includes('wool') &&  */!block.name.includes('stained_glass')/*  && !block.name.includes('terracotta') */) return false
-    const b = Block.fromStateId(block.defaultState, 0)
-    if (b.shapes?.length !== 1) return false
-    const shape = b.shapes[0]
-    return shape[0] === 0 && shape[1] === 0 && shape[2] === 0 && shape[3] === 1 && shape[4] === 1 && shape[5] === 1
-  })
-  const Z = -15
-  const sizeX = 100
-  const sizeY = 100
-  for (let x = -sizeX; x < sizeX; x++) {
-    for (let y = -sizeY; y < sizeY; y++) {
-      const block = fullBlocks[Math.floor(Math.random() * fullBlocks.length)]
-      world.setBlockStateId(new Vec3(x, y, Z), block.defaultState)
-    }
-  }
-  viewer.camera.updateProjectionMatrix()
-  viewer.camera.position.set(0.5, sizeY / 2 + 0.5, 0.5)
-  viewer.camera.rotation.set(0, 0, 0)
-  const initPos = new Vec3(...viewer.camera.position.toArray())
-  const worldView = new WorldDataEmitter(world, 2, initPos)
-  // worldView.addWaitTime = 0
-  await viewer.world.setVersion(version)
-  if (abortController.signal.aborted) return
-  viewer.connect(worldView)
-  void worldView.init(initPos)
-  await viewer.world.waitForChunksToRender()
-  if (abortController.signal.aborted) return
-  // add small camera rotation to side on mouse move depending on absolute position of the cursor
-  const { camera } = viewer
-  const initX = camera.position.x
-  const initY = camera.position.y
-  let prevTwin: tweenJs.Tween<THREE.Vector3> | undefined
-  document.body.addEventListener('pointermove', (e) => {
-    if (e.pointerType !== 'mouse') return
-    const pos = new THREE.Vector2(e.clientX, e.clientY)
-    const SCALE = 0.2
-    /* -0.5 - 0.5 */
-    const xRel = pos.x / window.innerWidth - 0.5
-    const yRel = -(pos.y / window.innerHeight - 0.5)
-    prevTwin?.stop()
-    const to = {
-      x: initX + (xRel * SCALE),
-      y: initY + (yRel * SCALE)
-    }
-    prevTwin = new tweenJs.Tween(camera.position).to(to, 0) // todo use the number depending on diff // todo use the number depending on diff
-    // prevTwin.easing(tweenJs.Easing.Exponential.InOut)
-    prevTwin.start()
-    camera.updateProjectionMatrix()
-  }, {
-    signal: abortController.signal
-  })
-
-  console.timeEnd('load scene')
-}
diff --git a/src/react/AppStatus.tsx b/src/react/AppStatus.tsx
index 4aa5da42..8dd181d7 100644
--- a/src/react/AppStatus.tsx
+++ b/src/react/AppStatus.tsx
@@ -18,7 +18,6 @@ export default ({
   children
 }) => {
   const [loadingDotIndex, setLoadingDotIndex] = useState(0)
-  const lockConnect = appQueryParams.lockConnect === 'true'
 
   useEffect(() => {
     const statusRunner = async () => {
@@ -84,7 +83,7 @@ export default ({
           >
             <b>Reset App (recommended)</b>
           </Button>
-          {!lockConnect && backAction && <Button label="Back" onClick={backAction} />}
+          {backAction && <Button label="Back" onClick={backAction} />}
         </>
       )}
       {children}
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index 2a9a5e4c..5f3e7e06 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -6,6 +6,7 @@ import type { ConnectOptions } from '../connect'
 import { downloadPacketsReplay, packetsRecordingState, replayLogger } from '../packetsReplay/packetsReplayLegacy'
 import { getProxyDetails } from '../microsoftAuthflow'
 import { downloadAutoCapturedPackets, getLastAutoCapturedPackets } from '../mineflayer/plugins/packetsRecording'
+import { appQueryParams } from '../appParams'
 import AppStatus from './AppStatus'
 import DiveTransition from './DiveTransition'
 import { useDidUpdateEffect } from './utils'
@@ -64,7 +65,7 @@ export default () => {
     lastState.current = JSON.parse(JSON.stringify(currentState))
   }
 
-  const usingState = isOpen ? currentState : lastState.current
+  const usingState = (isOpen ? currentState : lastState.current) as typeof currentState
   const { isError, lastStatus, maybeRecoverable, status, hideDots, descriptionHint, loadingChunksData, loadingChunksDataPlayerChunk, minecraftJsonMessage, showReconnect } = usingState
 
   useDidUpdateEffect(() => {
@@ -92,6 +93,7 @@ export default () => {
     window.addEventListener('keyup', (e) => {
       if ('input textarea select'.split(' ').includes((e.target as HTMLElement).tagName?.toLowerCase() ?? '')) return
       if (activeModalStack.at(-1)?.reactType !== 'app-status') return
+      // todo do only if reconnect is possible
       if (e.code !== 'KeyR' || !lastConnectOptions.value) return
       reconnect()
     }, {
@@ -116,6 +118,29 @@ export default () => {
   }
 
   const lastAutoCapturedPackets = getLastAutoCapturedPackets()
+  const lockConnect = appQueryParams.lockConnect === 'true'
+  const wasDisconnected = showReconnect
+  let backAction = undefined as (() => void) | undefined
+  if (maybeRecoverable && (!lockConnect || !wasDisconnected)) {
+    backAction = () => {
+      if (!wasDisconnected) {
+        hideModal(undefined, undefined, { force: true })
+        return
+      }
+      resetAppStatusState()
+      miscUiState.gameLoaded = false
+      miscUiState.loadedDataVersion = null
+      window.loadedData = undefined
+      if (activeModalStacks['main-menu']) {
+        insertActiveModalStack('main-menu')
+        if (activeModalStack.at(-1)?.reactType === 'app-status') {
+          hideModal(undefined, undefined, { force: true }) // workaround: hide loader that was shown on world loading
+        }
+      } else {
+        hideModal(undefined, undefined, { force: true })
+      }
+    }
+  }
   return <DiveTransition open={isOpen}>
     <AppStatus
       status={status}
@@ -129,26 +154,13 @@ export default () => {
       }{
         minecraftJsonMessage && <MessageFormattedString message={minecraftJsonMessage} />
       }</>}
-      backAction={maybeRecoverable ? () => {
-        resetAppStatusState()
-        miscUiState.gameLoaded = false
-        miscUiState.loadedDataVersion = null
-        window.loadedData = undefined
-        if (activeModalStacks['main-menu']) {
-          insertActiveModalStack('main-menu')
-          if (activeModalStack.at(-1)?.reactType === 'app-status') {
-            hideModal(undefined, undefined, { force: true }) // workaround: hide loader that was shown on world loading
-          }
-        } else {
-          hideModal(undefined, undefined, { force: true })
-        }
-      } : undefined}
+      backAction={backAction}
       actionsSlot={
         <>
           {displayAuthButton && <Button label='Authenticate' onClick={authReconnectAction} />}
           {displayVpnButton && <PossiblyVpnBypassProxyButton reconnect={reconnect} />}
           {replayActive && <Button label={`Download Packets Replay ${replayLogger?.contents.split('\n').length}L`} onClick={downloadPacketsReplay} />}
-          {lastAutoCapturedPackets && <Button label={`Inspect Last ${lastAutoCapturedPackets} Packets`} onClick={() => downloadAutoCapturedPackets()} />}
+          {wasDisconnected && lastAutoCapturedPackets && <Button label={`Inspect Last ${lastAutoCapturedPackets} Packets`} onClick={() => downloadAutoCapturedPackets()} />}
         </>
       }
     >
diff --git a/src/react/BookProvider.tsx b/src/react/BookProvider.tsx
index 056377cc..cd2219ff 100644
--- a/src/react/BookProvider.tsx
+++ b/src/react/BookProvider.tsx
@@ -1,4 +1,4 @@
-import { versionToNumber } from 'renderer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/common/utils'
 import nbt from 'prismarine-nbt'
 import { useEffect, useState } from 'react'
 import { useSnapshot } from 'valtio'
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index d0768583..3ce081fc 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -1,9 +1,9 @@
-import { useEffect, useRef, useMemo, useState } from 'react'
-import * as THREE from 'three'
+import { useEffect, useRef, useState } from 'react'
 import type { Block } from 'prismarine-block'
+import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import { getFixedFilesize } from '../downloadAndOpenFile'
 import { options } from '../optionsStorage'
-import { getBlockAssetsCacheKey } from '../../renderer/viewer/lib/mesher/shared'
+import { BlockStateModelInfo } from '../../renderer/viewer/lib/mesher/shared'
 import styles from './DebugOverlay.module.css'
 
 export default () => {
@@ -34,13 +34,13 @@ export default () => {
   const [blockL, setBlockL] = useState(0)
   const [biomeId, setBiomeId] = useState(0)
   const [day, setDay] = useState(0)
-  const [entitiesCount, setEntitiesCount] = useState('0')
   const [dimension, setDimension] = useState('')
   const [cursorBlock, setCursorBlock] = useState<Block | null>(null)
+  const [blockInfo, setBlockInfo] = useState<{ customBlockName?: string, modelInfo?: BlockStateModelInfo } | null>(null)
   const [clientTps, setClientTps] = useState(0)
   const minecraftYaw = useRef(0)
   const minecraftQuad = useRef(0)
-  const { rendererDevice } = viewer.world
+  const rendererDevice = appViewer.rendererState.renderer ?? 'No render backend'
 
   const quadsDescription = [
     'north (towards negative Z)',
@@ -132,10 +132,19 @@ export default () => {
       setBiomeId(bot.world.getBiome(bot.entity.position))
       setDimension(bot.game.dimension)
       setDay(bot.time.day)
-      setCursorBlock(bot.blockAtCursor(5))
-      setEntitiesCount(`${viewer.entities.entitiesRenderingCount} (${Object.values(bot.entities).length})`)
+      setCursorBlock(bot.mouse.getCursorState().cursorBlock)
     }, 100)
 
+    const notFrequentUpdateInterval = setInterval(async () => {
+      const block = bot.mouse.cursorBlock
+      if (!block) {
+        setBlockInfo(null)
+        return
+      }
+      const { customBlockName, modelInfo } = await getThreeJsRendererMethods()?.getBlockInfo(pos, block.stateId) ?? {}
+      setBlockInfo({ customBlockName, modelInfo })
+    }, 300)
+
     // @ts-expect-error
     bot._client.on('packet', readPacket)
     // @ts-expect-error
@@ -149,6 +158,7 @@ export default () => {
       document.removeEventListener('keydown', handleF3)
       clearInterval(packetsUpdateInterval)
       clearInterval(freqUpdateInterval)
+      clearInterval(notFrequentUpdateInterval)
       console.log('Last physics tick before disconnect was', Date.now() - lastTickDate, 'ms ago')
     }
   }, [])
@@ -163,7 +173,7 @@ export default () => {
   return <>
     <div className={`debug-left-side ${styles['debug-left-side']}`}>
       <p>Prismarine Web Client ({bot.version})</p>
-      <p>E: {entitiesCount}</p>
+      {appViewer.backend?.getDebugOverlay().entitiesString && <p>E: {appViewer.backend.getDebugOverlay().entitiesString}</p>}
       <p>{dimension}</p>
       <div className={styles.empty} />
       <p>XYZ: {pos.x.toFixed(3)} / {pos.y.toFixed(3)} / {pos.z.toFixed(3)}</p>
@@ -177,10 +187,11 @@ export default () => {
       <p>Biome: minecraft:{loadedData.biomesArray[biomeId]?.name ?? 'unknown biome'}</p>
       <p>Day: {day}</p>
       <div className={styles.empty} />
-      {Object.entries(customEntries.current).map(([name, value]) => <p key={name}>{name}: {value}</p>)}
+      {Object.entries(appViewer.backend?.getDebugOverlay().left ?? {}).map(([name, value]) => <p key={name}>{name}: {value}</p>)}
     </div>
 
     <div className={`debug-right-side ${styles['debug-right-side']}`}>
+      <p>Backend: {appViewer.backend?.NAME}</p>
       <p>Renderer: {rendererDevice}</p>
       <div className={styles.empty} />
       {cursorBlock ? (<>
@@ -202,11 +213,8 @@ export default () => {
         <p>Looking at: {cursorBlock.position.x} {cursorBlock.position.y} {cursorBlock.position.z}</p>
       ) : ''}
       <div className={styles.empty} />
-      {cursorBlock && (() => {
-        const chunkKey = `${Math.floor(cursorBlock.position.x / 16) * 16},${Math.floor(cursorBlock.position.z / 16) * 16}`
-        const customBlockName = viewer.world.protocolCustomBlocks.get(chunkKey)?.[`${cursorBlock.position.x},${cursorBlock.position.y},${cursorBlock.position.z}`]
-        const cacheKey = getBlockAssetsCacheKey(cursorBlock.stateId, customBlockName)
-        const modelInfo = viewer.world.blockStateModelInfo.get(cacheKey)
+      {blockInfo && (() => {
+        const { customBlockName, modelInfo } = blockInfo
         return modelInfo && (
           <>
             {customBlockName && <p style={{ fontSize: 7, }}>Custom block: {customBlockName}</p>}
@@ -221,6 +229,7 @@ export default () => {
           </>
         )
       })()}
+      {Object.entries(appViewer.backend?.getDebugOverlay().right ?? {}).map(([name, value]) => <p key={name}>{name}: {value}</p>)}
     </div>
   </>
 }
diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index af7d1387..f0fadbfb 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -110,7 +110,7 @@ const HotbarInner = () => {
     inv.canvas.style.pointerEvents = 'auto'
     container.current.appendChild(inv.canvas)
     const upHotbarItems = () => {
-      if (!viewer.world.currentTextureImage || !allImagesLoadedState.value) return
+      if (!appViewer.resourcesManager.currentResources?.itemsAtlasParser || !allImagesLoadedState.value) return
       upInventoryItems(true, inv)
     }
 
@@ -124,7 +124,7 @@ const HotbarInner = () => {
 
     upHotbarItems()
     bot.inventory.on('updateSlot', upHotbarItems)
-    viewer.world.renderUpdateEmitter.on('textureDownloaded', upHotbarItems)
+    appViewer.resourcesManager.on('assetsTexturesUpdated', upHotbarItems)
     const unsub2 = subscribe(allImagesLoadedState, () => {
       upHotbarItems()
     })
@@ -197,7 +197,7 @@ const HotbarInner = () => {
       inv.destroy()
       controller.abort()
       unsub2()
-      viewer.world.renderUpdateEmitter.off('textureDownloaded', upHotbarItems)
+      appViewer.resourcesManager.off('assetsTexturesUpdated', upHotbarItems)
     }
   }, [])
 
diff --git a/src/react/IndicatorEffectsProvider.tsx b/src/react/IndicatorEffectsProvider.tsx
index d1e9fdd0..83b321ee 100644
--- a/src/react/IndicatorEffectsProvider.tsx
+++ b/src/react/IndicatorEffectsProvider.tsx
@@ -1,5 +1,6 @@
-import { proxy, useSnapshot } from 'valtio'
+import { proxy, subscribe, useSnapshot } from 'valtio'
 import { useEffect, useMemo } from 'react'
+import { subscribeKey } from 'valtio/utils'
 import { inGameError } from '../utils'
 import { fsState } from '../loadSave'
 import { gameAdditionalState, miscUiState } from '../globalState'
@@ -9,7 +10,6 @@ import { images } from './effectsImages'
 
 export const state = proxy({
   indicators: {
-    chunksLoading: false
   },
   effects: [] as EffectType[]
 })
@@ -52,6 +52,9 @@ const getEffectIndex = (newEffect: EffectType) => {
 
 export default () => {
   const stateIndicators = useSnapshot(state.indicators)
+  const chunksLoading = !useSnapshot(appViewer.rendererState).world.allChunksLoaded
+  const { mesherWork } = useSnapshot(appViewer.rendererState).world
+
   const { hasErrors } = useSnapshot(miscUiState)
   const { disabledUiParts } = useSnapshot(options)
   const { isReadonly, openReadOperations, openWriteOperations } = useSnapshot(fsState)
@@ -62,27 +65,11 @@ export default () => {
     readingFiles: openReadOperations > 0,
     appHasErrors: hasErrors,
     connectionIssues: poorConnection ? 1 : noConnection ? 2 : 0,
+    chunksLoading,
+    // mesherWork,
     ...stateIndicators,
   }
 
-  useEffect(() => {
-    let alreadyWaiting = false
-    const listener = () => {
-      if (alreadyWaiting) return
-      state.indicators.chunksLoading = true
-      alreadyWaiting = true
-      void viewer.waitForChunksToRender().then(() => {
-        state.indicators.chunksLoading = false
-        alreadyWaiting = false
-      })
-    }
-    viewer.world.renderUpdateEmitter.on('dirty', listener)
-
-    return () => {
-      viewer.world.renderUpdateEmitter.off('dirty', listener)
-    }
-  }, [])
-
   const effects = useSnapshot(state.effects)
 
   useMemo(() => {
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
index 25df83aa..b1d39e80 100644
--- a/src/react/MinimapProvider.tsx
+++ b/src/react/MinimapProvider.tsx
@@ -2,7 +2,7 @@ import { useEffect } from 'react'
 import { simplify } from 'prismarine-nbt'
 import RegionFile from 'prismarine-provider-anvil/src/region'
 import { Vec3 } from 'vec3'
-import { versionToNumber } from 'renderer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/common/utils'
 import { WorldWarp } from 'flying-squid/dist/lib/modules/warps'
 import { TypedEventEmitter } from 'contro-max/build/typedEventEmitter'
 import { PCChunk } from 'prismarine-chunk'
@@ -11,6 +11,8 @@ import { Block } from 'prismarine-block'
 import { INVISIBLE_BLOCKS } from 'renderer/viewer/lib/mesher/worldConstants'
 import { getRenamedData } from 'flying-squid/dist/blockRenames'
 import { useSnapshot } from 'valtio'
+import { subscribeKey } from 'valtio/utils'
+import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import BlockData from '../../renderer/viewer/lib/moreBlockDataGenerated.json'
 import preflatMap from '../preflatMap.json'
 import { contro } from '../controls'
@@ -54,6 +56,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
   loadChunkFullmap: (key: string) => Promise<ChunkInfo | null | undefined>
   _full = false
   isBuiltinHeightmapAvailable = false
+  unsubscribers: Array<() => void> = []
 
   constructor (pos?: Vec3) {
     super()
@@ -111,13 +114,22 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
       this.blockData.set(renamedKey, BlockData.colors[blockKey])
     }
 
-    viewer.world?.renderUpdateEmitter.on('chunkFinished', (key) => {
-      if (!this.loadingChunksQueue.has(key)) return
-      this.loadingChunksQueue.delete(key)
-      void this.loadChunk(key)
+    subscribeKey(appViewer.rendererState, 'world', () => {
+      for (const key of this.loadingChunksQueue) {
+        if (appViewer.rendererState.world.chunksLoaded.includes(key)) {
+          this.loadingChunksQueue.delete(key)
+          void this.loadChunk(key)
+        }
+      }
     })
   }
 
+  destroy () {
+    for (const unsubscriber of this.unsubscribers) {
+      unsubscriber()
+    }
+  }
+
   get full () {
     return this._full
   }
@@ -188,7 +200,9 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     const [chunkX, chunkZ] = key.split(',').map(Number)
     const chunkWorldX = chunkX * 16
     const chunkWorldZ = chunkZ * 16
-    if (viewer.world.finishedChunks[`${chunkWorldX},${chunkWorldZ}`]) {
+    if (appViewer.rendererState.world.chunksLoaded.includes(`${chunkWorldX},${chunkWorldZ}`)) {
+      const highestBlocks = await getThreeJsRendererMethods()?.getHighestBlocks()
+      if (!highestBlocks) return undefined
       const heightmap = new Uint8Array(256)
       const colors = Array.from({ length: 256 }).fill('') as string[]
       // avoid creating new object every time
@@ -198,7 +212,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
         for (let x = 0; x < 16; x += 1) {
           const blockX = chunkWorldX + x
           const blockZ = chunkWorldZ + z
-          const hBlock = viewer.world.highestBlocks.get(`${blockX},${blockZ}`)
+          const hBlock = highestBlocks.get(`${blockX},${blockZ}`)
           blockPos.x = blockX; blockPos.z = blockZ; blockPos.y = hBlock?.y ?? 0
           let block = bot.world.getBlock(blockPos)
           while (block?.name.includes('air')) {
@@ -319,14 +333,16 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     const [chunkX, chunkZ] = key.split(',').map(Number)
     const chunkWorldX = chunkX * 16
     const chunkWorldZ = chunkZ * 16
-    if (viewer.world.finishedChunks[`${chunkWorldX},${chunkWorldZ}`]) {
+    const highestBlocks = await getThreeJsRendererMethods()?.getHighestBlocks()
+    if (appViewer.rendererState.world.chunksLoaded.includes(`${chunkWorldX},${chunkWorldZ}`)) {
       const heightmap = new Uint8Array(256)
       const colors = Array.from({ length: 256 }).fill('') as string[]
+      if (!highestBlocks) return null
       for (let z = 0; z < 16; z += 1) {
         for (let x = 0; x < 16; x += 1) {
           const blockX = chunkWorldX + x
           const blockZ = chunkWorldZ + z
-          const hBlock = viewer.world.highestBlocks.get(`${blockX},${blockZ}`)
+          const hBlock = highestBlocks.get(`${blockX},${blockZ}`)
           const block = bot.world.getBlock(new Vec3(blockX, hBlock?.y ?? 0, blockZ))
           // const block = Block.fromStateId(hBlock?.stateId ?? -1, hBlock?.biomeId ?? -1)
           const index = z * 16 + x
diff --git a/src/react/ModuleSignsViewer.tsx b/src/react/ModuleSignsViewer.tsx
index 70b42ba0..2cc9ad69 100644
--- a/src/react/ModuleSignsViewer.tsx
+++ b/src/react/ModuleSignsViewer.tsx
@@ -7,21 +7,22 @@ export const name = 'loaded world signs'
 export default () => {
   const [selected, setSelected] = useState([] as string[])
   const allSignsPos = [] as string[]
-  const signs = viewer.world instanceof WorldRendererThree ? [...viewer.world.chunkTextures.values()].flatMap(textures => {
-    return Object.entries(textures).map(([signPosKey, texture]) => {
-      allSignsPos.push(signPosKey)
-      const pos = signPosKey.split(',').map(Number)
-      const isSelected = selected.includes(signPosKey)
-      return <div key={signPosKey}>
-        <div style={{ color: 'white', userSelect: 'text', fontSize: 8, }}>{pos.join(', ')}</div>
-        <div
-          style={{ background: isSelected ? 'rgba(255, 255, 255, 0.8)' : 'rgba(255, 255, 255, 0.5)', padding: 5, borderRadius: 5, cursor: 'pointer' }}
-          onClick={() => setSelected(selected.includes(signPosKey) ? selected.filter(x => x !== signPosKey) : [...selected, signPosKey])}>
-          <AddElem elem={texture.image} />
-        </div>
-      </div>
-    })
-  }) : []
+  const signs = []
+  // const signs = viewer.world instanceof WorldRendererThree ? [...viewer.world.chunkTextures.values()].flatMap(textures => {
+  //   return Object.entries(textures).map(([signPosKey, texture]) => {
+  //     allSignsPos.push(signPosKey)
+  //     const pos = signPosKey.split(',').map(Number)
+  //     const isSelected = selected.includes(signPosKey)
+  //     return <div key={signPosKey}>
+  //       <div style={{ color: 'white', userSelect: 'text', fontSize: 8, }}>{pos.join(', ')}</div>
+  //       <div
+  //         style={{ background: isSelected ? 'rgba(255, 255, 255, 0.8)' : 'rgba(255, 255, 255, 0.5)', padding: 5, borderRadius: 5, cursor: 'pointer' }}
+  //         onClick={() => setSelected(selected.includes(signPosKey) ? selected.filter(x => x !== signPosKey) : [...selected, signPosKey])}>
+  //         <AddElem elem={texture.image} />
+  //       </div>
+  //     </div>
+  //   })
+  // }) : []
 
   return <FullScreenWidget name={name} title='Loaded Signs'>
     <div>
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 213c92b9..8037cd72 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -53,6 +53,19 @@ import { UIProvider } from './react/UIProvider'
 import { useAppScale } from './scaleInterface'
 import PacketsReplayProvider from './react/PacketsReplayProvider'
 import TouchInteractionHint from './react/TouchInteractionHint'
+import { ua } from './react/utils'
+
+const isFirefox = ua.getBrowser().name === 'Firefox'
+if (isFirefox) {
+  // set custom property
+  document.body.style.setProperty('--thin-if-firefox', 'thin')
+}
+
+const isIphone = ua.getDevice().model === 'iPhone' // todo ipad?
+
+if (isIphone) {
+  document.documentElement.style.setProperty('--hud-bottom-max', '21px') // env-safe-aria-inset-bottom
+}
 
 const RobustPortal = ({ children, to }) => {
   return createPortal(<PerComponentErrorBoundary>{children}</PerComponentErrorBoundary>, to)
diff --git a/src/rendererUtils.ts b/src/rendererUtils.ts
index 12081649..49a77801 100644
--- a/src/rendererUtils.ts
+++ b/src/rendererUtils.ts
@@ -74,8 +74,7 @@ const updateFovAnimation = () => {
       currentFov = targetFov
     }
 
-    viewer.camera.fov = currentFov
-    viewer.camera.updateProjectionMatrix()
+    appViewer.inWorldRenderingConfig.fov = currentFov
   }
   lastUpdateTime = now
 }
@@ -91,6 +90,6 @@ export const watchFov = () => {
   })
 
   subscribeKey(gameAdditionalState, 'isSneaking', () => {
-    viewer.setFirstPersonCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch)
+    appViewer.backend?.updateCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch)
   })
 }
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 81bd3ac6..344f79d6 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -3,13 +3,11 @@ import { join, dirname, basename } from 'path'
 import fs from 'fs'
 import JSZip from 'jszip'
 import { proxy, subscribe } from 'valtio'
-import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
 import { armorTextures } from 'renderer/viewer/lib/entity/armorModels'
-import { collectFilesToCopy, copyFilesAsyncWithProgress, mkdirRecursive, removeFileRecursiveAsync } from './browserfs'
+import { copyFilesAsyncWithProgress, mkdirRecursive, removeFileRecursiveAsync } from './browserfs'
 import { showNotification } from './react/NotificationProvider'
 import { options } from './optionsStorage'
 import { showOptionsModal } from './react/SelectOption'
-import { appStatusState } from './react/AppStatusProvider'
 import { appReplacableResources, resourcesContentOriginal } from './generated/resources'
 import { gameAdditionalState, miscUiState } from './globalState'
 import { watchUnloadForCleanup } from './gameUnload'
@@ -312,8 +310,9 @@ export const getResourcepackTiles = async (type: 'blocks' | 'items' | 'armor', e
 }
 
 const prepareBlockstatesAndModels = async (progressReporter: ProgressReporter) => {
-  viewer.world.customBlockStates = {}
-  viewer.world.customModels = {}
+  const resources = appViewer.resourcesManager.currentResources!
+  resources.customBlockStates = {}
+  resources.customModels = {}
   const usedBlockTextures = new Set<string>()
   const usedItemTextures = new Set<string>()
   const basePath = await getActiveResourcepackBasePath()
@@ -360,9 +359,9 @@ const prepareBlockstatesAndModels = async (progressReporter: ProgressReporter) =
     const blockModelsPath = `${basePath}/assets/${namespaceDir}/models/block`
     const itemModelsPath = `${basePath}/assets/${namespaceDir}/models/item`
 
-    Object.assign(viewer.world.customBlockStates!, await readModelData(blockstatesPath, 'blockstates', namespaceDir))
-    Object.assign(viewer.world.customModels!, await readModelData(blockModelsPath, 'models', namespaceDir))
-    Object.assign(viewer.world.customModels!, await readModelData(itemModelsPath, 'models', namespaceDir))
+    Object.assign(resources.customBlockStates!, await readModelData(blockstatesPath, 'blockstates', namespaceDir))
+    Object.assign(resources.customModels!, await readModelData(blockModelsPath, 'models', namespaceDir))
+    Object.assign(resources.customModels!, await readModelData(itemModelsPath, 'models', namespaceDir))
   }
 
   try {
@@ -372,8 +371,8 @@ const prepareBlockstatesAndModels = async (progressReporter: ProgressReporter) =
     }
   } catch (err) {
     console.error('Failed to read some of resource pack blockstates and models', err)
-    viewer.world.customBlockStates = undefined
-    viewer.world.customModels = undefined
+    resources.customBlockStates = undefined
+    resources.customModels = undefined
   }
   return {
     usedBlockTextures,
@@ -531,46 +530,48 @@ const updateAllReplacableTextures = async () => {
 
 const repeatArr = (arr, i) => Array.from({ length: i }, () => arr)
 
-const updateTextures = async (progressReporter = createConsoleLogProgressReporter()) => {
+const updateTextures = async (progressReporter = createConsoleLogProgressReporter(), skipResourcesLoad = false) => {
+  if (!appViewer.resourcesManager.currentResources) {
+    appViewer.resourcesManager.resetResources()
+  }
+  const resources = appViewer.resourcesManager.currentResources!
   currentErrors = []
-  const origBlocksFiles = Object.keys(viewer.world.sourceData.blocksAtlases.latest.textures)
-  const origItemsFiles = Object.keys(viewer.world.sourceData.itemsAtlases.latest.textures)
+  const origBlocksFiles = Object.keys(appViewer.resourcesManager.sourceBlocksAtlases.latest.textures)
+  const origItemsFiles = Object.keys(appViewer.resourcesManager.sourceItemsAtlases.latest.textures)
   const origArmorFiles = Object.keys(armorTextures)
   const { usedBlockTextures, usedItemTextures } = await prepareBlockstatesAndModels(progressReporter) ?? {}
   const blocksData = await getResourcepackTiles('blocks', [...origBlocksFiles, ...usedBlockTextures ?? []], progressReporter)
   const itemsData = await getResourcepackTiles('items', [...origItemsFiles, ...usedItemTextures ?? []], progressReporter)
   const armorData = await getResourcepackTiles('armor', origArmorFiles, progressReporter)
   await updateAllReplacableTextures()
-  viewer.world.customTextures = {}
+  resources.customTextures = {}
+
   if (blocksData) {
-    viewer.world.customTextures.blocks = {
+    resources.customTextures.blocks = {
       tileSize: blocksData.firstTextureSize,
       textures: blocksData.textures
     }
   }
   if (itemsData) {
-    viewer.world.customTextures.items = {
+    resources.customTextures.items = {
       tileSize: itemsData.firstTextureSize,
       textures: itemsData.textures
     }
   }
   if (armorData) {
-    viewer.world.customTextures.armor = {
+    resources.customTextures.armor = {
       tileSize: armorData.firstTextureSize,
       textures: armorData.textures
     }
   }
 
-  if (viewer.world.active) {
-    await viewer.world.updateAssetsData()
-    if (viewer.world instanceof WorldRendererThree) {
-      viewer.world.rerenderAllChunks?.()
-    }
+  if (!skipResourcesLoad) {
+    await appViewer.resourcesManager.updateAssetsData({ })
   }
 }
 
-export const resourcepackReload = async (version) => {
-  await updateTextures()
+export const resourcepackReload = async (skipResourcesLoad = false) => {
+  await updateTextures(undefined, skipResourcesLoad)
 }
 
 export const copyServerResourcePackToRegular = async (name = 'default') => {
diff --git a/src/resourcesManager.ts b/src/resourcesManager.ts
index 43c3882e..64810165 100644
--- a/src/resourcesManager.ts
+++ b/src/resourcesManager.ts
@@ -1,24 +1,201 @@
-import { Item } from 'prismarine-item'
-import { ItemSpecificContextProperties } from 'renderer/viewer/lib/basePlayerState'
-import { getItemDefinition } from 'mc-assets/dist/itemDefinitions'
-import { playerState } from './mineflayer/playerState'
-import { GeneralInputItem, getItemMetadata } from './mineflayer/items'
+import { EventEmitter } from 'events'
+import TypedEmitter from 'typed-emitter'
+import blocksAtlases from 'mc-assets/dist/blocksAtlases.json'
+import itemsAtlases from 'mc-assets/dist/itemsAtlases.json'
+import itemDefinitionsJson from 'mc-assets/dist/itemDefinitions.json'
+import blocksAtlasLatest from 'mc-assets/dist/blocksAtlasLatest.png'
+import blocksAtlasLegacy from 'mc-assets/dist/blocksAtlasLegacy.png'
+import itemsAtlasLatest from 'mc-assets/dist/itemsAtlasLatest.png'
+import itemsAtlasLegacy from 'mc-assets/dist/itemsAtlasLegacy.png'
+import christmasPack from 'mc-assets/dist/textureReplacements/christmas'
+import { AtlasParser } from 'mc-assets/dist/atlasParser'
+import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
+import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
+import { getLoadedItemDefinitionsStore } from 'mc-assets'
+import { getLoadedImage } from 'mc-assets/dist/utils'
+import { generateGuiAtlas } from 'renderer/viewer/lib/guiRenderer'
+import { importLargeData } from '../generated/large-data-aliases'
+import { loadMinecraftData } from './connect'
 
-export const getItemModelName = (item: GeneralInputItem, specificProps: ItemSpecificContextProperties) => {
-  let itemModelName = item.name
-  const { customModel } = getItemMetadata(item)
-  if (customModel) {
-    itemModelName = customModel
+type ResourceManagerEvents = {
+  assetsTexturesUpdated: () => void
+  assetsInventoryReady: () => void
+}
+
+export class LoadedResources {
+  // Atlas parsers
+  itemsAtlasParser: AtlasParser
+  blocksAtlasParser: AtlasParser
+  itemsAtlasImage: HTMLImageElement
+  blocksAtlasImage: HTMLImageElement
+  // User data (specific to current resourcepack/version)
+  customBlockStates?: Record<string, any>
+  customModels?: Record<string, any>
+  customTextures: {
+    items?: { tileSize: number | undefined, textures: Record<string, HTMLImageElement> }
+    blocks?: { tileSize: number | undefined, textures: Record<string, HTMLImageElement> }
+    armor?: { tileSize: number | undefined, textures: Record<string, HTMLImageElement> }
+  } = {}
+
+  itemsRenderer: ItemsRenderer
+  worldBlockProvider: WorldBlockProvider
+  blockstatesModels: any = null
+
+  version: string
+  texturesVersion: string
+}
+
+export interface ResourcesCurrentConfig {
+  version: string
+  texturesVersion?: string
+  noBlockstatesModels?: boolean
+  includeOnlyBlocks?: string[]
+}
+
+export interface UpdateAssetsRequest {
+  _?: false
+}
+
+export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<ResourceManagerEvents>) {
+  // Source data (imported, not changing)
+  sourceBlockStatesModels: any = null
+  readonly sourceBlocksAtlases: any = blocksAtlases
+  readonly sourceItemsAtlases: any = itemsAtlases
+  readonly sourceItemDefinitionsJson: any = itemDefinitionsJson
+  readonly itemsDefinitionsStore = getLoadedItemDefinitionsStore(this.sourceItemDefinitionsJson)
+
+  currentResources: LoadedResources | undefined
+  currentConfig: ResourcesCurrentConfig | undefined
+  abortController = new AbortController()
+
+  async loadMcData (version: string) {
+    await loadMinecraftData(version)
   }
 
-  const itemSelector = playerState.getItemSelector({
-    ...specificProps
-  })
-  const modelFromDef = getItemDefinition(viewer.world.itemsDefinitionsStore, {
-    name: itemModelName,
-    version: viewer.world.texturesVersion!,
-    properties: itemSelector
-  })?.model
-  const model = (modelFromDef === 'minecraft:special' ? undefined : modelFromDef) ?? itemModelName
-  return model
+  async loadSourceData (version: string) {
+    await this.loadMcData(version)
+    this.sourceBlockStatesModels ??= await importLargeData('blockStatesModels')
+  }
+
+  resetResources () {
+    this.currentResources = new LoadedResources()
+  }
+
+  async updateAssetsData (request: UpdateAssetsRequest, unstableSkipEvent = false) {
+    if (!this.currentConfig) throw new Error('No config loaded')
+    const abortController = new AbortController()
+    await this.loadSourceData(this.currentConfig.version)
+    if (abortController.signal.aborted) return
+
+    const resources = this.currentResources ?? new LoadedResources()
+    resources.version = this.currentConfig.version
+    resources.texturesVersion = this.currentConfig.texturesVersion ?? resources.version
+
+    resources.blockstatesModels = {
+      blockstates: {},
+      models: {}
+    }
+    // todo-low resolve version
+    resources.blockstatesModels.blockstates.latest = {
+      ...this.sourceBlockStatesModels.blockstates.latest,
+      ...resources.customBlockStates
+    }
+
+    resources.blockstatesModels.models.latest = {
+      ...this.sourceBlockStatesModels.models.latest,
+      ...resources.customModels
+    }
+
+
+    const blocksAssetsParser = new AtlasParser(this.sourceBlocksAtlases, blocksAtlasLatest, blocksAtlasLegacy)
+    const itemsAssetsParser = new AtlasParser(this.sourceItemsAtlases, itemsAtlasLatest, itemsAtlasLegacy)
+
+    const blockTexturesChanges = {} as Record<string, string>
+    const date = new Date()
+    if ((date.getMonth() === 11 && date.getDate() >= 24) || (date.getMonth() === 0 && date.getDate() <= 6)) {
+      Object.assign(blockTexturesChanges, christmasPack)
+    }
+
+    const customBlockTextures = Object.keys(resources.customTextures.blocks?.textures ?? {})
+    const customItemTextures = Object.keys(resources.customTextures.items?.textures ?? {})
+
+    console.time('createBlocksAtlas')
+    const { atlas: blocksAtlas, canvas: blocksCanvas } = await blocksAssetsParser.makeNewAtlas(
+      resources.texturesVersion,
+      (textureName) => {
+        if (this.currentConfig!.includeOnlyBlocks && !this.currentConfig!.includeOnlyBlocks.includes(textureName)) return false
+        const texture = resources.customTextures.blocks?.textures[textureName]
+        return blockTexturesChanges[textureName] ?? texture
+      },
+      undefined,
+      undefined,
+      customBlockTextures
+    )
+    console.timeEnd('createBlocksAtlas')
+
+    if (abortController.signal.aborted) return
+    console.time('createItemsAtlas')
+    const { atlas: itemsAtlas, canvas: itemsCanvas } = await itemsAssetsParser.makeNewAtlas(
+      resources.texturesVersion,
+      (textureName) => {
+        const texture = resources.customTextures.items?.textures[textureName]
+        if (!texture) return
+        return texture
+      },
+      resources.customTextures.items?.tileSize,
+      undefined,
+      customItemTextures
+    )
+    console.timeEnd('createItemsAtlas')
+
+    resources.blocksAtlasParser = new AtlasParser({ latest: blocksAtlas }, blocksCanvas.toDataURL())
+    resources.itemsAtlasParser = new AtlasParser({ latest: itemsAtlas }, itemsCanvas.toDataURL())
+    resources.blocksAtlasImage = await getLoadedImage(blocksCanvas.toDataURL())
+    resources.itemsAtlasImage = await getLoadedImage(itemsCanvas.toDataURL())
+
+    if (resources.version && resources.blockstatesModels && resources.itemsAtlasParser && resources.blocksAtlasParser) {
+      resources.itemsRenderer = new ItemsRenderer(
+        resources.version,
+        resources.blockstatesModels,
+        resources.itemsAtlasParser,
+        resources.blocksAtlasParser
+      )
+      resources.worldBlockProvider = worldBlockProvider(
+        resources.blockstatesModels,
+        resources.blocksAtlasParser.atlas,
+        'latest'
+      )
+    }
+
+    if (abortController.signal.aborted) return
+
+    this.currentResources = resources
+    if (!unstableSkipEvent) { // todo rework resourcepack optimization
+      this.emit('assetsTexturesUpdated')
+      void this.generateGuiTextures().then(() => {
+        this.emit('assetsInventoryReady')
+      })
+    }
+  }
+
+  async generateGuiTextures () {
+    await generateGuiAtlas()
+  }
+
+  async downloadDebugAtlas (isItems = false) {
+    const resources = this.currentResources
+    if (!resources) throw new Error('No resources loaded')
+    const atlasParser = (isItems ? resources.itemsAtlasParser : resources.blocksAtlasParser)!
+    const dataUrl = await atlasParser.createDebugImage(true)
+    const a = document.createElement('a')
+    a.href = dataUrl
+    a.download = `atlas-debug-${isItems ? 'items' : 'blocks'}.png`
+    a.click()
+  }
+
+  destroy () {
+    this.abortController.abort()
+    this.currentResources = undefined
+    this.abortController = new AbortController()
+  }
 }
diff --git a/src/shims/minecraftData.ts b/src/shims/minecraftData.ts
index e5097d0f..989aa698 100644
--- a/src/shims/minecraftData.ts
+++ b/src/shims/minecraftData.ts
@@ -1,4 +1,4 @@
-import { versionToNumber } from 'renderer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/common/utils'
 import { restoreMinecraftData } from '../optimizeJson'
 // import minecraftInitialDataJson from '../../generated/minecraft-initial-data.json'
 import { toMajorVersion } from '../utils'
diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index aa33db60..2f872015 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -1,5 +1,5 @@
 import { Vec3 } from 'vec3'
-import { versionToNumber } from 'renderer/viewer/prepare/utils'
+import { versionToNumber } from 'renderer/viewer/common/utils'
 import { loadScript } from 'renderer/viewer/lib/utils'
 import type { Block } from 'prismarine-block'
 import { subscribeKey } from 'valtio/utils'
@@ -46,7 +46,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
     const isMuted = options.mutedSounds.includes(soundKey) || options.volume === 0
     if (position) {
       if (!isMuted) {
-        viewer.playSound(
+        appViewer.backend?.soundSystem?.playSound(
           position,
           soundData.url,
           soundData.volume * (options.volume / 100),
diff --git a/src/sounds/soundsMap.ts b/src/sounds/soundsMap.ts
index c461dd8d..1b0a0178 100644
--- a/src/sounds/soundsMap.ts
+++ b/src/sounds/soundsMap.ts
@@ -1,6 +1,6 @@
 import fs from 'fs'
 import path from 'path'
-import { versionsMapToMajor, versionToMajor, versionToNumber } from 'renderer/viewer/prepare/utils'
+import { versionsMapToMajor, versionToMajor, versionToNumber } from 'renderer/viewer/common/utils'
 
 import { stopAllSounds } from '../basicSounds'
 import { musicSystem } from './musicSystem'
diff --git a/src/topRightStats.ts b/src/topRightStats.ts
deleted file mode 100644
index 529aa964..00000000
--- a/src/topRightStats.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import Stats from 'stats.js'
-import StatsGl from 'stats-gl'
-import { isCypress } from './standaloneUtils'
-
-const stats = new Stats()
-const stats2 = new Stats()
-const hasRamPanel = stats2.dom.children.length === 3
-const statsGl = new StatsGl({ minimal: true })
-// in my case values are good: gpu: < 0.5, cpu < 0.15
-
-stats2.showPanel(2)
-
-// prod or small screen
-const denseMode = process.env.NODE_ENV === 'production' || window.innerHeight < 500
-
-let total = 0
-const addStat = (dom, size = 80) => {
-  dom.style.position = 'absolute'
-  if (denseMode) dom.style.height = '12px'
-  dom.style.overflow = 'hidden'
-  dom.style.left = ''
-  dom.style.top = 0
-  dom.style.right = `${total}px`
-  dom.style.width = '80px'
-  dom.style.zIndex = 1
-  dom.style.opacity = '0.8'
-  document.body.appendChild(dom)
-  total += size
-}
-const addStatsGlStat = (canvas) => {
-  const container = document.createElement('div')
-  canvas.style.position = 'static'
-  canvas.style.display = 'block'
-  container.appendChild(canvas)
-  addStat(container)
-}
-addStat(stats.dom)
-if (hasRamPanel) {
-  addStat(stats2.dom)
-}
-
-export const toggleStatsVisibility = (visible: boolean) => {
-  if (visible) {
-    stats.dom.style.display = 'block'
-    stats2.dom.style.display = 'block'
-    statsGl.container.style.display = 'block'
-  } else {
-    stats.dom.style.display = 'none'
-    stats2.dom.style.display = 'none'
-    statsGl.container.style.display = 'none'
-  }
-}
-
-const hideStats = localStorage.hideStats || isCypress()
-if (hideStats) {
-  toggleStatsVisibility(false)
-}
-
-export const initWithRenderer = (canvas) => {
-  if (hideStats) return
-  statsGl.init(canvas)
-  // if (statsGl.gpuPanel && process.env.NODE_ENV !== 'production') {
-  //   addStatsGlStat(statsGl.gpuPanel.canvas)
-  // }
-  // addStatsGlStat(statsGl.msPanel.canvas)
-  statsGl.container.style.display = 'flex'
-  statsGl.container.style.justifyContent = 'flex-end'
-  let i = 0
-  for (const _child of statsGl.container.children) {
-    const child = _child as HTMLElement
-    if (i++ === 0) {
-      child.style.display = 'none'
-    }
-    child.style.position = ''
-  }
-}
-
-export const statsStart = () => {
-  stats.begin()
-  stats2.begin()
-  statsGl.begin()
-}
-export const statsEnd = () => {
-  stats.end()
-  stats2.end()
-  statsGl.end()
-}
-
-// for advanced debugging, use with watch expression
-
-window.statsPerSecAvg = {}
-let currentStatsPerSec = {} as Record<string, number[]>
-const waitingStatsPerSec = {}
-window.markStart = (label) => {
-  waitingStatsPerSec[label] ??= []
-  waitingStatsPerSec[label][0] = performance.now()
-}
-window.markEnd = (label) => {
-  if (!waitingStatsPerSec[label]?.[0]) return
-  currentStatsPerSec[label] ??= []
-  currentStatsPerSec[label].push(performance.now() - waitingStatsPerSec[label][0])
-  delete waitingStatsPerSec[label]
-}
-const updateStatsPerSecAvg = () => {
-  window.statsPerSecAvg = Object.fromEntries(Object.entries(currentStatsPerSec).map(([key, value]) => {
-    return [key, {
-      avg: value.reduce((a, b) => a + b, 0) / value.length,
-      count: value.length
-    }]
-  }))
-  currentStatsPerSec = {}
-}
-
-
-window.statsPerSec = {}
-let statsPerSecCurrent = {}
-let lastReset = performance.now()
-window.addStatPerSec = (name) => {
-  statsPerSecCurrent[name] ??= 0
-  statsPerSecCurrent[name]++
-}
-window.statsPerSecCurrent = statsPerSecCurrent
-setInterval(() => {
-  window.statsPerSec = { duration: Math.floor(performance.now() - lastReset), ...statsPerSecCurrent, }
-  statsPerSecCurrent = {}
-  window.statsPerSecCurrent = statsPerSecCurrent
-  updateStatsPerSecAvg()
-  lastReset = performance.now()
-}, 1000)
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 3e607f49..d52c3a5f 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -1,12 +1,12 @@
 // not all options are watched here
 
 import { subscribeKey } from 'valtio/utils'
-import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
 import { isMobile } from 'renderer/viewer/lib/simpleUtils'
+import { WorldDataEmitter } from 'renderer/viewer/lib/worldDataEmitter'
 import { options, watchValue } from './optionsStorage'
 import { reloadChunks } from './utils'
 import { miscUiState } from './globalState'
-import { toggleStatsVisibility } from './topRightStats'
+import { isCypress } from './standaloneUtils'
 
 subscribeKey(options, 'renderDistance', reloadChunks)
 subscribeKey(options, 'multiplayerRenderDistance', reloadChunks)
@@ -17,87 +17,104 @@ watchValue(options, o => {
   document.documentElement.style.setProperty('--chatHeight', `${o.chatHeight}px`)
   // gui scale is set in scaleInterface.ts
 })
+const updateTouch = (o) => {
+  miscUiState.currentTouch = o.alwaysShowMobileControls || isMobile()
+}
+watchValue(options, updateTouch)
+window.matchMedia('(pointer: coarse)').addEventListener('change', (e) => {
+  updateTouch(options)
+})
 
 /** happens once */
 export const watchOptionsAfterViewerInit = () => {
-  const updateTouch = (o) => {
-    miscUiState.currentTouch = o.alwaysShowMobileControls || isMobile()
-  }
-
-  watchValue(options, updateTouch)
-  window.matchMedia('(pointer: coarse)').addEventListener('change', (e) => {
-    updateTouch(options)
+  watchValue(options, o => {
+    appViewer.inWorldRenderingConfig.showChunkBorders = o.showChunkBorders
   })
 
   watchValue(options, o => {
-    if (!viewer) return
-    viewer.world.config.showChunkBorders = o.showChunkBorders
-    viewer.entities.setDebugMode(o.showChunkBorders ? 'basic' : 'none')
+    appViewer.inWorldRenderingConfig.mesherWorkers = o.lowMemoryMode ? 1 : o.numWorkers
   })
 
   watchValue(options, o => {
-    if (!viewer) return
-    // todo ideally there shouldnt be this setting and we don't need to send all same chunks to all workers
-    viewer.world.config.numWorkers = o.lowMemoryMode ? 1 : o.numWorkers
+    appViewer.inWorldRenderingConfig.renderEntities = o.renderEntities
   })
 
   watchValue(options, o => {
-    viewer.entities.setRendering(o.renderEntities)
+    const { renderDebug } = o
+    if (renderDebug === 'none' || isCypress()) {
+      appViewer.config.statsVisible = 0
+    } else if (o.renderDebug === 'basic') {
+      appViewer.config.statsVisible = 1
+    } else if (o.renderDebug === 'advanced') {
+      appViewer.config.statsVisible = 2
+    }
   })
 
-  if (options.renderDebug === 'none') {
-    toggleStatsVisibility(false)
-  }
-  subscribeKey(options, 'renderDebug', () => {
-    if (options.renderDebug === 'none') {
-      toggleStatsVisibility(false)
+  // Track window focus state and update FPS limit accordingly
+  let windowFocused = true
+  const updateFpsLimit = (o: typeof options) => {
+    const backgroundFpsLimit = o.backgroundRendering
+    const normalFpsLimit = o.frameLimit
+
+    if (windowFocused) {
+      appViewer.config.fpsLimit = normalFpsLimit || undefined
+    } else if (backgroundFpsLimit === '5fps') {
+      appViewer.config.fpsLimit = 5
+    } else if (backgroundFpsLimit === '20fps') {
+      appViewer.config.fpsLimit = 20
     } else {
-      toggleStatsVisibility(true)
+      appViewer.config.fpsLimit = undefined
     }
+  }
+
+  window.addEventListener('focus', () => {
+    windowFocused = true
+    updateFpsLimit(options)
   })
+  window.addEventListener('blur', () => {
+    windowFocused = false
+    updateFpsLimit(options)
+  })
+
   watchValue(options, o => {
-    viewer.world.displayStats = o.renderDebug === 'advanced'
+    updateFpsLimit(o)
   })
+
   watchValue(options, (o, isChanged) => {
-    viewer.world.mesherConfig.clipWorldBelowY = o.clipWorldBelowY
-    viewer.world.mesherConfig.disableSignsMapsSupport = o.disableSignsMapsSupport
-    if (isChanged) {
-      (viewer.world as WorldRendererThree).rerenderAllChunks()
-    }
+    appViewer.inWorldRenderingConfig.clipWorldBelowY = o.clipWorldBelowY
+    appViewer.inWorldRenderingConfig.extraBlockRenderers = !o.disableSignsMapsSupport
+    appViewer.inWorldRenderingConfig.fetchPlayerSkins = o.loadPlayerSkins
+    appViewer.inWorldRenderingConfig.highlightBlockColor = o.highlightBlockColor
   })
 
-  viewer.world.mesherConfig.smoothLighting = options.smoothLighting
+  appViewer.inWorldRenderingConfig.smoothLighting = options.smoothLighting
   subscribeKey(options, 'smoothLighting', () => {
-    viewer.world.mesherConfig.smoothLighting = options.smoothLighting;
-    (viewer.world as WorldRendererThree).rerenderAllChunks()
+    appViewer.inWorldRenderingConfig.smoothLighting = options.smoothLighting
   })
+
   subscribeKey(options, 'newVersionsLighting', () => {
-    viewer.world.mesherConfig.enableLighting = !bot.supportFeature('blockStateId') || options.newVersionsLighting;
-    (viewer.world as WorldRendererThree).rerenderAllChunks()
+    appViewer.inWorldRenderingConfig.enableLighting = !bot.supportFeature('blockStateId') || options.newVersionsLighting
   })
+
   customEvents.on('mineflayerBotCreated', () => {
-    viewer.world.mesherConfig.enableLighting = !bot.supportFeature('blockStateId') || options.newVersionsLighting
+    appViewer.inWorldRenderingConfig.enableLighting = !bot.supportFeature('blockStateId') || options.newVersionsLighting
   })
 
   watchValue(options, o => {
-    if (!(viewer.world instanceof WorldRendererThree)) return
-    viewer.world.starField.enabled = o.starfieldRendering
+    appViewer.inWorldRenderingConfig.starfield = o.starfieldRendering
   })
 
   watchValue(options, o => {
-    viewer.world.neighborChunkUpdates = o.neighborChunkUpdates
+    // appViewer.inWorldRenderingConfig.neighborChunkUpdates = o.neighborChunkUpdates
   })
 }
 
-let viewWatched = false
-export const watchOptionsAfterWorldViewInit = () => {
-  if (viewWatched) return
-  viewWatched = true
+export const watchOptionsAfterWorldViewInit = (worldView: WorldDataEmitter) => {
   watchValue(options, o => {
     if (!worldView) return
     worldView.keepChunksDistance = o.keepChunksDistance
-    viewer.world.config.renderEars = o.renderEars
-    viewer.world.config.showHand = o.showHand
-    viewer.world.config.viewBobbing = o.viewBobbing
+    appViewer.inWorldRenderingConfig.renderEars = o.renderEars
+    appViewer.inWorldRenderingConfig.showHand = o.showHand
+    appViewer.inWorldRenderingConfig.viewBobbing = o.viewBobbing
   })
 }
diff --git a/src/water.ts b/src/water.ts
index 94875e33..9221ec8a 100644
--- a/src/water.ts
+++ b/src/water.ts
@@ -1,18 +1,17 @@
-import * as THREE from 'three'
 import { watchUnloadForCleanup } from './gameUnload'
 
 let inWater = false
 
 customEvents.on('gameLoaded', () => {
   const cleanup = () => {
-    viewer.scene.fog = null
+    appViewer.playerState.reactive.inWater = false
   }
   watchUnloadForCleanup(cleanup)
 
   const updateInWater = () => {
     const waterBr = Object.keys(bot.entity.effects).find((effect: any) => loadedData.effects[effect.id].name === 'water_breathing')
     if (inWater) {
-      viewer.scene.fog = new THREE.Fog(0x00_00_ff, 0.1, waterBr ? 100 : 20) // Set the fog color to blue if the bot is in water.
+      appViewer.playerState.reactive.inWater = true
     } else {
       cleanup()
     }
@@ -32,5 +31,5 @@ let sceneBg = { r: 0, g: 0, b: 0 }
 export const updateBackground = (newSceneBg = sceneBg) => {
   sceneBg = newSceneBg
   const color: [number, number, number] = inWater ? [0, 0, 1] : [sceneBg.r, sceneBg.g, sceneBg.b]
-  viewer.world.changeBackgroundColor(color)
+  appViewer.playerState.reactive.backgroundColor = color
 }

From 237aeec6ac9513779be0d47c1f522aa5392a7953 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Mar 2025 03:46:08 +0300
Subject: [PATCH 369/753] feat: add `preventBackgroundTimeoutKick` which is
 disabled by default but can be enabled from advanced settings. Allows to
 avoid kicking you out of the server when tab is not focused for long time by
 playing 1hz sound at very low volume to keep tab active

---
 src/core/timers.ts       | 139 +++++++++++++++++++++++++++++++++++++++
 src/index.ts             |   1 +
 src/mineflayer/timers.ts |   9 +++
 src/optionsGuiScheme.tsx |  73 +++++++++++---------
 src/optionsStorage.ts    |   1 +
 5 files changed, 191 insertions(+), 32 deletions(-)
 create mode 100644 src/core/timers.ts
 create mode 100644 src/mineflayer/timers.ts

diff --git a/src/core/timers.ts b/src/core/timers.ts
new file mode 100644
index 00000000..fd9c72f5
--- /dev/null
+++ b/src/core/timers.ts
@@ -0,0 +1,139 @@
+import { options } from '../optionsStorage'
+
+interface Timer {
+  id: number
+  callback: () => void
+  targetTime: number
+  isInterval: boolean
+  interval?: number
+  cleanup?: () => void
+}
+
+let nextTimerId = 1
+const timers: Timer[] = []
+
+// TODO implementation breaks tps (something is wrong with intervals)
+const fixBrowserTimers = () => {
+  const originalSetTimeout = window.setTimeout
+  //@ts-expect-error
+  window.setTimeout = (callback: () => void, delay: number) => {
+    if (!delay) {
+      return originalSetTimeout(callback)
+    }
+    const id = nextTimerId++
+    const targetTime = performance.now() + delay
+    timers.push({ id, callback, targetTime, isInterval: false })
+    originalSetTimeout(() => {
+      checkTimers()
+    }, delay)
+    return id
+  }
+
+  const originalSetInterval = window.setInterval
+  //@ts-expect-error
+  window.setInterval = (callback: () => void, interval: number) => {
+    if (!interval) {
+      return originalSetInterval(callback, interval)
+    }
+    const id = nextTimerId++
+    const targetTime = performance.now() + interval
+    const originalInterval = originalSetInterval(() => {
+      checkTimers()
+    }, interval)
+    timers.push({
+      id,
+      callback,
+      targetTime,
+      isInterval: true,
+      interval,
+      cleanup () {
+        originalClearInterval(originalInterval)
+      },
+    })
+    return id
+  }
+
+  const originalClearTimeout = window.clearTimeout
+  //@ts-expect-error
+  window.clearTimeout = (id: number) => {
+    const index = timers.findIndex(t => t.id === id)
+    if (index !== -1) {
+      timers.splice(index, 1)
+    }
+    return originalClearTimeout(id)
+  }
+
+  const originalClearInterval = window.clearInterval
+  //@ts-expect-error
+  window.clearInterval = (id: number) => {
+    const index = timers.findIndex(t => t.id === id)
+    if (index !== -1) {
+      const timer = timers[index]
+      if (timer.cleanup) {
+        timer.cleanup()
+      }
+      timers.splice(index, 1)
+    }
+    return originalClearInterval(id)
+  }
+}
+
+export const checkTimers = () => {
+  const now = performance.now()
+
+  let triggered = false
+  for (let i = timers.length - 1; i >= 0; i--) {
+    const timer = timers[i]
+
+    if (now >= timer.targetTime) {
+      triggered = true
+      timer.callback()
+
+      if (timer.isInterval && timer.interval) {
+        // Reschedule interval
+        timer.targetTime = now + timer.interval
+      } else {
+        // Remove one-time timer
+        timers.splice(i, 1)
+      }
+    }
+  }
+
+  if (!triggered) {
+    console.log('No timers triggered!')
+  }
+}
+
+// workaround for browser timers throttling after 5 minutes of tab inactivity
+export const preventThrottlingWithSound = () => {
+  try {
+    const audioContext = new (window.AudioContext || (window as any).webkitAudioContext)()
+    const oscillator = audioContext.createOscillator()
+    const gainNode = audioContext.createGain()
+
+    // Unfortunatelly cant use 0
+    gainNode.gain.value = 0.001
+
+    // Connect nodes
+    oscillator.connect(gainNode)
+    gainNode.connect(audioContext.destination)
+
+    // Use a very low frequency
+    oscillator.frequency.value = 1
+
+    // Start playing
+    oscillator.start()
+
+    return () => {
+      try {
+        oscillator.stop()
+        audioContext.close()
+      } catch (err) {
+        console.error('Error stopping silent audio:', err)
+      }
+    }
+  } catch (err) {
+    console.error('Error creating silent audio:', err)
+    return () => {}
+  }
+}
diff --git a/src/index.ts b/src/index.ts
index f11cee11..5e346ae1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -13,6 +13,7 @@ import './shims/patchShims'
 import './mineflayer/java-tester/index'
 import './external'
 import './appConfig'
+import './mineflayer/timers'
 import { getServerInfo } from './mineflayer/mc-protocol'
 import { onGameLoad } from './inventoryWindows'
 import initCollisionShapes from './getCollisionInteractionShapes'
diff --git a/src/mineflayer/timers.ts b/src/mineflayer/timers.ts
new file mode 100644
index 00000000..698b624e
--- /dev/null
+++ b/src/mineflayer/timers.ts
@@ -0,0 +1,9 @@
+import { preventThrottlingWithSound } from '../core/timers'
+import { options } from '../optionsStorage'
+
+customEvents.on('mineflayerBotCreated', () => {
+  if (options.preventBackgroundTimeoutKick) {
+    const unsub = preventThrottlingWithSound()
+    bot.on('end', unsub)
+  }
+})
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index f308caef..4078d5e2 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -471,13 +471,51 @@ export const guiOptionsScheme: {
     },
     {
       custom () {
-        return <Category>Developer</Category>
+        return <Button label='Export/Import...' onClick={() => openOptionsMenu('export-import')} inScreen />
+      }
+    },
+    {
+      custom () {
+        return <Category>Server Connection</Category>
       },
     },
     {
       custom () {
-        return <Button label='Export/Import...' onClick={() => openOptionsMenu('export-import')} inScreen />
-      }
+        const { serversAutoVersionSelect } = useSnapshot(options)
+        const allVersions = [...[...supportedVersions].sort((a, b) => versionToNumber(a) - versionToNumber(b)), 'latest', 'auto']
+        const currentIndex = allVersions.indexOf(serversAutoVersionSelect)
+
+        const getDisplayValue = (version: string) => {
+          const versionAutoSelect = getVersionAutoSelect(version)
+          if (version === 'latest') return `latest (${versionAutoSelect})`
+          if (version === 'auto') return `auto (${versionAutoSelect})`
+          return version
+        }
+
+        return <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+          <Slider
+            style={{ width: 150 }}
+            label='Default Version'
+            title='First version to try to connect with'
+            value={currentIndex}
+            min={0}
+            max={allVersions.length - 1}
+            unit=''
+            valueDisplay={getDisplayValue(serversAutoVersionSelect)}
+            updateValue={(newVal) => {
+              options.serversAutoVersionSelect = allVersions[newVal]
+            }}
+          />
+        </div>
+      },
+    },
+    {
+      preventBackgroundTimeoutKick: {}
+    },
+    {
+      custom () {
+        return <Category>Developer</Category>
+      },
     },
     {
       custom () {
@@ -511,35 +549,6 @@ export const guiOptionsScheme: {
         ],
       },
     },
-    {
-      custom () {
-        const { serversAutoVersionSelect } = useSnapshot(options)
-        const allVersions = [...[...supportedVersions].sort((a, b) => versionToNumber(a) - versionToNumber(b)), 'latest', 'auto']
-        const currentIndex = allVersions.indexOf(serversAutoVersionSelect)
-
-        const getDisplayValue = (version: string) => {
-          const versionAutoSelect = getVersionAutoSelect(version)
-          if (version === 'latest') return `latest (${versionAutoSelect})`
-          if (version === 'auto') return `auto (${versionAutoSelect})`
-          return version
-        }
-
-        return <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-          <Slider
-            style={{ width: 150 }}
-            label='Prefer Server Version'
-            value={currentIndex}
-            min={0}
-            max={allVersions.length - 1}
-            unit=''
-            valueDisplay={getDisplayValue(serversAutoVersionSelect)}
-            updateValue={(newVal) => {
-              options.serversAutoVersionSelect = allVersions[newVal]
-            }}
-          />
-        </div>
-      },
-    },
   ],
   'export-import': [
     {
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index b5025ab4..eb1aa262 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -63,6 +63,7 @@ const defaultOptions = {
   // todo ui setting, maybe enable by default?
   waitForChunksRender: 'sp-only' as 'sp-only' | boolean,
   jeiEnabled: true as boolean | Array<'creative' | 'survival' | 'adventure' | 'spectator'>,
+  preventBackgroundTimeoutKick: false,
 
   // antiAliasing: false,
 

From a53a6e5f035895a0dca0fc68d7cc642532cb6028 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Mar 2025 03:55:06 +0300
Subject: [PATCH 370/753] fix chests regression

---
 package.json   |  2 +-
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 531f5370..d9d0b69e 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
     "mc-assets": "^0.2.45",
-    "mineflayer-mouse": "^0.1.6",
+    "mineflayer-mouse": "^0.1.7",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 97cd6664..537a391e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -362,8 +362,8 @@ importers:
         specifier: github:zardoy/mineflayer
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.6
-        version: 0.1.6(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+        specifier: ^0.1.7
+        version: 0.1.7(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.4
@@ -6925,8 +6925,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.6:
-    resolution: {integrity: sha512-BvLPo4I8egSJcI99TBUgtnm4qAN3WLSwn7jZw99lq4TD9e2cOAKHEPr04nrTnywrx1PsPf6cuVN1i/E7+vzzdA==}
+  mineflayer-mouse@0.1.7:
+    resolution: {integrity: sha512-sUX77P8Z94N6N/KEvplZdXLwtuCHLx3lmU4Y1FB8189+jFCl3jH/+bdzwtksObmrXWW+evJ5nAPpzmOOxqcfag==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.4:
@@ -17989,7 +17989,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.6(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  mineflayer-mouse@0.1.7(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
     dependencies:
       change-case: 5.4.4
       debug: 4.4.0(supports-color@8.1.1)

From 2d288153e386cf914e8b48af5f3843d1cc5566ba Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Mar 2025 04:01:43 +0300
Subject: [PATCH 371/753] move three.js related files to its own renderer dir

---
 renderer/playground/scenes/allEntities.ts     |  2 +-
 renderer/playground/scenes/entities.ts        |  2 +-
 .../playground/scenes/lightingStarfield.ts    |  2 +-
 renderer/playground/scenes/main.ts            |  4 ++--
 renderer/viewer/lib/basePlayerState.ts        |  2 +-
 renderer/viewer/lib/worldrendererCommon.ts    | 10 +--------
 renderer/viewer/{lib => three}/entities.ts    |  8 +++----
 .../{lib => three}/entity/EntityMesh.ts       |  2 +-
 .../{lib => three}/entity/animations.js       |  0
 .../{lib => three}/entity/armorModels.json    |  0
 .../{lib => three}/entity/armorModels.ts      |  0
 .../{lib => three}/entity/entities.json       |  0
 .../{lib => three}/entity/exportedModels.js   |  0
 .../entity/externalTextures.json              |  0
 .../{lib => three}/entity/models/allay.obj    |  0
 .../{lib => three}/entity/models/arrow.obj    |  0
 .../{lib => three}/entity/models/axolotl.obj  |  0
 .../{lib => three}/entity/models/blaze.obj    |  0
 .../{lib => three}/entity/models/boat.obj     |  0
 .../{lib => three}/entity/models/camel.obj    |  0
 .../{lib => three}/entity/models/cat.obj      |  0
 .../{lib => three}/entity/models/chicken.obj  |  0
 .../{lib => three}/entity/models/cod.obj      |  0
 .../{lib => three}/entity/models/creeper.obj  |  0
 .../{lib => three}/entity/models/dolphin.obj  |  0
 .../entity/models/ender_dragon.obj            |  0
 .../{lib => three}/entity/models/enderman.obj |  0
 .../entity/models/endermite.obj               |  0
 .../{lib => three}/entity/models/fox.obj      |  0
 .../{lib => three}/entity/models/frog.obj     |  0
 .../{lib => three}/entity/models/ghast.obj    |  0
 .../{lib => three}/entity/models/goat.obj     |  0
 .../{lib => three}/entity/models/guardian.obj |  0
 .../{lib => three}/entity/models/horse.obj    |  0
 .../{lib => three}/entity/models/llama.obj    |  0
 .../{lib => three}/entity/models/minecart.obj |  0
 .../{lib => three}/entity/models/parrot.obj   |  0
 .../{lib => three}/entity/models/piglin.obj   |  0
 .../{lib => three}/entity/models/pillager.obj |  0
 .../{lib => three}/entity/models/rabbit.obj   |  0
 .../{lib => three}/entity/models/sheep.obj    |  0
 .../{lib => three}/entity/models/shulker.obj  |  0
 .../{lib => three}/entity/models/sniffer.obj  |  0
 .../{lib => three}/entity/models/spider.obj   |  0
 .../{lib => three}/entity/models/tadpole.obj  |  0
 .../{lib => three}/entity/models/turtle.obj   |  0
 .../{lib => three}/entity/models/vex.obj      |  0
 .../{lib => three}/entity/models/villager.obj |  0
 .../{lib => three}/entity/models/warden.obj   |  0
 .../{lib => three}/entity/models/witch.obj    |  0
 .../{lib => three}/entity/models/wolf.obj     |  0
 .../entity/models/zombie_villager.obj         |  0
 .../viewer/{lib => three}/entity/objModels.js |  0
 renderer/viewer/three/graphicsBackend.ts      |  2 +-
 .../viewer/{lib => three}/holdingBlock.ts     | 16 +++++++-------
 renderer/viewer/three/panorama.ts             |  4 ++--
 renderer/viewer/{lib => three}/primitives.js  |  0
 .../viewer/{lib => three}/threeJsSound.ts     |  0
 .../viewer/{lib => three}/threeJsUtils.ts     |  0
 renderer/viewer/three/world/cursorBlock.ts    |  2 +-
 .../{lib => three}/worldrendererThree.ts      | 22 +++++++++----------
 src/resourcePack.ts                           |  2 +-
 62 files changed, 36 insertions(+), 44 deletions(-)
 rename renderer/viewer/{lib => three}/entities.ts (99%)
 rename renderer/viewer/{lib => three}/entity/EntityMesh.ts (99%)
 rename renderer/viewer/{lib => three}/entity/animations.js (100%)
 rename renderer/viewer/{lib => three}/entity/armorModels.json (100%)
 rename renderer/viewer/{lib => three}/entity/armorModels.ts (100%)
 rename renderer/viewer/{lib => three}/entity/entities.json (100%)
 rename renderer/viewer/{lib => three}/entity/exportedModels.js (100%)
 rename renderer/viewer/{lib => three}/entity/externalTextures.json (100%)
 rename renderer/viewer/{lib => three}/entity/models/allay.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/arrow.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/axolotl.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/blaze.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/boat.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/camel.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/cat.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/chicken.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/cod.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/creeper.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/dolphin.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/ender_dragon.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/enderman.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/endermite.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/fox.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/frog.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/ghast.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/goat.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/guardian.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/horse.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/llama.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/minecart.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/parrot.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/piglin.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/pillager.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/rabbit.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/sheep.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/shulker.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/sniffer.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/spider.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/tadpole.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/turtle.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/vex.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/villager.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/warden.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/witch.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/wolf.obj (100%)
 rename renderer/viewer/{lib => three}/entity/models/zombie_villager.obj (100%)
 rename renderer/viewer/{lib => three}/entity/objModels.js (100%)
 rename renderer/viewer/{lib => three}/holdingBlock.ts (98%)
 rename renderer/viewer/{lib => three}/primitives.js (100%)
 rename renderer/viewer/{lib => three}/threeJsSound.ts (100%)
 rename renderer/viewer/{lib => three}/threeJsUtils.ts (100%)
 rename renderer/viewer/{lib => three}/worldrendererThree.ts (98%)

diff --git a/renderer/playground/scenes/allEntities.ts b/renderer/playground/scenes/allEntities.ts
index c7a270ae..68714cf8 100644
--- a/renderer/playground/scenes/allEntities.ts
+++ b/renderer/playground/scenes/allEntities.ts
@@ -1,6 +1,6 @@
 //@ts-nocheck
 import { BasePlaygroundScene } from '../baseScene'
-import { EntityDebugFlags, EntityMesh, rendererSpecialHandled } from '../../viewer/lib/entity/EntityMesh'
+import { EntityDebugFlags, EntityMesh, rendererSpecialHandled } from '../../viewer/three/entity/EntityMesh'
 
 export default class AllEntities extends BasePlaygroundScene {
   continuousRender = false
diff --git a/renderer/playground/scenes/entities.ts b/renderer/playground/scenes/entities.ts
index ef4035a9..5b5d0582 100644
--- a/renderer/playground/scenes/entities.ts
+++ b/renderer/playground/scenes/entities.ts
@@ -2,7 +2,7 @@
 import * as THREE from 'three'
 import { Vec3 } from 'vec3'
 import { BasePlaygroundScene } from '../baseScene'
-import { WorldRendererThree } from '../../viewer/lib/worldrendererThree'
+import { WorldRendererThree } from '../../viewer/three/worldrendererThree'
 
 export default class extends BasePlaygroundScene {
   continuousRender = true
diff --git a/renderer/playground/scenes/lightingStarfield.ts b/renderer/playground/scenes/lightingStarfield.ts
index 48669d79..eec0a7d3 100644
--- a/renderer/playground/scenes/lightingStarfield.ts
+++ b/renderer/playground/scenes/lightingStarfield.ts
@@ -2,7 +2,7 @@
 import * as THREE from 'three'
 import { Vec3 } from 'vec3'
 import { BasePlaygroundScene } from '../baseScene'
-import { WorldRendererThree } from '../../viewer/lib/worldrendererThree'
+import { WorldRendererThree } from '../../viewer/three/worldrendererThree'
 
 export default class extends BasePlaygroundScene {
   continuousRender = true
diff --git a/renderer/playground/scenes/main.ts b/renderer/playground/scenes/main.ts
index 057fe2ed..64925f61 100644
--- a/renderer/playground/scenes/main.ts
+++ b/renderer/playground/scenes/main.ts
@@ -4,8 +4,8 @@ import GUI, { Controller } from 'lil-gui'
 import * as THREE from 'three'
 import JSZip from 'jszip'
 import { BasePlaygroundScene } from '../baseScene'
-import { TWEEN_DURATION } from '../../viewer/lib/entities'
-import { EntityMesh } from '../../viewer/lib/entity/EntityMesh'
+import { TWEEN_DURATION } from '../../viewer/three/entities'
+import { EntityMesh } from '../../viewer/three/entity/EntityMesh'
 
 class MainScene extends BasePlaygroundScene {
   // eslint-disable-next-line @typescript-eslint/no-useless-constructor
diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index 180ede3a..3384f0b4 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -4,7 +4,7 @@ import TypedEmitter from 'typed-emitter'
 import { ItemSelector } from 'mc-assets/dist/itemDefinitions'
 import { proxy } from 'valtio'
 import { GameMode } from 'mineflayer'
-import { HandItemBlock } from './holdingBlock'
+import { HandItemBlock } from '../three/holdingBlock'
 
 export type MovementState = 'NOT_MOVING' | 'WALKING' | 'SPRINTING' | 'SNEAKING'
 export type ItemSpecificContextProperties = Partial<Pick<ItemSelector['properties'], 'minecraft:using_item' | 'minecraft:use_duration' | 'minecraft:use_cycle' | 'minecraft:display_context'>>
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 71a1dca7..4ae9a466 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -11,12 +11,12 @@ import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
 import { toMajorVersion } from '../../../src/utils'
 import { ResourcesManager } from '../../../src/resourcesManager'
 import { DisplayWorldOptions, RendererReactiveState } from '../../../src/appViewer'
+import { SoundSystem } from '../three/threeJsSound'
 import { buildCleanupDecorator } from './cleanupDecorator'
 import { HighestBlockInfo, MesherGeometryOutput, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig } from './mesher/shared'
 import { chunkPos } from './simpleUtils'
 import { removeStat, updateStatText } from './ui/newStats'
 import { WorldDataEmitter } from './worldDataEmitter'
-import { SoundSystem } from './threeJsSound'
 import { IPlayerState } from './basePlayerState'
 
 function mod (x, n) {
@@ -51,11 +51,9 @@ export type WorldRendererConfig = typeof defaultWorldRendererConfig
 
 export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any> {
   displayStats = true
-  @worldCleanup()
   worldSizeParams = { minY: 0, worldHeight: 256 }
   cameraRoll = 0
 
-  @worldCleanup()
   active = false
 
   // #region CHUNK & SECTIONS TRACKING
@@ -77,28 +75,22 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   queuedFunctions = [] as Array<() => void>
   // #endregion
 
-  @worldCleanup()
   renderUpdateEmitter = new EventEmitter() as unknown as TypedEmitter<{
     dirty (pos: Vec3, value: boolean): void
     update (/* pos: Vec3, value: boolean */): void
     chunkFinished (key: string): void
   }>
   customTexturesDataUrl = undefined as string | undefined
-  @worldCleanup()
   workers: any[] = []
-  @worldCleanup()
   viewerPosition?: Vec3
   lastCamUpdate = 0
   droppedFpsPercentage = 0
-  @worldCleanup()
   initialChunkLoadWasStartedIn: number | undefined
-  @worldCleanup()
   initialChunksLoad = true
   enableChunksLoadDelay = false
   texturesVersion?: string
   viewDistance = -1
   chunksLength = 0
-  @worldCleanup()
   allChunksFinished = false
 
   handleResize = () => { }
diff --git a/renderer/viewer/lib/entities.ts b/renderer/viewer/three/entities.ts
similarity index 99%
rename from renderer/viewer/lib/entities.ts
rename to renderer/viewer/three/entities.ts
index daeb090e..45202608 100644
--- a/renderer/viewer/lib/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -17,15 +17,15 @@ import { BlockModel } from 'mc-assets'
 import { isEntityAttackable } from 'mineflayer-mouse/dist/attackableEntity'
 import { Vec3 } from 'vec3'
 import { EntityMetadataVersions } from '../../../src/mcDataTypes'
+import { ItemSpecificContextProperties } from '../lib/basePlayerState'
+import { loadSkinImage, getLookupUrl, stevePngUrl, steveTexture } from '../lib/utils/skins'
+import { loadTexture } from '../lib/utils'
+import { getBlockMeshFromModel } from './holdingBlock'
 import * as Entity from './entity/EntityMesh'
 import { getMesh } from './entity/EntityMesh'
 import { WalkingGeneralSwing } from './entity/animations'
 import { disposeObject } from './threeJsUtils'
 import { armorModel, armorTextures } from './entity/armorModels'
-import { getBlockMeshFromModel } from './holdingBlock'
-import { ItemSpecificContextProperties } from './basePlayerState'
-import { loadSkinImage, getLookupUrl, stevePngUrl, steveTexture } from './utils/skins'
-import { loadTexture } from './utils'
 import { WorldRendererThree } from './worldrendererThree'
 
 export const TWEEN_DURATION = 120
diff --git a/renderer/viewer/lib/entity/EntityMesh.ts b/renderer/viewer/three/entity/EntityMesh.ts
similarity index 99%
rename from renderer/viewer/lib/entity/EntityMesh.ts
rename to renderer/viewer/three/entity/EntityMesh.ts
index a6381c4b..67222ed8 100644
--- a/renderer/viewer/lib/entity/EntityMesh.ts
+++ b/renderer/viewer/three/entity/EntityMesh.ts
@@ -5,7 +5,7 @@ import { Vec3 } from 'vec3'
 import arrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/arrow.png'
 import spectralArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/spectral_arrow.png'
 import tippedArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/tipped_arrow.png'
-import { loadTexture } from '../utils'
+import { loadTexture } from '../../lib/utils'
 import { WorldRendererThree } from '../worldrendererThree'
 import entities from './entities.json'
 import { externalModels } from './objModels'
diff --git a/renderer/viewer/lib/entity/animations.js b/renderer/viewer/three/entity/animations.js
similarity index 100%
rename from renderer/viewer/lib/entity/animations.js
rename to renderer/viewer/three/entity/animations.js
diff --git a/renderer/viewer/lib/entity/armorModels.json b/renderer/viewer/three/entity/armorModels.json
similarity index 100%
rename from renderer/viewer/lib/entity/armorModels.json
rename to renderer/viewer/three/entity/armorModels.json
diff --git a/renderer/viewer/lib/entity/armorModels.ts b/renderer/viewer/three/entity/armorModels.ts
similarity index 100%
rename from renderer/viewer/lib/entity/armorModels.ts
rename to renderer/viewer/three/entity/armorModels.ts
diff --git a/renderer/viewer/lib/entity/entities.json b/renderer/viewer/three/entity/entities.json
similarity index 100%
rename from renderer/viewer/lib/entity/entities.json
rename to renderer/viewer/three/entity/entities.json
diff --git a/renderer/viewer/lib/entity/exportedModels.js b/renderer/viewer/three/entity/exportedModels.js
similarity index 100%
rename from renderer/viewer/lib/entity/exportedModels.js
rename to renderer/viewer/three/entity/exportedModels.js
diff --git a/renderer/viewer/lib/entity/externalTextures.json b/renderer/viewer/three/entity/externalTextures.json
similarity index 100%
rename from renderer/viewer/lib/entity/externalTextures.json
rename to renderer/viewer/three/entity/externalTextures.json
diff --git a/renderer/viewer/lib/entity/models/allay.obj b/renderer/viewer/three/entity/models/allay.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/allay.obj
rename to renderer/viewer/three/entity/models/allay.obj
diff --git a/renderer/viewer/lib/entity/models/arrow.obj b/renderer/viewer/three/entity/models/arrow.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/arrow.obj
rename to renderer/viewer/three/entity/models/arrow.obj
diff --git a/renderer/viewer/lib/entity/models/axolotl.obj b/renderer/viewer/three/entity/models/axolotl.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/axolotl.obj
rename to renderer/viewer/three/entity/models/axolotl.obj
diff --git a/renderer/viewer/lib/entity/models/blaze.obj b/renderer/viewer/three/entity/models/blaze.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/blaze.obj
rename to renderer/viewer/three/entity/models/blaze.obj
diff --git a/renderer/viewer/lib/entity/models/boat.obj b/renderer/viewer/three/entity/models/boat.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/boat.obj
rename to renderer/viewer/three/entity/models/boat.obj
diff --git a/renderer/viewer/lib/entity/models/camel.obj b/renderer/viewer/three/entity/models/camel.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/camel.obj
rename to renderer/viewer/three/entity/models/camel.obj
diff --git a/renderer/viewer/lib/entity/models/cat.obj b/renderer/viewer/three/entity/models/cat.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/cat.obj
rename to renderer/viewer/three/entity/models/cat.obj
diff --git a/renderer/viewer/lib/entity/models/chicken.obj b/renderer/viewer/three/entity/models/chicken.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/chicken.obj
rename to renderer/viewer/three/entity/models/chicken.obj
diff --git a/renderer/viewer/lib/entity/models/cod.obj b/renderer/viewer/three/entity/models/cod.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/cod.obj
rename to renderer/viewer/three/entity/models/cod.obj
diff --git a/renderer/viewer/lib/entity/models/creeper.obj b/renderer/viewer/three/entity/models/creeper.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/creeper.obj
rename to renderer/viewer/three/entity/models/creeper.obj
diff --git a/renderer/viewer/lib/entity/models/dolphin.obj b/renderer/viewer/three/entity/models/dolphin.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/dolphin.obj
rename to renderer/viewer/three/entity/models/dolphin.obj
diff --git a/renderer/viewer/lib/entity/models/ender_dragon.obj b/renderer/viewer/three/entity/models/ender_dragon.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/ender_dragon.obj
rename to renderer/viewer/three/entity/models/ender_dragon.obj
diff --git a/renderer/viewer/lib/entity/models/enderman.obj b/renderer/viewer/three/entity/models/enderman.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/enderman.obj
rename to renderer/viewer/three/entity/models/enderman.obj
diff --git a/renderer/viewer/lib/entity/models/endermite.obj b/renderer/viewer/three/entity/models/endermite.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/endermite.obj
rename to renderer/viewer/three/entity/models/endermite.obj
diff --git a/renderer/viewer/lib/entity/models/fox.obj b/renderer/viewer/three/entity/models/fox.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/fox.obj
rename to renderer/viewer/three/entity/models/fox.obj
diff --git a/renderer/viewer/lib/entity/models/frog.obj b/renderer/viewer/three/entity/models/frog.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/frog.obj
rename to renderer/viewer/three/entity/models/frog.obj
diff --git a/renderer/viewer/lib/entity/models/ghast.obj b/renderer/viewer/three/entity/models/ghast.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/ghast.obj
rename to renderer/viewer/three/entity/models/ghast.obj
diff --git a/renderer/viewer/lib/entity/models/goat.obj b/renderer/viewer/three/entity/models/goat.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/goat.obj
rename to renderer/viewer/three/entity/models/goat.obj
diff --git a/renderer/viewer/lib/entity/models/guardian.obj b/renderer/viewer/three/entity/models/guardian.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/guardian.obj
rename to renderer/viewer/three/entity/models/guardian.obj
diff --git a/renderer/viewer/lib/entity/models/horse.obj b/renderer/viewer/three/entity/models/horse.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/horse.obj
rename to renderer/viewer/three/entity/models/horse.obj
diff --git a/renderer/viewer/lib/entity/models/llama.obj b/renderer/viewer/three/entity/models/llama.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/llama.obj
rename to renderer/viewer/three/entity/models/llama.obj
diff --git a/renderer/viewer/lib/entity/models/minecart.obj b/renderer/viewer/three/entity/models/minecart.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/minecart.obj
rename to renderer/viewer/three/entity/models/minecart.obj
diff --git a/renderer/viewer/lib/entity/models/parrot.obj b/renderer/viewer/three/entity/models/parrot.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/parrot.obj
rename to renderer/viewer/three/entity/models/parrot.obj
diff --git a/renderer/viewer/lib/entity/models/piglin.obj b/renderer/viewer/three/entity/models/piglin.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/piglin.obj
rename to renderer/viewer/three/entity/models/piglin.obj
diff --git a/renderer/viewer/lib/entity/models/pillager.obj b/renderer/viewer/three/entity/models/pillager.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/pillager.obj
rename to renderer/viewer/three/entity/models/pillager.obj
diff --git a/renderer/viewer/lib/entity/models/rabbit.obj b/renderer/viewer/three/entity/models/rabbit.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/rabbit.obj
rename to renderer/viewer/three/entity/models/rabbit.obj
diff --git a/renderer/viewer/lib/entity/models/sheep.obj b/renderer/viewer/three/entity/models/sheep.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/sheep.obj
rename to renderer/viewer/three/entity/models/sheep.obj
diff --git a/renderer/viewer/lib/entity/models/shulker.obj b/renderer/viewer/three/entity/models/shulker.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/shulker.obj
rename to renderer/viewer/three/entity/models/shulker.obj
diff --git a/renderer/viewer/lib/entity/models/sniffer.obj b/renderer/viewer/three/entity/models/sniffer.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/sniffer.obj
rename to renderer/viewer/three/entity/models/sniffer.obj
diff --git a/renderer/viewer/lib/entity/models/spider.obj b/renderer/viewer/three/entity/models/spider.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/spider.obj
rename to renderer/viewer/three/entity/models/spider.obj
diff --git a/renderer/viewer/lib/entity/models/tadpole.obj b/renderer/viewer/three/entity/models/tadpole.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/tadpole.obj
rename to renderer/viewer/three/entity/models/tadpole.obj
diff --git a/renderer/viewer/lib/entity/models/turtle.obj b/renderer/viewer/three/entity/models/turtle.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/turtle.obj
rename to renderer/viewer/three/entity/models/turtle.obj
diff --git a/renderer/viewer/lib/entity/models/vex.obj b/renderer/viewer/three/entity/models/vex.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/vex.obj
rename to renderer/viewer/three/entity/models/vex.obj
diff --git a/renderer/viewer/lib/entity/models/villager.obj b/renderer/viewer/three/entity/models/villager.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/villager.obj
rename to renderer/viewer/three/entity/models/villager.obj
diff --git a/renderer/viewer/lib/entity/models/warden.obj b/renderer/viewer/three/entity/models/warden.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/warden.obj
rename to renderer/viewer/three/entity/models/warden.obj
diff --git a/renderer/viewer/lib/entity/models/witch.obj b/renderer/viewer/three/entity/models/witch.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/witch.obj
rename to renderer/viewer/three/entity/models/witch.obj
diff --git a/renderer/viewer/lib/entity/models/wolf.obj b/renderer/viewer/three/entity/models/wolf.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/wolf.obj
rename to renderer/viewer/three/entity/models/wolf.obj
diff --git a/renderer/viewer/lib/entity/models/zombie_villager.obj b/renderer/viewer/three/entity/models/zombie_villager.obj
similarity index 100%
rename from renderer/viewer/lib/entity/models/zombie_villager.obj
rename to renderer/viewer/three/entity/models/zombie_villager.obj
diff --git a/renderer/viewer/lib/entity/objModels.js b/renderer/viewer/three/entity/objModels.js
similarity index 100%
rename from renderer/viewer/lib/entity/objModels.js
rename to renderer/viewer/three/entity/objModels.js
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index 54c3faaf..bd97d7b7 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -3,7 +3,7 @@ import { Vec3 } from 'vec3'
 import { proxy } from 'valtio'
 import { GraphicsBackendLoader, GraphicsBackend, GraphicsInitOptions, DisplayWorldOptions, RendererReactiveState } from '../../../src/appViewer'
 import { ProgressReporter } from '../../../src/core/progressReporter'
-import { WorldRendererThree } from '../lib/worldrendererThree'
+import { WorldRendererThree } from './worldrendererThree'
 import { DocumentRenderer } from './documentRenderer'
 import { PanoramaRenderer } from './panorama'
 
diff --git a/renderer/viewer/lib/holdingBlock.ts b/renderer/viewer/three/holdingBlock.ts
similarity index 98%
rename from renderer/viewer/lib/holdingBlock.ts
rename to renderer/viewer/three/holdingBlock.ts
index 8b75b02a..aea46b0e 100644
--- a/renderer/viewer/lib/holdingBlock.ts
+++ b/renderer/viewer/three/holdingBlock.ts
@@ -2,15 +2,15 @@ import * as THREE from 'three'
 import * as tweenJs from '@tweenjs/tween.js'
 import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import { BlockModel } from 'mc-assets'
-import { getThreeBlockModelGroup, renderBlockThree, setBlockPosition } from './mesher/standaloneRenderer'
-import { getMyHand } from './hand'
-import { IPlayerState, MovementState } from './basePlayerState'
-import { DebugGui } from './DebugGui'
-import { SmoothSwitcher } from './smoothSwitcher'
-import { watchProperty } from './utils/proxy'
-import { disposeObject } from './threeJsUtils'
-import { WorldRendererConfig } from './worldrendererCommon'
+import { getThreeBlockModelGroup, renderBlockThree, setBlockPosition } from '../lib/mesher/standaloneRenderer'
+import { getMyHand } from '../lib/hand'
+import { IPlayerState, MovementState } from '../lib/basePlayerState'
+import { DebugGui } from '../lib/DebugGui'
+import { SmoothSwitcher } from '../lib/smoothSwitcher'
+import { watchProperty } from '../lib/utils/proxy'
+import { WorldRendererConfig } from '../lib/worldrendererCommon'
 import { WorldRendererThree } from './worldrendererThree'
+import { disposeObject } from './threeJsUtils'
 
 export type HandItemBlock = {
   name?
diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
index 1eb3c9fa..ddc79cbd 100644
--- a/renderer/viewer/three/panorama.ts
+++ b/renderer/viewer/three/panorama.ts
@@ -3,13 +3,13 @@ import * as THREE from 'three'
 import { getSyncWorld } from 'renderer/playground/shared'
 import { Vec3 } from 'vec3'
 import * as tweenJs from '@tweenjs/tween.js'
-import { EntityMesh } from '../lib/entity/EntityMesh'
 import type { GraphicsInitOptions } from '../../../src/appViewer'
 import { WorldDataEmitter } from '../lib/worldDataEmitter'
-import { WorldRendererThree } from '../lib/worldrendererThree'
 import { defaultWorldRendererConfig } from '../lib/worldrendererCommon'
 import { BasePlayerState } from '../lib/basePlayerState'
 import { getDefaultRendererState } from '../baseGraphicsBackend'
+import { WorldRendererThree } from './worldrendererThree'
+import { EntityMesh } from './entity/EntityMesh'
 import { DocumentRenderer } from './documentRenderer'
 
 const panoramaFiles = [
diff --git a/renderer/viewer/lib/primitives.js b/renderer/viewer/three/primitives.js
similarity index 100%
rename from renderer/viewer/lib/primitives.js
rename to renderer/viewer/three/primitives.js
diff --git a/renderer/viewer/lib/threeJsSound.ts b/renderer/viewer/three/threeJsSound.ts
similarity index 100%
rename from renderer/viewer/lib/threeJsSound.ts
rename to renderer/viewer/three/threeJsSound.ts
diff --git a/renderer/viewer/lib/threeJsUtils.ts b/renderer/viewer/three/threeJsUtils.ts
similarity index 100%
rename from renderer/viewer/lib/threeJsUtils.ts
rename to renderer/viewer/three/threeJsUtils.ts
diff --git a/renderer/viewer/three/world/cursorBlock.ts b/renderer/viewer/three/world/cursorBlock.ts
index cddfc5df..048539d9 100644
--- a/renderer/viewer/three/world/cursorBlock.ts
+++ b/renderer/viewer/three/world/cursorBlock.ts
@@ -3,7 +3,7 @@ import { LineMaterial, LineSegmentsGeometry, Wireframe } from 'three-stdlib'
 import { Vec3 } from 'vec3'
 import { subscribeKey } from 'valtio/utils'
 import { Block } from 'prismarine-block'
-import { WorldRendererThree } from '../../lib/worldrendererThree'
+import { WorldRendererThree } from '../worldrendererThree'
 import destroyStage0 from '../../../../assets/destroy_stage_0.png'
 import destroyStage1 from '../../../../assets/destroy_stage_1.png'
 import destroyStage2 from '../../../../assets/destroy_stage_2.png'
diff --git a/renderer/viewer/lib/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
similarity index 98%
rename from renderer/viewer/lib/worldrendererThree.ts
rename to renderer/viewer/three/worldrendererThree.ts
index d5e1750e..238177d0 100644
--- a/renderer/viewer/lib/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -6,20 +6,20 @@ import * as tweenJs from '@tweenjs/tween.js'
 import { subscribeKey } from 'valtio/utils'
 import { renderSign } from '../sign-renderer'
 import { DisplayWorldOptions, GraphicsInitOptions, RendererReactiveState } from '../../../src/appViewer'
-import { initVR } from '../three/world/vr'
-import { getItemUv } from '../three/appShared'
-import { CursorBlock } from '../three/world/cursorBlock'
-import { chunkPos, sectionPos } from './simpleUtils'
-import { WorldRendererCommon } from './worldrendererCommon'
-import { disposeObject } from './threeJsUtils'
+import { chunkPos, sectionPos } from '../lib/simpleUtils'
+import { WorldRendererCommon } from '../lib/worldrendererCommon'
+import { addNewStat, removeAllStats } from '../lib/ui/newStats'
+import { MesherGeometryOutput } from '../lib/mesher/shared'
+import { ItemSpecificContextProperties } from '../lib/basePlayerState'
+import { getMyHand } from '../lib/hand'
+import { setBlockPosition } from '../lib/mesher/standaloneRenderer'
 import HoldingBlock from './holdingBlock'
-import { addNewStat, removeAllStats } from './ui/newStats'
-import { MesherGeometryOutput } from './mesher/shared'
-import { ItemSpecificContextProperties } from './basePlayerState'
 import { getMesh } from './entity/EntityMesh'
 import { armorModel } from './entity/armorModels'
-import { getMyHand } from './hand'
-import { setBlockPosition } from './mesher/standaloneRenderer'
+import { disposeObject } from './threeJsUtils'
+import { CursorBlock } from './world/cursorBlock'
+import { getItemUv } from './appShared'
+import { initVR } from './world/vr'
 import { Entities } from './entities'
 import { ThreeJsSound } from './threeJsSound'
 
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 344f79d6..afe97777 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -3,7 +3,7 @@ import { join, dirname, basename } from 'path'
 import fs from 'fs'
 import JSZip from 'jszip'
 import { proxy, subscribe } from 'valtio'
-import { armorTextures } from 'renderer/viewer/lib/entity/armorModels'
+import { armorTextures } from 'renderer/viewer/three/entity/armorModels'
 import { copyFilesAsyncWithProgress, mkdirRecursive, removeFileRecursiveAsync } from './browserfs'
 import { showNotification } from './react/NotificationProvider'
 import { options } from './optionsStorage'

From 8786448d077a2f602723d489db8196eef81f627d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Mar 2025 04:07:34 +0300
Subject: [PATCH 372/753] fix tsc

---
 renderer/viewer/three/world/vr.ts | 2 +-
 src/appViewer.ts                  | 2 +-
 src/devReload.ts                  | 1 -
 src/devtools.ts                   | 2 +-
 src/mineflayer/playerState.ts     | 2 +-
 src/react/ModuleSignsViewer.tsx   | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/renderer/viewer/three/world/vr.ts b/renderer/viewer/three/world/vr.ts
index 2d1f3cdd..65b392cf 100644
--- a/renderer/viewer/three/world/vr.ts
+++ b/renderer/viewer/three/world/vr.ts
@@ -3,7 +3,7 @@ import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js'
 import { XRControllerModelFactory } from 'three/examples/jsm/webxr/XRControllerModelFactory.js'
 import { buttonMap as standardButtonsMap } from 'contro-max/build/gamepad'
 import * as THREE from 'three'
-import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
+import { WorldRendererThree } from 'renderer/viewer/three/worldRendererThree'
 
 export async function initVR (worldRenderer: WorldRendererThree) {
   if (!('xr' in navigator) || !worldRenderer.worldRendererConfig.vrSupport) return
diff --git a/src/appViewer.ts b/src/appViewer.ts
index de18ab67..4139bd84 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -3,7 +3,7 @@ import { IPlayerState } from 'renderer/viewer/lib/basePlayerState'
 import { subscribeKey } from 'valtio/utils'
 import { defaultWorldRendererConfig, WorldRendererConfig } from 'renderer/viewer/lib/worldrendererCommon'
 import { Vec3 } from 'vec3'
-import { SoundSystem } from 'renderer/viewer/lib/threeJsSound'
+import { SoundSystem } from 'renderer/viewer/three/threeJsSound'
 import { proxy } from 'valtio'
 import { getDefaultRendererState } from 'renderer/viewer/baseGraphicsBackend'
 import { playerState } from './mineflayer/playerState'
diff --git a/src/devReload.ts b/src/devReload.ts
index 5be5f2f6..e778d8d4 100644
--- a/src/devReload.ts
+++ b/src/devReload.ts
@@ -1,5 +1,4 @@
 import { isMobile } from 'renderer/viewer/lib/simpleUtils'
-import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
 
 if (process.env.NODE_ENV === 'development') {
   // mobile devtools
diff --git a/src/devtools.ts b/src/devtools.ts
index ff944dfb..5b15711f 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -1,7 +1,7 @@
 // global variables useful for debugging
 
 import fs from 'fs'
-import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
+import { WorldRendererThree } from 'renderer/viewer/three/worldrendererThree'
 import { enable, disable, enabled } from 'debug'
 import { Vec3 } from 'vec3'
 
diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
index 6ef9a90d..964e3d1b 100644
--- a/src/mineflayer/playerState.ts
+++ b/src/mineflayer/playerState.ts
@@ -1,7 +1,7 @@
 import { EventEmitter } from 'events'
 import { Vec3 } from 'vec3'
 import { BasePlayerState, IPlayerState, ItemSpecificContextProperties, MovementState, PlayerStateEvents } from 'renderer/viewer/lib/basePlayerState'
-import { HandItemBlock } from 'renderer/viewer/lib/holdingBlock'
+import { HandItemBlock } from 'renderer/viewer/three/holdingBlock'
 import TypedEmitter from 'typed-emitter'
 import { ItemSelector } from 'mc-assets/dist/itemDefinitions'
 import { proxy } from 'valtio'
diff --git a/src/react/ModuleSignsViewer.tsx b/src/react/ModuleSignsViewer.tsx
index 2cc9ad69..aa7bb2da 100644
--- a/src/react/ModuleSignsViewer.tsx
+++ b/src/react/ModuleSignsViewer.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from 'react'
-import { WorldRendererThree } from 'renderer/viewer/lib/worldrendererThree'
+import { WorldRendererThree } from 'renderer/viewer/three/worldrendererThree'
 import FullScreenWidget from './FullScreenWidget'
 
 export const name = 'loaded world signs'

From 118377cbc34a658b5823f133d361856413b9c4f3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Mar 2025 04:15:05 +0300
Subject: [PATCH 373/753] ci: fix relative import path

---
 renderer/viewer/three/world/vr.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderer/viewer/three/world/vr.ts b/renderer/viewer/three/world/vr.ts
index 65b392cf..925ba0bb 100644
--- a/renderer/viewer/three/world/vr.ts
+++ b/renderer/viewer/three/world/vr.ts
@@ -3,7 +3,7 @@ import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js'
 import { XRControllerModelFactory } from 'three/examples/jsm/webxr/XRControllerModelFactory.js'
 import { buttonMap as standardButtonsMap } from 'contro-max/build/gamepad'
 import * as THREE from 'three'
-import { WorldRendererThree } from 'renderer/viewer/three/worldRendererThree'
+import { WorldRendererThree } from '../worldrendererThree'
 
 export async function initVR (worldRenderer: WorldRendererThree) {
   if (!('xr' in navigator) || !worldRenderer.worldRendererConfig.vrSupport) return

From 761c92e27c58dbd215fe31dd521898fef503465b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Mar 2025 21:09:48 +0300
Subject: [PATCH 374/753] fix: always set sign text even in rich formatted mode
 so you dont lose your text if nbt edit command doesnt work (which is the case
 for the latest versions)

---
 src/markdownToFormattedText.ts   |  2 +-
 src/react/SignEditor.tsx         | 10 ++++++----
 src/react/SignEditorProvider.tsx | 20 ++++++++++----------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/markdownToFormattedText.ts b/src/markdownToFormattedText.ts
index 0f722bd1..5fff20f8 100644
--- a/src/markdownToFormattedText.ts
+++ b/src/markdownToFormattedText.ts
@@ -2,7 +2,7 @@ import { remark } from 'remark'
 
 export default (markdown: string) => {
   const arr = markdown.split('\n\n')
-  const lines = ['', '', '', '']
+  const lines = ['', '', '', ''] as any[]
   for (const [i, ast] of arr.map(md => remark().parse(md)).entries()) {
     lines[i] = transformToMinecraftJSON(ast as Element)
   }
diff --git a/src/react/SignEditor.tsx b/src/react/SignEditor.tsx
index 1af100c0..797d13d6 100644
--- a/src/react/SignEditor.tsx
+++ b/src/react/SignEditor.tsx
@@ -18,8 +18,7 @@ type Props = {
 
 export type ResultType = {
   plainText: string[]
-} | {
-  dataText: string[]
+  dataText?: string[]
 }
 
 export default ({ handleInput, ProseMirrorView, handleClick }: Props) => {
@@ -70,8 +69,11 @@ export default ({ handleInput, ProseMirrorView, handleClick }: Props) => {
         onClick={async () => {
           if (handleClick) {
             if (isWysiwyg) {
-              const text = markdownToFormattedText(editorView.current!.content)
-              handleClick({ dataText: text })
+              const formattedText = markdownToFormattedText(editorView.current!.content)
+              const plainText = formattedText
+                .map((t) => (Array.isArray(t) && Array.isArray(t[0]) ? t.map((t) => t[0]) : t))
+                .map((t) => (Array.isArray(t) ? t.map((t) => t.text).join('') : t))
+              handleClick({ dataText: formattedText, plainText })
             } else {
               const text = [] as string[]
               for (const input of document.getElementsByClassName('sign-editor')) {
diff --git a/src/react/SignEditorProvider.tsx b/src/react/SignEditorProvider.tsx
index 68c5abd0..7c8051bc 100644
--- a/src/react/SignEditorProvider.tsx
+++ b/src/react/SignEditorProvider.tsx
@@ -26,16 +26,16 @@ export default () => {
 
   const handleClick = (result: ResultType) => {
     hideModal({ reactType: 'signs-editor-screen' })
-    if ('plainText' in result) {
-      bot._client.write('update_sign', {
-        location,
-        isFrontText,
-        text1: result.plainText[0],
-        text2: result.plainText[1],
-        text3: result.plainText[2],
-        text4: result.plainText[3]
-      })
-    } else {
+    bot._client.write('update_sign', {
+      location,
+      isFrontText,
+      text1: result.plainText[0],
+      text2: result.plainText[1],
+      text3: result.plainText[2],
+      text4: result.plainText[3]
+    })
+
+    if (result.dataText) {
       if (!location) return
       const command = `/data merge block ${location.x} ${location.y} ${location.z} {Text1:'` + JSON.stringify(result.dataText[0]) + '\',Text2: \'' + JSON.stringify(result.dataText[1]) + '\',Text3:\'' + JSON.stringify(result.dataText[2]) + '\',Text4:\'' + JSON.stringify(result.dataText[3]) + '\'}' // mojangson
       bot.chat(command)

From db1c8a1e1a5a133a4121a0f8bfc5d7619ce883b8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Mar 2025 21:25:14 +0300
Subject: [PATCH 375/753] fix: allow custom media to be transparent

---
 renderer/viewer/three/worldrendererThree.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 238177d0..e6cc00eb 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -728,10 +728,11 @@ export class WorldRendererThree extends WorldRendererCommon {
     const geometry = new THREE.PlaneGeometry(1, 1)
 
     // Create material with initial properties using background texture
-    const material = new THREE.MeshBasicMaterial({
+    const material = new THREE.MeshLambertMaterial({
       map: backgroundTexture,
       transparent: true,
-      side: props.doubleSide ? THREE.DoubleSide : THREE.FrontSide
+      side: props.doubleSide ? THREE.DoubleSide : THREE.FrontSide,
+      alphaTest: 0.1
     })
 
     const texture = video
@@ -745,6 +746,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     texture.minFilter = THREE.NearestFilter
     texture.magFilter = THREE.NearestFilter
     texture.format = THREE.RGBAFormat
+    texture.colorSpace = THREE.SRGBColorSpace
     texture.generateMipmaps = false
 
     // Create inner mesh for offsets

From 10155568345a414861a4f4090890fab19ab89f04 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Mar 2025 21:33:12 +0300
Subject: [PATCH 376/753] use graphics backend id

---
 renderer/viewer/three/graphicsBackend.ts | 6 ++----
 renderer/viewer/three/threeJsMethods.ts  | 2 +-
 src/appViewer.ts                         | 3 ++-
 src/react/DebugOverlay.tsx               | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index bd97d7b7..de641c82 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -86,11 +86,9 @@ const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitO
 
   // Public interface
   const backend: GraphicsBackend = {
-    //@ts-expect-error mark as three.js renderer
-    __isThreeJsRenderer: true,
-    NAME: `three.js ${THREE.REVISION}`,
+    id: 'threejs',
+    displayName: `three.js ${THREE.REVISION}`,
     startPanorama,
-    prepareResources,
     startWorld,
     disconnect,
     setRendering (rendering) {
diff --git a/renderer/viewer/three/threeJsMethods.ts b/renderer/viewer/three/threeJsMethods.ts
index 0dc7bf79..629909c9 100644
--- a/renderer/viewer/three/threeJsMethods.ts
+++ b/renderer/viewer/three/threeJsMethods.ts
@@ -3,7 +3,7 @@ import type { ThreeJsBackendMethods } from './graphicsBackend'
 
 export function getThreeJsRendererMethods (): ThreeJsBackendMethods | undefined {
   const renderer = appViewer.backend
-  if (!renderer?.['__isThreeJsRenderer'] || !renderer.backendMethods) return
+  if (renderer?.id !== 'threejs' || !renderer.backendMethods) return
   return new Proxy(renderer.backendMethods, {
     get (target, prop) {
       return async (...args) => {
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 4139bd84..0936cff1 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -58,7 +58,8 @@ export type GraphicsBackendLoader = (options: GraphicsInitOptions) => GraphicsBa
 
 // no sync methods
 export interface GraphicsBackend {
-  NAME: string
+  id: string
+  displayName?: string
   startPanorama: () => void
   // prepareResources: (version: string, progressReporter: ProgressReporter) => Promise<void>
   startWorld: (options: DisplayWorldOptions) => void
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index 3ce081fc..4f7fb639 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -191,7 +191,7 @@ export default () => {
     </div>
 
     <div className={`debug-right-side ${styles['debug-right-side']}`}>
-      <p>Backend: {appViewer.backend?.NAME}</p>
+      <p>Backend: {appViewer.backend?.displayName}</p>
       <p>Renderer: {rendererDevice}</p>
       <div className={styles.empty} />
       {cursorBlock ? (<>

From 46787309e27d198b8d77702759ae540f4038254e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 25 Mar 2025 22:58:24 +0300
Subject: [PATCH 377/753] fix: fix camera shake effect! rewrite impl. Fix
 offhand holding block now can become empty

---
 renderer/viewer/lib/worldrendererCommon.ts  |  1 -
 renderer/viewer/three/cameraShake.ts        | 82 +++++++++++++++++++++
 renderer/viewer/three/graphicsBackend.ts    |  4 +-
 renderer/viewer/three/holdingBlock.ts       |  4 +-
 renderer/viewer/three/worldrendererThree.ts | 24 ++----
 src/appViewer.ts                            |  4 +-
 src/mineflayer/cameraShake.ts               | 82 +--------------------
 src/react/DebugOverlay.tsx                  |  6 +-
 8 files changed, 100 insertions(+), 107 deletions(-)
 create mode 100644 renderer/viewer/three/cameraShake.ts

diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 4ae9a466..d803069d 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -52,7 +52,6 @@ export type WorldRendererConfig = typeof defaultWorldRendererConfig
 export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any> {
   displayStats = true
   worldSizeParams = { minY: 0, worldHeight: 256 }
-  cameraRoll = 0
 
   active = false
 
diff --git a/renderer/viewer/three/cameraShake.ts b/renderer/viewer/three/cameraShake.ts
new file mode 100644
index 00000000..f6a61e2e
--- /dev/null
+++ b/renderer/viewer/three/cameraShake.ts
@@ -0,0 +1,82 @@
+import * as THREE from 'three'
+
+export class CameraShake {
+  private rollAngle = 0
+  private get damageRollAmount () { return 5 }
+  private get damageAnimDuration () { return 200 }
+  private rollAnimation?: { startTime: number, startRoll: number, targetRoll: number, duration: number, returnToZero?: boolean }
+  private basePitch = 0
+  private baseYaw = 0
+
+  constructor (public camera: THREE.Camera, public onRenderCallbacks: Array<() => void>) {
+    onRenderCallbacks.push(() => {
+      this.update()
+    })
+  }
+
+  setBaseRotation (pitch: number, yaw: number) {
+    this.basePitch = pitch
+    this.baseYaw = yaw
+    this.update()
+  }
+
+  shakeFromDamage (yaw?: number) {
+    // Add roll animation
+    const startRoll = this.rollAngle
+    const targetRoll = startRoll + (yaw ?? (Math.random() < 0.5 ? -1 : 1)) * this.damageRollAmount
+
+    this.rollAnimation = {
+      startTime: performance.now(),
+      startRoll,
+      targetRoll,
+      duration: this.damageAnimDuration / 2
+    }
+  }
+
+  update () {
+    // Update roll animation
+    if (this.rollAnimation) {
+      const now = performance.now()
+      const elapsed = now - this.rollAnimation.startTime
+      const progress = Math.min(elapsed / this.rollAnimation.duration, 1)
+
+      if (this.rollAnimation.returnToZero) {
+        // Ease back to zero
+        this.rollAngle = this.rollAnimation.startRoll * (1 - this.easeInOut(progress))
+        if (progress === 1) {
+          this.rollAnimation = undefined
+        }
+      } else {
+        // Initial roll
+        this.rollAngle = this.rollAnimation.startRoll + (this.rollAnimation.targetRoll - this.rollAnimation.startRoll) * this.easeOut(progress)
+        if (progress === 1) {
+          // Start return to zero animation
+          this.rollAnimation = {
+            startTime: now,
+            startRoll: this.rollAngle,
+            targetRoll: 0,
+            duration: this.damageAnimDuration / 2,
+            returnToZero: true
+          }
+        }
+      }
+    }
+
+    // Create rotation quaternions
+    const pitchQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), this.basePitch)
+    const yawQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), this.baseYaw)
+    const rollQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 0, 1), THREE.MathUtils.degToRad(this.rollAngle))
+
+    // Combine rotations in the correct order: pitch -> yaw -> roll
+    const finalQuat = yawQuat.multiply(pitchQuat).multiply(rollQuat)
+    this.camera.setRotationFromQuaternion(finalQuat)
+  }
+
+  private easeOut (t: number): number {
+    return 1 - (1 - t) * (1 - t)
+  }
+
+  private easeInOut (t: number): number {
+    return t < 0.5 ? 2 * t * t : 1 - (-2 * t + 2) ** 2 / 2
+  }
+}
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index de641c82..0f34052a 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -30,6 +30,7 @@ const getBackendMethods = (worldRenderer: WorldRendererThree) => {
     setVideoSeeking: worldRenderer.setVideoSeeking.bind(worldRenderer),
     setVideoVolume: worldRenderer.setVideoVolume.bind(worldRenderer),
     setVideoSpeed: worldRenderer.setVideoSpeed.bind(worldRenderer),
+    shakeFromDamage: worldRenderer.cameraShake.shakeFromDamage.bind(worldRenderer.cameraShake),
   }
 }
 
@@ -99,9 +100,6 @@ const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitO
     updateCamera (pos: Vec3 | null, yaw: number, pitch: number) {
       worldRenderer?.setFirstPersonCamera(pos, yaw, pitch)
     },
-    setRoll (roll: number) {
-      worldRenderer?.setCameraRoll(roll)
-    },
     get soundSystem () {
       return worldRenderer?.soundSystem
     },
diff --git a/renderer/viewer/three/holdingBlock.ts b/renderer/viewer/three/holdingBlock.ts
index aea46b0e..9ba76224 100644
--- a/renderer/viewer/three/holdingBlock.ts
+++ b/renderer/viewer/three/holdingBlock.ts
@@ -152,7 +152,9 @@ export default class HoldingBlock {
     const item = this.playerState.getHeldItem(this.offHand)
     if (item) {
       void this.setNewItem(item)
-    } else if (!this.offHand) {
+    } else if (this.offHand) {
+      void this.setNewItem()
+    } else {
       void this.setNewItem({
         type: 'hand',
       })
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index e6cc00eb..c74bba51 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -22,6 +22,7 @@ import { getItemUv } from './appShared'
 import { initVR } from './world/vr'
 import { Entities } from './entities'
 import { ThreeJsSound } from './threeJsSound'
+import { CameraShake } from './cameraShake'
 
 interface MediaProperties {
   position: { x: number, y: number, z: number }
@@ -46,7 +47,6 @@ export class WorldRendererThree extends WorldRendererCommon {
   cameraSectionPos: Vec3 = new Vec3(0, 0, 0)
   holdingBlock: HoldingBlock
   holdingBlockLeft: HoldingBlock
-  cameraRoll = 0
   scene = new THREE.Scene()
   ambientLight = new THREE.AmbientLight(0xcc_cc_cc)
   directionalLight = new THREE.DirectionalLight(0xff_ff_ff, 0.5)
@@ -62,6 +62,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     texture: THREE.Texture
     updateUVMapping: (config: { startU: number, endU: number, startV: number, endV: number }) => void
   }>()
+  cameraShake: CameraShake
 
   get tilesRendered () {
     return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).tilesCount, 0)
@@ -80,13 +81,14 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.holdingBlock = new HoldingBlock(this)
     this.holdingBlockLeft = new HoldingBlock(this, true)
 
-    this.soundSystem = new ThreeJsSound(this)
-
     this.addDebugOverlay()
     this.resetScene()
     this.watchReactivePlayerState()
     this.init()
     void initVR(this)
+
+    this.soundSystem = new ThreeJsSound(this)
+    this.cameraShake = new CameraShake(this.camera, this.onRender)
   }
 
   updateEntity (e, isPosUpdate = false) {
@@ -430,7 +432,7 @@ export class WorldRendererThree extends WorldRendererCommon {
       new tweenJs.Tween(this.camera.position).to({ x: pos.x, y: pos.y, z: pos.z }, 50).start()
       // this.freeFlyState.position = pos
     }
-    this.camera.rotation.set(pitch, yaw, this.cameraRoll, 'ZYX')
+    this.cameraShake.setBaseRotation(pitch, yaw)
   }
 
   render (sizeChanged = false) {
@@ -1026,20 +1028,6 @@ export class WorldRendererThree extends WorldRendererCommon {
 
   }
 
-  setCameraRoll (roll: number) {
-    this.cameraRoll = roll
-    const rollQuat = new THREE.Quaternion()
-    rollQuat.setFromAxisAngle(new THREE.Vector3(0, 0, 1), THREE.MathUtils.degToRad(roll))
-
-    // Get camera's current rotation
-    const camQuat = new THREE.Quaternion()
-    this.camera.getWorldQuaternion(camQuat)
-
-    // Apply roll after camera rotation
-    const finalQuat = camQuat.multiply(rollQuat)
-    this.camera.setRotationFromQuaternion(finalQuat)
-  }
-
   destroy (): void {
     removeAllStats()
     super.destroy()
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 0936cff1..561204c0 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -65,9 +65,9 @@ export interface GraphicsBackend {
   startWorld: (options: DisplayWorldOptions) => void
   disconnect: () => void
   setRendering: (rendering: boolean) => void
-  getDebugOverlay: () => Record<string, any>
+  getDebugOverlay?: () => Record<string, any>
   updateCamera: (pos: Vec3 | null, yaw: number, pitch: number) => void
-  setRoll: (roll: number) => void
+  setRoll?: (roll: number) => void
   soundSystem: SoundSystem | undefined
 
   backendMethods: Record<string, unknown> | undefined
diff --git a/src/mineflayer/cameraShake.ts b/src/mineflayer/cameraShake.ts
index 4b447aeb..9e271da5 100644
--- a/src/mineflayer/cameraShake.ts
+++ b/src/mineflayer/cameraShake.ts
@@ -1,84 +1,8 @@
-class CameraShake {
-  private rollAngle = 0
-  private get damageRollAmount () { return 5 }
-  private get damageAnimDuration () { return 200 }
-  private rollAnimation?: { startTime: number, startRoll: number, targetRoll: number, duration: number, returnToZero?: boolean }
-
-  constructor () {
-    this.rollAngle = 0
-  }
-
-  shakeFromDamage () {
-    // Add roll animation
-    const startRoll = this.rollAngle
-    const targetRoll = startRoll + (Math.random() < 0.5 ? -1 : 1) * this.damageRollAmount
-
-    this.rollAnimation = {
-      startTime: performance.now(),
-      startRoll,
-      targetRoll,
-      duration: this.damageAnimDuration / 2
-    }
-  }
-
-  update () {
-    // Update roll animation
-    if (this.rollAnimation) {
-      const now = performance.now()
-      const elapsed = now - this.rollAnimation.startTime
-      const progress = Math.min(elapsed / this.rollAnimation.duration, 1)
-
-      if (this.rollAnimation.returnToZero) {
-        // Ease back to zero
-        this.rollAngle = this.rollAnimation.startRoll * (1 - this.easeInOut(progress))
-        if (progress === 1) {
-          this.rollAnimation = undefined
-        }
-      } else {
-        // Initial roll
-        this.rollAngle = this.rollAnimation.startRoll + (this.rollAnimation.targetRoll - this.rollAnimation.startRoll) * this.easeOut(progress)
-        if (progress === 1) {
-          // Start return to zero animation
-          this.rollAnimation = {
-            startTime: now,
-            startRoll: this.rollAngle,
-            targetRoll: 0,
-            duration: this.damageAnimDuration / 2,
-            returnToZero: true
-          }
-        }
-      }
-    }
-
-    // Apply roll to camera
-    appViewer.backend?.setRoll(this.rollAngle)
-  }
-
-  private easeOut (t: number): number {
-    return 1 - (1 - t) * (1 - t)
-  }
-
-  private easeInOut (t: number): number {
-    return t < 0.5 ? 2 * t * t : 1 - (-2 * t + 2) ** 2 / 2
-  }
-}
-
-let cameraShake: CameraShake
-
-customEvents.on('hurtAnimation', () => {
-  cameraShake.shakeFromDamage()
-})
+import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 
 customEvents.on('mineflayerBotCreated', () => {
-  if (!cameraShake) {
-    cameraShake = new CameraShake()
-    beforeRenderFrame.push(() => {
-      cameraShake.update()
-    })
-  }
-
-  customEvents.on('hurtAnimation', () => {
-    cameraShake.shakeFromDamage()
+  customEvents.on('hurtAnimation', (yaw) => {
+    getThreeJsRendererMethods()?.shakeFromDamage()
   })
 
   bot._client.on('hurt_animation', ({ entityId, yaw }) => {
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index 4f7fb639..26f341f4 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -173,7 +173,7 @@ export default () => {
   return <>
     <div className={`debug-left-side ${styles['debug-left-side']}`}>
       <p>Prismarine Web Client ({bot.version})</p>
-      {appViewer.backend?.getDebugOverlay().entitiesString && <p>E: {appViewer.backend.getDebugOverlay().entitiesString}</p>}
+      {appViewer.backend?.getDebugOverlay?.().entitiesString && <p>E: {appViewer.backend.getDebugOverlay().entitiesString}</p>}
       <p>{dimension}</p>
       <div className={styles.empty} />
       <p>XYZ: {pos.x.toFixed(3)} / {pos.y.toFixed(3)} / {pos.z.toFixed(3)}</p>
@@ -187,7 +187,7 @@ export default () => {
       <p>Biome: minecraft:{loadedData.biomesArray[biomeId]?.name ?? 'unknown biome'}</p>
       <p>Day: {day}</p>
       <div className={styles.empty} />
-      {Object.entries(appViewer.backend?.getDebugOverlay().left ?? {}).map(([name, value]) => <p key={name}>{name}: {value}</p>)}
+      {Object.entries(appViewer.backend?.getDebugOverlay?.().left ?? {}).map(([name, value]) => <p key={name}>{name}: {value}</p>)}
     </div>
 
     <div className={`debug-right-side ${styles['debug-right-side']}`}>
@@ -229,7 +229,7 @@ export default () => {
           </>
         )
       })()}
-      {Object.entries(appViewer.backend?.getDebugOverlay().right ?? {}).map(([name, value]) => <p key={name}>{name}: {value}</p>)}
+      {Object.entries(appViewer.backend?.getDebugOverlay?.().right ?? {}).map(([name, value]) => <p key={name}>{name}: {value}</p>)}
     </div>
   </>
 }

From 33debc14755936d26c656f6bf2908ba6825e95fe Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Mar 2025 03:48:22 +0300
Subject: [PATCH 378/753] feat(experimental): make loading chunks as smooth as
 possible by delaying work to get more rendered fps at that time. It helps to
 eliminate massive fps drops on big chunks of data, however might introduce
 new possible race conditions. Also disabled full maps completely because it
 was hard to optimize atm. Now chunks load ~30-50% slower but smoother. Note
 that using waitChunksToLoad settings remains unchanged - time is the same

---
 renderer/viewer/lib/mesher/models.ts        |   6 +-
 renderer/viewer/lib/mesher/shared.ts        |   2 +-
 renderer/viewer/lib/worldDataEmitter.ts     |   7 +
 renderer/viewer/lib/worldrendererCommon.ts  | 208 ++++++++++++--------
 renderer/viewer/three/graphicsBackend.ts    |   1 +
 renderer/viewer/three/worldrendererThree.ts |   1 +
 src/appViewer.ts                            |  29 ++-
 src/index.ts                                |   5 +
 src/optionsStorage.ts                       |   5 +
 src/react/MinimapProvider.tsx               |  10 +-
 src/watchOptions.ts                         |   1 +
 11 files changed, 180 insertions(+), 95 deletions(-)

diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index dd2952fb..677886f9 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -468,7 +468,7 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
     heads: {},
     signs: {},
     // isFull: true,
-    highestBlocks: new Map<string, HighestBlockInfo>([]),
+    highestBlocks: {},
     hadErrors: false,
     blocksCount: 0
   }
@@ -479,9 +479,9 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
       for (cursor.x = sx; cursor.x < sx + 16; cursor.x++) {
         let block = world.getBlock(cursor, blockProvider, attr)!
         if (!INVISIBLE_BLOCKS.has(block.name)) {
-          const highest = attr.highestBlocks.get(`${cursor.x},${cursor.z}`)
+          const highest = attr.highestBlocks[`${cursor.x},${cursor.z}`]
           if (!highest || highest.y < cursor.y) {
-            attr.highestBlocks.set(`${cursor.x},${cursor.z}`, { y: cursor.y, stateId: block.stateId, biomeId: block.biome.id })
+            attr.highestBlocks[`${cursor.x},${cursor.z}`] = { y: cursor.y, stateId: block.stateId, biomeId: block.biome.id }
           }
         }
         if (INVISIBLE_BLOCKS.has(block.name)) continue
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index d8d89042..0e36c73b 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -38,7 +38,7 @@ export type MesherGeometryOutput = {
   heads: Record<string, any>,
   signs: Record<string, any>,
   // isFull: boolean
-  highestBlocks: Map<string, HighestBlockInfo>
+  highestBlocks: Record<string, HighestBlockInfo>
   hadErrors: boolean
   blocksCount: number
   customBlockModels?: CustomBlockModels
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index eb491748..557d5812 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -182,10 +182,17 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
   readdDebug () {
     const clonedLoadedChunks = { ...this.loadedChunks }
     this.unloadAllChunks()
+    console.time('readdDebug')
     for (const loadedChunk in clonedLoadedChunks) {
       const [x, z] = loadedChunk.split(',').map(Number)
       void this.loadChunk(new Vec3(x, 0, z))
     }
+    const interval = setInterval(() => {
+      if (appViewer.rendererState.world.allChunksLoaded) {
+        clearInterval(interval)
+        console.timeEnd('readdDebug')
+      }
+    }, 100)
   }
 
   // debugGotChunkLatency = [] as number[]
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index d803069d..26c659cd 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -44,7 +44,8 @@ export const defaultWorldRendererConfig = {
   fov: 75,
   fetchPlayerSkins: true,
   highlightBlockColor: 'blue',
-  foreground: true
+  foreground: true,
+  _experimentalSmoothChunkLoading: true
 }
 
 export type WorldRendererConfig = typeof defaultWorldRendererConfig
@@ -91,10 +92,14 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   viewDistance = -1
   chunksLength = 0
   allChunksFinished = false
+  messageQueue: any[] = []
+  isProcessingQueue = false
+  ONMESSAGE_TIME_LIMIT = 30 // ms
 
   handleResize = () => { }
   camera: THREE.PerspectiveCamera
-  highestBlocks = new Map<string, HighestBlockInfo>()
+  highestBlocksByChunks = {} as Record<string, { [chunkKey: string]: HighestBlockInfo }>
+  highestBlocksBySections = {} as Record<string, { [sectionKey: string]: HighestBlockInfo }>
   blockEntities = {}
 
   workersProcessAverageTime = 0
@@ -132,6 +137,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   reactiveState: RendererReactiveState
 
   abortController = new AbortController()
+  lastRendered = 0
+  renderingActive = true
 
   constructor (public readonly resourcesManager: ResourcesManager, public displayOptions: DisplayWorldOptions, public version: string) {
     // this.initWorkers(1) // preload script on page load
@@ -167,8 +174,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     return this.loadedChunks[chunkKey]
   }
 
-  async getHighestBlocks () {
-    return this.highestBlocks
+  async getHighestBlocks (chunkKey: string) {
+    return this.highestBlocksByChunks[chunkKey]
   }
 
   updateCustomBlock (chunkKey: string, blockPos: string, model: string) {
@@ -209,78 +216,128 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       } else {
         worker = new Worker(src)
       }
-      const handleMessage = (data) => {
-        if (!this.active) return
-        if (data.type !== 'geometry' || !this.debugStopGeometryUpdate) {
-          this.handleWorkerMessage(data)
-        }
-        if (data.type === 'geometry') {
-          this.geometryReceiveCount[data.workerIndex] ??= 0
-          this.geometryReceiveCount[data.workerIndex]++
-          const geometry = data.geometry as MesherGeometryOutput
-          for (const [key, highest] of geometry.highestBlocks.entries()) {
-            const currHighest = this.highestBlocks.get(key)
-            if (!currHighest || currHighest.y < highest.y) {
-              this.highestBlocks.set(key, highest)
-            }
-          }
-          // for (const key in geometry.highestBlocks) {
-          //   const highest = geometry.highestBlocks[key]
-          //   if (!this.highestBlocks[key] || this.highestBlocks[key].y < highest.y) {
-          //     this.highestBlocks[key] = highest
-          //   }
-          // }
-          const chunkCoords = data.key.split(',').map(Number)
-          this.lastChunkDistance = Math.max(...this.getDistance(new Vec3(chunkCoords[0], 0, chunkCoords[2])))
-        }
-        if (data.type === 'sectionFinished') { // on after load & unload section
-          if (!this.sectionsWaiting.get(data.key)) throw new Error(`sectionFinished event for non-outstanding section ${data.key}`)
-          this.sectionsWaiting.set(data.key, this.sectionsWaiting.get(data.key)! - 1)
-          if (this.sectionsWaiting.get(data.key) === 0) {
-            this.sectionsWaiting.delete(data.key)
-            this.finishedSections[data.key] = true
-          }
 
-          const chunkCoords = data.key.split(',').map(Number)
-          if (this.loadedChunks[`${chunkCoords[0]},${chunkCoords[2]}`]) { // ensure chunk data was added, not a neighbor chunk update
-            const loadingKeys = [...this.sectionsWaiting.keys()]
-            if (!loadingKeys.some(key => {
-              const [x, y, z] = key.split(',').map(Number)
-              return x === chunkCoords[0] && z === chunkCoords[2]
-            })) {
-              this.finishedChunks[`${chunkCoords[0]},${chunkCoords[2]}`] = true
-              this.renderUpdateEmitter.emit(`chunkFinished`, `${chunkCoords[0] / 16},${chunkCoords[2] / 16}`)
-            }
-          }
-          this.checkAllFinished()
-
-          this.renderUpdateEmitter.emit('update')
-          if (data.processTime) {
-            this.workersProcessAverageTimeCount++
-            this.workersProcessAverageTime = ((this.workersProcessAverageTime * (this.workersProcessAverageTimeCount - 1)) + data.processTime) / this.workersProcessAverageTimeCount
-            this.maxWorkersProcessTime = Math.max(this.maxWorkersProcessTime, data.processTime)
-          }
-        }
-
-        if (data.type === 'blockStateModelInfo') {
-          for (const [cacheKey, info] of Object.entries(data.info)) {
-            this.blockStateModelInfo.set(cacheKey, info)
-          }
-        }
-      }
       worker.onmessage = ({ data }) => {
         if (Array.isArray(data)) {
-          // eslint-disable-next-line unicorn/no-array-for-each
-          data.forEach(handleMessage)
-          return
+          this.messageQueue.push(...data)
+        } else {
+          this.messageQueue.push(data)
         }
-        handleMessage(data)
+        void this.processMessageQueue()
       }
       if (worker.on) worker.on('message', (data) => { worker.onmessage({ data }) })
       this.workers.push(worker)
     }
   }
 
+  async processMessageQueue () {
+    if (this.isProcessingQueue || this.messageQueue.length === 0) return
+    if (this.lastRendered && performance.now() - this.lastRendered > 30 && this.worldRendererConfig._experimentalSmoothChunkLoading && this.renderingActive) {
+      await new Promise(resolve => {
+        requestAnimationFrame(resolve)
+      })
+    }
+    this.isProcessingQueue = true
+
+    const startTime = performance.now()
+    let processedCount = 0
+
+    while (this.messageQueue.length > 0) {
+      const data = this.messageQueue.shift()!
+      this.handleMessage(data)
+      processedCount++
+
+      // Check if we've exceeded the time limit
+      if (performance.now() - startTime > this.ONMESSAGE_TIME_LIMIT && this.renderingActive) {
+        // If we have more messages and exceeded time limit, schedule next batch
+        if (this.messageQueue.length > 0) {
+          requestAnimationFrame(async () => {
+            this.isProcessingQueue = false
+            void this.processMessageQueue()
+          })
+          return
+        }
+        break
+      }
+    }
+
+    this.isProcessingQueue = false
+  }
+
+  handleMessage (data) {
+    if (!this.active) return
+    if (data.type !== 'geometry' || !this.debugStopGeometryUpdate) {
+      this.handleWorkerMessage(data)
+    }
+    if (data.type === 'geometry') {
+      this.geometryReceiveCount[data.workerIndex] ??= 0
+      this.geometryReceiveCount[data.workerIndex]++
+      const geometry = data.geometry as MesherGeometryOutput
+      this.highestBlocksBySections[data.key] = geometry.highestBlocks
+      const chunkCoords = data.key.split(',').map(Number)
+      this.lastChunkDistance = Math.max(...this.getDistance(new Vec3(chunkCoords[0], 0, chunkCoords[2])))
+    }
+    if (data.type === 'sectionFinished') { // on after load & unload section
+      if (!this.sectionsWaiting.has(data.key)) throw new Error(`sectionFinished event for non-outstanding section ${data.key}`)
+      this.sectionsWaiting.set(data.key, this.sectionsWaiting.get(data.key)! - 1)
+      if (this.sectionsWaiting.get(data.key) === 0) {
+        this.sectionsWaiting.delete(data.key)
+        this.finishedSections[data.key] = true
+      }
+
+      const chunkCoords = data.key.split(',').map(Number)
+      const chunkKey = `${chunkCoords[0]},${chunkCoords[2]}`
+      if (this.loadedChunks[chunkKey]) { // ensure chunk data was added, not a neighbor chunk update
+        let loaded = true
+        for (let y = this.worldMinYRender; y < this.worldSizeParams.worldHeight; y += 16) {
+          if (!this.finishedSections[`${chunkCoords[0]},${y},${chunkCoords[2]}`]) {
+            loaded = false
+            break
+          }
+        }
+        if (loaded) {
+          // CHUNK FINISHED
+          this.finishedChunks[chunkKey] = true
+          this.renderUpdateEmitter.emit(`chunkFinished`, `${chunkCoords[0] / 16},${chunkCoords[2] / 16}`)
+          this.checkAllFinished()
+          // merge highest blocks by sections into highest blocks by chunks
+          // for (let y = this.worldMinYRender; y < this.worldSizeParams.worldHeight; y += 16) {
+          //   const sectionKey = `${chunkCoords[0]},${y},${chunkCoords[2]}`
+          //   for (let x = 0; x < 16; x++) {
+          //     for (let z = 0; z < 16; z++) {
+          //       const posInsideKey = `${chunkCoords[0] + x},${chunkCoords[2] + z}`
+          //       let block = null as HighestBlockInfo | null
+          //       const highestBlock = this.highestBlocksBySections[sectionKey]?.[posInsideKey]
+          //       if (!highestBlock) continue
+          //       if (!block || highestBlock.y > block.y) {
+          //         block = highestBlock
+          //       }
+          //       if (block) {
+          //         this.highestBlocksByChunks[chunkKey] ??= {}
+          //         this.highestBlocksByChunks[chunkKey][posInsideKey] = block
+          //       }
+          //     }
+          //   }
+          //   delete this.highestBlocksBySections[sectionKey]
+          // }
+        }
+      }
+
+      this.renderUpdateEmitter.emit('update')
+      if (data.processTime) {
+        this.workersProcessAverageTimeCount++
+        this.workersProcessAverageTime = ((this.workersProcessAverageTime * (this.workersProcessAverageTimeCount - 1)) + data.processTime) / this.workersProcessAverageTimeCount
+        this.maxWorkersProcessTime = Math.max(this.maxWorkersProcessTime, data.processTime)
+      }
+    }
+
+    if (data.type === 'blockStateModelInfo') {
+      for (const [cacheKey, info] of Object.entries(data.info)) {
+        this.blockStateModelInfo.set(cacheKey, info)
+      }
+    }
+  }
+
   checkAllFinished () {
     if (this.sectionsWaiting.size === 0) {
       this.reactiveState.world.mesherWork = false
@@ -420,9 +477,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   updateChunksStats () {
     const loadedChunks = Object.keys(this.finishedChunks)
-    this.reactiveState.world.chunksLoaded = loadedChunks
-    this.reactiveState.world.chunksTotalNumber = this.chunksLength
+    this.displayOptions.nonReactiveState.world.chunksLoaded = loadedChunks
+    this.displayOptions.nonReactiveState.world.chunksTotalNumber = this.chunksLength
     this.reactiveState.world.allChunksLoaded = this.allChunksFinished
+
     updateStatText('downloaded-chunks', `${Object.keys(this.loadedChunks).length}/${this.chunksLength} chunks D (${this.workers.length}:${this.workersProcessAverageTime.toFixed(0)}ms/${this.allLoadedIn?.toFixed(1) ?? '-'}s)`)
   }
 
@@ -465,7 +523,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   removeColumn (x, z) {
-    this.updateChunksStats()
     delete this.loadedChunks[`${x},${z}`]
     for (const worker of this.workers) {
       worker.postMessage({ type: 'unloadChunk', x, z })
@@ -479,18 +536,11 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     for (let y = this.worldSizeParams.minY; y < this.worldSizeParams.worldHeight; y += 16) {
       this.setSectionDirty(new Vec3(x, y, z), false)
       delete this.finishedSections[`${x},${y},${z}`]
+      delete this.highestBlocksBySections[`${x},${y},${z}`]
     }
+    delete this.highestBlocksByChunks[`${x},${z}`]
 
-    // remove from highestBlocks
-    const startX = Math.floor(x / 16) * 16
-    const startZ = Math.floor(z / 16) * 16
-    const endX = Math.ceil((x + 1) / 16) * 16
-    const endZ = Math.ceil((z + 1) / 16) * 16
-    for (let x = startX; x < endX; x += 16) {
-      for (let z = startZ; z < endZ; z += 16) {
-        delete this.highestBlocks[`${x},${z}`]
-      }
-    }
+    this.updateChunksStats()
   }
 
   setBlockStateId (pos: Vec3, stateId: number | undefined) {
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index 0f34052a..ce18050b 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -94,6 +94,7 @@ const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitO
     disconnect,
     setRendering (rendering) {
       documentRenderer.setPaused(!rendering)
+      if (worldRenderer) worldRenderer.renderingActive = rendering
     },
     getDebugOverlay: () => ({
     }),
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index c74bba51..84354a25 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -436,6 +436,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   render (sizeChanged = false) {
+    this.lastRendered = performance.now()
     this.cursorBlock.render()
 
     const sizeOrFovChanged = sizeChanged || this.displayOptions.inWorldRenderingConfig.fov !== this.camera.fov
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 561204c0..98d0f389 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -1,11 +1,12 @@
 import { WorldDataEmitter } from 'renderer/viewer/lib/worldDataEmitter'
-import { IPlayerState } from 'renderer/viewer/lib/basePlayerState'
+import { BasePlayerState, IPlayerState } from 'renderer/viewer/lib/basePlayerState'
 import { subscribeKey } from 'valtio/utils'
 import { defaultWorldRendererConfig, WorldRendererConfig } from 'renderer/viewer/lib/worldrendererCommon'
 import { Vec3 } from 'vec3'
 import { SoundSystem } from 'renderer/viewer/three/threeJsSound'
 import { proxy } from 'valtio'
 import { getDefaultRendererState } from 'renderer/viewer/baseGraphicsBackend'
+import { getSyncWorld } from 'renderer/playground/shared'
 import { playerState } from './mineflayer/playerState'
 import { createNotificationProgressReporter, ProgressReporter } from './core/progressReporter'
 import { setLoadingScreenStatus } from './appStatus'
@@ -25,6 +26,15 @@ export interface RendererReactiveState {
   renderer: string
   preventEscapeMenu: boolean
 }
+export interface NonReactiveState {
+  world: {
+    chunksLoaded: string[]
+    chunksTotalNumber: number
+    allChunksLoaded: boolean
+    mesherWork: boolean
+    intersectMedia: { id: string, x: number, y: number } | null
+  }
+}
 
 export interface GraphicsBackendConfig {
   fpsLimit?: number
@@ -52,6 +62,7 @@ export interface DisplayWorldOptions {
   inWorldRenderingConfig: WorldRendererConfig
   playerState: IPlayerState
   rendererState: RendererReactiveState
+  nonReactiveState: NonReactiveState
 }
 
 export type GraphicsBackendLoader = (options: GraphicsInitOptions) => GraphicsBackend
@@ -91,6 +102,7 @@ export class AppViewer {
   lastCamUpdate = 0
   playerState = playerState
   rendererState = proxy(getDefaultRendererState())
+  nonReactiveState: NonReactiveState = getDefaultRendererState()
   worldReady: Promise<void>
   private resolveWorldReady: () => void
 
@@ -128,7 +140,7 @@ export class AppViewer {
     }
   }
 
-  startWorld (world, renderDistance: number, playerStateSend: IPlayerState = playerState) {
+  startWorld (world, renderDistance: number, playerStateSend: IPlayerState = this.playerState) {
     if (this.currentDisplay === 'world') throw new Error('World already started')
     this.currentDisplay = 'world'
     const startPosition = playerStateSend.getPosition()
@@ -141,7 +153,8 @@ export class AppViewer {
       worldView: this.worldView,
       inWorldRenderingConfig: this.inWorldRenderingConfig,
       playerState: playerStateSend,
-      rendererState: this.rendererState
+      rendererState: this.rendererState,
+      nonReactiveState: this.nonReactiveState
     }
     if (this.backend) {
       this.backend.startWorld(displayWorldOptions)
@@ -222,15 +235,17 @@ const initialMenuStart = async () => {
   if (appViewer.currentDisplay === 'world') {
     appViewer.resetBackend(true)
   }
-  appViewer.startPanorama()
+  // appViewer.startPanorama()
 
   // await appViewer.resourcesManager.loadMcData('1.21.4')
   // const world = getSyncWorld('1.21.4')
-  // await appViewer.prepareResources('1.21.4', createNullProgressReporter())
   // world.setBlockStateId(new Vec3(0, 64, 0), 1)
-  // appViewer.startWorld(world, 3, new Vec3(0, 64, 0), new BasePlayerState())
+  // appViewer.resourcesManager.currentConfig = { version: '1.21.4' }
+  // await appViewer.resourcesManager.updateAssetsData({})
+  // appViewer.playerState = new BasePlayerState() as any
+  // appViewer.startWorld(world, 3)
   // appViewer.backend?.updateCamera(new Vec3(0, 64, 2), 0, 0)
-  // void appViewer.worldView.init(new Vec3(0, 64, 0))
+  // void appViewer.worldView!.init(new Vec3(0, 64, 0))
 }
 window.initialMenuStart = initialMenuStart
 
diff --git a/src/index.ts b/src/index.ts
index 5e346ae1..67a751e2 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -173,6 +173,11 @@ export async function connect (connectOptions: ConnectOptions) {
       }
     })
   }
+  if (sessionStorage.delayLoadUntilClick) {
+    await new Promise(resolve => {
+      window.addEventListener('click', resolve)
+    })
+  }
 
   miscUiState.hasErrors = false
   lastConnectOptions.value = connectOptions
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index eb1aa262..db86b139 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -109,6 +109,11 @@ const defaultOptions = {
   disabledUiParts: [] as string[],
   neighborChunkUpdates: true,
   highlightBlockColor: 'auto' as 'auto' | 'blue' | 'classic',
+  rendererOptions: {
+    three: {
+      _experimentalSmoothChunkLoading: true
+    }
+  }
 }
 
 function getDefaultTouchControlsPositions () {
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
index b1d39e80..f72a03b4 100644
--- a/src/react/MinimapProvider.tsx
+++ b/src/react/MinimapProvider.tsx
@@ -201,7 +201,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     const chunkWorldX = chunkX * 16
     const chunkWorldZ = chunkZ * 16
     if (appViewer.rendererState.world.chunksLoaded.includes(`${chunkWorldX},${chunkWorldZ}`)) {
-      const highestBlocks = await getThreeJsRendererMethods()?.getHighestBlocks()
+      const highestBlocks = await getThreeJsRendererMethods()?.getHighestBlocks(`${chunkWorldX},${chunkWorldZ}`)
       if (!highestBlocks) return undefined
       const heightmap = new Uint8Array(256)
       const colors = Array.from({ length: 256 }).fill('') as string[]
@@ -212,7 +212,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
         for (let x = 0; x < 16; x += 1) {
           const blockX = chunkWorldX + x
           const blockZ = chunkWorldZ + z
-          const hBlock = highestBlocks.get(`${blockX},${blockZ}`)
+          const hBlock = highestBlocks[`${blockX},${blockZ}`]
           blockPos.x = blockX; blockPos.z = blockZ; blockPos.y = hBlock?.y ?? 0
           let block = bot.world.getBlock(blockPos)
           while (block?.name.includes('air')) {
@@ -333,7 +333,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     const [chunkX, chunkZ] = key.split(',').map(Number)
     const chunkWorldX = chunkX * 16
     const chunkWorldZ = chunkZ * 16
-    const highestBlocks = await getThreeJsRendererMethods()?.getHighestBlocks()
+    const highestBlocks = await getThreeJsRendererMethods()?.getHighestBlocks(`${chunkWorldX},${chunkWorldZ}`)
     if (appViewer.rendererState.world.chunksLoaded.includes(`${chunkWorldX},${chunkWorldZ}`)) {
       const heightmap = new Uint8Array(256)
       const colors = Array.from({ length: 256 }).fill('') as string[]
@@ -342,7 +342,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
         for (let x = 0; x < 16; x += 1) {
           const blockX = chunkWorldX + x
           const blockZ = chunkWorldZ + z
-          const hBlock = highestBlocks.get(`${blockX},${blockZ}`)
+          const hBlock = highestBlocks[`${blockX},${blockZ}`]
           const block = bot.world.getBlock(new Vec3(blockX, hBlock?.y ?? 0, blockZ))
           // const block = Block.fromStateId(hBlock?.stateId ?? -1, hBlock?.biomeId ?? -1)
           const index = z * 16 + x
@@ -462,7 +462,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     let color: string
     if (this.isOldVersion) {
       color = BlockData.colors[preflatMap.blocks[`${block.type}:${block.metadata}`]?.replaceAll(/\[.*?]/g, '')]
-      ?? 'rgb(0, 0, 255)'
+        ?? 'rgb(0, 0, 255)'
     } else {
       color = this.blockData.get(block.name) ?? 'rgb(0, 255, 0)'
     }
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index d52c3a5f..c6739a6d 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -85,6 +85,7 @@ export const watchOptionsAfterViewerInit = () => {
     appViewer.inWorldRenderingConfig.extraBlockRenderers = !o.disableSignsMapsSupport
     appViewer.inWorldRenderingConfig.fetchPlayerSkins = o.loadPlayerSkins
     appViewer.inWorldRenderingConfig.highlightBlockColor = o.highlightBlockColor
+    appViewer.inWorldRenderingConfig._experimentalSmoothChunkLoading = o.rendererOptions.three._experimentalSmoothChunkLoading
   })
 
   appViewer.inWorldRenderingConfig.smoothLighting = options.smoothLighting

From 3690cb22aa4d17f835ef59241a3cf5ed149c1ff2 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Mar 2025 04:39:33 +0300
Subject: [PATCH 379/753] fix classic panorama regression

---
 renderer/viewer/three/panorama.ts | 121 +++++++++++++++++-------------
 src/appViewer.ts                  |   2 +-
 src/react/MinimapProvider.tsx     |   2 +-
 3 files changed, 69 insertions(+), 56 deletions(-)

diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
index ddc79cbd..92164336 100644
--- a/renderer/viewer/three/panorama.ts
+++ b/renderer/viewer/three/panorama.ts
@@ -5,7 +5,7 @@ import { Vec3 } from 'vec3'
 import * as tweenJs from '@tweenjs/tween.js'
 import type { GraphicsInitOptions } from '../../../src/appViewer'
 import { WorldDataEmitter } from '../lib/worldDataEmitter'
-import { defaultWorldRendererConfig } from '../lib/worldrendererCommon'
+import { defaultWorldRendererConfig, WorldRendererCommon } from '../lib/worldrendererCommon'
 import { BasePlayerState } from '../lib/basePlayerState'
 import { getDefaultRendererState } from '../baseGraphicsBackend'
 import { WorldRendererThree } from './worldrendererThree'
@@ -29,7 +29,8 @@ export class PanoramaRenderer {
   private panoramaGroup: THREE.Object3D | null = null
   private time = 0
   private readonly abortController = new AbortController()
-  private worldRenderer: WorldRendererThree | undefined
+  private worldRenderer: WorldRendererCommon | WorldRendererThree | undefined
+  public WorldRendererClass = WorldRendererThree
 
   constructor (private readonly documentRenderer: DocumentRenderer, private readonly options: GraphicsInitOptions, private readonly doWorldBlocksPanorama = false) {
     this.scene = new THREE.Scene()
@@ -68,57 +69,14 @@ export class PanoramaRenderer {
   }
 
   addClassicPanorama () {
-    const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000)
-    const loader = new THREE.TextureLoader()
-    const panorMaterials = [] as THREE.MeshBasicMaterial[]
-
-    for (const file of panoramaFiles) {
-      const texture = loader.load(join('background', file))
-
-      // Instead of using repeat/offset to flip, we'll use the texture matrix
-      texture.matrixAutoUpdate = false
-      texture.matrix.set(
-        -1, 0, 1, 0, 1, 0, 0, 0, 1
-      )
-
-      texture.wrapS = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
-      texture.wrapT = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
-      texture.minFilter = THREE.LinearFilter
-      texture.magFilter = THREE.LinearFilter
-
-      panorMaterials.push(new THREE.MeshBasicMaterial({
-        map: texture,
-        transparent: true,
-        side: THREE.DoubleSide,
-        depthWrite: false,
-      }))
-    }
-
-    const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials)
-    panoramaBox.onBeforeRender = () => {
+    const classicPanorama = new ClassicPanoramaRenderer(panoramaFiles.map(file => join('background', file)))
+    classicPanorama.panoramaGroup.onBeforeRender = () => {
       this.time += 0.01
-      panoramaBox.rotation.y = Math.PI + this.time * 0.01
-      panoramaBox.rotation.z = Math.sin(-this.time * 0.001) * 0.001
+      classicPanorama.panoramaGroup.rotation.y = Math.PI + this.time * 0.01
+      classicPanorama.panoramaGroup.rotation.z = Math.sin(-this.time * 0.001) * 0.001
     }
-
-    const group = new THREE.Object3D()
-    group.add(panoramaBox)
-
-    // Add squids
-    for (let i = 0; i < 20; i++) {
-      const m = new EntityMesh('1.16.4', 'squid').mesh
-      m.position.set(Math.random() * 30 - 15, Math.random() * 20 - 10, Math.random() * 10 - 17)
-      m.rotation.set(0, Math.PI + Math.random(), -Math.PI / 4, 'ZYX')
-      const v = Math.random() * 0.01
-      m.children[0].onBeforeRender = () => {
-        m.rotation.y += v
-        m.rotation.z = Math.cos(panoramaBox.rotation.y * 3) * Math.PI / 4 - Math.PI / 2
-      }
-      group.add(m)
-    }
-
-    this.scene.add(group)
-    this.panoramaGroup = group
+    this.scene.add(classicPanorama.panoramaGroup)
+    this.panoramaGroup = classicPanorama.panoramaGroup
   }
 
   async worldBlocksPanorama () {
@@ -155,7 +113,7 @@ export class PanoramaRenderer {
     // worldView.addWaitTime = 0
     if (this.abortController.signal.aborted) return
 
-    this.worldRenderer = new WorldRendererThree(
+    this.worldRenderer = new this.WorldRendererClass(
       this.documentRenderer.renderer,
       this.options,
       {
@@ -163,10 +121,13 @@ export class PanoramaRenderer {
         worldView,
         inWorldRenderingConfig: defaultWorldRendererConfig,
         playerState: new BasePlayerState(),
-        rendererState: getDefaultRendererState()
+        rendererState: getDefaultRendererState(),
+        nonReactiveState: getDefaultRendererState()
       }
     )
-    this.scene = this.worldRenderer.scene
+    if (this.worldRenderer instanceof WorldRendererThree) {
+      this.scene = this.worldRenderer.scene
+    }
     void worldView.init(initPos)
 
     await this.worldRenderer.waitForChunksToRender()
@@ -205,3 +166,55 @@ export class PanoramaRenderer {
     this.abortController.abort()
   }
 }
+
+class ClassicPanoramaRenderer {
+  panoramaGroup: THREE.Object3D
+
+  constructor (private readonly backgroundFiles: string[]) {
+    const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000)
+    const loader = new THREE.TextureLoader()
+    const panorMaterials = [] as THREE.MeshBasicMaterial[]
+
+    for (const file of this.backgroundFiles) {
+      const texture = loader.load(file)
+
+      // Instead of using repeat/offset to flip, we'll use the texture matrix
+      texture.matrixAutoUpdate = false
+      texture.matrix.set(
+        -1, 0, 1, 0, 1, 0, 0, 0, 1
+      )
+
+      texture.wrapS = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
+      texture.wrapT = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
+      texture.minFilter = THREE.LinearFilter
+      texture.magFilter = THREE.LinearFilter
+
+      panorMaterials.push(new THREE.MeshBasicMaterial({
+        map: texture,
+        transparent: true,
+        side: THREE.DoubleSide,
+        depthWrite: false,
+      }))
+    }
+
+    const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials)
+
+    const group = new THREE.Object3D()
+    group.add(panoramaBox)
+
+    // Add squids
+    for (let i = 0; i < 20; i++) {
+      const m = new EntityMesh('1.16.4', 'squid').mesh
+      m.position.set(Math.random() * 30 - 15, Math.random() * 20 - 10, Math.random() * 10 - 17)
+      m.rotation.set(0, Math.PI + Math.random(), -Math.PI / 4, 'ZYX')
+      const v = Math.random() * 0.01
+      m.children[0].onBeforeRender = () => {
+        m.rotation.y += v
+        m.rotation.z = Math.cos(panoramaBox.rotation.y * 3) * Math.PI / 4 - Math.PI / 2
+      }
+      group.add(m)
+    }
+
+    this.panoramaGroup = group
+  }
+}
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 98d0f389..f4032712 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -235,7 +235,7 @@ const initialMenuStart = async () => {
   if (appViewer.currentDisplay === 'world') {
     appViewer.resetBackend(true)
   }
-  // appViewer.startPanorama()
+  appViewer.startPanorama()
 
   // await appViewer.resourcesManager.loadMcData('1.21.4')
   // const world = getSyncWorld('1.21.4')
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
index f72a03b4..fcd23f97 100644
--- a/src/react/MinimapProvider.tsx
+++ b/src/react/MinimapProvider.tsx
@@ -462,7 +462,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     let color: string
     if (this.isOldVersion) {
       color = BlockData.colors[preflatMap.blocks[`${block.type}:${block.metadata}`]?.replaceAll(/\[.*?]/g, '')]
-        ?? 'rgb(0, 0, 255)'
+      ?? 'rgb(0, 0, 255)'
     } else {
       color = this.blockData.get(block.name) ?? 'rgb(0, 255, 0)'
     }

From f161fd31d4388d77228663fb197f9d658aa5b22c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Mar 2025 04:40:11 +0300
Subject: [PATCH 380/753] feat(renderer): dont display underground sections.
 Display chunks only when they are fully loaded

---
 renderer/viewer/lib/worldrendererCommon.ts  |  2 +-
 renderer/viewer/three/worldrendererThree.ts | 28 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 26c659cd..2df29e6a 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -298,7 +298,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         if (loaded) {
           // CHUNK FINISHED
           this.finishedChunks[chunkKey] = true
-          this.renderUpdateEmitter.emit(`chunkFinished`, `${chunkCoords[0] / 16},${chunkCoords[2] / 16}`)
+          this.renderUpdateEmitter.emit(`chunkFinished`, `${chunkCoords[0]},${chunkCoords[2]}`)
           this.checkAllFinished()
           // merge highest blocks by sections into highest blocks by chunks
           // for (let y = this.worldMinYRender; y < this.worldSizeParams.worldHeight; y += 16) {
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 84354a25..20e7eef3 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -38,6 +38,8 @@ interface MediaProperties {
   volume?: number
 }
 
+type SectionKey = string
+
 export class WorldRendererThree extends WorldRendererCommon {
   outputFormat = 'threeJs' as const
   sectionObjects: Record<string, THREE.Object3D> = {}
@@ -63,6 +65,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     updateUVMapping: (config: { startU: number, endU: number, startV: number, endV: number }) => void
   }>()
   cameraShake: CameraShake
+  waitingChunksToDisplay = {} as { [chunkKey: string]: SectionKey[] }
 
   get tilesRendered () {
     return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).tilesCount, 0)
@@ -89,6 +92,10 @@ export class WorldRendererThree extends WorldRendererCommon {
 
     this.soundSystem = new ThreeJsSound(this)
     this.cameraShake = new CameraShake(this.camera, this.onRender)
+
+    this.renderUpdateEmitter.on('chunkFinished', (chunkKey: string) => {
+      this.finishChunk(chunkKey)
+    })
   }
 
   updateEntity (e, isPosUpdate = false) {
@@ -270,6 +277,18 @@ export class WorldRendererThree extends WorldRendererCommon {
     }
   }
 
+  getDir (current: number, origin: number) {
+    if (current === origin) return 0
+    return current < origin ? 1 : -1
+  }
+
+  finishChunk (chunkKey: string) {
+    for (const sectionKey of this.waitingChunksToDisplay[chunkKey] ?? []) {
+      this.sectionObjects[sectionKey].visible = true
+    }
+    delete this.waitingChunksToDisplay[chunkKey]
+  }
+
   // debugRecomputedDeletedObjects = 0
   handleWorkerMessage (data: { geometry: MesherGeometryOutput, key, type }): void {
     if (data.type !== 'geometry') return
@@ -347,6 +366,15 @@ export class WorldRendererThree extends WorldRendererCommon {
       }
     }
     this.sectionObjects[data.key] = object
+    object.visible = false
+    const chunkKey = `${chunkCoords[0]},${chunkCoords[2]}`
+    this.waitingChunksToDisplay[chunkKey] ??= []
+    this.waitingChunksToDisplay[chunkKey].push(data.key)
+    if (this.finishedChunks[chunkKey]) {
+      // todo it might happen even when it was not an update
+      this.finishChunk(chunkKey)
+    }
+
     this.updatePosDataChunk(data.key)
     object.matrixAutoUpdate = false
     mesh.onAfterRender = (renderer, scene, camera, geometry, material, group) => {

From f8ef748e585047cdbc6d68e6261cc4163b4b9247 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Mar 2025 05:01:17 +0300
Subject: [PATCH 381/753] fix: disable chunk batch display by default because
 of incorrect order and its too slow

---
 renderer/viewer/lib/worldrendererCommon.ts  |   3 +-
 renderer/viewer/three/documentRenderer.ts   |   4 +
 renderer/viewer/three/panorama.ts           | 145 +++++++++++++-------
 renderer/viewer/three/worldrendererThree.ts |  16 ++-
 src/optionsStorage.ts                       |   3 +-
 src/watchOptions.ts                         |   1 +
 6 files changed, 114 insertions(+), 58 deletions(-)

diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 2df29e6a..c5a8de53 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -45,7 +45,8 @@ export const defaultWorldRendererConfig = {
   fetchPlayerSkins: true,
   highlightBlockColor: 'blue',
   foreground: true,
-  _experimentalSmoothChunkLoading: true
+  _experimentalSmoothChunkLoading: true,
+  _renderByChunks: false
 }
 
 export type WorldRendererConfig = typeof defaultWorldRendererConfig
diff --git a/renderer/viewer/three/documentRenderer.ts b/renderer/viewer/three/documentRenderer.ts
index 29e43ee9..dbea1205 100644
--- a/renderer/viewer/three/documentRenderer.ts
+++ b/renderer/viewer/three/documentRenderer.ts
@@ -22,6 +22,7 @@ export class DocumentRenderer {
   sizeChanged = () => { }
   droppedFpsPercentage: number
   config: GraphicsBackendConfig
+  onRender = [] as Array<(sizeChanged: boolean) => void>
 
   constructor (initOptions: GraphicsInitOptions) {
     this.config = initOptions.config
@@ -120,6 +121,9 @@ export class DocumentRenderer {
       this.stats.markStart()
       tween.update()
       this.render(sizeChanged)
+      for (const fn of this.onRender) {
+        fn(sizeChanged)
+      }
       this.renderedFps++
       this.stats.markEnd()
       this.postRender()
diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
index 92164336..8f79ff54 100644
--- a/renderer/viewer/three/panorama.ts
+++ b/renderer/viewer/three/panorama.ts
@@ -69,14 +69,57 @@ export class PanoramaRenderer {
   }
 
   addClassicPanorama () {
-    const classicPanorama = new ClassicPanoramaRenderer(panoramaFiles.map(file => join('background', file)))
-    classicPanorama.panoramaGroup.onBeforeRender = () => {
-      this.time += 0.01
-      classicPanorama.panoramaGroup.rotation.y = Math.PI + this.time * 0.01
-      classicPanorama.panoramaGroup.rotation.z = Math.sin(-this.time * 0.001) * 0.001
+    const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000)
+    const loader = new THREE.TextureLoader()
+    const panorMaterials = [] as THREE.MeshBasicMaterial[]
+
+    for (const file of panoramaFiles) {
+      const texture = loader.load(join('background', file))
+
+      // Instead of using repeat/offset to flip, we'll use the texture matrix
+      texture.matrixAutoUpdate = false
+      texture.matrix.set(
+        -1, 0, 1, 0, 1, 0, 0, 0, 1
+      )
+
+      texture.wrapS = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
+      texture.wrapT = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
+      texture.minFilter = THREE.LinearFilter
+      texture.magFilter = THREE.LinearFilter
+
+      panorMaterials.push(new THREE.MeshBasicMaterial({
+        map: texture,
+        transparent: true,
+        side: THREE.DoubleSide,
+        depthWrite: false,
+      }))
     }
-    this.scene.add(classicPanorama.panoramaGroup)
-    this.panoramaGroup = classicPanorama.panoramaGroup
+
+    const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials)
+    panoramaBox.onBeforeRender = () => {
+      this.time += 0.01
+      panoramaBox.rotation.y = Math.PI + this.time * 0.01
+      panoramaBox.rotation.z = Math.sin(-this.time * 0.001) * 0.001
+    }
+
+    const group = new THREE.Object3D()
+    group.add(panoramaBox)
+
+    // Add squids
+    for (let i = 0; i < 20; i++) {
+      const m = new EntityMesh('1.16.4', 'squid').mesh
+      m.position.set(Math.random() * 30 - 15, Math.random() * 20 - 10, Math.random() * 10 - 17)
+      m.rotation.set(0, Math.PI + Math.random(), -Math.PI / 4, 'ZYX')
+      const v = Math.random() * 0.01
+      m.children[0].onBeforeRender = () => {
+        m.rotation.y += v
+        m.rotation.z = Math.cos(panoramaBox.rotation.y * 3) * Math.PI / 4 - Math.PI / 2
+      }
+      group.add(m)
+    }
+
+    this.scene.add(group)
+    this.panoramaGroup = group
   }
 
   async worldBlocksPanorama () {
@@ -167,54 +210,58 @@ export class PanoramaRenderer {
   }
 }
 
-class ClassicPanoramaRenderer {
-  panoramaGroup: THREE.Object3D
+// export class ClassicPanoramaRenderer {
+//   panoramaGroup: THREE.Object3D
 
-  constructor (private readonly backgroundFiles: string[]) {
-    const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000)
-    const loader = new THREE.TextureLoader()
-    const panorMaterials = [] as THREE.MeshBasicMaterial[]
+//   constructor (private readonly backgroundFiles: string[], onRender: Array<(sizeChanged: boolean) => void>, addSquids = true) {
+//     const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000)
+//     const loader = new THREE.TextureLoader()
+//     const panorMaterials = [] as THREE.MeshBasicMaterial[]
 
-    for (const file of this.backgroundFiles) {
-      const texture = loader.load(file)
+//     for (const file of this.backgroundFiles) {
+//       const texture = loader.load(file)
 
-      // Instead of using repeat/offset to flip, we'll use the texture matrix
-      texture.matrixAutoUpdate = false
-      texture.matrix.set(
-        -1, 0, 1, 0, 1, 0, 0, 0, 1
-      )
+//       // Instead of using repeat/offset to flip, we'll use the texture matrix
+//       texture.matrixAutoUpdate = false
+//       texture.matrix.set(
+//         -1, 0, 1, 0, 1, 0, 0, 0, 1
+//       )
 
-      texture.wrapS = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
-      texture.wrapT = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
-      texture.minFilter = THREE.LinearFilter
-      texture.magFilter = THREE.LinearFilter
+//       texture.wrapS = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
+//       texture.wrapT = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
+//       texture.minFilter = THREE.LinearFilter
+//       texture.magFilter = THREE.LinearFilter
 
-      panorMaterials.push(new THREE.MeshBasicMaterial({
-        map: texture,
-        transparent: true,
-        side: THREE.DoubleSide,
-        depthWrite: false,
-      }))
-    }
+//       panorMaterials.push(new THREE.MeshBasicMaterial({
+//         map: texture,
+//         transparent: true,
+//         side: THREE.DoubleSide,
+//         depthWrite: false,
+//       }))
+//     }
 
-    const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials)
+//     const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials)
+//     panoramaBox.onBeforeRender = () => {
+//     }
 
-    const group = new THREE.Object3D()
-    group.add(panoramaBox)
+//     const group = new THREE.Object3D()
+//     group.add(panoramaBox)
 
-    // Add squids
-    for (let i = 0; i < 20; i++) {
-      const m = new EntityMesh('1.16.4', 'squid').mesh
-      m.position.set(Math.random() * 30 - 15, Math.random() * 20 - 10, Math.random() * 10 - 17)
-      m.rotation.set(0, Math.PI + Math.random(), -Math.PI / 4, 'ZYX')
-      const v = Math.random() * 0.01
-      m.children[0].onBeforeRender = () => {
-        m.rotation.y += v
-        m.rotation.z = Math.cos(panoramaBox.rotation.y * 3) * Math.PI / 4 - Math.PI / 2
-      }
-      group.add(m)
-    }
+//     if (addSquids) {
+//       // Add squids
+//       for (let i = 0; i < 20; i++) {
+//         const m = new EntityMesh('1.16.4', 'squid').mesh
+//         m.position.set(Math.random() * 30 - 15, Math.random() * 20 - 10, Math.random() * 10 - 17)
+//         m.rotation.set(0, Math.PI + Math.random(), -Math.PI / 4, 'ZYX')
+//         const v = Math.random() * 0.01
+//         onRender.push(() => {
+//           m.rotation.y += v
+//           m.rotation.z = Math.cos(panoramaBox.rotation.y * 3) * Math.PI / 4 - Math.PI / 2
+//         })
+//         group.add(m)
+//       }
+//     }
 
-    this.panoramaGroup = group
-  }
-}
+//     this.panoramaGroup = group
+//   }
+// }
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 20e7eef3..1f42f379 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -366,13 +366,15 @@ export class WorldRendererThree extends WorldRendererCommon {
       }
     }
     this.sectionObjects[data.key] = object
-    object.visible = false
-    const chunkKey = `${chunkCoords[0]},${chunkCoords[2]}`
-    this.waitingChunksToDisplay[chunkKey] ??= []
-    this.waitingChunksToDisplay[chunkKey].push(data.key)
-    if (this.finishedChunks[chunkKey]) {
-      // todo it might happen even when it was not an update
-      this.finishChunk(chunkKey)
+    if (this.displayOptions.inWorldRenderingConfig._renderByChunks) {
+      object.visible = false
+      const chunkKey = `${chunkCoords[0]},${chunkCoords[2]}`
+      this.waitingChunksToDisplay[chunkKey] ??= []
+      this.waitingChunksToDisplay[chunkKey].push(data.key)
+      if (this.finishedChunks[chunkKey]) {
+        // todo it might happen even when it was not an update
+        this.finishChunk(chunkKey)
+      }
     }
 
     this.updatePosDataChunk(data.key)
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index db86b139..24e00f28 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -111,7 +111,8 @@ const defaultOptions = {
   highlightBlockColor: 'auto' as 'auto' | 'blue' | 'classic',
   rendererOptions: {
     three: {
-      _experimentalSmoothChunkLoading: true
+      _experimentalSmoothChunkLoading: true,
+      _renderByChunks: false
     }
   }
 }
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index c6739a6d..ddb25cb8 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -86,6 +86,7 @@ export const watchOptionsAfterViewerInit = () => {
     appViewer.inWorldRenderingConfig.fetchPlayerSkins = o.loadPlayerSkins
     appViewer.inWorldRenderingConfig.highlightBlockColor = o.highlightBlockColor
     appViewer.inWorldRenderingConfig._experimentalSmoothChunkLoading = o.rendererOptions.three._experimentalSmoothChunkLoading
+    appViewer.inWorldRenderingConfig._renderByChunks = o.rendererOptions.three._renderByChunks
   })
 
   appViewer.inWorldRenderingConfig.smoothLighting = options.smoothLighting

From 797459b0fc2fb84f98f2eccebccea1f130536906 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Mar 2025 05:08:10 +0300
Subject: [PATCH 382/753] fix: pass custom brand for ws:// servers

---
 src/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/index.ts b/src/index.ts
index 67a751e2..87ea7f1b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -463,9 +463,11 @@ export async function connect (connectOptions: ConnectOptions) {
       await downloadMcData(finalVersion)
     }
 
+    const brand = clientDataStream ? 'minecraft-web-client' : undefined
     bot = mineflayer.createBot({
       host: server.host,
       port: server.port ? +server.port : undefined,
+      brand,
       version: finalVersion || false,
       ...clientDataStream ? {
         stream: clientDataStream as any,

From f8800d5a31b2baef0e4df79885f5119b7091095a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Mar 2025 06:46:51 +0300
Subject: [PATCH 383/753] ci: add step to update deployAlwaysUpdate packages in
 preview workflow

---
 .github/workflows/preview.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 6408c86a..4b755f7b 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -52,6 +52,19 @@ jobs:
         with:
           node-version: 22
           cache: "pnpm"
+      - name: Update deployAlwaysUpdate packages
+        run: |
+          if [ -f package.json ]; then
+            PACKAGES=$(node -e "const pkg = require('./package.json'); if (pkg.deployAlwaysUpdate) console.log(pkg.deployAlwaysUpdate.join(' '))")
+            if [ ! -z "$PACKAGES" ]; then
+              echo "Updating packages: $PACKAGES"
+              pnpm up -L $PACKAGES
+            else
+              echo "No deployAlwaysUpdate packages found in package.json"
+            fi
+          else
+            echo "package.json not found"
+          fi
       - name: Install Global Dependencies
         run: pnpm add -g vercel
       - name: Pull Vercel Environment Information

From 52755fc18f3c99215d1b6127b3d17a409371e9ec Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Mar 2025 06:47:21 +0300
Subject: [PATCH 384/753] feat(renderer): add toggle for batch chunks display
 in options GUI

---
 src/optionsGuiScheme.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 4078d5e2..66a9d9cd 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -106,6 +106,15 @@ export const guiOptionsScheme: {
         ],
       },
     },
+    {
+      custom () {
+        const { _renderByChunks } = useSnapshot(options).rendererOptions.three
+        return <Button
+          label={`Batch Chunks Display ${_renderByChunks ? 'ON' : 'OFF'}`} onClick={() => {
+            options.rendererOptions.three._renderByChunks = !_renderByChunks
+          }} />
+      }
+    },
     {
       custom () {
         return <Category>Resource Packs</Category>

From b32bab82117414c4e83d6a15a73a528487ed31bb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Mar 2025 06:55:09 +0300
Subject: [PATCH 385/753] fix inscreen button

---
 src/optionsGuiScheme.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 66a9d9cd..a247350b 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -110,9 +110,12 @@ export const guiOptionsScheme: {
       custom () {
         const { _renderByChunks } = useSnapshot(options).rendererOptions.three
         return <Button
-          label={`Batch Chunks Display ${_renderByChunks ? 'ON' : 'OFF'}`} onClick={() => {
+          inScreen
+          label={`Batch Chunks Display ${_renderByChunks ? 'ON' : 'OFF'}`}
+          onClick={() => {
             options.rendererOptions.three._renderByChunks = !_renderByChunks
-          }} />
+          }}
+        />
       }
     },
     {

From cd9b796f16bf712783457668928eb89c8f95f09a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 26 Mar 2025 07:12:53 +0300
Subject: [PATCH 386/753] feat: now save actually changed options instead of
 all options in new localstorage key changedSettings for clarity

---
 src/optionsStorage.ts           | 32 ++++++++++++++++++++++++++------
 src/react/appStorageProvider.ts |  3 +++
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 24e00f28..ca2fa971 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -167,6 +167,18 @@ const migrateOptions = (options: Partial<AppOptions & Record<string, any>>) => {
 
   return options
 }
+const migrateOptionsLocalStorage = () => {
+  if (Object.keys(appStorage.options).length) {
+    for (const key of Object.keys(appStorage.options)) {
+      if (!(key in defaultOptions)) continue // drop unknown options
+      const defaultValue = defaultOptions[key]
+      if (JSON.stringify(defaultValue) !== JSON.stringify(appStorage.options[key])) {
+        appStorage.changedSettings[key] = appStorage.options[key]
+      }
+    }
+    appStorage.options = {}
+  }
+}
 
 export type AppOptions = typeof defaultOptions
 
@@ -187,14 +199,15 @@ const isDeepEqual = (a: any, b: any): boolean => {
 
 export const getChangedSettings = () => {
   return Object.fromEntries(
-    Object.entries(options).filter(([key, value]) => !isDeepEqual(defaultOptions[key], value))
+    Object.entries(appStorage.changedSettings).filter(([key, value]) => !isDeepEqual(defaultOptions[key], value))
   )
 }
 
+migrateOptionsLocalStorage()
 export const options: AppOptions = proxy({
   ...defaultOptions,
   ...initialAppConfig.defaultSettings,
-  ...migrateOptions(appStorage.options),
+  ...migrateOptions(appStorage.changedSettings),
   ...qsOptions
 })
 
@@ -210,10 +223,17 @@ Object.defineProperty(window, 'debugChangedOptions', {
   },
 })
 
-subscribe(options, () => {
-  // Don't save disabled settings to localStorage
-  const saveOptions = omitObj(options, [...disabledSettings.value] as any)
-  appStorage.options = saveOptions
+subscribe(options, (ops) => {
+  for (const op of ops) {
+    const [type, path, value] = op
+    // let patch
+    // let accessor = options
+    // for (const part of path) {
+    // }
+    const key = path[0] as string
+    if (disabledSettings.value.has(key)) continue
+    appStorage.changedSettings[key] = options[key]
+  }
 })
 
 type WatchValue = <T extends Record<string, any>>(proxy: T, callback: (p: T, isChanged: boolean) => void) => () => void
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index 30caa0ec..01420b39 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -32,7 +32,9 @@ type StorageData = {
   customCommands: Record<string, CustomCommand> | undefined
   username: string | undefined
   keybindings: UserOverridesConfig | undefined
+  /** @deprecated */
   options: any
+  changedSettings: any
   proxiesData: SavedProxiesData | undefined
   serversHistory: ServerHistoryEntry[]
   authenticatedAccounts: AuthenticatedAccount[]
@@ -72,6 +74,7 @@ const defaultStorageData: StorageData = {
   username: undefined,
   keybindings: undefined,
   options: {},
+  changedSettings: {},
   proxiesData: undefined,
   serversHistory: [],
   authenticatedAccounts: [],

From 47be0ac86566768391dae4de3d360c2cfc26c5d9 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 26 Mar 2025 06:22:38 +0100
Subject: [PATCH 387/753] feat: Item custom model data support (#318)

* feat: Item custom model data support

* rename prop, jsdoc for clarity

* explicit resource manager because it can be run in different threads, up mc-assets

* fix tsc

---------

Co-authored-by: Vitaly Turovsky <vital2580@icloud.com>
---
 .eslintrc.json                     |  1 +
 package.json                       |  2 +-
 pnpm-lock.yaml                     | 10 +++---
 renderer/viewer/three/appShared.ts |  2 +-
 renderer/viewer/three/entities.ts  |  1 +
 src/inventoryWindows.ts            |  4 +--
 src/mineflayer/items.ts            | 31 +++++++++++++++---
 src/react/HotbarRenderApp.tsx      |  2 +-
 src/resourcePack.ts                | 50 ++++++++++++++++++++++++++++++
 src/resourcesManager.ts            |  2 ++
 10 files changed, 90 insertions(+), 15 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 8b2225b5..3552f6a7 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -102,6 +102,7 @@
         // "@stylistic/multiline-ternary": "error", // not needed
         // "@stylistic/newline-per-chained-call": "error", // not sure if needed
         "@stylistic/new-parens": "error",
+        "@typescript-eslint/class-literal-property-style": "off",
         "@stylistic/no-confusing-arrow": "error",
         "@stylistic/wrap-iife": "error",
         "@stylistic/space-before-blocks": "error",
diff --git a/package.json b/package.json
index d9d0b69e..4867f241 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.45",
+    "mc-assets": "^0.2.47",
     "mineflayer-mouse": "^0.1.7",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 537a391e..865fd09a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -353,8 +353,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.45
-        version: 0.2.45
+        specifier: ^0.2.47
+        version: 0.2.47
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -6690,8 +6690,8 @@ packages:
   maxrects-packer@2.7.3:
     resolution: {integrity: sha512-bG6qXujJ1QgttZVIH4WDanhoJtvbud/xP/XPyf6A69C9RdA61BM4TomFALCq2nrTa+tARRIBB4LuIFsnUQU2wA==}
 
-  mc-assets@0.2.45:
-    resolution: {integrity: sha512-M1qnX73h/fW+mj9+A+jGtPaWDlq449DzPziZJxeLxmS1nSh/TSydKkLkWX967LaevVA1YtxNpA/SJ1N4jaW48w==}
+  mc-assets@0.2.47:
+    resolution: {integrity: sha512-L9tOcYctDGTUaG4QKJESw9uOiOMl8F2RZ3h0cF4NRCjBvd4c9GUrGDaaVdTaAByQZNNITXgGspmm9hNAFMWcKg==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.14:
@@ -17588,7 +17588,7 @@ snapshots:
 
   maxrects-packer@2.7.3: {}
 
-  mc-assets@0.2.45:
+  mc-assets@0.2.47:
     dependencies:
       maxrects-packer: 2.7.3
       zod: 3.24.1
diff --git a/renderer/viewer/three/appShared.ts b/renderer/viewer/three/appShared.ts
index b41d32db..9afbe563 100644
--- a/renderer/viewer/three/appShared.ts
+++ b/renderer/viewer/three/appShared.ts
@@ -26,7 +26,7 @@ export const getItemUv = (item: Record<string, any>, specificProps: ItemSpecific
     const model = getItemModelName({
       ...item,
       name,
-    } as GeneralInputItem, specificProps)
+    } as GeneralInputItem, specificProps, resourcesManager)
 
     const renderInfo = renderSlot({
       modelName: model,
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 45202608..35872deb 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -493,6 +493,7 @@ export class Entities {
   }
 
   getItemMesh (item, specificProps: ItemSpecificContextProperties, previousModel?: string) {
+    if (!item.nbt && item.nbtData) item.nbt = item.nbtData
     const textureUv = this.worldRenderer.getItemRenderData(item, specificProps)
     if (previousModel && previousModel === textureUv?.modelName) return undefined
 
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index a6cd4a3e..76c1c52d 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -250,7 +250,7 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
 }
 
 const getItemName = (slot: Item | RenderItem | null) => {
-  const parsed = getItemNameRaw(slot)
+  const parsed = getItemNameRaw(slot, appViewer.resourcesManager)
   if (!parsed) return
   // todo display full text renderer from sign renderer
   const text = flat(parsed as MessageFormatPart).map(x => x.text)
@@ -277,7 +277,7 @@ const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
     try {
       if (slot.durabilityUsed && slot.maxDurability) slot.durabilityUsed = Math.min(slot.durabilityUsed, slot.maxDurability)
       const debugIsQuickbar = !isJei && i === bot.inventory.hotbarStart + bot.quickBarSlot
-      const modelName = getItemModelName(slot, { 'minecraft:display_context': 'gui', })
+      const modelName = getItemModelName(slot, { 'minecraft:display_context': 'gui', }, appViewer.resourcesManager)
       const slotCustomProps = renderSlot({ modelName }, debugIsQuickbar)
       const itemCustomName = getItemName(slot)
       Object.assign(slot, { ...slotCustomProps, displayName: itemCustomName ?? slot.displayName })
diff --git a/src/mineflayer/items.ts b/src/mineflayer/items.ts
index 8ddb476c..45638cd4 100644
--- a/src/mineflayer/items.ts
+++ b/src/mineflayer/items.ts
@@ -4,6 +4,7 @@ import { fromFormattedString } from '@xmcl/text-component'
 import { ItemSpecificContextProperties } from 'renderer/viewer/lib/basePlayerState'
 import { getItemDefinition } from 'mc-assets/dist/itemDefinitions'
 import { MessageFormatPart } from '../chatUtils'
+import { ResourcesManager } from '../resourcesManager'
 import { playerState } from './playerState'
 
 type RenderSlotComponent = {
@@ -27,13 +28,21 @@ export type GeneralInputItem = Pick<import('prismarine-item').Item, 'name' | 'nb
 
 type JsonString = string
 type PossibleItemProps = {
+  CustomModelData?: number
   Damage?: number
   display?: { Name?: JsonString } // {"text":"Knife","color":"white","italic":"true"}
 }
 
-export const getItemMetadata = (item: GeneralInputItem) => {
+export const getItemMetadata = (item: GeneralInputItem, resourcesManager: ResourcesManager) => {
   let customText = undefined as string | any | undefined
   let customModel = undefined as string | undefined
+
+  let itemId = item.name
+  if (!itemId.includes(':')) {
+    itemId = `minecraft:${itemId}`
+  }
+  const customModelDataDefinitions = resourcesManager.currentResources?.customItemModelNames[itemId]
+
   if (item.components) {
     const componentMap = new Map<string, RenderSlotComponent>()
     for (const component of item.components) {
@@ -48,6 +57,15 @@ export const getItemMetadata = (item: GeneralInputItem) => {
     if (customModelComponent) {
       customModel = customModelComponent.data
     }
+    if (customModelDataDefinitions) {
+      const customModelDataComponent: any = componentMap.get('custom_model_data')
+      if (customModelDataComponent?.data && typeof customModelDataComponent.data === 'number') {
+        const customModelData = customModelDataComponent.data
+        if (customModelDataDefinitions[customModelData]) {
+          customModel = customModelDataDefinitions[customModelData]
+        }
+      }
+    }
     const loreComponent = componentMap.get('lore')
     if (loreComponent) {
       customText ??= item.displayName ?? item.name
@@ -61,6 +79,9 @@ export const getItemMetadata = (item: GeneralInputItem) => {
     if (customName) {
       customText = customName
     }
+    if (customModelDataDefinitions && itemNbt.CustomModelData && customModelDataDefinitions[itemNbt.CustomModelData]) {
+      customModel = customModelDataDefinitions[itemNbt.CustomModelData]
+    }
   }
 
   return {
@@ -70,8 +91,8 @@ export const getItemMetadata = (item: GeneralInputItem) => {
 }
 
 
-export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'> | null) => {
-  const { customText } = getItemMetadata(item as any)
+export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'> | null, resourcesManager: ResourcesManager) => {
+  const { customText } = getItemMetadata(item as any, resourcesManager)
   if (!customText) return
   try {
     if (typeof customText === 'object') {
@@ -90,9 +111,9 @@ export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'>
   }
 }
 
-export const getItemModelName = (item: GeneralInputItem, specificProps: ItemSpecificContextProperties) => {
+export const getItemModelName = (item: GeneralInputItem, specificProps: ItemSpecificContextProperties, resourcesManager: ResourcesManager) => {
   let itemModelName = item.name
-  const { customModel } = getItemMetadata(item)
+  const { customModel } = getItemMetadata(item, resourcesManager)
   if (customModel) {
     itemModelName = customModel
   }
diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index f0fadbfb..438f7e68 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -42,7 +42,7 @@ const ItemName = ({ itemKey }: { itemKey: string }) => {
   useEffect(() => {
     const item = bot.heldItem
     if (item) {
-      const customDisplay = getItemNameRaw(item)
+      const customDisplay = getItemNameRaw(item, appViewer.resourcesManager)
       if (customDisplay) {
         setItemName(customDisplay)
       } else {
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index afe97777..7c348cb2 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -313,6 +313,7 @@ const prepareBlockstatesAndModels = async (progressReporter: ProgressReporter) =
   const resources = appViewer.resourcesManager.currentResources!
   resources.customBlockStates = {}
   resources.customModels = {}
+  resources.customItemModelNames = {}
   const usedBlockTextures = new Set<string>()
   const usedItemTextures = new Set<string>()
   const basePath = await getActiveResourcepackBasePath()
@@ -354,14 +355,62 @@ const prepareBlockstatesAndModels = async (progressReporter: ProgressReporter) =
     return jsons
   }
 
+  const readCustomModelData = async (path: string, namespaceDir: string) => {
+    if (!(await existsAsync(path))) return
+    const files = await fs.promises.readdir(path)
+    const customModelData = {} as Record<string, string[]>
+    await Promise.all(files.map(async (file) => {
+      const filePath = `${path}/${file}`
+      if (file.endsWith('.json')) {
+        const contents = await fs.promises.readFile(filePath, 'utf8')
+        const name = file.replace('.json', '')
+        const parsed = JSON.parse(contents)
+        const entries: string[] = []
+        if (path.endsWith('/items')) { // 1.21.4+
+          // TODO: Support other properties too
+          if (parsed.model?.type === 'range_dispatch' && parsed.model?.property === 'custom_model_data') {
+            for (const entry of parsed.model?.entries ?? []) {
+              const threshold = entry.threshold ?? 0
+              let modelPath = entry.model?.model
+              if (typeof modelPath !== 'string') continue
+              if (!modelPath.includes(':')) modelPath = `minecraft:${modelPath}`
+              entries[threshold] = modelPath
+            }
+          }
+        } else if (path.endsWith('/models/item')) { // pre 1.21.4
+          for (const entry of parsed.overrides ?? []) {
+            if (entry.predicate?.custom_model_data && entry.model) {
+              let modelPath = entry.model
+              if (typeof modelPath !== 'string') continue
+              if (!modelPath.includes(':')) modelPath = `minecraft:${modelPath}`
+              entries[entry.predicate.custom_model_data] = modelPath
+            }
+          }
+        }
+        if (entries.length > 0) {
+          customModelData[`${namespaceDir}:${name}`] = entries
+        }
+      }
+    }))
+    return customModelData
+  }
+
   const readData = async (namespaceDir: string) => {
     const blockstatesPath = `${basePath}/assets/${namespaceDir}/blockstates`
     const blockModelsPath = `${basePath}/assets/${namespaceDir}/models/block`
+    const itemsPath = `${basePath}/assets/${namespaceDir}/items`
     const itemModelsPath = `${basePath}/assets/${namespaceDir}/models/item`
 
     Object.assign(resources.customBlockStates!, await readModelData(blockstatesPath, 'blockstates', namespaceDir))
     Object.assign(resources.customModels!, await readModelData(blockModelsPath, 'models', namespaceDir))
     Object.assign(resources.customModels!, await readModelData(itemModelsPath, 'models', namespaceDir))
+
+    for (const [key, value] of Object.entries(await readCustomModelData(itemsPath, namespaceDir) ?? {})) {
+      resources.customItemModelNames[key] = value
+    }
+    for (const [key, value] of Object.entries(await readCustomModelData(itemModelsPath, namespaceDir) ?? {})) {
+      resources.customItemModelNames[key] = value
+    }
   }
 
   try {
@@ -373,6 +422,7 @@ const prepareBlockstatesAndModels = async (progressReporter: ProgressReporter) =
     console.error('Failed to read some of resource pack blockstates and models', err)
     resources.customBlockStates = undefined
     resources.customModels = undefined
+    resources.customItemModelNames = {}
   }
   return {
     usedBlockTextures,
diff --git a/src/resourcesManager.ts b/src/resourcesManager.ts
index 64810165..5b3f403b 100644
--- a/src/resourcesManager.ts
+++ b/src/resourcesManager.ts
@@ -31,6 +31,8 @@ export class LoadedResources {
   // User data (specific to current resourcepack/version)
   customBlockStates?: Record<string, any>
   customModels?: Record<string, any>
+  /** array where the index represents the custom model data value, and the element at that index is the model path to use */
+  customItemModelNames: Record<string, string[]> = {}
   customTextures: {
     items?: { tileSize: number | undefined, textures: Record<string, HTMLImageElement> }
     blocks?: { tileSize: number | undefined, textures: Record<string, HTMLImageElement> }

From b58950bec2bec0a3eea673053bf8383883b86274 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 28 Mar 2025 12:46:05 +0300
Subject: [PATCH 388/753] update list of servers

---
 config.json | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/config.json b/config.json
index 532ed9c7..2ede8070 100644
--- a/config.json
+++ b/config.json
@@ -6,16 +6,19 @@
   "peerJsServer": "",
   "peerJsServerFallback": "https://p2p.mcraft.fun",
   "promoteServers": [
-    {
-      "ip": "wss://mcraft.ryzyn.xyz",
-      "version": "1.19.4"
-    },
     {
       "ip": "wss://play.mcraft.fun"
     },
+    {
+      "ip": "wss://ws.fuchsmc.net"
+    },
     {
       "ip": "wss://play2.mcraft.fun"
     },
+    {
+      "ip": "wss://mcraft.ryzyn.xyz",
+      "version": "1.19.4"
+    },
     {
       "ip": "kaboom.pw",
       "version": "1.20.3",

From 66b9f58c6fb6cd0786e6b14ba835034c886d8e65 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 01:53:54 +0300
Subject: [PATCH 389/753] fix error not displayed when crash during world
 display happens, dont crash world display on entity error

---
 renderer/viewer/lib/worldDataEmitter.ts |   7 +-
 src/index.ts                            | 162 +++++++++++++-----------
 2 files changed, 91 insertions(+), 78 deletions(-)

diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 557d5812..b4014239 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -150,7 +150,12 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
 
     for (const id in bot.entities) {
       const e = bot.entities[id]
-      emitEntity(e)
+      try {
+        emitEntity(e)
+      } catch (err) {
+        // reportError?.(err)
+        console.error('error processing entity', err)
+      }
     }
   }
 
diff --git a/src/index.ts b/src/index.ts
index 87ea7f1b..55d72a30 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,7 +5,7 @@ import './testCrasher'
 import './globals'
 import './devtools'
 import './entities'
-import './customChannels'
+import customChannels from './customChannels'
 import './globalDomListeners'
 import './mineflayer/maps'
 import './mineflayer/cameraShake'
@@ -111,6 +111,7 @@ initCollisionShapes()
 initializePacketsReplay()
 packetsPatcher()
 onAppLoad()
+customChannels()
 
 if (appQueryParams.testCrashApp === '2') throw new Error('test')
 
@@ -683,8 +684,7 @@ export async function connect (connectOptions: ConnectOptions) {
   })
 
   const spawnEarlier = !singleplayer && !p2pMultiplayer
-  // don't use spawn event, player can be dead
-  bot.once(spawnEarlier ? 'forcedMove' : 'health', async () => {
+  const displayWorld = async () => {
     if (resourcePackState.isServerInstalling) {
       await new Promise<void>(resolve => {
         subscribe(resourcePackState, () => {
@@ -694,88 +694,96 @@ export async function connect (connectOptions: ConnectOptions) {
         })
       })
     }
+    console.log('try to focus window')
     window.focus?.()
     errorAbortController.abort()
-
-    if (p2pConnectTimeout) clearTimeout(p2pConnectTimeout)
-    playerState.onlineMode = !!connectOptions.authenticatedAccount
-
-    progress.setMessage('Placing blocks (starting viewer)')
-    if (!connectOptions.worldStateFileContents || connectOptions.worldStateFileContents.length < 3 * 1024 * 1024) {
-      localStorage.lastConnectOptions = JSON.stringify(connectOptions)
-      if (process.env.NODE_ENV === 'development' && !localStorage.lockUrl && !Object.keys(window.debugQueryParams).length) {
-        lockUrl()
-      }
-    } else {
-      localStorage.removeItem('lastConnectOptions')
-    }
-    connectOptions.onSuccessfulPlay?.()
-    updateDataAfterJoin()
-    if (connectOptions.autoLoginPassword) {
-      bot.chat(`/login ${connectOptions.autoLoginPassword}`)
-    }
-
-
-    console.log('bot spawned - starting viewer')
-    appViewer.startWorld(bot.world, renderDistance)
-    appViewer.worldView!.listenToBot(bot)
-
-    initMotionTracking()
-    dayCycle()
-
-    // Bot position callback
-    function botPosition () {
-      appViewer.lastCamUpdate = Date.now()
-      // this might cause lag, but not sure
-      appViewer.backend?.updateCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch)
-      void appViewer.worldView?.updatePosition(bot.entity.position)
-    }
-    bot.on('move', botPosition)
-    botPosition()
-
-    progress.setMessage('Setting callbacks')
-
-    onGameLoad(() => {})
-
     if (appStatusState.isError) return
 
-    const waitForChunks = async () => {
-      if (appQueryParams.sp === '1') return //todo
-      const waitForChunks = options.waitForChunksRender === 'sp-only' ? !!singleplayer : options.waitForChunksRender
-      if (!appViewer.backend || appViewer.rendererState.world.allChunksLoaded || !waitForChunks) {
-        return
-      }
+    try {
+      if (p2pConnectTimeout) clearTimeout(p2pConnectTimeout)
+      playerState.onlineMode = !!connectOptions.authenticatedAccount
 
-      await progress.executeWithMessage(
-        'Loading chunks',
-        'chunks',
-        async () => {
-          await waitForChunksToLoad(progress)
+      progress.setMessage('Placing blocks (starting viewer)')
+      if (!connectOptions.worldStateFileContents || connectOptions.worldStateFileContents.length < 3 * 1024 * 1024) {
+        localStorage.lastConnectOptions = JSON.stringify(connectOptions)
+        if (process.env.NODE_ENV === 'development' && !localStorage.lockUrl && !Object.keys(window.debugQueryParams).length) {
+          lockUrl()
         }
-      )
-    }
-
-    await waitForChunks()
-
-    setTimeout(() => {
-      if (appQueryParams.suggest_save) {
-        showNotification('Suggestion', 'Save the world to keep your progress!', false, undefined, async () => {
-          const savePath = await saveToBrowserMemory()
-          if (!savePath) return
-          const saveName = savePath.split('/').pop()
-          bot.end()
-          // todo hot reload
-          location.search = `loadSave=${saveName}`
-        })
+      } else {
+        localStorage.removeItem('lastConnectOptions')
+      }
+      connectOptions.onSuccessfulPlay?.()
+      updateDataAfterJoin()
+      if (connectOptions.autoLoginPassword) {
+        bot.chat(`/login ${connectOptions.autoLoginPassword}`)
       }
-    }, 600)
 
-    miscUiState.gameLoaded = true
-    miscUiState.loadedServerIndex = connectOptions.serverIndex ?? ''
-    customEvents.emit('gameLoaded')
-    progress.end()
-    setLoadingScreenStatus(undefined)
-  })
+
+      console.log('bot spawned - starting viewer')
+      appViewer.startWorld(bot.world, renderDistance)
+      appViewer.worldView!.listenToBot(bot)
+
+      initMotionTracking()
+      dayCycle()
+
+      // Bot position callback
+      const botPosition = () => {
+        appViewer.lastCamUpdate = Date.now()
+        // this might cause lag, but not sure
+        appViewer.backend?.updateCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch)
+        void appViewer.worldView?.updatePosition(bot.entity.position)
+      }
+      bot.on('move', botPosition)
+      botPosition()
+
+      progress.setMessage('Setting callbacks')
+
+      onGameLoad(() => { })
+
+      if (appStatusState.isError) return
+
+      const waitForChunks = async () => {
+        if (appQueryParams.sp === '1') return //todo
+        const waitForChunks = options.waitForChunksRender === 'sp-only' ? !!singleplayer : options.waitForChunksRender
+        if (!appViewer.backend || appViewer.rendererState.world.allChunksLoaded || !waitForChunks) {
+          return
+        }
+
+        await progress.executeWithMessage(
+          'Loading chunks',
+          'chunks',
+          async () => {
+            await waitForChunksToLoad(progress)
+          }
+        )
+      }
+
+      await waitForChunks()
+
+      setTimeout(() => {
+        if (appQueryParams.suggest_save) {
+          showNotification('Suggestion', 'Save the world to keep your progress!', false, undefined, async () => {
+            const savePath = await saveToBrowserMemory()
+            if (!savePath) return
+            const saveName = savePath.split('/').pop()
+            bot.end()
+            // todo hot reload
+            location.search = `loadSave=${saveName}`
+          })
+        }
+      }, 600)
+
+      miscUiState.gameLoaded = true
+      miscUiState.loadedServerIndex = connectOptions.serverIndex ?? ''
+      customEvents.emit('gameLoaded')
+      progress.end()
+      setLoadingScreenStatus(undefined)
+    } catch (err) {
+      handleError(err)
+    }
+  }
+  // don't use spawn event, player can be dead
+  bot.once(spawnEarlier ? 'forcedMove' : 'health', displayWorld)
 
   if (singleplayer && connectOptions.serverOverrides.worldFolder) {
     fsState.saveLoaded = true

From 850ae6c2daef5bbe715ad997627fdfa219ca564f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 02:01:05 +0300
Subject: [PATCH 390/753] fix: put just connected server to start of list

---
 src/react/ServersListProvider.tsx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index fd4cdead..db1d7d77 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -287,12 +287,15 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         saveServerToHistory: shouldSave,
         onSuccessfulPlay () {
           if (shouldSave && !serversListDisplay.some(s => s.ip === ip)) {
-            const newServersList: StoreServerItem[] = [...serversListDisplay, {
-              ip,
-              lastJoined: Date.now(),
-              versionOverride: overrides.versionOverride,
-              numConnects: 1
-            }]
+            const newServersList: StoreServerItem[] = [
+              {
+                ip,
+                lastJoined: Date.now(),
+                versionOverride: overrides.versionOverride,
+                numConnects: 1
+              },
+              ...serversListDisplay
+            ]
             setNewServersList(newServersList)
             miscUiState.loadedServerIndex = (newServersList.length - 1).toString()
           }

From c3b4eb953fc6cce6e10dc8102a98e543f978a945 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 04:48:39 +0300
Subject: [PATCH 391/753] feat: add much better video support

---
 renderer/viewer/lib/guiRenderer.ts          |   1 -
 renderer/viewer/lib/worldrendererCommon.ts  |   2 +-
 renderer/viewer/three/entity/EntityMesh.ts  |   4 +-
 renderer/viewer/three/graphicsBackend.ts    |  15 +-
 renderer/viewer/three/threeJsMedia.ts       | 550 ++++++++++++++++++++
 renderer/viewer/three/threeJsSound.ts       |  24 +-
 renderer/viewer/three/world/cursorBlock.ts  |  16 +-
 renderer/viewer/three/worldrendererThree.ts | 456 +---------------
 src/controls.ts                             |   7 +
 src/customChannels.ts                       |  27 +
 src/mineflayer/plugins/mouse.ts             |  11 +-
 src/react/GameInteractionOverlay.tsx        |   2 +
 src/react/ServersList.tsx                   |   3 +
 src/react/Singleplayer.tsx                  |  15 +-
 src/react/utilsApp.ts                       |   1 +
 15 files changed, 657 insertions(+), 477 deletions(-)
 create mode 100644 renderer/viewer/three/threeJsMedia.ts

diff --git a/renderer/viewer/lib/guiRenderer.ts b/renderer/viewer/lib/guiRenderer.ts
index 2360e104..c81a8eaa 100644
--- a/renderer/viewer/lib/guiRenderer.ts
+++ b/renderer/viewer/lib/guiRenderer.ts
@@ -66,7 +66,6 @@ export const getNonFullBlocksModels = () => {
         handledItemsWithDefinitions.add(name)
       }
       if (resolvedModel?.elements) {
-
         let hasStandardDisplay = true
         if (resolvedModel['display']?.gui) {
           hasStandardDisplay =
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index c5a8de53..f48f7956 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -249,7 +249,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       processedCount++
 
       // Check if we've exceeded the time limit
-      if (performance.now() - startTime > this.ONMESSAGE_TIME_LIMIT && this.renderingActive) {
+      if (performance.now() - startTime > this.ONMESSAGE_TIME_LIMIT && this.renderingActive && this.worldRendererConfig._experimentalSmoothChunkLoading) {
         // If we have more messages and exceeded time limit, schedule next batch
         if (this.messageQueue.length > 0) {
           requestAnimationFrame(async () => {
diff --git a/renderer/viewer/three/entity/EntityMesh.ts b/renderer/viewer/three/entity/EntityMesh.ts
index 67222ed8..af6cc576 100644
--- a/renderer/viewer/three/entity/EntityMesh.ts
+++ b/renderer/viewer/three/entity/EntityMesh.ts
@@ -239,8 +239,8 @@ export function getMesh (
     const blockName = texture.slice(6)
     const textureInfo = worldRenderer.resourcesManager.currentResources!.blocksAtlasParser.getTextureInfo(blockName)
     if (textureInfo) {
-      textureWidth = blocksTexture!.image.width
-      textureHeight = blocksTexture!.image.height
+      textureWidth = blocksTexture?.image.width ?? textureWidth
+      textureHeight = blocksTexture?.image.height ?? textureHeight
       textureOffset = [textureInfo.u, textureInfo.v]
     } else {
       console.error(`Unknown block ${blockName}`)
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index ce18050b..a3a4c156 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -24,13 +24,16 @@ const getBackendMethods = (worldRenderer: WorldRendererThree) => {
     changeHandSwingingState: worldRenderer.changeHandSwingingState.bind(worldRenderer),
     getHighestBlocks: worldRenderer.getHighestBlocks.bind(worldRenderer),
     rerenderAllChunks: worldRenderer.rerenderAllChunks.bind(worldRenderer),
-    addMedia: worldRenderer.addMedia.bind(worldRenderer),
-    destroyMedia: worldRenderer.destroyMedia.bind(worldRenderer),
-    setVideoPlaying: worldRenderer.setVideoPlaying.bind(worldRenderer),
-    setVideoSeeking: worldRenderer.setVideoSeeking.bind(worldRenderer),
-    setVideoVolume: worldRenderer.setVideoVolume.bind(worldRenderer),
-    setVideoSpeed: worldRenderer.setVideoSpeed.bind(worldRenderer),
+
+    addMedia: worldRenderer.media.addMedia.bind(worldRenderer.media),
+    destroyMedia: worldRenderer.media.destroyMedia.bind(worldRenderer.media),
+    setVideoPlaying: worldRenderer.media.setVideoPlaying.bind(worldRenderer.media),
+    setVideoSeeking: worldRenderer.media.setVideoSeeking.bind(worldRenderer.media),
+    setVideoVolume: worldRenderer.media.setVideoVolume.bind(worldRenderer.media),
+    setVideoSpeed: worldRenderer.media.setVideoSpeed.bind(worldRenderer.media),
+
     shakeFromDamage: worldRenderer.cameraShake.shakeFromDamage.bind(worldRenderer.cameraShake),
+    onPageInteraction: worldRenderer.media.onPageInteraction.bind(worldRenderer.media),
   }
 }
 
diff --git a/renderer/viewer/three/threeJsMedia.ts b/renderer/viewer/three/threeJsMedia.ts
new file mode 100644
index 00000000..e9ddcd9f
--- /dev/null
+++ b/renderer/viewer/three/threeJsMedia.ts
@@ -0,0 +1,550 @@
+import * as THREE from 'three'
+import { sendVideoPlay, sendVideoStop } from '../../../src/customChannels'
+import { WorldRendererThree } from './worldrendererThree'
+import { ThreeJsSound } from './threeJsSound'
+
+interface MediaProperties {
+  position: { x: number, y: number, z: number }
+  size: { width: number, height: number }
+  src: string
+  rotation?: 0 | 1 | 2 | 3 // 0-3 for 0°, 90°, 180°, 270°
+  doubleSide?: boolean
+  background?: number // Hexadecimal color (e.g., 0x000000 for black)
+  opacity?: number // 0-1 value for transparency
+  uvMapping?: { startU: number, endU: number, startV: number, endV: number }
+  allowOrigins?: string[] | boolean
+  loop?: boolean
+  volume?: number
+  autoPlay?: boolean
+}
+
+export class ThreeJsMedia {
+  customMedia = new Map<string, {
+    mesh: THREE.Object3D
+    props: MediaProperties
+    video: HTMLVideoElement | undefined
+    texture: THREE.Texture
+    updateUVMapping: (config: { startU: number, endU: number, startV: number, endV: number }) => void
+    positionalAudio?: THREE.PositionalAudio
+    hadAutoPlayError?: boolean
+  }>()
+
+  constructor (private readonly worldRenderer: WorldRendererThree) {
+  }
+
+  private createErrorTexture (width: number, height: number, background = 0x00_00_00, error = 'Failed to load'): THREE.CanvasTexture {
+    const canvas = document.createElement('canvas')
+    // Scale up the canvas size for better text quality
+    canvas.width = width * 100
+    canvas.height = height * 100
+
+    const ctx = canvas.getContext('2d')
+    if (!ctx) return new THREE.CanvasTexture(canvas)
+
+    // Clear with transparent background
+    ctx.clearRect(0, 0, canvas.width, canvas.height)
+
+    // Add background color
+    ctx.fillStyle = `rgba(${background >> 16 & 255}, ${background >> 8 & 255}, ${background & 255}, 0.5)`
+    ctx.fillRect(0, 0, canvas.width, canvas.height)
+
+    // Add red text
+    ctx.fillStyle = '#ff0000'
+    ctx.font = 'bold 10px sans-serif'
+    ctx.textAlign = 'center'
+    ctx.textBaseline = 'middle'
+    ctx.fillText(error, canvas.width / 2, canvas.height / 2, canvas.width)
+
+    const texture = new THREE.CanvasTexture(canvas)
+    texture.minFilter = THREE.LinearFilter
+    texture.magFilter = THREE.LinearFilter
+    return texture
+  }
+
+  private createBackgroundTexture (width: number, height: number, color = 0x00_00_00, opacity = 1): THREE.CanvasTexture {
+    const canvas = document.createElement('canvas')
+    canvas.width = 1
+    canvas.height = 1
+
+    const ctx = canvas.getContext('2d')
+    if (!ctx) return new THREE.CanvasTexture(canvas)
+
+    // Convert hex color to rgba
+    const r = (color >> 16) & 255
+    const g = (color >> 8) & 255
+    const b = color & 255
+
+    ctx.fillStyle = `rgba(${r}, ${g}, ${b}, ${opacity})`
+    ctx.fillRect(0, 0, 1, 1)
+
+    const texture = new THREE.CanvasTexture(canvas)
+    texture.minFilter = THREE.NearestFilter
+    texture.magFilter = THREE.NearestFilter
+    return texture
+  }
+
+  validateOrigin (src: string, allowOrigins: string[] | boolean) {
+    if (allowOrigins === true) return true
+    if (allowOrigins === false) return false
+    const url = new URL(src)
+    return allowOrigins.some(origin => url.origin.endsWith(origin))
+  }
+
+  onPageInteraction () {
+    for (const [id, videoData] of this.customMedia.entries()) {
+      if (videoData.hadAutoPlayError) {
+        videoData.hadAutoPlayError = false
+        void videoData.video?.play()
+          .catch(err => {
+            if (err.name === 'AbortError') return
+            console.error('Failed to play video:', err)
+            videoData.hadAutoPlayError = true
+            return true
+          })
+          .then((fromCatch) => {
+            if (fromCatch) return
+            if (videoData.positionalAudio) {
+              // workaround: audio has to be recreated
+              this.addMedia(id, videoData.props)
+            }
+          })
+      }
+    }
+  }
+
+  addMedia (id: string, props: MediaProperties) {
+    const originalProps = structuredClone(props)
+    this.destroyMedia(id)
+
+    const { scene } = this.worldRenderer
+
+    const originSecurityError = props.allowOrigins !== undefined && !this.validateOrigin(props.src, props.allowOrigins)
+    if (originSecurityError) {
+      console.warn('Remote resource blocked due to security policy', props.src, 'allowed origins:', props.allowOrigins, 'you can control it with `remoteContentNotSameOrigin` option')
+      props.src = ''
+    }
+
+    const isImage = props.src.endsWith('.png') || props.src.endsWith('.jpg') || props.src.endsWith('.jpeg')
+
+    let video: HTMLVideoElement | undefined
+    let positionalAudio: THREE.PositionalAudio | undefined
+    if (!isImage) {
+      video = document.createElement('video')
+      video.src = props.src.endsWith('.gif') ? props.src.replace('.gif', '.mp4') : props.src
+      video.loop = props.loop ?? true
+      video.volume = props.volume ?? 1
+      video.playsInline = true
+      video.crossOrigin = 'anonymous'
+
+      // Create positional audio
+      const soundSystem = this.worldRenderer.soundSystem as ThreeJsSound
+      soundSystem.initAudioListener()
+      if (!soundSystem.audioListener) throw new Error('Audio listener not initialized')
+      positionalAudio = new THREE.PositionalAudio(soundSystem.audioListener)
+      positionalAudio.setRefDistance(6)
+      positionalAudio.setVolume(props.volume ?? 1)
+      scene.add(positionalAudio)
+      positionalAudio.position.set(props.position.x, props.position.y, props.position.z)
+
+      // Connect video to positional audio
+      positionalAudio.setMediaElementSource(video)
+      positionalAudio.connect()
+
+      video.addEventListener('pause', () => {
+        positionalAudio?.pause()
+        sendVideoStop(id, 'paused', video!.currentTime)
+      })
+      video.addEventListener('play', () => {
+        positionalAudio?.play()
+        sendVideoPlay(id)
+      })
+      video.addEventListener('seeked', () => {
+        if (positionalAudio && video) {
+          positionalAudio.offset = video.currentTime
+        }
+      })
+      video.addEventListener('stalled', () => {
+        sendVideoStop(id, 'stalled', video!.currentTime)
+      })
+      video.addEventListener('waiting', () => {
+        sendVideoStop(id, 'waiting', video!.currentTime)
+      })
+      video.addEventListener('error', ({ error }) => {
+        sendVideoStop(id, `error: ${error}`, video!.currentTime)
+      })
+      video.addEventListener('ended', () => {
+        sendVideoStop(id, 'ended', video!.currentTime)
+      })
+    }
+
+
+    // Create background texture first
+    const backgroundTexture = this.createBackgroundTexture(
+      props.size.width,
+      props.size.height,
+      props.background,
+      // props.opacity ?? 1
+    )
+
+    const handleError = (text?: string) => {
+      const errorTexture = this.createErrorTexture(props.size.width, props.size.height, props.background, text)
+      material.map = errorTexture
+      material.needsUpdate = true
+    }
+
+    // Create a plane geometry with configurable UV mapping
+    const geometry = new THREE.PlaneGeometry(1, 1)
+
+    // Create material with initial properties using background texture
+    const material = new THREE.MeshLambertMaterial({
+      map: backgroundTexture,
+      transparent: true,
+      side: props.doubleSide ? THREE.DoubleSide : THREE.FrontSide,
+      alphaTest: 0.1
+    })
+
+    const texture = video
+      ? new THREE.VideoTexture(video)
+      : new THREE.TextureLoader().load(props.src, () => {
+        if (this.customMedia.get(id)?.texture === texture) {
+          material.map = texture
+          material.needsUpdate = true
+        }
+      }, undefined, () => handleError()) // todo cache
+    texture.minFilter = THREE.NearestFilter
+    texture.magFilter = THREE.NearestFilter
+    // texture.format = THREE.RGBAFormat
+    // texture.colorSpace = THREE.SRGBColorSpace
+    texture.generateMipmaps = false
+
+    // Create inner mesh for offsets
+    const mesh = new THREE.Mesh(geometry, material)
+
+    const { mesh: panel } = this.positionMeshExact(mesh, THREE.MathUtils.degToRad((props.rotation ?? 0) * 90), props.position, props.size.width, props.size.height)
+
+    scene.add(panel)
+
+    if (video) {
+      // Start playing the video
+      video.play().catch(err => {
+        if (err.name === 'AbortError') return
+        console.error('Failed to play video:', err)
+        videoData.hadAutoPlayError = true
+        handleError(err.name === 'NotAllowedError' ? 'Waiting for user interaction' : 'Failed to auto play')
+      })
+
+      // Update texture in animation loop
+      mesh.onBeforeRender = () => {
+        if (video.readyState === video.HAVE_ENOUGH_DATA && (!video.paused || !videoData?.hadAutoPlayError)) {
+          if (material.map !== texture) {
+            material.map = texture
+            material.needsUpdate = true
+          }
+          texture.needsUpdate = true
+
+          // Sync audio position with video position
+          if (positionalAudio) {
+            positionalAudio.position.copy(panel.position)
+            positionalAudio.rotation.copy(panel.rotation)
+          }
+        }
+      }
+    }
+
+    // UV mapping configuration
+    const updateUVMapping = (config: { startU: number, endU: number, startV: number, endV: number }) => {
+      const uvs = geometry.attributes.uv.array as Float32Array
+      uvs[0] = config.startU
+      uvs[1] = config.startV
+      uvs[2] = config.endU
+      uvs[3] = config.startV
+      uvs[4] = config.endU
+      uvs[5] = config.endV
+      uvs[6] = config.startU
+      uvs[7] = config.endV
+      geometry.attributes.uv.needsUpdate = true
+    }
+
+    // Apply initial UV mapping if provided
+    if (props.uvMapping) {
+      updateUVMapping(props.uvMapping)
+    }
+
+    const videoData = {
+      mesh: panel,
+      video,
+      texture,
+      updateUVMapping,
+      positionalAudio,
+      props: originalProps,
+      hadAutoPlayError: false
+    }
+    // Store video data
+    this.customMedia.set(id, videoData)
+
+    return id
+  }
+
+  setVideoPlaying (id: string, playing: boolean) {
+    const videoData = this.customMedia.get(id)
+    if (videoData?.video) {
+      if (playing) {
+        videoData.video.play().catch(console.error)
+      } else {
+        videoData.video.pause()
+      }
+    }
+  }
+
+  setVideoSeeking (id: string, seconds: number) {
+    const videoData = this.customMedia.get(id)
+    if (videoData?.video) {
+      videoData.video.currentTime = seconds
+    }
+  }
+
+  setVideoVolume (id: string, volume: number) {
+    const videoData = this.customMedia.get(id)
+    if (videoData?.video) {
+      videoData.video.volume = volume
+    }
+  }
+
+  setVideoSpeed (id: string, speed: number) {
+    const videoData = this.customMedia.get(id)
+    if (videoData?.video) {
+      videoData.video.playbackRate = speed
+    }
+  }
+
+  destroyMedia (id: string) {
+    const { scene } = this.worldRenderer
+    const mediaData = this.customMedia.get(id)
+    if (mediaData) {
+      if (mediaData.video) {
+        mediaData.video.pause()
+        mediaData.video.src = ''
+        mediaData.video.remove()
+      }
+      if (mediaData.positionalAudio) {
+        // mediaData.positionalAudio.stop()
+        // mediaData.positionalAudio.disconnect()
+        scene.remove(mediaData.positionalAudio)
+      }
+      scene.remove(mediaData.mesh)
+      mediaData.texture.dispose()
+
+      // Get the inner mesh from the group
+      const mesh = mediaData.mesh.children[0] as THREE.Mesh
+      if (mesh) {
+        mesh.geometry.dispose()
+        if (mesh.material instanceof THREE.Material) {
+          mesh.material.dispose()
+        }
+      }
+
+      this.customMedia.delete(id)
+    }
+  }
+
+  /**
+   * Positions a mesh exactly at startPosition and extends it along the rotation direction
+   * with the specified width and height
+   *
+   * @param mesh The mesh to position
+   * @param rotation Rotation in radians (applied to Y axis)
+   * @param startPosition The exact starting position (corner) of the mesh
+   * @param width Width of the mesh
+   * @param height Height of the mesh
+   * @param depth Depth of the mesh (default: 1)
+   * @returns The positioned mesh for chaining
+   */
+  positionMeshExact (
+    mesh: THREE.Mesh,
+    rotation: number,
+    startPosition: { x: number, y: number, z: number },
+    width: number,
+    height: number,
+    depth = 1
+  ) {
+    // avoid z-fighting with the ground plane
+    if (rotation === 0) {
+      startPosition.z += 0.001
+    }
+    if (rotation === Math.PI / 2) {
+      startPosition.x -= 0.001
+    }
+    if (rotation === Math.PI) {
+      startPosition.z -= 0.001
+    }
+    if (rotation === 3 * Math.PI / 2) {
+      startPosition.x += 0.001
+    }
+
+    // rotation normalize coordinates
+    if (rotation === 0) {
+      startPosition.z += 1
+    }
+    if (rotation === Math.PI) {
+      startPosition.x += 1
+    }
+    if (rotation === 3 * Math.PI / 2) {
+      startPosition.z += 1
+      startPosition.x += 1
+    }
+
+
+    // First, clean up any previous transformations
+    mesh.matrix.identity()
+    mesh.position.set(0, 0, 0)
+    mesh.rotation.set(0, 0, 0)
+    mesh.scale.set(1, 1, 1)
+
+    // By default, PlaneGeometry creates a plane in the XY plane (facing +Z)
+    // We need to set up the proper orientation for our use case
+    // Rotate the plane to face the correct direction based on the rotation parameter
+    mesh.rotateY(rotation)
+    if (rotation === Math.PI / 2 || rotation === 3 * Math.PI / 2) {
+      mesh.rotateZ(-Math.PI)
+      mesh.rotateX(-Math.PI)
+    }
+
+    // Scale it to the desired size
+    mesh.scale.set(width, height, depth)
+
+    // For a PlaneGeometry, if we want the corner at the origin, we need to offset
+    // by half the dimensions after scaling
+    mesh.geometry.translate(0.5, 0.5, 0)
+    mesh.geometry.attributes.position.needsUpdate = true
+
+    // Now place the mesh at the start position
+    mesh.position.set(startPosition.x, startPosition.y, startPosition.z)
+
+    // Create a group to hold our mesh and markers
+    const debugGroup = new THREE.Group()
+    debugGroup.add(mesh)
+
+    // Add a marker at the starting position (should be exactly at pos)
+    const startMarker = new THREE.Mesh(
+      new THREE.BoxGeometry(0.1, 0.1, 0.1),
+      new THREE.MeshBasicMaterial({ color: 0xff_00_00 })
+    )
+    startMarker.position.copy(new THREE.Vector3(startPosition.x, startPosition.y, startPosition.z))
+    debugGroup.add(startMarker)
+
+    // Add a marker at the end position (width units away in the rotated direction)
+    const endX = startPosition.x + Math.cos(rotation) * width
+    const endZ = startPosition.z + Math.sin(rotation) * width
+    const endYMarker = new THREE.Mesh(
+      new THREE.BoxGeometry(0.1, 0.1, 0.1),
+      new THREE.MeshBasicMaterial({ color: 0x00_00_ff })
+    )
+    endYMarker.position.set(startPosition.x, startPosition.y + height, startPosition.z)
+    debugGroup.add(endYMarker)
+
+    // Add a marker at the width endpoint
+    const endWidthMarker = new THREE.Mesh(
+      new THREE.BoxGeometry(0.1, 0.1, 0.1),
+      new THREE.MeshBasicMaterial({ color: 0xff_ff_00 })
+    )
+    endWidthMarker.position.set(endX, startPosition.y, endZ)
+    debugGroup.add(endWidthMarker)
+
+    // Add a marker at the corner diagonal endpoint (both width and height)
+    const endCornerMarker = new THREE.Mesh(
+      new THREE.BoxGeometry(0.1, 0.1, 0.1),
+      new THREE.MeshBasicMaterial({ color: 0xff_00_ff })
+    )
+    endCornerMarker.position.set(endX, startPosition.y + height, endZ)
+    debugGroup.add(endCornerMarker)
+
+    // Also add a visual helper to show the rotation direction
+    const directionHelper = new THREE.ArrowHelper(
+      new THREE.Vector3(Math.cos(rotation), 0, Math.sin(rotation)),
+      new THREE.Vector3(startPosition.x, startPosition.y, startPosition.z),
+      1,
+      0xff_00_00
+    )
+    debugGroup.add(directionHelper)
+
+    return {
+      mesh,
+      debugGroup
+    }
+  }
+
+  createTestCanvasTexture () {
+    const canvas = document.createElement('canvas')
+    canvas.width = 100
+    canvas.height = 100
+    const ctx = canvas.getContext('2d')
+    if (!ctx) return null
+    ctx.font = '10px Arial'
+    ctx.fillStyle = 'red'
+    ctx.fillText('Hello World', 0, 10) // at
+    return new THREE.CanvasTexture(canvas)
+  }
+
+  /**
+   * Creates a test mesh that demonstrates the exact positioning
+   */
+  addTestMeshExact (rotationNum: number) {
+    const pos = window.cursorBlockRel().position
+    console.log('Creating exact positioned test mesh at:', pos)
+
+    // Create a plane mesh with a wireframe to visualize boundaries
+    const plane = new THREE.Mesh(
+      new THREE.PlaneGeometry(1, 1),
+      new THREE.MeshBasicMaterial({
+        // side: THREE.DoubleSide,
+        map: this.createTestCanvasTexture()
+      })
+    )
+
+    const width = 2
+    const height = 1
+    const rotation = THREE.MathUtils.degToRad(rotationNum * 90) // 90 degrees in radians
+
+    // Position the mesh exactly where we want it
+    const { debugGroup } = this.positionMeshExact(plane, rotation, pos, width, height)
+
+    this.worldRenderer.scene.add(debugGroup)
+    console.log('Exact test mesh added with dimensions:', width, height, 'and rotation:', rotation)
+  }
+
+  tryIntersectMedia () {
+    const { camera } = this.worldRenderer
+    const raycaster = new THREE.Raycaster()
+
+    // Get mouse position at center of screen
+    const mouse = new THREE.Vector2(0, 0)
+
+    // Update the raycaster
+    raycaster.setFromCamera(mouse, camera)
+
+    let result = null as { id: string, x: number, y: number } | null
+    // Check intersection with all video meshes
+    for (const [id, videoData] of this.customMedia.entries()) {
+      // Get the actual mesh (first child of the group)
+      const { mesh } = videoData
+      if (!mesh) continue
+
+      const intersects = raycaster.intersectObject(mesh, false)
+      if (intersects.length > 0) {
+        const intersection = intersects[0]
+        const { uv } = intersection
+        if (uv) {
+          result = {
+            id,
+            x: uv.x,
+            y: uv.y
+          }
+          break
+        }
+      }
+    }
+    this.worldRenderer.reactiveState.world.intersectMedia = result
+    this.worldRenderer['debugVideo'] = result ? this.customMedia.get(result.id) : null
+    this.worldRenderer.cursorBlock.cursorLinesHidden = !!result
+  }
+}
diff --git a/renderer/viewer/three/threeJsSound.ts b/renderer/viewer/three/threeJsSound.ts
index 64105423..627cabf8 100644
--- a/renderer/viewer/three/threeJsSound.ts
+++ b/renderer/viewer/three/threeJsSound.ts
@@ -1,26 +1,28 @@
-import { Vec3 } from 'vec3'
 import * as THREE from 'three'
 import { WorldRendererThree } from './worldrendererThree'
 
 export interface SoundSystem {
-  playSound: (position: Vec3, path: string, volume?: number, pitch?: number) => void
+  playSound: (position: { x: number, y: number, z: number }, path: string, volume?: number, pitch?: number) => void
   destroy: () => void
 }
 
 export class ThreeJsSound implements SoundSystem {
   audioListener: THREE.AudioListener | undefined
   private readonly activeSounds = new Set<THREE.PositionalAudio>()
-
+  private readonly audioContext: AudioContext | undefined
   constructor (public worldRenderer: WorldRendererThree) {
   }
 
-  playSound (position: Vec3, path: string, volume = 1, pitch = 1) {
-    if (!this.audioListener) {
-      this.audioListener = new THREE.AudioListener()
-      this.worldRenderer.camera.add(this.audioListener)
-    }
+  initAudioListener () {
+    if (this.audioListener) return
+    this.audioListener = new THREE.AudioListener()
+    this.worldRenderer.camera.add(this.audioListener)
+  }
 
-    const sound = new THREE.PositionalAudio(this.audioListener)
+  playSound (position: { x: number, y: number, z: number }, path: string, volume = 1, pitch = 1) {
+    this.initAudioListener()
+
+    const sound = new THREE.PositionalAudio(this.audioListener!)
     this.activeSounds.add(sound)
 
     const audioLoader = new THREE.AudioLoader()
@@ -58,4 +60,8 @@ export class ThreeJsSound implements SoundSystem {
       this.audioListener = undefined
     }
   }
+
+  playTestSound () {
+    this.playSound(this.worldRenderer.camera.position, '/sound.mp3')
+  }
 }
diff --git a/renderer/viewer/three/world/cursorBlock.ts b/renderer/viewer/three/world/cursorBlock.ts
index 048539d9..ab0c4854 100644
--- a/renderer/viewer/three/world/cursorBlock.ts
+++ b/renderer/viewer/three/world/cursorBlock.ts
@@ -16,9 +16,20 @@ import destroyStage8 from '../../../../assets/destroy_stage_8.png'
 import destroyStage9 from '../../../../assets/destroy_stage_9.png'
 
 export class CursorBlock {
+  _cursorLinesHidden = false
+  get cursorLinesHidden () {
+    return this._cursorLinesHidden
+  }
+  set cursorLinesHidden (value: boolean) {
+    if (this.interactionLines) {
+      this.interactionLines.mesh.visible = !value
+    }
+    this._cursorLinesHidden = value
+  }
+
   cursorLineMaterial: LineMaterial
-  interactionLines: null | { blockPos; mesh } = null
-  prevColor
+  interactionLines: null | { blockPos: Vec3, mesh: THREE.Group } = null
+  prevColor: string | undefined
   blockBreakMesh: THREE.Mesh
   breakTextures: THREE.Texture[] = []
 
@@ -132,6 +143,7 @@ export class CursorBlock {
       group.add(wireframe)
     }
     this.worldRenderer.scene.add(group)
+    group.visible = this.cursorLinesHidden
     this.interactionLines = { blockPos, mesh: group }
   }
 
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 1f42f379..31f68b10 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -13,6 +13,7 @@ import { MesherGeometryOutput } from '../lib/mesher/shared'
 import { ItemSpecificContextProperties } from '../lib/basePlayerState'
 import { getMyHand } from '../lib/hand'
 import { setBlockPosition } from '../lib/mesher/standaloneRenderer'
+import { sendVideoPlay, sendVideoStop } from '../../../src/customChannels'
 import HoldingBlock from './holdingBlock'
 import { getMesh } from './entity/EntityMesh'
 import { armorModel } from './entity/armorModels'
@@ -23,20 +24,7 @@ import { initVR } from './world/vr'
 import { Entities } from './entities'
 import { ThreeJsSound } from './threeJsSound'
 import { CameraShake } from './cameraShake'
-
-interface MediaProperties {
-  position: { x: number, y: number, z: number }
-  size: { width: number, height: number }
-  src: string
-  rotation?: 0 | 1 | 2 | 3 // 0-3 for 0°, 90°, 180°, 270°
-  doubleSide?: boolean
-  background?: number // Hexadecimal color (e.g., 0x000000 for black)
-  opacity?: number // 0-1 value for transparency
-  uvMapping?: { startU: number, endU: number, startV: number, endV: number }
-  allowOrigins?: string[] | boolean
-  loop?: boolean
-  volume?: number
-}
+import { ThreeJsMedia } from './threeJsMedia'
 
 type SectionKey = string
 
@@ -58,13 +46,8 @@ export class WorldRendererThree extends WorldRendererCommon {
   itemsTexture: THREE.Texture
   cursorBlock = new CursorBlock(this)
   onRender: Array<() => void> = []
-  customMedia = new Map<string, {
-    mesh: THREE.Object3D
-    video: HTMLVideoElement | undefined
-    texture: THREE.Texture
-    updateUVMapping: (config: { startU: number, endU: number, startV: number, endV: number }) => void
-  }>()
   cameraShake: CameraShake
+  media: ThreeJsMedia
   waitingChunksToDisplay = {} as { [chunkKey: string]: SectionKey[] }
 
   get tilesRendered () {
@@ -92,6 +75,7 @@ export class WorldRendererThree extends WorldRendererCommon {
 
     this.soundSystem = new ThreeJsSound(this)
     this.cameraShake = new CameraShake(this.camera, this.onRender)
+    this.media = new ThreeJsMedia(this)
 
     this.renderUpdateEmitter.on('chunkFinished', (chunkKey: string) => {
       this.finishChunk(chunkKey)
@@ -408,47 +392,13 @@ export class WorldRendererThree extends WorldRendererCommon {
     return tex
   }
 
-  tryIntersectMedia () {
-    const { camera } = this
-    const raycaster = new THREE.Raycaster()
-
-    // Get mouse position at center of screen
-    const mouse = new THREE.Vector2(0, 0)
-
-    // Update the raycaster
-    raycaster.setFromCamera(mouse, camera)
-
-    let result = null as { id: string, x: number, y: number } | null
-    // Check intersection with all video meshes
-    for (const [id, videoData] of this.customMedia.entries()) {
-      // Get the actual mesh (first child of the group)
-      const mesh = videoData.mesh.children[0] as THREE.Mesh
-      if (!mesh) continue
-
-      const intersects = raycaster.intersectObject(mesh, false)
-      if (intersects.length > 0) {
-        const intersection = intersects[0]
-        const { uv } = intersection
-        if (uv) {
-          result = {
-            id,
-            x: uv.x,
-            y: uv.y
-          }
-          break
-        }
-      }
-    }
-    this.reactiveState.world.intersectMedia = result
-  }
-
   setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number) {
     const cam = this.cameraObjectOverride || this.camera
     const yOffset = this.displayOptions.playerState.getEyeHeight()
 
     this.camera = cam as THREE.PerspectiveCamera
     this.updateCamera(pos?.offset(0, yOffset, 0) ?? null, yaw, pitch)
-    this.tryIntersectMedia()
+    this.media.tryIntersectMedia()
   }
 
   updateCamera (pos: Vec3 | null, yaw: number, pitch: number): void {
@@ -663,402 +613,6 @@ export class WorldRendererThree extends WorldRendererCommon {
     }
   }
 
-  private createErrorTexture (width: number, height: number, background = 0x00_00_00): THREE.CanvasTexture {
-    const canvas = document.createElement('canvas')
-    // Scale up the canvas size for better text quality
-    canvas.width = width * 100
-    canvas.height = height * 100
-
-    const ctx = canvas.getContext('2d')
-    if (!ctx) return new THREE.CanvasTexture(canvas)
-
-    // Clear with transparent background
-    ctx.clearRect(0, 0, canvas.width, canvas.height)
-
-    // Add background color
-    ctx.fillStyle = `rgba(${background >> 16 & 255}, ${background >> 8 & 255}, ${background & 255}, 0.5)`
-    ctx.fillRect(0, 0, canvas.width, canvas.height)
-
-    // Add red text
-    ctx.fillStyle = '#ff0000'
-    ctx.font = 'bold 10px sans-serif'
-    ctx.textAlign = 'center'
-    ctx.textBaseline = 'middle'
-    ctx.fillText('Failed to load', canvas.width / 2, canvas.height / 2, canvas.width)
-
-    const texture = new THREE.CanvasTexture(canvas)
-    texture.minFilter = THREE.LinearFilter
-    texture.magFilter = THREE.LinearFilter
-    return texture
-  }
-
-  private createBackgroundTexture (width: number, height: number, color = 0x00_00_00, opacity = 1): THREE.CanvasTexture {
-    const canvas = document.createElement('canvas')
-    canvas.width = 1
-    canvas.height = 1
-
-    const ctx = canvas.getContext('2d')
-    if (!ctx) return new THREE.CanvasTexture(canvas)
-
-    // Convert hex color to rgba
-    const r = (color >> 16) & 255
-    const g = (color >> 8) & 255
-    const b = color & 255
-
-    ctx.fillStyle = `rgba(${r}, ${g}, ${b}, ${opacity})`
-    ctx.fillRect(0, 0, 1, 1)
-
-    const texture = new THREE.CanvasTexture(canvas)
-    texture.minFilter = THREE.NearestFilter
-    texture.magFilter = THREE.NearestFilter
-    return texture
-  }
-
-  validateOrigin (src: string, allowOrigins: string[] | boolean) {
-    if (allowOrigins === true) return true
-    if (allowOrigins === false) return false
-    const url = new URL(src)
-    return allowOrigins.some(origin => url.origin.endsWith(origin))
-  }
-
-  addMedia (id: string, props: MediaProperties) {
-    this.destroyMedia(id)
-
-    const originSecurityError = props.allowOrigins !== undefined && !this.validateOrigin(props.src, props.allowOrigins)
-    if (originSecurityError) {
-      console.warn('Remote resource blocked due to security policy', props.src, 'allowed origins:', props.allowOrigins, 'you can control it with `remoteContentNotSameOrigin` option')
-      props.src = ''
-    }
-
-    const isImage = props.src.endsWith('.png') || props.src.endsWith('.jpg') || props.src.endsWith('.jpeg')
-
-    let video: HTMLVideoElement | undefined
-    if (!isImage) {
-      video = document.createElement('video')
-      video.src = props.src
-      video.loop = props.loop ?? true
-      video.volume = props.volume ?? 1
-      video.muted = !props.volume
-      video.playsInline = true
-      video.crossOrigin = 'anonymous'
-    }
-
-    // Create background texture first
-    const backgroundTexture = this.createBackgroundTexture(
-      props.size.width,
-      props.size.height,
-      props.background,
-      // props.opacity ?? 1
-    )
-
-    const handleError = () => {
-      const errorTexture = this.createErrorTexture(props.size.width, props.size.height, props.background)
-      material.map = errorTexture
-      material.needsUpdate = true
-    }
-
-    // Create a plane geometry with configurable UV mapping
-    const geometry = new THREE.PlaneGeometry(1, 1)
-
-    // Create material with initial properties using background texture
-    const material = new THREE.MeshLambertMaterial({
-      map: backgroundTexture,
-      transparent: true,
-      side: props.doubleSide ? THREE.DoubleSide : THREE.FrontSide,
-      alphaTest: 0.1
-    })
-
-    const texture = video
-      ? new THREE.VideoTexture(video)
-      : new THREE.TextureLoader().load(props.src, () => {
-        if (this.customMedia.get(id)?.texture === texture) {
-          material.map = texture
-          material.needsUpdate = true
-        }
-      }, undefined, handleError) // todo cache
-    texture.minFilter = THREE.NearestFilter
-    texture.magFilter = THREE.NearestFilter
-    texture.format = THREE.RGBAFormat
-    texture.colorSpace = THREE.SRGBColorSpace
-    texture.generateMipmaps = false
-
-    // Create inner mesh for offsets
-    const mesh = new THREE.Mesh(geometry, material)
-
-    const { mesh: panel } = this.positionMeshExact(mesh, THREE.MathUtils.degToRad((props.rotation ?? 0) * 90), props.position, props.size.width, props.size.height)
-
-    this.scene.add(panel)
-
-    if (video) {
-      // Start playing the video
-      video.play().catch(err => {
-        console.error('Failed to play video:', err)
-        handleError()
-      })
-
-      // Update texture in animation loop
-      mesh.onBeforeRender = () => {
-        if (video.readyState === video.HAVE_ENOUGH_DATA) {
-          if (material.map !== texture) {
-            material.map = texture
-            material.needsUpdate = true
-          }
-          texture.needsUpdate = true
-        }
-      }
-    }
-
-    // UV mapping configuration
-    const updateUVMapping = (config: { startU: number, endU: number, startV: number, endV: number }) => {
-      const uvs = geometry.attributes.uv.array as Float32Array
-      uvs[0] = config.startU
-      uvs[1] = config.startV
-      uvs[2] = config.endU
-      uvs[3] = config.startV
-      uvs[4] = config.endU
-      uvs[5] = config.endV
-      uvs[6] = config.startU
-      uvs[7] = config.endV
-      geometry.attributes.uv.needsUpdate = true
-    }
-
-    // Apply initial UV mapping if provided
-    if (props.uvMapping) {
-      updateUVMapping(props.uvMapping)
-    }
-
-    // Store video data
-    this.customMedia.set(id, {
-      mesh: panel,
-      video,
-      texture,
-      updateUVMapping
-    })
-
-    return id
-  }
-
-  setVideoPlaying (id: string, playing: boolean) {
-    const videoData = this.customMedia.get(id)
-    if (videoData?.video) {
-      if (playing) {
-        videoData.video.play().catch(console.error)
-      } else {
-        videoData.video.pause()
-      }
-    }
-  }
-
-  setVideoSeeking (id: string, seconds: number) {
-    const videoData = this.customMedia.get(id)
-    if (videoData?.video) {
-      videoData.video.currentTime = seconds
-    }
-  }
-
-  setVideoVolume (id: string, volume: number) {
-    const videoData = this.customMedia.get(id)
-    if (videoData?.video) {
-      videoData.video.volume = volume
-    }
-  }
-
-  setVideoSpeed (id: string, speed: number) {
-    const videoData = this.customMedia.get(id)
-    if (videoData?.video) {
-      videoData.video.playbackRate = speed
-    }
-  }
-
-  destroyMedia (id: string) {
-    const media = this.customMedia.get(id)
-    if (media) {
-      if (media.video) {
-        media.video.pause()
-        media.video.src = ''
-      }
-      this.scene.remove(media.mesh)
-      media.texture.dispose()
-
-      // Get the inner mesh from the group
-      const mesh = media.mesh.children[0] as THREE.Mesh
-      if (mesh) {
-        mesh.geometry.dispose()
-        if (mesh.material instanceof THREE.Material) {
-          mesh.material.dispose()
-        }
-      }
-
-      this.customMedia.delete(id)
-    }
-  }
-
-  /**
-   * Positions a mesh exactly at startPosition and extends it along the rotation direction
-   * with the specified width and height
-   *
-   * @param mesh The mesh to position
-   * @param rotation Rotation in radians (applied to Y axis)
-   * @param startPosition The exact starting position (corner) of the mesh
-   * @param width Width of the mesh
-   * @param height Height of the mesh
-   * @param depth Depth of the mesh (default: 1)
-   * @returns The positioned mesh for chaining
-   */
-  positionMeshExact (
-    mesh: THREE.Mesh,
-    rotation: number,
-    startPosition: { x: number, y: number, z: number },
-    width: number,
-    height: number,
-    depth = 1
-  ) {
-    // avoid z-fighting with the ground plane
-    if (rotation === 0) {
-      startPosition.z += 0.001
-    }
-    if (rotation === Math.PI / 2) {
-      startPosition.x -= 0.001
-    }
-    if (rotation === Math.PI) {
-      startPosition.z -= 0.001
-    }
-    if (rotation === 3 * Math.PI / 2) {
-      startPosition.x += 0.001
-    }
-
-    // rotation normalize coordinates
-    if (rotation === 0) {
-      startPosition.z += 1
-    }
-    if (rotation === Math.PI) {
-      startPosition.x += 1
-    }
-    if (rotation === 3 * Math.PI / 2) {
-      startPosition.z += 1
-      startPosition.x += 1
-    }
-
-
-    // First, clean up any previous transformations
-    mesh.matrix.identity()
-    mesh.position.set(0, 0, 0)
-    mesh.rotation.set(0, 0, 0)
-    mesh.scale.set(1, 1, 1)
-
-    // By default, PlaneGeometry creates a plane in the XY plane (facing +Z)
-    // We need to set up the proper orientation for our use case
-    // Rotate the plane to face the correct direction based on the rotation parameter
-    mesh.rotateY(rotation)
-    if (rotation === Math.PI / 2 || rotation === 3 * Math.PI / 2) {
-      mesh.rotateZ(-Math.PI)
-      mesh.rotateX(-Math.PI)
-    }
-
-    // Scale it to the desired size
-    mesh.scale.set(width, height, depth)
-
-    // For a PlaneGeometry, if we want the corner at the origin, we need to offset
-    // by half the dimensions after scaling
-    mesh.geometry.translate(0.5, 0.5, 0)
-    mesh.geometry.attributes.position.needsUpdate = true
-
-    // Now place the mesh at the start position
-    mesh.position.set(startPosition.x, startPosition.y, startPosition.z)
-
-    // Create a group to hold our mesh and markers
-    const debugGroup = new THREE.Group()
-    debugGroup.add(mesh)
-
-    // Add a marker at the starting position (should be exactly at pos)
-    const startMarker = new THREE.Mesh(
-      new THREE.BoxGeometry(0.1, 0.1, 0.1),
-      new THREE.MeshBasicMaterial({ color: 0xff_00_00 })
-    )
-    startMarker.position.copy(new THREE.Vector3(startPosition.x, startPosition.y, startPosition.z))
-    debugGroup.add(startMarker)
-
-    // Add a marker at the end position (width units away in the rotated direction)
-    const endX = startPosition.x + Math.cos(rotation) * width
-    const endZ = startPosition.z + Math.sin(rotation) * width
-    const endYMarker = new THREE.Mesh(
-      new THREE.BoxGeometry(0.1, 0.1, 0.1),
-      new THREE.MeshBasicMaterial({ color: 0x00_00_ff })
-    )
-    endYMarker.position.set(startPosition.x, startPosition.y + height, startPosition.z)
-    debugGroup.add(endYMarker)
-
-    // Add a marker at the width endpoint
-    const endWidthMarker = new THREE.Mesh(
-      new THREE.BoxGeometry(0.1, 0.1, 0.1),
-      new THREE.MeshBasicMaterial({ color: 0xff_ff_00 })
-    )
-    endWidthMarker.position.set(endX, startPosition.y, endZ)
-    debugGroup.add(endWidthMarker)
-
-    // Add a marker at the corner diagonal endpoint (both width and height)
-    const endCornerMarker = new THREE.Mesh(
-      new THREE.BoxGeometry(0.1, 0.1, 0.1),
-      new THREE.MeshBasicMaterial({ color: 0xff_00_ff })
-    )
-    endCornerMarker.position.set(endX, startPosition.y + height, endZ)
-    debugGroup.add(endCornerMarker)
-
-    // Also add a visual helper to show the rotation direction
-    const directionHelper = new THREE.ArrowHelper(
-      new THREE.Vector3(Math.cos(rotation), 0, Math.sin(rotation)),
-      new THREE.Vector3(startPosition.x, startPosition.y, startPosition.z),
-      1,
-      0xff_00_00
-    )
-    debugGroup.add(directionHelper)
-
-    return {
-      mesh,
-      debugGroup
-    }
-  }
-
-  createTestCanvasTexture () {
-    const canvas = document.createElement('canvas')
-    canvas.width = 100
-    canvas.height = 100
-    const ctx = canvas.getContext('2d')
-    if (!ctx) return null
-    ctx.font = '10px Arial'
-    ctx.fillStyle = 'red'
-    ctx.fillText('Hello World', 0, 10) // at
-    return new THREE.CanvasTexture(canvas)
-  }
-
-  /**
-   * Creates a test mesh that demonstrates the exact positioning
-   */
-  addTestMeshExact (rotationNum: number) {
-    const pos = window.cursorBlockRel().position
-    console.log('Creating exact positioned test mesh at:', pos)
-
-    // Create a plane mesh with a wireframe to visualize boundaries
-    const plane = new THREE.Mesh(
-      new THREE.PlaneGeometry(1, 1),
-      new THREE.MeshBasicMaterial({
-        // side: THREE.DoubleSide,
-        map: this.createTestCanvasTexture()
-      })
-    )
-
-    const width = 2
-    const height = 1
-    const rotation = THREE.MathUtils.degToRad(rotationNum * 90) // 90 degrees in radians
-
-    // Position the mesh exactly where we want it
-    const { debugGroup } = this.positionMeshExact(plane, rotation, pos, width, height)
-
-    this.scene.add(debugGroup)
-    console.log('Exact test mesh added with dimensions:', width, height, 'and rotation:', rotation)
-
-  }
-
   destroy (): void {
     removeAllStats()
     super.destroy()
diff --git a/src/controls.ts b/src/controls.ts
index b91ae7ab..aa78b103 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -7,6 +7,7 @@ import { ControMax } from 'contro-max/build/controMax'
 import { CommandEventArgument, SchemaCommandInput } from 'contro-max/build/types'
 import { stringStartsWith } from 'contro-max/build/stringUtils'
 import { GameMode } from 'mineflayer'
+import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import { isGameActive, showModal, gameAdditionalState, activeModalStack, hideCurrentModal, miscUiState, hideModal, hideAllModals } from './globalState'
 import { goFullscreen, isInRealGameSession, pointerLock, reloadChunks } from './utils'
 import { options } from './optionsStorage'
@@ -874,6 +875,7 @@ addEventListener('mousedown', async (e) => {
   if (!isInRealGameSession() && !(e.target as HTMLElement).id.includes('ui-root')) return
   void pointerLock.requestPointerLock()
   if (!bot) return
+  getThreeJsRendererMethods()?.onPageInteraction()
   // wheel click
   // todo support ctrl+wheel (+nbt)
   if (e.button === 1) {
@@ -883,6 +885,10 @@ addEventListener('mousedown', async (e) => {
 
 window.addEventListener('keydown', (e) => {
   if (e.code !== 'Escape') return
+  if (!activeModalStack.length) {
+    getThreeJsRendererMethods()?.onPageInteraction()
+  }
+
   if (activeModalStack.length) {
     const hideAll = e.ctrlKey || e.metaKey
     if (hideAll) {
@@ -891,6 +897,7 @@ window.addEventListener('keydown', (e) => {
       hideCurrentModal()
     }
     if (activeModalStack.length === 0) {
+      getThreeJsRendererMethods()?.onPageInteraction()
       pointerLock.justHitEscape = true
     }
   } else if (pointerLock.hasPointerLock) {
diff --git a/src/customChannels.ts b/src/customChannels.ts
index fabe71ec..2a26cc5a 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -258,15 +258,42 @@ const registerMediaChannels = () => {
 
   bot._client.registerChannel(MEDIA_INTERACTION_CHANNEL, interactionPacketStructure, true)
 
+  // Media play channel
+  bot._client.registerChannel(MEDIA_PLAY_CHANNEL_CLIENTBOUND, noDataPacketStructure, true)
+  const mediaStopPacketStructure = [
+    'container',
+    [
+      { name: 'id', type: ['pstring', { countType: 'i16' }] },
+      // ended - emitted even when loop is true (will continue playing)
+      // error: ...
+      // stalled - connection drops, server stops sending data
+      // waiting - connection is slow, server is sending data, but not fast enough (buffering)
+      // control
+      { name: 'reason', type: ['pstring', { countType: 'i16' }] },
+      { name: 'time', type: 'f32' }
+    ]
+  ]
+  bot._client.registerChannel(MEDIA_STOP_CHANNEL_CLIENTBOUND, mediaStopPacketStructure, true)
+
   console.debug('Registered media channels')
 }
 
 const MEDIA_INTERACTION_CHANNEL = 'minecraft-web-client:media-interaction'
+const MEDIA_PLAY_CHANNEL_CLIENTBOUND = 'minecraft-web-client:media-play'
+const MEDIA_STOP_CHANNEL_CLIENTBOUND = 'minecraft-web-client:media-stop'
 
 export const sendVideoInteraction = (id: string, x: number, y: number, isRightClick: boolean) => {
   bot._client.writeChannel(MEDIA_INTERACTION_CHANNEL, { id, x, y, isRightClick })
 }
 
+export const sendVideoPlay = (id: string) => {
+  bot._client.writeChannel(MEDIA_PLAY_CHANNEL_CLIENTBOUND, { id })
+}
+
+export const sendVideoStop = (id: string, reason: string, time: number) => {
+  bot._client.writeChannel(MEDIA_STOP_CHANNEL_CLIENTBOUND, { id, reason, time })
+}
+
 export const videoCursorInteraction = () => {
   const { intersectMedia } = appViewer.rendererState.world
   if (!intersectMedia) return null
diff --git a/src/mineflayer/plugins/mouse.ts b/src/mineflayer/plugins/mouse.ts
index a0ae60ec..219a8be8 100644
--- a/src/mineflayer/plugins/mouse.ts
+++ b/src/mineflayer/plugins/mouse.ts
@@ -65,10 +65,13 @@ const otherListeners = () => {
 }
 
 const domListeners = (bot: Bot) => {
+  const abortController = new AbortController()
   document.addEventListener('mousedown', (e) => {
     if (e.isTrusted && !document.pointerLockElement && !isCypress()) return
     if (!isGameActive(true)) return
 
+    getThreeJsRendererMethods()?.onPageInteraction()
+
     const videoInteraction = videoCursorInteraction()
     if (videoInteraction) {
       sendVideoInteraction(videoInteraction.id, videoInteraction.x, videoInteraction.y, e.button === 0)
@@ -80,7 +83,7 @@ const domListeners = (bot: Bot) => {
     } else if (e.button === 2) {
       bot.rightClickStart()
     }
-  })
+  }, { signal: abortController.signal })
 
   document.addEventListener('mouseup', (e) => {
     if (e.button === 0) {
@@ -88,7 +91,7 @@ const domListeners = (bot: Bot) => {
     } else if (e.button === 2) {
       bot.rightClickEnd()
     }
-  })
+  }, { signal: abortController.signal })
 
   bot.mouse.beforeUpdateChecks = () => {
     if (!document.hasFocus()) {
@@ -96,4 +99,8 @@ const domListeners = (bot: Bot) => {
       bot.mouse.buttons.fill(false)
     }
   }
+
+  bot.on('end', () => {
+    abortController.abort()
+  })
 }
diff --git a/src/react/GameInteractionOverlay.tsx b/src/react/GameInteractionOverlay.tsx
index 90f7655c..63cee586 100644
--- a/src/react/GameInteractionOverlay.tsx
+++ b/src/react/GameInteractionOverlay.tsx
@@ -1,6 +1,7 @@
 import { useRef, useEffect } from 'react'
 import { subscribe, useSnapshot } from 'valtio'
 import { useUtilsEffect } from '@zardoy/react-util'
+import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import { options } from '../optionsStorage'
 import { activeModalStack, isGameActive, miscUiState } from '../globalState'
 import { onCameraMove, CameraMoveEvent } from '../cameraRotationControls'
@@ -47,6 +48,7 @@ function GameInteractionOverlayInner ({
       if (!isGameActive(true) || clickedEl !== cameraControlEl || e.pointerId === undefined) {
         return
       }
+      getThreeJsRendererMethods()?.onPageInteraction()
       screenTouches++
       if (screenTouches === 3) {
         // todo maybe mouse wheel click?
diff --git a/src/react/ServersList.tsx b/src/react/ServersList.tsx
index 7b34f016..a88f8a59 100644
--- a/src/react/ServersList.tsx
+++ b/src/react/ServersList.tsx
@@ -72,6 +72,9 @@ export default ({
   const proxiesData = snap.proxiesData ?? { proxies: initialProxies, selected: initialProxies[0] }
   return <Singleplayer
     {...props}
+    worldData={props.worldData ? props.worldData.map(world => ({
+      ...world
+    })) : null}
     firstRowChildrenOverride={<form
       style={{ width: '100%', display: 'flex', justifyContent: 'center' }} onSubmit={(e) => {
         e.preventDefault()
diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index d3a32423..5e531076 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -25,6 +25,7 @@ export interface WorldProps {
   formattedTextOverride?: string
   worldNameRight?: string
   worldNameRightGrayed?: string
+  afterTitleUi?: React.ReactNode
   onFocus?: (name: string) => void
   onInteraction?(interaction: 'enter' | 'space')
   elemRef?: React.Ref<HTMLDivElement>
@@ -46,7 +47,7 @@ const GroupHeader = ({ name, count, expanded, onToggle }: { name: string, count:
   </div>
 }
 
-const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus, onInteraction, iconSrc, formattedTextOverride, worldNameRight, worldNameRightGrayed, elemRef, offline }: WorldProps & { ref?: React.Ref<HTMLDivElement> }) => {
+const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus, onInteraction, iconSrc, formattedTextOverride, worldNameRight, worldNameRightGrayed, afterTitleUi, elemRef, offline }: WorldProps & { ref?: React.Ref<HTMLDivElement> }) => {
   const timeRelativeFormatted = useMemo(() => {
     if (!lastPlayed) return ''
     const formatter = new Intl.RelativeTimeFormat('en', { numeric: 'auto' })
@@ -67,12 +68,17 @@ const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus,
 
   return <div
     ref={elemRef}
-    className={classNames(styles.world_root, isFocused ? styles.world_focused : undefined)} tabIndex={0} onFocus={() => onFocus?.(name)} onKeyDown={(e) => {
+    className={classNames(styles.world_root, isFocused ? styles.world_focused : undefined)}
+    style={{ position: 'relative' }}
+    tabIndex={0}
+    onFocus={() => onFocus?.(name)}
+    onKeyDown={(e) => {
       if (e.code === 'Enter' || e.code === 'Space') {
         e.preventDefault()
         onInteraction?.(e.code === 'Enter' ? 'enter' : 'space')
       }
-    }} onDoubleClick={() => onInteraction?.('enter')}
+    }}
+    onDoubleClick={() => onInteraction?.('enter')}
   >
     <img className={`${styles.world_image} ${iconSrc ? '' : styles.image_missing}`} src={iconSrc ?? missingWorldPreview} alt='world preview' />
     <div className={styles.world_info}>
@@ -101,6 +107,9 @@ const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus,
           <div className={styles.world_info_description_line}>{sizeFormatted}</div>
         </>}
     </div>
+    <div style={{ position: 'absolute', left: '100%', top: '50%', transform: 'translateY(-50%)', marginLeft: 4, display: 'flex', alignItems: 'center' }}>
+      {afterTitleUi}
+    </div>
   </div>
 }
 
diff --git a/src/react/utilsApp.ts b/src/react/utilsApp.ts
index 859cd10b..d40a72e5 100644
--- a/src/react/utilsApp.ts
+++ b/src/react/utilsApp.ts
@@ -9,6 +9,7 @@ export const watchedModalsFromHooks = proxy({
 // todo should not be there
 export const hardcodedKnownModals = [
   'player_win:',
+  'divkit:',
   'full-map' // todo
 ]
 

From e2f28e497550c658680205c39ab3e9b5c7a38c8e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 05:34:32 +0300
Subject: [PATCH 392/753] fix: fix hotbar & inv texture updates on resources
 change fix: delay autologin /login sending

---
 src/index.ts                  |  6 ++--
 src/inventoryWindows.ts       | 60 ++++++++++++++++-------------------
 src/react/ChatProvider.tsx    |  7 ++++
 src/react/HotbarRenderApp.tsx |  7 ++--
 4 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 55d72a30..181a64c6 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -715,7 +715,9 @@ export async function connect (connectOptions: ConnectOptions) {
       connectOptions.onSuccessfulPlay?.()
       updateDataAfterJoin()
       if (connectOptions.autoLoginPassword) {
-        bot.chat(`/login ${connectOptions.autoLoginPassword}`)
+        setTimeout(() => {
+          bot.chat(`/login ${connectOptions.autoLoginPassword}`)
+        }, 500)
       }
 
 
@@ -738,7 +740,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
       progress.setMessage('Setting callbacks')
 
-      onGameLoad(() => { })
+      onGameLoad()
 
       if (appStatusState.isError) return
 
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 76c1c52d..8fbc7043 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -28,36 +28,18 @@ const cleanLoadedImagesCache = () => {
 }
 
 let lastWindow: ReturnType<typeof showInventory>
+let lastWindowType: string | null | undefined // null is inventory
 /** bot version */
 let version: string
 let PrismarineItem: typeof Item
 
-export const allImagesLoadedState = proxy({
-  value: false
-})
-
 export const jeiCustomCategories = proxy({
   value: [] as Array<{ id: string, categoryTitle: string, items: any[] }>
 })
 
-export const onGameLoad = (onLoad) => {
-  allImagesLoadedState.value = false
+export const onGameLoad = () => {
   version = bot.version
 
-  const checkIfLoaded = () => {
-    if (!appViewer.resourcesManager.currentResources?.itemsAtlasParser) return
-    if (!allImagesLoadedState.value) {
-      onLoad?.()
-    }
-    allImagesLoadedState.value = false
-    setTimeout(() => {
-      allImagesLoadedState.value = true
-    }, 0)
-  }
-  appViewer.resourcesManager.on('assetsTexturesUpdated', checkIfLoaded)
-  appViewer.resourcesManager.on('assetsInventoryReady', checkIfLoaded)
-  checkIfLoaded()
-
   PrismarineItem = PItem(version)
 
   const mapWindowType = (type: string, inventoryStart: number) => {
@@ -134,6 +116,16 @@ export const onGameLoad = (onLoad) => {
     if (!lastWindow) return
     upJei(q)
   })
+
+  if (!appViewer.resourcesManager['_inventoryChangeTracked']) {
+    appViewer.resourcesManager['_inventoryChangeTracked'] = true
+    const upWindowItems = () => {
+      if (!lastWindow) return
+      upWindowItemsLocal()
+    }
+    appViewer.resourcesManager.on('assetsInventoryReady', () => upWindowItems())
+    appViewer.resourcesManager.on('assetsTexturesUpdated', () => upWindowItems())
+  }
 }
 
 const getImageSrc = (path): string | HTMLImageElement => {
@@ -384,6 +376,15 @@ export const openItemsCanvas = (type, _bot = bot as typeof bot | null) => {
   return inv
 }
 
+const upWindowItemsLocal = () => {
+  if (!lastWindow && bot.currentWindow) {
+    // edge case: might happen due to high ping, inventory should be closed soon!
+    // openWindow(implementedContainersGuiMap[bot.currentWindow.type])
+    return
+  }
+  void Promise.resolve().then(() => upInventoryItems(lastWindowType === null))
+}
+
 let skipClosePacketSending = false
 const openWindow = (type: string | undefined) => {
   // if (activeModalStack.some(x => x.reactType?.includes?.('player_win:'))) {
@@ -396,6 +397,7 @@ const openWindow = (type: string | undefined) => {
       return
     }
   }
+  lastWindowType = type ?? null
   showModal({
     reactType: `player_win:${type}`,
   })
@@ -404,6 +406,7 @@ const openWindow = (type: string | undefined) => {
     if (type !== undefined && bot.currentWindow && !skipClosePacketSending) bot.currentWindow['close']()
     lastWindow.destroy()
     lastWindow = null as any
+    lastWindowType = null
     window.lastWindow = lastWindow
     miscUiState.displaySearchInput = false
     destroyFn()
@@ -441,15 +444,8 @@ const openWindow = (type: string | undefined) => {
   }
 
   lastWindow = inv
-  const upWindowItems = () => {
-    if (!lastWindow && bot.currentWindow) {
-      // edge case: might happen due to high ping, inventory should be closed soon!
-      // openWindow(implementedContainersGuiMap[bot.currentWindow.type])
-      return
-    }
-    void Promise.resolve().then(() => upInventoryItems(type === undefined))
-  }
-  upWindowItems()
+
+  upWindowItemsLocal()
 
   lastWindow.pwindow.touch = miscUiState.currentTouch ?? false
   const oldOnInventoryEvent = lastWindow.pwindow.onInventoryEvent.bind(lastWindow.pwindow)
@@ -511,14 +507,14 @@ const openWindow = (type: string | undefined) => {
 
   if (type === undefined) {
     // player inventory
-    bot.inventory.on('updateSlot', upWindowItems)
+    bot.inventory.on('updateSlot', upWindowItemsLocal)
     destroyFn = () => {
-      bot.inventory.off('updateSlot', upWindowItems)
+      bot.inventory.off('updateSlot', upWindowItemsLocal)
     }
   } else {
     //@ts-expect-error
     bot.currentWindow.on('updateSlot', () => {
-      upWindowItems()
+      upWindowItemsLocal()
     })
   }
 }
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index cf849df7..0b913875 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -65,6 +65,13 @@ export default () => {
           })
           hideNotification()
         })
+        const listener = () => {
+          hideNotification()
+        }
+        bot.on('kicked', listener)
+        setTimeout(() => {
+          bot.removeListener('kicked', listener)
+        }, 2000)
       }
       if (!builtinHandled) {
         bot.chat(message)
diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index 438f7e68..e1eeb47a 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from 'react'
 import { Transition } from 'react-transition-group'
 import { createPortal } from 'react-dom'
 import { subscribe, useSnapshot } from 'valtio'
-import { allImagesLoadedState, openItemsCanvas, openPlayerInventory, upInventoryItems } from '../inventoryWindows'
+import { openItemsCanvas, openPlayerInventory, upInventoryItems } from '../inventoryWindows'
 import { activeModalStack, isGameActive, miscUiState } from '../globalState'
 import { currentScaling } from '../scaleInterface'
 import { watchUnloadForCleanup } from '../gameUnload'
@@ -110,7 +110,7 @@ const HotbarInner = () => {
     inv.canvas.style.pointerEvents = 'auto'
     container.current.appendChild(inv.canvas)
     const upHotbarItems = () => {
-      if (!appViewer.resourcesManager.currentResources?.itemsAtlasParser || !allImagesLoadedState.value) return
+      if (!appViewer.resourcesManager.currentResources?.itemsAtlasParser) return
       upInventoryItems(true, inv)
     }
 
@@ -125,7 +125,7 @@ const HotbarInner = () => {
     upHotbarItems()
     bot.inventory.on('updateSlot', upHotbarItems)
     appViewer.resourcesManager.on('assetsTexturesUpdated', upHotbarItems)
-    const unsub2 = subscribe(allImagesLoadedState, () => {
+    appViewer.resourcesManager.on('assetsInventoryReady', () => {
       upHotbarItems()
     })
 
@@ -196,7 +196,6 @@ const HotbarInner = () => {
     return () => {
       inv.destroy()
       controller.abort()
-      unsub2()
       appViewer.resourcesManager.off('assetsTexturesUpdated', upHotbarItems)
     }
   }, [])

From 4fd290c636c775652b04cf220b7737656fd8979a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 06:44:48 +0300
Subject: [PATCH 393/753] fix(regression): fix rendering almost all items in
 the game, like shield, banners, beds, filled maps, ...

---
 package.json                       |  2 +-
 pnpm-lock.yaml                     | 43 +++++++++++++++++++++---------
 renderer/viewer/lib/guiRenderer.ts |  6 +++++
 src/inventoryWindows.ts            |  2 +-
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 4867f241..ed9cbec1 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.47",
+    "mc-assets": "^0.2.48",
     "mineflayer-mouse": "^0.1.7",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 865fd09a..98c16ac5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -353,8 +353,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.47
-        version: 0.2.47
+        specifier: ^0.2.48
+        version: 0.2.48
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
@@ -5497,6 +5497,10 @@ packages:
     resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
     engines: {node: '>= 0.6'}
 
+  fresh@2.0.0:
+    resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==}
+    engines: {node: '>= 0.8'}
+
   from@0.1.7:
     resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==}
 
@@ -6690,8 +6694,8 @@ packages:
   maxrects-packer@2.7.3:
     resolution: {integrity: sha512-bG6qXujJ1QgttZVIH4WDanhoJtvbud/xP/XPyf6A69C9RdA61BM4TomFALCq2nrTa+tARRIBB4LuIFsnUQU2wA==}
 
-  mc-assets@0.2.47:
-    resolution: {integrity: sha512-L9tOcYctDGTUaG4QKJESw9uOiOMl8F2RZ3h0cF4NRCjBvd4c9GUrGDaaVdTaAByQZNNITXgGspmm9hNAFMWcKg==}
+  mc-assets@0.2.48:
+    resolution: {integrity: sha512-ixFBAkdWuluBZ3RhWXvD+KyLX5jKAK8ksXJamAuJxc7nXHP6xK5rEAR3qQ7JVYh27USl3mE+GWTFy/aF0CGRYg==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.14:
@@ -6861,10 +6865,18 @@ packages:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  mime-db@1.54.0:
+    resolution: {integrity: sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==}
+    engines: {node: '>= 0.6'}
+
   mime-types@2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
 
+  mime-types@3.0.1:
+    resolution: {integrity: sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==}
+    engines: {node: '>= 0.6'}
+
   mime@1.6.0:
     resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
     engines: {node: '>=4'}
@@ -8366,8 +8378,8 @@ packages:
     resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
     engines: {node: '>= 0.8.0'}
 
-  send@1.1.0:
-    resolution: {integrity: sha512-v67WcEouB5GxbTWL/4NeToqcZiAWEq90N888fczVArY8A79J0L4FD7vj5hm3eUMua5EpoQ59wa/oovY6TLvRUA==}
+  send@1.2.0:
+    resolution: {integrity: sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==}
     engines: {node: '>= 18'}
 
   sentence-case@3.0.4:
@@ -16234,6 +16246,8 @@ snapshots:
 
   fresh@0.5.2: {}
 
+  fresh@2.0.0: {}
+
   from@0.1.7: {}
 
   fs-constants@1.0.0: {}
@@ -17384,7 +17398,7 @@ snapshots:
       object-assign: 4.1.1
       opn: 6.0.0
       proxy-middleware: 0.15.0
-      send: 1.1.0
+      send: 1.2.0
       serve-index: 1.9.1
     transitivePeerDependencies:
       - supports-color
@@ -17588,7 +17602,7 @@ snapshots:
 
   maxrects-packer@2.7.3: {}
 
-  mc-assets@0.2.47:
+  mc-assets@0.2.48:
     dependencies:
       maxrects-packer: 2.7.3
       zod: 3.24.1
@@ -17873,10 +17887,16 @@ snapshots:
 
   mime-db@1.52.0: {}
 
+  mime-db@1.54.0: {}
+
   mime-types@2.1.35:
     dependencies:
       mime-db: 1.52.0
 
+  mime-types@3.0.1:
+    dependencies:
+      mime-db: 1.54.0
+
   mime@1.6.0: {}
 
   mime@2.6.0: {}
@@ -19793,16 +19813,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  send@1.1.0:
+  send@1.2.0:
     dependencies:
       debug: 4.4.0(supports-color@8.1.1)
-      destroy: 1.2.0
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
-      fresh: 0.5.2
+      fresh: 2.0.0
       http-errors: 2.0.0
-      mime-types: 2.1.35
+      mime-types: 3.0.1
       ms: 2.1.3
       on-finished: 2.4.1
       range-parser: 1.2.1
diff --git a/renderer/viewer/lib/guiRenderer.ts b/renderer/viewer/lib/guiRenderer.ts
index c81a8eaa..bdfd805c 100644
--- a/renderer/viewer/lib/guiRenderer.ts
+++ b/renderer/viewer/lib/guiRenderer.ts
@@ -47,6 +47,8 @@ export const getNonFullBlocksModels = () => {
     if (!model?.elements?.length) return
     const isFullBlock = model.elements.length === 1 && arrEqual(model.elements[0].from, [0, 0, 0]) && arrEqual(model.elements[0].to, [16, 16, 16])
     if (isFullBlock) return
+    const hasBetterPrerender = assetsParser.blockModelsStore.data.latest[`item/${name}`]?.textures?.['layer0']?.startsWith('invsprite_')
+    if (hasBetterPrerender) return
     model['display'] ??= {}
     model['display']['gui'] ??= standardGuiDisplay
     blockModelsResolved[name] = model
@@ -144,6 +146,7 @@ const generateItemsGui = async (models: Record<string, BlockModelMcAssets>, isIt
   const PREVIEW_ID = Identifier.parse('preview:preview')
   const PREVIEW_DEFINITION = new BlockDefinition({ '': { model: PREVIEW_ID.toString() } }, undefined)
 
+  let textureWasRequested = false
   let modelData: any
   let currentModelName: string | undefined
   const resources: ItemRendererResources = {
@@ -154,6 +157,7 @@ const generateItemsGui = async (models: Record<string, BlockModelMcAssets>, isIt
       return null
     },
     getTextureUV (texture) {
+      textureWasRequested = true
       return textureAtlas.getTextureUV(texture.toString().replace('minecraft:', '').replace('block/', '').replace('item/', '').replace('blocks/', '').replace('items/', '') as any)
     },
     getTextureAtlas () {
@@ -202,6 +206,7 @@ const generateItemsGui = async (models: Record<string, BlockModelMcAssets>, isIt
   const renderer = new ItemRenderer(gl, item, resources, { display_context: 'gui' })
   const missingTextures = new Set()
   for (const [modelName, model] of Object.entries(models)) {
+    textureWasRequested = false
     if (includeOnly.length && !includeOnly.includes(modelName)) continue
 
     const patchMissingTextures = () => {
@@ -223,6 +228,7 @@ const generateItemsGui = async (models: Record<string, BlockModelMcAssets>, isIt
     if (!modelData) continue
     renderer.setItem(item, { display_context: 'gui' })
     renderer.drawItem()
+    if (!textureWasRequested) continue
     const url = canvas.toDataURL()
     // eslint-disable-next-line no-await-in-loop
     const img = await getLoadedImage(url)
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 8fbc7043..805295ad 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -200,7 +200,7 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
   if (!fullBlockModelSupport) {
     const atlas = activeGuiAtlas.atlas?.json
     // todo atlas holds all rendered blocks, not all possibly rendered item/block models, need to request this on demand instead (this is how vanilla works)
-    const item = atlas?.textures[itemModelName.replace('minecraft:', '').replace('block/', '').replace('blocks/', '').replace('item/', '').replace('items/', '').replace('_inventory', '').replace('_bottom', '')]
+    const item = atlas?.textures[itemModelName.replace('minecraft:', '').replace('block/', '').replace('blocks/', '').replace('item/', '').replace('items/', '').replace('_inventory', '').replace('_bottom', '').replace('_height2', '').replace('_stable', '').replace('_unstable', '')]
     if (item) {
       const x = item.u * atlas.width
       const y = item.v * atlas.height

From 187e9fa6b492baa123096098aba8401c534f8c18 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 09:16:36 +0300
Subject: [PATCH 394/753] important: fix visual update issues in inventory
 after server packet

---
 src/inventoryWindows.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 805295ad..05e371ef 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -252,7 +252,7 @@ const getItemName = (slot: Item | RenderItem | null) => {
 let lastMappedSots = [] as any[]
 const itemToVisualKey = (slot: RenderItem | Item | null) => {
   if (!slot) return null
-  return slot.name + (slot['metadata'] ?? '-') + (slot.nbt ? JSON.stringify(slot.nbt) : '') + (slot['components'] ? JSON.stringify(slot['components']) : '')
+  return slot.name + slot['count'] + (slot['metadata'] ?? '-') + (slot.nbt ? JSON.stringify(slot.nbt) : '') + (slot['components'] ? JSON.stringify(slot['components']) : '')
 }
 const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
   const newSlots = slots.map((slot, i) => {

From 08bb0b677710bd071a9cb1dfc285c3aa0791160f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 09:17:48 +0300
Subject: [PATCH 395/753] fix: fix almost all known inventory update bugs

---
 pnpm-lock.yaml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 98c16ac5..cb1d391c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -357,7 +357,7 @@ importers:
         version: 0.2.48
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
-        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0)
+        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/69dee6aa15f7c8a6df2a2ab01972e6a7b2f9ee30(@types/react@18.2.20)(react@18.2.0)
       mineflayer:
         specifier: github:zardoy/mineflayer
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)
@@ -6912,8 +6912,8 @@ packages:
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8:
-    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8}
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/69dee6aa15f7c8a6df2a2ab01972e6a7b2f9ee30:
+    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/69dee6aa15f7c8a6df2a2ab01972e6a7b2f9ee30}
     version: 1.0.1
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1:
@@ -7251,8 +7251,8 @@ packages:
     resolution: {integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==}
     engines: {node: '>= 0.4'}
 
-  object.entries@1.1.8:
-    resolution: {integrity: sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==}
+  object.entries@1.1.9:
+    resolution: {integrity: sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==}
     engines: {node: '>= 0.4'}
 
   object.fromentries@2.0.8:
@@ -15736,7 +15736,7 @@ snapshots:
       estraverse: 5.3.0
       jsx-ast-utils: 3.3.5
       minimatch: 3.1.2
-      object.entries: 1.1.8
+      object.entries: 1.1.9
       object.fromentries: 2.0.8
       object.hasown: 1.1.4
       object.values: 1.2.1
@@ -17919,7 +17919,7 @@ snapshots:
 
   minecraft-folder-path@1.2.0: {}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.2.20)(react@18.2.0):
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/69dee6aa15f7c8a6df2a2ab01972e6a7b2f9ee30(@types/react@18.2.20)(react@18.2.0):
     dependencies:
       valtio: 1.11.2(@types/react@18.2.20)(react@18.2.0)
     transitivePeerDependencies:
@@ -18455,9 +18455,10 @@ snapshots:
       has-symbols: 1.1.0
       object-keys: 1.1.1
 
-  object.entries@1.1.8:
+  object.entries@1.1.9:
     dependencies:
       call-bind: 1.0.8
+      call-bound: 1.0.4
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
 

From af9da939784f0d37933138a05037ac6a44bddfba Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 09:19:54 +0300
Subject: [PATCH 396/753] enabling parsing kick messages

---
 src/botUtils.ts | 18 +++++++++---------
 src/index.ts    |  2 --
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/botUtils.ts b/src/botUtils.ts
index 5a6f92f7..10609322 100644
--- a/src/botUtils.ts
+++ b/src/botUtils.ts
@@ -21,15 +21,15 @@ export const displayClientChat = (text: string) => {
 }
 
 export const parseFormattedMessagePacket = (arg) => {
-  // if (typeof arg === 'string') {
-  //   try {
-  //     arg = JSON.parse(arg)
-  //     return {
-  //       formatted: arg,
-  //       plain: ''
-  //     }
-  //   } catch {}
-  // }
+  if (typeof arg === 'string') {
+    try {
+      arg = JSON.parse(arg)
+      return {
+        formatted: arg,
+        plain: ''
+      }
+    } catch {}
+  }
   if (typeof arg === 'object') {
     try {
       return {
diff --git a/src/index.ts b/src/index.ts
index 181a64c6..e57e8b41 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -628,8 +628,6 @@ export async function connect (connectOptions: ConnectOptions) {
     destroyAll()
   })
 
-  // bot.emit('kicked', '{"translate":"disconnect.genericReason","with":["Internal Exception: io.netty.handler.codec.EncoderException: com.viaversion.viaversion.exception.InformativeException: Please report this on the Via support Discord or open an issue on the relevant GitHub repository\\nPacket Type: SYSTEM_CHAT, Index: 1, Type: TagType, Data: [], Packet ID: 103, Source 0: com.viaversion.viabackwards.protocol.v1_20_3to1_20_2.Protocol1_20_3To1_20_2$$Lambda/0x00007f9930f63080"]}', false)
-
   const packetBeforePlay = (_, __, ___, fullBuffer) => {
     lastPacket = fullBuffer.toString()
   }

From 6f15fcc72673947d626cf4ea29190d1fa0e32917 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 09:57:57 +0300
Subject: [PATCH 397/753] fix: display proxy disconnect message to the client
 when proxy server is being shutdown

---
 pnpm-lock.yaml          | 17 ++++++++++++-----
 src/index.ts            | 17 ++++++++++++++---
 src/react/AppStatus.tsx |  1 +
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cb1d391c..ba4d494f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -151,7 +151,7 @@ importers:
         version: 2.0.4
       net-browserify:
         specifier: github:zardoy/prismarinejs-net-browserify
-        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590
+        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/29cb893a3dd40c663b1b9b34fbecdbf967b089d4
       node-gzip:
         specifier: ^1.1.2
         version: 1.1.2
@@ -7107,8 +7107,8 @@ packages:
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590}
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/29cb893a3dd40c663b1b9b34fbecdbf967b089d4:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/29cb893a3dd40c663b1b9b34fbecdbf967b089d4}
     version: 0.2.4
 
   nice-try@1.0.5:
@@ -7669,6 +7669,9 @@ packages:
   prismarine-nbt@2.5.0:
     resolution: {integrity: sha512-F0/8UAa9SDDnAGrBYqZc4nG8h2zj5cE2eAJU5xlDR/IsQQ3moVxkOjE3h3nMv6SbvZrvAcgX7waA/nd9LLHYdA==}
 
+  prismarine-nbt@2.7.0:
+    resolution: {integrity: sha512-Du9OLQAcCj3y29YtewOJbbV4ARaSUEJiTguw0PPQbPBy83f+eCyDRkyBpnXTi/KPyEpgYCzsjGzElevLpFoYGQ==}
+
   prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     resolution: {tarball: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b}
     version: 1.9.0
@@ -18265,7 +18268,7 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590:
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/29cb893a3dd40c663b1b9b34fbecdbf967b089d4:
     dependencies:
       body-parser: 1.20.2
       express: 4.18.2
@@ -18903,13 +18906,17 @@ snapshots:
 
   prismarine-item@1.16.0:
     dependencies:
-      prismarine-nbt: 2.5.0
+      prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
 
   prismarine-nbt@2.5.0:
     dependencies:
       protodef: 1.18.0
 
+  prismarine-nbt@2.7.0:
+    dependencies:
+      protodef: 1.18.0
+
   prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     dependencies:
       minecraft-data: 3.83.1
diff --git a/src/index.ts b/src/index.ts
index e57e8b41..988cf68e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -32,7 +32,7 @@ import { watchOptionsAfterViewerInit, watchOptionsAfterWorldViewInit } from './w
 import downloadAndOpenFile from './downloadAndOpenFile'
 
 import fs from 'fs'
-import net from 'net'
+import net, { Socket } from 'net'
 import mineflayer from 'mineflayer'
 
 import debug from 'debug'
@@ -300,6 +300,7 @@ export async function connect (connectOptions: ConnectOptions) {
   let updateDataAfterJoin = () => { }
   let localServer
   let localReplaySession: ReturnType<typeof startLocalReplayServer> | undefined
+  let lastKnownKickReason = undefined as string | undefined
   try {
     const serverOptions = defaultsDeep({}, connectOptions.serverOverrides ?? {}, options.localServerOptions, defaultServerOptions)
     Object.assign(serverOptions, connectOptions.serverOverridesFlat ?? {})
@@ -566,6 +567,16 @@ export async function connect (connectOptions: ConnectOptions) {
       bot._client.emit('connect')
     } else {
       const setupConnectHandlers = () => {
+        Socket.prototype['handleStringMessage'] = function (message: string) {
+          if (message.startsWith('proxy-message') || message.startsWith('proxy-command:')) { // for future
+            return false
+          }
+          if (message.startsWith('proxy-shutdown:')) {
+            lastKnownKickReason = message.slice('proxy-shutdown:'.length)
+            return false
+          }
+          return true
+        }
         bot._client.socket.on('connect', () => {
           console.log('Proxy WebSocket connection established')
           //@ts-expect-error
@@ -643,9 +654,9 @@ export async function connect (connectOptions: ConnectOptions) {
     if (ended) return
     console.log('disconnected for', endReason)
     if (endReason === 'socketClosed') {
-      endReason = 'Connection with server lost'
+      endReason = lastKnownKickReason ?? 'Connection with server lost'
     }
-    setLoadingScreenStatus(`You have been disconnected from the server. End reason: ${endReason}`, true)
+    setLoadingScreenStatus(`You have been disconnected from the server. End reason:\n${endReason}`, true)
     appStatusState.showReconnect = true
     onPossibleErrorDisconnect()
     destroyAll()
diff --git a/src/react/AppStatus.tsx b/src/react/AppStatus.tsx
index 8dd181d7..c083e445 100644
--- a/src/react/AppStatus.tsx
+++ b/src/react/AppStatus.tsx
@@ -46,6 +46,7 @@ export default ({
         <>
           <span style={{
             wordBreak: 'break-word',
+            whiteSpace: 'pre-wrap',
           }}
           >
             {status}

From 47864f002396ea1b2c4a6c3fe252fabc17b7007d Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 10:41:25 +0300
Subject: [PATCH 398/753] ci: report size change + always check single file
 build (#320)

* init

* should be final

* mbmb

* Update .github/workflows/bundle-stats.yml

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 .github/workflows/bundle-stats.yml | 57 +++++++++++++++++++++++++++++
 .github/workflows/ci.yml           | 59 ++++++++++++++++++++++++++++++
 rsbuild.config.ts                  |  6 +++
 3 files changed, 122 insertions(+)
 create mode 100644 .github/workflows/bundle-stats.yml

diff --git a/.github/workflows/bundle-stats.yml b/.github/workflows/bundle-stats.yml
new file mode 100644
index 00000000..a9dcb0e5
--- /dev/null
+++ b/.github/workflows/bundle-stats.yml
@@ -0,0 +1,57 @@
+name: Bundle Stats
+on:
+  workflow_call:
+    inputs:
+      mode:
+        required: true
+        type: string
+        description: "'store' or 'compare'"
+      branch:
+        required: true
+        type: string
+    outputs:
+      stats:
+        description: "Bundle stats comparison"
+        value: ${{ jobs.bundle-stats.outputs.stats }}
+
+jobs:
+  bundle-stats:
+    runs-on: ubuntu-latest
+    outputs:
+      stats: ${{ steps.gist-ops.outputs.stats }}
+    steps:
+      - uses: actions/github-script@v6
+        id: gist-ops
+        with:
+          script: |
+            const gistId = '${{ secrets.BUNDLE_STATS_GIST_ID }}';
+
+            async function getGistContent() {
+              const { data } = await github.rest.gists.get({ gist_id: gistId });
+              return JSON.parse(data.files['bundle-stats.json'].content || '{}');
+            }
+
+            async function updateGistContent(content) {
+              await github.rest.gists.update({
+                gist_id: gistId,
+                files: {
+                  'bundle-stats.json': {
+                    content: JSON.stringify(content, null, 2)
+                  }
+                }
+              });
+            }
+
+            if ('${{ inputs.mode }}' === 'store') {
+              const stats = require('/tmp/bundle-stats.json');
+              const content = await getGistContent();
+              content['${{ inputs.branch }}'] = stats;
+              await updateGistContent(content);
+            } else {
+              const content = await getGistContent();
+              const baseStats = content['${{ inputs.branch }}'];
+              const newStats = require('/tmp/bundle-stats.json');
+
+              const comparison = `minecraft.html (normal build gzip)\n${baseStats.total}MB (${baseStats.gzipped}MB compressed) -> ${newStats.total}MB (${newStats.gzipped}MB compressed)`;
+              core.setOutput('stats', comparison);
+            }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 92b7e7f3..46a2de6b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,6 +21,13 @@ jobs:
         uses: pnpm/action-setup@v4
       - run: pnpm install
       - run: pnpm check-build
+      - name: Create zip package for size comparison
+        run: |
+          mkdir -p package
+          cp -r dist package/
+          cd package
+          zip -r ../self-host.zip .
+      - run: pnpm build-single-file
       - run: pnpm build-playground
       - run: pnpm build-storybook
       - run: pnpm test-unit
@@ -40,6 +47,58 @@ jobs:
       #   if: ${{ github.event.pull_request.base.ref == 'release' }}
       #   env:
       #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Parse Bundle Stats
+        run: |
+          SIZE_BYTES=$(du -s dist/single/minecraft.html 2>/dev/null | cut -f1)
+          GZIP_BYTES=$(du -s self-host.zip 2>/dev/null | cut -f1)
+          SIZE=$(echo "scale=2; $SIZE_BYTES/1024/1024" | bc)
+          GZIP_SIZE=$(echo "scale=2; $GZIP_BYTES/1024/1024" | bc)
+          echo "{\"total\": ${SIZE}, \"gzipped\": ${GZIP_SIZE}}" > /tmp/bundle-stats.json
+
+      - name: Compare Bundle Stats
+        id: compare
+        uses: ./.github/workflows/bundle-stats
+        with:
+          mode: compare
+          branch: ${{ github.event.pull_request.base.ref }}
+
+      - name: Store Bundle Stats
+        if: github.event.pull_request.base.ref == 'next'
+        uses: ./.github/workflows/bundle-stats
+        with:
+          mode: store
+          branch: ${{ github.event.pull_request.base.ref }}
+
+      - name: Update PR Description
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const { data: pr } = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number
+            });
+
+            let body = pr.body || '';
+            const statsMarker = '### Bundle Size';
+            const comparison = '${{ steps.compare.outputs.stats }}';
+
+            if (body.includes(statsMarker)) {
+              body = body.replace(
+                new RegExp(`${statsMarker}[^\n]*\n[^\n]*`),
+                `${statsMarker}\n${comparison}`
+              );
+            } else {
+              body += `\n\n${statsMarker}\n${comparison}`;
+            }
+
+            await github.rest.pulls.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number,
+              body
+            });
   # dedupe-check:
   #   runs-on: ubuntu-latest
   #   if: github.event.pull_request.head.ref == 'next'
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 1701fc5c..36ccb9b0 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -203,6 +203,12 @@ const appConfig = defineConfig({
                     })
                     build.onAfterBuild(async () => {
                         if (SINGLE_FILE_BUILD) {
+                            // check that only index.html is in the dist/single folder
+                            const singleBuildFiles = fs.readdirSync('./dist/single')
+                            if (singleBuildFiles.length !== 1 || singleBuildFiles[0] !== 'index.html') {
+                                throw new Error('Single file build must only have index.html in the dist/single folder. Ensure workers are imported & built correctly.')
+                            }
+
                             // process index.html
                             const singleBuildHtml = './dist/single/index.html'
                             let html = fs.readFileSync(singleBuildHtml, 'utf8')

From 66fa59a87a48b36b1f05388377adfc2fba801e02 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 10:53:50 +0300
Subject: [PATCH 399/753] ci: add size tracking for minecraft.html and adjust
 build steps

---
 .github/workflows/ci.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 46a2de6b..9ec11a50 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,6 +20,11 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
       - run: pnpm install
+      - run: pnpm build-single-file
+      - name: Store minecraft.html size
+        run: |
+          SIZE_BYTES=$(du -s dist/single/minecraft.html 2>/dev/null | cut -f1)
+          echo "SIZE_BYTES=$SIZE_BYTES" >> $GITHUB_ENV
       - run: pnpm check-build
       - name: Create zip package for size comparison
         run: |
@@ -27,7 +32,6 @@ jobs:
           cp -r dist package/
           cd package
           zip -r ../self-host.zip .
-      - run: pnpm build-single-file
       - run: pnpm build-playground
       - run: pnpm build-storybook
       - run: pnpm test-unit
@@ -50,8 +54,8 @@ jobs:
 
       - name: Parse Bundle Stats
         run: |
-          SIZE_BYTES=$(du -s dist/single/minecraft.html 2>/dev/null | cut -f1)
           GZIP_BYTES=$(du -s self-host.zip 2>/dev/null | cut -f1)
+          SIZE_BYTES=$(du -s dist/single/minecraft.html 2>/dev/null | cut -f1)
           SIZE=$(echo "scale=2; $SIZE_BYTES/1024/1024" | bc)
           GZIP_SIZE=$(echo "scale=2; $GZIP_BYTES/1024/1024" | bc)
           echo "{\"total\": ${SIZE}, \"gzipped\": ${GZIP_SIZE}}" > /tmp/bundle-stats.json

From 983b8a184b64c4ae88afa61e68923fd82582cc35 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 11:01:35 +0300
Subject: [PATCH 400/753] refactor: remove bundle-stats workflow and integrate
 its functionality directly into CI

---
 .github/workflows/bundle-stats.yml | 57 ------------------------------
 .github/workflows/ci.yml           | 46 ++++++++++++++++++++----
 2 files changed, 39 insertions(+), 64 deletions(-)
 delete mode 100644 .github/workflows/bundle-stats.yml

diff --git a/.github/workflows/bundle-stats.yml b/.github/workflows/bundle-stats.yml
deleted file mode 100644
index a9dcb0e5..00000000
--- a/.github/workflows/bundle-stats.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: Bundle Stats
-on:
-  workflow_call:
-    inputs:
-      mode:
-        required: true
-        type: string
-        description: "'store' or 'compare'"
-      branch:
-        required: true
-        type: string
-    outputs:
-      stats:
-        description: "Bundle stats comparison"
-        value: ${{ jobs.bundle-stats.outputs.stats }}
-
-jobs:
-  bundle-stats:
-    runs-on: ubuntu-latest
-    outputs:
-      stats: ${{ steps.gist-ops.outputs.stats }}
-    steps:
-      - uses: actions/github-script@v6
-        id: gist-ops
-        with:
-          script: |
-            const gistId = '${{ secrets.BUNDLE_STATS_GIST_ID }}';
-
-            async function getGistContent() {
-              const { data } = await github.rest.gists.get({ gist_id: gistId });
-              return JSON.parse(data.files['bundle-stats.json'].content || '{}');
-            }
-
-            async function updateGistContent(content) {
-              await github.rest.gists.update({
-                gist_id: gistId,
-                files: {
-                  'bundle-stats.json': {
-                    content: JSON.stringify(content, null, 2)
-                  }
-                }
-              });
-            }
-
-            if ('${{ inputs.mode }}' === 'store') {
-              const stats = require('/tmp/bundle-stats.json');
-              const content = await getGistContent();
-              content['${{ inputs.branch }}'] = stats;
-              await updateGistContent(content);
-            } else {
-              const content = await getGistContent();
-              const baseStats = content['${{ inputs.branch }}'];
-              const newStats = require('/tmp/bundle-stats.json');
-
-              const comparison = `minecraft.html (normal build gzip)\n${baseStats.total}MB (${baseStats.gzipped}MB compressed) -> ${newStats.total}MB (${newStats.gzipped}MB compressed)`;
-              core.setOutput('stats', comparison);
-            }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9ec11a50..dc1deee5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,24 +55,56 @@ jobs:
       - name: Parse Bundle Stats
         run: |
           GZIP_BYTES=$(du -s self-host.zip 2>/dev/null | cut -f1)
-          SIZE_BYTES=$(du -s dist/single/minecraft.html 2>/dev/null | cut -f1)
           SIZE=$(echo "scale=2; $SIZE_BYTES/1024/1024" | bc)
           GZIP_SIZE=$(echo "scale=2; $GZIP_BYTES/1024/1024" | bc)
           echo "{\"total\": ${SIZE}, \"gzipped\": ${GZIP_SIZE}}" > /tmp/bundle-stats.json
 
       - name: Compare Bundle Stats
         id: compare
-        uses: ./.github/workflows/bundle-stats
+        uses: actions/github-script@v6
         with:
-          mode: compare
-          branch: ${{ github.event.pull_request.base.ref }}
+          script: |
+            const gistId = '${{ secrets.BUNDLE_STATS_GIST_ID }}';
+
+            async function getGistContent() {
+              const { data } = await github.rest.gists.get({ gist_id: gistId });
+              return JSON.parse(data.files['bundle-stats.json'].content || '{}');
+            }
+
+            const content = await getGistContent();
+            const baseStats = content['${{ github.event.pull_request.base.ref }}'];
+            const newStats = require('/tmp/bundle-stats.json');
+
+            const comparison = `minecraft.html (normal build gzip)\n${baseStats.total}MB (${baseStats.gzipped}MB compressed) -> ${newStats.total}MB (${newStats.gzipped}MB compressed)`;
+            core.setOutput('stats', comparison);
 
       - name: Store Bundle Stats
         if: github.event.pull_request.base.ref == 'next'
-        uses: ./.github/workflows/bundle-stats
+        uses: actions/github-script@v6
         with:
-          mode: store
-          branch: ${{ github.event.pull_request.base.ref }}
+          script: |
+            const gistId = '${{ secrets.BUNDLE_STATS_GIST_ID }}';
+
+            async function getGistContent() {
+              const { data } = await github.rest.gists.get({ gist_id: gistId });
+              return JSON.parse(data.files['bundle-stats.json'].content || '{}');
+            }
+
+            async function updateGistContent(content) {
+              await github.rest.gists.update({
+                gist_id: gistId,
+                files: {
+                  'bundle-stats.json': {
+                    content: JSON.stringify(content, null, 2)
+                  }
+                }
+              });
+            }
+
+            const stats = require('/tmp/bundle-stats.json');
+            const content = await getGistContent();
+            content['${{ github.event.pull_request.base.ref }}'] = stats;
+            await updateGistContent(content);
 
       - name: Update PR Description
         uses: actions/github-script@v6

From 291ead079a46fb2f6a5b5115897c862bb8aab7f5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 11:13:33 +0300
Subject: [PATCH 401/753] use token: workaround

---
 .github/workflows/ci.yml | 76 +++++++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dc1deee5..d44c45f7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,9 @@ on:
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
-    permissions: write-all
+    permissions:
+      contents: write
+      gists: write
     steps:
       - name: Checkout repository
         uses: actions/checkout@master
@@ -36,6 +38,40 @@ jobs:
       - run: pnpm build-storybook
       - run: pnpm test-unit
       - run: pnpm lint
+
+      - name: Parse Bundle Stats
+        run: |
+          GZIP_BYTES=$(du -s self-host.zip 2>/dev/null | cut -f1)
+          SIZE=$(echo "scale=2; $SIZE_BYTES/1024/1024" | bc)
+          GZIP_SIZE=$(echo "scale=2; $GZIP_BYTES/1024/1024" | bc)
+          echo "{\"total\": ${SIZE}, \"gzipped\": ${GZIP_SIZE}}" > /tmp/bundle-stats.json
+
+      - name: Compare Bundle Stats
+        id: compare
+        uses: actions/github-script@v6
+        env:
+          GIST_TOKEN: ${{ secrets.GIST_TOKEN }}
+        with:
+          script: |
+            const gistId = '${{ secrets.BUNDLE_STATS_GIST_ID }}';
+
+            async function getGistContent() {
+              const { data } = await github.rest.gists.get({
+                gist_id: gistId,
+                headers: {
+                  authorization: `token ${process.env.GIST_TOKEN}`
+                }
+              });
+              return JSON.parse(data.files['bundle-stats.json'].content || '{}');
+            }
+
+            const content = await getGistContent();
+            const baseStats = content['${{ github.event.pull_request.base.ref }}'];
+            const newStats = require('/tmp/bundle-stats.json');
+
+            const comparison = `minecraft.html (normal build gzip)\n${baseStats.total}MB (${baseStats.gzipped}MB compressed) -> ${newStats.total}MB (${newStats.gzipped}MB compressed)`;
+            core.setOutput('stats', comparison);
+
       # - run: pnpm tsx scripts/buildNpmReact.ts
       - run: nohup pnpm prod-start &
       - run: nohup pnpm test-mc-server &
@@ -52,47 +88,31 @@ jobs:
       #   env:
       #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Parse Bundle Stats
-        run: |
-          GZIP_BYTES=$(du -s self-host.zip 2>/dev/null | cut -f1)
-          SIZE=$(echo "scale=2; $SIZE_BYTES/1024/1024" | bc)
-          GZIP_SIZE=$(echo "scale=2; $GZIP_BYTES/1024/1024" | bc)
-          echo "{\"total\": ${SIZE}, \"gzipped\": ${GZIP_SIZE}}" > /tmp/bundle-stats.json
-
-      - name: Compare Bundle Stats
-        id: compare
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const gistId = '${{ secrets.BUNDLE_STATS_GIST_ID }}';
-
-            async function getGistContent() {
-              const { data } = await github.rest.gists.get({ gist_id: gistId });
-              return JSON.parse(data.files['bundle-stats.json'].content || '{}');
-            }
-
-            const content = await getGistContent();
-            const baseStats = content['${{ github.event.pull_request.base.ref }}'];
-            const newStats = require('/tmp/bundle-stats.json');
-
-            const comparison = `minecraft.html (normal build gzip)\n${baseStats.total}MB (${baseStats.gzipped}MB compressed) -> ${newStats.total}MB (${newStats.gzipped}MB compressed)`;
-            core.setOutput('stats', comparison);
-
       - name: Store Bundle Stats
         if: github.event.pull_request.base.ref == 'next'
         uses: actions/github-script@v6
+        env:
+          GIST_TOKEN: ${{ secrets.GIST_TOKEN }}
         with:
           script: |
             const gistId = '${{ secrets.BUNDLE_STATS_GIST_ID }}';
 
             async function getGistContent() {
-              const { data } = await github.rest.gists.get({ gist_id: gistId });
+              const { data } = await github.rest.gists.get({
+                gist_id: gistId,
+                headers: {
+                  authorization: `token ${process.env.GIST_TOKEN}`
+                }
+              });
               return JSON.parse(data.files['bundle-stats.json'].content || '{}');
             }
 
             async function updateGistContent(content) {
               await github.rest.gists.update({
                 gist_id: gistId,
+                headers: {
+                  authorization: `token ${process.env.GIST_TOKEN}`
+                },
                 files: {
                   'bundle-stats.json': {
                     content: JSON.stringify(content, null, 2)

From 18ee1dc532110d0e0bdda0e84dd35679bdb3259e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 11:15:54 +0300
Subject: [PATCH 402/753] ci: fix syntax

---
 .github/workflows/ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d44c45f7..a3421ec5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,9 +4,7 @@ on:
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      gists: write
+    permissions: write-all
     steps:
       - name: Checkout repository
         uses: actions/checkout@master

From 115022a21bf7e1746e68b7eb6e007f1401e0a324 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 11:23:48 +0300
Subject: [PATCH 403/753] ci: use github_token var

---
 .github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3421ec5..546d0cd9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,7 +48,7 @@ jobs:
         id: compare
         uses: actions/github-script@v6
         env:
-          GIST_TOKEN: ${{ secrets.GIST_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GIST_TOKEN }}
         with:
           script: |
             const gistId = '${{ secrets.BUNDLE_STATS_GIST_ID }}';
@@ -57,7 +57,7 @@ jobs:
               const { data } = await github.rest.gists.get({
                 gist_id: gistId,
                 headers: {
-                  authorization: `token ${process.env.GIST_TOKEN}`
+                  authorization: `token ${process.env.GITHUB_TOKEN}`
                 }
               });
               return JSON.parse(data.files['bundle-stats.json'].content || '{}');
@@ -90,7 +90,7 @@ jobs:
         if: github.event.pull_request.base.ref == 'next'
         uses: actions/github-script@v6
         env:
-          GIST_TOKEN: ${{ secrets.GIST_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GIST_TOKEN }}
         with:
           script: |
             const gistId = '${{ secrets.BUNDLE_STATS_GIST_ID }}';
@@ -99,7 +99,7 @@ jobs:
               const { data } = await github.rest.gists.get({
                 gist_id: gistId,
                 headers: {
-                  authorization: `token ${process.env.GIST_TOKEN}`
+                  authorization: `token ${process.env.GITHUB_TOKEN}`
                 }
               });
               return JSON.parse(data.files['bundle-stats.json'].content || '{}');
@@ -109,7 +109,7 @@ jobs:
               await github.rest.gists.update({
                 gist_id: gistId,
                 headers: {
-                  authorization: `token ${process.env.GIST_TOKEN}`
+                  authorization: `token ${process.env.GITHUB_TOKEN}`
                 },
                 files: {
                   'bundle-stats.json': {

From b666f6e3c358f302f069377947a0d1d5bd33c8db Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 29 Mar 2025 11:27:10 +0300
Subject: [PATCH 404/753] ci: disable functionality that should work but doesnt
 work because github doesnt make any sense

---
 .github/workflows/ci.yml | 112 +++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 546d0cd9..d624be53 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,31 +44,31 @@ jobs:
           GZIP_SIZE=$(echo "scale=2; $GZIP_BYTES/1024/1024" | bc)
           echo "{\"total\": ${SIZE}, \"gzipped\": ${GZIP_SIZE}}" > /tmp/bundle-stats.json
 
-      - name: Compare Bundle Stats
-        id: compare
-        uses: actions/github-script@v6
-        env:
-          GITHUB_TOKEN: ${{ secrets.GIST_TOKEN }}
-        with:
-          script: |
-            const gistId = '${{ secrets.BUNDLE_STATS_GIST_ID }}';
+      # - name: Compare Bundle Stats
+      #   id: compare
+      #   uses: actions/github-script@v6
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GIST_TOKEN }}
+      #   with:
+      #     script: |
+      #       const gistId = '${{ secrets.BUNDLE_STATS_GIST_ID }}';
 
-            async function getGistContent() {
-              const { data } = await github.rest.gists.get({
-                gist_id: gistId,
-                headers: {
-                  authorization: `token ${process.env.GITHUB_TOKEN}`
-                }
-              });
-              return JSON.parse(data.files['bundle-stats.json'].content || '{}');
-            }
+      #       async function getGistContent() {
+      #         const { data } = await github.rest.gists.get({
+      #           gist_id: gistId,
+      #           headers: {
+      #             authorization: `token ${process.env.GITHUB_TOKEN}`
+      #           }
+      #         });
+      #         return JSON.parse(data.files['bundle-stats.json'].content || '{}');
+      #       }
 
-            const content = await getGistContent();
-            const baseStats = content['${{ github.event.pull_request.base.ref }}'];
-            const newStats = require('/tmp/bundle-stats.json');
+      #       const content = await getGistContent();
+      #       const baseStats = content['${{ github.event.pull_request.base.ref }}'];
+      #       const newStats = require('/tmp/bundle-stats.json');
 
-            const comparison = `minecraft.html (normal build gzip)\n${baseStats.total}MB (${baseStats.gzipped}MB compressed) -> ${newStats.total}MB (${newStats.gzipped}MB compressed)`;
-            core.setOutput('stats', comparison);
+      #       const comparison = `minecraft.html (normal build gzip)\n${baseStats.total}MB (${baseStats.gzipped}MB compressed) -> ${newStats.total}MB (${newStats.gzipped}MB compressed)`;
+      #       core.setOutput('stats', comparison);
 
       # - run: pnpm tsx scripts/buildNpmReact.ts
       - run: nohup pnpm prod-start &
@@ -86,43 +86,43 @@ jobs:
       #   env:
       #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Store Bundle Stats
-        if: github.event.pull_request.base.ref == 'next'
-        uses: actions/github-script@v6
-        env:
-          GITHUB_TOKEN: ${{ secrets.GIST_TOKEN }}
-        with:
-          script: |
-            const gistId = '${{ secrets.BUNDLE_STATS_GIST_ID }}';
+      # - name: Store Bundle Stats
+      #   if: github.event.pull_request.base.ref == 'next'
+      #   uses: actions/github-script@v6
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GIST_TOKEN }}
+      #   with:
+      #     script: |
+      #       const gistId = '${{ secrets.BUNDLE_STATS_GIST_ID }}';
 
-            async function getGistContent() {
-              const { data } = await github.rest.gists.get({
-                gist_id: gistId,
-                headers: {
-                  authorization: `token ${process.env.GITHUB_TOKEN}`
-                }
-              });
-              return JSON.parse(data.files['bundle-stats.json'].content || '{}');
-            }
+      #       async function getGistContent() {
+      #         const { data } = await github.rest.gists.get({
+      #           gist_id: gistId,
+      #           headers: {
+      #             authorization: `token ${process.env.GITHUB_TOKEN}`
+      #           }
+      #         });
+      #         return JSON.parse(data.files['bundle-stats.json'].content || '{}');
+      #       }
 
-            async function updateGistContent(content) {
-              await github.rest.gists.update({
-                gist_id: gistId,
-                headers: {
-                  authorization: `token ${process.env.GITHUB_TOKEN}`
-                },
-                files: {
-                  'bundle-stats.json': {
-                    content: JSON.stringify(content, null, 2)
-                  }
-                }
-              });
-            }
+      #       async function updateGistContent(content) {
+      #         await github.rest.gists.update({
+      #           gist_id: gistId,
+      #           headers: {
+      #             authorization: `token ${process.env.GITHUB_TOKEN}`
+      #           },
+      #           files: {
+      #             'bundle-stats.json': {
+      #               content: JSON.stringify(content, null, 2)
+      #             }
+      #           }
+      #         });
+      #       }
 
-            const stats = require('/tmp/bundle-stats.json');
-            const content = await getGistContent();
-            content['${{ github.event.pull_request.base.ref }}'] = stats;
-            await updateGistContent(content);
+      #       const stats = require('/tmp/bundle-stats.json');
+      #       const content = await getGistContent();
+      #       content['${{ github.event.pull_request.base.ref }}'] = stats;
+      #       await updateGistContent(content);
 
       - name: Update PR Description
         uses: actions/github-script@v6

From c324ce29abcf42acd1c849ccd0c0261c46144449 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 30 Mar 2025 14:03:50 +0300
Subject: [PATCH 405/753] fix: always limit error texture dimension to avoid
 crashes on high width/height

---
 renderer/viewer/three/threeJsMedia.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/renderer/viewer/three/threeJsMedia.ts b/renderer/viewer/three/threeJsMedia.ts
index e9ddcd9f..9ed5b8d3 100644
--- a/renderer/viewer/three/threeJsMedia.ts
+++ b/renderer/viewer/three/threeJsMedia.ts
@@ -34,9 +34,10 @@ export class ThreeJsMedia {
 
   private createErrorTexture (width: number, height: number, background = 0x00_00_00, error = 'Failed to load'): THREE.CanvasTexture {
     const canvas = document.createElement('canvas')
-    // Scale up the canvas size for better text quality
-    canvas.width = width * 100
-    canvas.height = height * 100
+    const MAX_DIMENSION = 100
+
+    canvas.width = MAX_DIMENSION
+    canvas.height = MAX_DIMENSION
 
     const ctx = canvas.getContext('2d')
     if (!ctx) return new THREE.CanvasTexture(canvas)
@@ -48,7 +49,7 @@ export class ThreeJsMedia {
     ctx.fillStyle = `rgba(${background >> 16 & 255}, ${background >> 8 & 255}, ${background & 255}, 0.5)`
     ctx.fillRect(0, 0, canvas.width, canvas.height)
 
-    // Add red text
+    // Add red text with size relative to canvas dimensions
     ctx.fillStyle = '#ff0000'
     ctx.font = 'bold 10px sans-serif'
     ctx.textAlign = 'center'

From 73e65c665610eabbe6c4c2527887ceed9a563f53 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 30 Mar 2025 16:09:45 +0300
Subject: [PATCH 406/753] try different intersect raycast media approach

---
 renderer/viewer/three/threeJsMedia.ts | 47 +++++++++++++++------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/renderer/viewer/three/threeJsMedia.ts b/renderer/viewer/three/threeJsMedia.ts
index 9ed5b8d3..60ff4ac9 100644
--- a/renderer/viewer/three/threeJsMedia.ts
+++ b/renderer/viewer/three/threeJsMedia.ts
@@ -514,7 +514,7 @@ export class ThreeJsMedia {
   }
 
   tryIntersectMedia () {
-    const { camera } = this.worldRenderer
+    const { camera, scene } = this.worldRenderer
     const raycaster = new THREE.Raycaster()
 
     // Get mouse position at center of screen
@@ -523,29 +523,36 @@ export class ThreeJsMedia {
     // Update the raycaster
     raycaster.setFromCamera(mouse, camera)
 
-    let result = null as { id: string, x: number, y: number } | null
-    // Check intersection with all video meshes
-    for (const [id, videoData] of this.customMedia.entries()) {
-      // Get the actual mesh (first child of the group)
-      const { mesh } = videoData
-      if (!mesh) continue
+    // Check intersection with all objects in scene
+    const intersects = raycaster.intersectObjects(scene.children, true)
+    if (intersects.length > 0) {
+      const intersection = intersects[0]
+      const intersectedObject = intersection.object
 
-      const intersects = raycaster.intersectObject(mesh, false)
-      if (intersects.length > 0) {
-        const intersection = intersects[0]
-        const { uv } = intersection
-        if (uv) {
-          result = {
-            id,
-            x: uv.x,
-            y: uv.y
+      // Find if this object belongs to any media
+      for (const [id, videoData] of this.customMedia.entries()) {
+        // Check if the intersected object is part of our media mesh
+        if (intersectedObject === videoData.mesh ||
+          videoData.mesh.children.includes(intersectedObject)) {
+          const { uv } = intersection
+          if (uv) {
+            const result = {
+              id,
+              x: uv.x,
+              y: uv.y
+            }
+            this.worldRenderer.reactiveState.world.intersectMedia = result
+            this.worldRenderer['debugVideo'] = videoData
+            this.worldRenderer.cursorBlock.cursorLinesHidden = true
+            return
           }
-          break
         }
       }
     }
-    this.worldRenderer.reactiveState.world.intersectMedia = result
-    this.worldRenderer['debugVideo'] = result ? this.customMedia.get(result.id) : null
-    this.worldRenderer.cursorBlock.cursorLinesHidden = !!result
+
+    // No media intersection found
+    this.worldRenderer.reactiveState.world.intersectMedia = null
+    this.worldRenderer['debugVideo'] = null
+    this.worldRenderer.cursorBlock.cursorLinesHidden = false
   }
 }

From 1a87951bc897f605abc5800fec0235233c2c8caf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 30 Mar 2025 16:09:50 +0300
Subject: [PATCH 407/753] up proxy

---
 pnpm-lock.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ba4d494f..6bc64cd6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -151,7 +151,7 @@ importers:
         version: 2.0.4
       net-browserify:
         specifier: github:zardoy/prismarinejs-net-browserify
-        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/29cb893a3dd40c663b1b9b34fbecdbf967b089d4
+        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/5c7b3a51dfc508288ffab1a2d2562647fca9f104
       node-gzip:
         specifier: ^1.1.2
         version: 1.1.2
@@ -7107,8 +7107,8 @@ packages:
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/29cb893a3dd40c663b1b9b34fbecdbf967b089d4:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/29cb893a3dd40c663b1b9b34fbecdbf967b089d4}
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/5c7b3a51dfc508288ffab1a2d2562647fca9f104:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/5c7b3a51dfc508288ffab1a2d2562647fca9f104}
     version: 0.2.4
 
   nice-try@1.0.5:
@@ -18268,7 +18268,7 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/29cb893a3dd40c663b1b9b34fbecdbf967b089d4:
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/5c7b3a51dfc508288ffab1a2d2562647fca9f104:
     dependencies:
       body-parser: 1.20.2
       express: 4.18.2

From 9c6bc4992162cfbf18b6115bae73c2d95cbef989 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 30 Mar 2025 18:01:21 +0300
Subject: [PATCH 408/753] fix msg for proxy

---
 src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.ts b/src/index.ts
index 988cf68e..d48429a2 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -654,7 +654,7 @@ export async function connect (connectOptions: ConnectOptions) {
     if (ended) return
     console.log('disconnected for', endReason)
     if (endReason === 'socketClosed') {
-      endReason = lastKnownKickReason ?? 'Connection with server lost'
+      endReason = lastKnownKickReason ?? 'Connection with proxy server lost'
     }
     setLoadingScreenStatus(`You have been disconnected from the server. End reason:\n${endReason}`, true)
     appStatusState.showReconnect = true

From 3c2ed440b6b444e4013c6022b855ab0c9fe757c3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 31 Mar 2025 08:22:29 +0300
Subject: [PATCH 409/753] up proxy software to avoid new crashes

---
 pnpm-lock.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6bc64cd6..5f673776 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -151,7 +151,7 @@ importers:
         version: 2.0.4
       net-browserify:
         specifier: github:zardoy/prismarinejs-net-browserify
-        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/5c7b3a51dfc508288ffab1a2d2562647fca9f104
+        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/4c6eccc7d7a7468ec811cb6c7398ded4753aea55
       node-gzip:
         specifier: ^1.1.2
         version: 1.1.2
@@ -7107,8 +7107,8 @@ packages:
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/5c7b3a51dfc508288ffab1a2d2562647fca9f104:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/5c7b3a51dfc508288ffab1a2d2562647fca9f104}
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/4c6eccc7d7a7468ec811cb6c7398ded4753aea55:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/4c6eccc7d7a7468ec811cb6c7398ded4753aea55}
     version: 0.2.4
 
   nice-try@1.0.5:
@@ -18268,7 +18268,7 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/5c7b3a51dfc508288ffab1a2d2562647fca9f104:
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/4c6eccc7d7a7468ec811cb6c7398ded4753aea55:
     dependencies:
       body-parser: 1.20.2
       express: 4.18.2

From 1b9b6c954c0785304d3537a4fa681e70f169e18b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 31 Mar 2025 11:43:07 +0300
Subject: [PATCH 410/753] fix: remove media and custom blocks on world switch,
 minor fixes

---
 renderer/viewer/lib/worldDataEmitter.ts     |  6 +-
 renderer/viewer/lib/worldrendererCommon.ts  | 19 +++---
 renderer/viewer/three/threeJsMedia.ts       |  5 ++
 renderer/viewer/three/worldrendererThree.ts |  9 +++
 src/customChannels.ts                       | 67 ++++++++-------------
 5 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index b4014239..f2004231 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -28,6 +28,7 @@ export type WorldDataEmitterEvents = {
   unloadChunk: (data: { x: number, z: number }) => void
   loadChunk: (data: { x: number, z: number, chunk: any, blockEntities: any, worldConfig: any, isLightUpdate: boolean }) => void
   updateLight: (data: { pos: Vec3 }) => void
+  onWorldSwitch: () => void
 }
 
 /**
@@ -119,7 +120,10 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
       },
       time: () => {
         this.emitter.emit('time', bot.time.timeOfDay)
-      }
+      },
+      respawn: () => {
+        this.emitter.emit('onWorldSwitch')
+      },
     } satisfies Partial<BotEvents>
 
 
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index f48f7956..1a846a21 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -98,7 +98,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   ONMESSAGE_TIME_LIMIT = 30 // ms
 
   handleResize = () => { }
-  camera: THREE.PerspectiveCamera
   highestBlocksByChunks = {} as Record<string, { [chunkKey: string]: HighestBlockInfo }>
   highestBlocksBySections = {} as Record<string, { [sectionKey: string]: HighestBlockInfo }>
   blockEntities = {}
@@ -108,6 +107,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   maxWorkersProcessTime = 0
   geometryReceiveCount = {}
   allLoadedIn: undefined | number
+  onWorldSwitched = [] as Array<() => void>
 
   edgeChunks = {} as Record<string, boolean>
   lastAddChunk = null as null | {
@@ -119,9 +119,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   lastChunkDistance = 0
   debugStopGeometryUpdate = false
 
-  @worldCleanup()
-  itemsRenderer: ItemsRenderer | undefined
-
   protocolCustomBlocks = new Map<string, CustomBlockModels>()
 
   @worldCleanup()
@@ -186,7 +183,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     })
     if (this.wasChunkSentToWorker(chunkKey)) {
       const [x, y, z] = blockPos.split(',').map(Number)
-      this.setBlockStateId(new Vec3(x, y, z), undefined)
+      this.setBlockStateId(new Vec3(x, y, z), undefined, false)
     }
   }
 
@@ -544,7 +541,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.updateChunksStats()
   }
 
-  setBlockStateId (pos: Vec3, stateId: number | undefined) {
+  setBlockStateId (pos: Vec3, stateId: number | undefined, needAoRecalculation = true) {
     const set = async () => {
       const sectionX = Math.floor(pos.x / 16) * 16
       const sectionZ = Math.floor(pos.z / 16) * 16
@@ -558,7 +555,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       if (!this.loadedChunks[`${sectionX},${sectionZ}`]) {
         // console.debug('[should be unreachable] setBlockStateId called for unloaded chunk', pos)
       }
-      this.setBlockStateIdInner(pos, stateId)
+      this.setBlockStateIdInner(pos, stateId, needAoRecalculation)
     }
     void set()
   }
@@ -641,6 +638,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       this.lightUpdate(pos.x, pos.z)
     })
 
+    worldEmitter.on('onWorldSwitch', () => {
+      for (const fn of this.onWorldSwitched) fn()
+    })
+
     worldEmitter.on('time', (timeOfDay) => {
       this.timeUpdated?.(timeOfDay)
 
@@ -667,8 +668,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     worldEmitter.emit('listening')
   }
 
-  setBlockStateIdInner (pos: Vec3, stateId: number | undefined) {
-    const needAoRecalculation = true
+  setBlockStateIdInner (pos: Vec3, stateId: number | undefined, needAoRecalculation = true) {
     const chunkKey = `${Math.floor(pos.x / 16) * 16},${Math.floor(pos.z / 16) * 16}`
     const blockPosKey = `${pos.x},${pos.y},${pos.z}`
     const customBlockModels = this.protocolCustomBlocks.get(chunkKey) || {}
@@ -733,6 +733,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     if (this.viewDistance === -1) throw new Error('viewDistance not set')
     this.reactiveState.world.mesherWork = true
     const distance = this.getDistance(pos)
+    // todo shouldnt we check loadedChunks instead?
     if (!this.workers.length || distance[0] > this.viewDistance || distance[1] > this.viewDistance) return
     const key = `${Math.floor(pos.x / 16) * 16},${Math.floor(pos.y / 16) * 16},${Math.floor(pos.z / 16) * 16}`
     // if (this.sectionsOutstanding.has(key)) return
diff --git a/renderer/viewer/three/threeJsMedia.ts b/renderer/viewer/three/threeJsMedia.ts
index 60ff4ac9..a004d44b 100644
--- a/renderer/viewer/three/threeJsMedia.ts
+++ b/renderer/viewer/three/threeJsMedia.ts
@@ -30,6 +30,11 @@ export class ThreeJsMedia {
   }>()
 
   constructor (private readonly worldRenderer: WorldRendererThree) {
+    worldRenderer.onWorldSwitched.push(() => {
+      for (const [id, videoData] of this.customMedia.entries()) {
+        this.destroyMedia(id)
+      }
+    })
   }
 
   private createErrorTexture (width: number, height: number, background = 0x00_00_00, error = 'Failed to load'): THREE.CanvasTexture {
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 31f68b10..cef405cc 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -49,6 +49,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   cameraShake: CameraShake
   media: ThreeJsMedia
   waitingChunksToDisplay = {} as { [chunkKey: string]: SectionKey[] }
+  camera: THREE.PerspectiveCamera
 
   get tilesRendered () {
     return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).tilesCount, 0)
@@ -80,6 +81,14 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.renderUpdateEmitter.on('chunkFinished', (chunkKey: string) => {
       this.finishChunk(chunkKey)
     })
+    this.worldSwitchActions()
+  }
+
+  worldSwitchActions () {
+    this.onWorldSwitched.push(() => {
+      // clear custom blocks
+      this.protocolCustomBlocks.clear()
+    })
   }
 
   updateEntity (e, isPosUpdate = false) {
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 2a26cc5a..7d99cb12 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -179,13 +179,30 @@ const registerMediaChannels = () => {
   ]
 
   // Register channels
-  bot._client.registerChannel(ADD_CHANNEL, addPacketStructure, true)
-  bot._client.registerChannel(PLAY_CHANNEL, noDataPacketStructure, true)
-  bot._client.registerChannel(PAUSE_CHANNEL, noDataPacketStructure, true)
-  bot._client.registerChannel(SEEK_CHANNEL, setNumberPacketStructure, true)
-  bot._client.registerChannel(VOLUME_CHANNEL, setNumberPacketStructure, true)
-  bot._client.registerChannel(SPEED_CHANNEL, setNumberPacketStructure, true)
-  bot._client.registerChannel(DESTROY_CHANNEL, noDataPacketStructure, true)
+  registerChannel(PLAY_CHANNEL, noDataPacketStructure, (data) => {
+    const { id } = data
+    getThreeJsRendererMethods()?.setVideoPlaying(id, true)
+  }, true)
+  registerChannel(PAUSE_CHANNEL, noDataPacketStructure, (data) => {
+    const { id } = data
+    getThreeJsRendererMethods()?.setVideoPlaying(id, false)
+  }, true)
+  registerChannel(SEEK_CHANNEL, setNumberPacketStructure, (data) => {
+    const { id, seconds } = data
+    getThreeJsRendererMethods()?.setVideoSeeking(id, seconds)
+  }, true)
+  registerChannel(VOLUME_CHANNEL, setNumberPacketStructure, (data) => {
+    const { id, volume } = data
+    getThreeJsRendererMethods()?.setVideoVolume(id, volume)
+  }, true)
+  registerChannel(SPEED_CHANNEL, setNumberPacketStructure, (data) => {
+    const { id, speed } = data
+    getThreeJsRendererMethods()?.setVideoSpeed(id, speed)
+  }, true)
+  registerChannel(DESTROY_CHANNEL, noDataPacketStructure, (data) => {
+    const { id } = data
+    getThreeJsRendererMethods()?.destroyMedia(id)
+  }, true)
 
   // Handle media add
   registerChannel(ADD_CHANNEL, addPacketStructure, (data) => {
@@ -207,42 +224,6 @@ const registerMediaChannels = () => {
     })
   })
 
-  // Handle media play
-  registerChannel(PLAY_CHANNEL, noDataPacketStructure, (data) => {
-    const { id } = data
-    getThreeJsRendererMethods()?.setVideoPlaying(id, true)
-  }, true)
-
-  // Handle media pause
-  registerChannel(PAUSE_CHANNEL, noDataPacketStructure, (data) => {
-    const { id } = data
-    getThreeJsRendererMethods()?.setVideoPlaying(id, false)
-  }, true)
-
-  // Handle media seek
-  registerChannel(SEEK_CHANNEL, setNumberPacketStructure, (data) => {
-    const { id, seconds } = data
-    getThreeJsRendererMethods()?.setVideoSeeking(id, seconds)
-  }, true)
-
-  // Handle media destroy
-  registerChannel(DESTROY_CHANNEL, noDataPacketStructure, (data) => {
-    const { id } = data
-    getThreeJsRendererMethods()?.destroyMedia(id)
-  }, true)
-
-  // Handle media volume
-  registerChannel(VOLUME_CHANNEL, setNumberPacketStructure, (data) => {
-    const { id, volume } = data
-    getThreeJsRendererMethods()?.setVideoVolume(id, volume)
-  }, true)
-
-  // Handle media speed
-  registerChannel(SPEED_CHANNEL, setNumberPacketStructure, (data) => {
-    const { id, speed } = data
-    getThreeJsRendererMethods()?.setVideoSpeed(id, speed)
-  }, true)
-
   // ---
 
   // Video interaction channel

From c5c9fd9bcdf755daedfa633d79e1a27a56eda053 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 31 Mar 2025 11:43:21 +0300
Subject: [PATCH 411/753] fix: fix name display on new versions in edge cases

---
 src/inventoryWindows.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 05e371ef..e3808152 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -245,7 +245,7 @@ const getItemName = (slot: Item | RenderItem | null) => {
   const parsed = getItemNameRaw(slot, appViewer.resourcesManager)
   if (!parsed) return
   // todo display full text renderer from sign renderer
-  const text = flat(parsed as MessageFormatPart).map(x => x.text)
+  const text = flat(parsed as MessageFormatPart).map(x => (typeof x === 'string' ? x : x.text))
   return text.join('')
 }
 

From 5af290ac4eaac5a8796c426ec68bdcfd7e094972 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 31 Mar 2025 11:49:05 +0300
Subject: [PATCH 412/753] also remove media on world remove, and stop

---
 README.MD                                   |  9 +++++++++
 renderer/viewer/lib/worldDataEmitter.ts     |  4 ++++
 renderer/viewer/lib/worldrendererCommon.ts  |  6 ++++++
 renderer/viewer/three/threeJsMedia.ts       | 18 ++++++++++++++----
 renderer/viewer/three/worldrendererThree.ts |  5 +++++
 5 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/README.MD b/README.MD
index 67e46333..ef65ca01 100644
--- a/README.MD
+++ b/README.MD
@@ -43,6 +43,15 @@ These browsers have issues with capturing pointer:
 **Opera Mini**: Disable *mouse gestures* in browsre settings to avoid opening new tab on right click hold
 **Vivaldi**: Disable Controls -> *Raw Input* in game settings if experiencing issues
 
+### Versions Support
+
+Server versions 1.8 - 1.21.4 are supported.
+First class versions (most of the features are tested on these versions):
+- 1.19.4
+- 1.21.4
+
+Versions below 1.13 are not tested currently and may not work correctly.
+
 ### World Loading
 
 Zip files and folders are supported. Just drag and drop them into the browser window. You can open folders in readonly and read-write mode. New chunks may be generated incorrectly for now.
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index f2004231..506f3844 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -29,6 +29,7 @@ export type WorldDataEmitterEvents = {
   loadChunk: (data: { x: number, z: number, chunk: any, blockEntities: any, worldConfig: any, isLightUpdate: boolean }) => void
   updateLight: (data: { pos: Vec3 }) => void
   onWorldSwitch: () => void
+  end: () => void
 }
 
 /**
@@ -124,6 +125,9 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
       respawn: () => {
         this.emitter.emit('onWorldSwitch')
       },
+      end: () => {
+        this.emitter.emit('end')
+      },
     } satisfies Partial<BotEvents>
 
 
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 1a846a21..8d89c6b7 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -618,6 +618,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       this.updateViewerPosition(pos)
     })
 
+    worldEmitter.on('end', () => {
+      this.worldStop?.()
+    })
+
 
     worldEmitter.on('renderDistance', (d) => {
       this.viewDistance = d
@@ -715,6 +719,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
   }
 
+  abstract worldStop? ()
+
   queueAwaited = false
   messagesQueue = {} as { [workerIndex: string]: any[] }
 
diff --git a/renderer/viewer/three/threeJsMedia.ts b/renderer/viewer/three/threeJsMedia.ts
index a004d44b..a8855f7c 100644
--- a/renderer/viewer/three/threeJsMedia.ts
+++ b/renderer/viewer/three/threeJsMedia.ts
@@ -30,13 +30,23 @@ export class ThreeJsMedia {
   }>()
 
   constructor (private readonly worldRenderer: WorldRendererThree) {
-    worldRenderer.onWorldSwitched.push(() => {
-      for (const [id, videoData] of this.customMedia.entries()) {
-        this.destroyMedia(id)
-      }
+    this.worldRenderer.onWorldSwitched.push(() => {
+      this.onWorldGone()
     })
   }
 
+  onWorldGone () {
+    for (const [id, videoData] of this.customMedia.entries()) {
+      this.destroyMedia(id)
+    }
+  }
+
+  onWorldStop () {
+    for (const [id, videoData] of this.customMedia.entries()) {
+      this.setVideoPlaying(id, false)
+    }
+  }
+
   private createErrorTexture (width: number, height: number, background = 0x00_00_00, error = 'Failed to load'): THREE.CanvasTexture {
     const canvas = document.createElement('canvas')
     const MAX_DIMENSION = 100
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index cef405cc..25a5afb4 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -622,8 +622,13 @@ export class WorldRendererThree extends WorldRendererCommon {
     }
   }
 
+  worldStop () {
+    this.media.onWorldStop()
+  }
+
   destroy (): void {
     removeAllStats()
+    this.media.onWorldGone()
     super.destroy()
   }
 }

From 4f45cd072ad31bb4ba6f0fcabd361fc3bea51e3c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 31 Mar 2025 13:16:57 +0300
Subject: [PATCH 413/753] fix(perf): dont load gui textures on panorama start
 in singlefile build fix: update textures in inventory & hotbar after textures
 load, including jei fix: one row of jei was out of the screen

---
 package.json                                |  2 +-
 pnpm-lock.yaml                              | 18 ++++-----
 renderer/viewer/lib/guiRenderer.ts          |  2 +
 renderer/viewer/lib/worldrendererCommon.ts  | 14 +++----
 renderer/viewer/three/panorama.ts           |  2 +-
 renderer/viewer/three/worldrendererThree.ts | 14 -------
 src/index.ts                                |  1 +
 src/inventoryWindows.ts                     | 43 ++++++++++++++-------
 src/resourcesManager.ts                     | 20 +++++++++-
 9 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/package.json b/package.json
index ed9cbec1..66e074cb 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.48",
+    "mc-assets": "^0.2.49",
     "mineflayer-mouse": "^0.1.7",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5f673776..a419da1d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -353,11 +353,11 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.48
-        version: 0.2.48
+        specifier: ^0.2.49
+        version: 0.2.49
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
-        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/69dee6aa15f7c8a6df2a2ab01972e6a7b2f9ee30(@types/react@18.2.20)(react@18.2.0)
+        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00(@types/react@18.2.20)(react@18.2.0)
       mineflayer:
         specifier: github:zardoy/mineflayer
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)
@@ -6694,8 +6694,8 @@ packages:
   maxrects-packer@2.7.3:
     resolution: {integrity: sha512-bG6qXujJ1QgttZVIH4WDanhoJtvbud/xP/XPyf6A69C9RdA61BM4TomFALCq2nrTa+tARRIBB4LuIFsnUQU2wA==}
 
-  mc-assets@0.2.48:
-    resolution: {integrity: sha512-ixFBAkdWuluBZ3RhWXvD+KyLX5jKAK8ksXJamAuJxc7nXHP6xK5rEAR3qQ7JVYh27USl3mE+GWTFy/aF0CGRYg==}
+  mc-assets@0.2.49:
+    resolution: {integrity: sha512-pFR43FqG1bxiQVLXX8c4LNA/7wcFRGDFFclsBM6tY8tKFNolKhwiSaLmV0xtFHEF6SZGv9g2hkMqxsbAzMD/6A==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.14:
@@ -6912,8 +6912,8 @@ packages:
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/69dee6aa15f7c8a6df2a2ab01972e6a7b2f9ee30:
-    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/69dee6aa15f7c8a6df2a2ab01972e6a7b2f9ee30}
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00:
+    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00}
     version: 1.0.1
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1:
@@ -17605,7 +17605,7 @@ snapshots:
 
   maxrects-packer@2.7.3: {}
 
-  mc-assets@0.2.48:
+  mc-assets@0.2.49:
     dependencies:
       maxrects-packer: 2.7.3
       zod: 3.24.1
@@ -17922,7 +17922,7 @@ snapshots:
 
   minecraft-folder-path@1.2.0: {}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/69dee6aa15f7c8a6df2a2ab01972e6a7b2f9ee30(@types/react@18.2.20)(react@18.2.0):
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00(@types/react@18.2.20)(react@18.2.0):
     dependencies:
       valtio: 1.11.2(@types/react@18.2.20)(react@18.2.0)
     transitivePeerDependencies:
diff --git a/renderer/viewer/lib/guiRenderer.ts b/renderer/viewer/lib/guiRenderer.ts
index bdfd805c..2689126e 100644
--- a/renderer/viewer/lib/guiRenderer.ts
+++ b/renderer/viewer/lib/guiRenderer.ts
@@ -11,6 +11,7 @@ import { getItemDefinition } from 'mc-assets/dist/itemDefinitions'
 
 export const activeGuiAtlas = proxy({
   atlas: null as null | { json, image },
+  version: 0
 })
 
 export const getNonFullBlocksModels = () => {
@@ -278,5 +279,6 @@ export const generateGuiAtlas = async () => {
   const itemImages = await generateItemsGui(itemsModelsResolved, true)
   console.timeEnd('generate items gui atlas')
   await generateAtlas({ ...blockImages, ...itemImages })
+  activeGuiAtlas.version++
   // await generateAtlas(blockImages)
 }
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 8d89c6b7..c0a0ff8d 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -183,7 +183,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     })
     if (this.wasChunkSentToWorker(chunkKey)) {
       const [x, y, z] = blockPos.split(',').map(Number)
-      this.setBlockStateId(new Vec3(x, y, z), undefined, false)
+      this.setBlockStateId(new Vec3(x, y, z), undefined)
     }
   }
 
@@ -722,7 +722,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   abstract worldStop? ()
 
   queueAwaited = false
-  messagesQueue = {} as { [workerIndex: string]: any[] }
+  toWorkerMessagesQueue = {} as { [workerIndex: string]: any[] }
 
   getWorkerNumber (pos: Vec3, updateAction = false) {
     if (updateAction) {
@@ -749,8 +749,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     // is always dispatched to the same worker
     const hash = this.getWorkerNumber(pos, useChangeWorker)
     this.sectionsWaiting.set(key, (this.sectionsWaiting.get(key) ?? 0) + 1)
-    this.messagesQueue[hash] ??= []
-    this.messagesQueue[hash].push({
+    this.toWorkerMessagesQueue[hash] ??= []
+    this.toWorkerMessagesQueue[hash].push({
       // this.workers[hash].postMessage({
       type: 'dirty',
       x: pos.x,
@@ -767,11 +767,11 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.queueAwaited = true
     setTimeout(() => {
       // group messages and send as one
-      for (const workerIndex in this.messagesQueue) {
+      for (const workerIndex in this.toWorkerMessagesQueue) {
         const worker = this.workers[Number(workerIndex)]
-        worker.postMessage(this.messagesQueue[workerIndex])
+        worker.postMessage(this.toWorkerMessagesQueue[workerIndex])
       }
-      this.messagesQueue = {}
+      this.toWorkerMessagesQueue = {}
       this.queueAwaited = false
     })
   }
diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
index 8f79ff54..682d25d2 100644
--- a/renderer/viewer/three/panorama.ts
+++ b/renderer/viewer/three/panorama.ts
@@ -124,7 +124,7 @@ export class PanoramaRenderer {
 
   async worldBlocksPanorama () {
     const version = '1.21.4'
-    this.options.resourcesManager.currentConfig = { version }
+    this.options.resourcesManager.currentConfig = { version, noInventoryGui: true, }
     await this.options.resourcesManager.updateAssetsData({ })
     if (this.abortController.signal.aborted) return
     console.time('load panorama scene')
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 25a5afb4..e705b2d1 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -299,20 +299,6 @@ export class WorldRendererThree extends WorldRendererCommon {
     //   this.debugRecomputedDeletedObjects++
     // }
 
-    // if (!this.initialChunksLoad && this.enableChunksLoadDelay) {
-    //   const newPromise = new Promise(resolve => {
-    //     if (this.droppedFpsPercentage > 0.5) {
-    //       setTimeout(resolve, 1000 / 50 * this.droppedFpsPercentage)
-    //     } else {
-    //       setTimeout(resolve)
-    //     }
-    //   })
-    //   this.promisesQueue.push(newPromise)
-    //   for (const promise of this.promisesQueue) {
-    //     await promise
-    //   }
-    // }
-
     const geometry = new THREE.BufferGeometry()
     geometry.setAttribute('position', new THREE.BufferAttribute(data.geometry.positions, 3))
     geometry.setAttribute('normal', new THREE.BufferAttribute(data.geometry.normals, 3))
diff --git a/src/index.ts b/src/index.ts
index d48429a2..623a88ac 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -702,6 +702,7 @@ export async function connect (connectOptions: ConnectOptions) {
           }
         })
       })
+      await appViewer.resourcesManager.promiseAssetsReady
     }
     console.log('try to focus window')
     window.focus?.()
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index e3808152..30299cf6 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -119,12 +119,13 @@ export const onGameLoad = () => {
 
   if (!appViewer.resourcesManager['_inventoryChangeTracked']) {
     appViewer.resourcesManager['_inventoryChangeTracked'] = true
-    const upWindowItems = () => {
+    const texturesChanged = () => {
       if (!lastWindow) return
       upWindowItemsLocal()
+      upJei(lastJeiSearch)
     }
-    appViewer.resourcesManager.on('assetsInventoryReady', () => upWindowItems())
-    appViewer.resourcesManager.on('assetsTexturesUpdated', () => upWindowItems())
+    appViewer.resourcesManager.on('assetsInventoryReady', () => texturesChanged())
+    appViewer.resourcesManager.on('assetsTexturesUpdated', () => texturesChanged())
   }
 }
 
@@ -176,6 +177,7 @@ const getImage = ({ path = undefined as string | undefined, texture = undefined
 
 export type ResolvedItemModelRender = {
   modelName: string,
+  originalItemName?: string
 }
 
 export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = false, fullBlockModelSupport = false): {
@@ -200,7 +202,8 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
   if (!fullBlockModelSupport) {
     const atlas = activeGuiAtlas.atlas?.json
     // todo atlas holds all rendered blocks, not all possibly rendered item/block models, need to request this on demand instead (this is how vanilla works)
-    const item = atlas?.textures[itemModelName.replace('minecraft:', '').replace('block/', '').replace('blocks/', '').replace('item/', '').replace('items/', '').replace('_inventory', '').replace('_bottom', '').replace('_height2', '').replace('_stable', '').replace('_unstable', '')]
+    const tryGetAtlasTexture = (name?: string) => name && atlas?.textures[name.replace('minecraft:', '').replace('block/', '').replace('blocks/', '').replace('item/', '').replace('items/', '').replace('_inventory', '')]
+    const item = tryGetAtlasTexture(itemModelName) ?? tryGetAtlasTexture(model.originalItemName)
     if (item) {
       const x = item.u * atlas.width
       const y = item.v * atlas.height
@@ -217,6 +220,7 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
     assertDefined(appViewer.resourcesManager.currentResources?.itemsRenderer)
     itemTexture =
       appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture(itemModelName, {}, false, fullBlockModelSupport)
+      ?? (model.originalItemName ? appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture(model.originalItemName, {}, false, fullBlockModelSupport) : undefined)
       ?? appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture('item/missing_texture')!
   } catch (err) {
     inGameError(`Failed to render item ${itemModelName} (original: ${originalItemName}) on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
@@ -249,20 +253,29 @@ const getItemName = (slot: Item | RenderItem | null) => {
   return text.join('')
 }
 
-let lastMappedSots = [] as any[]
+let lastMappedSlots = [] as any[]
 const itemToVisualKey = (slot: RenderItem | Item | null) => {
-  if (!slot) return null
-  return slot.name + slot['count'] + (slot['metadata'] ?? '-') + (slot.nbt ? JSON.stringify(slot.nbt) : '') + (slot['components'] ? JSON.stringify(slot['components']) : '')
+  if (!slot) return ''
+  const keys = [
+    slot.name,
+    slot['count'],
+    slot['metadata'],
+    slot.nbt ? JSON.stringify(slot.nbt) : '',
+    slot['components'] ? JSON.stringify(slot['components']) : '',
+    activeGuiAtlas.version,
+  ].join('|')
+  return keys
 }
 const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
   const newSlots = slots.map((slot, i) => {
-    // todo stateid
-    if (!slot) return
+    if (!slot) return null
 
     if (!isJei) {
-      const oldKey = itemToVisualKey(lastMappedSots[i])
-      if (oldKey && oldKey === itemToVisualKey(slot)) {
-        return lastMappedSots[i]
+      const oldKey = lastMappedSlots[i]?.cacheKey
+      const newKey = itemToVisualKey(slot)
+      slot['cacheKey'] = newKey
+      if (oldKey && oldKey === newKey) {
+        return lastMappedSlots[i]
       }
     }
 
@@ -270,7 +283,7 @@ const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
       if (slot.durabilityUsed && slot.maxDurability) slot.durabilityUsed = Math.min(slot.durabilityUsed, slot.maxDurability)
       const debugIsQuickbar = !isJei && i === bot.inventory.hotbarStart + bot.quickBarSlot
       const modelName = getItemModelName(slot, { 'minecraft:display_context': 'gui', }, appViewer.resourcesManager)
-      const slotCustomProps = renderSlot({ modelName }, debugIsQuickbar)
+      const slotCustomProps = renderSlot({ modelName, originalItemName: slot.name }, debugIsQuickbar)
       const itemCustomName = getItemName(slot)
       Object.assign(slot, { ...slotCustomProps, displayName: itemCustomName ?? slot.displayName })
       //@ts-expect-error
@@ -285,7 +298,7 @@ const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
     }
     return slot
   })
-  lastMappedSots = newSlots
+  lastMappedSlots = newSlots
   return newSlots
 }
 
@@ -331,7 +344,9 @@ const implementedContainersGuiMap = {
   'minecraft:villager': 'VillagerWin',
 }
 
+let lastJeiSearch = ''
 const upJei = (search: string) => {
+  lastJeiSearch = search
   search = search.toLowerCase()
   // todo fix pre flat
   const itemsArray = [
diff --git a/src/resourcesManager.ts b/src/resourcesManager.ts
index 5b3f403b..d4c1fe81 100644
--- a/src/resourcesManager.ts
+++ b/src/resourcesManager.ts
@@ -51,6 +51,7 @@ export interface ResourcesCurrentConfig {
   version: string
   texturesVersion?: string
   noBlockstatesModels?: boolean
+  noInventoryGui?: boolean
   includeOnlyBlocks?: string[]
 }
 
@@ -58,6 +59,7 @@ export interface UpdateAssetsRequest {
   _?: false
 }
 
+const STABLE_MODELS_VERSION = '1.21.4'
 export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<ResourceManagerEvents>) {
   // Source data (imported, not changing)
   sourceBlockStatesModels: any = null
@@ -69,6 +71,10 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
   currentResources: LoadedResources | undefined
   currentConfig: ResourcesCurrentConfig | undefined
   abortController = new AbortController()
+  _promiseAssetsReadyResolvers = Promise.withResolvers<void>()
+  get promiseAssetsReady () {
+    return this._promiseAssetsReadyResolvers.promise
+  }
 
   async loadMcData (version: string) {
     await loadMinecraftData(version)
@@ -85,6 +91,7 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
 
   async updateAssetsData (request: UpdateAssetsRequest, unstableSkipEvent = false) {
     if (!this.currentConfig) throw new Error('No config loaded')
+    this._promiseAssetsReadyResolvers = Promise.withResolvers()
     const abortController = new AbortController()
     await this.loadSourceData(this.currentConfig.version)
     if (abortController.signal.aborted) return
@@ -165,7 +172,7 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
       resources.worldBlockProvider = worldBlockProvider(
         resources.blockstatesModels,
         resources.blocksAtlasParser.atlas,
-        'latest'
+        STABLE_MODELS_VERSION
       )
     }
 
@@ -174,8 +181,17 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
     this.currentResources = resources
     if (!unstableSkipEvent) { // todo rework resourcepack optimization
       this.emit('assetsTexturesUpdated')
+    }
+
+    if (this.currentConfig.noInventoryGui) {
+      this._promiseAssetsReadyResolvers.resolve()
+    } else {
       void this.generateGuiTextures().then(() => {
-        this.emit('assetsInventoryReady')
+        if (abortController.signal.aborted) return
+        if (!unstableSkipEvent) {
+          this.emit('assetsInventoryReady')
+        }
+        this._promiseAssetsReadyResolvers.resolve()
       })
     }
   }

From f89530438001e113be6d2abc1d3b7249edfd604b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 31 Mar 2025 13:32:40 +0300
Subject: [PATCH 414/753] add debug method and fix f3 custom block name display

---
 renderer/viewer/lib/mesher/mesher.ts       |  7 +++++++
 renderer/viewer/lib/worldrendererCommon.ts | 18 ++++++++++++++++++
 src/react/DebugOverlay.tsx                 |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index 42432a6d..01a89fd8 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -141,6 +141,13 @@ const handleMessage = data => {
 
       break
     }
+    case 'getCustomBlockModel': {
+      const pos = new Vec3(data.pos.x, data.pos.y, data.pos.z)
+      const chunkKey = `${Math.floor(pos.x / 16) * 16},${Math.floor(pos.z / 16) * 16}`
+      const customBlockModel = world.customBlockModels.get(chunkKey)?.[`${pos.x},${pos.y},${pos.z}`]
+      global.postMessage({ type: 'customBlockModel', chunkKey, customBlockModel })
+      break
+    }
   // No default
   }
 }
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index c0a0ff8d..c91bf066 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -735,6 +735,24 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     return hash + 1
   }
 
+  async debugGetWorkerCustomBlockModel (pos: Vec3) {
+    const data = [] as Array<Promise<string>>
+    for (const worker of this.workers) {
+      data.push(new Promise((resolve) => {
+        worker.addEventListener('message', (e) => {
+          if (e.data.type === 'customBlockModel') {
+            resolve(e.data.customBlockModel)
+          }
+        })
+      }))
+      worker.postMessage({
+        type: 'getCustomBlockModel',
+        pos
+      })
+    }
+    return Promise.all(data)
+  }
+
   setSectionDirty (pos: Vec3, value = true, useChangeWorker = false) { // value false is used for unloading chunks
     if (this.viewDistance === -1) throw new Error('viewDistance not set')
     this.reactiveState.world.mesherWork = true
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index 26f341f4..1aff4a0e 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -141,7 +141,7 @@ export default () => {
         setBlockInfo(null)
         return
       }
-      const { customBlockName, modelInfo } = await getThreeJsRendererMethods()?.getBlockInfo(pos, block.stateId) ?? {}
+      const { customBlockName, modelInfo } = await getThreeJsRendererMethods()?.getBlockInfo(block.position, block.stateId) ?? {}
       setBlockInfo({ customBlockName, modelInfo })
     }, 300)
 

From 394a12b147c7586fbca6b07e5dcf8a2d10678b6f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 31 Mar 2025 14:08:56 +0300
Subject: [PATCH 415/753] fix(important): fix physics crash in powder snow and
 pink petals

---
 src/interactionShapesGenerated.json | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/interactionShapesGenerated.json b/src/interactionShapesGenerated.json
index 8c8c283e..afd3ce0f 100644
--- a/src/interactionShapesGenerated.json
+++ b/src/interactionShapesGenerated.json
@@ -457,7 +457,14 @@
         13,
         14
     ],
-    "powder_snow": "PowderSnowBlock",
+    "powder_snow": [
+        0,
+        0,
+        0,
+        16,
+        16,
+        16
+    ],
     "spore_blossom": [
         2,
         13,
@@ -6547,7 +6554,6 @@
         16,
         15
     ],
-    "pink_petals": "PinkPetalsBlock",
     "big_dripleaf_stem": {
         "facing=north": [
             5,

From 70fbe1b0e28bcb70bc200958452008827a26ad22 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 31 Mar 2025 22:06:30 +0300
Subject: [PATCH 416/753] dont clip edition

---
 src/react/mainMenu.module.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/react/mainMenu.module.css b/src/react/mainMenu.module.css
index 8e303c3b..897144e7 100644
--- a/src/react/mainMenu.module.css
+++ b/src/react/mainMenu.module.css
@@ -48,7 +48,8 @@
     left: calc((512px / 2 - 176px / 2) / 2);
     background-image: url('../../assets/edition.png');
     background-size: 128px;
-    width: 88px;
+    background-repeat: no-repeat;
+    width: 100%;
     height: 14px;
 }
 

From d78a8b1220903d8c17a860c76f1e0824f566d1c9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 31 Mar 2025 22:55:17 +0300
Subject: [PATCH 417/753] add mesher logging functionality for advanced
 debugging on other client end

---
 renderer/viewer/lib/mesher/mesher.ts       |  4 +--
 renderer/viewer/lib/worldDataEmitter.ts    |  2 +-
 renderer/viewer/lib/worldrendererCommon.ts | 42 ++++++++++++++++++++--
 renderer/viewer/three/graphicsBackend.ts   |  1 +
 src/builtinCommands.ts                     |  8 +++++
 5 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index 01a89fd8..ed595fd5 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -53,7 +53,7 @@ function setSectionDirty (pos, value = true) {
   const key = sectionKey(x, y, z)
   if (!value) {
     dirtySections.delete(key)
-    postMessage({ type: 'sectionFinished', key })
+    postMessage({ type: 'sectionFinished', key, workerIndex })
     return
   }
 
@@ -61,7 +61,7 @@ function setSectionDirty (pos, value = true) {
   if (chunk?.getSection(pos)) {
     dirtySections.set(key, (dirtySections.get(key) || 0) + 1)
   } else {
-    postMessage({ type: 'sectionFinished', key })
+    postMessage({ type: 'sectionFinished', key, workerIndex })
   }
 }
 
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 506f3844..981b1851 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -26,7 +26,7 @@ export type WorldDataEmitterEvents = {
   listening: () => void
   markAsLoaded: (data: { x: number, z: number }) => void
   unloadChunk: (data: { x: number, z: number }) => void
-  loadChunk: (data: { x: number, z: number, chunk: any, blockEntities: any, worldConfig: any, isLightUpdate: boolean }) => void
+  loadChunk: (data: { x: number, z: number, chunk: string, blockEntities: any, worldConfig: any, isLightUpdate: boolean }) => void
   updateLight: (data: { pos: Vec3 }) => void
   onWorldSwitch: () => void
   end: () => void
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index c91bf066..0c00c179 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -137,6 +137,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   abortController = new AbortController()
   lastRendered = 0
   renderingActive = true
+  workerLogger = {
+    contents: [] as string[],
+    active: new URL(location.href).searchParams.get('mesherlog') === 'true'
+  }
 
   constructor (public readonly resourcesManager: ResourcesManager, public displayOptions: DisplayWorldOptions, public version: string) {
     // this.initWorkers(1) // preload script on page load
@@ -153,6 +157,11 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.connect(this.displayOptions.worldView)
   }
 
+  logWorkerWork (message: string | (() => string)) {
+    if (!this.workerLogger.active) return
+    this.workerLogger.contents.push(typeof message === 'function' ? message() : message)
+  }
+
   init () {
     if (this.active) throw new Error('WorldRendererCommon is already initialized')
     void this.setVersion(this.version).then(() => {
@@ -181,6 +190,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       ...this.protocolCustomBlocks.get(chunkKey),
       [blockPos]: model
     })
+    this.logWorkerWork(() => `-> updateCustomBlock ${chunkKey} ${blockPos} ${model} ${this.wasChunkSentToWorker(chunkKey)}`)
     if (this.wasChunkSentToWorker(chunkKey)) {
       const [x, y, z] = blockPos.split(',').map(Number)
       this.setBlockStateId(new Vec3(x, y, z), undefined)
@@ -221,19 +231,22 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         } else {
           this.messageQueue.push(data)
         }
-        void this.processMessageQueue()
+        void this.processMessageQueue('worker')
       }
       if (worker.on) worker.on('message', (data) => { worker.onmessage({ data }) })
       this.workers.push(worker)
     }
   }
 
-  async processMessageQueue () {
+  async processMessageQueue (source: string) {
     if (this.isProcessingQueue || this.messageQueue.length === 0) return
+    this.logWorkerWork(`# ${source} processing queue`)
     if (this.lastRendered && performance.now() - this.lastRendered > 30 && this.worldRendererConfig._experimentalSmoothChunkLoading && this.renderingActive) {
+      const start = performance.now()
       await new Promise(resolve => {
         requestAnimationFrame(resolve)
       })
+      this.logWorkerWork(`# processing got delayed by ${performance.now() - start}ms`)
     }
     this.isProcessingQueue = true
 
@@ -251,7 +264,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         if (this.messageQueue.length > 0) {
           requestAnimationFrame(async () => {
             this.isProcessingQueue = false
-            void this.processMessageQueue()
+            void this.processMessageQueue('queue-delay')
           })
           return
         }
@@ -268,6 +281,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       this.handleWorkerMessage(data)
     }
     if (data.type === 'geometry') {
+      this.logWorkerWork(() => `-> ${data.workerIndex} geometry ${data.key} ${JSON.stringify({ dataSize: JSON.stringify(data).length })}`)
       this.geometryReceiveCount[data.workerIndex] ??= 0
       this.geometryReceiveCount[data.workerIndex]++
       const geometry = data.geometry as MesherGeometryOutput
@@ -276,6 +290,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       this.lastChunkDistance = Math.max(...this.getDistance(new Vec3(chunkCoords[0], 0, chunkCoords[2])))
     }
     if (data.type === 'sectionFinished') { // on after load & unload section
+      this.logWorkerWork(`-> ${data.workerIndex} sectionFinished ${data.key} ${JSON.stringify({ processTime: data.processTime })}`)
       if (!this.sectionsWaiting.has(data.key)) throw new Error(`sectionFinished event for non-outstanding section ${data.key}`)
       this.sectionsWaiting.set(data.key, this.sectionsWaiting.get(data.key)! - 1)
       if (this.sectionsWaiting.get(data.key) === 0) {
@@ -336,6 +351,13 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
   }
 
+  downloadMesherLog () {
+    const a = document.createElement('a')
+    a.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(this.workerLogger.contents.join('\n'))
+    a.download = 'mesher.log'
+    a.click()
+  }
+
   checkAllFinished () {
     if (this.sectionsWaiting.size === 0) {
       this.reactiveState.world.mesherWork = false
@@ -446,6 +468,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     for (const worker of this.workers) {
       worker.postMessage({ type: 'mcData', mcData, config: this.getMesherConfig() })
     }
+    this.logWorkerWork('# mcData sent')
   }
 
   async updateAssetsData () {
@@ -466,6 +489,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       })
     }
 
+    this.logWorkerWork('# mesherData sent')
     console.log('textures loaded')
   }
 
@@ -502,6 +526,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         customBlockModels: customBlockModels || undefined
       })
     }
+    this.logWorkerWork(`-> chunk ${JSON.stringify({ x, z, chunkLength: chunk.length, customBlockModelsLength: customBlockModels ? Object.keys(customBlockModels).length : 0 })}`)
     for (let y = this.worldMinYRender; y < this.worldSizeParams.worldHeight; y += 16) {
       const loc = new Vec3(x, y, z)
       this.setSectionDirty(loc)
@@ -517,6 +542,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   markAsLoaded (x, z) {
     this.loadedChunks[`${x},${z}`] = true
     this.finishedChunks[`${x},${z}`] = true
+    this.logWorkerWork(`-> markAsLoaded ${JSON.stringify({ x, z })}`)
     this.checkAllFinished()
   }
 
@@ -525,6 +551,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     for (const worker of this.workers) {
       worker.postMessage({ type: 'unloadChunk', x, z })
     }
+    this.logWorkerWork(`-> unloadChunk ${JSON.stringify({ x, z })}`)
     delete this.finishedChunks[`${x},${z}`]
     this.allChunksFinished = Object.keys(this.finishedChunks).length === this.chunksLength
     if (!this.allChunksFinished) {
@@ -539,6 +566,11 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     delete this.highestBlocksByChunks[`${x},${z}`]
 
     this.updateChunksStats()
+
+    if (Object.keys(this.loadedChunks).length === 0) {
+      this.workerLogger.contents = []
+      this.logWorkerWork('# all chunks unloaded. New log started')
+    }
   }
 
   setBlockStateId (pos: Vec3, stateId: number | undefined, needAoRecalculation = true) {
@@ -685,6 +717,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         customBlockModels
       })
     }
+    this.logWorkerWork(`-> blockUpdate ${JSON.stringify({ pos, stateId, customBlockModels })}`)
     this.setSectionDirty(pos, true, true)
     if (this.neighborChunkUpdates) {
       if ((pos.x & 15) === 0) this.setSectionDirty(pos.offset(-16, 0, 0), true, true)
@@ -788,6 +821,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       for (const workerIndex in this.toWorkerMessagesQueue) {
         const worker = this.workers[Number(workerIndex)]
         worker.postMessage(this.toWorkerMessagesQueue[workerIndex])
+        for (const message of this.toWorkerMessagesQueue[workerIndex]) {
+          this.logWorkerWork(`-> ${workerIndex} dispatchMessages ${message.type} ${JSON.stringify({ x: message.x, y: message.y, z: message.z, value: message.value })}`)
+        }
       }
       this.toWorkerMessagesQueue = {}
       this.queueAwaited = false
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index a3a4c156..06b17d2f 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -34,6 +34,7 @@ const getBackendMethods = (worldRenderer: WorldRendererThree) => {
 
     shakeFromDamage: worldRenderer.cameraShake.shakeFromDamage.bind(worldRenderer.cameraShake),
     onPageInteraction: worldRenderer.media.onPageInteraction.bind(worldRenderer.media),
+    downloadMesherLog: worldRenderer.downloadMesherLog.bind(worldRenderer),
   }
 }
 
diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts
index 278ff57f..9e971e22 100644
--- a/src/builtinCommands.ts
+++ b/src/builtinCommands.ts
@@ -1,6 +1,7 @@
 import fs from 'fs'
 import { join } from 'path'
 import JSZip from 'jszip'
+import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import { readLevelDat } from './loadSave'
 import { closeWan, openToWanAndCopyJoinLink } from './localServerMultiplayer'
 import { copyFilesAsync, uniqueFileNameFromWorldName } from './browserfs'
@@ -129,6 +130,13 @@ export const commands: Array<{
       await navigator.clipboard.writeText(formatted)
       writeText(`Copied position to clipboard: ${formatted}`)
     }
+  },
+  {
+    command: ['/mesherlog'],
+    alwaysAvailable: true,
+    invoke () {
+      getThreeJsRendererMethods()?.downloadMesherLog()
+    }
   }
 ]
 //@ts-format-ignore-endregion

From dbfadde04445b4b51c5597e035275d1f06d1cb08 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 5 Apr 2025 11:15:39 +0300
Subject: [PATCH 418/753] fix(renderer): rendering of ALL blocks of north side
 was not correct. Fix texture flipping

---
 package.json                                  |  2 +-
 pnpm-lock.yaml                                | 36 +++++++++----------
 .../viewer/lib/mesher/modelsGeometryCommon.ts |  8 ++---
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index 66e074cb..c20a781d 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.49",
+    "mc-assets": "^0.2.50",
     "mineflayer-mouse": "^0.1.7",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a419da1d..a4a86dd8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -353,8 +353,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.49
-        version: 0.2.49
+        specifier: ^0.2.50
+        version: 0.2.50
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00(@types/react@18.2.20)(react@18.2.0)
@@ -438,7 +438,7 @@ importers:
         version: 1.3.6
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
         version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
@@ -6694,8 +6694,8 @@ packages:
   maxrects-packer@2.7.3:
     resolution: {integrity: sha512-bG6qXujJ1QgttZVIH4WDanhoJtvbud/xP/XPyf6A69C9RdA61BM4TomFALCq2nrTa+tARRIBB4LuIFsnUQU2wA==}
 
-  mc-assets@0.2.49:
-    resolution: {integrity: sha512-pFR43FqG1bxiQVLXX8c4LNA/7wcFRGDFFclsBM6tY8tKFNolKhwiSaLmV0xtFHEF6SZGv9g2hkMqxsbAzMD/6A==}
+  mc-assets@0.2.50:
+    resolution: {integrity: sha512-X27KLLTyeEAVTlBVKqGmoG/YvZq3tDG29kyRgy3Hj9s03m6+/TI8HvCyxumRjEQE8IYPcjPiX+7iuEZtNQ9N+w==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.14:
@@ -17605,7 +17605,7 @@ snapshots:
 
   maxrects-packer@2.7.3: {}
 
-  mc-assets@0.2.49:
+  mc-assets@0.2.50:
     dependencies:
       maxrects-packer: 2.7.3
       zod: 3.24.1
@@ -18043,7 +18043,7 @@ snapshots:
   mineflayer-pathfinder@2.4.4:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-entity: 2.3.1
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
@@ -18055,7 +18055,7 @@ snapshots:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.10.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
@@ -18078,7 +18078,7 @@ snapshots:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.10.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
@@ -18867,7 +18867,7 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-registry: 1.11.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0):
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
     dependencies:
       minecraft-data: 3.83.1
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
@@ -18875,19 +18875,17 @@ snapshots:
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.11.0
-    transitivePeerDependencies:
-      - prismarine-registry
 
   prismarine-chat@1.10.1:
     dependencies:
       mojangson: 2.0.4
-      prismarine-nbt: 2.5.0
+      prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
 
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
@@ -18920,12 +18918,12 @@ snapshots:
   prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-nbt: 2.5.0
+      prismarine-nbt: 2.7.0
       vec3: 0.1.10
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-nbt: 2.5.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -18949,13 +18947,13 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
-      prismarine-nbt: 2.5.0
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-nbt: 2.7.0
 
   prismarine-schematic@1.2.3:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.5.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.10
diff --git a/renderer/viewer/lib/mesher/modelsGeometryCommon.ts b/renderer/viewer/lib/mesher/modelsGeometryCommon.ts
index 2aec00e2..3df20556 100644
--- a/renderer/viewer/lib/mesher/modelsGeometryCommon.ts
+++ b/renderer/viewer/lib/mesher/modelsGeometryCommon.ts
@@ -122,10 +122,10 @@ export const elemFaces = {
     mask1: [1, 0, 1],
     mask2: [0, 1, 1],
     corners: [
-      [1, 0, 0, 0, 1],
-      [0, 0, 0, 1, 1],
-      [1, 1, 0, 0, 0],
-      [0, 1, 0, 1, 0]
+      [1, 0, 0, 1, 1],
+      [0, 0, 0, 0, 1],
+      [1, 1, 0, 1, 0],
+      [0, 1, 0, 0, 0]
     ]
   },
   south: {

From 04c37c1eef823cbba2dd49bdec2c7c0d8530daf0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 5 Apr 2025 18:37:21 +0300
Subject: [PATCH 419/753] fix: fix durability is nan

---
 src/inventoryWindows.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 30299cf6..7b5cd951 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -258,6 +258,8 @@ const itemToVisualKey = (slot: RenderItem | Item | null) => {
   if (!slot) return ''
   const keys = [
     slot.name,
+    slot.durabilityUsed,
+    slot.maxDurability,
     slot['count'],
     slot['metadata'],
     slot.nbt ? JSON.stringify(slot.nbt) : '',

From c025a1c75a158a85b4bfc8656ffccc84ae28e36e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 5 Apr 2025 18:55:59 +0300
Subject: [PATCH 420/753] fix a lot annoying sentry errors

---
 renderer/viewer/lib/mesher/mesher.ts | 4 ++--
 src/inventoryWindows.ts              | 6 +++++-
 src/react/MinimapProvider.tsx        | 9 +++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index ed595fd5..21e2d8ef 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -122,12 +122,12 @@ const handleMessage = data => {
     case 'blockUpdate': {
       const loc = new Vec3(data.pos.x, data.pos.y, data.pos.z).floored()
       if (data.stateId !== undefined && data.stateId !== null) {
-        world.setBlockStateId(loc, data.stateId)
+        world?.setBlockStateId(loc, data.stateId)
       }
 
       const chunkKey = `${Math.floor(loc.x / 16) * 16},${Math.floor(loc.z / 16) * 16}`
       if (data.customBlockModels) {
-        world.customBlockModels.set(chunkKey, data.customBlockModels)
+        world?.customBlockModels.set(chunkKey, data.customBlockModels)
       }
       break
     }
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 7b5cd951..40b0e4d7 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -275,7 +275,7 @@ const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
     if (!isJei) {
       const oldKey = lastMappedSlots[i]?.cacheKey
       const newKey = itemToVisualKey(slot)
-      slot['cacheKey'] = newKey
+      slot['cacheKey'] = i + '|' + newKey
       if (oldKey && oldKey === newKey) {
         return lastMappedSlots[i]
       }
@@ -478,6 +478,10 @@ const openWindow = (type: string | undefined) => {
     }
   }
   lastWindow.pwindow.onJeiClick = (slotItem, _index, isRightclick) => {
+    if (versionToNumber(bot.version) < versionToNumber('1.13')) {
+      alert('Item give is broken on 1.12.2 and below, we are working on it!')
+      return
+    }
     // slotItem is the slot from mapSlots
     const itemId = loadedData.itemsByName[slotItem.name]?.id
     if (!itemId) {
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
index fcd23f97..0e9cd943 100644
--- a/src/react/MinimapProvider.tsx
+++ b/src/react/MinimapProvider.tsx
@@ -80,8 +80,13 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
         const readZ = chunkZ % 32 < 0 ? 32 + chunkZ % 32 : chunkZ % 32
         console.log('heightmap check begun', readX, readZ)
         void this.regions.get(regionKey)?.read(readX, readZ)?.then((rawChunk) => {
-          const chunk = simplify(rawChunk as any)
-          const heightmap = findHeightMap(chunk)
+          let heightmap: number[] | undefined
+          try {
+            const chunk = simplify(rawChunk as any)
+            heightmap = findHeightMap(chunk)
+          } catch (err) {
+            console.warn('error getting heightmap', err)
+          }
           if (heightmap) {
             this.isBuiltinHeightmapAvailable = true
             this.loadChunkFullmap = this.loadChunkFromRegion

From 908fa64f2fbeb8a776a51900a9c1cbc816d28c51 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sun, 6 Apr 2025 00:22:27 +0300
Subject: [PATCH 421/753] pick most of changes from webgpu for better stability
 (#322)

---
 package.json                                |  2 +-
 pnpm-lock.yaml                              | 22 +++---
 renderer/viewer/lib/basePlayerState.ts      |  6 +-
 renderer/viewer/lib/worldDataEmitter.ts     |  8 ++-
 renderer/viewer/lib/worldrendererCommon.ts  | 29 ++++++--
 renderer/viewer/three/graphicsBackend.ts    |  1 +
 renderer/viewer/three/holdingBlock.ts       |  2 +-
 renderer/viewer/three/worldrendererThree.ts | 20 ++----
 src/appViewer.ts                            | 44 ++++++++----
 src/appViewerLoad.ts                        | 34 +++++++++
 src/builtinCommands.ts                      |  9 +--
 src/controls.ts                             | 15 ++--
 src/core/timers.ts                          |  6 +-
 src/devtools.ts                             |  5 +-
 src/globals.d.ts                            | 13 ++++
 src/globals.js                              |  1 +
 src/googledrive.ts                          |  3 +-
 src/index.ts                                | 33 ++-------
 src/loadSave.ts                             |  4 +-
 src/optionsGuiScheme.tsx                    | 12 ++--
 src/optionsStorage.ts                       | 20 ++++--
 src/packetsReplay/replayPackets.ts          |  2 +-
 src/react/AppStatusProvider.tsx             | 36 ++++++++--
 src/react/ButtonWithTooltip.tsx             |  7 +-
 src/react/DebugOverlay.module.css           |  4 +-
 src/react/MainMenuRenderApp.tsx             |  8 ++-
 src/react/PauseScreen.tsx                   |  7 +-
 src/resourcesManager.ts                     | 76 ++++++++++++---------
 src/shims/empty.ts                          |  2 +
 src/shims/fs.js                             | 11 ++-
 src/shims/perf_hooks_replacement.js         |  2 +-
 src/utils.ts                                | 14 +++-
 src/watchOptions.ts                         |  6 +-
 src/water.ts                                |  6 +-
 34 files changed, 305 insertions(+), 165 deletions(-)
 create mode 100644 src/appViewerLoad.ts

diff --git a/package.json b/package.json
index c20a781d..94bcedf5 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.50",
+    "mc-assets": "^0.2.52",
     "mineflayer-mouse": "^0.1.7",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a4a86dd8..24c4e332 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -353,8 +353,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.50
-        version: 0.2.50
+        specifier: ^0.2.52
+        version: 0.2.52
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00(@types/react@18.2.20)(react@18.2.0)
@@ -3546,6 +3546,9 @@ packages:
     engines: {node: '>=8'}
     hasBin: true
 
+  '@zardoy/maxrects-packer@2.7.4':
+    resolution: {integrity: sha512-ZIDcSdtSg6EhKFxGYWCcTnA/0YVbpixBL+psUS6ncw4IvdDF5hWauMU3XeCfYwrT/88QFgAq/Pafxt+P9OJyoQ==}
+
   '@zardoy/react-util@0.2.4':
     resolution: {integrity: sha512-YRBbXi54QOgWGDSn3NLEMMGrWbfL/gn2khxO31HT0WPFB6IW2rSnB4hcy+S/nc+2D6PRNq4kQxGs4vTAe4a7Xg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -6691,11 +6694,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  maxrects-packer@2.7.3:
-    resolution: {integrity: sha512-bG6qXujJ1QgttZVIH4WDanhoJtvbud/xP/XPyf6A69C9RdA61BM4TomFALCq2nrTa+tARRIBB4LuIFsnUQU2wA==}
-
-  mc-assets@0.2.50:
-    resolution: {integrity: sha512-X27KLLTyeEAVTlBVKqGmoG/YvZq3tDG29kyRgy3Hj9s03m6+/TI8HvCyxumRjEQE8IYPcjPiX+7iuEZtNQ9N+w==}
+  mc-assets@0.2.52:
+    resolution: {integrity: sha512-6mUI63fcUIjB0Ghjls7bLMnse2XUgvhPajsFkRQf10PcXYbfS/OAnX51X8sNx2pzfoHSlA81U7v+v906YwoAUw==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.14:
@@ -13688,6 +13688,8 @@ snapshots:
       - encoding
       - supports-color
 
+  '@zardoy/maxrects-packer@2.7.4': {}
+
   '@zardoy/react-util@0.2.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       classnames: 2.5.1
@@ -17603,11 +17605,9 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  maxrects-packer@2.7.3: {}
-
-  mc-assets@0.2.50:
+  mc-assets@0.2.52:
     dependencies:
-      maxrects-packer: 2.7.3
+      maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.1
 
   mcraft-fun-mineflayer@0.1.14(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)):
diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index 3384f0b4..93f4f6ce 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -2,7 +2,7 @@ import { EventEmitter } from 'events'
 import { Vec3 } from 'vec3'
 import TypedEmitter from 'typed-emitter'
 import { ItemSelector } from 'mc-assets/dist/itemDefinitions'
-import { proxy } from 'valtio'
+import { proxy, ref } from 'valtio'
 import { GameMode } from 'mineflayer'
 import { HandItemBlock } from '../three/holdingBlock'
 
@@ -34,6 +34,7 @@ export interface IPlayerState {
   reactive: {
     playerSkin: string | undefined
     inWater: boolean
+    waterBreathing: boolean
     backgroundColor: [number, number, number]
     ambientLight: number
     directionalLight: number
@@ -45,7 +46,8 @@ export class BasePlayerState implements IPlayerState {
   reactive = proxy({
     playerSkin: undefined as string | undefined,
     inWater: false,
-    backgroundColor: [0, 0, 0] as [number, number, number],
+    waterBreathing: false,
+    backgroundColor: ref([0, 0, 0]) as [number, number, number],
     ambientLight: 0,
     directionalLight: 0,
   })
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 981b1851..b7c2139f 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -41,9 +41,10 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
   private readonly lastPos: Vec3
   private eventListeners: Record<string, any> = {}
   private readonly emitter: WorldDataEmitter
-  keepChunksDistance = 0
   addWaitTime = 1
-  isPlayground = false
+  /* config */ keepChunksDistance = 0
+  /* config */ isPlayground = false
+  /* config */ allowPositionUpdate = true
 
   public reactive = proxy({
     cursorBlock: null as Vec3 | null,
@@ -165,6 +166,8 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
         console.error('error processing entity', err)
       }
     }
+
+    void this.init(bot.entity.position)
   }
 
   removeListenersFromBot (bot: import('mineflayer').Bot) {
@@ -253,6 +256,7 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
   }
 
   async updatePosition (pos: Vec3, force = false) {
+    if (!this.allowPositionUpdate) return
     const [lastX, lastZ] = chunkPos(this.lastPos)
     const [botX, botZ] = chunkPos(pos)
     if (lastX !== botX || lastZ !== botZ || force) {
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 0c00c179..0225bb87 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -7,6 +7,7 @@ import TypedEmitter from 'typed-emitter'
 import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import { generateSpiralMatrix } from 'flying-squid/dist/utils'
+import { subscribeKey } from 'valtio/utils'
 import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
 import { toMajorVersion } from '../../../src/utils'
 import { ResourcesManager } from '../../../src/resourcesManager'
@@ -15,7 +16,7 @@ import { SoundSystem } from '../three/threeJsSound'
 import { buildCleanupDecorator } from './cleanupDecorator'
 import { HighestBlockInfo, MesherGeometryOutput, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig } from './mesher/shared'
 import { chunkPos } from './simpleUtils'
-import { removeStat, updateStatText } from './ui/newStats'
+import { removeAllStats, removeStat, updateStatText } from './ui/newStats'
 import { WorldDataEmitter } from './worldDataEmitter'
 import { IPlayerState } from './basePlayerState'
 
@@ -105,7 +106,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   workersProcessAverageTime = 0
   workersProcessAverageTimeCount = 0
   maxWorkersProcessTime = 0
-  geometryReceiveCount = {}
+  geometryReceiveCount = {} as Record<number, number>
   allLoadedIn: undefined | number
   onWorldSwitched = [] as Array<() => void>
 
@@ -137,6 +138,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   abortController = new AbortController()
   lastRendered = 0
   renderingActive = true
+  geometryReceiveCountPerSec = 0
   workerLogger = {
     contents: [] as string[],
     active: new URL(location.href).searchParams.get('mesherlog') === 'true'
@@ -155,6 +157,12 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     })
 
     this.connect(this.displayOptions.worldView)
+
+    setInterval(() => {
+      this.geometryReceiveCountPerSec = Object.values(this.geometryReceiveCount).reduce((acc, curr) => acc + curr, 0)
+      this.geometryReceiveCount = {}
+      this.updateChunksStats()
+    }, 1000)
   }
 
   logWorkerWork (message: string | (() => string)) {
@@ -164,6 +172,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   init () {
     if (this.active) throw new Error('WorldRendererCommon is already initialized')
+    this.watchReactivePlayerState()
     void this.setVersion(this.version).then(() => {
       this.resourcesManager.on('assetsTexturesUpdated', () => {
         if (!this.active) return
@@ -238,6 +247,17 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
   }
 
+  onReactiveValueUpdated<T extends keyof typeof this.displayOptions.playerState.reactive>(key: T, callback: (value: typeof this.displayOptions.playerState.reactive[T]) => void) {
+    callback(this.displayOptions.playerState.reactive[key])
+    subscribeKey(this.displayOptions.playerState.reactive, key, callback)
+  }
+
+  watchReactivePlayerState () {
+    this.onReactiveValueUpdated('backgroundColor', (value) => {
+      this.changeBackgroundColor(value)
+    })
+  }
+
   async processMessageQueue (source: string) {
     if (this.isProcessingQueue || this.messageQueue.length === 0) return
     this.logWorkerWork(`# ${source} processing queue`)
@@ -503,7 +523,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.displayOptions.nonReactiveState.world.chunksTotalNumber = this.chunksLength
     this.reactiveState.world.allChunksLoaded = this.allChunksFinished
 
-    updateStatText('downloaded-chunks', `${Object.keys(this.loadedChunks).length}/${this.chunksLength} chunks D (${this.workers.length}:${this.workersProcessAverageTime.toFixed(0)}ms/${this.allLoadedIn?.toFixed(1) ?? '-'}s)`)
+    updateStatText('downloaded-chunks', `${Object.keys(this.loadedChunks).length}/${this.chunksLength} chunks D (${this.workers.length}:${this.workersProcessAverageTime.toFixed(0)}ms/${this.geometryReceiveCountPerSec}ss/${this.allLoadedIn?.toFixed(1) ?? '-'}s)`)
   }
 
   addColumn (x: number, z: number, chunk: any, isLightUpdate: boolean) {
@@ -884,7 +904,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.renderUpdateEmitter.removeAllListeners()
     this.displayOptions.worldView.removeAllListeners() // todo
     this.abortController.abort()
-    removeStat('chunks-loaded')
-    removeStat('chunks-read')
+    removeAllStats()
   }
 }
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index 06b17d2f..3ee34ea7 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -117,4 +117,5 @@ const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitO
   return backend
 }
 
+createGraphicsBackend.id = 'threejs'
 export default createGraphicsBackend
diff --git a/renderer/viewer/three/holdingBlock.ts b/renderer/viewer/three/holdingBlock.ts
index 9ba76224..cf294016 100644
--- a/renderer/viewer/three/holdingBlock.ts
+++ b/renderer/viewer/three/holdingBlock.ts
@@ -911,6 +911,6 @@ export const getBlockMeshFromModel = (material: THREE.Material, model: BlockMode
   const worldRenderModel = blockProvider.transformModel(model, {
     name,
     properties: {}
-  })
+  }) as any
   return getThreeBlockModelGroup(material, [[worldRenderModel]], undefined, 'plains', loadedData)
 }
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index e705b2d1..4e800776 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -70,7 +70,6 @@ export class WorldRendererThree extends WorldRendererCommon {
 
     this.addDebugOverlay()
     this.resetScene()
-    this.watchReactivePlayerState()
     this.init()
     void initVR(this)
 
@@ -120,22 +119,15 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.camera = new THREE.PerspectiveCamera(75, size.x / size.y, 0.1, 1000)
   }
 
-  watchReactivePlayerState () {
-    const updateValue = <T extends keyof typeof this.displayOptions.playerState.reactive>(key: T, callback: (value: typeof this.displayOptions.playerState.reactive[T]) => void) => {
-      callback(this.displayOptions.playerState.reactive[key])
-      subscribeKey(this.displayOptions.playerState.reactive, key, callback)
-    }
-    updateValue('backgroundColor', (value) => {
-      this.changeBackgroundColor(value)
+  override watchReactivePlayerState () {
+    this.onReactiveValueUpdated('inWater', (value) => {
+      this.scene.fog = value ? new THREE.Fog(0x00_00_ff, 0.1, this.displayOptions.playerState.reactive.waterBreathing ? 100 : 20) : null
     })
-    updateValue('inWater', (value) => {
-      this.scene.fog = value ? new THREE.Fog(0x00_00_ff, 0.1, 100) : null
-    })
-    updateValue('ambientLight', (value) => {
+    this.onReactiveValueUpdated('ambientLight', (value) => {
       if (!value) return
       this.ambientLight.intensity = value
     })
-    updateValue('directionalLight', (value) => {
+    this.onReactiveValueUpdated('directionalLight', (value) => {
       if (!value) return
       this.directionalLight.intensity = value
     })
@@ -613,8 +605,6 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   destroy (): void {
-    removeAllStats()
-    this.media.onWorldGone()
     super.destroy()
   }
 }
diff --git a/src/appViewer.ts b/src/appViewer.ts
index f4032712..1b973ad2 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -49,11 +49,13 @@ const defaultGraphicsBackendConfig: GraphicsBackendConfig = {
   sceneBackground: 'lightblue'
 }
 
-export interface GraphicsInitOptions {
+export interface GraphicsInitOptions<S = any> {
   resourcesManager: ResourcesManager
   config: GraphicsBackendConfig
+  rendererSpecificSettings: S
 
   displayCriticalError: (error: Error) => void
+  setRendererSpecificSettings: (key: string, value: any) => void
 }
 
 export interface DisplayWorldOptions {
@@ -65,7 +67,9 @@ export interface DisplayWorldOptions {
   nonReactiveState: NonReactiveState
 }
 
-export type GraphicsBackendLoader = (options: GraphicsInitOptions) => GraphicsBackend
+export type GraphicsBackendLoader = ((options: GraphicsInitOptions) => GraphicsBackend) & {
+  id: string
+}
 
 // no sync methods
 export interface GraphicsBackend {
@@ -73,7 +77,7 @@ export interface GraphicsBackend {
   displayName?: string
   startPanorama: () => void
   // prepareResources: (version: string, progressReporter: ProgressReporter) => Promise<void>
-  startWorld: (options: DisplayWorldOptions) => void
+  startWorld: (options: DisplayWorldOptions) => Promise<void> | void
   disconnect: () => void
   setRendering: (rendering: boolean) => void
   getDebugOverlay?: () => Record<string, any>
@@ -116,6 +120,13 @@ export class AppViewer {
     }
 
     this.backendLoader = loader
+    const rendererSpecificSettings = {} as Record<string, any>
+    const rendererSettingsKey = `renderer.${this.backendLoader?.id}`
+    for (const key in options) {
+      if (key.startsWith(rendererSettingsKey)) {
+        rendererSpecificSettings[key.slice(rendererSettingsKey.length + 1)] = options[key]
+      }
+    }
     const loaderOptions: GraphicsInitOptions = {
       resourcesManager: this.resourcesManager,
       config: this.config,
@@ -123,6 +134,10 @@ export class AppViewer {
         console.error(error)
         setLoadingScreenStatus(error.message, true)
       },
+      rendererSpecificSettings,
+      setRendererSpecificSettings (key: string, value: any) {
+        options[`${rendererSettingsKey}.${key}`] = value
+      }
     }
     this.backend = loader(loaderOptions)
 
@@ -135,12 +150,12 @@ export class AppViewer {
       const { method, args } = this.currentState
       this.backend[method](...args)
       if (method === 'startWorld') {
-        void this.worldView!.init(args[0].playerState.getPosition())
+        // void this.worldView!.init(args[0].playerState.getPosition())
       }
     }
   }
 
-  startWorld (world, renderDistance: number, playerStateSend: IPlayerState = this.playerState) {
+  async startWorld (world, renderDistance: number, playerStateSend: IPlayerState = this.playerState) {
     if (this.currentDisplay === 'world') throw new Error('World already started')
     this.currentDisplay = 'world'
     const startPosition = playerStateSend.getPosition()
@@ -156,14 +171,17 @@ export class AppViewer {
       rendererState: this.rendererState,
       nonReactiveState: this.nonReactiveState
     }
+    let promise: undefined | Promise<void>
     if (this.backend) {
-      this.backend.startWorld(displayWorldOptions)
-      void this.worldView.init(startPosition)
+      promise = this.backend.startWorld(displayWorldOptions) ?? undefined
+      // void this.worldView.init(startPosition)
     }
     this.currentState = { method: 'startWorld', args: [displayWorldOptions] }
 
+    await promise
     // Resolve the promise after world is started
     this.resolveWorldReady()
+    return !!promise
   }
 
   resetBackend (cleanState = false) {
@@ -237,13 +255,15 @@ const initialMenuStart = async () => {
   }
   appViewer.startPanorama()
 
-  // await appViewer.resourcesManager.loadMcData('1.21.4')
-  // const world = getSyncWorld('1.21.4')
-  // world.setBlockStateId(new Vec3(0, 64, 0), 1)
-  // appViewer.resourcesManager.currentConfig = { version: '1.21.4' }
+  // const version = '1.18.2'
+  // const version = '1.21.4'
+  // await appViewer.resourcesManager.loadMcData(version)
+  // const world = getSyncWorld(version)
+  // world.setBlockStateId(new Vec3(0, 64, 0), loadedData.blocksByName.water.defaultState)
+  // appViewer.resourcesManager.currentConfig = { version }
   // await appViewer.resourcesManager.updateAssetsData({})
   // appViewer.playerState = new BasePlayerState() as any
-  // appViewer.startWorld(world, 3)
+  // await appViewer.startWorld(world, 3)
   // appViewer.backend?.updateCamera(new Vec3(0, 64, 2), 0, 0)
   // void appViewer.worldView!.init(new Vec3(0, 64, 0))
 }
diff --git a/src/appViewerLoad.ts b/src/appViewerLoad.ts
new file mode 100644
index 00000000..09649b3f
--- /dev/null
+++ b/src/appViewerLoad.ts
@@ -0,0 +1,34 @@
+import { subscribeKey } from 'valtio/utils'
+import createGraphicsBackend from 'renderer/viewer/three/graphicsBackend'
+import { options } from './optionsStorage'
+import { appViewer } from './appViewer'
+import { miscUiState } from './globalState'
+import { watchOptionsAfterViewerInit } from './watchOptions'
+
+const loadBackend = () => {
+  if (options.activeRenderer === 'webgpu') {
+    // appViewer.loadBackend(createWebgpuBackend)
+  } else {
+    appViewer.loadBackend(createGraphicsBackend)
+  }
+}
+window.loadBackend = loadBackend
+if (process.env.SINGLE_FILE_BUILD_MODE) {
+  const unsub = subscribeKey(miscUiState, 'fsReady', () => {
+    if (miscUiState.fsReady) {
+      // don't do it earlier to load fs and display menu faster
+      loadBackend()
+      unsub()
+    }
+  })
+} else {
+  loadBackend()
+}
+
+const animLoop = () => {
+  for (const fn of beforeRenderFrame) fn()
+  requestAnimationFrame(animLoop)
+}
+requestAnimationFrame(animLoop)
+
+watchOptionsAfterViewerInit()
diff --git a/src/builtinCommands.ts b/src/builtinCommands.ts
index 9e971e22..a292c5cd 100644
--- a/src/builtinCommands.ts
+++ b/src/builtinCommands.ts
@@ -2,12 +2,13 @@ import fs from 'fs'
 import { join } from 'path'
 import JSZip from 'jszip'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
-import { readLevelDat } from './loadSave'
+import { fsState, readLevelDat } from './loadSave'
 import { closeWan, openToWanAndCopyJoinLink } from './localServerMultiplayer'
 import { copyFilesAsync, uniqueFileNameFromWorldName } from './browserfs'
 import { saveServer } from './flyingSquidUtils'
 import { setLoadingScreenStatus } from './appStatus'
 import { displayClientChat } from './botUtils'
+import { miscUiState } from './globalState'
 
 const notImplemented = () => {
   return 'Not implemented yet'
@@ -69,7 +70,7 @@ export const exportWorld = async (path: string, type: 'zip' | 'folder', zipName
 // todo include in help
 const exportLoadedWorld = async () => {
   await saveServer()
-  let { worldFolder } = localServer!.options
+  let worldFolder = fsState.inMemorySavePath
   if (!worldFolder.startsWith('/')) worldFolder = `/${worldFolder}`
   await exportWorld(worldFolder, 'zip')
 }
@@ -141,12 +142,12 @@ export const commands: Array<{
 ]
 //@ts-format-ignore-endregion
 
-export const getBuiltinCommandsList = () => commands.filter(command => command.alwaysAvailable || localServer).flatMap(command => command.command)
+export const getBuiltinCommandsList = () => commands.filter(command => command.alwaysAvailable || miscUiState.singleplayer).flatMap(command => command.command)
 
 export const tryHandleBuiltinCommand = (message: string) => {
   const [userCommand, ...args] = message.split(' ')
 
-  for (const command of commands.filter(command => command.alwaysAvailable || localServer)) {
+  for (const command of commands.filter(command => command.alwaysAvailable || miscUiState.singleplayer)) {
     if (command.command.includes(userCommand)) {
       void command.invoke(args) // ignoring for now
       return true
diff --git a/src/controls.ts b/src/controls.ts
index aa78b103..d4522eae 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -417,8 +417,9 @@ const alwaysPressedHandledCommand = (command: Command) => {
 
 export function lockUrl () {
   let newQs = ''
-  if (fsState.saveLoaded) {
-    const save = localServer!.options.worldFolder.split('/').at(-1)
+  if (fsState.saveLoaded && fsState.inMemorySave) {
+    const worldFolder = fsState.inMemorySavePath
+    const save = worldFolder.split('/').at(-1)
     newQs = `loadSave=${save}`
   } else if (process.env.NODE_ENV === 'development') {
     newQs = `reconnect=1`
@@ -579,7 +580,7 @@ contro.on('release', ({ command }) => {
 
 export const f3Keybinds: Array<{
   key?: string,
-  action: () => void,
+  action: () => void | Promise<void>,
   mobileTitle: string
   enabled?: () => boolean
 }> = [
@@ -694,7 +695,7 @@ document.addEventListener('keydown', (e) => {
   if (hardcodedPressedKeys.has('F3')) {
     const keybind = f3Keybinds.find((v) => v.key === e.code)
     if (keybind && (keybind.enabled?.() ?? true)) {
-      keybind.action()
+      void keybind.action()
       e.stopPropagation()
     }
     return
@@ -933,13 +934,17 @@ window.addEventListener('keydown', (e) => {
   if (e.code === 'KeyL' && e.altKey && !e.shiftKey && !e.ctrlKey && !e.metaKey) {
     console.clear()
   }
-  if (e.code === 'KeyK' && e.altKey && !e.shiftKey && !e.ctrlKey && !e.metaKey) {
+  if (e.code === 'KeyK' && e.altKey && e.shiftKey && !e.ctrlKey && !e.metaKey) {
     if (sessionStorage.delayLoadUntilFocus) {
       sessionStorage.removeItem('delayLoadUntilFocus')
     } else {
       sessionStorage.setItem('delayLoadUntilFocus', 'true')
     }
   }
+  if (e.code === 'KeyK' && e.altKey && !e.shiftKey && !e.ctrlKey && !e.metaKey) {
+    // eslint-disable-next-line no-debugger
+    debugger
+  }
 })
 // #endregion
 
diff --git a/src/core/timers.ts b/src/core/timers.ts
index fd9c72f5..570f46c0 100644
--- a/src/core/timers.ts
+++ b/src/core/timers.ts
@@ -124,12 +124,12 @@ export const preventThrottlingWithSound = () => {
     // Start playing
     oscillator.start()
 
-    return () => {
+    return async () => {
       try {
         oscillator.stop()
-        audioContext.close()
+        await audioContext.close()
       } catch (err) {
-        console.error('Error stopping silent audio:', err)
+        console.warn('Error stopping silent audio:', err)
       }
     }
   } catch (err) {
diff --git a/src/devtools.ts b/src/devtools.ts
index 5b15711f..b9267127 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -21,7 +21,8 @@ window.inspectPlayer = () => require('fs').promises.readFile('/world/playerdata/
 
 Object.defineProperty(window, 'debugSceneChunks', {
   get () {
-    return (window.world as WorldRendererThree)?.getLoadedChunksRelative?.(bot.entity.position, true)
+    if (!(window.world instanceof WorldRendererThree)) return undefined
+    return (window.world)?.getLoadedChunksRelative?.(bot.entity.position, true)
   },
 })
 
@@ -149,7 +150,7 @@ Object.defineProperty(window, 'debugToggle', {
 })
 
 customEvents.on('gameLoaded', () => {
-  window.holdingBlock = (window.world as WorldRendererThree).holdingBlock
+  window.holdingBlock = (window.world as WorldRendererThree | undefined)?.holdingBlock
 })
 
 window.clearStorage = (...keysToKeep: string[]) => {
diff --git a/src/globals.d.ts b/src/globals.d.ts
index 2a854f16..b8741a12 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -34,4 +34,17 @@ declare interface Document {
   exitPointerLock?(): void
 }
 
+declare module '*.frag' {
+  const png: string
+  export default png
+}
+declare module '*.vert' {
+  const png: string
+  export default png
+}
+declare module '*.wgsl' {
+  const png: string
+  export default png
+}
+
 declare interface Window extends Record<string, any> { }
diff --git a/src/globals.js b/src/globals.js
index 005d422f..1aa141c6 100644
--- a/src/globals.js
+++ b/src/globals.js
@@ -8,3 +8,4 @@ window.worldView = undefined
 window.viewer = undefined
 window.loadedData = undefined
 window.customEvents = new EventEmitter()
+window.customEvents.setMaxListeners(10_000)
diff --git a/src/googledrive.ts b/src/googledrive.ts
index 76fa1ce2..5e5e9ae9 100644
--- a/src/googledrive.ts
+++ b/src/googledrive.ts
@@ -4,7 +4,6 @@ import React from 'react'
 import { loadScript } from 'renderer/viewer/lib/utils'
 import { loadGoogleDriveApi, loadInMemorySave } from './react/SingleplayerProvider'
 import { setLoadingScreenStatus } from './appStatus'
-import { mountGoogleDriveFolder } from './browserfs'
 import { showOptionsModal } from './react/SelectOption'
 import { appQueryParams } from './appParams'
 
@@ -67,7 +66,7 @@ export const possiblyHandleStateVariable = async () => {
       }
       setLoadingScreenStatus('Opening world in read only mode...')
       googleProviderState.accessToken = response.access_token
-      await mountGoogleDriveFolder(true, parsed.ids[0])
+      // await mountGoogleDriveFolder(true, parsed.ids[0])
       await loadInMemorySave('/google')
     }
   })
diff --git a/src/index.ts b/src/index.ts
index 623a88ac..b8a52a49 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -95,8 +95,7 @@ import { startLocalReplayServer } from './packetsReplay/replayPackets'
 import { localRelayServerPlugin } from './mineflayer/plugins/packetsRecording'
 import { createConsoleLogProgressReporter, createFullScreenProgressReporter, ProgressReporter } from './core/progressReporter'
 import { appViewer } from './appViewer'
-import createGraphicsBackend from 'renderer/viewer/three/graphicsBackend'
-import { subscribeKey } from 'valtio/utils'
+import './appViewerLoad'
 
 window.debug = debug
 window.beforeRenderFrame = []
@@ -115,30 +114,6 @@ customChannels()
 
 if (appQueryParams.testCrashApp === '2') throw new Error('test')
 
-const loadBackend = () => {
-  appViewer.loadBackend(createGraphicsBackend)
-}
-window.loadBackend = loadBackend
-if (process.env.SINGLE_FILE_BUILD_MODE) {
-  const unsub = subscribeKey(miscUiState, 'fsReady', () => {
-    if (miscUiState.fsReady) {
-      // don't do it earlier to load fs and display menu faster
-      loadBackend()
-      unsub()
-    }
-  })
-} else {
-  loadBackend()
-}
-
-const animLoop = () => {
-  for (const fn of beforeRenderFrame) fn()
-  requestAnimationFrame(animLoop)
-}
-requestAnimationFrame(animLoop)
-
-watchOptionsAfterViewerInit()
-
 function hideCurrentScreens () {
   activeModalStacks['main-menu'] = [...activeModalStack]
   insertActiveModalStack('', [])
@@ -223,6 +198,7 @@ export async function connect (connectOptions: ConnectOptions) {
   let bot!: typeof __type_bot
   const destroyAll = () => {
     if (ended) return
+    errorAbortController.abort()
     ended = true
     progress.end()
     // dont reset viewer so we can still do debugging
@@ -240,7 +216,6 @@ export async function connect (connectOptions: ConnectOptions) {
       //@ts-expect-error
       window.bot = bot = undefined
     }
-    resetStateAfterDisconnect()
     cleanFs()
   }
   const cleanFs = () => {
@@ -261,7 +236,6 @@ export async function connect (connectOptions: ConnectOptions) {
     if (err === 'ResizeObserver loop completed with undelivered notifications.') {
       return
     }
-    errorAbortController.abort()
     if (isCypress()) throw err
     miscUiState.hasErrors = true
     if (miscUiState.gameLoaded) return
@@ -272,6 +246,7 @@ export async function connect (connectOptions: ConnectOptions) {
     destroyAll()
   }
 
+  // todo(hard): remove it!
   const errorAbortController = new AbortController()
   window.addEventListener('unhandledrejection', (e) => {
     if (e.reason.name === 'ServerPluginLoadFailure') {
@@ -732,7 +707,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
 
       console.log('bot spawned - starting viewer')
-      appViewer.startWorld(bot.world, renderDistance)
+      await appViewer.startWorld(bot.world, renderDistance)
       appViewer.worldView!.listenToBot(bot)
 
       initMotionTracking()
diff --git a/src/loadSave.ts b/src/loadSave.ts
index 4746a95c..c672193c 100644
--- a/src/loadSave.ts
+++ b/src/loadSave.ts
@@ -22,7 +22,8 @@ export const fsState = proxy({
   saveLoaded: false,
   openReadOperations: 0,
   openWriteOperations: 0,
-  remoteBackend: false
+  remoteBackend: false,
+  inMemorySavePath: ''
 })
 
 const PROPOSE_BACKUP = true
@@ -181,6 +182,7 @@ export const loadSave = async (root = '/world') => {
 
   // todo should not be set here
   fsState.saveLoaded = true
+  fsState.inMemorySavePath = root
   window.dispatchEvent(new CustomEvent('singleplayer', {
     // todo check gamemode level.dat data etc
     detail: {
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index a247350b..5b83922f 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -61,8 +61,6 @@ export const guiOptionsScheme: {
       custom () {
         return <Button label='Guide: Disable VSync' onClick={() => openURL('https://gist.github.com/zardoy/6e5ce377d2b4c1e322e660973da069cd')} inScreen />
       },
-    },
-    {
       backgroundRendering: {
         text: 'Background FPS limit',
         values: [
@@ -71,6 +69,12 @@ export const guiOptionsScheme: {
           ['20fps', '20 FPS'],
         ],
       },
+      activeRenderer: {
+        text: 'Renderer',
+        values: [
+          ['threejs', 'Three.js (stable)'],
+        ],
+      },
     },
     {
       custom () {
@@ -108,12 +112,12 @@ export const guiOptionsScheme: {
     },
     {
       custom () {
-        const { _renderByChunks } = useSnapshot(options).rendererOptions.three
+        const { _renderByChunks } = useSnapshot(options).rendererSharedOptions
         return <Button
           inScreen
           label={`Batch Chunks Display ${_renderByChunks ? 'ON' : 'OFF'}`}
           onClick={() => {
-            options.rendererOptions.three._renderByChunks = !_renderByChunks
+            options.rendererSharedOptions._renderByChunks = !_renderByChunks
           }}
         />
       }
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index ca2fa971..ba2baeec 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -34,6 +34,7 @@ const defaultOptions = {
   touchButtonsOpacity: 80,
   touchButtonsPosition: 12,
   touchControlsPositions: getDefaultTouchControlsPositions(),
+  touchControlsSize: getTouchControlsSize(),
   touchMovementType: 'modern' as 'modern' | 'classic',
   touchInteractionType: 'classic' as 'classic' | 'buttons',
   gpuPreference: 'default' as 'default' | 'high-performance' | 'low-power',
@@ -109,11 +110,10 @@ const defaultOptions = {
   disabledUiParts: [] as string[],
   neighborChunkUpdates: true,
   highlightBlockColor: 'auto' as 'auto' | 'blue' | 'classic',
-  rendererOptions: {
-    three: {
-      _experimentalSmoothChunkLoading: true,
-      _renderByChunks: false
-    }
+  activeRenderer: 'threejs',
+  rendererSharedOptions: {
+    _experimentalSmoothChunkLoading: true,
+    _renderByChunks: false
   }
 }
 
@@ -138,6 +138,16 @@ function getDefaultTouchControlsPositions () {
   } as Record<string, [number, number]>
 }
 
+function getTouchControlsSize () {
+  return {
+    joystick: 60,
+    action: 36,
+    break: 36,
+    jump: 36,
+    sneak: 36,
+  }
+}
+
 // const qsOptionsRaw = new URLSearchParams(location.search).getAll('setting')
 const qsOptionsRaw = appQueryParamsArray.setting ?? []
 export const qsOptions = Object.fromEntries(qsOptionsRaw.map(o => {
diff --git a/src/packetsReplay/replayPackets.ts b/src/packetsReplay/replayPackets.ts
index f1c85a94..87d03a9c 100644
--- a/src/packetsReplay/replayPackets.ts
+++ b/src/packetsReplay/replayPackets.ts
@@ -4,11 +4,11 @@ import { ParsedReplayPacket, parseReplayContents } from 'mcraft-fun-mineflayer/b
 import { PACKETS_REPLAY_FILE_EXTENSION, WORLD_STATE_FILE_EXTENSION } from 'mcraft-fun-mineflayer/build/worldState'
 import MinecraftData from 'minecraft-data'
 import { GameMode } from 'mineflayer'
-import { LocalServer } from '../customServer'
 import { UserError } from '../mineflayer/userError'
 import { packetsReplayState } from '../react/state/packetsReplayState'
 import { getFixedFilesize } from '../react/simpleUtils'
 import { appQueryParams } from '../appParams'
+import { LocalServer } from '../customServer'
 
 const SUPPORTED_FORMAT_VERSION = 1
 
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index 5f3e7e06..24fb91e7 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -71,12 +71,36 @@ export default () => {
   useDidUpdateEffect(() => {
     // todo play effect only when world successfully loaded
     if (!isOpen) {
-      const divingElem: HTMLElement = document.querySelector('#viewer-canvas')!
-      divingElem.style.animationName = 'dive-animation'
-      divingElem.parentElement!.style.perspective = '1200px'
-      divingElem.onanimationend = () => {
-        divingElem.parentElement!.style.perspective = ''
-        divingElem.onanimationend = null
+      const startDiveAnimation = (divingElem: HTMLElement) => {
+        divingElem.style.animationName = 'dive-animation'
+        divingElem.parentElement!.style.perspective = '1200px'
+        divingElem.onanimationend = () => {
+          divingElem.parentElement!.style.perspective = ''
+          divingElem.onanimationend = null
+        }
+      }
+
+      const divingElem = document.querySelector('#viewer-canvas')
+      let observer: MutationObserver | null = null
+      if (divingElem) {
+        startDiveAnimation(divingElem as HTMLElement)
+      } else {
+        observer = new MutationObserver((mutations) => {
+          const divingElem = document.querySelector('#viewer-canvas')
+          if (divingElem) {
+            startDiveAnimation(divingElem as HTMLElement)
+            observer!.disconnect()
+          }
+        })
+        observer.observe(document.body, {
+          childList: true,
+          subtree: true
+        })
+      }
+      return () => {
+        if (observer) {
+          observer.disconnect()
+        }
       }
     }
   }, [isOpen])
diff --git a/src/react/ButtonWithTooltip.tsx b/src/react/ButtonWithTooltip.tsx
index d9372007..e308d8fd 100644
--- a/src/react/ButtonWithTooltip.tsx
+++ b/src/react/ButtonWithTooltip.tsx
@@ -9,14 +9,15 @@ interface Props extends React.ComponentProps<typeof Button> {
     localStorageKey?: string | null
     offset?: number
   }
+  alwaysTooltip?: string
 }
 
 const ARROW_HEIGHT = 7
 const GAP = 0
 
-export default ({ initialTooltip, ...args }: Props) => {
+export default ({ initialTooltip, alwaysTooltip, ...args }: Props) => {
   const { localStorageKey = 'firstTimeTooltip', offset = 0 } = initialTooltip
-  const [showTooltips, setShowTooltips] = useState(localStorageKey ? localStorage[localStorageKey] !== 'false' : true)
+  const [showTooltips, setShowTooltips] = useState(alwaysTooltip || (localStorageKey ? localStorage[localStorageKey] !== 'false' : true))
 
   useEffect(() => {
     let timeout
@@ -67,7 +68,7 @@ export default ({ initialTooltip, ...args }: Props) => {
         zIndex: 11
       }}
     >
-      {initialTooltip.content}
+      {alwaysTooltip || initialTooltip.content}
       <FloatingArrow ref={arrowRef} context={context} style={{ opacity: 0.7 }} />
     </div>
   </>
diff --git a/src/react/DebugOverlay.module.css b/src/react/DebugOverlay.module.css
index 3b966426..c20f39f1 100644
--- a/src/react/DebugOverlay.module.css
+++ b/src/react/DebugOverlay.module.css
@@ -11,12 +11,12 @@
 }
 
 .debug-left-side {
-  top: 1px;
+  top: 25px;
   left: 1px;
 }
 
 .debug-right-side {
-  top: 5px;
+  top: 25px;
   right: 1px;
   /* limit renderer long text width */
   width: 50%;
diff --git a/src/react/MainMenuRenderApp.tsx b/src/react/MainMenuRenderApp.tsx
index f678e7f7..b1b4bc47 100644
--- a/src/react/MainMenuRenderApp.tsx
+++ b/src/react/MainMenuRenderApp.tsx
@@ -112,8 +112,10 @@ export default () => {
     }
   }, [])
 
-  let mapsProviderUrl = appConfig?.mapsProvider
-  if (mapsProviderUrl && location.origin !== 'https://mcraft.fun') mapsProviderUrl = mapsProviderUrl + '?to=' + encodeURIComponent(location.href)
+  const mapsProviderUrl = appConfig?.mapsProvider && new URL(appConfig?.mapsProvider)
+  if (mapsProviderUrl && location.origin !== 'https://mcraft.fun') {
+    mapsProviderUrl.searchParams.set('to', location.href)
+  }
 
   // todo clean, use custom csstransition
   return <Transition in={!noDisplay} timeout={disableAnimation ? 0 : 100} mountOnEnter unmountOnExit>
@@ -134,7 +136,7 @@ export default () => {
             openFilePicker()
           }
         }}
-        mapsProvider={mapsProviderUrl}
+        mapsProvider={mapsProviderUrl?.toString()}
         versionStatus={versionStatus}
         versionTitle={versionTitle}
         onVersionStatusClick={async () => {
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index f051f9e1..75da9dfa 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -53,9 +53,8 @@ export const saveToBrowserMemory = async () => {
         }
       })
     })
-    //@ts-expect-error
-    const { worldFolder } = localServer.options
-    const saveRootPath = await uniqueFileNameFromWorldName(worldFolder.split('/').pop(), `/data/worlds`)
+    const worldFolder = fsState.inMemorySavePath
+    const saveRootPath = await uniqueFileNameFromWorldName(worldFolder.split('/').pop()!, `/data/worlds`)
     await mkdirRecursive(saveRootPath)
     console.log('made world folder', saveRootPath)
     const allRootPaths = [...usedServerPathsV1]
@@ -290,7 +289,7 @@ export default () => {
       ) : null}
       {!lockConnect && <>
         <Button className="button" style={{ width: '204px' }} onClick={disconnect}>
-          {localServer && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
+          {fsState.inMemorySave && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
         </Button>
       </>}
       {noConnection && (
diff --git a/src/resourcesManager.ts b/src/resourcesManager.ts
index d4c1fe81..4ee91ab4 100644
--- a/src/resourcesManager.ts
+++ b/src/resourcesManager.ts
@@ -50,7 +50,7 @@ export class LoadedResources {
 export interface ResourcesCurrentConfig {
   version: string
   texturesVersion?: string
-  noBlockstatesModels?: boolean
+  // noBlockstatesModels?: boolean
   noInventoryGui?: boolean
   includeOnlyBlocks?: string[]
 }
@@ -115,34 +115,12 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
       ...resources.customModels
     }
 
-
-    const blocksAssetsParser = new AtlasParser(this.sourceBlocksAtlases, blocksAtlasLatest, blocksAtlasLegacy)
-    const itemsAssetsParser = new AtlasParser(this.sourceItemsAtlases, itemsAtlasLatest, itemsAtlasLegacy)
-
-    const blockTexturesChanges = {} as Record<string, string>
-    const date = new Date()
-    if ((date.getMonth() === 11 && date.getDate() >= 24) || (date.getMonth() === 0 && date.getDate() <= 6)) {
-      Object.assign(blockTexturesChanges, christmasPack)
-    }
-
-    const customBlockTextures = Object.keys(resources.customTextures.blocks?.textures ?? {})
-    const customItemTextures = Object.keys(resources.customTextures.items?.textures ?? {})
-
-    console.time('createBlocksAtlas')
-    const { atlas: blocksAtlas, canvas: blocksCanvas } = await blocksAssetsParser.makeNewAtlas(
-      resources.texturesVersion,
-      (textureName) => {
-        if (this.currentConfig!.includeOnlyBlocks && !this.currentConfig!.includeOnlyBlocks.includes(textureName)) return false
-        const texture = resources.customTextures.blocks?.textures[textureName]
-        return blockTexturesChanges[textureName] ?? texture
-      },
-      undefined,
-      undefined,
-      customBlockTextures
-    )
-    console.timeEnd('createBlocksAtlas')
+    await this.recreateBlockAtlas(resources)
 
     if (abortController.signal.aborted) return
+
+    const itemsAssetsParser = new AtlasParser(this.sourceItemsAtlases, itemsAtlasLatest, itemsAtlasLegacy)
+    const customItemTextures = Object.keys(resources.customTextures.items?.textures ?? {})
     console.time('createItemsAtlas')
     const { atlas: itemsAtlas, canvas: itemsCanvas } = await itemsAssetsParser.makeNewAtlas(
       resources.texturesVersion,
@@ -157,9 +135,7 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
     )
     console.timeEnd('createItemsAtlas')
 
-    resources.blocksAtlasParser = new AtlasParser({ latest: blocksAtlas }, blocksCanvas.toDataURL())
     resources.itemsAtlasParser = new AtlasParser({ latest: itemsAtlas }, itemsCanvas.toDataURL())
-    resources.blocksAtlasImage = await getLoadedImage(blocksCanvas.toDataURL())
     resources.itemsAtlasImage = await getLoadedImage(itemsCanvas.toDataURL())
 
     if (resources.version && resources.blockstatesModels && resources.itemsAtlasParser && resources.blocksAtlasParser) {
@@ -169,11 +145,6 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
         resources.itemsAtlasParser,
         resources.blocksAtlasParser
       )
-      resources.worldBlockProvider = worldBlockProvider(
-        resources.blockstatesModels,
-        resources.blocksAtlasParser.atlas,
-        STABLE_MODELS_VERSION
-      )
     }
 
     if (abortController.signal.aborted) return
@@ -196,6 +167,43 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
     }
   }
 
+  async recreateBlockAtlas (resources: LoadedResources = this.currentResources!) {
+    const blockTexturesChanges = {} as Record<string, string>
+    const date = new Date()
+    if ((date.getMonth() === 11 && date.getDate() >= 24) || (date.getMonth() === 0 && date.getDate() <= 6)) {
+      Object.assign(blockTexturesChanges, christmasPack)
+    }
+
+    const blocksAssetsParser = new AtlasParser(this.sourceBlocksAtlases, blocksAtlasLatest, blocksAtlasLegacy)
+
+    const customBlockTextures = Object.keys(resources.customTextures.blocks?.textures ?? {})
+    console.time('createBlocksAtlas')
+    const { atlas: blocksAtlas, canvas: blocksCanvas } = await blocksAssetsParser.makeNewAtlas(
+      resources.texturesVersion,
+      (textureName) => {
+        if (this.currentConfig!.includeOnlyBlocks && !this.currentConfig!.includeOnlyBlocks.includes(textureName)) return false
+        const texture = resources.customTextures.blocks?.textures[textureName]
+        return blockTexturesChanges[textureName] ?? texture
+      },
+      undefined,
+      undefined,
+      customBlockTextures,
+      {
+        needHorizontalIndexes: !!this.currentConfig!.includeOnlyBlocks,
+      }
+    )
+    console.timeEnd('createBlocksAtlas')
+
+    resources.blocksAtlasParser = new AtlasParser({ latest: blocksAtlas }, blocksCanvas.toDataURL())
+    resources.blocksAtlasImage = await getLoadedImage(blocksCanvas.toDataURL())
+
+    resources.worldBlockProvider = worldBlockProvider(
+      resources.blockstatesModels,
+      resources.blocksAtlasParser.atlas,
+      STABLE_MODELS_VERSION
+    )
+  }
+
   async generateGuiTextures () {
     await generateGuiAtlas()
   }
diff --git a/src/shims/empty.ts b/src/shims/empty.ts
index f0a766d3..9fabff8f 100644
--- a/src/shims/empty.ts
+++ b/src/shims/empty.ts
@@ -1 +1,3 @@
+// eslint-disable-next-line @typescript-eslint/no-useless-empty-export
 export { }
+export default {}
diff --git a/src/shims/fs.js b/src/shims/fs.js
index b238a376..df83f969 100644
--- a/src/shims/fs.js
+++ b/src/shims/fs.js
@@ -1,3 +1,12 @@
 const BrowserFS = require('browserfs')
 
-module.exports = BrowserFS.BFSRequire('fs')
+globalThis.fs ??= BrowserFS.BFSRequire('fs')
+globalThis.fs.promises = new Proxy({}, {
+  get(target, p) {
+    return (...args) => {
+      return globalThis.promises[p](...args)
+    }
+  }
+})
+
+module.exports = globalThis.fs
diff --git a/src/shims/perf_hooks_replacement.js b/src/shims/perf_hooks_replacement.js
index 69b0e2ed..6c19053a 100644
--- a/src/shims/perf_hooks_replacement.js
+++ b/src/shims/perf_hooks_replacement.js
@@ -1 +1 @@
-module.exports.performance = window.performance
+module.exports.performance = globalThis.performance
diff --git a/src/utils.ts b/src/utils.ts
index 6399a5c4..17f5c2ec 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -65,6 +65,16 @@ export const pointerLock = {
   }
 }
 
+export const logAction = (category: string, action: string, value?: string, label?: string) => {
+  if (!options.externalLoggingService) return
+  window.loggingServiceChannel?.({
+    category,
+    action,
+    value,
+    label
+  })
+}
+
 export const isInRealGameSession = () => {
   return isGameActive(true) && (!packetsReplayState.isOpen || packetsReplayState.isMinimized) && !gameAdditionalState.viewerConnection
 }
@@ -148,11 +158,11 @@ export const setRenderDistance = () => {
     localServer!.players[0].view = 0
     renderDistance = 0
   }
-  worldView.updateViewDistance(renderDistance)
+  worldView?.updateViewDistance(renderDistance)
   prevRenderDistance = renderDistance
 }
 export const reloadChunks = async () => {
-  if (!worldView) return
+  if (!bot || !worldView) return
   setRenderDistance()
   await worldView.updatePosition(bot.entity.position, true)
 }
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index ddb25cb8..41f78d07 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -8,6 +8,8 @@ import { reloadChunks } from './utils'
 import { miscUiState } from './globalState'
 import { isCypress } from './standaloneUtils'
 
+globalThis.viewer ??= { world: {} }
+
 subscribeKey(options, 'renderDistance', reloadChunks)
 subscribeKey(options, 'multiplayerRenderDistance', reloadChunks)
 
@@ -85,8 +87,8 @@ export const watchOptionsAfterViewerInit = () => {
     appViewer.inWorldRenderingConfig.extraBlockRenderers = !o.disableSignsMapsSupport
     appViewer.inWorldRenderingConfig.fetchPlayerSkins = o.loadPlayerSkins
     appViewer.inWorldRenderingConfig.highlightBlockColor = o.highlightBlockColor
-    appViewer.inWorldRenderingConfig._experimentalSmoothChunkLoading = o.rendererOptions.three._experimentalSmoothChunkLoading
-    appViewer.inWorldRenderingConfig._renderByChunks = o.rendererOptions.three._renderByChunks
+    appViewer.inWorldRenderingConfig._experimentalSmoothChunkLoading = o.rendererSharedOptions._experimentalSmoothChunkLoading
+    appViewer.inWorldRenderingConfig._renderByChunks = o.rendererSharedOptions._renderByChunks
   })
 
   appViewer.inWorldRenderingConfig.smoothLighting = options.smoothLighting
diff --git a/src/water.ts b/src/water.ts
index 9221ec8a..257a5e13 100644
--- a/src/water.ts
+++ b/src/water.ts
@@ -1,3 +1,4 @@
+import { ref } from 'valtio'
 import { watchUnloadForCleanup } from './gameUnload'
 
 let inWater = false
@@ -9,9 +10,10 @@ customEvents.on('gameLoaded', () => {
   watchUnloadForCleanup(cleanup)
 
   const updateInWater = () => {
-    const waterBr = Object.keys(bot.entity.effects).find((effect: any) => loadedData.effects[effect.id].name === 'water_breathing')
+    const waterBr = Object.keys(bot.entity.effects).find((effect: any) => loadedData.effects[effect.id]?.name === 'water_breathing')
     if (inWater) {
       appViewer.playerState.reactive.inWater = true
+      appViewer.playerState.reactive.waterBreathing = waterBr !== undefined
     } else {
       cleanup()
     }
@@ -31,5 +33,5 @@ let sceneBg = { r: 0, g: 0, b: 0 }
 export const updateBackground = (newSceneBg = sceneBg) => {
   sceneBg = newSceneBg
   const color: [number, number, number] = inWater ? [0, 0, 1] : [sceneBg.r, sceneBg.g, sceneBg.b]
-  appViewer.playerState.reactive.backgroundColor = color
+  appViewer.playerState.reactive.backgroundColor = ref(color)
 }

From 9b71ae1a2467079b5fe5e8613defa2628888a30d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 6 Apr 2025 00:23:17 +0300
Subject: [PATCH 422/753] feat: rework mobile button control sizes & joystick.
 Make size of every button and joystick configurable via configurator UI from
 settings!

---
 src/optionsStorage.ts            |  6 +--
 src/react/TouchAreasControls.tsx | 64 ++++++++++++++++++++++++++------
 2 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index ba2baeec..3d021903 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -129,18 +129,18 @@ function getDefaultTouchControlsPositions () {
     ],
     break: [
       70,
-      60
+      57
     ],
     jump: [
       84,
-      60
+      57
     ],
   } as Record<string, [number, number]>
 }
 
 function getTouchControlsSize () {
   return {
-    joystick: 60,
+    joystick: 55,
     action: 36,
     break: 36,
     jump: 36,
diff --git a/src/react/TouchAreasControls.tsx b/src/react/TouchAreasControls.tsx
index 6b34f9bc..ec9d201b 100644
--- a/src/react/TouchAreasControls.tsx
+++ b/src/react/TouchAreasControls.tsx
@@ -1,9 +1,10 @@
-import { CSSProperties, PointerEvent, useEffect, useRef } from 'react'
+import { CSSProperties, PointerEvent, useEffect, useRef, useState } from 'react'
 import { proxy, ref, useSnapshot } from 'valtio'
 import { contro } from '../controls'
 import { options } from '../optionsStorage'
 import PixelartIcon from './PixelartIcon'
 import Button from './Button'
+import Slider from './Slider'
 
 export type ButtonName = 'action' | 'sneak' | 'break' | 'jump'
 
@@ -54,8 +55,9 @@ const Z_INDEX_INTERACTIBLE = 8
 
 export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props) => {
   const bot = window.bot as typeof __type_bot | undefined
-  const { touchControlsPositions, touchMovementType, touchInteractionType } = useSnapshot(options)
+  const { touchControlsPositions, touchMovementType, touchInteractionType, touchControlsSize } = useSnapshot(options)
   const buttonsPositions = touchControlsPositions as ButtonsPositions
+  const [selectedButton, setSelectedButton] = useState<ButtonName | 'joystick' | null>(null)
 
   const joystickOuter = useRef<HTMLDivElement>(null)
   const joystickInner = useRef<HTMLDivElement>(null)
@@ -143,19 +145,23 @@ export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props)
         left: `${buttonsPositions[name][0]}%`,
         top: `${buttonsPositions[name][1]}%`,
         borderRadius: '50%',
-        width: '32px',
-        height: '32px',
+        width: `${touchControlsSize[name]}px`,
+        height: `${touchControlsSize[name]}px`,
         background: active ? 'rgba(0, 0, 0, 0.8)' : 'rgba(0, 0, 0, 0.5)',
         display: 'flex',
         justifyContent: 'center',
         alignItems: 'center',
         transition: 'background 0.1s',
         zIndex: Z_INDEX_INTERACTIBLE,
+        ...(setupActive && selectedButton === name ? {
+          border: '2px solid white',
+        } : {}),
       } satisfies CSSProperties,
       onPointerDown (e: PType) {
         const elem = e.currentTarget as HTMLElement
         elem.setPointerCapture(e.pointerId)
         if (setupActive) {
+          setSelectedButton(name)
           setupPointer = { x: e.clientX, y: e.clientY }
         } else {
           holdDown[name]()
@@ -188,33 +194,67 @@ export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props)
   if (!foregroundGameActive && !setupActive) return null
 
   return <div>
+    {setupActive && (
+      <div style={{
+        position: 'fixed',
+        top: '0',
+        left: '50%',
+        transform: 'translateX(-50%)',
+        zIndex: Z_INDEX_INTERACTIBLE + 1,
+      }}>
+        <Slider
+          label={selectedButton ? `Size: ${selectedButton}` : 'Change button size'}
+          value={selectedButton ? touchControlsSize[selectedButton] : 32}
+          min={15}
+          max={100}
+          disabledReason={selectedButton ? undefined : 'Select a button first'}
+          updateValue={(value) => {
+            if (selectedButton) {
+              options.touchControlsSize[selectedButton] = value
+            }
+          }}
+        />
+      </div>
+    )}
     {touchMovementType === 'modern' && (
       <div
         className='movement_joystick_outer'
         ref={joystickOuter}
         style={{
-          display: pointer ? 'flex' : 'none',
+          display: pointer || setupActive ? 'flex' : 'none',
           borderRadius: '50%',
-          width: 50,
-          height: 50,
+          width: touchControlsSize.joystick,
+          height: touchControlsSize.joystick,
           border: '2px solid rgba(0, 0, 0, 0.5)',
-          backgroundColor: 'rgba(255, 255, div, 0.5)',
+          backgroundColor: 'rgba(255, 255, 255, 0.5)',
           position: 'fixed',
           justifyContent: 'center',
           alignItems: 'center',
           translate: '-50% -50%',
-          ...pointer ? {
+          ...(setupActive ? {
+            left: '20%',
+            top: '50%',
+            cursor: 'pointer',
+            ...(selectedButton === 'joystick' ? {
+              border: '2px solid white',
+            } : {}),
+          } : pointer ? {
             left: `${pointer.x / window.innerWidth * 100}%`,
             top: `${pointer.y / window.innerHeight * 100}%`
-          } : {}
+          } : {}),
+        }}
+        onClick={() => {
+          if (setupActive) {
+            setSelectedButton('joystick')
+          }
         }}
       >
         <div
           className='movement_joystick_inner'
           style={{
             borderRadius: '50%',
-            width: 20,
-            height: 20,
+            width: touchControlsSize.joystick * 0.35,
+            height: touchControlsSize.joystick * 0.35,
             backgroundColor: 'rgba(0, 0, 0, 0.5)',
             position: 'absolute',
           }}

From ce5ef7c7cb15bf3406d440ccbd0a2d9d9b446ad1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 6 Apr 2025 11:09:17 +0300
Subject: [PATCH 423/753] remove not neede functionality

---
 src/utils.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/utils.ts b/src/utils.ts
index 17f5c2ec..98a4472f 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -65,16 +65,6 @@ export const pointerLock = {
   }
 }
 
-export const logAction = (category: string, action: string, value?: string, label?: string) => {
-  if (!options.externalLoggingService) return
-  window.loggingServiceChannel?.({
-    category,
-    action,
-    value,
-    label
-  })
-}
-
 export const isInRealGameSession = () => {
   return isGameActive(true) && (!packetsReplayState.isOpen || packetsReplayState.isMinimized) && !gameAdditionalState.viewerConnection
 }

From 0aa4d11bdd0809f3ecaf9fa396a26b9caf91b362 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 02:21:37 +0300
Subject: [PATCH 424/753] feat: Performance benchmark!! (#153)

---
 .github/workflows/benchmark.yml             |  50 ++++++
 cypress.config.ts                           |   4 +-
 cypress/e2e/rendering_performance.spec.ts   |  32 ++++
 package.json                                |   3 +-
 pnpm-lock.yaml                              |  64 +++++--
 renderer/viewer/lib/worldrendererCommon.ts  |   4 +-
 renderer/viewer/three/worldrendererThree.ts |   7 +
 src/appParams.ts                            |   7 +
 src/benchmark.ts                            | 179 ++++++++++++++++++++
 src/benchmarkAdapter.ts                     |  58 +++++++
 src/browserfs.ts                            |   5 +-
 src/connect.ts                              |  12 +-
 src/downloadAndOpenFile.ts                  |  24 ++-
 src/index.ts                                |  46 +++--
 src/loadSave.ts                             |   6 +-
 src/mineflayer/timers.ts                    |  68 +++++++-
 src/optionsGuiScheme.tsx                    |   6 +-
 src/optionsStorage.ts                       |   1 +
 src/react/IndicatorEffects.tsx              |   4 +-
 src/react/IndicatorEffectsProvider.tsx      |  12 +-
 20 files changed, 538 insertions(+), 54 deletions(-)
 create mode 100644 .github/workflows/benchmark.yml
 create mode 100644 cypress/e2e/rendering_performance.spec.ts
 create mode 100644 src/benchmark.ts
 create mode 100644 src/benchmarkAdapter.ts

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
new file mode 100644
index 00000000..1bee9e5c
--- /dev/null
+++ b/.github/workflows/benchmark.yml
@@ -0,0 +1,50 @@
+name: Benchmark
+on:
+  issue_comment:
+    types: [created]
+  push:
+    branches:
+      - perf-test
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    # if: >-
+    #   github.event.issue.pull_request != '' &&
+    #   (
+    #     contains(github.event.comment.body, '/benchmark')
+    #   )
+    permissions:
+      pull-requests: write
+    steps:
+      - run: lscpu
+      - name: Checkout
+        uses: actions/checkout@v2
+        # with:
+          # ref: refs/pull/${{ github.event.issue.number }}/head
+      - run: npm i -g pnpm@9.0.4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: "pnpm"
+      - run: pnpm install
+      - run: pnpm build
+      - run: nohup pnpm prod-start &
+      - run: pnpm test:benchmark
+        id: benchmark
+        continue-on-error: true
+      # read benchmark results from stdout
+      - run: |
+          if [ -f benchmark.txt ]; then
+            # Format the benchmark results for GitHub comment
+            BENCHMARK_RESULT=$(cat benchmark.txt | sed 's/^/- /')
+            echo "BENCHMARK_RESULT<<EOF" >> $GITHUB_ENV
+            echo "$BENCHMARK_RESULT" >> $GITHUB_ENV
+            echo "EOF" >> $GITHUB_ENV
+          else
+            echo "BENCHMARK_RESULT=Benchmark failed to run or produce results" >> $GITHUB_ENV
+          fi
+      - uses: mshick/add-pr-comment@v2
+        with:
+          allow-repeats: true
+          message: |
+            Benchmark result: ${{ env.BENCHMARK_RESULT }}
diff --git a/cypress.config.ts b/cypress.config.ts
index 861931e3..3bf2c720 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -1,5 +1,7 @@
 import { defineConfig } from 'cypress'
 
+const isPerformanceTest = process.env.PERFORMANCE_TEST === 'true'
+
 export default defineConfig({
   video: false,
   chromeWebSecurity: false,
@@ -32,7 +34,7 @@ export default defineConfig({
       return require('./cypress/plugins/index.js')(on, config)
     },
     baseUrl: 'http://localhost:8080',
-    specPattern: 'cypress/e2e/**/*.spec.ts',
+    specPattern: !isPerformanceTest ? 'cypress/e2e/smoke.spec.ts' : 'cypress/e2e/rendering_performance.spec.ts',
     excludeSpecPattern: ['**/__snapshots__/*', '**/__image_snapshots__/*'],
   },
 })
diff --git a/cypress/e2e/rendering_performance.spec.ts b/cypress/e2e/rendering_performance.spec.ts
new file mode 100644
index 00000000..2ca85329
--- /dev/null
+++ b/cypress/e2e/rendering_performance.spec.ts
@@ -0,0 +1,32 @@
+/// <reference types="cypress" />
+import { BenchmarkAdapterInfo, getAllInfoLines } from '../../src/benchmarkAdapter'
+import { cleanVisit } from './shared'
+
+it('Benchmark rendering performance', () => {
+  cleanVisit('/?openBenchmark=true&renderDistance=5')
+  // wait for render end event
+  return cy.document().then({ timeout: 180_000 }, doc => {
+    return new Cypress.Promise(resolve => {
+      cy.log('Waiting for world to load')
+      doc.addEventListener('cypress-world-ready', resolve)
+    }).then(() => {
+      cy.log('World loaded')
+    })
+  }).then(() => {
+    cy.window().then(win => {
+      const adapter = win.benchmarkAdapter as BenchmarkAdapterInfo
+
+      const messages = getAllInfoLines(adapter)
+      // wait for 10 seconds
+      cy.wait(10_000)
+      const messages2 = getAllInfoLines(adapter, true)
+      for (const message of messages) {
+        cy.log(message)
+      }
+      for (const message of messages2) {
+        cy.log(message)
+      }
+      cy.writeFile('benchmark.txt', [...messages, ...messages2].join('\n'))
+    })
+  })
+})
diff --git a/package.json b/package.json
index 94bcedf5..c72e591f 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "prepare-project": "tsx scripts/genShims.ts && tsx scripts/makeOptimizedMcData.mjs && tsx scripts/genLargeDataAliases.ts",
     "check-build": "pnpm prepare-project && tsc && pnpm build",
     "test:cypress": "cypress run",
+    "test:benchmark": "PERFORMANCE_TEST=true cypress run",
     "test:cypress:open": "cypress open",
     "test-unit": "vitest",
     "test:e2e": "start-test http-get://localhost:8080 test:cypress",
@@ -75,7 +76,7 @@
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "express": "^4.18.2",
     "filesize": "^10.0.12",
-    "flying-squid": "npm:@zardoy/flying-squid@^0.0.51",
+    "flying-squid": "npm:@zardoy/flying-squid@^0.0.58",
     "fs-extra": "^11.1.1",
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 24c4e332..933acaa3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -120,8 +120,8 @@ importers:
         specifier: ^10.0.12
         version: 10.0.12
       flying-squid:
-        specifier: npm:@zardoy/flying-squid@^0.0.51
-        version: '@zardoy/flying-squid@0.0.51(encoding@0.1.13)'
+        specifier: npm:@zardoy/flying-squid@^0.0.58
+        version: '@zardoy/flying-squid@0.0.58(encoding@0.1.13)'
       fs-extra:
         specifier: ^11.1.1
         version: 11.1.1
@@ -438,7 +438,7 @@ importers:
         version: 1.3.6
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
         version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
@@ -3541,8 +3541,8 @@ packages:
     engines: {node: '>=8'}
     hasBin: true
 
-  '@zardoy/flying-squid@0.0.51':
-    resolution: {integrity: sha512-HHZ79H9NkS44lL9vk6gVEuJDJqj88gpiBt9Ihh5p4rHXTVbRid95riiNK5dD0kHI94P5/DXdtNalvmJDPU86oQ==}
+  '@zardoy/flying-squid@0.0.58':
+    resolution: {integrity: sha512-qkSoaYRpVQaAvcVgZDTe0i4PxaK2l2B6i7GfRCEsyYFl3UaNQYBwwocXqLrIwhsc63bwXa0XQe8UNUubz+A4eA==}
     engines: {node: '>=8'}
     hasBin: true
 
@@ -6926,6 +6926,11 @@ packages:
     version: 1.54.0
     engines: {node: '>=22'}
 
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284}
+    version: 1.57.0
+    engines: {node: '>=22'}
+
   minecraft-wrap@1.5.1:
     resolution: {integrity: sha512-7DZ2WhrcRD3fUMau84l9Va0KWzV92SHNdB7mnNdNhgXID2aW6pjWuYPZi8MepEBemA4XKKdnDx7HmhTbkoiR8A==}
     hasBin: true
@@ -13652,7 +13657,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@zardoy/flying-squid@0.0.51(encoding@0.1.13)':
+  '@zardoy/flying-squid@0.0.58(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
       chalk: 5.3.0
@@ -13663,14 +13668,14 @@ snapshots:
       flatmap: 0.0.3
       long: 5.2.3
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
       prismarine-item: 1.16.0
-      prismarine-nbt: 2.5.0
+      prismarine-nbt: 2.7.0
       prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -17981,6 +17986,31 @@ snapshots:
       - encoding
       - supports-color
 
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(encoding@0.1.13):
+    dependencies:
+      '@types/node-rsa': 1.1.4
+      '@types/readable-stream': 4.0.12
+      aes-js: 3.1.2
+      buffer-equal: 1.0.1
+      debug: 4.4.0(supports-color@8.1.1)
+      endian-toggle: 0.0.0
+      lodash.merge: 4.6.2
+      minecraft-data: 3.83.1
+      minecraft-folder-path: 1.2.0
+      node-fetch: 2.7.0(encoding@0.1.13)
+      node-rsa: 0.4.2
+      prismarine-auth: 2.4.2(encoding@0.1.13)
+      prismarine-chat: 1.10.1
+      prismarine-nbt: 2.7.0
+      prismarine-realms: 1.3.2(encoding@0.1.13)
+      protodef: 1.18.0
+      readable-stream: 4.5.2
+      uuid-1345: 1.0.2
+      yggdrasil: 1.7.0(encoding@0.1.13)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
   minecraft-wrap@1.5.1(encoding@0.1.13):
     dependencies:
       debug: 4.4.0(supports-color@8.1.1)
@@ -18043,7 +18073,7 @@ snapshots:
   mineflayer-pathfinder@2.4.4:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-entity: 2.3.1
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
@@ -18055,7 +18085,7 @@ snapshots:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.10.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
@@ -18078,7 +18108,7 @@ snapshots:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.10.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.3.1
@@ -18867,7 +18897,7 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-registry: 1.11.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.83.1
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
@@ -18875,6 +18905,8 @@ snapshots:
       prismarine-item: 1.16.0
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.11.0
+    transitivePeerDependencies:
+      - prismarine-registry
 
   prismarine-chat@1.10.1:
     dependencies:
@@ -18885,7 +18917,7 @@ snapshots:
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.5.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
@@ -18923,7 +18955,7 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-nbt: 2.5.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -18947,13 +18979,13 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.7.0
 
   prismarine-schematic@1.2.3:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.5.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.10
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 0225bb87..2e3ff5d2 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -109,7 +109,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   geometryReceiveCount = {} as Record<number, number>
   allLoadedIn: undefined | number
   onWorldSwitched = [] as Array<() => void>
-
+  renderTimeMax = 0
+  renderTimeAvg = 0
+  renderTimeAvgCount = 0
   edgeChunks = {} as Record<string, boolean>
   lastAddChunk = null as null | {
     timeout: any
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 4e800776..7b82953b 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -50,6 +50,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   media: ThreeJsMedia
   waitingChunksToDisplay = {} as { [chunkKey: string]: SectionKey[] }
   camera: THREE.PerspectiveCamera
+  renderTimeAvg = 0
 
   get tilesRendered () {
     return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).tilesCount, 0)
@@ -403,6 +404,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   render (sizeChanged = false) {
+    const start = performance.now()
     this.lastRendered = performance.now()
     this.cursorBlock.render()
 
@@ -427,6 +429,11 @@ export class WorldRendererThree extends WorldRendererCommon {
     for (const onRender of this.onRender) {
       onRender()
     }
+    const end = performance.now()
+    const totalTime = end - start
+    this.renderTimeAvgCount++
+    this.renderTimeAvg = ((this.renderTimeAvg * (this.renderTimeAvgCount - 1)) + totalTime) / this.renderTimeAvgCount
+    this.renderTimeMax = Math.max(this.renderTimeMax, totalTime)
   }
 
   renderHead (position: Vec3, rotation: number, isWall: boolean, blockEntity) {
diff --git a/src/appParams.ts b/src/appParams.ts
index b550ea02..994a5e16 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -51,6 +51,13 @@ export type AppQsParams = {
   replayStopOnError?: string
   replaySkipMissingOnTimeout?: string
   replayPacketsSenderDelay?: string
+
+  // Benchmark params
+  openBenchmark?: string
+  renderDistance?: string
+  downloadBenchmark?: string
+  benchmarkMapZipUrl?: string
+  benchmarkPosition?: string
 }
 
 export type AppQsParamsArray = {
diff --git a/src/benchmark.ts b/src/benchmark.ts
new file mode 100644
index 00000000..b3efa307
--- /dev/null
+++ b/src/benchmark.ts
@@ -0,0 +1,179 @@
+import { Vec3 } from 'vec3'
+import { WorldRendererCommon } from 'renderer/viewer/lib/worldrendererCommon'
+import prettyBytes from 'pretty-bytes'
+import { subscribe } from 'valtio'
+import { downloadAndOpenMapFromUrl } from './downloadAndOpenFile'
+import { activeModalStack, miscUiState } from './globalState'
+import { disabledSettings, options } from './optionsStorage'
+import { BenchmarkAdapterInfo, getAllInfoLines } from './benchmarkAdapter'
+import { appQueryParams } from './appParams'
+
+const DEFAULT_RENDER_DISTANCE = 8
+
+const fixtures = {
+  default: {
+    url: 'https://bucket.mcraft.fun/Future CITY 4.4-slim.zip',
+    spawn: [-133, 87, 309] as [number, number, number],
+  },
+}
+
+Error.stackTraceLimit = Error.stackTraceLimit < 30 ? 30 : Error.stackTraceLimit
+
+export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) => {
+  const fixture: {
+    url: string
+    spawn?: [number, number, number]
+  } = appQueryParams.benchmarkMapZipUrl ? {
+    url: appQueryParams.benchmarkMapZipUrl,
+    spawn: appQueryParams.benchmarkPosition ? appQueryParams.benchmarkPosition.split(',').map(Number) as [number, number, number] : fixtures.default.spawn,
+  } : fixtures.default
+
+  let memoryUsageAverage = 0
+  let memoryUsageSamples = 0
+  let memoryUsageWorst = 0
+  setInterval(() => {
+    const memoryUsage = (window.performance as any)?.memory?.usedJSHeapSize
+    if (memoryUsage) {
+      memoryUsageAverage = (memoryUsageAverage * memoryUsageSamples + memoryUsage) / (memoryUsageSamples + 1)
+      memoryUsageSamples++
+      if (memoryUsage > memoryUsageWorst) {
+        memoryUsageWorst = memoryUsage
+      }
+    }
+  }, 200)
+
+  let benchmarkName = `${fixture.url}`
+  if (fixture.spawn) {
+    benchmarkName += ` - ${fixture.spawn.join(',')}`
+  }
+  benchmarkName += ` - ${renderDistance}`
+  const benchmarkAdapter: BenchmarkAdapterInfo = {
+    get benchmarkName () {
+      return benchmarkName
+    },
+    get worldLoadTimeSeconds () {
+      return window.worldLoadTime
+    },
+    get mesherWorkersCount () {
+      return (window.world as WorldRendererCommon).worldRendererConfig.mesherWorkers
+    },
+    get mesherProcessAvgMs () {
+      return (window.world as WorldRendererCommon).workersProcessAverageTime
+    },
+    get mesherProcessWorstMs () {
+      return (window.world as WorldRendererCommon).maxWorkersProcessTime
+    },
+    get averageRenderTimeMs () {
+      return (window.world as WorldRendererCommon).renderTimeAvg
+    },
+    get worstRenderTimeMs () {
+      return (window.world as WorldRendererCommon).renderTimeMax
+    },
+    get fpsAveragePrediction () {
+      const avgRenderTime = (window.world as WorldRendererCommon).renderTimeAvg
+      return 1000 / avgRenderTime
+    },
+    get fpsWorstPrediction () {
+      const maxRenderTime = (window.world as WorldRendererCommon).renderTimeMax
+      return 1000 / maxRenderTime
+    },
+    get fpsAverageReal () {
+      return -1
+    },
+    get fpsWorstReal () {
+      return -1
+    },
+    get memoryUsageAverage () {
+      return prettyBytes(memoryUsageAverage)
+    },
+    get memoryUsageWorst () {
+      return prettyBytes(memoryUsageWorst)
+    },
+    get gpuInfo () {
+      return appViewer.rendererState.renderer
+    },
+    get hardwareConcurrency () {
+      return navigator.hardwareConcurrency
+    },
+    get userAgent () {
+      return navigator.userAgent
+    },
+  }
+  window.benchmarkAdapter = benchmarkAdapter
+
+  disabledSettings.value.add('renderDistance')
+  options.renderDistance = renderDistance
+  void downloadAndOpenMapFromUrl(fixture.url, undefined, {
+    connectEvents: {
+      serverCreated () {
+        if (fixture.spawn) {
+          localServer!.spawnPoint = new Vec3(...fixture.spawn)
+          localServer!.on('newPlayer', (player) => {
+            player.on('dataLoaded', () => {
+              player.position = new Vec3(...fixture.spawn!)
+            })
+          })
+        }
+      },
+    }
+  })
+  document.addEventListener('cypress-world-ready', () => {
+    let stats = getAllInfoLines(window.benchmarkAdapter)
+    if (appQueryParams.downloadBenchmark) {
+      const a = document.createElement('a')
+      a.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(stats.join('\n'))
+      a.download = `benchmark-${appViewer.backend?.id}.txt`
+      a.click()
+    }
+
+    const panel = document.createElement('div')
+    panel.style.position = 'fixed'
+    panel.style.top = '10px'
+    panel.style.right = '10px'
+    panel.style.backgroundColor = 'rgba(0,0,0,0.8)'
+    panel.style.color = 'white'
+    panel.style.padding = '10px'
+    panel.style.zIndex = '1000'
+    panel.style.fontFamily = 'monospace'
+    panel.id = 'benchmark-panel'
+
+    const pre = document.createElement('pre')
+    panel.appendChild(pre)
+
+    pre.textContent = stats.join('\n')
+    const updateStats = () => {
+      stats = getAllInfoLines(window.benchmarkAdapter)
+      pre.textContent = stats.join('\n')
+    }
+
+    document.body.appendChild(panel)
+    // setInterval(updateStats, 100)
+  })
+}
+
+document.addEventListener('pointerlockchange', (e) => {
+  const panel = document.querySelector<HTMLDivElement>('#benchmark-panel')
+  if (panel) {
+    panel.hidden = !!document.pointerLockElement
+  }
+})
+
+subscribe(activeModalStack, () => {
+  const panel = document.querySelector<HTMLDivElement>('#benchmark-panel')
+  if (panel && activeModalStack.length > 1) {
+    panel.hidden = true
+  }
+})
+
+export const registerOpenBenchmarkListener = () => {
+  if (appQueryParams.openBenchmark) {
+    void openBenchmark(appQueryParams.renderDistance ? +appQueryParams.renderDistance : undefined)
+  }
+
+  window.addEventListener('keydown', (e) => {
+    if (e.code === 'KeyB' && e.shiftKey && !miscUiState.gameLoaded && activeModalStack.length === 0) {
+      e.preventDefault()
+      void openBenchmark()
+    }
+  })
+}
diff --git a/src/benchmarkAdapter.ts b/src/benchmarkAdapter.ts
new file mode 100644
index 00000000..85fb360b
--- /dev/null
+++ b/src/benchmarkAdapter.ts
@@ -0,0 +1,58 @@
+import { noCase } from 'change-case'
+
+export interface BenchmarkAdapterInfo {
+  benchmarkName: string
+  // general load info
+  worldLoadTimeSeconds: number
+
+  // mesher
+  mesherWorkersCount: number
+  mesherProcessAvgMs: number
+  mesherProcessWorstMs: number
+
+  // rendering backend
+  averageRenderTimeMs: number
+  worstRenderTimeMs: number
+  fpsAveragePrediction: number
+  fpsWorstPrediction: number
+  fpsAverageReal: number
+  fpsWorstReal: number
+
+  // memory total
+  memoryUsageAverage: string
+  memoryUsageWorst: string
+
+  // context info
+  gpuInfo: string
+  hardwareConcurrency: number
+  userAgent: string
+}
+
+export const getAllInfo = (adapter: BenchmarkAdapterInfo) => {
+  return Object.fromEntries(
+    Object.entries(adapter).map(([key, value]) => {
+      if (typeof value === 'function') {
+        value = (value as () => any)()
+      }
+      if (typeof value === 'number') {
+        value = value.toFixed(2)
+      }
+      return [noCase(key), value]
+    })
+  )
+}
+
+export const getAllInfoLines = (adapter: BenchmarkAdapterInfo, delayed = false) => {
+  const info = getAllInfo(adapter)
+  if (delayed) {
+    for (const key in info) {
+      if (key !== 'fpsAveragePrediction' && key !== 'fpsAverageReal') {
+        delete info[key]
+      }
+    }
+  }
+
+  return Object.entries(info).map(([key, value]) => {
+    return `${key}${delayed ? ' (delayed)' : ''}: ${value}`
+  })
+}
diff --git a/src/browserfs.ts b/src/browserfs.ts
index 9fb0771f..a4ae96cc 100644
--- a/src/browserfs.ts
+++ b/src/browserfs.ts
@@ -16,6 +16,7 @@ import { packetsReplayState } from './react/state/packetsReplayState'
 import { createFullScreenProgressReporter } from './core/progressReporter'
 import { showNotification } from './react/NotificationProvider'
 import { resetAppStorage } from './react/appStorageProvider'
+import { ConnectOptions } from './connect'
 const { GoogleDriveFileSystem } = require('google-drive-browserfs/src/backends/GoogleDrive')
 
 browserfs.install(window)
@@ -558,7 +559,7 @@ export const openWorldFromHttpDir = async (fileDescriptorUrls: string[]/*  | und
 }
 
 // todo rename method
-const openWorldZipInner = async (file: File | ArrayBuffer, name = file['name']) => {
+const openWorldZipInner = async (file: File | ArrayBuffer, name = file['name'], connectOptions?: Partial<ConnectOptions>) => {
   await new Promise<void>(async resolve => {
     browserfs.configure({
       // todo
@@ -603,7 +604,7 @@ const openWorldZipInner = async (file: File | ArrayBuffer, name = file['name'])
     }
 
     if (availableWorlds.length === 1) {
-      await loadSave(`/world/${availableWorlds[0]}`)
+      await loadSave(`/world/${availableWorlds[0]}`, connectOptions)
       return
     }
 
diff --git a/src/connect.ts b/src/connect.ts
index 5afdb0f6..134b86da 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -15,7 +15,7 @@ export type ConnectOptions = {
   singleplayer?: any
   username: string
   proxy?: string
-  botVersion?: any
+  botVersion?: string
   serverOverrides?
   serverOverridesFlat?
   peerId?: string
@@ -23,7 +23,6 @@ export type ConnectOptions = {
   onSuccessfulPlay?: () => void
   autoLoginPassword?: string
   serverIndex?: string
-  /** If true, will show a UI to authenticate with a new account */
   authenticatedAccount?: AuthenticatedAccount | true
   peerOptions?: any
   viewerWsConnect?: string
@@ -31,6 +30,15 @@ export type ConnectOptions = {
 
   /** Will enable local replay server */
   worldStateFileContents?: string
+
+  connectEvents?: {
+    serverCreated?: () => void
+    // connect: () => void;
+    // disconnect: () => void;
+    // error: (err: any) => void;
+    // ready: () => void;
+    // end: () => void;
+  }
 }
 
 export const getVersionAutoSelect = (autoVersionSelect = options.serversAutoVersionSelect) => {
diff --git a/src/downloadAndOpenFile.ts b/src/downloadAndOpenFile.ts
index 78cd6984..32d5ae10 100644
--- a/src/downloadAndOpenFile.ts
+++ b/src/downloadAndOpenFile.ts
@@ -5,6 +5,7 @@ import { setLoadingScreenStatus } from './appStatus'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 import { VALID_REPLAY_EXTENSIONS, openFile } from './packetsReplay/replayPackets'
 import { createFullScreenProgressReporter } from './core/progressReporter'
+import { ConnectOptions } from './connect'
 
 export const getFixedFilesize = (bytes: number) => {
   return prettyBytes(bytes, { minimumFractionDigits: 2, maximumFractionDigits: 2 })
@@ -65,24 +66,29 @@ const inner = async () => {
     await openWorldFromHttpDir(mapUrlDir, mapUrlDirBaseUrl ?? undefined)
     return true
   }
+
   if (mapUrlDirGuess) {
     // await openWorldFromHttpDir(undefined, mapUrlDirGuess)
     return true
   }
-  let mapUrl = appQueryParams.map
-  const { texturepack } = appQueryParams
+
+  const { map, texturepack } = appQueryParams
+  return downloadAndOpenMapFromUrl(map, texturepack)
+}
+
+export const downloadAndOpenMapFromUrl = async (mapUrl: string | undefined, texturepackUrl: string | undefined, connectOptions?: Partial<ConnectOptions>) => {
   // fixme
-  if (texturepack) mapUrl = texturepack
+  if (texturepackUrl) mapUrl = texturepackUrl
   if (!mapUrl) return false
 
-  if (texturepack) {
+  if (texturepackUrl) {
     await updateTexturePackInstalledState()
     if (resourcePackState.resourcePackInstalled) {
       if (!confirm(`You are going to install a new resource pack, which will REPLACE the current one: ${await getResourcePackNames()[0]} Continue?`)) return
     }
   }
   const name = mapUrl.slice(mapUrl.lastIndexOf('/') + 1).slice(-25)
-  const downloadThing = texturepack ? 'texturepack' : 'world'
+  const downloadThing = texturepackUrl ? 'texturepack' : 'world'
   setLoadingScreenStatus(`Downloading ${downloadThing} ${name}...`)
 
   const response = await fetch(mapUrl)
@@ -115,25 +121,25 @@ const inner = async () => {
         const progress = contentLength ? (downloadedBytes / contentLength) * 100 : undefined
         setLoadingScreenStatus(`Download ${downloadThing} progress: ${progress === undefined ? '?' : Math.floor(progress)}% (${getFixedFilesize(downloadedBytes)} / ${contentLength && getFixedFilesize(contentLength)})`, false, true)
 
-
         // Pass the received data to the controller
         controller.enqueue(value)
       }
     },
   })).arrayBuffer()
-  if (texturepack) {
+  if (texturepackUrl) {
     const name = mapUrl.slice(mapUrl.lastIndexOf('/') + 1).slice(-30)
     await installResourcepackPack(buffer, createFullScreenProgressReporter(), name)
   } else {
-    await openWorldZip(buffer)
+    await openWorldZip(buffer, undefined, connectOptions)
   }
+  return true
 }
 
 export default async () => {
   try {
     return await inner()
   } catch (err) {
-    setLoadingScreenStatus(`Failed to download. Either refresh page or remove map param from URL. Reason: ${err.message}`)
+    setLoadingScreenStatus(`Failed to download/open. Either refresh page or remove map param from URL. Reason: ${err.message}`)
     return true
   }
 }
diff --git a/src/index.ts b/src/index.ts
index b8a52a49..fca2d8c1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -96,6 +96,7 @@ import { localRelayServerPlugin } from './mineflayer/plugins/packetsRecording'
 import { createConsoleLogProgressReporter, createFullScreenProgressReporter, ProgressReporter } from './core/progressReporter'
 import { appViewer } from './appViewer'
 import './appViewerLoad'
+import { registerOpenBenchmarkListener } from './benchmark'
 
 window.debug = debug
 window.beforeRenderFrame = []
@@ -119,13 +120,22 @@ function hideCurrentScreens () {
   insertActiveModalStack('', [])
 }
 
-const loadSingleplayer = (serverOverrides = {}, flattenedServerOverrides = {}) => {
+const loadSingleplayer = (serverOverrides = {}, flattenedServerOverrides = {}, connectOptions?: Partial<ConnectOptions>) => {
   const serverSettingsQsRaw = appQueryParamsArray.serverSetting ?? []
   const serverSettingsQs = serverSettingsQsRaw.map(x => x.split(':')).reduce<Record<string, string>>((acc, [key, value]) => {
     acc[key] = JSON.parse(value)
     return acc
   }, {})
-  void connect({ singleplayer: true, username: options.localUsername, serverOverrides, serverOverridesFlat: { ...flattenedServerOverrides, ...serverSettingsQs } })
+  void connect({
+    singleplayer: true,
+    username: options.localUsername,
+    serverOverrides,
+    serverOverridesFlat: {
+      ...flattenedServerOverrides,
+      ...serverSettingsQs
+    },
+    ...connectOptions
+  })
 }
 function listenGlobalEvents () {
   window.addEventListener('connect', e => {
@@ -133,7 +143,9 @@ function listenGlobalEvents () {
     void connect(options)
   })
   window.addEventListener('singleplayer', (e) => {
-    loadSingleplayer((e as CustomEvent).detail)
+    const { detail } = (e as CustomEvent)
+    const { connectOptions, ...rest } = detail
+    loadSingleplayer(rest, {}, connectOptions)
   })
 }
 
@@ -348,6 +360,7 @@ export async function connect (connectOptions: ConnectOptions) {
       // flying-squid: 'login' -> player.login -> now sends 'login' event to the client (handled in many plugins in mineflayer) -> then 'update_health' is sent which emits 'spawn' in mineflayer
 
       localServer = window.localServer = window.server = startLocalServer(serverOptions)
+      connectOptions?.connectEvents?.serverCreated?.()
       // todo need just to call quit if started
       // loadingScreen.maybeRecoverable = false
       // init world, todo: do it for any async plugins
@@ -644,13 +657,15 @@ export async function connect (connectOptions: ConnectOptions) {
     setLoadingScreenStatus('Loading world')
   })
 
-  const loadStart = Date.now()
   let worldWasReady = false
   const waitForChunksToLoad = async (progress?: ProgressReporter) => {
     await new Promise<void>(resolve => {
+      if (worldWasReady) {
+        resolve()
+        return
+      }
       const unsub = subscribe(appViewer.rendererState, () => {
-        if (worldWasReady) return
-        if (appViewer.rendererState.world.allChunksLoaded) {
+        if (appViewer.rendererState.world.allChunksLoaded && appViewer.nonReactiveState.world.chunksTotalNumber) {
           worldWasReady = true
           resolve()
           unsub()
@@ -662,11 +677,6 @@ export async function connect (connectOptions: ConnectOptions) {
     })
   }
 
-  void waitForChunksToLoad().then(() => {
-    console.log('All chunks done and ready! Time from renderer connect to ready', (Date.now() - loadStart) / 1000, 's')
-    document.dispatchEvent(new Event('cypress-world-ready'))
-  })
-
   const spawnEarlier = !singleplayer && !p2pMultiplayer
   const displayWorld = async () => {
     if (resourcePackState.isServerInstalling) {
@@ -679,11 +689,18 @@ export async function connect (connectOptions: ConnectOptions) {
       })
       await appViewer.resourcesManager.promiseAssetsReady
     }
-    console.log('try to focus window')
-    window.focus?.()
     errorAbortController.abort()
     if (appStatusState.isError) return
 
+    const loadWorldStart = Date.now()
+    console.log('try to focus window')
+    window.focus?.()
+    void waitForChunksToLoad().then(() => {
+      window.worldLoadTime = (Date.now() - loadWorldStart) / 1000
+      console.log('All chunks done and ready! Time from renderer connect to ready', (Date.now() - loadWorldStart) / 1000, 's')
+      document.dispatchEvent(new Event('cypress-world-ready'))
+    })
+
     try {
       if (p2pConnectTimeout) clearTimeout(p2pConnectTimeout)
       playerState.onlineMode = !!connectOptions.authenticatedAccount
@@ -932,7 +949,7 @@ if (!reconnectOptions) {
     }
   }, (err) => {
     console.error(err)
-    alert(`Failed to download file: ${err}`)
+    alert(`Something went wrong: ${err}`)
   })
 }
 
@@ -945,3 +962,4 @@ if (initialLoader) {
 window.pageLoaded = true
 
 void possiblyHandleStateVariable()
+registerOpenBenchmarkListener()
diff --git a/src/loadSave.ts b/src/loadSave.ts
index c672193c..7c9f7277 100644
--- a/src/loadSave.ts
+++ b/src/loadSave.ts
@@ -11,6 +11,7 @@ import { isMajorVersionGreater } from './utils'
 
 import { activeModalStacks, insertActiveModalStack, miscUiState } from './globalState'
 import supportedVersions from './supportedVersions.mjs'
+import { ConnectOptions } from './connect'
 import { appQueryParams } from './appParams'
 
 // todo include name of opened handle (zip)!
@@ -49,7 +50,7 @@ export const readLevelDat = async (path) => {
   return { levelDat, dataRaw: parsed.value.Data!.value as Record<string, any> }
 }
 
-export const loadSave = async (root = '/world') => {
+export const loadSave = async (root = '/world', connectOptions?: Partial<ConnectOptions>) => {
   // todo test
   if (miscUiState.gameLoaded) {
     await disconnect()
@@ -194,7 +195,8 @@ export const loadSave = async (root = '/world') => {
       } : {},
       ...root === '/world' ? {} : {
         'worldFolder': root
-      }
+      },
+      connectOptions
     },
   }))
 }
diff --git a/src/mineflayer/timers.ts b/src/mineflayer/timers.ts
index 698b624e..99110718 100644
--- a/src/mineflayer/timers.ts
+++ b/src/mineflayer/timers.ts
@@ -1,9 +1,71 @@
+import { subscribeKey } from 'valtio/utils'
 import { preventThrottlingWithSound } from '../core/timers'
 import { options } from '../optionsStorage'
 
 customEvents.on('mineflayerBotCreated', () => {
-  if (options.preventBackgroundTimeoutKick) {
-    const unsub = preventThrottlingWithSound()
-    bot.on('end', unsub)
+  const abortController = new AbortController()
+
+  const maybeGoBackgroundKickPrevention = () => {
+    if (options.preventBackgroundTimeoutKick && !bot.backgroundKickPrevention) {
+      const unsub = preventThrottlingWithSound()
+      bot.on('end', unsub)
+      bot.backgroundKickPrevention = true
+    }
   }
+  maybeGoBackgroundKickPrevention()
+  subscribeKey(options, 'preventBackgroundTimeoutKick', (value) => {
+    maybeGoBackgroundKickPrevention()
+  })
+
+  // wake lock
+  const requestWakeLock = async () => {
+    if (!('wakeLock' in navigator)) {
+      console.warn('Wake Lock API is not supported in this browser')
+      return
+    }
+
+    if (options.preventSleep && !bot.wakeLock && !bot.lockRequested) {
+      bot.lockRequested = true
+      bot.wakeLock = await navigator.wakeLock.request('screen').finally(() => {
+        bot.lockRequested = false
+      })
+
+      bot.wakeLock.addEventListener('release', () => {
+        bot.wakeLock = undefined
+      }, {
+        once: true,
+      })
+    }
+
+    if (!options.preventSleep && bot.wakeLock) {
+      void bot.wakeLock.release()
+    }
+  }
+  document.addEventListener('visibilitychange', () => {
+    if (document.visibilityState === 'visible') {
+      // we are back to the tab, request wake lock again
+      void requestWakeLock()
+    }
+  }, {
+    signal: abortController.signal,
+  })
+  void requestWakeLock()
+  subscribeKey(options, 'preventSleep', (value) => {
+    void requestWakeLock()
+  })
+
+  bot.on('end', () => {
+    if (bot.wakeLock) {
+      void bot.wakeLock.release()
+    }
+    abortController.abort()
+  })
 })
+
+declare module 'mineflayer' {
+  interface Bot {
+    backgroundKickPrevention?: boolean
+    wakeLock?: WakeLockSentinel
+    lockRequested?: boolean
+  }
+}
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 5b83922f..ef8d9a8e 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -526,7 +526,11 @@ export const guiOptionsScheme: {
       },
     },
     {
-      preventBackgroundTimeoutKick: {}
+      preventBackgroundTimeoutKick: {},
+      preventSleep: {
+        disabledReason: navigator.wakeLock ? undefined : 'Your browser does not support wake lock API',
+        enableWarning: 'When connected to a server, prevent PC from sleeping or screen dimming. Useful for purpusely staying AFK for long time. Some events might still prevent this like loosing tab focus or going low power mode.',
+      },
     },
     {
       custom () {
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 3d021903..4d76ba0c 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -65,6 +65,7 @@ const defaultOptions = {
   waitForChunksRender: 'sp-only' as 'sp-only' | boolean,
   jeiEnabled: true as boolean | Array<'creative' | 'survival' | 'adventure' | 'spectator'>,
   preventBackgroundTimeoutKick: false,
+  preventSleep: false,
 
   // antiAliasing: false,
 
diff --git a/src/react/IndicatorEffects.tsx b/src/react/IndicatorEffects.tsx
index 18ab0785..5b05290f 100644
--- a/src/react/IndicatorEffects.tsx
+++ b/src/react/IndicatorEffects.tsx
@@ -46,7 +46,8 @@ export const defaultIndicatorsState = {
   readonlyFiles: false,
   writingFiles: false, // saving
   appHasErrors: false,
-  connectionIssues: 0
+  connectionIssues: 0,
+  preventSleep: false,
 }
 
 const indicatorIcons: Record<keyof typeof defaultIndicatorsState, string> = {
@@ -56,6 +57,7 @@ const indicatorIcons: Record<keyof typeof defaultIndicatorsState, string> = {
   appHasErrors: 'alert',
   readonlyFiles: 'file-off',
   connectionIssues: pixelartIcons['cellular-signal-off'],
+  preventSleep: pixelartIcons.moon,
 }
 
 const colorOverrides = {
diff --git a/src/react/IndicatorEffectsProvider.tsx b/src/react/IndicatorEffectsProvider.tsx
index 83b321ee..1913fb7b 100644
--- a/src/react/IndicatorEffectsProvider.tsx
+++ b/src/react/IndicatorEffectsProvider.tsx
@@ -1,5 +1,5 @@
 import { proxy, subscribe, useSnapshot } from 'valtio'
-import { useEffect, useMemo } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import { subscribeKey } from 'valtio/utils'
 import { inGameError } from '../utils'
 import { fsState } from '../loadSave'
@@ -51,6 +51,7 @@ const getEffectIndex = (newEffect: EffectType) => {
 }
 
 export default () => {
+  const [dummyState, setDummyState] = useState(false)
   const stateIndicators = useSnapshot(state.indicators)
   const chunksLoading = !useSnapshot(appViewer.rendererState).world.allChunksLoaded
   const { mesherWork } = useSnapshot(appViewer.rendererState).world
@@ -66,12 +67,21 @@ export default () => {
     appHasErrors: hasErrors,
     connectionIssues: poorConnection ? 1 : noConnection ? 2 : 0,
     chunksLoading,
+    preventSleep: !!bot.wakeLock,
     // mesherWork,
     ...stateIndicators,
   }
 
   const effects = useSnapshot(state.effects)
 
+  useEffect(() => {
+    // update bot related states
+    const interval = setInterval(() => {
+      setDummyState(s => !s)
+    }, 1000)
+    return () => clearInterval(interval)
+  }, [])
+
   useMemo(() => {
     const effectsImages = Object.fromEntries(loadedData.effectsArray.map((effect) => {
       const nameKebab = effect.name.replaceAll(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`).slice(1)

From 27e51b65df48edbabf978a761eb7b1e3a7e8f2d0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 02:26:11 +0300
Subject: [PATCH 425/753] refactor: rename benchmarkName to fixture and update
 related logic in benchmark files

---
 src/benchmark.ts        | 10 +++++-----
 src/benchmarkAdapter.ts |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/benchmark.ts b/src/benchmark.ts
index b3efa307..56983e22 100644
--- a/src/benchmark.ts
+++ b/src/benchmark.ts
@@ -42,14 +42,14 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
     }
   }, 200)
 
-  let benchmarkName = `${fixture.url}`
+  let fixtureName = `${fixture.url}`
   if (fixture.spawn) {
-    benchmarkName += ` - ${fixture.spawn.join(',')}`
+    fixtureName += ` - ${fixture.spawn.join(',')}`
   }
-  benchmarkName += ` - ${renderDistance}`
+  fixtureName += ` - ${renderDistance}`
   const benchmarkAdapter: BenchmarkAdapterInfo = {
-    get benchmarkName () {
-      return benchmarkName
+    get fixture () {
+      return fixtureName
     },
     get worldLoadTimeSeconds () {
       return window.worldLoadTime
diff --git a/src/benchmarkAdapter.ts b/src/benchmarkAdapter.ts
index 85fb360b..4938fd76 100644
--- a/src/benchmarkAdapter.ts
+++ b/src/benchmarkAdapter.ts
@@ -1,7 +1,7 @@
 import { noCase } from 'change-case'
 
 export interface BenchmarkAdapterInfo {
-  benchmarkName: string
+  fixture: string
   // general load info
   worldLoadTimeSeconds: number
 

From 568ea3d18b7f6f2dbac1e0fe04f7431d51d157b0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 12:49:24 +0300
Subject: [PATCH 426/753] adjust default render distance to match testing on ci

---
 src/benchmark.ts        | 5 ++++-
 src/benchmarkAdapter.ts | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/benchmark.ts b/src/benchmark.ts
index 56983e22..e49b8164 100644
--- a/src/benchmark.ts
+++ b/src/benchmark.ts
@@ -8,7 +8,7 @@ import { disabledSettings, options } from './optionsStorage'
 import { BenchmarkAdapterInfo, getAllInfoLines } from './benchmarkAdapter'
 import { appQueryParams } from './appParams'
 
-const DEFAULT_RENDER_DISTANCE = 8
+const DEFAULT_RENDER_DISTANCE = 5
 
 const fixtures = {
   default: {
@@ -60,6 +60,9 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
     get mesherProcessAvgMs () {
       return (window.world as WorldRendererCommon).workersProcessAverageTime
     },
+    get mesherProcessTotalMs () {
+      return (window.world as WorldRendererCommon).workersProcessAverageTime * (window.world as WorldRendererCommon).workersProcessAverageTimeCount
+    },
     get mesherProcessWorstMs () {
       return (window.world as WorldRendererCommon).maxWorkersProcessTime
     },
diff --git a/src/benchmarkAdapter.ts b/src/benchmarkAdapter.ts
index 4938fd76..3ae72a4c 100644
--- a/src/benchmarkAdapter.ts
+++ b/src/benchmarkAdapter.ts
@@ -9,6 +9,7 @@ export interface BenchmarkAdapterInfo {
   mesherWorkersCount: number
   mesherProcessAvgMs: number
   mesherProcessWorstMs: number
+  mesherProcessTotalMs: number
 
   // rendering backend
   averageRenderTimeMs: number

From 3109be2d8ade83aa2ab9b781fe18910243868775 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 12:49:33 +0300
Subject: [PATCH 427/753] universal load backend + fallback

---
 src/appViewerLoad.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/appViewerLoad.ts b/src/appViewerLoad.ts
index 09649b3f..8110ac89 100644
--- a/src/appViewerLoad.ts
+++ b/src/appViewerLoad.ts
@@ -4,13 +4,18 @@ import { options } from './optionsStorage'
 import { appViewer } from './appViewer'
 import { miscUiState } from './globalState'
 import { watchOptionsAfterViewerInit } from './watchOptions'
+import { showNotification } from './react/NotificationProvider'
 
+const backends = [
+  createGraphicsBackend,
+]
 const loadBackend = () => {
-  if (options.activeRenderer === 'webgpu') {
-    // appViewer.loadBackend(createWebgpuBackend)
-  } else {
-    appViewer.loadBackend(createGraphicsBackend)
+  let backend = backends.find(backend => backend.id === options.activeRenderer)
+  if (!backend) {
+    showNotification(`No backend found for renderer ${options.activeRenderer}`, `Falling back to ${backends[0].id}`, true)
+    backend = backends[0]
   }
+  appViewer.loadBackend(backend)
 }
 window.loadBackend = loadBackend
 if (process.env.SINGLE_FILE_BUILD_MODE) {

From 881d105c5713da2570d9c49cca36c1a4dea63cbf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 13:42:13 +0300
Subject: [PATCH 428/753] always render debug

---
 src/benchmark.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/benchmark.ts b/src/benchmark.ts
index e49b8164..5a6d3c24 100644
--- a/src/benchmark.ts
+++ b/src/benchmark.ts
@@ -106,6 +106,9 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
 
   disabledSettings.value.add('renderDistance')
   options.renderDistance = renderDistance
+  disabledSettings.value.add('renderDebug')
+  options.renderDebug = 'advanced'
+
   void downloadAndOpenMapFromUrl(fixture.url, undefined, {
     connectEvents: {
       serverCreated () {

From 23bab8dbd522f42a6cf17e0457ab9c4fbc3da7ad Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 13:55:18 +0300
Subject: [PATCH 429/753] basically fix all the debug panes, record that info

---
 renderer/viewer/lib/ui/newStats.ts          |  7 ++
 renderer/viewer/lib/worldrendererCommon.ts  | 44 +++++++++--
 renderer/viewer/three/worldrendererThree.ts | 19 ++++-
 src/benchmark.ts                            | 83 ++++++++++++++++++++-
 src/benchmarkAdapter.ts                     |  8 +-
 src/index.ts                                |  2 +-
 6 files changed, 147 insertions(+), 16 deletions(-)

diff --git a/renderer/viewer/lib/ui/newStats.ts b/renderer/viewer/lib/ui/newStats.ts
index 6c84ef69..8ccd4e57 100644
--- a/renderer/viewer/lib/ui/newStats.ts
+++ b/renderer/viewer/lib/ui/newStats.ts
@@ -40,6 +40,13 @@ export const updateStatText = (id, text) => {
   stats[id].innerText = text
 }
 
+export const updatePanesVisibility = (visible: boolean) => {
+  // eslint-disable-next-line guard-for-in
+  for (const id in stats) {
+    stats[id].style.display = visible ? 'block' : 'none'
+  }
+}
+
 export const removeAllStats = () => {
   // eslint-disable-next-line guard-for-in
   for (const id in stats) {
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 2e3ff5d2..5f845dbc 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -11,12 +11,12 @@ import { subscribeKey } from 'valtio/utils'
 import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
 import { toMajorVersion } from '../../../src/utils'
 import { ResourcesManager } from '../../../src/resourcesManager'
-import { DisplayWorldOptions, RendererReactiveState } from '../../../src/appViewer'
+import { DisplayWorldOptions, GraphicsInitOptions, RendererReactiveState } from '../../../src/appViewer'
 import { SoundSystem } from '../three/threeJsSound'
 import { buildCleanupDecorator } from './cleanupDecorator'
 import { HighestBlockInfo, MesherGeometryOutput, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig } from './mesher/shared'
 import { chunkPos } from './simpleUtils'
-import { removeAllStats, removeStat, updateStatText } from './ui/newStats'
+import { addNewStat, removeAllStats, removeStat, updatePanesVisibility, updateStatText } from './ui/newStats'
 import { WorldDataEmitter } from './worldDataEmitter'
 import { IPlayerState } from './basePlayerState'
 
@@ -53,7 +53,6 @@ export const defaultWorldRendererConfig = {
 export type WorldRendererConfig = typeof defaultWorldRendererConfig
 
 export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any> {
-  displayStats = true
   worldSizeParams = { minY: 0, worldHeight: 256 }
 
   active = false
@@ -145,8 +144,23 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     contents: [] as string[],
     active: new URL(location.href).searchParams.get('mesherlog') === 'true'
   }
+  currentRenderedFrames = 0
+  fpsAverage = 0
+  fpsWorst = undefined as number | undefined
+  fpsSamples = 0
+  mainThreadRendering = true
+  backendInfoReport = '-'
+  chunksFullInfo = '-'
 
-  constructor (public readonly resourcesManager: ResourcesManager, public displayOptions: DisplayWorldOptions, public version: string) {
+  get version () {
+    return this.displayOptions.version
+  }
+
+  get displayAdvancedStats () {
+    return (this.initOptions.config.statsVisible ?? 0) > 1
+  }
+
+  constructor (public readonly resourcesManager: ResourcesManager, public displayOptions: DisplayWorldOptions, public initOptions: GraphicsInitOptions) {
     // this.initWorkers(1) // preload script on page load
     this.snapshotInitialValues()
     this.worldRendererConfig = displayOptions.inWorldRenderingConfig
@@ -158,15 +172,32 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       updateStatText('loaded-chunks', `${loadedChunks}/${this.chunksLength} chunks (${this.lastChunkDistance}/${this.viewDistance})`)
     })
 
+    addNewStat('downloaded-chunks', 100, 140, 20)
+
     this.connect(this.displayOptions.worldView)
 
     setInterval(() => {
       this.geometryReceiveCountPerSec = Object.values(this.geometryReceiveCount).reduce((acc, curr) => acc + curr, 0)
       this.geometryReceiveCount = {}
+      updatePanesVisibility(this.displayAdvancedStats)
       this.updateChunksStats()
+      if (this.mainThreadRendering) {
+        this.fpsUpdate()
+      }
     }, 1000)
   }
 
+  fpsUpdate () {
+    this.fpsSamples++
+    this.fpsAverage = (this.fpsAverage * (this.fpsSamples - 1) + this.currentRenderedFrames) / this.fpsSamples
+    if (this.fpsWorst === undefined) {
+      this.fpsWorst = this.currentRenderedFrames
+    } else {
+      this.fpsWorst = Math.min(this.fpsWorst, this.currentRenderedFrames)
+    }
+    this.currentRenderedFrames = 0
+  }
+
   logWorkerWork (message: string | (() => string)) {
     if (!this.workerLogger.active) return
     this.workerLogger.contents.push(typeof message === 'function' ? message() : message)
@@ -444,7 +475,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   // new game load happens here
   async setVersion (version: string) {
-    this.version = version
     this.resetWorld()
 
     // for workers in single file build
@@ -525,7 +555,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.displayOptions.nonReactiveState.world.chunksTotalNumber = this.chunksLength
     this.reactiveState.world.allChunksLoaded = this.allChunksFinished
 
-    updateStatText('downloaded-chunks', `${Object.keys(this.loadedChunks).length}/${this.chunksLength} chunks D (${this.workers.length}:${this.workersProcessAverageTime.toFixed(0)}ms/${this.geometryReceiveCountPerSec}ss/${this.allLoadedIn?.toFixed(1) ?? '-'}s)`)
+    const text = `Q: ${this.messageQueue.length} ${Object.keys(this.loadedChunks).length}/${Object.keys(this.finishedChunks).length}/${this.chunksLength} chunks (${this.workers.length}:${this.workersProcessAverageTime.toFixed(0)}ms/${this.geometryReceiveCountPerSec}ss/${this.allLoadedIn?.toFixed(1) ?? '-'}s)`
+    this.chunksFullInfo = text
+    updateStatText('downloaded-chunks', text)
   }
 
   addColumn (x: number, z: number, chunk: any, isLightUpdate: boolean) {
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 7b82953b..ac31d686 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -62,7 +62,7 @@ export class WorldRendererThree extends WorldRendererCommon {
 
   constructor (public renderer: THREE.WebGLRenderer, public initOptions: GraphicsInitOptions, public displayOptions: DisplayWorldOptions) {
     if (!initOptions.resourcesManager) throw new Error('resourcesManager is required')
-    super(initOptions.resourcesManager, displayOptions, displayOptions.version)
+    super(initOptions.resourcesManager, displayOptions, initOptions)
 
     displayOptions.rendererState.renderer = WorldRendererThree.getRendererInfo(renderer) ?? '...'
     this.starField = new StarField(this.scene)
@@ -233,9 +233,19 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.debugOverlayAdded = true
     const pane = addNewStat('debug-overlay')
     setInterval(() => {
-      pane.setVisibility(this.displayStats)
-      if (this.displayStats) {
-        pane.updateText(`C: ${this.renderer.info.render.calls} TR: ${this.renderer.info.render.triangles} TE: ${this.renderer.info.memory.textures} F: ${this.tilesRendered} B: ${this.blocksRendered}`)
+      pane.setVisibility(this.displayAdvancedStats)
+      if (this.displayAdvancedStats) {
+        const formatBigNumber = (num: number) => {
+          return new Intl.NumberFormat('en-US', {}).format(num)
+        }
+        let text = ''
+        text += `C: ${formatBigNumber(this.renderer.info.render.calls)} `
+        text += `TR: ${formatBigNumber(this.renderer.info.render.triangles)} `
+        text += `TE: ${formatBigNumber(this.renderer.info.memory.textures)} `
+        text += `F: ${formatBigNumber(this.tilesRendered)} `
+        text += `B: ${formatBigNumber(this.blocksRendered)}`
+        pane.updateText(text)
+        this.backendInfoReport = text
       }
     }, 200)
   }
@@ -434,6 +444,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.renderTimeAvgCount++
     this.renderTimeAvg = ((this.renderTimeAvg * (this.renderTimeAvgCount - 1)) + totalTime) / this.renderTimeAvgCount
     this.renderTimeMax = Math.max(this.renderTimeMax, totalTime)
+    this.currentRenderedFrames++
   }
 
   renderHead (position: Vec3, rotation: number, isWall: boolean, blockEntity) {
diff --git a/src/benchmark.ts b/src/benchmark.ts
index 5a6d3c24..f097569b 100644
--- a/src/benchmark.ts
+++ b/src/benchmark.ts
@@ -7,6 +7,8 @@ import { activeModalStack, miscUiState } from './globalState'
 import { disabledSettings, options } from './optionsStorage'
 import { BenchmarkAdapterInfo, getAllInfoLines } from './benchmarkAdapter'
 import { appQueryParams } from './appParams'
+import { getScreenRefreshRate } from './utils'
+import { setLoadingScreenStatus } from './appStatus'
 
 const DEFAULT_RENDER_DISTANCE = 5
 
@@ -20,6 +22,19 @@ const fixtures = {
 Error.stackTraceLimit = Error.stackTraceLimit < 30 ? 30 : Error.stackTraceLimit
 
 export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) => {
+  const SESSION_STORAGE_BACKUP_KEY = 'benchmark-backup'
+  if (sessionStorage.getItem(SESSION_STORAGE_BACKUP_KEY)) {
+    const backup = JSON.stringify(JSON.parse(sessionStorage.getItem(SESSION_STORAGE_BACKUP_KEY)!), null, 2)
+    setLoadingScreenStatus('Either other tab with benchmark is open or page crashed. Last data backup is downloaded. Reload page to retry.')
+    // download file
+    const a = document.createElement('a')
+    a.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(backup)
+    a.download = `benchmark-${appViewer.backend?.id}.txt`
+    a.click()
+    sessionStorage.removeItem(SESSION_STORAGE_BACKUP_KEY)
+    return
+  }
+
   const fixture: {
     url: string
     spawn?: [number, number, number]
@@ -42,11 +57,47 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
     }
   }, 200)
 
+  let mainThreadFpsAverage = 0
+  let mainThreadFpsWorst = undefined as number | undefined
+  let mainThreadFpsSamples = 0
+  let currentPassedFrames = 0
+  const mainLoop = () => {
+    currentPassedFrames++
+    requestAnimationFrame(mainLoop)
+  }
+  requestAnimationFrame(mainLoop)
+  setInterval(() => {
+    mainThreadFpsAverage = (mainThreadFpsAverage * mainThreadFpsSamples + currentPassedFrames) / (mainThreadFpsSamples + 1)
+    mainThreadFpsSamples++
+    if (mainThreadFpsWorst === undefined) {
+      mainThreadFpsWorst = currentPassedFrames
+    } else {
+      mainThreadFpsWorst = Math.min(mainThreadFpsWorst, currentPassedFrames)
+    }
+    currentPassedFrames = 0
+  }, 1000)
+
   let fixtureName = `${fixture.url}`
   if (fixture.spawn) {
-    fixtureName += ` - ${fixture.spawn.join(',')}`
+    fixtureName += ` - ${fixture.spawn.join(' ')}`
   }
   fixtureName += ` - ${renderDistance}`
+  if (process.env.NODE_ENV !== 'development') { // do not delay
+    setLoadingScreenStatus('Benchmark requested... Getting screen refresh rate')
+    await new Promise(resolve => {
+      setTimeout(resolve, 1000)
+    })
+  }
+  let start = 0
+  // interval to backup data in sessionStorage in case of page crash
+  const saveBackupInterval = setInterval(() => {
+    if (!window.world) return
+    const backup = JSON.parse(JSON.stringify(window.benchmarkAdapter))
+    backup.timePassed = ((Date.now() - start) / 1000).toFixed(2)
+    sessionStorage.setItem(SESSION_STORAGE_BACKUP_KEY, JSON.stringify(backup))
+  }, 500)
+
+  const screenRefreshRate = await getScreenRefreshRate()
   const benchmarkAdapter: BenchmarkAdapterInfo = {
     get fixture () {
       return fixtureName
@@ -66,6 +117,9 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
     get mesherProcessWorstMs () {
       return (window.world as WorldRendererCommon).maxWorkersProcessTime
     },
+    get chunksFullInfo () {
+      return (window.world as WorldRendererCommon).chunksFullInfo
+    },
     get averageRenderTimeMs () {
       return (window.world as WorldRendererCommon).renderTimeAvg
     },
@@ -81,10 +135,19 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
       return 1000 / maxRenderTime
     },
     get fpsAverageReal () {
-      return -1
+      return `${(window.world as WorldRendererCommon).fpsAverage.toFixed(0)} / ${screenRefreshRate}`
     },
     get fpsWorstReal () {
-      return -1
+      return (window.world as WorldRendererCommon).fpsWorst ?? -1
+    },
+    get backendInfoReport () {
+      return (window.world as WorldRendererCommon).backendInfoReport
+    },
+    get fpsAverageMainThread () {
+      return mainThreadFpsAverage
+    },
+    get fpsWorstMainThread () {
+      return mainThreadFpsWorst ?? -1
     },
     get memoryUsageAverage () {
       return prettyBytes(memoryUsageAverage)
@@ -117,6 +180,7 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
           localServer!.on('newPlayer', (player) => {
             player.on('dataLoaded', () => {
               player.position = new Vec3(...fixture.spawn!)
+              start = Date.now()
             })
           })
         }
@@ -124,13 +188,20 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
     }
   })
   document.addEventListener('cypress-world-ready', () => {
+    clearInterval(saveBackupInterval)
+    sessionStorage.removeItem(SESSION_STORAGE_BACKUP_KEY)
     let stats = getAllInfoLines(window.benchmarkAdapter)
-    if (appQueryParams.downloadBenchmark) {
+    const downloadFile = () => {
+      // const changedSettings =
+
       const a = document.createElement('a')
       a.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(stats.join('\n'))
       a.download = `benchmark-${appViewer.backend?.id}.txt`
       a.click()
     }
+    if (appQueryParams.downloadBenchmark) {
+      downloadFile()
+    }
 
     const panel = document.createElement('div')
     panel.style.position = 'fixed'
@@ -179,6 +250,10 @@ export const registerOpenBenchmarkListener = () => {
   window.addEventListener('keydown', (e) => {
     if (e.code === 'KeyB' && e.shiftKey && !miscUiState.gameLoaded && activeModalStack.length === 0) {
       e.preventDefault()
+      // add ?openBenchmark=true to url without reload
+      const url = new URL(window.location.href)
+      url.searchParams.set('openBenchmark', 'true')
+      window.history.replaceState({}, '', url.toString())
       void openBenchmark()
     }
   })
diff --git a/src/benchmarkAdapter.ts b/src/benchmarkAdapter.ts
index 3ae72a4c..85e02b89 100644
--- a/src/benchmarkAdapter.ts
+++ b/src/benchmarkAdapter.ts
@@ -10,14 +10,20 @@ export interface BenchmarkAdapterInfo {
   mesherProcessAvgMs: number
   mesherProcessWorstMs: number
   mesherProcessTotalMs: number
+  chunksFullInfo: string
 
   // rendering backend
   averageRenderTimeMs: number
   worstRenderTimeMs: number
   fpsAveragePrediction: number
   fpsWorstPrediction: number
-  fpsAverageReal: number
+  fpsAverageReal: string
   fpsWorstReal: number
+  backendInfoReport: string
+
+  // main thread
+  fpsAverageMainThread: number
+  fpsWorstMainThread: number
 
   // memory total
   memoryUsageAverage: string
diff --git a/src/index.ts b/src/index.ts
index fca2d8c1..f51311ae 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -708,7 +708,7 @@ export async function connect (connectOptions: ConnectOptions) {
       progress.setMessage('Placing blocks (starting viewer)')
       if (!connectOptions.worldStateFileContents || connectOptions.worldStateFileContents.length < 3 * 1024 * 1024) {
         localStorage.lastConnectOptions = JSON.stringify(connectOptions)
-        if (process.env.NODE_ENV === 'development' && !localStorage.lockUrl && !Object.keys(window.debugQueryParams).length) {
+        if (process.env.NODE_ENV === 'development' && !localStorage.lockUrl && !location.search.slice(1).length) {
           lockUrl()
         }
       } else {

From 914dcb6110b8b604aa85a55966e4e9f4a25db6b3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 14:16:44 +0300
Subject: [PATCH 430/753] add more fixtures support

---
 src/benchmark.ts           | 42 +++++++++++++++++++++++++++++---------
 src/downloadAndOpenFile.ts | 15 +++++++-------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/benchmark.ts b/src/benchmark.ts
index f097569b..2f6e5e2b 100644
--- a/src/benchmark.ts
+++ b/src/benchmark.ts
@@ -12,16 +12,35 @@ import { setLoadingScreenStatus } from './appStatus'
 
 const DEFAULT_RENDER_DISTANCE = 5
 
-const fixtures = {
+interface BenchmarkFixture {
+  urlZip?: string
+  urlDir?: string[]
+  replayFileUrl?: string
+  spawn?: [number, number, number]
+}
+
+const fixtures: Record<string, BenchmarkFixture> = {
   default: {
-    url: 'https://bucket.mcraft.fun/Future CITY 4.4-slim.zip',
+    urlZip: 'https://bucket.mcraft.fun/Future CITY 4.4-slim.zip',
     spawn: [-133, 87, 309] as [number, number, number],
   },
+  dir: {
+    urlDir: ['https://bucket.mcraft.fun/Greenfield%20v0.5.1/map-index.json', 'https://mcraft-proxy.vercel.app/0/bucket.mcraft.fun/Greenfield%20v0.5.1/map-index.json'],
+  },
+  replay: {
+    replayFileUrl: 'https://raw.githubusercontent.com/zardoy/mcraft-fun-replays/refs/heads/main/hypepixel-tnt-lobby.worldstate.txt',
+  },
 }
 
 Error.stackTraceLimit = Error.stackTraceLimit < 30 ? 30 : Error.stackTraceLimit
 
 export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) => {
+  let fixtureNameOpen = appQueryParams.openBenchmark
+  if (!fixtureNameOpen || fixtureNameOpen === '1' || fixtureNameOpen === 'true' || fixtureNameOpen === 'zip') {
+    fixtureNameOpen = 'default'
+  }
+
+
   const SESSION_STORAGE_BACKUP_KEY = 'benchmark-backup'
   if (sessionStorage.getItem(SESSION_STORAGE_BACKUP_KEY)) {
     const backup = JSON.stringify(JSON.parse(sessionStorage.getItem(SESSION_STORAGE_BACKUP_KEY)!), null, 2)
@@ -35,13 +54,15 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
     return
   }
 
-  const fixture: {
-    url: string
-    spawn?: [number, number, number]
-  } = appQueryParams.benchmarkMapZipUrl ? {
-    url: appQueryParams.benchmarkMapZipUrl,
+  const fixture: BenchmarkFixture = appQueryParams.benchmarkMapZipUrl ? {
+    urlZip: appQueryParams.benchmarkMapZipUrl,
     spawn: appQueryParams.benchmarkPosition ? appQueryParams.benchmarkPosition.split(',').map(Number) as [number, number, number] : fixtures.default.spawn,
-  } : fixtures.default
+  } : fixtures[fixtureNameOpen]
+
+  if (!fixture) {
+    setLoadingScreenStatus(`Benchmark fixture ${fixtureNameOpen} not found`)
+    return
+  }
 
   let memoryUsageAverage = 0
   let memoryUsageSamples = 0
@@ -77,7 +98,8 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
     currentPassedFrames = 0
   }, 1000)
 
-  let fixtureName = `${fixture.url}`
+  // todo urlDir fix
+  let fixtureName = `${fixture.urlZip ?? fixture.urlDir?.join('|') ?? fixture.replayFileUrl ?? 'unknown'}`
   if (fixture.spawn) {
     fixtureName += ` - ${fixture.spawn.join(' ')}`
   }
@@ -172,7 +194,7 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
   disabledSettings.value.add('renderDebug')
   options.renderDebug = 'advanced'
 
-  void downloadAndOpenMapFromUrl(fixture.url, undefined, {
+  void downloadAndOpenMapFromUrl(fixture.urlZip, undefined, fixture.urlDir, fixture.replayFileUrl, {
     connectEvents: {
       serverCreated () {
         if (fixture.spawn) {
diff --git a/src/downloadAndOpenFile.ts b/src/downloadAndOpenFile.ts
index 32d5ae10..1e703369 100644
--- a/src/downloadAndOpenFile.ts
+++ b/src/downloadAndOpenFile.ts
@@ -12,7 +12,12 @@ export const getFixedFilesize = (bytes: number) => {
 }
 
 const inner = async () => {
-  const { replayFileUrl } = appQueryParams
+  const { map, texturepack, replayFileUrl } = appQueryParams
+  const { mapDir } = appQueryParamsArray
+  return downloadAndOpenMapFromUrl(map, texturepack, mapDir, replayFileUrl)
+}
+
+export const downloadAndOpenMapFromUrl = async (mapUrl: string | undefined, texturepackUrl: string | undefined, mapUrlDir: string[] | undefined, replayFileUrl: string | undefined, connectOptions?: Partial<ConnectOptions>) => {
   if (replayFileUrl) {
     setLoadingScreenStatus('Downloading replay file')
     const response = await fetch(replayFileUrl)
@@ -59,10 +64,9 @@ const inner = async () => {
     return true
   }
 
-  const mapUrlDir = appQueryParamsArray.mapDir ?? []
   const mapUrlDirGuess = appQueryParams.mapDirGuess
   const mapUrlDirBaseUrl = appQueryParams.mapDirBaseUrl
-  if (mapUrlDir.length) {
+  if (mapUrlDir?.length) {
     await openWorldFromHttpDir(mapUrlDir, mapUrlDirBaseUrl ?? undefined)
     return true
   }
@@ -72,11 +76,6 @@ const inner = async () => {
     return true
   }
 
-  const { map, texturepack } = appQueryParams
-  return downloadAndOpenMapFromUrl(map, texturepack)
-}
-
-export const downloadAndOpenMapFromUrl = async (mapUrl: string | undefined, texturepackUrl: string | undefined, connectOptions?: Partial<ConnectOptions>) => {
   // fixme
   if (texturepackUrl) mapUrl = texturepackUrl
   if (!mapUrl) return false

From d1a646ed5407a52b51fdbccc28e237749e042701 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 14:21:25 +0300
Subject: [PATCH 431/753] never wait for load waitForChunksRender

---
 src/benchmark.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/benchmark.ts b/src/benchmark.ts
index 2f6e5e2b..afa886f7 100644
--- a/src/benchmark.ts
+++ b/src/benchmark.ts
@@ -193,6 +193,8 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
   options.renderDistance = renderDistance
   disabledSettings.value.add('renderDebug')
   options.renderDebug = 'advanced'
+  disabledSettings.value.add('waitForChunksRender')
+  options.waitForChunksRender = false
 
   void downloadAndOpenMapFromUrl(fixture.urlZip, undefined, fixture.urlDir, fixture.replayFileUrl, {
     connectEvents: {

From f79472a1da54b3b285b49355eb9963b854bb64a3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 16:09:01 +0300
Subject: [PATCH 432/753] add client info, fix small width data display

---
 src/benchmark.ts        | 21 ++++++++++++++++++++-
 src/benchmarkAdapter.ts |  1 +
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/benchmark.ts b/src/benchmark.ts
index afa886f7..9539c9b0 100644
--- a/src/benchmark.ts
+++ b/src/benchmark.ts
@@ -186,6 +186,7 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
     get userAgent () {
       return navigator.userAgent
     },
+    clientVersion: `${process.env.RELEASE_TAG} ${process.env.BUILD_VERSION} ${process.env.RELEASE_LINK ?? ''}`,
   }
   window.benchmarkAdapter = benchmarkAdapter
 
@@ -229,16 +230,34 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
 
     const panel = document.createElement('div')
     panel.style.position = 'fixed'
-    panel.style.top = '10px'
+    panel.style.top = '20px'
     panel.style.right = '10px'
     panel.style.backgroundColor = 'rgba(0,0,0,0.8)'
     panel.style.color = 'white'
     panel.style.padding = '10px'
     panel.style.zIndex = '1000'
     panel.style.fontFamily = 'monospace'
+    panel.style.maxWidth = '80%'
+    panel.style.maxHeight = '90vh'
+    panel.style.overflow = 'auto'
     panel.id = 'benchmark-panel'
 
+    // Add download button
+    const downloadButton = document.createElement('button')
+    downloadButton.textContent = 'Download Results'
+    downloadButton.style.marginBottom = '10px'
+    downloadButton.style.padding = '5px 10px'
+    downloadButton.style.backgroundColor = '#4CAF50'
+    downloadButton.style.color = 'white'
+    downloadButton.style.border = 'none'
+    downloadButton.style.borderRadius = '4px'
+    downloadButton.style.cursor = 'pointer'
+    downloadButton.onclick = downloadFile
+    panel.appendChild(downloadButton)
+
     const pre = document.createElement('pre')
+    pre.style.whiteSpace = 'pre-wrap'
+    pre.style.wordBreak = 'break-word'
     panel.appendChild(pre)
 
     pre.textContent = stats.join('\n')
diff --git a/src/benchmarkAdapter.ts b/src/benchmarkAdapter.ts
index 85e02b89..e3da6669 100644
--- a/src/benchmarkAdapter.ts
+++ b/src/benchmarkAdapter.ts
@@ -33,6 +33,7 @@ export interface BenchmarkAdapterInfo {
   gpuInfo: string
   hardwareConcurrency: number
   userAgent: string
+  clientVersion: string
 }
 
 export const getAllInfo = (adapter: BenchmarkAdapterInfo) => {

From b35b88236d3a635ab76423dd0a1e20f4c6ffa547 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 16:20:06 +0300
Subject: [PATCH 433/753] use whitelist to active touch cancel hack to avoid
 issues with side integrations

---
 src/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index f51311ae..42346606 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -850,8 +850,8 @@ document.body.addEventListener('touchend', (e) => {
   activeTouch = undefined
 })
 document.body.addEventListener('touchstart', (e) => {
-  const ignoreElem = (e.target as HTMLElement).matches('vercel-live-feedback') || (e.target as HTMLElement).closest('.hotbar')
-  if (!isGameActive(true) || ignoreElem) return
+  const targetElement = (e.target as HTMLElement).closest('#ui-root')
+  if (!isGameActive(true) || !targetElement) return
   // we always prevent default behavior to disable magnifier on ios, but by doing so we also disable click events
   e.preventDefault()
   let firstClickable // todo remove composedPath and this workaround when lit-element is fully dropped

From 4dce591f8bd0f6f3084885104f65ec9b02407ccf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 16:45:48 +0300
Subject: [PATCH 434/753] fix if for benchmark

---
 .github/workflows/benchmark.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 1bee9e5c..2b2deb1b 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -8,11 +8,13 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    # if: >-
-    #   github.event.issue.pull_request != '' &&
-    #   (
-    #     contains(github.event.comment.body, '/benchmark')
-    #   )
+    if: >-
+      (github.event_name == 'push' && github.ref == 'refs/heads/perf-test') ||
+      (
+        github.event_name == 'issue_comment' &&
+        github.event.issue.pull_request != '' &&
+        contains(github.event.comment.body, '/benchmark')
+      )
     permissions:
       pull-requests: write
     steps:

From cc264e895fdc471aa16499056254e54c59dbd398 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 17:00:16 +0300
Subject: [PATCH 435/753] Move Cypress from optionalDependencies to
 dependencies in benchmark workflow

---
 .github/workflows/benchmark.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 2b2deb1b..ae4f366b 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -28,6 +28,10 @@ jobs:
         with:
           node-version: 18
           cache: "pnpm"
+      - name: Move Cypress to dependencies
+        run: |
+          jq '.dependencies.cypress = .optionalDependencies.cypress | del(.optionalDependencies.cypress)' package.json > package.json.tmp
+          mv package.json.tmp package.json
       - run: pnpm install
       - run: pnpm build
       - run: nohup pnpm prod-start &

From 0a85de180ee464b6b258a0c922f15c1522aa067c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 17:00:39 +0300
Subject: [PATCH 436/753] should fix modal not found error on server connect UI

---
 src/react/NoModalFoundProvider.tsx | 2 +-
 src/react/utilsApp.ts              | 7 ++++---
 src/reactUi.tsx                    | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/react/NoModalFoundProvider.tsx b/src/react/NoModalFoundProvider.tsx
index c11b57ca..4ca57830 100644
--- a/src/react/NoModalFoundProvider.tsx
+++ b/src/react/NoModalFoundProvider.tsx
@@ -18,7 +18,7 @@ const checkModalAvailability = () => {
     }
   }
 
-  componentActive.enabled = !!last && !hardcodedKnownModals.some(x => last.reactType.startsWith(x)) && !watchedModalsFromHooks.value.has(last.reactType) && !withWildCardModal
+  componentActive.enabled = !!last && !hardcodedKnownModals.some(x => last.reactType.startsWith(x)) && !watchedModalsFromHooks.value.includes(last.reactType) && !withWildCardModal
 }
 
 subscribe(activeModalStack, () => {
diff --git a/src/react/utilsApp.ts b/src/react/utilsApp.ts
index d40a72e5..95f98d62 100644
--- a/src/react/utilsApp.ts
+++ b/src/react/utilsApp.ts
@@ -4,10 +4,11 @@ import { useMedia } from 'react-use'
 import { activeModalStack, miscUiState } from '../globalState'
 
 export const watchedModalsFromHooks = proxy({
-  value: new Set<string>()
+  value: [] as string[]
 })
 // todo should not be there
 export const hardcodedKnownModals = [
+  'empty',
   'player_win:',
   'divkit:',
   'full-map' // todo
@@ -18,12 +19,12 @@ export const useUsingTouch = () => {
 }
 export const useIsModalActive = (modal: string, useIncludes = false) => {
   useMemo(() => {
-    watchedModalsFromHooks.value.add(modal)
+    watchedModalsFromHooks.value.push(modal)
   }, [])
   useEffect(() => {
     // watchedModalsFromHooks.add(modal)
     return () => {
-      watchedModalsFromHooks.value.delete(modal)
+      watchedModalsFromHooks.value = watchedModalsFromHooks.value.filter(x => x !== modal)
     }
   }, [])
 
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 8037cd72..15c09939 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -224,9 +224,10 @@ const App = () => {
             <MainMenuRenderApp />
             <TouchAreasControlsProvider />
             <SignInMessageProvider />
-            <NoModalFoundProvider />
             <PacketsReplayProvider />
             <NotificationProvider />
+
+            <NoModalFoundProvider />
           </RobustPortal>
           <RobustPortal to={document.body}>
             <div className='overlay-top-scaled'>

From d347957f64c2ebb78e3ffea80caa4042c4fcd6a7 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 17:07:32 +0300
Subject: [PATCH 437/753] Update pnpm install command in benchmark workflow to
 use --no-frozen-lockfile

---
 .github/workflows/benchmark.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index ae4f366b..70a24af9 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -32,7 +32,7 @@ jobs:
         run: |
           jq '.dependencies.cypress = .optionalDependencies.cypress | del(.optionalDependencies.cypress)' package.json > package.json.tmp
           mv package.json.tmp package.json
-      - run: pnpm install
+      - run: pnpm install --no-frozen-lockfile
       - run: pnpm build
       - run: nohup pnpm prod-start &
       - run: pnpm test:benchmark

From 4fc801141328277cda64aa9f435341f6bc84d4db Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 19:00:21 +0300
Subject: [PATCH 438/753] feat(customChannelsPreview): add sections moving
 animations

---
 renderer/viewer/three/graphicsBackend.ts    |  7 +++
 renderer/viewer/three/worldrendererThree.ts | 68 +++++++++++++++++++++
 src/customChannels.ts                       | 66 ++++++++++++++++++++
 src/react/IndicatorEffectsProvider.tsx      |  2 +-
 4 files changed, 142 insertions(+), 1 deletion(-)

diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index 3ee34ea7..c6d23a2e 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -32,6 +32,13 @@ const getBackendMethods = (worldRenderer: WorldRendererThree) => {
     setVideoVolume: worldRenderer.media.setVideoVolume.bind(worldRenderer.media),
     setVideoSpeed: worldRenderer.media.setVideoSpeed.bind(worldRenderer.media),
 
+    addSectionAnimation (id: string, animation: typeof worldRenderer.sectionsOffsetsAnimations[string]) {
+      worldRenderer.sectionsOffsetsAnimations[id] = animation
+    },
+    removeSectionAnimation (id: string) {
+      delete worldRenderer.sectionsOffsetsAnimations[id]
+    },
+
     shakeFromDamage: worldRenderer.cameraShake.shakeFromDamage.bind(worldRenderer.cameraShake),
     onPageInteraction: worldRenderer.media.onPageInteraction.bind(worldRenderer.media),
     downloadMesherLog: worldRenderer.downloadMesherLog.bind(worldRenderer),
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index ac31d686..e901905e 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -51,6 +51,23 @@ export class WorldRendererThree extends WorldRendererCommon {
   waitingChunksToDisplay = {} as { [chunkKey: string]: SectionKey[] }
   camera: THREE.PerspectiveCamera
   renderTimeAvg = 0
+  sectionsOffsetsAnimations = {} as {
+    [chunkKey: string]: {
+      time: number,
+      // also specifies direction
+      speedX: number,
+      speedY: number,
+      speedZ: number,
+
+      currentOffsetX: number,
+      currentOffsetY: number,
+      currentOffsetZ: number,
+
+      limitX?: number,
+      limitY?: number,
+      limitZ?: number,
+    }
+  }
 
   get tilesRendered () {
     return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).tilesCount, 0)
@@ -88,6 +105,8 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.onWorldSwitched.push(() => {
       // clear custom blocks
       this.protocolCustomBlocks.clear()
+      // Reset section animations
+      this.sectionsOffsetsAnimations = {}
     })
   }
 
@@ -418,6 +437,8 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.lastRendered = performance.now()
     this.cursorBlock.render()
 
+    this.updateSectionOffsets()
+
     const sizeOrFovChanged = sizeChanged || this.displayOptions.inWorldRenderingConfig.fov !== this.camera.fov
     if (sizeOrFovChanged) {
       this.camera.aspect = window.innerWidth / window.innerHeight
@@ -625,6 +646,53 @@ export class WorldRendererThree extends WorldRendererCommon {
   destroy (): void {
     super.destroy()
   }
+
+  updateSectionOffsets () {
+    const currentTime = performance.now()
+    for (const [key, anim] of Object.entries(this.sectionsOffsetsAnimations)) {
+      const timeDelta = (currentTime - anim.time) / 1000 // Convert to seconds
+      anim.time = currentTime
+
+      // Update offsets based on speed and time delta
+      anim.currentOffsetX += anim.speedX * timeDelta
+      anim.currentOffsetY += anim.speedY * timeDelta
+      anim.currentOffsetZ += anim.speedZ * timeDelta
+
+      // Apply limits if they exist
+      if (anim.limitX !== undefined) {
+        if (anim.speedX > 0) {
+          anim.currentOffsetX = Math.min(anim.currentOffsetX, anim.limitX)
+        } else {
+          anim.currentOffsetX = Math.max(anim.currentOffsetX, anim.limitX)
+        }
+      }
+      if (anim.limitY !== undefined) {
+        if (anim.speedY > 0) {
+          anim.currentOffsetY = Math.min(anim.currentOffsetY, anim.limitY)
+        } else {
+          anim.currentOffsetY = Math.max(anim.currentOffsetY, anim.limitY)
+        }
+      }
+      if (anim.limitZ !== undefined) {
+        if (anim.speedZ > 0) {
+          anim.currentOffsetZ = Math.min(anim.currentOffsetZ, anim.limitZ)
+        } else {
+          anim.currentOffsetZ = Math.max(anim.currentOffsetZ, anim.limitZ)
+        }
+      }
+
+      // Apply the offset to the section object
+      const section = this.sectionObjects[key]
+      if (section) {
+        section.position.set(
+          anim.currentOffsetX,
+          anim.currentOffsetY,
+          anim.currentOffsetZ
+        )
+        section.updateMatrix()
+      }
+    }
+  }
 }
 
 class StarField {
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 7d99cb12..f26b5836 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -13,6 +13,7 @@ export default () => {
     })
     registerBlockModelsChannel()
     registerMediaChannels()
+    registerSectionAnimationChannels()
     registeredJeiChannel()
   })
 }
@@ -72,6 +73,71 @@ const registerBlockModelsChannel = () => {
   }, true)
 }
 
+const registerSectionAnimationChannels = () => {
+  const ADD_CHANNEL = 'minecraft-web-client:section-animation-add'
+  const REMOVE_CHANNEL = 'minecraft-web-client:section-animation-remove'
+
+  const addPacketStructure = [
+    'container',
+    [
+      { name: 'id', type: ['pstring', { countType: 'i16' }] },
+      { name: 'offset', type: 'f32' },
+      { name: 'speedX', type: 'f32' },
+      { name: 'speedY', type: 'f32' },
+      { name: 'speedZ', type: 'f32' },
+      { name: 'limitX', type: 'f32' },
+      { name: 'limitY', type: 'f32' },
+      { name: 'limitZ', type: 'f32' }
+    ]
+  ]
+
+  const removePacketStructure = [
+    'container',
+    [
+      { name: 'id', type: ['pstring', { countType: 'i16' }] }
+    ]
+  ]
+
+  registerChannel(ADD_CHANNEL, addPacketStructure, (data) => {
+    const { id, offset, speedX, speedY, speedZ, limitX, limitY, limitZ } = data
+    getThreeJsRendererMethods()?.addSectionAnimation(id, {
+      time: performance.now(),
+      speedX,
+      speedY,
+      speedZ,
+      currentOffsetX: offset,
+      currentOffsetY: offset,
+      currentOffsetZ: offset,
+      limitX: limitX === 0 ? undefined : limitX,
+      limitY: limitY === 0 ? undefined : limitY,
+      limitZ: limitZ === 0 ? undefined : limitZ
+    })
+  }, true)
+
+  registerChannel(REMOVE_CHANNEL, removePacketStructure, (data) => {
+    const { id } = data
+    getThreeJsRendererMethods()?.removeSectionAnimation(id)
+  }, true)
+
+  console.debug('Registered section animation channels')
+}
+
+window.testSectionAnimation = (speedY = 1) => {
+  const pos = bot.entity.position
+  const id = `${Math.floor(pos.x / 16) * 16},${Math.floor(pos.y / 16) * 16},${Math.floor(pos.z / 16) * 16}`
+  getThreeJsRendererMethods()?.addSectionAnimation(id, {
+    time: performance.now(),
+    speedX: 0,
+    speedY,
+    speedZ: 0,
+    currentOffsetX: 0,
+    currentOffsetY: 0,
+    currentOffsetZ: 0,
+    // limitX: 10,
+    // limitY: 10,
+  })
+}
+
 const registeredJeiChannel = () => {
   const CHANNEL_NAME = 'minecraft-web-client:jei'
   // id - string, categoryTitle - string, items - string (json array)
diff --git a/src/react/IndicatorEffectsProvider.tsx b/src/react/IndicatorEffectsProvider.tsx
index 1913fb7b..097bb28d 100644
--- a/src/react/IndicatorEffectsProvider.tsx
+++ b/src/react/IndicatorEffectsProvider.tsx
@@ -67,7 +67,7 @@ export default () => {
     appHasErrors: hasErrors,
     connectionIssues: poorConnection ? 1 : noConnection ? 2 : 0,
     chunksLoading,
-    preventSleep: !!bot.wakeLock,
+    preventSleep: !!bot?.wakeLock,
     // mesherWork,
     ...stateIndicators,
   }

From 758405da0320e2c9a793f36f1df6ac5315d9c13e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 7 Apr 2025 19:16:16 +0300
Subject: [PATCH 439/753] [skip ci] add doc

---
 src/customChannels.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/customChannels.ts b/src/customChannels.ts
index f26b5836..7cdd6c32 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -77,6 +77,17 @@ const registerSectionAnimationChannels = () => {
   const ADD_CHANNEL = 'minecraft-web-client:section-animation-add'
   const REMOVE_CHANNEL = 'minecraft-web-client:section-animation-remove'
 
+  /**
+   * Add a section animation
+   * @param id - Section position for animation like `16,32,16`
+   * @param offset - Initial offset in blocks
+   * @param speedX - Movement speed in blocks per second on X axis
+   * @param speedY - Movement speed in blocks per second on Y axis
+   * @param speedZ - Movement speed in blocks per second on Z axis
+   * @param limitX - Maximum offset in blocks on X axis (0 means no limit)
+   * @param limitY - Maximum offset in blocks on Y axis (0 means no limit)
+   * @param limitZ - Maximum offset in blocks on Z axis (0 means no limit)
+   */
   const addPacketStructure = [
     'container',
     [
@@ -91,6 +102,10 @@ const registerSectionAnimationChannels = () => {
     ]
   ]
 
+  /**
+   * Remove a section animation
+   * @param id - Identifier of the animation to remove
+   */
   const removePacketStructure = [
     'container',
     [

From 33a6f4d088c91da0fce60516365ab9c8c15971bd Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 8 Apr 2025 17:23:32 +0300
Subject: [PATCH 440/753] fix: a little better perf when media is not in use

---
 renderer/viewer/three/threeJsMedia.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/renderer/viewer/three/threeJsMedia.ts b/renderer/viewer/three/threeJsMedia.ts
index a8855f7c..af95f416 100644
--- a/renderer/viewer/three/threeJsMedia.ts
+++ b/renderer/viewer/three/threeJsMedia.ts
@@ -529,6 +529,9 @@ export class ThreeJsMedia {
   }
 
   tryIntersectMedia () {
+    // hack: need to optimize this by pulling only in distance of interaction instead (or throttle)!
+    if (this.customMedia.size === 0) return
+
     const { camera, scene } = this.worldRenderer
     const raycaster = new THREE.Raycaster()
 

From 0b72ea61c73a9d7b249663d6ca91880f77c0b7be Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 9 Apr 2025 04:34:58 +0300
Subject: [PATCH 441/753] fix: add time to debug overlay

---
 src/react/DebugOverlay.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index 1aff4a0e..af0d6675 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -34,6 +34,7 @@ export default () => {
   const [blockL, setBlockL] = useState(0)
   const [biomeId, setBiomeId] = useState(0)
   const [day, setDay] = useState(0)
+  const [timeOfDay, setTimeOfDay] = useState(0)
   const [dimension, setDimension] = useState('')
   const [cursorBlock, setCursorBlock] = useState<Block | null>(null)
   const [blockInfo, setBlockInfo] = useState<{ customBlockName?: string, modelInfo?: BlockStateModelInfo } | null>(null)
@@ -132,6 +133,7 @@ export default () => {
       setBiomeId(bot.world.getBiome(bot.entity.position))
       setDimension(bot.game.dimension)
       setDay(bot.time.day)
+      setTimeOfDay(bot.time.timeOfDay)
       setCursorBlock(bot.mouse.getCursorState().cursorBlock)
     }, 100)
 
@@ -185,7 +187,7 @@ export default () => {
       <p>Light: {blockL} ({skyL} sky)</p>
 
       <p>Biome: minecraft:{loadedData.biomesArray[biomeId]?.name ?? 'unknown biome'}</p>
-      <p>Day: {day}</p>
+      <p>Day: {day} Time: {timeOfDay}</p>
       <div className={styles.empty} />
       {Object.entries(appViewer.backend?.getDebugOverlay?.().left ?? {}).map(([name, value]) => <p key={name}>{name}: {value}</p>)}
     </div>

From 5adbce39e0ba68850cc0c45583ae7bff962858ad Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 9 Apr 2025 05:07:41 +0300
Subject: [PATCH 442/753] pick changes from webgpu: fix cursor lines fix
 background color change

---
 renderer/buildMesherWorker.mjs              |  4 +-
 renderer/playground.html                    |  6 +++
 renderer/viewer/lib/basePlayerState.ts      | 18 ++++++++
 renderer/viewer/lib/ui/newStats.ts          | 48 ++++++++++++++++++++-
 renderer/viewer/lib/workerProxy.ts          | 11 ++---
 renderer/viewer/lib/worldrendererCommon.ts  | 29 ++++++++-----
 renderer/viewer/three/graphicsBackend.ts    |  2 -
 renderer/viewer/three/world/cursorBlock.ts  | 15 +++----
 renderer/viewer/three/worldrendererThree.ts |  7 +++
 src/appViewer.ts                            | 21 ++++++---
 src/appViewerLoad.ts                        | 10 +++++
 src/mineflayer/plugins/mouse.ts             | 22 +++++++---
 src/watchOptions.ts                         |  2 -
 13 files changed, 151 insertions(+), 44 deletions(-)

diff --git a/renderer/buildMesherWorker.mjs b/renderer/buildMesherWorker.mjs
index 2f9a4a02..47ea5771 100644
--- a/renderer/buildMesherWorker.mjs
+++ b/renderer/buildMesherWorker.mjs
@@ -22,7 +22,7 @@ const buildOptions = {
   },
   platform: 'browser',
   entryPoints: [path.join(__dirname, './viewer/lib/mesher/mesher.ts')],
-  minify: true,
+  minify: !watch,
   logLevel: 'info',
   drop: !watch ? [
     'debugger'
@@ -39,7 +39,7 @@ const buildOptions = {
     ...mesherSharedPlugins,
     {
       name: 'external-json',
-      setup (build) {
+      setup(build) {
         build.onResolve({ filter: /\.json$/ }, args => {
           const fileName = args.path.split('/').pop().replace('.json', '')
           if (args.resolveDir.includes('minecraft-data')) {
diff --git a/renderer/playground.html b/renderer/playground.html
index ec4c0f33..258426fe 100644
--- a/renderer/playground.html
+++ b/renderer/playground.html
@@ -11,11 +11,17 @@
 
       html, body {
         height: 100%;
+        touch-action: none;
 
         margin: 0;
         padding: 0;
       }
 
+      * {
+        user-select: none;
+        -webkit-user-select: none;
+      }
+
       canvas {
         height: 100%;
         width: 100%;
diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index 93f4f6ce..df8cbc61 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -14,6 +14,9 @@ export type PlayerStateEvents = {
   heldItemChanged: (item: HandItemBlock | undefined, isLeftHand: boolean) => void
 }
 
+export type BlockShape = { position: any; width: any; height: any; depth: any; }
+export type BlocksShapes = BlockShape[]
+
 export interface IPlayerState {
   getEyeHeight(): number
   getMovementState(): MovementState
@@ -39,6 +42,21 @@ export interface IPlayerState {
     ambientLight: number
     directionalLight: number
     gameMode?: GameMode
+    lookingAtBlock?: {
+      x: number
+      y: number
+      z: number
+      face?: number
+      shapes: BlocksShapes
+    }
+    diggingBlock?: {
+      x: number
+      y: number
+      z: number
+      stage: number
+      face?: number
+      mergedShape?: BlockShape
+    }
   }
 }
 
diff --git a/renderer/viewer/lib/ui/newStats.ts b/renderer/viewer/lib/ui/newStats.ts
index 8ccd4e57..4a1b0a0f 100644
--- a/renderer/viewer/lib/ui/newStats.ts
+++ b/renderer/viewer/lib/ui/newStats.ts
@@ -7,7 +7,7 @@ let lastY = 40
 export const addNewStat = (id: string, width = 80, x = rightOffset, y = lastY) => {
   const pane = document.createElement('div')
   pane.style.position = 'fixed'
-  pane.style.top = `${y}px`
+  pane.style.top = `${y ?? lastY}px`
   pane.style.right = `${x}px`
   // gray bg
   pane.style.backgroundColor = 'rgba(0, 0, 0, 0.7)'
@@ -19,7 +19,7 @@ export const addNewStat = (id: string, width = 80, x = rightOffset, y = lastY) =
   pane.style.pointerEvents = 'none'
   document.body.appendChild(pane)
   stats[id] = pane
-  if (y === 0) { // otherwise it's a custom position
+  if (y === undefined && x === rightOffset) { // otherwise it's a custom position
     // rightOffset += width
     lastY += 20
   }
@@ -35,6 +35,50 @@ export const addNewStat = (id: string, width = 80, x = rightOffset, y = lastY) =
   }
 }
 
+export const addNewStat2 = (id: string, { top, bottom, right, left, displayOnlyWhenWider }: { top?: number, bottom?: number, right?: number, left?: number, displayOnlyWhenWider?: number }) => {
+  if (top === undefined && bottom === undefined) top = 0
+  const pane = document.createElement('div')
+  pane.style.position = 'fixed'
+  if (top !== undefined) {
+    pane.style.top = `${top}px`
+  }
+  if (bottom !== undefined) {
+    pane.style.bottom = `${bottom}px`
+  }
+  if (left !== undefined) {
+    pane.style.left = `${left}px`
+  }
+  if (right !== undefined) {
+    pane.style.right = `${right}px`
+  }
+  // gray bg
+  pane.style.backgroundColor = 'rgba(0, 0, 0, 0.7)'
+  pane.style.color = 'white'
+  pane.style.padding = '2px'
+  pane.style.fontFamily = 'monospace'
+  pane.style.fontSize = '12px'
+  pane.style.zIndex = '10000'
+  pane.style.pointerEvents = 'none'
+  document.body.appendChild(pane)
+  stats[id] = pane
+
+  const resizeCheck = () => {
+    if (!displayOnlyWhenWider) return
+    pane.style.display = window.innerWidth > displayOnlyWhenWider ? 'block' : 'none'
+  }
+  window.addEventListener('resize', resizeCheck)
+  resizeCheck()
+
+  return {
+    updateText (text: string) {
+      pane.innerText = text
+    },
+    setVisibility (visible: boolean) {
+      pane.style.display = visible ? 'block' : 'none'
+    }
+  }
+}
+
 export const updateStatText = (id, text) => {
   if (!stats[id]) return
   stats[id].innerText = text
diff --git a/renderer/viewer/lib/workerProxy.ts b/renderer/viewer/lib/workerProxy.ts
index a27c817d..9d8e7fcc 100644
--- a/renderer/viewer/lib/workerProxy.ts
+++ b/renderer/viewer/lib/workerProxy.ts
@@ -1,5 +1,6 @@
-export function createWorkerProxy<T extends Record<string, (...args: any[]) => void>> (handlers: T): { __workerProxy: T } {
-  addEventListener('message', (event) => {
+export function createWorkerProxy<T extends Record<string, (...args: any[]) => void>> (handlers: T, channel?: MessagePort): { __workerProxy: T } {
+  const target = channel ?? globalThis
+  target.addEventListener('message', (event: any) => {
     const { type, args } = event.data
     if (handlers[type]) {
       handlers[type](...args)
@@ -19,7 +20,7 @@ export function createWorkerProxy<T extends Record<string, (...args: any[]) => v
  * const workerChannel = useWorkerProxy<typeof importedTypeWorkerProxy>(worker)
  * ```
  */
-export const useWorkerProxy = <T extends { __workerProxy: Record<string, (...args: any[]) => void> }> (worker: Worker, autoTransfer = true): T['__workerProxy'] & {
+export const useWorkerProxy = <T extends { __workerProxy: Record<string, (...args: any[]) => void> }> (worker: Worker | MessagePort, autoTransfer = true): T['__workerProxy'] & {
   transfer: (...args: Transferable[]) => T['__workerProxy']
 } => {
   // in main thread
@@ -40,11 +41,11 @@ export const useWorkerProxy = <T extends { __workerProxy: Record<string, (...arg
         }
       }
       return (...args: any[]) => {
-        const transfer = autoTransfer ? args.filter(arg => arg instanceof ArrayBuffer || arg instanceof MessagePort || arg instanceof ImageBitmap || arg instanceof OffscreenCanvas) : []
+        const transfer = autoTransfer ? args.filter(arg => arg instanceof ArrayBuffer || arg instanceof MessagePort || arg instanceof ImageBitmap || arg instanceof OffscreenCanvas || arg instanceof ImageData) : []
         worker.postMessage({
           type: prop,
           args,
-        }, transfer)
+        }, transfer as any[])
       }
     }
   })
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 5f845dbc..8454ed16 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -53,6 +53,7 @@ export const defaultWorldRendererConfig = {
 export type WorldRendererConfig = typeof defaultWorldRendererConfig
 
 export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any> {
+  timeOfTheDay = 0
   worldSizeParams = { minY: 0, worldHeight: 256 }
 
   active = false
@@ -184,7 +185,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       if (this.mainThreadRendering) {
         this.fpsUpdate()
       }
-    }, 1000)
+    }, 500)
   }
 
   fpsUpdate () {
@@ -495,10 +496,23 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   getMesherConfig (): MesherConfig {
+    let skyLight = 15
+    const timeOfDay = this.timeOfTheDay
+    if (timeOfDay < 0 || timeOfDay > 24_000) {
+      //
+    } else if (timeOfDay <= 6000 || timeOfDay >= 18_000) {
+      skyLight = 15
+    } else if (timeOfDay > 6000 && timeOfDay < 12_000) {
+      skyLight = 15 - ((timeOfDay - 6000) / 6000) * 15
+    } else if (timeOfDay >= 12_000 && timeOfDay < 18_000) {
+      skyLight = ((timeOfDay - 12_000) / 6000) * 15
+    }
+
+    skyLight = Math.floor(skyLight)
     return {
       version: this.version,
       enableLighting: this.worldRendererConfig.enableLighting,
-      skyLight: 15,
+      skyLight,
       smoothLighting: this.worldRendererConfig.smoothLighting,
       outputFormat: this.outputFormat,
       textureSize: this.resourcesManager.currentResources!.blocksAtlasParser.atlas.latest.width,
@@ -608,7 +622,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.logWorkerWork(`-> unloadChunk ${JSON.stringify({ x, z })}`)
     delete this.finishedChunks[`${x},${z}`]
     this.allChunksFinished = Object.keys(this.finishedChunks).length === this.chunksLength
-    if (!this.allChunksFinished) {
+    if (Object.keys(this.finishedChunks).length === 0) {
       this.allLoadedIn = undefined
       this.initialChunkLoadWasStartedIn = undefined
     }
@@ -735,18 +749,11 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     worldEmitter.on('time', (timeOfDay) => {
       this.timeUpdated?.(timeOfDay)
 
-      let skyLight = 15
       if (timeOfDay < 0 || timeOfDay > 24_000) {
         throw new Error('Invalid time of day. It should be between 0 and 24000.')
-      } else if (timeOfDay <= 6000 || timeOfDay >= 18_000) {
-        skyLight = 15
-      } else if (timeOfDay > 6000 && timeOfDay < 12_000) {
-        skyLight = 15 - ((timeOfDay - 6000) / 6000) * 15
-      } else if (timeOfDay >= 12_000 && timeOfDay < 18_000) {
-        skyLight = ((timeOfDay - 12_000) / 6000) * 15
       }
 
-      skyLight = Math.floor(skyLight) // todo: remove this after optimization
+      this.timeOfTheDay = timeOfDay
 
       // if (this.worldRendererConfig.skyLight === skyLight) return
       // this.worldRendererConfig.skyLight = skyLight
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index c6d23a2e..f8cf14a4 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -19,8 +19,6 @@ const getBackendMethods = (worldRenderer: WorldRendererThree) => {
     playEntityAnimation: worldRenderer.entities.playAnimation.bind(worldRenderer.entities),
     damageEntity: worldRenderer.entities.handleDamageEvent.bind(worldRenderer.entities),
     updatePlayerSkin: worldRenderer.entities.updatePlayerSkin.bind(worldRenderer.entities),
-    setHighlightCursorBlock: worldRenderer.cursorBlock.setHighlightCursorBlock.bind(worldRenderer.cursorBlock),
-    updateBreakAnimation: worldRenderer.cursorBlock.updateBreakAnimation.bind(worldRenderer.cursorBlock),
     changeHandSwingingState: worldRenderer.changeHandSwingingState.bind(worldRenderer),
     getHighestBlocks: worldRenderer.getHighestBlocks.bind(worldRenderer),
     rerenderAllChunks: worldRenderer.rerenderAllChunks.bind(worldRenderer),
diff --git a/renderer/viewer/three/world/cursorBlock.ts b/renderer/viewer/three/world/cursorBlock.ts
index ab0c4854..fe95c2c9 100644
--- a/renderer/viewer/three/world/cursorBlock.ts
+++ b/renderer/viewer/three/world/cursorBlock.ts
@@ -3,6 +3,7 @@ import { LineMaterial, LineSegmentsGeometry, Wireframe } from 'three-stdlib'
 import { Vec3 } from 'vec3'
 import { subscribeKey } from 'valtio/utils'
 import { Block } from 'prismarine-block'
+import { BlockShape, BlocksShapes } from 'renderer/viewer/lib/basePlayerState'
 import { WorldRendererThree } from '../worldrendererThree'
 import destroyStage0 from '../../../../assets/destroy_stage_0.png'
 import destroyStage1 from '../../../../assets/destroy_stage_1.png'
@@ -89,15 +90,13 @@ export class CursorBlock {
     this.prevColor = this.worldRenderer.worldRendererConfig.highlightBlockColor
   }
 
-  updateBreakAnimation (block: Block | undefined, stage: number | null) {
+  updateBreakAnimation (blockPosition: { x: number, y: number, z: number } | undefined, stage: number | null, mergedShape?: BlockShape) {
     this.hideBreakAnimation()
-    if (stage === null || !block) return
+    if (stage === null || !blockPosition || !mergedShape) return
 
-    const mergedShape = bot.mouse.getMergedCursorShape(block)
-    if (!mergedShape) return
-    const { position, width, height, depth } = bot.mouse.getDataFromShape(mergedShape)
+    const { position, width, height, depth } = mergedShape
     this.blockBreakMesh.scale.set(width * 1.001, height * 1.001, depth * 1.001)
-    position.add(block.position)
+    position.add(blockPosition)
     this.blockBreakMesh.position.set(position.x, position.y, position.z)
     this.blockBreakMesh.visible = true;
 
@@ -119,7 +118,7 @@ export class CursorBlock {
     }
   }
 
-  setHighlightCursorBlock (blockPos: Vec3 | null, shapePositions?: Array<{ position: any; width: any; height: any; depth: any; }>): void {
+  setHighlightCursorBlock (blockPos: Vec3 | null, shapePositions?: BlocksShapes): void {
     if (blockPos && this.interactionLines && blockPos.equals(this.interactionLines.blockPos)) {
       return
     }
@@ -143,7 +142,7 @@ export class CursorBlock {
       group.add(wireframe)
     }
     this.worldRenderer.scene.add(group)
-    group.visible = this.cursorLinesHidden
+    group.visible = !this.cursorLinesHidden
     this.interactionLines = { blockPos, mesh: group }
   }
 
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index e901905e..482b0255 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -140,6 +140,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   override watchReactivePlayerState () {
+    super.watchReactivePlayerState()
     this.onReactiveValueUpdated('inWater', (value) => {
       this.scene.fog = value ? new THREE.Fog(0x00_00_ff, 0.1, this.displayOptions.playerState.reactive.waterBreathing ? 100 : 20) : null
     })
@@ -151,6 +152,12 @@ export class WorldRendererThree extends WorldRendererCommon {
       if (!value) return
       this.directionalLight.intensity = value
     })
+    this.onReactiveValueUpdated('lookingAtBlock', (value) => {
+      this.cursorBlock.setHighlightCursorBlock(value ? new Vec3(value.x, value.y, value.z) : null, value?.shapes)
+    })
+    this.onReactiveValueUpdated('diggingBlock', (value) => {
+      this.cursorBlock.updateBreakAnimation(value ? { x: value.x, y: value.y, z: value.z } : undefined, value?.stage ?? null, value?.mergedShape)
+    })
   }
 
   changeHandSwingingState (isAnimationPlaying: boolean, isLeft = false) {
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 1b973ad2..0f29b9a6 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -155,6 +155,12 @@ export class AppViewer {
     }
   }
 
+  async startWithBot () {
+    const renderDistance = miscUiState.singleplayer ? options.renderDistance : options.multiplayerRenderDistance
+    await this.startWorld(bot.world, renderDistance)
+    this.worldView!.listenToBot(bot)
+  }
+
   async startWorld (world, renderDistance: number, playerStateSend: IPlayerState = this.playerState) {
     if (this.currentDisplay === 'world') throw new Error('World already started')
     this.currentDisplay = 'world'
@@ -185,11 +191,7 @@ export class AppViewer {
   }
 
   resetBackend (cleanState = false) {
-    if (cleanState) {
-      this.currentState = undefined
-      this.currentDisplay = null
-      this.worldView = undefined
-    }
+    this.disconnectBackend(cleanState)
     if (this.backendLoader) {
       this.loadBackend(this.backendLoader)
     }
@@ -216,7 +218,12 @@ export class AppViewer {
     this.resourcesManager.destroy()
   }
 
-  disconnectBackend () {
+  disconnectBackend (cleanState = false) {
+    if (cleanState) {
+      this.currentState = undefined
+      this.currentDisplay = null
+      this.worldView = undefined
+    }
     if (this.backend) {
       this.backend.disconnect()
       this.backend = undefined
@@ -225,7 +232,7 @@ export class AppViewer {
     const { promise, resolve } = Promise.withResolvers<void>()
     this.worldReady = promise
     this.resolveWorldReady = resolve
-    Object.assign(this.rendererState, getDefaultRendererState())
+    this.rendererState = proxy(getDefaultRendererState())
     // this.queuedDisplay = undefined
   }
 
diff --git a/src/appViewerLoad.ts b/src/appViewerLoad.ts
index 8110ac89..96e3bf03 100644
--- a/src/appViewerLoad.ts
+++ b/src/appViewerLoad.ts
@@ -37,3 +37,13 @@ const animLoop = () => {
 requestAnimationFrame(animLoop)
 
 watchOptionsAfterViewerInit()
+
+// reset backend when renderer changes
+
+subscribeKey(options, 'activeRenderer', () => {
+  if (appViewer.currentDisplay === 'world' && bot) {
+    appViewer.resetBackend(true)
+    loadBackend()
+    void appViewer.startWithBot()
+  }
+})
diff --git a/src/mineflayer/plugins/mouse.ts b/src/mineflayer/plugins/mouse.ts
index 219a8be8..4e82b770 100644
--- a/src/mineflayer/plugins/mouse.ts
+++ b/src/mineflayer/plugins/mouse.ts
@@ -11,20 +11,32 @@ import { sendVideoInteraction, videoCursorInteraction } from '../../customChanne
 function cursorBlockDisplay (bot: Bot) {
   const updateCursorBlock = (data?: { block: Block }) => {
     if (!data?.block) {
-      getThreeJsRendererMethods()?.setHighlightCursorBlock(null)
+      playerState.reactive.lookingAtBlock = undefined
       return
     }
 
     const { block } = data
-    getThreeJsRendererMethods()?.setHighlightCursorBlock(block.position, bot.mouse.getBlockCursorShapes(block).map(shape => {
-      return bot.mouse.getDataFromShape(shape)
-    }))
+    playerState.reactive.lookingAtBlock = {
+      x: block.position.x,
+      y: block.position.y,
+      z: block.position.z,
+      shapes: bot.mouse.getBlockCursorShapes(block).map(shape => {
+        return bot.mouse.getDataFromShape(shape)
+      })
+    }
   }
 
   bot.on('highlightCursorBlock', updateCursorBlock)
 
   bot.on('blockBreakProgressStage', (block, stage) => {
-    getThreeJsRendererMethods()?.updateBreakAnimation(block, stage)
+    const mergedShape = bot.mouse.getMergedCursorShape(block)
+    playerState.reactive.diggingBlock = stage === null ? undefined : {
+      x: block.position.x,
+      y: block.position.y,
+      z: block.position.z,
+      stage,
+      mergedShape: mergedShape ? bot.mouse.getDataFromShape(mergedShape) : undefined
+    }
   })
 }
 
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 41f78d07..9fe55289 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -8,8 +8,6 @@ import { reloadChunks } from './utils'
 import { miscUiState } from './globalState'
 import { isCypress } from './standaloneUtils'
 
-globalThis.viewer ??= { world: {} }
-
 subscribeKey(options, 'renderDistance', reloadChunks)
 subscribeKey(options, 'multiplayerRenderDistance', reloadChunks)
 

From f4bd38fa5ce5547378f66fcc17479a90f0659ab8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 9 Apr 2025 05:30:51 +0300
Subject: [PATCH 443/753] use more reliable bot entity instead of player.entity

---
 src/mineflayer/playerState.ts | 6 +++---
 src/sounds/botSoundSystem.ts  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
index 964e3d1b..e88933b9 100644
--- a/src/mineflayer/playerState.ts
+++ b/src/mineflayer/playerState.ts
@@ -77,9 +77,9 @@ export class PlayerStateManager implements IPlayerState {
 
   // #region Movement and Physics State
   private updateState () {
-    if (!bot.player?.entity || this.disableStateUpdates) return
+    if (!bot?.entity || this.disableStateUpdates) return
 
-    const { velocity } = bot.player.entity
+    const { velocity } = bot.entity
     const isOnGround = bot.entity.onGround
     const VELOCITY_THRESHOLD = 0.01
     const SPRINTING_VELOCITY = 0.15
@@ -138,7 +138,7 @@ export class PlayerStateManager implements IPlayerState {
   }
 
   getPosition (): Vec3 {
-    return bot.player?.entity.position ?? new Vec3(0, 0, 0)
+    return bot.entity?.position ?? new Vec3(0, 0, 0)
   }
   // #endregion
 
diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 2f872015..882fd2b7 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -132,9 +132,9 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
 
   let lastStepSound = 0
   const movementHappening = async () => {
-    if (!bot.player || !soundMap) return // no info yet
+    if (!bot.entity || !soundMap) return // no info yet
     const VELOCITY_THRESHOLD = 0.1
-    const { x, z, y } = bot.player.entity.velocity
+    const { x, z, y } = bot.entity.velocity
     if (bot.entity.onGround && Math.abs(x) < VELOCITY_THRESHOLD && (Math.abs(z) > VELOCITY_THRESHOLD || Math.abs(y) > VELOCITY_THRESHOLD)) {
       // movement happening
       if (Date.now() - lastStepSound > 300) {

From 7824cf64a2a92403ddf9f3c1670c6204eb7b1d4b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 9 Apr 2025 05:46:40 +0300
Subject: [PATCH 444/753] fix lint

---
 src/localServerMultiplayer.ts   | 2 +-
 src/react/KeybindingsScreen.tsx | 8 ++++----
 src/react/MinimapProvider.tsx   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/localServerMultiplayer.ts b/src/localServerMultiplayer.ts
index de49ffd6..bbbf0db6 100644
--- a/src/localServerMultiplayer.ts
+++ b/src/localServerMultiplayer.ts
@@ -1,5 +1,5 @@
 import { Duplex } from 'stream'
-import Peer, { DataConnection } from 'peerjs'
+import { Peer, DataConnection } from 'peerjs'
 import Client from 'minecraft-protocol/src/client'
 import { resolveTimeout } from './utils'
 import { setLoadingScreenStatus } from './appStatus'
diff --git a/src/react/KeybindingsScreen.tsx b/src/react/KeybindingsScreen.tsx
index 79d9e186..e56b0189 100644
--- a/src/react/KeybindingsScreen.tsx
+++ b/src/react/KeybindingsScreen.tsx
@@ -303,10 +303,10 @@ export const ButtonWithMatchesAlert = ({
       <Keybinding type={inputType} val={buttonSign as AllKeyCodes} />
     </Button>
     {userConfig?.[group]?.[action]?.[inputType === 'keyboard' ? 'keys' : 'gamepad']?.some(key => Object.keys(bindsMap[inputType]).includes(key)
-    && bindsMap[inputType][key].length > 1
-    && bindsMap[inputType][key].some(prop => prop.index === index
-    && prop.group === group
-    && prop.action === action)) ? (
+      && bindsMap[inputType][key].length > 1
+      && bindsMap[inputType][key].some(prop => prop.index === index
+        && prop.group === group
+        && prop.action === action)) ? (
       //@ts-format-ignore-region
         <div id={`bind-warning-${group}-${action}-${inputType}-${index}`} className={styles['matched-bind-warning']}>
           <PixelartIcon
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
index 0e9cd943..86670954 100644
--- a/src/react/MinimapProvider.tsx
+++ b/src/react/MinimapProvider.tsx
@@ -467,7 +467,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     let color: string
     if (this.isOldVersion) {
       color = BlockData.colors[preflatMap.blocks[`${block.type}:${block.metadata}`]?.replaceAll(/\[.*?]/g, '')]
-      ?? 'rgb(0, 0, 255)'
+        ?? 'rgb(0, 0, 255)'
     } else {
       color = this.blockData.get(block.name) ?? 'rgb(0, 255, 0)'
     }

From 31d5089e9cd92392dc2fcacb1f9854b32ceab46a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 9 Apr 2025 05:50:39 +0300
Subject: [PATCH 445/753] should fix rare case when some tiles are not rendered

---
 renderer/viewer/lib/mesher/models.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index 677886f9..ba1fc6e0 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -253,7 +253,7 @@ function renderElement (world: World, cursor: Vec3, element: BlockElement, doAO:
         if (!neighbor.transparent && (isCube(neighbor) || identicalCull(element, neighbor, new Vec3(...dir)))) continue
       } else {
         needSectionRecomputeOnChange = true
-        continue
+        // continue
       }
     }
 

From 1fbbf368593d5967531d2bd329b123e15022e567 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 9 Apr 2025 05:51:34 +0300
Subject: [PATCH 446/753] feat: NEW PHYSICS ENGINE - GRIM PASSES >1.19.4 (#327)

---
 package.json    |    14 +-
 pnpm-lock.yaml  | 10024 ++++++++++++++++++++++------------------------
 src/controls.ts |   121 +-
 3 files changed, 4819 insertions(+), 5340 deletions(-)

diff --git a/package.json b/package.json
index c72e591f..dba845b2 100644
--- a/package.json
+++ b/package.json
@@ -119,11 +119,11 @@
     "workbox-build": "^7.0.0"
   },
   "devDependencies": {
-    "@rsbuild/core": "^1.0.1-beta.9",
-    "@rsbuild/plugin-node-polyfill": "^1.0.3",
-    "@rsbuild/plugin-react": "^1.0.1-beta.9",
-    "@rsbuild/plugin-type-check": "^1.0.1-beta.9",
-    "@rsbuild/plugin-typed-css-modules": "^1.0.1",
+    "@rsbuild/core": "1.0.1-beta.9",
+    "@rsbuild/plugin-node-polyfill": "1.0.3",
+    "@rsbuild/plugin-react": "1.0.1-beta.9",
+    "@rsbuild/plugin-type-check": "1.0.1-beta.9",
+    "@rsbuild/plugin-typed-css-modules": "1.0.1",
     "@storybook/addon-essentials": "^7.4.6",
     "@storybook/addon-links": "^7.4.6",
     "@storybook/blocks": "^7.4.6",
@@ -154,7 +154,7 @@
     "mc-assets": "^0.2.52",
     "mineflayer-mouse": "^0.1.7",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
-    "mineflayer": "github:zardoy/mineflayer",
+    "mineflayer": "github:GenerelSchwerz/mineflayer",
     "mineflayer-pathfinder": "^2.4.4",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
@@ -195,9 +195,9 @@
   },
   "pnpm": {
     "overrides": {
+      "@nxg-org/mineflayer-physics-util": "1.8.5",
       "buffer": "^6.0.3",
       "vec3": "0.1.10",
-      "@nxg-org/mineflayer-physics-util": "1.5.8",
       "three": "0.154.0",
       "diamond-square": "github:zardoy/diamond-square",
       "prismarine-block": "github:zardoy/prismarine-block#next-era",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 933acaa3..44343516 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,9 +5,9 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
+  '@nxg-org/mineflayer-physics-util': 1.8.5
   buffer: ^6.0.3
   vec3: 0.1.10
-  '@nxg-org/mineflayer-physics-util': 1.5.8
   three: 0.154.0
   diamond-square: github:zardoy/diamond-square
   prismarine-block: github:zardoy/prismarine-block#next-era
@@ -40,58 +40,58 @@ importers:
     dependencies:
       '@dimaka/interface':
         specifier: 0.0.3-alpha.0
-        version: 0.0.3-alpha.0(@babel/core@7.22.11)(@popperjs/core@2.11.8)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        version: 0.0.3-alpha.0(@babel/core@7.26.9)(@popperjs/core@2.11.8)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@floating-ui/react':
         specifier: ^0.26.1
-        version: 0.26.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        version: 0.26.28(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@nxg-org/mineflayer-auto-jump':
         specifier: ^0.7.12
         version: 0.7.12
       '@nxg-org/mineflayer-tracker':
         specifier: 1.2.1
-        version: 1.2.1
+        version: 1.2.1(encoding@0.1.13)
       '@react-oauth/google':
         specifier: ^0.12.1
-        version: 0.12.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        version: 0.12.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@stylistic/eslint-plugin':
         specifier: ^2.6.1
-        version: 2.6.1(eslint@8.50.0)(typescript@5.5.4)
+        version: 2.13.0(eslint@8.57.1)(typescript@5.5.4)
       '@types/gapi':
         specifier: ^0.0.47
         version: 0.0.47
       '@types/react':
         specifier: ^18.2.20
-        version: 18.2.20
+        version: 18.3.18
       '@types/react-dom':
         specifier: ^18.2.7
-        version: 18.2.7
+        version: 18.3.5(@types/react@18.3.18)
       '@types/wicg-file-system-access':
         specifier: ^2023.10.2
-        version: 2023.10.2
+        version: 2023.10.5
       '@xmcl/text-component':
         specifier: ^2.1.3
         version: 2.1.3
       '@zardoy/react-util':
         specifier: ^0.2.4
-        version: 0.2.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        version: 0.2.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@zardoy/utils':
         specifier: ^0.0.11
         version: 0.0.11
       adm-zip:
         specifier: ^0.5.12
-        version: 0.5.12
+        version: 0.5.16
       browserfs:
         specifier: github:zardoy/browserfs#build
         version: https://codeload.github.com/zardoy/browserfs/tar.gz/e60ca69e74888e057a96a468afe1d62347d3f56f
       change-case:
         specifier: ^5.1.2
-        version: 5.1.2
+        version: 5.4.4
       classnames:
         specifier: ^2.5.1
         version: 2.5.1
       compression:
         specifier: ^1.7.4
-        version: 1.7.4
+        version: 1.8.0
       cors:
         specifier: ^2.8.5
         version: 2.8.5
@@ -106,25 +106,25 @@ importers:
         version: 1.0.5
       eruda:
         specifier: ^3.0.1
-        version: 3.0.1
+        version: 3.4.1
       esbuild:
         specifier: ^0.19.3
-        version: 0.19.11
+        version: 0.19.12
       esbuild-plugin-polyfill-node:
         specifier: ^0.3.0
-        version: 0.3.0(esbuild@0.19.11)
+        version: 0.3.0(esbuild@0.19.12)
       express:
         specifier: ^4.18.2
-        version: 4.18.2
+        version: 4.21.2
       filesize:
         specifier: ^10.0.12
-        version: 10.0.12
+        version: 10.1.6
       flying-squid:
         specifier: npm:@zardoy/flying-squid@^0.0.58
         version: '@zardoy/flying-squid@0.0.58(encoding@0.1.13)'
       fs-extra:
         specifier: ^11.1.1
-        version: 11.1.1
+        version: 11.3.0
       google-drive-browserfs:
         specifier: github:zardoy/browserfs#google-drive
         version: browserfs@https://codeload.github.com/zardoy/browserfs/tar.gz/ab58ae8ef00e3a31db01909e365e6cb5188436e0
@@ -136,13 +136,13 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.14
-        version: 0.1.14(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13))
+        version: 0.1.14(encoding@0.1.13)(mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13)
@@ -151,13 +151,13 @@ importers:
         version: 2.0.4
       net-browserify:
         specifier: github:zardoy/prismarinejs-net-browserify
-        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/4c6eccc7d7a7468ec811cb6c7398ded4753aea55
+        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590
       node-gzip:
         specifier: ^1.1.2
         version: 1.1.2
       peerjs:
         specifier: ^1.5.0
-        version: 1.5.0
+        version: 1.5.4
       pixelarticons:
         specifier: ^1.8.1
         version: 1.8.1(patch_hash=cclg2qo6d4yjs4evj64nr2mbwa)
@@ -169,10 +169,10 @@ importers:
         version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1)
       prosemirror-example-setup:
         specifier: ^1.2.2
-        version: 1.2.2
+        version: 1.2.3
       prosemirror-markdown:
         specifier: ^1.12.0
-        version: 1.12.0
+        version: 1.13.1
       prosemirror-menu:
         specifier: ^1.2.4
         version: 1.2.4
@@ -181,25 +181,25 @@ importers:
         version: 1.4.3
       prosemirror-view:
         specifier: ^1.33.1
-        version: 1.33.1
+        version: 1.38.1
       qrcode.react:
         specifier: ^3.1.0
-        version: 3.1.0(react@18.2.0)
+        version: 3.2.0(react@18.3.1)
       react:
         specifier: ^18.2.0
-        version: 18.2.0
+        version: 18.3.1
       react-dom:
         specifier: ^18.2.0
-        version: 18.2.0(react@18.2.0)
+        version: 18.3.1(react@18.3.1)
       react-select:
         specifier: ^5.8.0
-        version: 5.8.0(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        version: 5.10.1(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react-transition-group:
         specifier: ^4.4.5
-        version: 4.4.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        version: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react-zoom-pan-pinch:
         specifier: 3.4.4
-        version: 3.4.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        version: 3.4.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       remark:
         specifier: ^15.0.1
         version: 15.0.1
@@ -208,13 +208,13 @@ importers:
         version: 1.6.3
       skinview3d:
         specifier: ^3.0.1
-        version: 3.0.1
+        version: 3.1.0
       source-map-js:
         specifier: ^1.0.2
         version: 1.2.1
       stats-gl:
         specifier: ^1.0.5
-        version: 1.0.5
+        version: 1.0.7
       stats.js:
         specifier: ^0.17.0
         version: 0.17.0
@@ -226,13 +226,13 @@ importers:
         version: 3.0.3
       ua-parser-js:
         specifier: ^1.0.37
-        version: 1.0.37
+        version: 1.0.40
       use-typed-event-listener:
         specifier: ^4.0.2
-        version: 4.0.2(react@18.2.0)(typescript@5.5.4)
+        version: 4.0.2(react@18.3.1)(typescript@5.5.4)
       valtio:
         specifier: ^1.11.1
-        version: 1.11.2(@types/react@18.2.20)(react@18.2.0)
+        version: 1.13.2(@types/react@18.3.18)(react@18.3.1)
       vec3:
         specifier: 0.1.10
         version: 0.1.10
@@ -241,63 +241,63 @@ importers:
         version: 7.2.0(debug@4.4.0)
       workbox-build:
         specifier: ^7.0.0
-        version: 7.0.0(@types/babel__core@7.20.2)
+        version: 7.3.0(@types/babel__core@7.20.5)
     optionalDependencies:
       cypress:
         specifier: ^10.11.0
         version: 10.11.0
       cypress-plugin-snapshots:
         specifier: ^1.4.4
-        version: 1.4.4(cypress@10.11.0)
+        version: 1.4.4(cypress@10.11.0)(debug@4.4.0)
       sharp:
         specifier: ^0.33.5
         version: 0.33.5
       systeminformation:
         specifier: ^5.21.22
-        version: 5.22.7
+        version: 5.25.11
     devDependencies:
       '@rsbuild/core':
-        specifier: ^1.0.1-beta.9
+        specifier: 1.0.1-beta.9
         version: 1.0.1-beta.9
       '@rsbuild/plugin-node-polyfill':
-        specifier: ^1.0.3
+        specifier: 1.0.3
         version: 1.0.3(@rsbuild/core@1.0.1-beta.9)
       '@rsbuild/plugin-react':
-        specifier: ^1.0.1-beta.9
+        specifier: 1.0.1-beta.9
         version: 1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)
       '@rsbuild/plugin-type-check':
-        specifier: ^1.0.1-beta.9
-        version: 1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)(esbuild@0.19.11)(typescript@5.5.4)
+        specifier: 1.0.1-beta.9
+        version: 1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)(esbuild@0.19.12)(typescript@5.5.4)
       '@rsbuild/plugin-typed-css-modules':
-        specifier: ^1.0.1
+        specifier: 1.0.1
         version: 1.0.1(@rsbuild/core@1.0.1-beta.9)
       '@storybook/addon-essentials':
         specifier: ^7.4.6
-        version: 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        version: 7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@storybook/addon-links':
         specifier: ^7.4.6
-        version: 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        version: 7.6.20(react@18.3.1)
       '@storybook/blocks':
         specifier: ^7.4.6
-        version: 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        version: 7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@storybook/react':
         specifier: ^7.4.6
-        version: 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
+        version: 7.6.20(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4)
       '@storybook/react-vite':
         specifier: ^7.4.6
-        version: 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.4)(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))
+        version: 7.6.20(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@2.79.2)(typescript@5.5.4)(vite@6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0))
       '@types/diff-match-patch':
         specifier: ^1.0.36
         version: 1.0.36
       '@types/lodash-es':
         specifier: ^4.17.9
-        version: 4.17.9
+        version: 4.17.12
       '@types/react-transition-group':
         specifier: ^4.4.7
-        version: 4.4.7
+        version: 4.4.12(@types/react@18.3.18)
       '@types/stats.js':
         specifier: ^0.17.1
-        version: 0.17.1
+        version: 0.17.3
       '@types/three':
         specifier: 0.154.0
         version: 0.154.0
@@ -309,7 +309,7 @@ importers:
         version: 5.3.4
       '@xmcl/installer':
         specifier: ^5.1.0
-        version: 5.1.0
+        version: 5.4.0
       assert:
         specifier: ^2.0.0
         version: 2.1.0
@@ -327,16 +327,16 @@ importers:
         version: 0.1.8(typescript@5.5.4)
       crypto-browserify:
         specifier: ^3.12.0
-        version: 3.12.0
+        version: 3.12.1
       cypress-esbuild-preprocessor:
         specifier: ^1.0.2
         version: 1.0.2
       eslint:
         specifier: ^8.50.0
-        version: 8.50.0
+        version: 8.57.1
       eslint-config-zardoy:
         specifier: ^0.2.17
-        version: 0.2.17(eslint-plugin-react-hooks@4.6.0(eslint@8.50.0))(eslint-plugin-react@7.34.1(eslint@8.50.0))(eslint@8.50.0)(typescript@5.5.4)
+        version: 0.2.17(eslint-plugin-react-hooks@5.2.0(eslint@8.57.1))(eslint-plugin-react@7.37.4(eslint@8.57.1))(eslint@8.57.1)(typescript@5.5.4)
       events:
         specifier: ^3.3.0
         version: 3.3.0
@@ -357,16 +357,16 @@ importers:
         version: 0.2.52
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
-        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00(@types/react@18.2.20)(react@18.2.0)
+        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
-        specifier: github:zardoy/mineflayer
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)
+        specifier: github:GenerelSchwerz/mineflayer
+        version: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.7
-        version: 0.1.7(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+        version: 0.1.7(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
       mineflayer-pathfinder:
         specifier: ^2.4.4
-        version: 2.4.4
+        version: 2.4.5
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -387,10 +387,10 @@ importers:
         version: link:renderer
       rimraf:
         specifier: ^5.0.1
-        version: 5.0.1
+        version: 5.0.10
       storybook:
         specifier: ^7.4.6
-        version: 7.4.6(encoding@0.1.13)
+        version: 7.6.20(encoding@0.1.13)
       stream-browserify:
         specifier: ^3.0.0
         version: 3.0.0
@@ -405,10 +405,10 @@ importers:
         version: 5.5.4
       vitest:
         specifier: ^0.34.6
-        version: 0.34.6(terser@5.31.3)
+        version: 0.34.6(terser@5.39.0)
       yaml:
         specifier: ^2.3.2
-        version: 2.4.1
+        version: 2.7.0
 
   renderer:
     dependencies:
@@ -423,19 +423,19 @@ importers:
         version: 6.0.3
       filesize:
         specifier: ^10.0.12
-        version: 10.0.12
+        version: 10.1.6
       fs-extra:
         specifier: ^11.0.0
-        version: 11.1.1
+        version: 11.3.0
       lil-gui:
         specifier: ^0.18.2
         version: 0.18.2
       minecraft-wrap:
         specifier: ^1.3.0
-        version: 1.5.1(encoding@0.1.13)
+        version: 1.6.0(encoding@0.1.13)
       minecrafthawkeye:
         specifier: ^1.3.6
-        version: 1.3.6
+        version: 1.3.9
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
         version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
@@ -453,19 +453,19 @@ importers:
         version: 'link:'
       socket.io:
         specifier: ^4.0.0
-        version: 4.7.2
+        version: 4.8.1
       socket.io-client:
         specifier: ^4.0.0
-        version: 4.7.2
+        version: 4.8.1
       three-stdlib:
         specifier: ^2.26.11
-        version: 2.28.5(three@0.154.0(patch_hash=sj7ocb4p23jym6bkfgueanti2e))
+        version: 2.35.14(three@0.154.0(patch_hash=sj7ocb4p23jym6bkfgueanti2e))
       three.meshline:
         specifier: ^1.3.0
         version: 1.4.0
       tsx:
         specifier: ^4.7.0
-        version: 4.7.0
+        version: 4.19.3
       vec3:
         specifier: 0.1.10
         version: 0.1.10
@@ -485,16 +485,12 @@ importers:
     dependencies:
       vite:
         specifier: ^4.4.9
-        version: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
+        version: 4.5.9(@types/node@22.13.9)(terser@5.39.0)
 
 packages:
 
-  '@aashutoshrathi/word-wrap@1.2.6':
-    resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
-    engines: {node: '>=0.10.0'}
-
-  '@ampproject/remapping@2.2.1':
-    resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==}
+  '@ampproject/remapping@2.3.0':
+    resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
     engines: {node: '>=6.0.0'}
 
   '@apideck/better-ajv-errors@0.3.6':
@@ -507,178 +503,147 @@ packages:
     resolution: {integrity: sha512-Xk1sIhyNC/esHGGVjL/niHLowM0csl/kFO5uawBy4IrWwy0o1G8LGt3jP6nmWGz+USxeeqbihAmp/oVZju6wug==}
     hasBin: true
 
-  '@azure/msal-common@14.9.0':
-    resolution: {integrity: sha512-yzBPRlWPnTBeixxLNI3BBIgF5/bHpbhoRVuuDBnYjCyWRavaPUsKAHUDYLqpGkBLDciA6TCc6GOxN4/S3WiSxg==}
+  '@azure/msal-common@14.16.0':
+    resolution: {integrity: sha512-1KOZj9IpcDSwpNiQNjt0jDYZpQvNZay7QAEi/5DLubay40iGYtLzya/jbjRPLyOTZhEKyL1MzPuw2HqBCjceYA==}
     engines: {node: '>=0.8.0'}
 
-  '@azure/msal-node@2.7.0':
-    resolution: {integrity: sha512-wXD8LkUvHICeSWZydqg6o8Yvv+grlBEcmLGu+QEI4FcwFendbTEZrlSygnAXXSOCVaGAirWLchca35qrgpO6Jw==}
+  '@azure/msal-node@2.16.2':
+    resolution: {integrity: sha512-An7l1hEr0w1HMMh1LU+rtDtqL7/jw74ORlc9Wnh06v7TU/xpG39/Zdr1ZJu3QpjUfKJ+E0/OXMW8DRSWTlh7qQ==}
     engines: {node: '>=16'}
 
-  '@babel/code-frame@7.22.13':
-    resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==}
+  '@babel/code-frame@7.26.2':
+    resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/compat-data@7.22.9':
-    resolution: {integrity: sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==}
+  '@babel/compat-data@7.26.8':
+    resolution: {integrity: sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/core@7.22.11':
-    resolution: {integrity: sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==}
+  '@babel/core@7.26.9':
+    resolution: {integrity: sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/generator@7.22.10':
-    resolution: {integrity: sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==}
+  '@babel/generator@7.26.9':
+    resolution: {integrity: sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-annotate-as-pure@7.22.5':
-    resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}
+  '@babel/helper-annotate-as-pure@7.25.9':
+    resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-builder-binary-assignment-operator-visitor@7.22.10':
-    resolution: {integrity: sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==}
+  '@babel/helper-compilation-targets@7.26.5':
+    resolution: {integrity: sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-compilation-targets@7.22.10':
-    resolution: {integrity: sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-create-class-features-plugin@7.22.15':
-    resolution: {integrity: sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==}
+  '@babel/helper-create-class-features-plugin@7.26.9':
+    resolution: {integrity: sha512-ubbUqCofvxPRurw5L8WTsCLSkQiVpov4Qx0WMA+jUN+nXBK8ADPlJO1grkFw5CWKC5+sZSOfuGMdX1aI1iT9Sg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-create-regexp-features-plugin@7.22.9':
-    resolution: {integrity: sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==}
+  '@babel/helper-create-regexp-features-plugin@7.26.3':
+    resolution: {integrity: sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-define-polyfill-provider@0.4.2':
-    resolution: {integrity: sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==}
+  '@babel/helper-define-polyfill-provider@0.6.3':
+    resolution: {integrity: sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
-  '@babel/helper-environment-visitor@7.22.20':
-    resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==}
+  '@babel/helper-member-expression-to-functions@7.25.9':
+    resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-function-name@7.22.5':
-    resolution: {integrity: sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==}
+  '@babel/helper-module-imports@7.25.9':
+    resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-hoist-variables@7.22.5':
-    resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-member-expression-to-functions@7.23.0':
-    resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-module-imports@7.22.15':
-    resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-module-transforms@7.23.0':
-    resolution: {integrity: sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==}
+  '@babel/helper-module-transforms@7.26.0':
+    resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-optimise-call-expression@7.22.5':
-    resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
+  '@babel/helper-optimise-call-expression@7.25.9':
+    resolution: {integrity: sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-plugin-utils@7.22.5':
-    resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
+  '@babel/helper-plugin-utils@7.26.5':
+    resolution: {integrity: sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-remap-async-to-generator@7.22.9':
-    resolution: {integrity: sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==}
+  '@babel/helper-remap-async-to-generator@7.25.9':
+    resolution: {integrity: sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-replace-supers@7.22.9':
-    resolution: {integrity: sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==}
+  '@babel/helper-replace-supers@7.26.5':
+    resolution: {integrity: sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-simple-access@7.22.5':
-    resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
+  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
+    resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-skip-transparent-expression-wrappers@7.22.5':
-    resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==}
+  '@babel/helper-string-parser@7.25.9':
+    resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-split-export-declaration@7.22.6':
-    resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
+  '@babel/helper-validator-identifier@7.25.9':
+    resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-string-parser@7.22.5':
-    resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==}
+  '@babel/helper-validator-option@7.25.9':
+    resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-validator-identifier@7.22.20':
-    resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
+  '@babel/helper-wrap-function@7.25.9':
+    resolution: {integrity: sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-validator-option@7.22.15':
-    resolution: {integrity: sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==}
+  '@babel/helpers@7.26.9':
+    resolution: {integrity: sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-wrap-function@7.22.10':
-    resolution: {integrity: sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helpers@7.22.11':
-    resolution: {integrity: sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/highlight@7.22.13':
-    resolution: {integrity: sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/parser@7.22.13':
-    resolution: {integrity: sha512-3l6+4YOvc9wx7VlCSw4yQfcBo01ECA8TicQfbnCPuCEpRQrf+gTUyGdxNw+pyTUyywp6JRD1w0YQs9TpBXYlkw==}
+  '@babel/parser@7.26.9':
+    resolution: {integrity: sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5':
-    resolution: {integrity: sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==}
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9':
+    resolution: {integrity: sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.22.5':
-    resolution: {integrity: sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==}
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9':
+    resolution: {integrity: sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9':
+    resolution: {integrity: sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9':
+    resolution: {integrity: sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.13.0
 
-  '@babel/plugin-proposal-class-properties@7.18.6':
-    resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9':
+    resolution: {integrity: sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.
     peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-proposal-nullish-coalescing-operator@7.18.6':
-    resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
-    engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-proposal-optional-chaining@7.21.0':
-    resolution: {integrity: sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==}
-    engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+      '@babel/core': ^7.0.0
 
   '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2':
     resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
@@ -686,110 +651,32 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-async-generators@7.8.4':
-    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-class-properties@7.12.13':
-    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-class-static-block@7.14.5':
-    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+  '@babel/plugin-syntax-flow@7.26.0':
+    resolution: {integrity: sha512-B+O2DnPc0iG+YXFqOxv2WNuNU97ToWjOomUQ78DouOENWUaM5sVrmet9mcomUGQFwpJd//gvUagXBSdzO1fRKg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-dynamic-import@7.8.3':
-    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-export-namespace-from@7.8.3':
-    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-flow@7.22.5':
-    resolution: {integrity: sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==}
+  '@babel/plugin-syntax-import-assertions@7.26.0':
+    resolution: {integrity: sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-import-assertions@7.22.5':
-    resolution: {integrity: sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==}
+  '@babel/plugin-syntax-import-attributes@7.26.0':
+    resolution: {integrity: sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-import-attributes@7.22.5':
-    resolution: {integrity: sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==}
+  '@babel/plugin-syntax-jsx@7.25.9':
+    resolution: {integrity: sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-import-meta@7.10.4':
-    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-json-strings@7.8.3':
-    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-jsx@7.22.5':
-    resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-logical-assignment-operators@7.10.4':
-    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3':
-    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-numeric-separator@7.10.4':
-    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-object-rest-spread@7.8.3':
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-optional-catch-binding@7.8.3':
-    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-optional-chaining@7.8.3':
-    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-private-property-in-object@7.14.5':
-    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-top-level-await@7.14.5':
-    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-syntax-typescript@7.22.5':
-    resolution: {integrity: sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==}
+  '@babel/plugin-syntax-typescript@7.25.9':
+    resolution: {integrity: sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -800,326 +687,338 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-transform-arrow-functions@7.22.5':
-    resolution: {integrity: sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==}
+  '@babel/plugin-transform-arrow-functions@7.25.9':
+    resolution: {integrity: sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-async-generator-functions@7.22.11':
-    resolution: {integrity: sha512-0pAlmeRJn6wU84zzZsEOx1JV1Jf8fqO9ok7wofIJwUnplYo247dcd24P+cMJht7ts9xkzdtB0EPHmOb7F+KzXw==}
+  '@babel/plugin-transform-async-generator-functions@7.26.8':
+    resolution: {integrity: sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-async-to-generator@7.22.5':
-    resolution: {integrity: sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==}
+  '@babel/plugin-transform-async-to-generator@7.25.9':
+    resolution: {integrity: sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-block-scoped-functions@7.22.5':
-    resolution: {integrity: sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==}
+  '@babel/plugin-transform-block-scoped-functions@7.26.5':
+    resolution: {integrity: sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-block-scoping@7.22.10':
-    resolution: {integrity: sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==}
+  '@babel/plugin-transform-block-scoping@7.25.9':
+    resolution: {integrity: sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-class-properties@7.22.5':
-    resolution: {integrity: sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==}
+  '@babel/plugin-transform-class-properties@7.25.9':
+    resolution: {integrity: sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-class-static-block@7.22.11':
-    resolution: {integrity: sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==}
+  '@babel/plugin-transform-class-static-block@7.26.0':
+    resolution: {integrity: sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.12.0
 
-  '@babel/plugin-transform-classes@7.22.6':
-    resolution: {integrity: sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==}
+  '@babel/plugin-transform-classes@7.25.9':
+    resolution: {integrity: sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-computed-properties@7.22.5':
-    resolution: {integrity: sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==}
+  '@babel/plugin-transform-computed-properties@7.25.9':
+    resolution: {integrity: sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-destructuring@7.22.10':
-    resolution: {integrity: sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==}
+  '@babel/plugin-transform-destructuring@7.25.9':
+    resolution: {integrity: sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-dotall-regex@7.22.5':
-    resolution: {integrity: sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==}
+  '@babel/plugin-transform-dotall-regex@7.25.9':
+    resolution: {integrity: sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-duplicate-keys@7.22.5':
-    resolution: {integrity: sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==}
+  '@babel/plugin-transform-duplicate-keys@7.25.9':
+    resolution: {integrity: sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-dynamic-import@7.22.11':
-    resolution: {integrity: sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-exponentiation-operator@7.22.5':
-    resolution: {integrity: sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-export-namespace-from@7.22.11':
-    resolution: {integrity: sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-flow-strip-types@7.22.5':
-    resolution: {integrity: sha512-tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-for-of@7.22.5':
-    resolution: {integrity: sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-function-name@7.22.5':
-    resolution: {integrity: sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-json-strings@7.22.11':
-    resolution: {integrity: sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-literals@7.22.5':
-    resolution: {integrity: sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-logical-assignment-operators@7.22.11':
-    resolution: {integrity: sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-member-expression-literals@7.22.5':
-    resolution: {integrity: sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-modules-amd@7.22.5':
-    resolution: {integrity: sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-modules-commonjs@7.23.0':
-    resolution: {integrity: sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-modules-systemjs@7.22.11':
-    resolution: {integrity: sha512-rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-modules-umd@7.22.5':
-    resolution: {integrity: sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-named-capturing-groups-regex@7.22.5':
-    resolution: {integrity: sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==}
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9':
+    resolution: {integrity: sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/plugin-transform-new-target@7.22.5':
-    resolution: {integrity: sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==}
+  '@babel/plugin-transform-dynamic-import@7.25.9':
+    resolution: {integrity: sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-nullish-coalescing-operator@7.22.11':
-    resolution: {integrity: sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==}
+  '@babel/plugin-transform-exponentiation-operator@7.26.3':
+    resolution: {integrity: sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-numeric-separator@7.22.11':
-    resolution: {integrity: sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==}
+  '@babel/plugin-transform-export-namespace-from@7.25.9':
+    resolution: {integrity: sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-object-rest-spread@7.22.11':
-    resolution: {integrity: sha512-nX8cPFa6+UmbepISvlf5jhQyaC7ASs/7UxHmMkuJ/k5xSHvDPPaibMo+v3TXwU/Pjqhep/nFNpd3zn4YR59pnw==}
+  '@babel/plugin-transform-flow-strip-types@7.26.5':
+    resolution: {integrity: sha512-eGK26RsbIkYUns3Y8qKl362juDDYK+wEdPGHGrhzUl6CewZFo55VZ7hg+CyMFU4dd5QQakBN86nBMpRsFpRvbQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-object-super@7.22.5':
-    resolution: {integrity: sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==}
+  '@babel/plugin-transform-for-of@7.26.9':
+    resolution: {integrity: sha512-Hry8AusVm8LW5BVFgiyUReuoGzPUpdHQQqJY5bZnbbf+ngOHWuCuYFKw/BqaaWlvEUrF91HMhDtEaI1hZzNbLg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-optional-catch-binding@7.22.11':
-    resolution: {integrity: sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==}
+  '@babel/plugin-transform-function-name@7.25.9':
+    resolution: {integrity: sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-optional-chaining@7.22.12':
-    resolution: {integrity: sha512-7XXCVqZtyFWqjDsYDY4T45w4mlx1rf7aOgkc/Ww76xkgBiOlmjPkx36PBLHa1k1rwWvVgYMPsbuVnIamx2ZQJw==}
+  '@babel/plugin-transform-json-strings@7.25.9':
+    resolution: {integrity: sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-parameters@7.22.5':
-    resolution: {integrity: sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==}
+  '@babel/plugin-transform-literals@7.25.9':
+    resolution: {integrity: sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-private-methods@7.22.5':
-    resolution: {integrity: sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==}
+  '@babel/plugin-transform-logical-assignment-operators@7.25.9':
+    resolution: {integrity: sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-private-property-in-object@7.22.11':
-    resolution: {integrity: sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==}
+  '@babel/plugin-transform-member-expression-literals@7.25.9':
+    resolution: {integrity: sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-property-literals@7.22.5':
-    resolution: {integrity: sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==}
+  '@babel/plugin-transform-modules-amd@7.25.9':
+    resolution: {integrity: sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-react-jsx-self@7.22.5':
-    resolution: {integrity: sha512-nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g==}
+  '@babel/plugin-transform-modules-commonjs@7.26.3':
+    resolution: {integrity: sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-react-jsx-source@7.22.5':
-    resolution: {integrity: sha512-yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w==}
+  '@babel/plugin-transform-modules-systemjs@7.25.9':
+    resolution: {integrity: sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-regenerator@7.22.10':
-    resolution: {integrity: sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==}
+  '@babel/plugin-transform-modules-umd@7.25.9':
+    resolution: {integrity: sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-reserved-words@7.22.5':
-    resolution: {integrity: sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-shorthand-properties@7.22.5':
-    resolution: {integrity: sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-spread@7.22.5':
-    resolution: {integrity: sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-sticky-regex@7.22.5':
-    resolution: {integrity: sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-template-literals@7.22.5':
-    resolution: {integrity: sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-typeof-symbol@7.22.5':
-    resolution: {integrity: sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-typescript@7.22.15':
-    resolution: {integrity: sha512-1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-unicode-escapes@7.22.10':
-    resolution: {integrity: sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-unicode-property-regex@7.22.5':
-    resolution: {integrity: sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-unicode-regex@7.22.5':
-    resolution: {integrity: sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-unicode-sets-regex@7.22.5':
-    resolution: {integrity: sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==}
+  '@babel/plugin-transform-named-capturing-groups-regex@7.25.9':
+    resolution: {integrity: sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/preset-env@7.22.10':
-    resolution: {integrity: sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==}
+  '@babel/plugin-transform-new-target@7.25.9':
+    resolution: {integrity: sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/preset-flow@7.22.15':
-    resolution: {integrity: sha512-dB5aIMqpkgbTfN5vDdTRPzjqtWiZcRESNR88QYnoPR+bmdYoluOzMX9tQerTv0XzSgZYctPfO1oc0N5zdog1ew==}
+  '@babel/plugin-transform-nullish-coalescing-operator@7.26.6':
+    resolution: {integrity: sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-numeric-separator@7.25.9':
+    resolution: {integrity: sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-object-rest-spread@7.25.9':
+    resolution: {integrity: sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-object-super@7.25.9':
+    resolution: {integrity: sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-optional-catch-binding@7.25.9':
+    resolution: {integrity: sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-optional-chaining@7.25.9':
+    resolution: {integrity: sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-parameters@7.25.9':
+    resolution: {integrity: sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-private-methods@7.25.9':
+    resolution: {integrity: sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-private-property-in-object@7.25.9':
+    resolution: {integrity: sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-property-literals@7.25.9':
+    resolution: {integrity: sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx-self@7.25.9':
+    resolution: {integrity: sha512-y8quW6p0WHkEhmErnfe58r7x0A70uKphQm8Sp8cV7tjNQwK56sNVK0M73LK3WuYmsuyrftut4xAkjjgU0twaMg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx-source@7.25.9':
+    resolution: {integrity: sha512-+iqjT8xmXhhYv4/uiYd8FNQsraMFZIfxVSqxxVSZP0WbbSAWvBXAul0m/zu+7Vv4O/3WtApy9pmaTMiumEZgfg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-regenerator@7.25.9':
+    resolution: {integrity: sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-regexp-modifiers@7.26.0':
+    resolution: {integrity: sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-reserved-words@7.25.9':
+    resolution: {integrity: sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-shorthand-properties@7.25.9':
+    resolution: {integrity: sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-spread@7.25.9':
+    resolution: {integrity: sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-sticky-regex@7.25.9':
+    resolution: {integrity: sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-template-literals@7.26.8':
+    resolution: {integrity: sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-typeof-symbol@7.26.7':
+    resolution: {integrity: sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-typescript@7.26.8':
+    resolution: {integrity: sha512-bME5J9AC8ChwA7aEPJ6zym3w7aObZULHhbNLU0bKUhKsAkylkzUdq+0kdymh9rzi8nlNFl2bmldFBCKNJBUpuw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-escapes@7.25.9':
+    resolution: {integrity: sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-property-regex@7.25.9':
+    resolution: {integrity: sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-regex@7.25.9':
+    resolution: {integrity: sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-sets-regex@7.25.9':
+    resolution: {integrity: sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/preset-env@7.26.9':
+    resolution: {integrity: sha512-vX3qPGE8sEKEAZCWk05k3cpTAE3/nOYca++JA+Rd0z2NCNzabmYvEiSShKzm10zdquOIAVXsy2Ei/DTW34KlKQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/preset-flow@7.25.9':
+    resolution: {integrity: sha512-EASHsAhE+SSlEzJ4bzfusnXSHiU+JfAYzj+jbw2vgQKgq5HrUr8qs+vgtiEL5dOH6sEweI+PNt2D7AqrDSHyqQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1129,73 +1028,37 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
 
-  '@babel/preset-typescript@7.23.0':
-    resolution: {integrity: sha512-6P6VVa/NM/VlAYj5s2Aq/gdVg8FSENCg3wlZ6Qau9AcPaoF5LbN1nyGlR9DTRIw9PpxI94e+ReydsJHcjwAweg==}
+  '@babel/preset-typescript@7.26.0':
+    resolution: {integrity: sha512-NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/register@7.22.15':
-    resolution: {integrity: sha512-V3Q3EqoQdn65RCgTLwauZaTfd1ShhwPmbBv+1dkZV/HpCGMKVyn6oFcRlI7RaKqiDQjX2Qd3AuoEguBgdjIKlg==}
+  '@babel/register@7.25.9':
+    resolution: {integrity: sha512-8D43jXtGsYmEeDvm4MWHYUpWf8iiXgWYx3fW7E7Wb7Oe6FWqJPl5K6TuFW0dOwNZzEE5rjlaSJYH9JjrUKJszA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/regjsgen@0.8.0':
-    resolution: {integrity: sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==}
-
-  '@babel/runtime@7.24.5':
-    resolution: {integrity: sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==}
+  '@babel/runtime@7.26.9':
+    resolution: {integrity: sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/template@7.22.5':
-    resolution: {integrity: sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==}
+  '@babel/template@7.26.9':
+    resolution: {integrity: sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/traverse@7.22.11':
-    resolution: {integrity: sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==}
+  '@babel/traverse@7.26.9':
+    resolution: {integrity: sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/types@7.23.0':
-    resolution: {integrity: sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==}
+  '@babel/types@7.26.9':
+    resolution: {integrity: sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==}
     engines: {node: '>=6.9.0'}
 
   '@base2/pretty-print-object@1.0.1':
     resolution: {integrity: sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==}
 
-  '@bcoe/v8-coverage@0.2.3':
-    resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
-
-  '@cbor-extract/cbor-extract-darwin-arm64@2.2.0':
-    resolution: {integrity: sha512-P7swiOAdF7aSi0H+tHtHtr6zrpF3aAq/W9FXx5HektRvLTM2O89xCyXF3pk7pLc7QpaY7AoaE8UowVf9QBdh3w==}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@cbor-extract/cbor-extract-darwin-x64@2.2.0':
-    resolution: {integrity: sha512-1liF6fgowph0JxBbYnAS7ZlqNYLf000Qnj4KjqPNW4GViKrEql2MgZnAsExhY9LSy8dnvA4C0qHEBgPrll0z0w==}
-    cpu: [x64]
-    os: [darwin]
-
-  '@cbor-extract/cbor-extract-linux-arm64@2.2.0':
-    resolution: {integrity: sha512-rQvhNmDuhjTVXSPFLolmQ47/ydGOFXtbR7+wgkSY0bdOxCFept1hvg59uiLPT2fVDuJFuEy16EImo5tE2x3RsQ==}
-    cpu: [arm64]
-    os: [linux]
-
-  '@cbor-extract/cbor-extract-linux-arm@2.2.0':
-    resolution: {integrity: sha512-QeBcBXk964zOytiedMPQNZr7sg0TNavZeuUCD6ON4vEOU/25+pLhNN6EDIKJ9VLTKaZ7K7EaAriyYQ1NQ05s/Q==}
-    cpu: [arm]
-    os: [linux]
-
-  '@cbor-extract/cbor-extract-linux-x64@2.2.0':
-    resolution: {integrity: sha512-cWLAWtT3kNLHSvP4RKDzSTX9o0wvQEEAj4SKvhWuOVZxiDAeQazr9A+PSiRILK1VYMLeDml89ohxCnUNQNQNCw==}
-    cpu: [x64]
-    os: [linux]
-
-  '@cbor-extract/cbor-extract-win32-x64@2.2.0':
-    resolution: {integrity: sha512-l2M+Z8DO2vbvADOBNLbbh9y5ST1RY5sqkWOg/58GkUPBYou/cuNZ68SGQ644f1CvZ8kcOxyZtw06+dxWHIoN/w==}
-    cpu: [x64]
-    os: [win32]
-
   '@colors/colors@1.5.0':
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
@@ -1219,11 +1082,11 @@ packages:
   '@emnapi/runtime@1.3.1':
     resolution: {integrity: sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==}
 
-  '@emotion/babel-plugin@11.12.0':
-    resolution: {integrity: sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw==}
+  '@emotion/babel-plugin@11.13.5':
+    resolution: {integrity: sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==}
 
-  '@emotion/cache@11.13.1':
-    resolution: {integrity: sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==}
+  '@emotion/cache@11.14.0':
+    resolution: {integrity: sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==}
 
   '@emotion/css@11.5.0':
     resolution: {integrity: sha512-mqjz/3aqR9rp40M+pvwdKYWxlQK4Nj3cnNjo3Tx6SM14dSsEn7q/4W2/I7PlgG+mb27iITHugXuBIHH/QwUBVQ==}
@@ -1239,8 +1102,8 @@ packages:
   '@emotion/memoize@0.9.0':
     resolution: {integrity: sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==}
 
-  '@emotion/react@11.13.0':
-    resolution: {integrity: sha512-WkL+bw1REC2VNV1goQyfxjx1GYJkcc23CRQkXX+vZNLINyfI7o+uUn/rTGPt/xJ3bJHd5GcljgnxHf4wRw5VWQ==}
+  '@emotion/react@11.14.0':
+    resolution: {integrity: sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==}
     peerDependencies:
       '@types/react': '*'
       react: ^18.2.0
@@ -1248,28 +1111,28 @@ packages:
       '@types/react':
         optional: true
 
-  '@emotion/serialize@1.3.0':
-    resolution: {integrity: sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==}
+  '@emotion/serialize@1.3.3':
+    resolution: {integrity: sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==}
 
   '@emotion/sheet@1.4.0':
     resolution: {integrity: sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==}
 
-  '@emotion/unitless@0.9.0':
-    resolution: {integrity: sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ==}
+  '@emotion/unitless@0.10.0':
+    resolution: {integrity: sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==}
 
-  '@emotion/use-insertion-effect-with-fallbacks@1.1.0':
-    resolution: {integrity: sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==}
+  '@emotion/use-insertion-effect-with-fallbacks@1.2.0':
+    resolution: {integrity: sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==}
     peerDependencies:
       react: ^18.2.0
 
-  '@emotion/utils@1.4.0':
-    resolution: {integrity: sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ==}
+  '@emotion/utils@1.4.2':
+    resolution: {integrity: sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==}
 
   '@emotion/weak-memoize@0.4.0':
     resolution: {integrity: sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==}
 
-  '@esbuild/aix-ppc64@0.19.11':
-    resolution: {integrity: sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==}
+  '@esbuild/aix-ppc64@0.19.12':
+    resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [aix]
@@ -1286,8 +1149,8 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.19.11':
-    resolution: {integrity: sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q==}
+  '@esbuild/android-arm64@0.19.12':
+    resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
@@ -1304,8 +1167,8 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.19.11':
-    resolution: {integrity: sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw==}
+  '@esbuild/android-arm@0.19.12':
+    resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
@@ -1322,8 +1185,8 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.19.11':
-    resolution: {integrity: sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg==}
+  '@esbuild/android-x64@0.19.12':
+    resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
@@ -1340,8 +1203,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.19.11':
-    resolution: {integrity: sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ==}
+  '@esbuild/darwin-arm64@0.19.12':
+    resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
@@ -1358,8 +1221,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.19.11':
-    resolution: {integrity: sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g==}
+  '@esbuild/darwin-x64@0.19.12':
+    resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
@@ -1376,8 +1239,8 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.19.11':
-    resolution: {integrity: sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA==}
+  '@esbuild/freebsd-arm64@0.19.12':
+    resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
@@ -1394,8 +1257,8 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.19.11':
-    resolution: {integrity: sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw==}
+  '@esbuild/freebsd-x64@0.19.12':
+    resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
@@ -1412,8 +1275,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.19.11':
-    resolution: {integrity: sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg==}
+  '@esbuild/linux-arm64@0.19.12':
+    resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
@@ -1430,8 +1293,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.19.11':
-    resolution: {integrity: sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q==}
+  '@esbuild/linux-arm@0.19.12':
+    resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
@@ -1448,8 +1311,8 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.19.11':
-    resolution: {integrity: sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA==}
+  '@esbuild/linux-ia32@0.19.12':
+    resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
@@ -1466,8 +1329,8 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.19.11':
-    resolution: {integrity: sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg==}
+  '@esbuild/linux-loong64@0.19.12':
+    resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
@@ -1484,8 +1347,8 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.19.11':
-    resolution: {integrity: sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg==}
+  '@esbuild/linux-mips64el@0.19.12':
+    resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
@@ -1502,8 +1365,8 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.19.11':
-    resolution: {integrity: sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA==}
+  '@esbuild/linux-ppc64@0.19.12':
+    resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
@@ -1520,8 +1383,8 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.19.11':
-    resolution: {integrity: sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ==}
+  '@esbuild/linux-riscv64@0.19.12':
+    resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
@@ -1538,8 +1401,8 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.19.11':
-    resolution: {integrity: sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q==}
+  '@esbuild/linux-s390x@0.19.12':
+    resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
@@ -1556,8 +1419,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.19.11':
-    resolution: {integrity: sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==}
+  '@esbuild/linux-x64@0.19.12':
+    resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
@@ -1580,8 +1443,8 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.19.11':
-    resolution: {integrity: sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ==}
+  '@esbuild/netbsd-x64@0.19.12':
+    resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
@@ -1604,8 +1467,8 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.19.11':
-    resolution: {integrity: sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw==}
+  '@esbuild/openbsd-x64@0.19.12':
+    resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
@@ -1622,8 +1485,8 @@ packages:
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.19.11':
-    resolution: {integrity: sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ==}
+  '@esbuild/sunos-x64@0.19.12':
+    resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
@@ -1640,8 +1503,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.19.11':
-    resolution: {integrity: sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ==}
+  '@esbuild/win32-arm64@0.19.12':
+    resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
@@ -1658,8 +1521,8 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.19.11':
-    resolution: {integrity: sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg==}
+  '@esbuild/win32-ia32@0.19.12':
+    resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
@@ -1676,8 +1539,8 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.19.11':
-    resolution: {integrity: sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==}
+  '@esbuild/win32-x64@0.19.12':
+    resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
@@ -1688,51 +1551,51 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@eslint-community/eslint-utils@4.4.0':
-    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
+  '@eslint-community/eslint-utils@4.4.1':
+    resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
 
-  '@eslint-community/regexpp@4.8.0':
-    resolution: {integrity: sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==}
+  '@eslint-community/regexpp@4.12.1':
+    resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
 
-  '@eslint/eslintrc@2.1.2':
-    resolution: {integrity: sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==}
+  '@eslint/eslintrc@2.1.4':
+    resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  '@eslint/js@8.50.0':
-    resolution: {integrity: sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==}
+  '@eslint/js@8.57.1':
+    resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
   '@fal-works/esbuild-plugin-global-externals@2.1.2':
     resolution: {integrity: sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==}
 
-  '@fastify/busboy@2.0.0':
-    resolution: {integrity: sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==}
+  '@fastify/busboy@2.1.1':
+    resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==}
     engines: {node: '>=14'}
 
-  '@floating-ui/core@1.5.0':
-    resolution: {integrity: sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==}
+  '@floating-ui/core@1.6.9':
+    resolution: {integrity: sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==}
 
-  '@floating-ui/dom@1.5.3':
-    resolution: {integrity: sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==}
+  '@floating-ui/dom@1.6.13':
+    resolution: {integrity: sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==}
 
-  '@floating-ui/react-dom@2.0.9':
-    resolution: {integrity: sha512-q0umO0+LQK4+p6aGyvzASqKbKOJcAHJ7ycE9CuUvfx3s9zTHWmGJTPOIlM/hmSBfUfg/XfY5YhLBLR/LHwShQQ==}
+  '@floating-ui/react-dom@2.1.2':
+    resolution: {integrity: sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==}
     peerDependencies:
       react: ^18.2.0
       react-dom: '>=16.8.0'
 
-  '@floating-ui/react@0.26.1':
-    resolution: {integrity: sha512-5gyJIJ2tZOPMgmZ/vEcVhdmQiy75b7LPO71sYIiDsxGcZ4hxLuygQWCuT0YXHqppt//Eese+L6t5KnX/gZ3tVA==}
+  '@floating-ui/react@0.26.28':
+    resolution: {integrity: sha512-yORQuuAtVpiRjpMhdc0wJj06b9JFjrYF4qp96j++v2NBpbi6SEGF7donUJ3TMieerQ6qVkAv1tgr7L4r5roTqw==}
     peerDependencies:
       react: ^18.2.0
       react-dom: '>=16.8.0'
 
-  '@floating-ui/utils@0.1.6':
-    resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==}
+  '@floating-ui/utils@0.2.9':
+    resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==}
 
   '@gar/promisify@1.1.3':
     resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
@@ -1743,8 +1606,8 @@ packages:
   '@hapi/topo@5.1.0':
     resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==}
 
-  '@humanwhocodes/config-array@0.11.11':
-    resolution: {integrity: sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==}
+  '@humanwhocodes/config-array@0.13.0':
+    resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==}
     engines: {node: '>=10.10.0'}
     deprecated: Use @eslint/config-array instead
 
@@ -1752,8 +1615,8 @@ packages:
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
 
-  '@humanwhocodes/object-schema@1.2.1':
-    resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
+  '@humanwhocodes/object-schema@2.0.3':
+    resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
     deprecated: Use @eslint/object-schema instead
 
   '@img/sharp-darwin-arm64@0.33.5':
@@ -2050,32 +1913,29 @@ packages:
   '@jimp/utils@0.10.3':
     resolution: {integrity: sha512-VcSlQhkil4ReYmg1KkN+WqHyYfZ2XfZxDsKAHSfST1GEz/RQHxKZbX+KhFKtKflnL0F4e6DlNQj3vznMNXCR2w==}
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.2.1':
-    resolution: {integrity: sha512-ou4ZJSXMMWHqGS4g8uNRbC5TiTWxAgQZiVucoUrOCWuPrTbkpJbmVyIi9jU72SBry7gQtuMEDp4YR8EEXAg7VQ==}
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.3.0':
+    resolution: {integrity: sha512-2D6y7fNvFmsLmRt6UCOFJPvFoPMJGT0Uh1Wg0RaigUp7kdQPs6yYn8Dmx6GZkOH/NW0yMTwRz/p0SRMMRo50vA==}
     peerDependencies:
       typescript: '>= 4.3.x'
-      vite: ^3.0.0 || ^4.0.0
+      vite: ^3.0.0 || ^4.0.0 || ^5.0.0
     peerDependenciesMeta:
       typescript:
         optional: true
 
-  '@jridgewell/gen-mapping@0.3.3':
-    resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==}
+  '@jridgewell/gen-mapping@0.3.8':
+    resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==}
     engines: {node: '>=6.0.0'}
 
-  '@jridgewell/resolve-uri@3.1.1':
-    resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==}
+  '@jridgewell/resolve-uri@3.1.2':
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
     engines: {node: '>=6.0.0'}
 
-  '@jridgewell/set-array@1.1.2':
-    resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
+  '@jridgewell/set-array@1.2.1':
+    resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
     engines: {node: '>=6.0.0'}
 
-  '@jridgewell/source-map@0.3.5':
-    resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==}
-
-  '@jridgewell/sourcemap-codec@1.4.15':
-    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
+  '@jridgewell/source-map@0.3.6':
+    resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
 
   '@jridgewell/sourcemap-codec@1.5.0':
     resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
@@ -2083,12 +1943,15 @@ packages:
   '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
-  '@jspm/core@2.0.1':
-    resolution: {integrity: sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==}
+  '@jspm/core@2.1.0':
+    resolution: {integrity: sha512-3sRl+pkyFY/kLmHl0cgHiFp2xEqErA8N3ECjMs7serSUBmoJ70lBa0PG5t0IM6WJgdZNyyI0R8YFfi5wM8+mzg==}
 
   '@juggle/resize-observer@3.3.1':
     resolution: {integrity: sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw==}
 
+  '@juggle/resize-observer@3.4.0':
+    resolution: {integrity: sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==}
+
   '@mapbox/node-pre-gyp@1.0.11':
     resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==}
     hasBin: true
@@ -2141,17 +2004,17 @@ packages:
   '@nxg-org/mineflayer-auto-jump@0.7.12':
     resolution: {integrity: sha512-F5vX/lerlWx/5HVlkDNbvrtQ19PL6iG8i4ItPTIRtjGiFzusDefP7DI226zSFR8Wlaw45qHv0jn814p/4/qVdQ==}
 
-  '@nxg-org/mineflayer-physics-util@1.5.8':
-    resolution: {integrity: sha512-KmCkAqpUo8BbuRdIBs6+V2hWHehz++PRz3lRwIsb47CuG0u4sgLYh37RY3ifAznC6uWvmPK+q3B4ZXwJzPy1MQ==}
+  '@nxg-org/mineflayer-physics-util@1.8.5':
+    resolution: {integrity: sha512-+pqS4dvGzcBqkb2cJPDRSXEmWuFeMvTTOJoKUwuSvpk1xAEsc+z6+PiYebtys1Hbg47yoIW2y6Qb+LXYJ9abBA==}
 
   '@nxg-org/mineflayer-tracker@1.2.1':
     resolution: {integrity: sha512-SI1ffF8zvg3/ZNE021Ja2W0FZPN+WbQDZf8yFqOcXtPRXAtM9W6HvoACdzXep8BZid7WYgYLIgjKpB+9RqvCNQ==}
 
-  '@nxg-org/mineflayer-trajectories@1.1.1':
-    resolution: {integrity: sha512-X103KXlX8+L3uMeK4jQxMUdTizv01sQRSfBizAF/iOAdfQZehRLXr3CYKeJzfwPYGLN0X0JCl++cMEcZVn4vbg==}
+  '@nxg-org/mineflayer-trajectories@1.2.0':
+    resolution: {integrity: sha512-yTDHn96fyWLKwdHdOGIrnt8nss4SJmxXwJn101o7aNI4sgdnUmwaX4FoNbmrEa9eZn6IwxaXIxDf+fJmKj9RIw==}
 
-  '@nxg-org/mineflayer-util-plugin@1.8.3':
-    resolution: {integrity: sha512-YlIbzCDs9822xuvmYlD0vXZz0iye9buqp9NK4nNn15gYybdqBtC/YxK6BLqXtwNohZCKoZdKgei7Xd5Bt2/rUg==}
+  '@nxg-org/mineflayer-util-plugin@1.8.4':
+    resolution: {integrity: sha512-hPaCZxU0Aq+gUSi/l6x7n32hUG6bnDugAMoQXD2dFE/gyNkmRSpmgH5+Y6G41w3H8P3Nl++upGCOlaxvZ7RuoA==}
 
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
@@ -2166,6 +2029,9 @@ packages:
   '@radix-ui/primitive@1.0.1':
     resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==}
 
+  '@radix-ui/primitive@1.1.1':
+    resolution: {integrity: sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==}
+
   '@radix-ui/react-arrow@1.0.3':
     resolution: {integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==}
     peerDependencies:
@@ -2192,6 +2058,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-collection@1.1.2':
+    resolution: {integrity: sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^18.2.0
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-compose-refs@1.0.1':
     resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==}
     peerDependencies:
@@ -2201,6 +2080,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-compose-refs@1.1.1':
+    resolution: {integrity: sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^18.2.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-context@1.0.1':
     resolution: {integrity: sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==}
     peerDependencies:
@@ -2210,6 +2098,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-context@1.1.1':
+    resolution: {integrity: sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^18.2.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-direction@1.0.1':
     resolution: {integrity: sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==}
     peerDependencies:
@@ -2219,6 +2116,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-direction@1.1.0':
+    resolution: {integrity: sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^18.2.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-dismissable-layer@1.0.4':
     resolution: {integrity: sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==}
     peerDependencies:
@@ -2263,6 +2169,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-id@1.1.0':
+    resolution: {integrity: sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^18.2.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-popper@1.1.2':
     resolution: {integrity: sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==}
     peerDependencies:
@@ -2302,13 +2217,26 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-roving-focus@1.0.4':
-    resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==}
+  '@radix-ui/react-primitive@2.0.2':
+    resolution: {integrity: sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
       react: ^18.2.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-roving-focus@1.1.2':
+    resolution: {integrity: sha512-zgMQWkNO169GtGqRvYrzb0Zf8NhMHS2DuEB/TiEmVnpr5OqPU3i8lfbxaAmC2J/KYuIQxyoQQ6DxepyXp61/xw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^18.2.0
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
     peerDependenciesMeta:
       '@types/react':
         optional: true
@@ -2328,13 +2256,13 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-separator@1.0.3':
-    resolution: {integrity: sha512-itYmTy/kokS21aiV5+Z56MZB54KrhPgn6eHDKkFeOLR34HMN2s8PaN47qZZAGnvupcjxHaFZnW4pQEh0BvvVuw==}
+  '@radix-ui/react-separator@1.1.2':
+    resolution: {integrity: sha512-oZfHcaAp2Y6KFBX6I5P1u7CQoy4lheCGiYj+pGFrHy8E/VNRb5E39TkTr3JrV520csPBTZjkuKFdEsjS5EUNKQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
       react: ^18.2.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
     peerDependenciesMeta:
       '@types/react':
         optional: true
@@ -2350,39 +2278,48 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-toggle-group@1.0.4':
-    resolution: {integrity: sha512-Uaj/M/cMyiyT9Bx6fOZO0SAG4Cls0GptBWiBmBxofmDbNVnYYoyRWj/2M/6VCi/7qcXFWnHhRUfdfZFvvkuu8A==}
+  '@radix-ui/react-slot@1.1.2':
+    resolution: {integrity: sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^18.2.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-toggle-group@1.1.2':
+    resolution: {integrity: sha512-JBm6s6aVG/nwuY5eadhU2zDi/IwYS0sDM5ZWb4nymv/hn3hZdkw+gENn0LP4iY1yCd7+bgJaCwueMYJIU3vk4A==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
       react: ^18.2.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
     peerDependenciesMeta:
       '@types/react':
         optional: true
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-toggle@1.0.3':
-    resolution: {integrity: sha512-Pkqg3+Bc98ftZGsl60CLANXQBBQ4W3mTFS9EJvNxKMZ7magklKV69/id1mlAlOFDDfHvlCms0fx8fA4CMKDJHg==}
+  '@radix-ui/react-toggle@1.1.2':
+    resolution: {integrity: sha512-lntKchNWx3aCHuWKiDY+8WudiegQvBpDRAYL8dKLRvKEH8VOpl0XX6SSU/bUBqIRJbcTy4+MW06Wv8vgp10rzQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
       react: ^18.2.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
     peerDependenciesMeta:
       '@types/react':
         optional: true
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-toolbar@1.0.4':
-    resolution: {integrity: sha512-tBgmM/O7a07xbaEkYJWYTXkIdU/1pW4/KZORR43toC/4XWyBCURK0ei9kMUdp+gTPPKBgYLxXmRSH1EVcIDp8Q==}
+  '@radix-ui/react-toolbar@1.1.2':
+    resolution: {integrity: sha512-wT20eQ7ScFk+kBMDmHp+lMk18cgxhu35b2Bn5deUcPxiVwfn5vuZgi7NGcHu8ocdkinahmp4FaSZysKDyRVPWQ==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
       react: ^18.2.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
     peerDependenciesMeta:
       '@types/react':
         optional: true
@@ -2398,6 +2335,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-use-callback-ref@1.1.0':
+    resolution: {integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^18.2.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-use-controllable-state@1.0.1':
     resolution: {integrity: sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==}
     peerDependencies:
@@ -2407,6 +2353,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-use-controllable-state@1.1.0':
+    resolution: {integrity: sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^18.2.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-use-escape-keydown@1.0.3':
     resolution: {integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==}
     peerDependencies:
@@ -2425,6 +2380,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-use-layout-effect@1.1.0':
+    resolution: {integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^18.2.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-use-previous@1.0.1':
     resolution: {integrity: sha512-cV5La9DPwiQ7S0gf/0qiD6YgNqM5Fk97Kdrlc5yBcrF3jyEZQwm7vYFqMo4IfeHgJXsRaMvLABFtd0OVEmZhDw==}
     peerDependencies:
@@ -2485,25 +2449,37 @@ packages:
       '@types/babel__core':
         optional: true
 
-  '@rollup/plugin-node-resolve@11.2.1':
-    resolution: {integrity: sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==}
-    engines: {node: '>= 10.0.0'}
+  '@rollup/plugin-node-resolve@15.3.1':
+    resolution: {integrity: sha512-tgg6b91pAybXHJQMAAwW9VuWBO6Thi+q7BCNARLwSqlmsHz0XYURtGvh/AuwSADXSI4h/2uHbs7s4FzlZDGSGA==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
-      rollup: ^1.20.0||^2.0.0
+      rollup: ^2.78.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
 
   '@rollup/plugin-replace@2.4.2':
     resolution: {integrity: sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==}
     peerDependencies:
       rollup: ^1.20.0 || ^2.0.0
 
+  '@rollup/plugin-terser@0.4.4':
+    resolution: {integrity: sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+
   '@rollup/pluginutils@3.1.0':
     resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0
 
-  '@rollup/pluginutils@5.0.5':
-    resolution: {integrity: sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==}
+  '@rollup/pluginutils@5.1.4':
+    resolution: {integrity: sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
@@ -2511,98 +2487,98 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.34.8':
-    resolution: {integrity: sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==}
+  '@rollup/rollup-android-arm-eabi@4.34.9':
+    resolution: {integrity: sha512-qZdlImWXur0CFakn2BJ2znJOdqYZKiedEPEVNTBrpfPjc/YuTGcaYZcdmNFTkUj3DU0ZM/AElcM8Ybww3xVLzA==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.34.8':
-    resolution: {integrity: sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==}
+  '@rollup/rollup-android-arm64@4.34.9':
+    resolution: {integrity: sha512-4KW7P53h6HtJf5Y608T1ISKvNIYLWRKMvfnG0c44M6In4DQVU58HZFEVhWINDZKp7FZps98G3gxwC1sb0wXUUg==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.34.8':
-    resolution: {integrity: sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==}
+  '@rollup/rollup-darwin-arm64@4.34.9':
+    resolution: {integrity: sha512-0CY3/K54slrzLDjOA7TOjN1NuLKERBgk9nY5V34mhmuu673YNb+7ghaDUs6N0ujXR7fz5XaS5Aa6d2TNxZd0OQ==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.34.8':
-    resolution: {integrity: sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==}
+  '@rollup/rollup-darwin-x64@4.34.9':
+    resolution: {integrity: sha512-eOojSEAi/acnsJVYRxnMkPFqcxSMFfrw7r2iD9Q32SGkb/Q9FpUY1UlAu1DH9T7j++gZ0lHjnm4OyH2vCI7l7Q==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.34.8':
-    resolution: {integrity: sha512-IQNVXL9iY6NniYbTaOKdrlVP3XIqazBgJOVkddzJlqnCpRi/yAeSOa8PLcECFSQochzqApIOE1GHNu3pCz+BDA==}
+  '@rollup/rollup-freebsd-arm64@4.34.9':
+    resolution: {integrity: sha512-2lzjQPJbN5UnHm7bHIUKFMulGTQwdvOkouJDpPysJS+QFBGDJqcfh+CxxtG23Ik/9tEvnebQiylYoazFMAgrYw==}
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.34.8':
-    resolution: {integrity: sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==}
+  '@rollup/rollup-freebsd-x64@4.34.9':
+    resolution: {integrity: sha512-SLl0hi2Ah2H7xQYd6Qaiu01kFPzQ+hqvdYSoOtHYg/zCIFs6t8sV95kaoqjzjFwuYQLtOI0RZre/Ke0nPaQV+g==}
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.34.8':
-    resolution: {integrity: sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.34.9':
+    resolution: {integrity: sha512-88I+D3TeKItrw+Y/2ud4Tw0+3CxQ2kLgu3QvrogZ0OfkmX/DEppehus7L3TS2Q4lpB+hYyxhkQiYPJ6Mf5/dPg==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.34.8':
-    resolution: {integrity: sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==}
+  '@rollup/rollup-linux-arm-musleabihf@4.34.9':
+    resolution: {integrity: sha512-3qyfWljSFHi9zH0KgtEPG4cBXHDFhwD8kwg6xLfHQ0IWuH9crp005GfoUUh/6w9/FWGBwEHg3lxK1iHRN1MFlA==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.34.8':
-    resolution: {integrity: sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==}
+  '@rollup/rollup-linux-arm64-gnu@4.34.9':
+    resolution: {integrity: sha512-6TZjPHjKZUQKmVKMUowF3ewHxctrRR09eYyvT5eFv8w/fXarEra83A2mHTVJLA5xU91aCNOUnM+DWFMSbQ0Nxw==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.34.8':
-    resolution: {integrity: sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==}
+  '@rollup/rollup-linux-arm64-musl@4.34.9':
+    resolution: {integrity: sha512-LD2fytxZJZ6xzOKnMbIpgzFOuIKlxVOpiMAXawsAZ2mHBPEYOnLRK5TTEsID6z4eM23DuO88X0Tq1mErHMVq0A==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.34.8':
-    resolution: {integrity: sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==}
+  '@rollup/rollup-linux-loongarch64-gnu@4.34.9':
+    resolution: {integrity: sha512-dRAgTfDsn0TE0HI6cmo13hemKpVHOEyeciGtvlBTkpx/F65kTvShtY/EVyZEIfxFkV5JJTuQ9tP5HGBS0hfxIg==}
     cpu: [loong64]
     os: [linux]
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.34.8':
-    resolution: {integrity: sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==}
+  '@rollup/rollup-linux-powerpc64le-gnu@4.34.9':
+    resolution: {integrity: sha512-PHcNOAEhkoMSQtMf+rJofwisZqaU8iQ8EaSps58f5HYll9EAY5BSErCZ8qBDMVbq88h4UxaNPlbrKqfWP8RfJA==}
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.34.8':
-    resolution: {integrity: sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==}
+  '@rollup/rollup-linux-riscv64-gnu@4.34.9':
+    resolution: {integrity: sha512-Z2i0Uy5G96KBYKjeQFKbbsB54xFOL5/y1P5wNBsbXB8yE+At3oh0DVMjQVzCJRJSfReiB2tX8T6HUFZ2k8iaKg==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.34.8':
-    resolution: {integrity: sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==}
+  '@rollup/rollup-linux-s390x-gnu@4.34.9':
+    resolution: {integrity: sha512-U+5SwTMoeYXoDzJX5dhDTxRltSrIax8KWwfaaYcynuJw8mT33W7oOgz0a+AaXtGuvhzTr2tVKh5UO8GVANTxyQ==}
     cpu: [s390x]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-gnu@4.34.8':
-    resolution: {integrity: sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==}
+  '@rollup/rollup-linux-x64-gnu@4.34.9':
+    resolution: {integrity: sha512-FwBHNSOjUTQLP4MG7y6rR6qbGw4MFeQnIBrMe161QGaQoBQLqSUEKlHIiVgF3g/mb3lxlxzJOpIBhaP+C+KP2A==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.34.8':
-    resolution: {integrity: sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==}
+  '@rollup/rollup-linux-x64-musl@4.34.9':
+    resolution: {integrity: sha512-cYRpV4650z2I3/s6+5/LONkjIz8MBeqrk+vPXV10ORBnshpn8S32bPqQ2Utv39jCiDcO2eJTuSlPXpnvmaIgRA==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-win32-arm64-msvc@4.34.8':
-    resolution: {integrity: sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==}
+  '@rollup/rollup-win32-arm64-msvc@4.34.9':
+    resolution: {integrity: sha512-z4mQK9dAN6byRA/vsSgQiPeuO63wdiDxZ9yg9iyX2QTzKuQM7T4xlBoeUP/J8uiFkqxkcWndWi+W7bXdPbt27Q==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.34.8':
-    resolution: {integrity: sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==}
+  '@rollup/rollup-win32-ia32-msvc@4.34.9':
+    resolution: {integrity: sha512-KB48mPtaoHy1AwDNkAJfHXvHp24H0ryZog28spEs0V48l3H1fr4i37tiyHsgKZJnCmvxsbATdZGBpbmxTE3a9w==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.34.8':
-    resolution: {integrity: sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==}
+  '@rollup/rollup-win32-x64-msvc@4.34.9':
+    resolution: {integrity: sha512-AyleYRPU7+rgkMWbEh71fQlrzRfeP6SyMnRf9XX4fCdDPAJumdSBqYEcWPMzVQ4ScAl7E4oFfK0GUVn77xSwbw==}
     cpu: [x64]
     os: [win32]
 
@@ -2706,8 +2682,8 @@ packages:
       react-refresh:
         optional: true
 
-  '@rushstack/eslint-patch@1.4.0':
-    resolution: {integrity: sha512-cEjvTPU32OM9lUFegJagO0mRnIn+rbqrG89vV8/xLnLFX0DoR0r1oy5IlTga71Q7uT3Qus7qm7wgeiMT/+Irlg==}
+  '@rushstack/eslint-patch@1.10.5':
+    resolution: {integrity: sha512-kkKUDVlII2DQiKy7UstOR1ErJP8kUKAQ4oa+SQtM0K+lPdmmjj0YnnxBgtTVYH7mUKtbsxeFC9y0AmK7Yb78/A==}
 
   '@sideway/address@4.1.5':
     resolution: {integrity: sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==}
@@ -2721,127 +2697,68 @@ packages:
   '@sinclair/typebox@0.27.8':
     resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
 
-  '@socket.io/component-emitter@3.1.0':
-    resolution: {integrity: sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==}
+  '@socket.io/component-emitter@3.1.2':
+    resolution: {integrity: sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==}
 
-  '@storybook/addon-actions@7.4.6':
-    resolution: {integrity: sha512-SsqZr3js5NinKPnC8AeNI7Ij+Q6fIl9tRdRmSulEgjksjOg7E5S1/Wsn5Bb2CCgj7MaX6VxGyC7s3XskQtDiIQ==}
+  '@storybook/addon-actions@7.6.20':
+    resolution: {integrity: sha512-c/GkEQ2U9BC/Ew/IMdh+zvsh4N6y6n7Zsn2GIhJgcu9YEAa5aF2a9/pNgEGBMOABH959XE8DAOMERw/5qiLR8g==}
+
+  '@storybook/addon-backgrounds@7.6.20':
+    resolution: {integrity: sha512-a7ukoaXT42vpKsMxkseIeO3GqL0Zst2IxpCTq5dSlXiADrcemSF/8/oNpNW9C4L6F1Zdt+WDtECXslEm017FvQ==}
+
+  '@storybook/addon-controls@7.6.20':
+    resolution: {integrity: sha512-06ZT5Ce1sZW52B0s6XuokwjkKO9GqHlTUHvuflvd8wifxKlCmRvNUxjBvwh+ccGJ49ZS73LbMSLFgtmBEkCxbg==}
+
+  '@storybook/addon-docs@7.6.20':
+    resolution: {integrity: sha512-XNfYRhbxH5JP7B9Lh4W06PtMefNXkfpV39Gaoih5HuqngV3eoSL4RikZYOMkvxRGQ738xc6axySU3+JKcP1OZg==}
     peerDependencies:
       react: ^18.2.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+
+  '@storybook/addon-essentials@7.6.20':
+    resolution: {integrity: sha512-hCupSOiJDeOxJKZSgH0x5Mb2Xqii6mps21g5hpxac1XjhQtmGflShxi/xOHhK3sNqrbgTSbScfpUP3hUlZO/2Q==}
+    peerDependencies:
+      react: ^18.2.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+
+  '@storybook/addon-highlight@7.6.20':
+    resolution: {integrity: sha512-7/x7xFdFyqCki5Dm3uBePldUs9l98/WxJ7rTHQuYqlX7kASwyN5iXPzuhmMRUhlMm/6G6xXtLabIpzwf1sFurA==}
+
+  '@storybook/addon-links@7.6.20':
+    resolution: {integrity: sha512-iomSnBD90CA4MinesYiJkFX2kb3P1Psd/a1Y0ghlFEsHD4uMId9iT6sx2s16DYMja0SlPkrbWYnGukqaCjZpRw==}
+    peerDependencies:
+      react: ^18.2.0
     peerDependenciesMeta:
       react:
         optional: true
-      react-dom:
-        optional: true
 
-  '@storybook/addon-backgrounds@7.4.6':
-    resolution: {integrity: sha512-+LHTZB/ZYMAzkyD5ZxSriBsqmsrvIaW/Nnd/BeuXGbkrVKKqM0qAKiFZAfjc2WchA1piVNy0/1Rsf+kuYCEiJw==}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      react-dom:
-        optional: true
+  '@storybook/addon-measure@7.6.20':
+    resolution: {integrity: sha512-i2Iq08bGfI7gZbG6Lb8uF/L287tnaGUR+2KFEmdBjH6+kgjWLiwfpanoPQpy4drm23ar0gUjX+L3Ri03VI5/Xg==}
 
-  '@storybook/addon-controls@7.4.6':
-    resolution: {integrity: sha512-4lq3sycEUIsK8SUWDYc60QgF4vV9FZZ3lDr6M7j2W9bOnvGw49d2fbdlnq+bX1ZprZZ9VgglQpBAorQB3BXZRw==}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      react-dom:
-        optional: true
+  '@storybook/addon-outline@7.6.20':
+    resolution: {integrity: sha512-TdsIQZf/TcDsGoZ1XpO+9nBc4OKqcMIzY4SrI8Wj9dzyFLQ37s08gnZr9POci8AEv62NTUOVavsxcafllkzqDQ==}
 
-  '@storybook/addon-docs@7.4.6':
-    resolution: {integrity: sha512-dLaub+XWFq4hChw+xfuF9yYg0Txp77FUawKoAigccfjWXx+OOhRV3XTuAcknpXkYq94GWynHgUFXosXT9kbDNA==}
+  '@storybook/addon-toolbars@7.6.20':
+    resolution: {integrity: sha512-5Btg4i8ffWTDHsU72cqxC8nIv9N3E3ObJAc6k0llrmPBG/ybh3jxmRfs8fNm44LlEXaZ5qrK/petsXX3UbpIFg==}
+
+  '@storybook/addon-viewport@7.6.20':
+    resolution: {integrity: sha512-i8mIw8BjLWAVHEQsOTE6UPuEGQvJDpsu1XZnOCkpfTfPMz73m+3td/PmLG7mMT2wPnLu9IZncKLCKTAZRbt/YQ==}
+
+  '@storybook/blocks@7.6.20':
+    resolution: {integrity: sha512-xADKGEOJWkG0UD5jbY4mBXRlmj2C+CIupDL0/hpzvLvwobxBMFPKZIkcZIMvGvVnI/Ui+tJxQxLSuJ5QsPthUw==}
     peerDependencies:
       react: ^18.2.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
 
-  '@storybook/addon-essentials@7.4.6':
-    resolution: {integrity: sha512-dWodufrt71TK7ELkeIvVae/x4PzECUlbOm57Iqqt4yQCyR291CgvI4PjeB8un2HbpcXCGZ+N/Oj3YkytvzBi4A==}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  '@storybook/builder-manager@7.6.20':
+    resolution: {integrity: sha512-e2GzpjLaw6CM/XSmc4qJRzBF8GOoOyotyu3JrSPTYOt4RD8kjUsK4QlismQM1DQRu8i39aIexxmRbiJyD74xzQ==}
 
-  '@storybook/addon-highlight@7.4.6':
-    resolution: {integrity: sha512-zCufxxD2KS5VwczxfkcBxe1oR/juTTn2H1Qm8kYvWCJQx3UxzX0+G9cwafbpV7eivqaufLweEwROkH+0KjAtkQ==}
-
-  '@storybook/addon-links@7.4.6':
-    resolution: {integrity: sha512-BPygElZKX+CPI9Se6GJNk1dYc5oxuhA+vHigO1tBqhiM6VkHyFP3cvezJNQvpNYhkUnu3cxnZXb3UJnlRbPY3g==}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      react-dom:
-        optional: true
-
-  '@storybook/addon-measure@7.4.6':
-    resolution: {integrity: sha512-nCymMLaHnxv8TE3yEM1A9Tulb1NuRXRNmtsdHTkjv7P1aWCxZo8A/GZaottKe/GLT8jSRjZ+dnpYWrbAhw6wTQ==}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      react-dom:
-        optional: true
-
-  '@storybook/addon-outline@7.4.6':
-    resolution: {integrity: sha512-errNUblRVDLpuEaHQPr/nsrnsUkD2ARmXawkRvizgDWLIDMDJYjTON3MUCaVx3x+hlZ3I6X//G5TVcma8tCc8A==}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      react-dom:
-        optional: true
-
-  '@storybook/addon-toolbars@7.4.6':
-    resolution: {integrity: sha512-L9m2FBcKeteGq7qIYsMJr0LEfiH7Wdrv5IDcldZTn68eZUJTh1p4GdJZcOmzX1P5IFRr76hpu03iWsNlWQjpbQ==}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      react-dom:
-        optional: true
-
-  '@storybook/addon-viewport@7.4.6':
-    resolution: {integrity: sha512-INDtk54j7bi7NgxMfd2ATmbA0J7nAd6X8itMkLIyPuPJtx8bYHPDORyemDOd0AojgmAdTOAyUtDYdI/PFeo4Cw==}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      react-dom:
-        optional: true
-
-  '@storybook/blocks@7.4.6':
-    resolution: {integrity: sha512-HxBSAeOiTZW2jbHQlo1upRWFgoMsaAyKijUFf5MwwMNIesXCuuTGZDJ3xTABwAVLK2qC9Ektfbo0CZCiPVuDRQ==}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-
-  '@storybook/builder-manager@7.4.6':
-    resolution: {integrity: sha512-zylZCD2rmyLOOFBFmUgtJg6UNUKmRNgXiig1XApzS2TkIbTZP827DsVEUl0ey/lskCe0uArkrEBR6ICba8p/Rw==}
-
-  '@storybook/builder-vite@7.4.6':
-    resolution: {integrity: sha512-xV9STYK+TkqWWTf2ydm6jx+7P70fjD2UPd1XTUw08uKszIjhuuxk+bG/OF5R1E25mPunAKXm6kBFh351AKejBg==}
+  '@storybook/builder-vite@7.6.20':
+    resolution: {integrity: sha512-q3vf8heE7EaVYTWlm768ewaJ9lh6v/KfoPPeHxXxzSstg4ByP9kg4E1mrfAo/l6broE9E9zo3/Q4gsM/G/rw8Q==}
     peerDependencies:
       '@preact/preset-vite': '*'
       typescript: '>= 4.3.x'
-      vite: ^3.0.0 || ^4.0.0
+      vite: ^3.0.0 || ^4.0.0 || ^5.0.0
       vite-plugin-glimmerx: '*'
     peerDependenciesMeta:
       '@preact/preset-vite':
@@ -2851,95 +2768,92 @@ packages:
       vite-plugin-glimmerx:
         optional: true
 
-  '@storybook/channels@7.4.6':
-    resolution: {integrity: sha512-yPv/sfo2c18fM3fvG0i1xse63vG8l33Al/OU0k/dtovltPu001/HVa1QgBgsb/QrEfZtvGjGhmtdVeYb39fv3A==}
+  '@storybook/channels@7.6.20':
+    resolution: {integrity: sha512-4hkgPSH6bJclB2OvLnkZOGZW1WptJs09mhQ6j6qLjgBZzL/ZdD6priWSd7iXrmPiN5TzUobkG4P4Dp7FjkiO7A==}
 
-  '@storybook/cli@7.4.6':
-    resolution: {integrity: sha512-rRwaH8pOL+FHz/pJMEkNpMH2xvZvWsrl7obBYw26NQiHmiVSAkfHJicndSN1mwc+p5w+9iXthrgzbLtSAOSvkA==}
+  '@storybook/cli@7.6.20':
+    resolution: {integrity: sha512-ZlP+BJyqg7HlnXf7ypjG2CKMI/KVOn03jFIiClItE/jQfgR6kRFgtjRU7uajh427HHfjv9DRiur8nBzuO7vapA==}
     hasBin: true
 
-  '@storybook/client-logger@7.4.6':
-    resolution: {integrity: sha512-XDw31ZziU//86PKuMRnmc+L/G0VopaGKENQOGEpvAXCU9IZASwGKlKAtcyosjrpi+ZiUXlMgUXCpXM7x3b1Ehw==}
+  '@storybook/client-logger@7.6.20':
+    resolution: {integrity: sha512-NwG0VIJQCmKrSaN5GBDFyQgTAHLNishUPLW1NrzqTDNAhfZUoef64rPQlinbopa0H4OXmlB+QxbQIb3ubeXmSQ==}
 
-  '@storybook/codemod@7.4.6':
-    resolution: {integrity: sha512-lxmwEpwksCaAq96APN2YlooSDfKjJ1vKzN5Ni2EqQzf2TEXl7XQjLacHd7OOaII1kfsy+D5gNG4N5wBo7Ub30g==}
+  '@storybook/codemod@7.6.20':
+    resolution: {integrity: sha512-8vmSsksO4XukNw0TmqylPmk7PxnfNfE21YsxFa7mnEBmEKQcZCQsNil4ZgWfG0IzdhTfhglAN4r++Ew0WE+PYA==}
 
-  '@storybook/components@7.4.6':
-    resolution: {integrity: sha512-nIRBhewAgrJJVafyCzuaLx1l+YOfvvD5dOZ0JxZsxJsefOdw1jFpUqUZ5fIpQ2moyvrR0mAUFw378rBfMdHz5Q==}
+  '@storybook/components@7.6.20':
+    resolution: {integrity: sha512-0d8u4m558R+W5V+rseF/+e9JnMciADLXTpsILrG+TBhwECk0MctIWW18bkqkujdCm8kDZr5U2iM/5kS1Noy7Ug==}
     peerDependencies:
       react: ^18.2.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
 
-  '@storybook/core-client@7.4.6':
-    resolution: {integrity: sha512-tfgxAHeCvMcs6DsVgtb4hQSDaCHeAPJOsoyhb47eDQfk4OmxzriM0qWucJV5DePSMi+KutX/rN2u0JxfOuN68g==}
+  '@storybook/core-client@7.6.20':
+    resolution: {integrity: sha512-upQuQQinLmlOPKcT8yqXNtwIucZ4E4qegYZXH5HXRWoLAL6GQtW7sUVSIuFogdki8OXRncr/dz8OA+5yQyYS4w==}
 
-  '@storybook/core-common@7.4.6':
-    resolution: {integrity: sha512-05MJFmOM86qvTLtgDskokIFz9txe0Lbhq4L3by1FtF0GwgH+p+W6I94KI7c6ANER+kVZkXQZhiRzwBFnVTW+Cg==}
+  '@storybook/core-common@7.6.20':
+    resolution: {integrity: sha512-8H1zPWPjcmeD4HbDm4FDD0WLsfAKGVr566IZ4hG+h3iWVW57II9JW9MLBtiR2LPSd8u7o0kw64lwRGmtCO1qAw==}
 
-  '@storybook/core-events@7.4.6':
-    resolution: {integrity: sha512-r5vrE+32lwrJh1NGFr1a0mWjvxo7q8FXYShylcwRWpacmL5NTtLkrXOoJSeGvJ4yKNYkvxQFtOPId4lzDxa32w==}
+  '@storybook/core-events@7.6.20':
+    resolution: {integrity: sha512-tlVDuVbDiNkvPDFAu+0ou3xBBYbx9zUURQz4G9fAq0ScgBOs/bpzcRrFb4mLpemUViBAd47tfZKdH4MAX45KVQ==}
 
-  '@storybook/core-server@7.4.6':
-    resolution: {integrity: sha512-jqmRTGCJ1W0WReImivkisPVaLFT5sjtLnFoAk0feHp6QS5j7EYOPN7CYzliyQmARWTLUEXOVaFf3VD6nJZQhJQ==}
+  '@storybook/core-server@7.6.20':
+    resolution: {integrity: sha512-qC5BdbqqwMLTdCwMKZ1Hbc3+3AaxHYWLiJaXL9e8s8nJw89xV8c8l30QpbJOGvcDmsgY6UTtXYaJ96OsTr7MrA==}
 
-  '@storybook/csf-plugin@7.4.6':
-    resolution: {integrity: sha512-yi7Qa4NSqKOyiJTWCxlB0ih2ijXq6oY5qZKW6MuMMBP14xJNRGLbH5KabpfXgN2T7YECcOWG1uWaGj2veJb1KA==}
+  '@storybook/csf-plugin@7.6.20':
+    resolution: {integrity: sha512-dzBzq0dN+8WLDp6NxYS4G7BCe8+vDeDRBRjHmM0xb0uJ6xgQViL8SDplYVSGnk3bXE/1WmtvyRzQyTffBnaj9Q==}
 
-  '@storybook/csf-tools@7.4.6':
-    resolution: {integrity: sha512-ocKpcIUtTBy6hlLY34RUFQyX403cWpB2gGfqvkHbpGe2BQj7EyV0zpWnjsfVxvw+M9OWlCdxHWDOPUgXM33ELw==}
+  '@storybook/csf-tools@7.6.20':
+    resolution: {integrity: sha512-rwcwzCsAYh/m/WYcxBiEtLpIW5OH1ingxNdF/rK9mtGWhJxXRDV8acPkFrF8rtFWIVKoOCXu5USJYmc3f2gdYQ==}
 
-  '@storybook/csf@0.1.1':
-    resolution: {integrity: sha512-4hE3AlNVxR60Wc5KSC68ASYzUobjPqtSKyhV6G+ge0FIXU55N5nTY7dXGRZHQGDBPq+XqchMkIdlkHPRs8nTHg==}
+  '@storybook/csf@0.1.13':
+    resolution: {integrity: sha512-7xOOwCLGB3ebM87eemep89MYRFTko+D8qE7EdAAq74lgdqRR5cOUtYWJLjO2dLtP94nqoOdHJo6MdLLKzg412Q==}
 
   '@storybook/docs-mdx@0.1.0':
     resolution: {integrity: sha512-JDaBR9lwVY4eSH5W8EGHrhODjygPd6QImRbwjAuJNEnY0Vw4ie3bPkeGfnacB3OBW6u/agqPv2aRlR46JcAQLg==}
 
-  '@storybook/docs-tools@7.4.6':
-    resolution: {integrity: sha512-nZj1L/8WwKWWJ41FW4MaKGajZUtrhnr9UwflRCkQJaWhAKmDfOb5M5TqI93uCOULpFPOm5wpoMBz2IHInQ2Lrg==}
+  '@storybook/docs-tools@7.6.20':
+    resolution: {integrity: sha512-Bw2CcCKQ5xGLQgtexQsI1EGT6y5epoFzOINi0FSTGJ9Wm738nRp5LH3dLk1GZLlywIXcYwOEThb2pM+pZeRQxQ==}
 
   '@storybook/global@5.0.0':
     resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
 
-  '@storybook/manager-api@7.4.6':
-    resolution: {integrity: sha512-inrm3DIbCp8wjXSN/wK6e6i2ysQ/IEmtC7IN0OJ7vdrp+USCooPT448SQTUmVctUGCFmOU3fxXByq8g77oIi7w==}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  '@storybook/manager-api@7.6.20':
+    resolution: {integrity: sha512-gOB3m8hO3gBs9cBoN57T7jU0wNKDh+hi06gLcyd2awARQlAlywnLnr3s1WH5knih6Aq+OpvGBRVKkGLOkaouCQ==}
 
-  '@storybook/manager@7.4.6':
-    resolution: {integrity: sha512-kA1hUDxpn1i2SO9OinvLvVXDeL4xgJkModp+pbE8IXv4NJWReNq1ecMeQCzPLS3Sil2gnrullQ9uYXsnZ9bxxA==}
+  '@storybook/manager@7.6.20':
+    resolution: {integrity: sha512-0Cf6WN0t7yEG2DR29tN5j+i7H/TH5EfPppg9h9/KiQSoFHk+6KLoy2p5do94acFU+Ro4+zzxvdCGbcYGKuArpg==}
 
   '@storybook/mdx2-csf@1.1.0':
     resolution: {integrity: sha512-TXJJd5RAKakWx4BtpwvSNdgTDkKM6RkXU8GK34S/LhidQ5Pjz3wcnqb0TxEkfhK/ztbP8nKHqXFwLfa2CYkvQw==}
 
-  '@storybook/node-logger@7.4.6':
-    resolution: {integrity: sha512-djZb310Q27GviDug1XBv0jOEDLCiwr4hhDE0aifCEKZpfNCi/EaP31nbWimFzZwxu4hE/YAPWExzScruR1zw9Q==}
+  '@storybook/node-logger@7.6.20':
+    resolution: {integrity: sha512-l2i4qF1bscJkOplNffcRTsgQWYR7J51ewmizj5YrTM8BK6rslWT1RntgVJWB1RgPqvx6VsCz1gyP3yW1oKxvYw==}
 
-  '@storybook/postinstall@7.4.6':
-    resolution: {integrity: sha512-TqI5BucPAGRWrkh55BYiG2/gHLFtC0In4cuu0GsUzB/1jc4i51npLRorCwhmT7r7YliGl5F7JaP0Bni/qHN3Lg==}
+  '@storybook/postinstall@7.6.20':
+    resolution: {integrity: sha512-AN4WPeNma2xC2/K/wP3I/GMbBUyeSGD3+86ZFFJFO1QmE/Zea6E+1aVlTd1iKHQUcNkZ9bZTrqkhPGVYx10pIw==}
 
-  '@storybook/preview-api@7.4.6':
-    resolution: {integrity: sha512-byUS/Opt3ytWD4cWz3sNEKw5Yks8MkQgRN+GDSyIomaEAQkLAM0rchPC0MYjwCeUSecV7IIQweNX5RbV4a34BA==}
+  '@storybook/preview-api@7.6.20':
+    resolution: {integrity: sha512-3ic2m9LDZEPwZk02wIhNc3n3rNvbi7VDKn52hDXfAxnL5EYm7yDICAkaWcVaTfblru2zn0EDJt7ROpthscTW5w==}
 
-  '@storybook/preview@7.4.6':
-    resolution: {integrity: sha512-2RPXusJ4CTDrIipIKKvbotD7fP0+8VzoFjImunflIrzN9rni+2rq5eMjqlXAaB+77w064zIR4uDUzI9fxsMDeQ==}
+  '@storybook/preview@7.6.20':
+    resolution: {integrity: sha512-cxYlZ5uKbCYMHoFpgleZqqGWEnqHrk5m5fT8bYSsDsdQ+X5wPcwI/V+v8dxYAdQcMphZVIlTjo6Dno9WG8qmVA==}
 
-  '@storybook/react-dom-shim@7.4.6':
-    resolution: {integrity: sha512-DSq8l9FDocUF1ooVI+TF83pddj1LynE/Hv0/y8XZhc3IgJ/HkuOQuUmfz29ezgfAi9gFYUR8raTIBi3/xdoRmw==}
+  '@storybook/react-dom-shim@7.6.20':
+    resolution: {integrity: sha512-SRvPDr9VWcS24ByQOVmbfZ655y5LvjXRlsF1I6Pr9YZybLfYbu3L5IicfEHT4A8lMdghzgbPFVQaJez46DTrkg==}
     peerDependencies:
       react: ^18.2.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
 
-  '@storybook/react-vite@7.4.6':
-    resolution: {integrity: sha512-jkjnrf3FxzR5wcmebXRPflrsM4WIDjWyW/NVFJwxi5PeIOk7fE7/QAPrm4NFRUu2Q7DeuH3oLKsw8bigvUI9RA==}
+  '@storybook/react-vite@7.6.20':
+    resolution: {integrity: sha512-uKuBFyGPZxpfR8vpDU/2OE9v7iTaxwL7ldd7k1swYd1rTSAPacTnEHSMl1R5AjUhkdI7gRmGN9q7qiVfK2XJCA==}
     engines: {node: '>=16'}
     peerDependencies:
       react: ^18.2.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      vite: ^3.0.0 || ^4.0.0
+      vite: ^3.0.0 || ^4.0.0 || ^5.0.0
 
-  '@storybook/react@7.4.6':
-    resolution: {integrity: sha512-w0dVo64baFFPTGpUOWFqkKsu6pQincoymegSNgqaBd5DxEyMDRiRoTWSJHMKE9BwgE8SyWhRkP1ak1mkccSOhQ==}
+  '@storybook/react@7.6.20':
+    resolution: {integrity: sha512-i5tKNgUbTNwlqBWGwPveDhh9ktlS0wGtd97A1ZgKZc3vckLizunlAFc7PRC1O/CMq5PTyxbuUb4RvRD2jWKwDA==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
       react: ^18.2.0
@@ -2949,49 +2863,23 @@ packages:
       typescript:
         optional: true
 
-  '@storybook/router@7.4.6':
-    resolution: {integrity: sha512-Vl1esrHkcHxDKqc+HY7+6JQpBPW3zYvGk0cQ2rxVMhWdLZTAz1hss9DqzN9tFnPyfn0a1Q77EpMySkUrvWKKNQ==}
+  '@storybook/router@7.6.20':
+    resolution: {integrity: sha512-mCzsWe6GrH47Xb1++foL98Zdek7uM5GhaSlrI7blWVohGa0qIUYbfJngqR4ZsrXmJeeEvqowobh+jlxg3IJh+w==}
+
+  '@storybook/telemetry@7.6.20':
+    resolution: {integrity: sha512-dmAOCWmOscYN6aMbhCMmszQjoycg7tUPRVy2kTaWg6qX10wtMrvEtBV29W4eMvqdsoRj5kcvoNbzRdYcWBUOHQ==}
+
+  '@storybook/theming@7.6.20':
+    resolution: {integrity: sha512-iT1pXHkSkd35JsCte6Qbanmprx5flkqtSHC6Gi6Umqoxlg9IjiLPmpHbaIXzoC06DSW93hPj5Zbi1lPlTvRC7Q==}
     peerDependencies:
       react: ^18.2.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
 
-  '@storybook/telemetry@7.4.6':
-    resolution: {integrity: sha512-c8p/C1NIH8EMBviZkBCx8MMDk6rrITJ+b29DEp5MaWSRlklIVyhGiC4RPIRv6sxJwlD41PnqWVFtfu2j2eXLdQ==}
+  '@storybook/types@7.6.20':
+    resolution: {integrity: sha512-GncdY3x0LpbhmUAAJwXYtJDUQEwfF175gsjH0/fxPkxPoV7Sef9TM41jQLJW/5+6TnZoCZP/+aJZTJtq3ni23Q==}
 
-  '@storybook/theming@7.4.6':
-    resolution: {integrity: sha512-HW77iJ9ptCMqhoBOYFjRQw7VBap+38fkJGHP5KylEJCyYCgIAm2dEcQmtWpMVYFssSGcb6djfbtAMhYU4TL4Iw==}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-
-  '@storybook/types@7.4.6':
-    resolution: {integrity: sha512-6QLXtMVsFZFpzPkdGWsu/iuc8na9dnS67AMOBKm5qCLPwtUJOYkwhMdFRSSeJthLRpzV7JLAL8Kwvl7MFP3QSw==}
-
-  '@stylistic/eslint-plugin-js@2.6.1':
-    resolution: {integrity: sha512-iLOiVzcvqzDGD9U0EuVOX680v+XOPiPAjkxWj+Q6iV2GLOM5NB27tKVOpJY7AzBhidwpRbaLTgg3T4UzYx09jw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: '>=8.40.0'
-
-  '@stylistic/eslint-plugin-jsx@2.6.1':
-    resolution: {integrity: sha512-5qHLXqxfY6jubAQfDqrifv41fx7gaqA9svDaChxMI6JiHpEBfh+PXxmm3g+B8gJCYVBTC62Rjl0Ny5QabK58bw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: '>=8.40.0'
-
-  '@stylistic/eslint-plugin-plus@2.6.1':
-    resolution: {integrity: sha512-z/IYu/q8ipApzNam5utSU+BrXg4pK/Gv9xNbr4eWv/bZppvTWJU62xCO4nw/6r2dHNPnqc7uCHEC7GMlBnPY0A==}
-    peerDependencies:
-      eslint: '*'
-
-  '@stylistic/eslint-plugin-ts@2.6.1':
-    resolution: {integrity: sha512-Mxl1VMorEG1Hc6oBYPD0+KIJOWkjEF1R0liL7wWgKfwpqOkgmnh5lVdZBrYyfRKOE4RlGcwEFTNai1IW6orgVg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: '>=8.40.0'
-
-  '@stylistic/eslint-plugin@2.6.1':
-    resolution: {integrity: sha512-UT0f4t+3sQ/GKW7875NiIIjZJ1Bh4gd7JNfoIkwIQyWqO7wGd0Pqzu0Ho30Ka8MNF5lm++SkVeqAk26vGxoUpg==}
+  '@stylistic/eslint-plugin@2.13.0':
+    resolution: {integrity: sha512-RnO1SaiCFHn666wNz2QfZEFxvmiNRqhzaMXHXxXXKt+MEP7aajlPxUSMIQpKAaJfverpovEYqjBOXDq6dDcaOQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: '>=8.40.0'
@@ -3012,44 +2900,43 @@ packages:
   '@tweenjs/tween.js@20.0.3':
     resolution: {integrity: sha512-SYUe1UgY5HM05EB4+0B4arq2IPjvyzKXoklXKxSYrc2IFxGm1cBrqg5XbiB5uwbs0xY5j+rj986NAJMM0KZaUw==}
 
-  '@types/babel__core@7.20.2':
-    resolution: {integrity: sha512-pNpr1T1xLUc2l3xJKuPtsEky3ybxN3m4fJkknfIpTCTfIZCDW57oAg+EfCgIIp2rvCe0Wn++/FfodDS4YXxBwA==}
+  '@types/babel__core@7.20.5':
+    resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
 
-  '@types/babel__generator@7.6.5':
-    resolution: {integrity: sha512-h9yIuWbJKdOPLJTbmSpPzkF67e659PbQDba7ifWm5BJ8xTv+sDmS7rFmywkWOvXedGTivCdeGSIIX8WLcRTz8w==}
+  '@types/babel__generator@7.6.8':
+    resolution: {integrity: sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==}
 
-  '@types/babel__template@7.4.2':
-    resolution: {integrity: sha512-/AVzPICMhMOMYoSx9MoKpGDKdBRsIXMNByh1PXSZoa+v6ZoLa8xxtsT/uLQ/NJm0XVAWl/BvId4MlDeXJaeIZQ==}
+  '@types/babel__template@7.4.4':
+    resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==}
 
-  '@types/babel__traverse@7.20.2':
-    resolution: {integrity: sha512-ojlGK1Hsfce93J0+kn3H5R73elidKUaZonirN33GSmgTUMpzI/MIFfSpF3haANe3G1bEBS9/9/QEqwTzwqFsKw==}
+  '@types/babel__traverse@7.20.6':
+    resolution: {integrity: sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==}
 
-  '@types/body-parser@1.19.3':
-    resolution: {integrity: sha512-oyl4jvAfTGX9Bt6Or4H9ni1Z447/tQuxnZsytsCaExKlmJiU8sFgnIBRzJUpKwB5eWn9HuBYlUlVA74q/yN0eQ==}
+  '@types/body-parser@1.19.5':
+    resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==}
 
-  '@types/chai-subset@1.3.3':
-    resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==}
+  '@types/chai-subset@1.3.6':
+    resolution: {integrity: sha512-m8lERkkQj+uek18hXOZuec3W/fCRTrU4hrnXjH3qhHy96ytuPaPiWGgu7sJb7tZxZonO75vYAjCvpe/e4VUwRw==}
+    peerDependencies:
+      '@types/chai': <5.2.0
 
-  '@types/chai@4.3.6':
-    resolution: {integrity: sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==}
+  '@types/chai@4.3.20':
+    resolution: {integrity: sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ==}
 
-  '@types/connect@3.4.36':
-    resolution: {integrity: sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w==}
+  '@types/connect@3.4.38':
+    resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
 
-  '@types/cookie@0.4.1':
-    resolution: {integrity: sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==}
+  '@types/cors@2.8.17':
+    resolution: {integrity: sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==}
 
-  '@types/cors@2.8.15':
-    resolution: {integrity: sha512-n91JxbNLD8eQIuXDIChAN1tCKNWCEgpceU9b7ZMbFA+P+Q4yIeh80jizFLEvolRPc1ES0VdwFlGv+kJTSirogw==}
-
-  '@types/cross-spawn@6.0.3':
-    resolution: {integrity: sha512-BDAkU7WHHRHnvBf5z89lcvACsvkz/n7Tv+HyD/uW76O29HoH1Tk/W6iQrepaZVbisvlEek4ygwT8IW7ow9XLAA==}
+  '@types/cross-spawn@6.0.6':
+    resolution: {integrity: sha512-fXRhhUkG4H3TQk5dBhQ7m/JDdSNHKwR2BBia62lhwEIq9xGiQKLxd6LymNhn47SjXhsUEPmxi+PKw2OkW4LLjA==}
 
   '@types/debug@4.1.12':
     resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
 
-  '@types/detect-port@1.3.3':
-    resolution: {integrity: sha512-bV/jQlAJ/nPY3XqSatkGpu+nGzou+uSwrH1cROhn+jBFg47yaNH+blW4C7p9KhopC7QxCv/6M86s37k8dMk0Yg==}
+  '@types/detect-port@1.3.5':
+    resolution: {integrity: sha512-Rf3/lB9WkDfIL9eEKaSYKc+1L/rNVYBjThk22JTqQw0YozXarX8YljFAz+HCoC6h4B4KwCMsBPZHaFezwT4BNA==}
 
   '@types/diff-match-patch@1.0.36':
     resolution: {integrity: sha512-xFdR6tkm0MWvBfO8xXCSsinYxHcqkQUlcHeSpMC2ukzOb6lwQAfDmW+Qt0AvlGd8HpsS28qKsB+oPeJn9I39jg==}
@@ -3057,14 +2944,17 @@ packages:
   '@types/doctrine@0.0.3':
     resolution: {integrity: sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA==}
 
-  '@types/draco3d@1.4.7':
-    resolution: {integrity: sha512-sjx6hQ8UArRZf+2ZhpPkjJW8iCkyxar69/IElc9NHuGE40n0U9SuvxX59CHvF4xUH7qfJDQ2lIbANZ0HHJg+BQ==}
+  '@types/doctrine@0.0.9':
+    resolution: {integrity: sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==}
 
-  '@types/ejs@3.1.3':
-    resolution: {integrity: sha512-mv5T/JI/bu+pbfz1o+TLl1NF0NIBbjS0Vl6Ppz1YY9DkXfzZT0lelXpfS5i3ZS3U/p90it7uERQpBvLYoK8e4A==}
+  '@types/draco3d@1.4.10':
+    resolution: {integrity: sha512-AX22jp8Y7wwaBgAixaSvkoG4M/+PlAcm3Qs4OW8yT9DM4xUpWKeFhLueTAyZF39pviAdcDdeJoACapiAceqNcw==}
 
-  '@types/emscripten@1.39.8':
-    resolution: {integrity: sha512-Rk0HKcMXFUuqT32k1kXHZWgxiMvsyYsmlnjp0rLKa0MMoqXLE3T9dogDBTRfuc3SAsXu97KD3k4SKR1lHqd57w==}
+  '@types/ejs@3.1.5':
+    resolution: {integrity: sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==}
+
+  '@types/emscripten@1.40.0':
+    resolution: {integrity: sha512-MD2JJ25S4tnjnhjWyalMS6K6p0h+zQV6+Ylm+aGbiS8tSn/aHLSGNzBgduj6FB4zH0ax2GRMGYi/8G1uOxhXWA==}
 
   '@types/escodegen@0.0.6':
     resolution: {integrity: sha512-AjwI4MvWx3HAOaZqYsjKWyEObT9lcVV0Y0V8nXo6cXzN8ZiMxVhf6F3d/UNvXVGKrEzL/Dluc5p+y9GkzlTWig==}
@@ -3072,8 +2962,8 @@ packages:
   '@types/eslint-scope@3.7.7':
     resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}
 
-  '@types/eslint@9.6.0':
-    resolution: {integrity: sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==}
+  '@types/eslint@9.6.1':
+    resolution: {integrity: sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==}
 
   '@types/estree@0.0.39':
     resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==}
@@ -3081,17 +2971,14 @@ packages:
   '@types/estree@0.0.51':
     resolution: {integrity: sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==}
 
-  '@types/estree@1.0.5':
-    resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
-
   '@types/estree@1.0.6':
     resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
 
-  '@types/express-serve-static-core@4.17.37':
-    resolution: {integrity: sha512-ZohaCYTgGFcOP7u6aJOhY9uIZQgZ2vxC2yWoArY+FeDXlqeH66ZVBjgvg+RLVAS/DWNq4Ap9ZXu1+SUQiiWYMg==}
+  '@types/express-serve-static-core@4.19.6':
+    resolution: {integrity: sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==}
 
-  '@types/express@4.17.18':
-    resolution: {integrity: sha512-Sxv8BSLLgsBYmcnGdGjjEjqET2U+AKAdCRODmMiq02FgjwuV75Ut85DRpvFjyw/Mk0vgUOliGRU0UUmuuZHByQ==}
+  '@types/express@4.17.21':
+    resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==}
 
   '@types/find-cache-dir@3.2.1':
     resolution: {integrity: sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==}
@@ -3102,140 +2989,150 @@ packages:
   '@types/glob@7.2.0':
     resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
 
-  '@types/graceful-fs@4.1.7':
-    resolution: {integrity: sha512-MhzcwU8aUygZroVwL2jeYk6JisJrPl/oov/gsgGCue9mkgl9wjGbzReYQClxiUgFDnib9FuHqTndccKeZKxTRw==}
+  '@types/graceful-fs@4.1.9':
+    resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==}
 
-  '@types/http-cache-semantics@4.0.2':
-    resolution: {integrity: sha512-FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw==}
+  '@types/http-cache-semantics@4.0.4':
+    resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==}
 
-  '@types/http-errors@2.0.2':
-    resolution: {integrity: sha512-lPG6KlZs88gef6aD85z3HNkztpj7w2R7HmR3gygjfXCQmsLloWNARFkMuzKiiY8FGdh1XDpgBdrSf4aKDiA7Kg==}
+  '@types/http-errors@2.0.4':
+    resolution: {integrity: sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==}
 
-  '@types/istanbul-lib-coverage@2.0.4':
-    resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==}
+  '@types/istanbul-lib-coverage@2.0.6':
+    resolution: {integrity: sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==}
 
-  '@types/istanbul-lib-report@3.0.1':
-    resolution: {integrity: sha512-gPQuzaPR5h/djlAv2apEG1HVOyj1IUs7GpfMZixU0/0KXT3pm64ylHuMUI1/Akh+sq/iikxg6Z2j+fcMDXaaTQ==}
+  '@types/istanbul-lib-report@3.0.3':
+    resolution: {integrity: sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==}
 
-  '@types/istanbul-reports@3.0.2':
-    resolution: {integrity: sha512-kv43F9eb3Lhj+lr/Hn6OcLCs/sSM8bt+fIaP11rCYngfV6NVjzWXJ17owQtDQTL9tQ8WSLUrGsSJ6rJz0F1w1A==}
+  '@types/istanbul-reports@3.0.4':
+    resolution: {integrity: sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==}
 
   '@types/js-cookie@2.2.7':
     resolution: {integrity: sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA==}
 
-  '@types/json-schema@7.0.12':
-    resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==}
+  '@types/json-schema@7.0.15':
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
   '@types/json5@0.0.29':
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
 
-  '@types/lodash-es@4.17.9':
-    resolution: {integrity: sha512-ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ==}
+  '@types/linkify-it@5.0.0':
+    resolution: {integrity: sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==}
 
-  '@types/lodash@4.14.199':
-    resolution: {integrity: sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg==}
+  '@types/lodash-es@4.17.12':
+    resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==}
 
-  '@types/mdast@4.0.3':
-    resolution: {integrity: sha512-LsjtqsyF+d2/yFOYaN22dHZI1Cpwkrj+g06G8+qtUKlhovPW89YhqSnfKtMbkgmEtYpH2gydRNULd6y8mciAFg==}
+  '@types/lodash@4.17.16':
+    resolution: {integrity: sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==}
 
-  '@types/mdx@2.0.8':
-    resolution: {integrity: sha512-r7/zWe+f9x+zjXqGxf821qz++ld8tp6Z4jUS6qmPZUXH6tfh4riXOhAqb12tWGWAevCFtMt1goLWkQMqIJKpsA==}
+  '@types/markdown-it@14.1.2':
+    resolution: {integrity: sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==}
 
-  '@types/mime-types@2.1.2':
-    resolution: {integrity: sha512-q9QGHMGCiBJCHEvd4ZLdasdqXv570agPsUW0CeIm/B8DzhxsYMerD0l3IlI+EQ1A2RWHY2mmM9x1YIuuWxisCg==}
+  '@types/mdast@4.0.4':
+    resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==}
 
-  '@types/mime@1.3.3':
-    resolution: {integrity: sha512-Ys+/St+2VF4+xuY6+kDIXGxbNRO0mesVg0bbxEfB97Od1Vjpjx9KD1qxs64Gcb3CWPirk9Xe+PT4YiiHQ9T+eg==}
+  '@types/mdurl@2.0.0':
+    resolution: {integrity: sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==}
 
-  '@types/mime@3.0.2':
-    resolution: {integrity: sha512-Wj+fqpTLtTbG7c0tH47dkahefpLKEbB+xAZuLq7b4/IDHPl/n6VoXcyUQ2bypFlbSwvCr0y+bD4euTTqTJsPxQ==}
+  '@types/mdx@2.0.13':
+    resolution: {integrity: sha512-+OWZQfAYyio6YkJb3HLxDrvnx6SWWDbC0zVPfBRzUk0/nqoDyf6dNxQi3eArPe8rJ473nobTMQ/8Zk+LxJ+Yuw==}
+
+  '@types/mime-types@2.1.4':
+    resolution: {integrity: sha512-lfU4b34HOri+kAY5UheuFMWPDOI+OPceBSHZKp69gEyTL/mmJ4cnU6Y/rlme3UL3GyOn6Y42hyIEw0/q8sWx5w==}
+
+  '@types/mime@1.3.5':
+    resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}
 
   '@types/minimatch@5.1.2':
     resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
 
-  '@types/minimist@1.2.3':
-    resolution: {integrity: sha512-ZYFzrvyWUNhaPomn80dsMNgMeXxNWZBdkuG/hWlUvXvbdUH8ZERNBGXnU87McuGcWDsyzX2aChCv/SVN348k3A==}
+  '@types/minimist@1.2.5':
+    resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==}
 
-  '@types/ms@0.7.34':
-    resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==}
+  '@types/ms@2.1.0':
+    resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
 
-  '@types/node-fetch@2.6.6':
-    resolution: {integrity: sha512-95X8guJYhfqiuVVhRFxVQcf4hW/2bCuoPwDasMf/531STFoNoWTT7YDnWdXHEZKqAGUigmpG31r2FE70LwnzJw==}
+  '@types/node-fetch@2.6.12':
+    resolution: {integrity: sha512-8nneRWKCg3rMtF69nLQJnOYUcbafYeFSjqkw3jCRLsqkWFlHaoQrr5mXmofFGOx3DKn7UfmBMyov8ySvLRVldA==}
 
   '@types/node-rsa@1.1.4':
     resolution: {integrity: sha512-dB0ECel6JpMnq5ULvpUTunx3yNm8e/dIkv8Zu9p2c8me70xIRUUG3q+qXRwcSf9rN3oqamv4116iHy90dJGRpA==}
 
-  '@types/node@14.18.56':
-    resolution: {integrity: sha512-+k+57NVS9opgrEn5l9c0gvD1r6C+PtyhVE4BTnMMRwiEA8ZO8uFcs6Yy2sXIy0eC95ZurBtRSvhZiHXBysbl6w==}
+  '@types/node@14.18.63':
+    resolution: {integrity: sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==}
 
-  '@types/node@16.18.58':
-    resolution: {integrity: sha512-YGncyA25/MaVtQkjWW9r0EFBukZ+JulsLcVZBlGUfIb96OBMjkoRWwQo5IEWJ8Fj06Go3GHw+bjYDitv6BaGsA==}
+  '@types/node@18.19.79':
+    resolution: {integrity: sha512-90K8Oayimbctc5zTPHPfZloc/lGVs7f3phUAAMcTgEPtg8kKquGZDERC8K4vkBYkQQh48msiYUslYtxTWvqcAg==}
 
-  '@types/node@22.8.1':
-    resolution: {integrity: sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==}
+  '@types/node@22.13.9':
+    resolution: {integrity: sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==}
 
-  '@types/normalize-package-data@2.4.2':
-    resolution: {integrity: sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A==}
+  '@types/normalize-package-data@2.4.4':
+    resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
 
-  '@types/offscreencanvas@2019.7.2':
-    resolution: {integrity: sha512-ujCjOxeA07IbEBQYAkoOI+XFw5sT3nhWJ/xZfPR6reJppDG7iPQPZacQiLTtWH1b3a2NYXWlxvYqa40y/LAixQ==}
+  '@types/offscreencanvas@2019.7.3':
+    resolution: {integrity: sha512-ieXiYmgSRXUDeOntE1InxjWyvEelZGP63M+cGuquuRLuIKKT1osnkXjxev9B7d1nXSug5vpunx+gNlbVxMlC9A==}
 
-  '@types/parse-json@4.0.0':
-    resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
+  '@types/parse-json@4.0.2':
+    resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
 
-  '@types/pretty-hrtime@1.0.1':
-    resolution: {integrity: sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ==}
+  '@types/pretty-hrtime@1.0.3':
+    resolution: {integrity: sha512-nj39q0wAIdhwn7DGUyT9irmsKK1tV0bd5WFEhgpqNTMFZ8cE+jieuTphCW0tfdm47S2zVT5mr09B28b1chmQMA==}
 
-  '@types/prop-types@15.7.12':
-    resolution: {integrity: sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==}
+  '@types/prop-types@15.7.14':
+    resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==}
 
-  '@types/qs@6.9.8':
-    resolution: {integrity: sha512-u95svzDlTysU5xecFNTgfFG5RUWu1A9P0VzgpcIiGZA9iraHOdSzcxMxQ55DyeRaGCSxQi7LxXDI4rzq/MYfdg==}
+  '@types/qs@6.9.18':
+    resolution: {integrity: sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==}
 
-  '@types/range-parser@1.2.5':
-    resolution: {integrity: sha512-xrO9OoVPqFuYyR/loIHjnbvvyRZREYKLjxV4+dY6v3FQR3stQ9ZxIGkaclF7YhI9hfjpuTbu14hZEy94qKLtOA==}
+  '@types/range-parser@1.2.7':
+    resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==}
 
-  '@types/rbush@3.0.1':
-    resolution: {integrity: sha512-0LecKcQjuJ/PclmThftzePIKXaKt7OMjoZZ3Xf17Ebd28ZU6OFUu1mObbvV74YXS1W3APdZO5GRHyD/ezGK4Vg==}
+  '@types/rbush@3.0.4':
+    resolution: {integrity: sha512-knSt9cCW8jj1ZSFcFeBZaX++OucmfPxxHiRwTahZfJlnQsek7O0bazTJHWD2RVj9LEoejUYF2de3/stf+QXcXw==}
 
-  '@types/react-dom@18.2.7':
-    resolution: {integrity: sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==}
+  '@types/react-dom@18.3.5':
+    resolution: {integrity: sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==}
+    peerDependencies:
+      '@types/react': ^18.0.0
 
-  '@types/react-transition-group@4.4.7':
-    resolution: {integrity: sha512-ICCyBl5mvyqYp8Qeq9B5G/fyBSRC0zx3XM3sCC6KkcMsNeAHqXBKkmat4GqdJET5jtYUpZXrxI5flve5qhi2Eg==}
+  '@types/react-transition-group@4.4.12':
+    resolution: {integrity: sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==}
+    peerDependencies:
+      '@types/react': '*'
 
-  '@types/react@18.2.20':
-    resolution: {integrity: sha512-WKNtmsLWJM/3D5mG4U84cysVY31ivmyw85dE84fOCk5Hx78wezB/XEjVPWl2JTZ5FkEeaTJf+VgUAUn3PE7Isw==}
+  '@types/react@18.3.18':
+    resolution: {integrity: sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ==}
 
-  '@types/readable-stream@4.0.12':
-    resolution: {integrity: sha512-SCaw+bs9o/HCX1eTa3glTcQgW1oPxof49mqP2Qikik3xzTimNv2M4p43BQHhBuf7CwOJdQW0s1SrWU3MZxz6lw==}
+  '@types/readable-stream@4.0.18':
+    resolution: {integrity: sha512-21jK/1j+Wg+7jVw1xnSwy/2Q1VgVjWuFssbYGTREPUBeZ+rqVFl2udq0IkxzPC0ZhOzVceUbyIACFZKLqKEBlA==}
 
-  '@types/resolve@1.17.1':
-    resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==}
+  '@types/resolve@1.20.2':
+    resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
+
+  '@types/resolve@1.20.6':
+    resolution: {integrity: sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==}
 
   '@types/sat@0.0.31':
     resolution: {integrity: sha512-P4SVw79XheP1p92useDVpLYYOUQ6lpw2L7IdQz4dD23DZ8DiC1STgPOh72hjR5IZJBPQbzlICAbmjCKbwyYuxg==}
 
-  '@types/scheduler@0.16.3':
-    resolution: {integrity: sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==}
+  '@types/semver@7.5.8':
+    resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==}
 
-  '@types/semver@7.5.3':
-    resolution: {integrity: sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==}
+  '@types/send@0.17.4':
+    resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==}
 
-  '@types/send@0.17.2':
-    resolution: {integrity: sha512-aAG6yRf6r0wQ29bkS+x97BIs64ZLxeE/ARwyS6wrldMm3C1MdKwCcnnEwMC1slI8wuxJOpiUH9MioC0A0i+GJw==}
-
-  '@types/serve-static@1.15.3':
-    resolution: {integrity: sha512-yVRvFsEMrv7s0lGhzrggJjNOSmZCdgCjw9xWrPr/kNNLp6FaDfMC1KaYl3TSJ0c58bECwNBMoQrZJ8hA8E1eFg==}
+  '@types/serve-static@1.15.7':
+    resolution: {integrity: sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==}
 
   '@types/sinonjs__fake-timers@8.1.1':
     resolution: {integrity: sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==}
 
-  '@types/sizzle@2.3.3':
-    resolution: {integrity: sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==}
+  '@types/sizzle@2.3.9':
+    resolution: {integrity: sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==}
 
-  '@types/stats.js@0.17.1':
-    resolution: {integrity: sha512-OgfYE1x2w1jRUXzzKABX+kOdwz2y9PE0uSwnZabkWfJTWOzm7Pvfm4JI2xqRE0q2nwUe2jZLWcrcnhd9lQU63w==}
+  '@types/stats.js@0.17.3':
+    resolution: {integrity: sha512-pXNfAD3KHOdif9EQXZ9deK82HVNaXP5ZIF5RP2QG6OQFNTaY2YIetfrE9t528vEreGQvEPRDDc8muaoYeK0SxQ==}
 
   '@types/three@0.154.0':
     resolution: {integrity: sha512-IioqpGhch6FdLDh4zazRn3rXHj6Vn2nVOziJdXVbJFi9CaI65LtP9qqUtpzbsHK2Ezlox8NtsLNHSw3AQzucjA==}
@@ -3243,32 +3140,35 @@ packages:
   '@types/three@0.156.0':
     resolution: {integrity: sha512-733bXDSRdlrxqOmQuOmfC1UBRuJ2pREPk8sWnx9MtIJEVDQMx8U0NQO5MVVaOrjzDPyLI+cFPim2X/ss9v0+LQ==}
 
-  '@types/trusted-types@2.0.3':
-    resolution: {integrity: sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==}
+  '@types/trusted-types@2.0.7':
+    resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
 
   '@types/ua-parser-js@0.7.39':
     resolution: {integrity: sha512-P/oDfpofrdtF5xw433SPALpdSchtJmY7nsJItf8h3KXqOslkbySh8zq4dSWXH2oTjRvJ5PczVEoCZPow6GicLg==}
 
-  '@types/unist@2.0.8':
-    resolution: {integrity: sha512-d0XxK3YTObnWVp6rZuev3c49+j4Lo8g4L1ZRm9z5L0xpoZycUPshHgczK5gsUMaZOstjVYYi09p5gYvUtfChYw==}
+  '@types/unist@2.0.11':
+    resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==}
 
-  '@types/unist@3.0.2':
-    resolution: {integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==}
+  '@types/unist@3.0.3':
+    resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
+
+  '@types/uuid@9.0.8':
+    resolution: {integrity: sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==}
 
   '@types/wait-on@5.3.4':
     resolution: {integrity: sha512-EBsPjFMrFlMbbUFf9D1Fp+PAB2TwmUn7a3YtHyD9RLuTIk1jDd8SxXVAoez2Ciy+8Jsceo2MYEYZzJ/DvorOKw==}
 
-  '@types/webxr@0.5.7':
-    resolution: {integrity: sha512-Rcgs5c2eNFnHp53YOjgtKfl/zWX1Y+uFGUwlSXrWcZWu3yhANRezmph4MninmqybUYT6g9ZE0aQ9QIdPkLR3Kg==}
+  '@types/webxr@0.5.21':
+    resolution: {integrity: sha512-geZIAtLzjGmgY2JUi6VxXdCrTb99A7yP49lxLr2Nm/uIK0PkkxcEi4OGhoGDO4pxCf3JwGz2GiJL2Ej4K2bKaA==}
 
-  '@types/wicg-file-system-access@2023.10.2':
-    resolution: {integrity: sha512-nSiK8qt0O7sQmDcW3HYfvya7GDoD6ipgdcUFzk3QN+UBIqXeNg38Nh6VnKv7EIPfkVETRiquyMskCbpxUzgX1Q==}
+  '@types/wicg-file-system-access@2023.10.5':
+    resolution: {integrity: sha512-e9kZO9kCdLqT2h9Tw38oGv9UNzBBWaR1MzuAavxPcsV/7FJ3tWbU6RI3uB+yKIDPGLkGVbplS52ub0AcRLvrhA==}
 
-  '@types/yargs-parser@21.0.1':
-    resolution: {integrity: sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ==}
+  '@types/yargs-parser@21.0.3':
+    resolution: {integrity: sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==}
 
-  '@types/yargs@17.0.28':
-    resolution: {integrity: sha512-N3e3fkS86hNhtk6BEnc0rj3zcehaxx8QWhCROJkqpl5Zaoi7nAic3jH8q94jVD3zu5LGk+PUB6KAiDmimYOEQw==}
+  '@types/yargs@17.0.33':
+    resolution: {integrity: sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==}
 
   '@types/yauzl@2.10.3':
     resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
@@ -3284,8 +3184,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/parser@6.7.3':
-    resolution: {integrity: sha512-TlutE+iep2o7R8Lf+yoer3zU6/0EAUc8QIBB3GYBc1KGz4c4TRm83xwXUZVPlZ6YCLss4r77jbu6j3sendJoiQ==}
+  '@typescript-eslint/parser@6.21.0':
+    resolution: {integrity: sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0
@@ -3298,12 +3198,12 @@ packages:
     resolution: {integrity: sha512-AxjgxDn27hgPpe2rQe19k0tXw84YCOsjDJ2r61cIebq1t+AIxbgiXKvD4999Wk49GVaAcdJ/d49FYel+Pp3jjw==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
-  '@typescript-eslint/scope-manager@6.7.3':
-    resolution: {integrity: sha512-wOlo0QnEou9cHO2TdkJmzF7DFGvAKEnB82PuPNHpT8ZKKaZu6Bm63ugOTn9fXNJtvuDPanBc78lGUGGytJoVzQ==}
+  '@typescript-eslint/scope-manager@6.21.0':
+    resolution: {integrity: sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
-  '@typescript-eslint/scope-manager@8.0.0':
-    resolution: {integrity: sha512-V0aa9Csx/ZWWv2IPgTfY7T4agYwJyILESu/PVqFtTFz9RIS823mAze+NbnBI8xiwdX3iqeQbcTYlvB04G9wyQw==}
+  '@typescript-eslint/scope-manager@8.26.0':
+    resolution: {integrity: sha512-E0ntLvsfPqnPwng8b8y4OGuzh/iIOm2z8U3S9zic2TeMLW61u5IH2Q1wu0oSTkfrSzwbDJIB/Lm8O3//8BWMPA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/type-utils@6.1.0':
@@ -3320,12 +3220,12 @@ packages:
     resolution: {integrity: sha512-+Gfd5NHCpDoHDOaU/yIF3WWRI2PcBRKKpP91ZcVbL0t5tQpqYWBs3z/GGhvU+EV1D0262g9XCnyqQh19prU0JQ==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
-  '@typescript-eslint/types@6.7.3':
-    resolution: {integrity: sha512-4g+de6roB2NFcfkZb439tigpAMnvEIg3rIjWQ+EM7IBaYt/CdJt6em9BJ4h4UpdgaBWdmx2iWsafHTrqmgIPNw==}
+  '@typescript-eslint/types@6.21.0':
+    resolution: {integrity: sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
-  '@typescript-eslint/types@8.0.0':
-    resolution: {integrity: sha512-wgdSGs9BTMWQ7ooeHtu5quddKKs5Z5dS+fHLbrQI+ID0XWJLODGMHRfhwImiHoeO2S5Wir2yXuadJN6/l4JRxw==}
+  '@typescript-eslint/types@8.26.0':
+    resolution: {integrity: sha512-89B1eP3tnpr9A8L6PZlSjBvnJhWXtYfZhECqlBl1D9Lme9mHO6iWlsprBtVenQvY1HMhax1mWOjhtL3fh/u+pA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/typescript-estree@6.1.0':
@@ -3337,8 +3237,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/typescript-estree@6.7.3':
-    resolution: {integrity: sha512-YLQ3tJoS4VxLFYHTw21oe1/vIZPRqAO91z6Uv0Ss2BKm/Ag7/RVQBcXTGcXhgJMdA4U+HrKuY5gWlJlvoaKZ5g==}
+  '@typescript-eslint/typescript-estree@6.21.0':
+    resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==}
     engines: {node: ^16.0.0 || >=18.0.0}
     peerDependencies:
       typescript: '*'
@@ -3346,14 +3246,11 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/typescript-estree@8.0.0':
-    resolution: {integrity: sha512-5b97WpKMX+Y43YKi4zVcCVLtK5F98dFls3Oxui8LbnmRsseKenbbDinmvxrWegKDMmlkIq/XHuyy0UGLtpCDKg==}
+  '@typescript-eslint/typescript-estree@8.26.0':
+    resolution: {integrity: sha512-tiJ1Hvy/V/oMVRTbEOIeemA2XoylimlDQ03CgPPNaHYZbpsc78Hmngnt+WXZfJX1pjQ711V7g0H7cSJThGYfPQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+      typescript: '>=4.8.4 <5.9.0'
 
   '@typescript-eslint/utils@6.1.0':
     resolution: {integrity: sha512-wp652EogZlKmQoMS5hAvWqRKplXvkuOnNzZSE0PVvsKjpexd/XznRVHAtrfHFYmqaJz0DFkjlDsGYC9OXw+OhQ==}
@@ -3361,24 +3258,28 @@ packages:
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0
 
-  '@typescript-eslint/utils@8.0.0':
-    resolution: {integrity: sha512-k/oS/A/3QeGLRvOWCg6/9rATJL5rec7/5s1YmdS0ZU6LHveJyGFwBvLhSRBv6i9xaj7etmosp+l+ViN1I9Aj/Q==}
+  '@typescript-eslint/utils@8.26.0':
+    resolution: {integrity: sha512-2L2tU3FVwhvU14LndnQCA2frYC8JnPDVKyQtWFPf8IYFMt/ykEN1bPolNhNbCVgOmdzTlWdusCTKA/9nKrf8Ig==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
+      typescript: '>=4.8.4 <5.9.0'
 
   '@typescript-eslint/visitor-keys@6.1.0':
     resolution: {integrity: sha512-yQeh+EXhquh119Eis4k0kYhj9vmFzNpbhM3LftWQVwqVjipCkwHBQOZutcYW+JVkjtTG9k8nrZU1UoNedPDd1A==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
-  '@typescript-eslint/visitor-keys@6.7.3':
-    resolution: {integrity: sha512-HEVXkU9IB+nk9o63CeICMHxFWbHWr3E1mpilIQBe9+7L/lH97rleFLVtYsfnWB+JVMaiFnEaxvknvmIzX+CqVg==}
+  '@typescript-eslint/visitor-keys@6.21.0':
+    resolution: {integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
-  '@typescript-eslint/visitor-keys@8.0.0':
-    resolution: {integrity: sha512-oN0K4nkHuOyF3PVMyETbpP5zp6wfyOvm7tWhTMfoqxSSsPmJIh6JNASuZDlODE8eE+0EB9uar+6+vxr9DBTYOA==}
+  '@typescript-eslint/visitor-keys@8.26.0':
+    resolution: {integrity: sha512-2z8JQJWAzPdDd51dRQ/oqIJxe99/hoLIqmf8RMCAJQtYDc535W/Jt2+RTP4bP0aKeBG1F65yjIZuczOXCmbWwg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@ungap/structured-clone@1.3.0':
+    resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
+
   '@vitejs/plugin-react@3.1.0':
     resolution: {integrity: sha512-AfgcRL8ZBhAlc3BFdigClmTUMISmmzHn7sB2h9U1odvc5U/MjWXsAaz18b/WoppUTDBzxOJwo2VdClfUcItu9g==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -3388,11 +3289,11 @@ packages:
   '@vitest/expect@0.34.6':
     resolution: {integrity: sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==}
 
-  '@vitest/expect@3.0.7':
-    resolution: {integrity: sha512-QP25f+YJhzPfHrHfYHtvRn+uvkCFCqFtW9CktfBxmB+25QqWsx7VB2As6f4GmwllHLDhXNHvqedwhvMmSnNmjw==}
+  '@vitest/expect@3.0.8':
+    resolution: {integrity: sha512-Xu6TTIavTvSSS6LZaA3EebWFr6tsoXPetOWNMOlc7LO88QVVBwq2oQWBoDiLCN6YTvNYsGSjqOO8CAdjom5DCQ==}
 
-  '@vitest/mocker@3.0.7':
-    resolution: {integrity: sha512-qui+3BLz9Eonx4EAuR/i+QlCX6AUZ35taDQgwGkK/Tw6/WgwodSrjN1X2xf69IA/643ZX5zNKIn2svvtZDrs4w==}
+  '@vitest/mocker@3.0.8':
+    resolution: {integrity: sha512-n3LjS7fcW1BCoF+zWZxG7/5XvuYH+lsFg+BDwwAz0arIwHQJFUEsKBQ0BLU49fCxuM/2HSeBPHQD8WjgrxMfow==}
     peerDependencies:
       msw: ^2.4.9
       vite: ^5.0.0 || ^6.0.0
@@ -3402,77 +3303,77 @@ packages:
       vite:
         optional: true
 
-  '@vitest/pretty-format@3.0.7':
-    resolution: {integrity: sha512-CiRY0BViD/V8uwuEzz9Yapyao+M9M008/9oMOSQydwbwb+CMokEq3XVaF3XK/VWaOK0Jm9z7ENhybg70Gtxsmg==}
+  '@vitest/pretty-format@3.0.8':
+    resolution: {integrity: sha512-BNqwbEyitFhzYMYHUVbIvepOyeQOSFA/NeJMIP9enMntkkxLgOcgABH6fjyXG85ipTgvero6noreavGIqfJcIg==}
 
   '@vitest/runner@0.34.6':
     resolution: {integrity: sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==}
 
-  '@vitest/runner@3.0.7':
-    resolution: {integrity: sha512-WeEl38Z0S2ZcuRTeyYqaZtm4e26tq6ZFqh5y8YD9YxfWuu0OFiGFUbnxNynwLjNRHPsXyee2M9tV7YxOTPZl2g==}
+  '@vitest/runner@3.0.8':
+    resolution: {integrity: sha512-c7UUw6gEcOzI8fih+uaAXS5DwjlBaCJUo7KJ4VvJcjL95+DSR1kova2hFuRt3w41KZEFcOEiq098KkyrjXeM5w==}
 
   '@vitest/snapshot@0.34.6':
     resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==}
 
-  '@vitest/snapshot@3.0.7':
-    resolution: {integrity: sha512-eqTUryJWQN0Rtf5yqCGTQWsCFOQe4eNz5Twsu21xYEcnFJtMU5XvmG0vgebhdLlrHQTSq5p8vWHJIeJQV8ovsA==}
+  '@vitest/snapshot@3.0.8':
+    resolution: {integrity: sha512-x8IlMGSEMugakInj44nUrLSILh/zy1f2/BgH0UeHpNyOocG18M9CWVIFBaXPt8TrqVZWmcPjwfG/ht5tnpba8A==}
 
   '@vitest/spy@0.34.6':
     resolution: {integrity: sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==}
 
-  '@vitest/spy@3.0.7':
-    resolution: {integrity: sha512-4T4WcsibB0B6hrKdAZTM37ekuyFZt2cGbEGd2+L0P8ov15J1/HUsUaqkXEQPNAWr4BtPPe1gI+FYfMHhEKfR8w==}
+  '@vitest/spy@3.0.8':
+    resolution: {integrity: sha512-MR+PzJa+22vFKYb934CejhR4BeRpMSoxkvNoDit68GQxRLSf11aT6CTj3XaqUU9rxgWJFnqicN/wxw6yBRkI1Q==}
 
   '@vitest/utils@0.34.6':
     resolution: {integrity: sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==}
 
-  '@vitest/utils@3.0.7':
-    resolution: {integrity: sha512-xePVpCRfooFX3rANQjwoditoXgWb1MaFbzmGuPP59MK6i13mrnDw/yEIyJudLeW6/38mCNcwCiJIGmpDPibAIg==}
+  '@vitest/utils@3.0.8':
+    resolution: {integrity: sha512-nkBC3aEhfX2PdtQI/QwAWp8qZWwzASsU4Npbcd5RdMPBSSLCpkZp52P3xku3s3uA0HIEhGvEcF8rNkBsz9dQ4Q==}
 
-  '@webassemblyjs/ast@1.12.1':
-    resolution: {integrity: sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==}
+  '@webassemblyjs/ast@1.14.1':
+    resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==}
 
-  '@webassemblyjs/floating-point-hex-parser@1.11.6':
-    resolution: {integrity: sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==}
+  '@webassemblyjs/floating-point-hex-parser@1.13.2':
+    resolution: {integrity: sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==}
 
-  '@webassemblyjs/helper-api-error@1.11.6':
-    resolution: {integrity: sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==}
+  '@webassemblyjs/helper-api-error@1.13.2':
+    resolution: {integrity: sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==}
 
-  '@webassemblyjs/helper-buffer@1.12.1':
-    resolution: {integrity: sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==}
+  '@webassemblyjs/helper-buffer@1.14.1':
+    resolution: {integrity: sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==}
 
-  '@webassemblyjs/helper-numbers@1.11.6':
-    resolution: {integrity: sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==}
+  '@webassemblyjs/helper-numbers@1.13.2':
+    resolution: {integrity: sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==}
 
-  '@webassemblyjs/helper-wasm-bytecode@1.11.6':
-    resolution: {integrity: sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==}
+  '@webassemblyjs/helper-wasm-bytecode@1.13.2':
+    resolution: {integrity: sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==}
 
-  '@webassemblyjs/helper-wasm-section@1.12.1':
-    resolution: {integrity: sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==}
+  '@webassemblyjs/helper-wasm-section@1.14.1':
+    resolution: {integrity: sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==}
 
-  '@webassemblyjs/ieee754@1.11.6':
-    resolution: {integrity: sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==}
+  '@webassemblyjs/ieee754@1.13.2':
+    resolution: {integrity: sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==}
 
-  '@webassemblyjs/leb128@1.11.6':
-    resolution: {integrity: sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==}
+  '@webassemblyjs/leb128@1.13.2':
+    resolution: {integrity: sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==}
 
-  '@webassemblyjs/utf8@1.11.6':
-    resolution: {integrity: sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==}
+  '@webassemblyjs/utf8@1.13.2':
+    resolution: {integrity: sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==}
 
-  '@webassemblyjs/wasm-edit@1.12.1':
-    resolution: {integrity: sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==}
+  '@webassemblyjs/wasm-edit@1.14.1':
+    resolution: {integrity: sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==}
 
-  '@webassemblyjs/wasm-gen@1.12.1':
-    resolution: {integrity: sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==}
+  '@webassemblyjs/wasm-gen@1.14.1':
+    resolution: {integrity: sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==}
 
-  '@webassemblyjs/wasm-opt@1.12.1':
-    resolution: {integrity: sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==}
+  '@webassemblyjs/wasm-opt@1.14.1':
+    resolution: {integrity: sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==}
 
-  '@webassemblyjs/wasm-parser@1.12.1':
-    resolution: {integrity: sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==}
+  '@webassemblyjs/wasm-parser@1.14.1':
+    resolution: {integrity: sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==}
 
-  '@webassemblyjs/wast-printer@1.12.1':
-    resolution: {integrity: sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==}
+  '@webassemblyjs/wast-printer@1.14.1':
+    resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==}
 
   '@xboxreplay/errors@0.1.0':
     resolution: {integrity: sha512-Tgz1d/OIPDWPeyOvuL5+aai5VCcqObhPnlI3skQuf80GVF3k1I0lPCnGC+8Cm5PV9aLBT5m8qPcJoIUQ2U4y9g==}
@@ -3484,24 +3385,24 @@ packages:
     resolution: {integrity: sha512-7vCVgm1E1IZ2cujiitFk9550Vgu2XAOn1ff90di638fMmTK0XkFMXKsSR/nGZmYKt+XiTMI/0B3TvreqbVjOug==}
     engines: {node: '>=16'}
 
-  '@xmcl/core@2.12.0':
-    resolution: {integrity: sha512-rcxy29i2fjGFpe6sEvaJxYHFGlfYMcJwElbk6TIUCrKNOiMhyLZeBtCJSk38hvaYF0kiROA3c4EJeWNGHf2zVw==}
+  '@xmcl/core@2.13.0':
+    resolution: {integrity: sha512-1BslEWUr234zZZTq9Q3QDm8APReYx7phy6PY5fodiztwblYbgipsd89vfx+Qvjc1xWpGtjei0AvxubUDeMFTgA==}
     engines: {node: '>=16.0'}
 
-  '@xmcl/file-transfer@1.0.3':
-    resolution: {integrity: sha512-p5JsUQpNShqW4VpqaKXcQzYSO9o/9UGjXZfb5aNt/24Ty+j9qepQyPo4P1CFwfzgFuf9GGhH5cPUi6nShlKS+g==}
+  '@xmcl/file-transfer@1.0.6':
+    resolution: {integrity: sha512-WVnCTyHTqUUIMsqgGnkmQqov9/qxKWWBj+wjn6pMotpCJHu3gKkLqVoD76IQeTgUBIoh5sGgGbYMZmpRlqCGzw==}
     engines: {node: '>=16.0'}
 
   '@xmcl/forge-site-parser@2.0.9':
     resolution: {integrity: sha512-OHKG2KYE+F6TSeOQmymuGoqEifxbJb3w3X/hmxMNeqtewiYukJldPmKO559ZFnZnOuMQEnr+X0dMbTQwWs5dFg==}
     engines: {node: '>=16'}
 
-  '@xmcl/installer@5.1.0':
-    resolution: {integrity: sha512-KpoxpfYdUWH4U4Yat7RifS1JZajArOdfgsJ/LdU90y6Fc3hKhHSJsiRudk1VxASTyMXKCM0lWVxH5JzywRHBDw==}
+  '@xmcl/installer@5.4.0':
+    resolution: {integrity: sha512-Y4UK6WWogDdgvcAUQnUPoJidlkuVQP5dSV5QueJhKeEJAA3lmGklwV8Dp8z0/92ITQ45OBsB7g08qV3eec4G6w==}
     engines: {node: '>=16.0'}
 
-  '@xmcl/task@4.0.6':
-    resolution: {integrity: sha512-h0AR7DQm6xxBgROPnRi0EY8DlaDQwuGzPA5lFRMD4EsnpHJ/3fPdzwbMLb81ZxKJlLSCn3hVR2yI0mSKIm5Heg==}
+  '@xmcl/task@4.1.0':
+    resolution: {integrity: sha512-5Gqo/gltcenXTvRUz3H1Q2tNw9wWbOjeOVd9TeRNtBAOaKmdTD7iMhOIbdei71BSZ9FkVEhcUjO+PL+y+WNHoQ==}
 
   '@xmcl/text-component@2.1.3':
     resolution: {integrity: sha512-LdUZgC5+8F23J2ZkZi7aZb87QBNfxwJqhUyts8YBQYwxQPwei20TOBm2hr69euoAeDo7NDfbLXssD4mUvsAS0Q==}
@@ -3549,12 +3450,16 @@ packages:
   '@zardoy/maxrects-packer@2.7.4':
     resolution: {integrity: sha512-ZIDcSdtSg6EhKFxGYWCcTnA/0YVbpixBL+psUS6ncw4IvdDF5hWauMU3XeCfYwrT/88QFgAq/Pafxt+P9OJyoQ==}
 
-  '@zardoy/react-util@0.2.4':
-    resolution: {integrity: sha512-YRBbXi54QOgWGDSn3NLEMMGrWbfL/gn2khxO31HT0WPFB6IW2rSnB4hcy+S/nc+2D6PRNq4kQxGs4vTAe4a7Xg==}
+  '@zardoy/react-util@0.2.7':
+    resolution: {integrity: sha512-LJOml3y8wa5OxvNgDKMceP7kaFHkw2nX9y/RQGMv2sijTEnc4gCd3yNtc4fibu1PFWZlupb6UvsNe45o7UwElg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
+      '@nextui-org/react': ^2.4.6
       react: ^18.2.0
       react-dom: '>=18.0.0'
+    peerDependenciesMeta:
+      '@nextui-org/react':
+        optional: true
 
   '@zardoy/utils@0.0.11':
     resolution: {integrity: sha512-d6xBnSFCOa98HcL52xSBflJKjKpxfRhtr1eVexy89YujeCHSQhUMmSz9h07xyrulfW60k9tSeYH5reuqoh4l4w==}
@@ -3574,11 +3479,6 @@ packages:
     resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
     engines: {node: '>= 0.6'}
 
-  acorn-import-attributes@1.9.5:
-    resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==}
-    peerDependencies:
-      acorn: ^8
-
   acorn-jsx@5.3.2:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -3588,8 +3488,8 @@ packages:
     resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
     engines: {node: '>=0.4.0'}
 
-  acorn-walk@8.2.0:
-    resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
+  acorn-walk@8.3.4:
+    resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==}
     engines: {node: '>=0.4.0'}
 
   acorn@7.4.1:
@@ -3597,8 +3497,8 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  acorn@8.12.1:
-    resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==}
+  acorn@8.14.1:
+    resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
@@ -3606,9 +3506,9 @@ packages:
     resolution: {integrity: sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==}
     engines: {node: '>= 10.0.0'}
 
-  adm-zip@0.5.12:
-    resolution: {integrity: sha512-6TVU49mK6KZb4qG6xWaaM4C7sA/sgUMLy/JYMOzkcp3BvVLpW0fXDFQiIzAuxFCt/2+xD7fNIiPFAoLZPhVNLQ==}
-    engines: {node: '>=6.0'}
+  adm-zip@0.5.16:
+    resolution: {integrity: sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==}
+    engines: {node: '>=12.0'}
 
   aes-js@3.1.2:
     resolution: {integrity: sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ==}
@@ -3624,28 +3524,37 @@ packages:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
 
-  agent-base@7.1.0:
-    resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
-    engines: {node: '>= 14'}
-
-  agentkeepalive@4.5.0:
-    resolution: {integrity: sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==}
+  agentkeepalive@4.6.0:
+    resolution: {integrity: sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==}
     engines: {node: '>= 8.0.0'}
 
   aggregate-error@3.1.0:
     resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
     engines: {node: '>=8'}
 
+  ajv-formats@2.1.1:
+    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
+
   ajv-keywords@3.5.2:
     resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
     peerDependencies:
       ajv: ^6.9.1
 
+  ajv-keywords@5.1.0:
+    resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==}
+    peerDependencies:
+      ajv: ^8.8.2
+
   ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
 
-  ajv@8.12.0:
-    resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
+  ajv@8.17.1:
+    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
 
   animejs@3.2.1:
     resolution: {integrity: sha512-sWno3ugFryK5nhiDm/2BKeFCpZv7vzerWUcUPyAZLDhMek3+S/p418ldZJbJXo5ZUOpfm2kP2XRO4NJcULMy9A==}
@@ -3662,8 +3571,8 @@ packages:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
 
-  ansi-regex@6.0.1:
-    resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
+  ansi-regex@6.1.0:
+    resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==}
     engines: {node: '>=12'}
 
   ansi-styles@3.2.1:
@@ -3728,8 +3637,8 @@ packages:
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
-  aria-hidden@1.2.3:
-    resolution: {integrity: sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==}
+  aria-hidden@1.2.4:
+    resolution: {integrity: sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==}
     engines: {node: '>=10'}
 
   arr-diff@4.0.0:
@@ -3775,9 +3684,6 @@ packages:
     resolution: {integrity: sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==}
     engines: {node: '>= 0.4'}
 
-  array.prototype.toreversed@1.1.2:
-    resolution: {integrity: sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==}
-
   array.prototype.tosorted@1.1.4:
     resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==}
     engines: {node: '>= 0.4'}
@@ -3793,8 +3699,8 @@ packages:
     resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
     engines: {node: '>=0.10.0'}
 
-  asn1.js@5.4.1:
-    resolution: {integrity: sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==}
+  asn1.js@4.10.1:
+    resolution: {integrity: sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==}
 
   asn1@0.2.3:
     resolution: {integrity: sha512-6i37w/+EhlWlGUJff3T/Q8u1RGmP5wgbiwYnOnbOqvtrPxT63/sYFyP9RcpxtxGymtfA075IvmOnL7ycNOWl3w==}
@@ -3820,14 +3726,6 @@ packages:
     resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
     engines: {node: '>=0.10.0'}
 
-  ast-types@0.14.2:
-    resolution: {integrity: sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==}
-    engines: {node: '>=4'}
-
-  ast-types@0.15.2:
-    resolution: {integrity: sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==}
-    engines: {node: '>=4'}
-
   ast-types@0.16.1:
     resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
     engines: {node: '>=4'}
@@ -3849,8 +3747,8 @@ packages:
   async@2.6.4:
     resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==}
 
-  async@3.2.5:
-    resolution: {integrity: sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==}
+  async@3.2.6:
+    resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
 
   asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
@@ -3871,14 +3769,14 @@ packages:
   aws-sign2@0.7.0:
     resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
 
-  aws4@1.12.0:
-    resolution: {integrity: sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==}
+  aws4@1.13.2:
+    resolution: {integrity: sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==}
 
   axios@0.21.4:
     resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
 
-  axios@1.7.2:
-    resolution: {integrity: sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==}
+  axios@1.8.2:
+    resolution: {integrity: sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==}
 
   babel-core@7.0.0-bridge.0:
     resolution: {integrity: sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==}
@@ -3893,18 +3791,18 @@ packages:
     resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
     engines: {node: '>=10', npm: '>=6'}
 
-  babel-plugin-polyfill-corejs2@0.4.5:
-    resolution: {integrity: sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==}
+  babel-plugin-polyfill-corejs2@0.4.12:
+    resolution: {integrity: sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
-  babel-plugin-polyfill-corejs3@0.8.3:
-    resolution: {integrity: sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==}
+  babel-plugin-polyfill-corejs3@0.11.1:
+    resolution: {integrity: sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
-  babel-plugin-polyfill-regenerator@0.5.2:
-    resolution: {integrity: sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==}
+  babel-plugin-polyfill-regenerator@0.6.3:
+    resolution: {integrity: sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
@@ -3949,16 +3847,16 @@ packages:
     resolution: {integrity: sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==}
     engines: {node: '>=12.0.0'}
 
-  big-integer@1.6.51:
-    resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==}
+  big-integer@1.6.52:
+    resolution: {integrity: sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==}
     engines: {node: '>=0.6'}
 
   binary-extensions@1.13.1:
     resolution: {integrity: sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==}
     engines: {node: '>=0.10.0'}
 
-  binary-extensions@2.2.0:
-    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
+  binary-extensions@2.3.0:
+    resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
     engines: {node: '>=8'}
 
   bindings@1.5.0:
@@ -3982,18 +3880,14 @@ packages:
   bmp-js@0.1.0:
     resolution: {integrity: sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==}
 
-  bn.js@4.12.0:
-    resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==}
+  bn.js@4.12.1:
+    resolution: {integrity: sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg==}
 
   bn.js@5.2.1:
     resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==}
 
-  body-parser@1.20.1:
-    resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==}
-    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
-
-  body-parser@1.20.2:
-    resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==}
+  body-parser@1.20.3:
+    resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==}
     engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
 
   boolbase@1.0.0:
@@ -4013,8 +3907,8 @@ packages:
     resolution: {integrity: sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==}
     engines: {node: '>=0.10.0'}
 
-  braces@3.0.2:
-    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
 
   brorand@1.1.0:
@@ -4041,11 +3935,13 @@ packages:
   browserify-des@1.0.2:
     resolution: {integrity: sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==}
 
-  browserify-rsa@4.1.0:
-    resolution: {integrity: sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==}
+  browserify-rsa@4.1.1:
+    resolution: {integrity: sha512-YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ==}
+    engines: {node: '>= 0.10'}
 
-  browserify-sign@4.2.1:
-    resolution: {integrity: sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==}
+  browserify-sign@4.2.3:
+    resolution: {integrity: sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==}
+    engines: {node: '>= 0.12'}
 
   browserify-zlib@0.1.4:
     resolution: {integrity: sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==}
@@ -4053,8 +3949,8 @@ packages:
   browserify-zlib@0.2.0:
     resolution: {integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==}
 
-  browserslist@4.23.2:
-    resolution: {integrity: sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==}
+  browserslist@4.24.4:
+    resolution: {integrity: sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
@@ -4091,19 +3987,10 @@ packages:
   builtin-status-codes@3.0.0:
     resolution: {integrity: sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==}
 
-  bytes@3.0.0:
-    resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==}
-    engines: {node: '>= 0.8'}
-
   bytes@3.1.2:
     resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
     engines: {node: '>= 0.8'}
 
-  c8@7.14.0:
-    resolution: {integrity: sha512-i04rtkkcNcCf7zsQcSv/T9EbUn4RXQ6mropeMcjFOsQXQ0iGLAr/xT6TImQg4+U9hmNpN9XdvPkjUL1IzbgxJw==}
-    engines: {node: '>=10.12.0'}
-    hasBin: true
-
   cac@6.7.14:
     resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
     engines: {node: '>=8'}
@@ -4128,10 +4015,6 @@ packages:
     resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==}
     engines: {node: '>= 0.4'}
 
-  call-bound@1.0.3:
-    resolution: {integrity: sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==}
-    engines: {node: '>= 0.4'}
-
   call-bound@1.0.4:
     resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
     engines: {node: '>= 0.4'}
@@ -4155,8 +4038,8 @@ packages:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
     engines: {node: '>=10'}
 
-  caniuse-lite@1.0.30001646:
-    resolution: {integrity: sha512-dRg00gudiBDDTmUhClSdv3hqRfpbOnU28IpI1T6PBTLWa+kOj0681C8uML3PifYfREuBrVjDGhL3adYpBT6spw==}
+  caniuse-lite@1.0.30001702:
+    resolution: {integrity: sha512-LoPe/D7zioC0REI5W73PeR1e1MLCipRGq/VkovJnd6Df+QVqT+vT33OXCp8QUd7kA7RZrHWxb1B36OQKI/0gOA==}
 
   canvas@2.11.2:
     resolution: {integrity: sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==}
@@ -4168,15 +4051,11 @@ packages:
   caseless@0.12.0:
     resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
 
-  cbor-extract@2.2.0:
-    resolution: {integrity: sha512-Ig1zM66BjLfTXpNgKpvBePq271BPOvu8MR0Jl080yG7Jsl+wAZunfrwiwA+9ruzm/WEdIV5QF/bjDZTqyAIVHA==}
-    hasBin: true
+  centra@2.7.0:
+    resolution: {integrity: sha512-PbFMgMSrmgx6uxCdm57RUos9Tc3fclMvhLSATYN39XsDV29B89zZ3KA89jmY0vwSGazyU+uerqwa6t+KaodPcg==}
 
-  cbor-x@1.5.4:
-    resolution: {integrity: sha512-PVKILDn+Rf6MRhhcyzGXi5eizn1i0i3F8Fe6UMMxXBnWkalq9+C5+VTmlIjAYM4iF2IYF2N+zToqAfYOp+3rfw==}
-
-  chai@4.3.10:
-    resolution: {integrity: sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==}
+  chai@4.5.0:
+    resolution: {integrity: sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==}
     engines: {node: '>=4'}
 
   chai@5.2.0:
@@ -4191,16 +4070,13 @@ packages:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
 
-  chalk@5.3.0:
-    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
+  chalk@5.4.1:
+    resolution: {integrity: sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==}
     engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
 
   change-case@4.1.2:
     resolution: {integrity: sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==}
 
-  change-case@5.1.2:
-    resolution: {integrity: sha512-CAtbGEDulyjzs05RXy3uKcwqeztz/dMEuAc1Xu9NQBsbrhuGMneL0u9Dj5SoutLKBFYun8txxYIwhjtLNfUmCA==}
-
   change-case@5.4.4:
     resolution: {integrity: sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==}
 
@@ -4224,8 +4100,8 @@ packages:
   chokidar@2.1.8:
     resolution: {integrity: sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==}
 
-  chokidar@3.5.3:
-    resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
+  chokidar@3.6.0:
+    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
     engines: {node: '>= 8.10.0'}
 
   chownr@1.1.4:
@@ -4239,12 +4115,16 @@ packages:
     resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==}
     engines: {node: '>=6.0'}
 
-  ci-info@3.8.0:
-    resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==}
+  ci-info@3.9.0:
+    resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
     engines: {node: '>=8'}
 
-  cipher-base@1.0.4:
-    resolution: {integrity: sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==}
+  cipher-base@1.0.6:
+    resolution: {integrity: sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==}
+    engines: {node: '>= 0.10'}
+
+  citty@0.1.6:
+    resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==}
 
   class-utils@0.3.6:
     resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
@@ -4265,21 +4145,18 @@ packages:
     resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
     engines: {node: '>=8'}
 
-  cli-spinners@2.9.1:
-    resolution: {integrity: sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==}
+  cli-spinners@2.9.2:
+    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
     engines: {node: '>=6'}
 
-  cli-table3@0.6.3:
-    resolution: {integrity: sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==}
+  cli-table3@0.6.5:
+    resolution: {integrity: sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==}
     engines: {node: 10.* || >= 12.*}
 
   cli-truncate@2.1.0:
     resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
     engines: {node: '>=8'}
 
-  cliui@7.0.4:
-    resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
-
   cliui@8.0.1:
     resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
     engines: {node: '>=12'}
@@ -4359,8 +4236,8 @@ packages:
   component-emitter@1.2.1:
     resolution: {integrity: sha512-jPatnhd33viNplKjqXKRkGU345p263OIWzDL2wH3LGIGp5Kojo+uXizHmOADRvhGFFTnJqX3jBAKP6vvmSDKcA==}
 
-  component-emitter@1.3.0:
-    resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}
+  component-emitter@1.3.1:
+    resolution: {integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==}
 
   component-inherit@0.0.3:
     resolution: {integrity: sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA==}
@@ -4369,8 +4246,8 @@ packages:
     resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==}
     engines: {node: '>= 0.6'}
 
-  compression@1.7.4:
-    resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==}
+  compression@1.8.0:
+    resolution: {integrity: sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==}
     engines: {node: '>= 0.8.0'}
 
   concat-map@0.0.1:
@@ -4380,6 +4257,9 @@ packages:
     resolution: {integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==}
     engines: {'0': node >= 0.8}
 
+  confbox@0.1.8:
+    resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
+
   confusing-browser-globals@1.0.11:
     resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==}
 
@@ -4387,6 +4267,10 @@ packages:
     resolution: {integrity: sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==}
     engines: {node: '>= 0.10.0'}
 
+  consola@3.4.0:
+    resolution: {integrity: sha512-EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==}
+    engines: {node: ^14.18.0 || >=16.10.0}
+
   console-browserify@1.2.0:
     resolution: {integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==}
 
@@ -4424,8 +4308,12 @@ packages:
     resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==}
     engines: {node: '>= 0.6'}
 
-  cookie@0.5.0:
-    resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
+  cookie@0.7.1:
+    resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==}
+    engines: {node: '>= 0.6'}
+
+  cookie@0.7.2:
+    resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==}
     engines: {node: '>= 0.6'}
 
   copy-descriptor@0.1.1:
@@ -4435,12 +4323,15 @@ packages:
   copy-to-clipboard@3.3.3:
     resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==}
 
-  core-js-compat@3.32.1:
-    resolution: {integrity: sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==}
+  core-js-compat@3.41.0:
+    resolution: {integrity: sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==}
 
   core-js@3.37.1:
     resolution: {integrity: sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==}
 
+  core-js@3.41.0:
+    resolution: {integrity: sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==}
+
   core-util-is@1.0.2:
     resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
 
@@ -4480,19 +4371,20 @@ packages:
   crelt@1.0.6:
     resolution: {integrity: sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==}
 
-  cross-spawn@6.0.5:
-    resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}
+  cross-spawn@6.0.6:
+    resolution: {integrity: sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==}
     engines: {node: '>=4.8'}
 
-  cross-spawn@7.0.3:
-    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
+  cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
 
   crypt@0.0.2:
     resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
 
-  crypto-browserify@3.12.0:
-    resolution: {integrity: sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==}
+  crypto-browserify@3.12.1:
+    resolution: {integrity: sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ==}
+    engines: {node: '>= 0.10'}
 
   crypto-random-string@2.0.0:
     resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==}
@@ -4512,8 +4404,8 @@ packages:
     resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
     engines: {node: '>= 6'}
 
-  csstype@3.1.2:
-    resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
+  csstype@3.1.3:
+    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
 
   cypress-esbuild-preprocessor@1.0.2:
     resolution: {integrity: sha512-JsFnm6fBQt/OEzstknJ1KLMTuUERUaG0ZB9fk0KdNUlZqxaVEoQ9/pFvKmqRfzUe2y00cWD++ptccQA4tNAAlQ==}
@@ -4545,8 +4437,8 @@ packages:
     resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==}
     engines: {node: '>= 0.4'}
 
-  dayjs@1.11.9:
-    resolution: {integrity: sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==}
+  dayjs@1.11.13:
+    resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}
 
   debounce@1.2.1:
     resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==}
@@ -4614,8 +4506,8 @@ packages:
     resolution: {integrity: sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==}
     engines: {node: '>=10'}
 
-  decode-named-character-reference@1.0.2:
-    resolution: {integrity: sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==}
+  decode-named-character-reference@1.1.0:
+    resolution: {integrity: sha512-Wy+JTSbFThEOXQIR2L6mxJvEs+veIzpmqD7ynWxMXGpnk3smkHQOp6forLdHsKpAMW9iJpaBBIxz285t1n1C3w==}
 
   decode-uri-component@0.2.2:
     resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
@@ -4629,8 +4521,8 @@ packages:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
     engines: {node: '>=10'}
 
-  deep-eql@4.1.3:
-    resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
+  deep-eql@4.1.4:
+    resolution: {integrity: sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==}
     engines: {node: '>=6'}
 
   deep-eql@5.0.2:
@@ -4682,8 +4574,8 @@ packages:
     resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==}
     engines: {node: '>=0.10.0'}
 
-  defu@6.1.2:
-    resolution: {integrity: sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==}
+  defu@6.1.4:
+    resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==}
 
   del@6.1.1:
     resolution: {integrity: sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==}
@@ -4704,14 +4596,15 @@ packages:
     resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
     engines: {node: '>= 0.8'}
 
-  dequal@1.0.0:
-    resolution: {integrity: sha512-/Nd1EQbQbI9UbSHrMiKZjFLrXSnU328iQdZKPQf78XQI6C+gutkFUeoHpG5J08Ioa6HeRbRNFpSIclh1xyG0mw==}
-    engines: {node: '>=6'}
-
   dequal@2.0.3:
     resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
     engines: {node: '>=6'}
 
+  derive-valtio@0.1.0:
+    resolution: {integrity: sha512-OCg2UsLbXK7GmmpzMXhYkdO64vhJ1ROUUGaTFyHjVwEdMEcTTRj7W1TxLbSBxdY8QLBPCcp66MTyaSy0RpO17A==}
+    peerDependencies:
+      valtio: '*'
+
   des.js@1.1.0:
     resolution: {integrity: sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==}
 
@@ -4726,10 +4619,6 @@ packages:
     resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
     engines: {node: '>=8'}
 
-  detect-libc@2.0.2:
-    resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==}
-    engines: {node: '>=8'}
-
   detect-libc@2.0.3:
     resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
     engines: {node: '>=8'}
@@ -4741,8 +4630,9 @@ packages:
     resolution: {integrity: sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==}
     engines: {node: '>=12'}
 
-  detect-port@1.5.1:
-    resolution: {integrity: sha512-aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ==}
+  detect-port@1.6.1:
+    resolution: {integrity: sha512-CmnVc+Hek2egPx1PeTFVta2W78xy2K/9Rkf6cC4T59S50tVnzKj+tnx5mmx5lwvCkujZ4uRrpRSuV+IVs3f90Q==}
+    engines: {node: '>= 4.0.0'}
     hasBin: true
 
   devlop@1.1.0:
@@ -4809,8 +4699,8 @@ packages:
     resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
     engines: {node: '>= 4'}
 
-  domutils@3.1.0:
-    resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==}
+  domutils@3.2.2:
+    resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==}
 
   dot-case@3.0.4:
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
@@ -4819,12 +4709,12 @@ packages:
     resolution: {integrity: sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==}
     engines: {node: '>=12'}
 
-  dotenv@16.3.1:
-    resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==}
+  dotenv@16.4.7:
+    resolution: {integrity: sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==}
     engines: {node: '>=12'}
 
-  draco3d@1.5.6:
-    resolution: {integrity: sha512-+3NaRjWktb5r61ZFoDejlykPEFKT5N/LkbXsaddlw6xNSXBanUYpFc2AXXpbJDilPHazcSreU/DpQIaxfX0NfQ==}
+  draco3d@1.5.7:
+    resolution: {integrity: sha512-m6WCKt/erDXcw+70IJXnG7M3awwQPAsZvJGX5zY7beBqpELw6RDGkYVU0W43AFxye4pDZ5i2Lbyc/NNGqwjUVQ==}
 
   dunder-proto@1.0.1:
     resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
@@ -4848,16 +4738,16 @@ packages:
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  ejs@3.1.9:
-    resolution: {integrity: sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==}
+  ejs@3.1.10:
+    resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==}
     engines: {node: '>=0.10.0'}
     hasBin: true
 
-  electron-to-chromium@1.5.0:
-    resolution: {integrity: sha512-Vb3xHHYnLseK8vlMJQKJYXJ++t4u1/qJ3vykuVrVjvdiOEhYyT1AuP4x03G8EnPmYvYOhe9T+dADTmthjRQMkA==}
+  electron-to-chromium@1.5.113:
+    resolution: {integrity: sha512-wjT2O4hX+wdWPJ76gWSkMhcHAV2PTMX+QetUCPYEdCIe+cxmgzzSSiGRCKW8nuh4mwKZlpv0xvoW7OF2X+wmHg==}
 
-  elliptic@6.5.4:
-    resolution: {integrity: sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==}
+  elliptic@6.6.1:
+    resolution: {integrity: sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==}
 
   emit-then@2.0.0:
     resolution: {integrity: sha512-y5JHnrygHnCndtqVHHDhCr0ZzzWHK5RBTczWRlGSIR5UnGHBXuxpoaE0UB5E82qym8ma2dI799wDSSJN2e4VSg==}
@@ -4886,29 +4776,29 @@ packages:
   endian-toggle@0.0.0:
     resolution: {integrity: sha512-ShfqhXeHRE4TmggSlHXG8CMGIcsOsqDw/GcoPcosToE59Rm9e4aXaMhEQf2kPBsBRrKem1bbOAv5gOKnkliMFQ==}
 
-  engine.io-client@3.5.3:
-    resolution: {integrity: sha512-qsgyc/CEhJ6cgMUwxRRtOndGVhIu5hpL5tR4umSpmX/MvkFoIxUTM7oFMDQumHNzlNLwSVy6qhstFPoWTf7dOw==}
+  engine.io-client@3.5.4:
+    resolution: {integrity: sha512-ydc8uuMMDxC5KCKNJN3zZKYJk2sgyTuTZQ7Aj1DJSsLKAcizA/PzWivw8fZMIjJVBo2CJOYzntv4FSjY/Lr//g==}
 
-  engine.io-client@6.5.2:
-    resolution: {integrity: sha512-CQZqbrpEYnrpGqC07a9dJDz4gePZUgTPMU3NKJPSeQOyw27Tst4Pl3FemKoFGAlHzgZmKjoRmiJvbWfhCXUlIg==}
+  engine.io-client@6.6.3:
+    resolution: {integrity: sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==}
 
   engine.io-parser@2.2.1:
     resolution: {integrity: sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==}
 
-  engine.io-parser@5.2.1:
-    resolution: {integrity: sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==}
+  engine.io-parser@5.2.3:
+    resolution: {integrity: sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==}
     engines: {node: '>=10.0.0'}
 
-  engine.io@3.6.1:
-    resolution: {integrity: sha512-dfs8EVg/i7QjFsXxn7cCRQ+Wai1G1TlEvHhdYEi80fxn5R1vZ2K661O6v/rezj1FP234SZ14r9CmJke99iYDGg==}
+  engine.io@3.6.2:
+    resolution: {integrity: sha512-C4JjGQZLY3kWlIDx0BQNKizbrfpb7NahxDztGdN5jrPK2ghmXiNDN+E/t0JzDeNRZxPVaszxEng42Pmj27X/0w==}
     engines: {node: '>=8.0.0'}
 
-  engine.io@6.5.3:
-    resolution: {integrity: sha512-IML/R4eG/pUS5w7OfcDE0jKrljWS9nwnEfsxWCIJF5eO6AHo6+Hlv+lQbdlAYsiJPHzUthLm1RUjnBzWOs45cw==}
+  engine.io@6.6.4:
+    resolution: {integrity: sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==}
     engines: {node: '>=10.2.0'}
 
-  enhanced-resolve@5.17.1:
-    resolution: {integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==}
+  enhanced-resolve@5.18.1:
+    resolution: {integrity: sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==}
     engines: {node: '>=10.13.0'}
 
   enquirer@2.4.1:
@@ -4923,8 +4813,8 @@ packages:
     resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
     engines: {node: '>=6'}
 
-  envinfo@7.10.0:
-    resolution: {integrity: sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==}
+  envinfo@7.14.0:
+    resolution: {integrity: sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==}
     engines: {node: '>=4'}
     hasBin: true
 
@@ -4937,8 +4827,8 @@ packages:
   error-stack-parser@2.1.4:
     resolution: {integrity: sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==}
 
-  eruda@3.0.1:
-    resolution: {integrity: sha512-6q1Xdwga4JTr1mKSW4mzuWSSbmXgqpm/8Wa1QGFGfCWRjC0bCQjbS4u06M1te1moucIS3hBLlbSTPWYH2W0qbQ==}
+  eruda@3.4.1:
+    resolution: {integrity: sha512-RmaO5yD97URY/9Q0lye3cmmNPoXNKreeePIw7c/zllbscR92CjGFZFuQ70+0fLIvLcKW3Xha8DS8NFhmeNbEBQ==}
 
   es-abstract@1.23.9:
     resolution: {integrity: sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==}
@@ -4959,9 +4849,6 @@ packages:
   es-module-lexer@0.9.3:
     resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
 
-  es-module-lexer@1.5.4:
-    resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==}
-
   es-module-lexer@1.6.0:
     resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==}
 
@@ -4995,8 +4882,8 @@ packages:
     peerDependencies:
       esbuild: '*'
 
-  esbuild-register@3.5.0:
-    resolution: {integrity: sha512-+4G/XmakeBAsvJuDugJvtyF1x+XJT4FMocynNpxrvEBViirpfUn2PgNpCHedfWhF4WokNsO/OvMKrmJOIJsI5A==}
+  esbuild-register@3.6.0:
+    resolution: {integrity: sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg==}
     peerDependencies:
       esbuild: '>=0.12 <1'
 
@@ -5005,8 +4892,8 @@ packages:
     engines: {node: '>=12'}
     hasBin: true
 
-  esbuild@0.19.11:
-    resolution: {integrity: sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA==}
+  esbuild@0.19.12:
+    resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==}
     engines: {node: '>=12'}
     hasBin: true
 
@@ -5015,8 +4902,8 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  escalade@3.1.2:
-    resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}
+  escalade@3.2.0:
+    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
     engines: {node: '>=6'}
 
   escape-html@1.0.3:
@@ -5081,8 +4968,8 @@ packages:
   eslint-import-resolver-node@0.3.9:
     resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
 
-  eslint-module-utils@2.8.0:
-    resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
+  eslint-module-utils@2.12.0:
+    resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==}
     engines: {node: '>=4'}
     peerDependencies:
       '@typescript-eslint/parser': '*'
@@ -5130,17 +5017,17 @@ packages:
     peerDependencies:
       eslint: '>=5.16.0'
 
-  eslint-plugin-react-hooks@4.6.0:
-    resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==}
+  eslint-plugin-react-hooks@5.2.0:
+    resolution: {integrity: sha512-+f15FfK64YQwZdJNELETdn5ibXEUQmW1DZL6KXhNnc2heoy/sg9VJJeT7n8TlMWouzWqSWavFkIhHyIbIAEapg==}
     engines: {node: '>=10'}
     peerDependencies:
-      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
+      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0
 
-  eslint-plugin-react@7.34.1:
-    resolution: {integrity: sha512-N97CxlouPT1AHt8Jn0mhhN2RrADlUAsk1/atcT2KyA/l9Q/E6ll7OIGwNumFmWfZ9skV3XXccYS19h80rHtgkw==}
+  eslint-plugin-react@7.37.4:
+    resolution: {integrity: sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==}
     engines: {node: '>=4'}
     peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
 
   eslint-plugin-sonarjs@0.19.0:
     resolution: {integrity: sha512-6+s5oNk5TFtVlbRxqZN7FIGmjdPCYQKaTzFPmqieCmsU1kBYDzndTeQav0xtQNwZJWu5awWfTGe8Srq9xFOGnw==}
@@ -5174,18 +5061,18 @@ packages:
     resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  eslint-visitor-keys@4.0.0:
-    resolution: {integrity: sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==}
+  eslint-visitor-keys@4.2.0:
+    resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  eslint@8.50.0:
-    resolution: {integrity: sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==}
+  eslint@8.57.1:
+    resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
     hasBin: true
 
-  espree@10.1.0:
-    resolution: {integrity: sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==}
+  espree@10.3.0:
+    resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   espree@9.6.1:
@@ -5197,8 +5084,8 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
-  esquery@1.5.0:
-    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
+  esquery@1.6.0:
+    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
     engines: {node: '>=0.10'}
 
   esrecurse@4.3.0:
@@ -5213,10 +5100,6 @@ packages:
     resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
     engines: {node: '>=4.0'}
 
-  estree-to-babel@3.2.1:
-    resolution: {integrity: sha512-YNF+mZ/Wu2FU/gvmzuWtYc8rloubL7wfXCTgouFrnjGVXPA/EeYYA7pupXWrb3Iv1cTBeSSxxJIbK23l4MRNqg==}
-    engines: {node: '>=8.3.0'}
-
   estree-walker@1.0.1:
     resolution: {integrity: sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==}
 
@@ -5281,12 +5164,12 @@ packages:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
     engines: {node: '>=6'}
 
-  expect-type@1.1.0:
-    resolution: {integrity: sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==}
+  expect-type@1.2.0:
+    resolution: {integrity: sha512-80F22aiJ3GLyVnS/B3HzgR6RelZVumzj9jkL0Rhz4h0xYbNW9PjlQz5h3J/SShErbXBc295vseR4/MIbVmUbeA==}
     engines: {node: '>=12.0.0'}
 
-  exponential-backoff@3.1.1:
-    resolution: {integrity: sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==}
+  exponential-backoff@3.1.2:
+    resolution: {integrity: sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==}
 
   express-ws@4.0.0:
     resolution: {integrity: sha512-KEyUw8AwRET2iFjFsI1EJQrJ/fHeGiJtgpYgEWG3yDv4l/To/m3a2GaYfeGyB3lsWdvbesjF5XCMx+SVBgAAYw==}
@@ -5294,8 +5177,8 @@ packages:
     peerDependencies:
       express: ^4.0.0 || ^5.0.0-alpha.1
 
-  express@4.18.2:
-    resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==}
+  express@4.21.2:
+    resolution: {integrity: sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==}
     engines: {node: '>= 0.10.0'}
 
   extend-shallow@2.0.1:
@@ -5329,8 +5212,8 @@ packages:
   fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
-  fast-glob@3.3.1:
-    resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==}
+  fast-glob@3.3.3:
+    resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
     engines: {node: '>=8.6.0'}
 
   fast-json-stable-stringify@2.1.0:
@@ -5339,17 +5222,17 @@ packages:
   fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
-  fast-loops@1.1.3:
-    resolution: {integrity: sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g==}
-
   fast-shallow-equal@1.0.0:
     resolution: {integrity: sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw==}
 
+  fast-uri@3.0.6:
+    resolution: {integrity: sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==}
+
   fastest-stable-stringify@2.0.2:
     resolution: {integrity: sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q==}
 
-  fastq@1.15.0:
-    resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
+  fastq@1.19.1:
+    resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==}
 
   faye-websocket@0.11.4:
     resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==}
@@ -5388,24 +5271,24 @@ packages:
   filelist@1.0.4:
     resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
 
-  filesize@10.0.12:
-    resolution: {integrity: sha512-6RS9gDchbn+qWmtV2uSjo5vmKizgfCQeb5jKmqx8HyzA3MoLqqyQxN+QcjkGBJt7FjJ9qFce67Auyya5rRRbpw==}
+  filesize@10.1.6:
+    resolution: {integrity: sha512-sJslQKU2uM33qH5nqewAwVB2QgR6w1aMNsYUp3aN5rMRyXEwJGmZvaWzeJFNTOXWlHQyBFCWrdj3fV/fsTOX8w==}
     engines: {node: '>= 10.4.0'}
 
   fill-range@4.0.0:
     resolution: {integrity: sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==}
     engines: {node: '>=0.10.0'}
 
-  fill-range@7.0.1:
-    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
     engines: {node: '>=8'}
 
   finalhandler@1.1.2:
     resolution: {integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==}
     engines: {node: '>= 0.8'}
 
-  finalhandler@1.2.0:
-    resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==}
+  finalhandler@1.3.1:
+    resolution: {integrity: sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==}
     engines: {node: '>= 0.8'}
 
   find-cache-dir@2.1.0:
@@ -5431,22 +5314,22 @@ packages:
     resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
     engines: {node: '>=10'}
 
-  flat-cache@3.1.0:
-    resolution: {integrity: sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==}
-    engines: {node: '>=12.0.0'}
+  flat-cache@3.2.0:
+    resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
+    engines: {node: ^10.12.0 || >=12.0.0}
 
   flatmap@0.0.3:
     resolution: {integrity: sha512-OuR+o7kHVe+x9RtIujPay7Uw3bvDZBZFSBXClEphZuSDLmZTqMdclasf4vFSsogC8baDz0eaC2NdO/2dlXHBKQ==}
 
-  flatted@3.2.7:
-    resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
+  flatted@3.3.3:
+    resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==}
 
-  flow-parser@0.218.0:
-    resolution: {integrity: sha512-mk4e7UK4P/W3tjrJyto6oxPuCjwvRMyzBh72hTl8T0dOcTzkP0M2JJHpncgyhKphMFi9pnjwHfc8e0oe4Uk3LA==}
+  flow-parser@0.263.0:
+    resolution: {integrity: sha512-F0Tr7SUvZ4BQYglFOkr8rCTO5FPjCwMhm/6i57h40F80Oz/hzzkqte4lGO0vGJ7THQonuXcTyYqCdKkAwt5d2w==}
     engines: {node: '>=0.4.0'}
 
-  follow-redirects@1.15.6:
-    resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==}
+  follow-redirects@1.15.9:
+    resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
     engines: {node: '>=4.0'}
     peerDependencies:
       debug: '*'
@@ -5454,20 +5337,16 @@ packages:
       debug:
         optional: true
 
-  for-each@0.3.4:
-    resolution: {integrity: sha512-kKaIINnFpzW6ffJNDjjyjrk21BkDx38c0xa/klsT8VzLCaMEefv4ZTacrcVR4DmgTeBra++jMDAfS/tS799YDw==}
+  for-each@0.3.5:
+    resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==}
     engines: {node: '>= 0.4'}
 
   for-in@1.0.2:
     resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
     engines: {node: '>=0.10.0'}
 
-  foreground-child@2.0.0:
-    resolution: {integrity: sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==}
-    engines: {node: '>=8.0.0'}
-
-  foreground-child@3.1.1:
-    resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==}
+  foreground-child@3.3.1:
+    resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==}
     engines: {node: '>=14'}
 
   forever-agent@0.6.1:
@@ -5484,8 +5363,8 @@ packages:
     resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
     engines: {node: '>= 0.12'}
 
-  form-data@4.0.0:
-    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
+  form-data@4.0.2:
+    resolution: {integrity: sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==}
     engines: {node: '>= 6'}
 
   forwarded@0.2.0:
@@ -5518,6 +5397,10 @@ packages:
     resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==}
     engines: {node: '>=14.14'}
 
+  fs-extra@11.3.0:
+    resolution: {integrity: sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==}
+    engines: {node: '>=14.14'}
+
   fs-extra@7.0.1:
     resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
     engines: {node: '>=6 <7 || >=8'}
@@ -5586,8 +5469,8 @@ packages:
     resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==}
     engines: {node: '>=6'}
 
-  get-npm-tarball-url@2.0.3:
-    resolution: {integrity: sha512-R/PW6RqyaBQNWYaSyfrh54/qtcnOp22FHCCiRhSSZj0FP3KQWCsxxt0DzIdVTbwTqe9CtQfvl/FPD4UIPt4pqw==}
+  get-npm-tarball-url@2.1.0:
+    resolution: {integrity: sha512-ro+DiMu5DXgRBabqXupW38h7WPZ9+Ad8UjwhvsmmN8w1sU7ab0nzAXvVZ4kqYg57OrqomRtJvepX5/xvFKNtjA==}
     engines: {node: '>=12.17'}
 
   get-own-enumerable-property-symbols@3.0.2:
@@ -5617,8 +5500,8 @@ packages:
     resolution: {integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==}
     engines: {node: '>= 0.4'}
 
-  get-tsconfig@4.7.2:
-    resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==}
+  get-tsconfig@4.10.0:
+    resolution: {integrity: sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==}
 
   get-value@2.0.6:
     resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
@@ -5630,8 +5513,8 @@ packages:
   getpass@0.1.7:
     resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
 
-  giget@1.1.3:
-    resolution: {integrity: sha512-zHuCeqtfgqgDwvXlR84UNgnJDuUHQcNI5OqWqFxxuk2BshuKbYhJWdxBsEo4PvKqoGh23lUAIvBNpChMLv7/9Q==}
+  giget@1.2.5:
+    resolution: {integrity: sha512-r1ekGw/Bgpi3HLV3h1MRBIlSAdHoIMklpaQ3OQLFcRw9PwAj2rqigvIbg+dBUI51OxVI2jsEtDywDBjSiuf7Ug==}
     hasBin: true
 
   github-from-package@0.0.0:
@@ -5667,9 +5550,8 @@ packages:
   glob-to-regexp@0.4.1:
     resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
 
-  glob@10.3.3:
-    resolution: {integrity: sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==}
-    engines: {node: '>=16 || 14 >=14.17'}
+  glob@10.4.5:
+    resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
     hasBin: true
 
   glob@7.2.3:
@@ -5692,8 +5574,8 @@ packages:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
 
-  globals@13.21.0:
-    resolution: {integrity: sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==}
+  globals@13.24.0:
+    resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
     engines: {node: '>=8'}
 
   globalthis@1.0.4:
@@ -5786,13 +5668,13 @@ packages:
     resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==}
     engines: {node: '>=0.10.0'}
 
-  has@1.0.3:
-    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
+  has@1.0.4:
+    resolution: {integrity: sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==}
     engines: {node: '>= 0.4.0'}
 
-  hash-base@3.1.0:
-    resolution: {integrity: sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==}
-    engines: {node: '>=4'}
+  hash-base@3.0.5:
+    resolution: {integrity: sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==}
+    engines: {node: '>= 0.10'}
 
   hash.js@1.1.7:
     resolution: {integrity: sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==}
@@ -5832,9 +5714,6 @@ packages:
   html-entities@2.5.2:
     resolution: {integrity: sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==}
 
-  html-escaper@2.0.2:
-    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
-
   html-tags@3.3.1:
     resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
     engines: {node: '>=8'}
@@ -5857,8 +5736,8 @@ packages:
     resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
     engines: {node: '>= 0.8'}
 
-  http-parser-js@0.5.8:
-    resolution: {integrity: sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==}
+  http-parser-js@0.5.9:
+    resolution: {integrity: sha512-n1XsPy3rXVxlqxVioEWdC+0+M+SQw0DpJynwtOPo1X+ZlvdzTLtDBIJJlDQTnwZIFJrZSzSGmIOUdP8tu+SgLw==}
 
   http-proxy-agent@5.0.0:
     resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
@@ -5888,10 +5767,6 @@ packages:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
 
-  https-proxy-agent@7.0.2:
-    resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==}
-    engines: {node: '>= 14'}
-
   human-signals@1.1.1:
     resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==}
     engines: {node: '>=8.12.0'}
@@ -5903,8 +5778,8 @@ packages:
   humanize-ms@1.2.1:
     resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
 
-  hyphenate-style-name@1.0.4:
-    resolution: {integrity: sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==}
+  hyphenate-style-name@1.1.0:
+    resolution: {integrity: sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==}
 
   iconv-lite@0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
@@ -5920,8 +5795,8 @@ packages:
   ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
-  ignore@5.2.4:
-    resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
+  ignore@5.3.2:
+    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
     engines: {node: '>= 4'}
 
   image-size@0.7.5:
@@ -5932,12 +5807,12 @@ packages:
   immediate@3.0.6:
     resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}
 
-  import-fresh@3.3.0:
-    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
+  import-fresh@3.3.1:
+    resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
     engines: {node: '>=6'}
 
-  import-meta-resolve@3.0.0:
-    resolution: {integrity: sha512-4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg==}
+  import-meta-resolve@3.1.1:
+    resolution: {integrity: sha512-qeywsE/KC3w9Fd2ORrRDUw6nS/nLwZpXgfrOc2IILvZYnCaEMd+D56Vfg9k4G29gIeVi3XKql1RQatME8iYsiw==}
 
   imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
@@ -5974,18 +5849,16 @@ packages:
     resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==}
     engines: {node: '>=10'}
 
-  inline-style-prefixer@6.0.4:
-    resolution: {integrity: sha512-FwXmZC2zbeeS7NzGjJ6pAiqRhXR0ugUShSNb6GApMl6da0/XGc4MOJsoWAywia52EEWbXNSy0pzkwz/+Y+swSg==}
+  inline-style-prefixer@7.0.1:
+    resolution: {integrity: sha512-lhYo5qNTQp3EvSSp3sRvXMbVQTLrvGV6DycRMJ5dm2BLMiJ30wpXKdDdgX+GmJZ5uQMucwRKHamXSst3Sj/Giw==}
 
   internal-slot@1.1.0:
     resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==}
     engines: {node: '>= 0.4'}
 
-  invariant@2.2.4:
-    resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
-
-  ip@2.0.0:
-    resolution: {integrity: sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==}
+  ip-address@9.0.5:
+    resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==}
+    engines: {node: '>= 12'}
 
   ipaddr.js@1.9.1:
     resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
@@ -5999,8 +5872,8 @@ packages:
     resolution: {integrity: sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==}
     engines: {node: '>= 0.10'}
 
-  is-arguments@1.1.1:
-    resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
+  is-arguments@1.2.0:
+    resolution: {integrity: sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==}
     engines: {node: '>= 0.4'}
 
   is-array-buffer@3.0.5:
@@ -6029,8 +5902,8 @@ packages:
     resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
     engines: {node: '>=8'}
 
-  is-boolean-object@1.2.1:
-    resolution: {integrity: sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==}
+  is-boolean-object@1.2.2:
+    resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==}
     engines: {node: '>= 0.4'}
 
   is-buffer@1.1.6:
@@ -6224,8 +6097,8 @@ packages:
     resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==}
     engines: {node: '>= 0.4'}
 
-  is-weakref@1.1.0:
-    resolution: {integrity: sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==}
+  is-weakref@1.1.1:
+    resolution: {integrity: sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==}
     engines: {node: '>= 0.4'}
 
   is-weakset@2.0.4:
@@ -6270,32 +6143,23 @@ packages:
   isstream@0.1.2:
     resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
 
-  istanbul-lib-coverage@3.2.0:
-    resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
+  istanbul-lib-coverage@3.2.2:
+    resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
     engines: {node: '>=8'}
 
   istanbul-lib-instrument@5.2.1:
     resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
     engines: {node: '>=8'}
 
-  istanbul-lib-report@3.0.1:
-    resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
-    engines: {node: '>=10'}
-
-  istanbul-reports@3.1.6:
-    resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==}
-    engines: {node: '>=8'}
-
   iterator.prototype@1.1.5:
     resolution: {integrity: sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==}
     engines: {node: '>= 0.4'}
 
-  jackspeak@2.3.0:
-    resolution: {integrity: sha512-uKmsITSsF4rUWQHzqaRUuyAir3fZfW3f202Ee34lz/gZCi970CPZwyQXLGNgWJvvZbvFyzeyGq0+4fcG/mBKZg==}
-    engines: {node: '>=14'}
+  jackspeak@3.4.3:
+    resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
 
-  jake@10.8.7:
-    resolution: {integrity: sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==}
+  jake@10.9.2:
+    resolution: {integrity: sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -6311,10 +6175,6 @@ packages:
     resolution: {integrity: sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  jest-worker@26.6.2:
-    resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==}
-    engines: {node: '>= 10.13.0'}
-
   jest-worker@27.5.1:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
@@ -6326,11 +6186,12 @@ packages:
   jimp@0.10.3:
     resolution: {integrity: sha512-meVWmDMtyUG5uYjFkmzu0zBgnCvvxwWNi27c4cg55vWNVC9ES4Lcwb+ogx+uBBQE3Q+dLKjXaLl0JVW+nUNwbQ==}
 
-  joi@17.13.1:
-    resolution: {integrity: sha512-vaBlIKCyo4FCUtCm7Eu4QZd/q02bWcxfUO6YSXAZOWF6gzcLBeba8kwotUdYJjDLW8Cz8RywsSOqiNJZW0mNvg==}
+  jiti@2.4.2:
+    resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==}
+    hasBin: true
 
-  jose@4.15.5:
-    resolution: {integrity: sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==}
+  joi@17.13.3:
+    resolution: {integrity: sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==}
 
   jpeg-js@0.3.7:
     resolution: {integrity: sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==}
@@ -6355,26 +6216,32 @@ packages:
   jsbn@0.1.1:
     resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
 
-  jscodeshift@0.14.0:
-    resolution: {integrity: sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==}
+  jsbn@1.1.0:
+    resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==}
+
+  jscodeshift@0.15.2:
+    resolution: {integrity: sha512-FquR7Okgmc4Sd0aEDwqho3rEiKR3BdvuG9jfdHjLJ6JQoWSMpavug3AoIfnfWhxFlf+5pzQh8qjqz0DWFrNQzA==}
     hasBin: true
     peerDependencies:
       '@babel/preset-env': ^7.1.6
+    peerDependenciesMeta:
+      '@babel/preset-env':
+        optional: true
 
   jsesc@0.5.0:
     resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==}
     hasBin: true
 
-  jsesc@2.5.2:
-    resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
-    engines: {node: '>=4'}
-    hasBin: true
-
   jsesc@3.0.2:
     resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
     engines: {node: '>=6'}
     hasBin: true
 
+  jsesc@3.1.0:
+    resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
+    engines: {node: '>=6'}
+    hasBin: true
+
   json-buffer@3.0.1:
     resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
 
@@ -6408,9 +6275,6 @@ packages:
     engines: {node: '>=6'}
     hasBin: true
 
-  jsonc-parser@3.2.0:
-    resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
-
   jsonfile@4.0.0:
     resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
 
@@ -6442,8 +6306,8 @@ packages:
   jws@3.2.2:
     resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==}
 
-  keyv@4.5.3:
-    resolution: {integrity: sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==}
+  keyv@4.5.4:
+    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
   kind-of@3.2.2:
     resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
@@ -6506,8 +6370,8 @@ packages:
     engines: {node: '>=0.10.0'}
     hasBin: true
 
-  load-bmfont@1.4.1:
-    resolution: {integrity: sha512-8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA==}
+  load-bmfont@1.4.2:
+    resolution: {integrity: sha512-qElWkmjW9Oq1F9EI5Gt7aD9zcdHb9spJCW1L/dmPf7KzCCEJxq8nhHz5eCgI9aMf7vrG/wyaCqdsI+Iy9ZTlog==}
 
   load-json-file@4.0.0:
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
@@ -6587,8 +6451,8 @@ packages:
     resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}
     engines: {node: '>=10'}
 
-  long@5.2.3:
-    resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==}
+  long@5.3.1:
+    resolution: {integrity: sha512-ka87Jz3gcx/I7Hal94xaN2tZEOPoUOEVftkQqZx2EeQRN7LGdfLlI3FvZ+7WDplm+vK2Urx9ULrvSowtdCieng==}
 
   longest-streak@3.1.0:
     resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==}
@@ -6597,9 +6461,8 @@ packages:
     resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
 
-  loupe@2.3.6:
-    resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==}
-    deprecated: Please upgrade to 2.3.7 which fixes GHSA-4q6p-r6v2-jvc5
+  loupe@2.3.7:
+    resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
 
   loupe@3.1.3:
     resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==}
@@ -6607,9 +6470,8 @@ packages:
   lower-case@2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
 
-  lru-cache@10.0.1:
-    resolution: {integrity: sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==}
-    engines: {node: 14 || >=16.14}
+  lru-cache@10.4.3:
+    resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
 
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
@@ -6635,10 +6497,6 @@ packages:
   magic-string@0.30.17:
     resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
 
-  magic-string@0.30.4:
-    resolution: {integrity: sha512-Q/TKtsC5BPm0kGqgBIF9oXAs/xEf2vRKiIB4wCRQTJOQIByZ1d+NnUOotvJOvNpi5RNIgVOMC3pOuaP1ZTDlVg==}
-    engines: {node: '>=12'}
-
   make-dir@2.1.0:
     resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
     engines: {node: '>=6'}
@@ -6647,10 +6505,6 @@ packages:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
 
-  make-dir@4.0.0:
-    resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
-    engines: {node: '>=10'}
-
   make-fetch-happen@10.2.1:
     resolution: {integrity: sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
@@ -6680,12 +6534,12 @@ packages:
     resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
     engines: {node: '>=0.10.0'}
 
-  markdown-it@14.0.0:
-    resolution: {integrity: sha512-seFjF0FIcPt4P9U39Bq1JYblX0KZCjDLFFQPHpL5AzHpqPEKtosxmdq/LTVZnjfH7tjt9BxStm+wXcDBNuYmzw==}
+  markdown-it@14.1.0:
+    resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==}
     hasBin: true
 
-  markdown-to-jsx@7.3.2:
-    resolution: {integrity: sha512-B+28F5ucp83aQm+OxNrPkS8z0tMKaeHiy0lHJs3LqCyDQFtWuenaIrkaVTgAm1pf1AU85LXltva86hlaT17i8Q==}
+  markdown-to-jsx@7.7.4:
+    resolution: {integrity: sha512-1bSfXyBKi+EYS3YY+e0Csuxf8oZ3decdfhOav/Z7Wrk89tjudyL5FOmwZQUoy0/qVXGUl+6Q3s2SWtpDEWITfQ==}
     engines: {node: '>= 10'}
     peerDependencies:
       react: ^18.2.0
@@ -6723,14 +6577,14 @@ packages:
   mdast-util-definitions@4.0.0:
     resolution: {integrity: sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==}
 
-  mdast-util-from-markdown@2.0.0:
-    resolution: {integrity: sha512-n7MTOr/z+8NAX/wmhhDji8O3bRvPTV/U0oTCaZJkjhPSKTPhS3xufVhKGF8s1pJ7Ox4QgoIU7KHseh09S+9rTA==}
+  mdast-util-from-markdown@2.0.2:
+    resolution: {integrity: sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==}
 
   mdast-util-phrasing@4.1.0:
     resolution: {integrity: sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==}
 
-  mdast-util-to-markdown@2.1.0:
-    resolution: {integrity: sha512-SR2VnIEdVNCJbP6y7kVTJgPLifdr8WEU440fQec7qHoHOUz/oJ2jmNRqdDQ3rbiStOXb2mCDGTuwsK5OPUgYlQ==}
+  mdast-util-to-markdown@2.1.2:
+    resolution: {integrity: sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==}
 
   mdast-util-to-string@1.1.0:
     resolution: {integrity: sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==}
@@ -6766,8 +6620,8 @@ packages:
     resolution: {integrity: sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  merge-descriptors@1.0.1:
-    resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==}
+  merge-descriptors@1.0.3:
+    resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==}
 
   merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
@@ -6786,75 +6640,75 @@ packages:
     resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
     engines: {node: '>= 0.6'}
 
-  micromark-core-commonmark@2.0.0:
-    resolution: {integrity: sha512-jThOz/pVmAYUtkroV3D5c1osFXAMv9e0ypGDOIZuCeAe91/sD6BoE2Sjzt30yuXtwOYUmySOhMas/PVyh02itA==}
+  micromark-core-commonmark@2.0.3:
+    resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==}
 
-  micromark-factory-destination@2.0.0:
-    resolution: {integrity: sha512-j9DGrQLm/Uhl2tCzcbLhy5kXsgkHUrjJHg4fFAeoMRwJmJerT9aw4FEhIbZStWN8A3qMwOp1uzHr4UL8AInxtA==}
+  micromark-factory-destination@2.0.1:
+    resolution: {integrity: sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==}
 
-  micromark-factory-label@2.0.0:
-    resolution: {integrity: sha512-RR3i96ohZGde//4WSe/dJsxOX6vxIg9TimLAS3i4EhBAFx8Sm5SmqVfR8E87DPSR31nEAjZfbt91OMZWcNgdZw==}
+  micromark-factory-label@2.0.1:
+    resolution: {integrity: sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==}
 
-  micromark-factory-space@2.0.0:
-    resolution: {integrity: sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==}
+  micromark-factory-space@2.0.1:
+    resolution: {integrity: sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==}
 
-  micromark-factory-title@2.0.0:
-    resolution: {integrity: sha512-jY8CSxmpWLOxS+t8W+FG3Xigc0RDQA9bKMY/EwILvsesiRniiVMejYTE4wumNc2f4UbAa4WsHqe3J1QS1sli+A==}
+  micromark-factory-title@2.0.1:
+    resolution: {integrity: sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==}
 
-  micromark-factory-whitespace@2.0.0:
-    resolution: {integrity: sha512-28kbwaBjc5yAI1XadbdPYHX/eDnqaUFVikLwrO7FDnKG7lpgxnvk/XGRhX/PN0mOZ+dBSZ+LgunHS+6tYQAzhA==}
+  micromark-factory-whitespace@2.0.1:
+    resolution: {integrity: sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==}
 
-  micromark-util-character@2.1.0:
-    resolution: {integrity: sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==}
+  micromark-util-character@2.1.1:
+    resolution: {integrity: sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==}
 
-  micromark-util-chunked@2.0.0:
-    resolution: {integrity: sha512-anK8SWmNphkXdaKgz5hJvGa7l00qmcaUQoMYsBwDlSKFKjc6gjGXPDw3FNL3Nbwq5L8gE+RCbGqTw49FK5Qyvg==}
+  micromark-util-chunked@2.0.1:
+    resolution: {integrity: sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==}
 
-  micromark-util-classify-character@2.0.0:
-    resolution: {integrity: sha512-S0ze2R9GH+fu41FA7pbSqNWObo/kzwf8rN/+IGlW/4tC6oACOs8B++bh+i9bVyNnwCcuksbFwsBme5OCKXCwIw==}
+  micromark-util-classify-character@2.0.1:
+    resolution: {integrity: sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==}
 
-  micromark-util-combine-extensions@2.0.0:
-    resolution: {integrity: sha512-vZZio48k7ON0fVS3CUgFatWHoKbbLTK/rT7pzpJ4Bjp5JjkZeasRfrS9wsBdDJK2cJLHMckXZdzPSSr1B8a4oQ==}
+  micromark-util-combine-extensions@2.0.1:
+    resolution: {integrity: sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==}
 
-  micromark-util-decode-numeric-character-reference@2.0.1:
-    resolution: {integrity: sha512-bmkNc7z8Wn6kgjZmVHOX3SowGmVdhYS7yBpMnuMnPzDq/6xwVA604DuOXMZTO1lvq01g+Adfa0pE2UKGlxL1XQ==}
+  micromark-util-decode-numeric-character-reference@2.0.2:
+    resolution: {integrity: sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==}
 
-  micromark-util-decode-string@2.0.0:
-    resolution: {integrity: sha512-r4Sc6leeUTn3P6gk20aFMj2ntPwn6qpDZqWvYmAG6NgvFTIlj4WtrAudLi65qYoaGdXYViXYw2pkmn7QnIFasA==}
+  micromark-util-decode-string@2.0.1:
+    resolution: {integrity: sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==}
 
-  micromark-util-encode@2.0.0:
-    resolution: {integrity: sha512-pS+ROfCXAGLWCOc8egcBvT0kf27GoWMqtdarNfDcjb6YLuV5cM3ioG45Ys2qOVqeqSbjaKg72vU+Wby3eddPsA==}
+  micromark-util-encode@2.0.1:
+    resolution: {integrity: sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==}
 
-  micromark-util-html-tag-name@2.0.0:
-    resolution: {integrity: sha512-xNn4Pqkj2puRhKdKTm8t1YHC/BAjx6CEwRFXntTaRf/x16aqka6ouVoutm+QdkISTlT7e2zU7U4ZdlDLJd2Mcw==}
+  micromark-util-html-tag-name@2.0.1:
+    resolution: {integrity: sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==}
 
-  micromark-util-normalize-identifier@2.0.0:
-    resolution: {integrity: sha512-2xhYT0sfo85FMrUPtHcPo2rrp1lwbDEEzpx7jiH2xXJLqBuy4H0GgXk5ToU8IEwoROtXuL8ND0ttVa4rNqYK3w==}
+  micromark-util-normalize-identifier@2.0.1:
+    resolution: {integrity: sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==}
 
-  micromark-util-resolve-all@2.0.0:
-    resolution: {integrity: sha512-6KU6qO7DZ7GJkaCgwBNtplXCvGkJToU86ybBAUdavvgsCiG8lSSvYxr9MhwmQ+udpzywHsl4RpGJsYWG1pDOcA==}
+  micromark-util-resolve-all@2.0.1:
+    resolution: {integrity: sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==}
 
-  micromark-util-sanitize-uri@2.0.0:
-    resolution: {integrity: sha512-WhYv5UEcZrbAtlsnPuChHUAsu/iBPOVaEVsntLBIdpibO0ddy8OzavZz3iL2xVvBZOpolujSliP65Kq0/7KIYw==}
+  micromark-util-sanitize-uri@2.0.1:
+    resolution: {integrity: sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==}
 
-  micromark-util-subtokenize@2.0.0:
-    resolution: {integrity: sha512-vc93L1t+gpR3p8jxeVdaYlbV2jTYteDje19rNSS/H5dlhxUYll5Fy6vJ2cDwP8RnsXi818yGty1ayP55y3W6fg==}
+  micromark-util-subtokenize@2.1.0:
+    resolution: {integrity: sha512-XQLu552iSctvnEcgXw6+Sx75GflAPNED1qx7eBJ+wydBb2KCbRZe+NwvIEEMM83uml1+2WSXpBAcp9IUCgCYWA==}
 
-  micromark-util-symbol@2.0.0:
-    resolution: {integrity: sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==}
+  micromark-util-symbol@2.0.1:
+    resolution: {integrity: sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==}
 
-  micromark-util-types@2.0.0:
-    resolution: {integrity: sha512-oNh6S2WMHWRZrmutsRmDDfkzKtxF+bc2VxLC9dvtrDIRFln627VsFP6fLMgTryGDljgLPjkrzQSDcPrjPyDJ5w==}
+  micromark-util-types@2.0.2:
+    resolution: {integrity: sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==}
 
-  micromark@4.0.0:
-    resolution: {integrity: sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==}
+  micromark@4.0.2:
+    resolution: {integrity: sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==}
 
   micromatch@3.1.10:
     resolution: {integrity: sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==}
     engines: {node: '>=0.10.0'}
 
-  micromatch@4.0.5:
-    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
     engines: {node: '>=8.6'}
 
   miller-rabin@4.0.1:
@@ -6865,6 +6719,10 @@ packages:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
+  mime-db@1.53.0:
+    resolution: {integrity: sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==}
+    engines: {node: '>= 0.6'}
+
   mime-db@1.54.0:
     resolution: {integrity: sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==}
     engines: {node: '>= 0.6'}
@@ -6912,8 +6770,8 @@ packages:
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00:
-    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00}
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8:
+    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8}
     version: 1.0.1
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1:
@@ -6921,22 +6779,17 @@ packages:
     version: 1.54.0
     engines: {node: '>=22'}
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d}
-    version: 1.54.0
-    engines: {node: '>=22'}
-
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284:
     resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284}
     version: 1.57.0
     engines: {node: '>=22'}
 
-  minecraft-wrap@1.5.1:
-    resolution: {integrity: sha512-7DZ2WhrcRD3fUMau84l9Va0KWzV92SHNdB7mnNdNhgXID2aW6pjWuYPZi8MepEBemA4XKKdnDx7HmhTbkoiR8A==}
+  minecraft-wrap@1.6.0:
+    resolution: {integrity: sha512-A1GjIR72x9H9cEaxAQsXZe5uhw7CPgq1pGwYkdbPe6mQraePinmj/jRIuntXYWEKrYamwQFT3igIafA+PEG11w==}
     hasBin: true
 
-  minecrafthawkeye@1.3.6:
-    resolution: {integrity: sha512-SlRlorxQs6nNzMiiIQ5z47wzbAI27UaCdbRB82CE8jqj4C8m3Gqk5TlgN+PSThxx8EDPXySzd8Vk+/wNigAd5A==}
+  minecrafthawkeye@1.3.9:
+    resolution: {integrity: sha512-YIDHTvljQjsJH4cEcbF02/ehNRUrbzEiL/quQmdEU8ruv69R4bwHqmBB8O9FyhpQgNppmNTs3pK8h4J0/MYGpQ==}
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
@@ -6946,17 +6799,17 @@ packages:
     resolution: {integrity: sha512-sUX77P8Z94N6N/KEvplZdXLwtuCHLx3lmU4Y1FB8189+jFCl3jH/+bdzwtksObmrXWW+evJ5nAPpzmOOxqcfag==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  mineflayer-pathfinder@2.4.4:
-    resolution: {integrity: sha512-HAXakZrJRb1UC+5dv8EaDrqjW3ZnBnBk3nkb6x/YWyhHCUKn/E7VU0FO+UN9whuqPlkSaVumEdXJdydE6lSYxQ==}
+  mineflayer-pathfinder@2.4.5:
+    resolution: {integrity: sha512-Jh3JnUgRLwhMh2Dugo4SPza68C41y+NPP5sdsgxRu35ydndo70i1JJGxauVWbXrpNwIxYNztUw78aFyb7icw8g==}
 
-  mineflayer@4.25.0:
-    resolution: {integrity: sha512-q7cmpZFaSI6sodcMJxc2GkV8IO84HbsUP+xNipGKfGg+FMISKabzdJ838Axb60qRtZrp6ny7LluQE7lesHvvxQ==}
-    engines: {node: '>=18'}
+  mineflayer@4.27.0:
+    resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
+    engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d}
-    version: 4.25.0
-    engines: {node: '>=18'}
+  mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448:
+    resolution: {tarball: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448}
+    version: 4.27.0
+    engines: {node: '>=22'}
 
   minimalistic-assert@1.0.1:
     resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
@@ -6971,6 +6824,10 @@ packages:
     resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
     engines: {node: '>=10'}
 
+  minimatch@9.0.3:
+    resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
   minimatch@9.0.5:
     resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -7010,8 +6867,8 @@ packages:
     resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
     engines: {node: '>=8'}
 
-  minipass@7.0.3:
-    resolution: {integrity: sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==}
+  minipass@7.1.2:
+    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
     engines: {node: '>=16 || 14 >=14.17'}
 
   minizlib@2.1.2:
@@ -7043,8 +6900,8 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  mlly@1.4.2:
-    resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==}
+  mlly@1.7.4:
+    resolution: {integrity: sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==}
 
   mojangson@2.0.4:
     resolution: {integrity: sha512-HYmhgDjr1gzF7trGgvcC/huIg2L8FsVbi/KacRe6r1AswbboGVZDS47SOZlomPuMWvZLas8m9vuHHucdZMwTmQ==}
@@ -7056,10 +6913,6 @@ packages:
     resolution: {integrity: sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==}
     engines: {node: '>= 0.8.0'}
 
-  mri@1.2.0:
-    resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
-    engines: {node: '>=4'}
-
   ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 
@@ -7069,22 +6922,17 @@ packages:
   mz@2.7.0:
     resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
 
-  nan@2.18.0:
-    resolution: {integrity: sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==}
+  nan@2.22.2:
+    resolution: {integrity: sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==}
 
-  nano-css@5.3.5:
-    resolution: {integrity: sha512-vSB9X12bbNu4ALBu7nigJgRViZ6ja3OU7CeuiV1zMIbXOdmkLahgtPmh3GBOlDxbKY0CitqlPdOReGlBLSp+yg==}
+  nano-css@5.6.2:
+    resolution: {integrity: sha512-+6bHaC8dSDGALM1HJjOHVXpuastdu2xFoZlC77Jh4cg+33Zcgm+Gxd+1xsnpZK14eyHObSp82+ll5y3SX75liw==}
     peerDependencies:
       react: ^18.2.0
       react-dom: '*'
 
-  nanoid@3.3.7:
-    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-
-  nanoid@3.3.8:
-    resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==}
+  nanoid@3.3.9:
+    resolution: {integrity: sha512-SppoicMGpZvbF1l3z4x7No3OlIjP7QJvC9XR7AhZr1kL133KHnKPztkKDc+Ir4aJ/1VhTySrtKhrsycmrMQfvg==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
@@ -7092,8 +6940,8 @@ packages:
     resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
     engines: {node: '>=0.10.0'}
 
-  napi-build-utils@1.0.2:
-    resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}
+  napi-build-utils@2.0.0:
+    resolution: {integrity: sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==}
 
   natural-compare-lite@1.4.0:
     resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
@@ -7109,11 +6957,15 @@ packages:
     resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
     engines: {node: '>= 0.6'}
 
+  negotiator@0.6.4:
+    resolution: {integrity: sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==}
+    engines: {node: '>= 0.6'}
+
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/4c6eccc7d7a7468ec811cb6c7398ded4753aea55:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/4c6eccc7d7a7468ec811cb6c7398ded4753aea55}
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590}
     version: 0.2.4
 
   nice-try@1.0.5:
@@ -7122,8 +6974,8 @@ packages:
   no-case@3.0.4:
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
 
-  node-abi@3.47.0:
-    resolution: {integrity: sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==}
+  node-abi@3.74.0:
+    resolution: {integrity: sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==}
     engines: {node: '>=10'}
 
   node-abort-controller@3.1.1:
@@ -7139,8 +6991,8 @@ packages:
     resolution: {integrity: sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==}
     engines: {node: '>= 0.10.5'}
 
-  node-fetch-native@1.4.0:
-    resolution: {integrity: sha512-F5kfEj95kX8tkDhUCYdV8dg3/8Olx/94zB8+ZNthFs6Bz31UpUi8Xh40TN3thLwXgrwXry1pEg9lJ++tLWTcqA==}
+  node-fetch-native@1.6.6:
+    resolution: {integrity: sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==}
 
   node-fetch@2.7.0:
     resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
@@ -7151,10 +7003,6 @@ packages:
       encoding:
         optional: true
 
-  node-gyp-build-optional-packages@5.1.1:
-    resolution: {integrity: sha512-+P72GAjVAbTxjjwUmwjVrqrdZROD4nf8KgpBoDxqXXTiYZZt/ud60dE5yvCSr9lRO8e8yv6kgJIC0K0PfZFVQw==}
-    hasBin: true
-
   node-gyp@9.4.1:
     resolution: {integrity: sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==}
     engines: {node: ^12.13 || ^14.13 || >=16}
@@ -7163,14 +7011,14 @@ packages:
   node-gzip@1.1.2:
     resolution: {integrity: sha512-ZB6zWpfZHGtxZnPMrJSKHVPrRjURoUzaDbLFj3VO70mpLTW5np96vXyHwft4Id0o+PYIzgDkBUjIzaNHhQ8srw==}
 
-  node-html-parser@6.1.10:
-    resolution: {integrity: sha512-6/uWdWxjQWQ7tMcFK2wWlrflsQUzh1HsEzlIf2j5+TtzfhT2yUvg3DwZYAmjEHeR3uX74ko7exjHW69J0tOzIg==}
+  node-html-parser@6.1.13:
+    resolution: {integrity: sha512-qIsTMOY4C/dAa5Q5vsobRpOOvPfC4pB61UVW2uSwZNUp0QU/jCekTal1vMmbO0DgdHeLUJpv/ARmDqErVxA3Sg==}
 
   node-int64@0.4.0:
     resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
 
-  node-releases@2.0.18:
-    resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
+  node-releases@2.0.19:
+    resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==}
 
   node-rsa@0.4.2:
     resolution: {integrity: sha512-Bvso6Zi9LY4otIZefYrscsUpo2mUpiAVIEmSZV2q41sP8tHZoert3Yu6zv4f/RXJqMNZQKCtnhDugIuCma23YA==}
@@ -7228,6 +7076,11 @@ packages:
   nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
 
+  nypm@0.5.4:
+    resolution: {integrity: sha512-X0SNNrZiGU8/e/zAB7sCTtdxWTMSIO73q+xuKgglm2Yvzwlo8UoC5FNySQFCvl84uPaeADkqHUZUkWy4aH4xOA==}
+    engines: {node: ^14.16.0 || >=16.10.0}
+    hasBin: true
+
   object-assign@4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
@@ -7236,12 +7089,12 @@ packages:
     resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
     engines: {node: '>=0.10.0'}
 
-  object-inspect@1.13.3:
-    resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==}
+  object-inspect@1.13.4:
+    resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
     engines: {node: '>= 0.4'}
 
-  object-is@1.1.5:
-    resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==}
+  object-is@1.1.6:
+    resolution: {integrity: sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==}
     engines: {node: '>= 0.4'}
 
   object-keys@1.1.1:
@@ -7264,10 +7117,6 @@ packages:
     resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
     engines: {node: '>= 0.4'}
 
-  object.hasown@1.1.4:
-    resolution: {integrity: sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==}
-    engines: {node: '>= 0.4'}
-
   object.pick@1.3.0:
     resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
     engines: {node: '>=0.10.0'}
@@ -7311,8 +7160,8 @@ packages:
     engines: {node: '>=8'}
     deprecated: The package has been renamed to `open`
 
-  optionator@0.9.3:
-    resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
+  optionator@0.9.4:
+    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
     engines: {node: '>= 0.8.0'}
 
   ora@5.4.1:
@@ -7364,6 +7213,9 @@ packages:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
 
+  package-json-from-dist@1.0.1:
+    resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
+
   pako@0.2.9:
     resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==}
 
@@ -7380,8 +7232,9 @@ packages:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
 
-  parse-asn1@5.1.6:
-    resolution: {integrity: sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==}
+  parse-asn1@5.1.7:
+    resolution: {integrity: sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==}
+    engines: {node: '>= 0.10'}
 
   parse-bmfont-ascii@1.0.6:
     resolution: {integrity: sha512-U4RrVsUFCleIOBsIGYOMKjn9PavsGOXxbvYGtMOEfnId0SVNsgehXh1DxUdVPLoxd5mvcEtvmKs2Mmf0Mpa1ZA==}
@@ -7389,8 +7242,8 @@ packages:
   parse-bmfont-binary@1.0.6:
     resolution: {integrity: sha512-GxmsRea0wdGdYthjuUeWTMWPqm2+FAd4GI8vCvhgJsFnoGhTrLhXDDupwTo7rXVAgaLIGoVHDZS9p/5XbSqeWA==}
 
-  parse-bmfont-xml@1.1.4:
-    resolution: {integrity: sha512-bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ==}
+  parse-bmfont-xml@1.1.6:
+    resolution: {integrity: sha512-0cEliVMZEhrFDwMh4SxIyVJpqYoOWDJ9P895tFuS+XuNzI5UBmBk5U5O4KuJdTnZpSBI4LFA2+ZiJaiwfSwlMA==}
 
   parse-headers@2.0.5:
     resolution: {integrity: sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA==}
@@ -7461,12 +7314,12 @@ packages:
   path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
-  path-scurry@1.10.1:
-    resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==}
-    engines: {node: '>=16 || 14 >=14.17'}
+  path-scurry@1.11.1:
+    resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
+    engines: {node: '>=16 || 14 >=14.18'}
 
-  path-to-regexp@0.1.7:
-    resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==}
+  path-to-regexp@0.1.12:
+    resolution: {integrity: sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==}
 
   path-type@3.0.0:
     resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
@@ -7476,8 +7329,8 @@ packages:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
 
-  pathe@1.1.1:
-    resolution: {integrity: sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==}
+  pathe@1.1.2:
+    resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
 
   pathe@2.0.3:
     resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
@@ -7499,12 +7352,12 @@ packages:
   peek-stream@1.1.3:
     resolution: {integrity: sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==}
 
-  peerjs-js-binarypack@2.0.0:
-    resolution: {integrity: sha512-wu+L0Qeg4IH2DXm3B6xKP5ODeCIovwEEO/Fu3MVqApPQeVLzSdZpFzQzPobh+sdhUWMQGEO7YxHeiwpPngLjqQ==}
+  peerjs-js-binarypack@2.1.0:
+    resolution: {integrity: sha512-YIwCC+pTzp3Bi8jPI9UFKO0t0SLo6xALnHkiNt/iUFmUUZG0fEEmEyFKvjsDKweiFitzHRyhuh6NvyJZ4nNxMg==}
     engines: {node: '>= 14.0.0'}
 
-  peerjs@1.5.0:
-    resolution: {integrity: sha512-NLZ73jRNE4aLq2pmVTiSkWmwf6cvt9cH72qJHnzaLH+I2CtoWVvY42U9/O0/tYE6UYwRYJ1ktKRs2DdZ1Jrgcg==}
+  peerjs@1.5.4:
+    resolution: {integrity: sha512-yFsoLMnurJKlQbx6kVSBpOp+AlNldY1JQS2BrSsHLKCZnq6t7saHleuHM5svuLNbQkUJXHLF3sKOJB1K0xulOw==}
     engines: {node: '>= 14'}
 
   pend@1.2.0:
@@ -7517,6 +7370,10 @@ packages:
     resolution: {integrity: sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==}
     deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
 
+  phin@3.7.1:
+    resolution: {integrity: sha512-GEazpTWwTZaEQ9RhL7Nyz0WwqilbqgLahDM3D0hxWwmVDI52nXEybHqiN6/elwpkJBhcuj+WbBu+QfT0uhPGfQ==}
+    engines: {node: '>= 8'}
+
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
@@ -7568,8 +7425,8 @@ packages:
     resolution: {integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==}
     engines: {node: '>=10'}
 
-  pkg-types@1.0.3:
-    resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==}
+  pkg-types@1.3.1:
+    resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}
 
   pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
@@ -7579,29 +7436,25 @@ packages:
     resolution: {integrity: sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==}
     engines: {node: '>=4.0.0'}
 
-  polished@4.2.2:
-    resolution: {integrity: sha512-Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ==}
+  polished@4.3.1:
+    resolution: {integrity: sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==}
     engines: {node: '>=10'}
 
   poly-decomp@0.3.0:
     resolution: {integrity: sha512-hWeBxGzPYiybmI4548Fca7Up/0k1qS5+79cVHI9+H33dKya5YNb9hxl0ZnDaDgvrZSuYFBhkCK/HOnqN7gefkQ==}
 
-  portfinder@1.0.32:
-    resolution: {integrity: sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==}
+  portfinder@1.0.33:
+    resolution: {integrity: sha512-+2jndHT63cL5MdQOwDm9OT2dIe11zVpjV+0GGRXdtO1wpPxv260NfVqoEXtYAi/shanmm3W4+yLduIe55ektTw==}
     engines: {node: '>= 0.12.0'}
 
   posix-character-classes@0.1.1:
     resolution: {integrity: sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==}
     engines: {node: '>=0.10.0'}
 
-  possible-typed-array-names@1.0.0:
-    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
+  possible-typed-array-names@1.1.0:
+    resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}
     engines: {node: '>= 0.4'}
 
-  postcss@8.4.47:
-    resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==}
-    engines: {node: ^10 || ^12 || >=14}
-
   postcss@8.5.3:
     resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}
     engines: {node: ^10 || ^12 || >=14}
@@ -7609,8 +7462,8 @@ packages:
   potpack@1.0.2:
     resolution: {integrity: sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ==}
 
-  prebuild-install@7.1.1:
-    resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==}
+  prebuild-install@7.1.3:
+    resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -7644,8 +7497,8 @@ packages:
     resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
     engines: {node: '>= 0.8'}
 
-  prismarine-auth@2.4.2:
-    resolution: {integrity: sha512-Cq4woGobnFYYfMBDh1WITW+Vs98toN91qAFBvBitwV7IwJaiSAh2Nl+WPUEGeg5eLBoSPpSyCVT8P2oi7Cav8g==}
+  prismarine-auth@2.7.0:
+    resolution: {integrity: sha512-L8wTF6sdtnN6hViPNy+Nx39a8iQBwR5iO92AWCiym5cSXp/92pmnuwnTdcmNDWyqq6zY4hbibVGYhgLA1Ox8sQ==}
 
   prismarine-biome@1.3.0:
     resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==}
@@ -7657,23 +7510,20 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9}
     version: 1.21.0
 
-  prismarine-chat@1.10.1:
-    resolution: {integrity: sha512-XukYcuueuhDxzEXG7r8BZyt6jOObrPPB4JESCgb+/XenB9nExoSHF8eTQWWj8faKPLqm1dRQaYwFJlNBlJZJUw==}
+  prismarine-chat@1.11.0:
+    resolution: {integrity: sha512-VJT/MWYB3qoiznUhrgvSQh76YFpzpCZpY85kJKxHLbd3UVoM0wsfs43Eg8dOltiZG92wc5/DTMLlT07TEeoa9w==}
 
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374:
     resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374}
     version: 1.38.1
     engines: {node: '>=14'}
 
-  prismarine-entity@2.3.1:
-    resolution: {integrity: sha512-HOv8l7IetHNf4hwZ7V/W4vM3GNl+e6VCtKDkH9h02TRq7jWngsggKtJV+VanCce/sNwtJUhJDjORGs728ep4MA==}
+  prismarine-entity@2.5.0:
+    resolution: {integrity: sha512-nRPCawUwf9r3iKqi4I7mZRlir1Ix+DffWYdWq6p/KNnmiXve+xHE5zv8XCdhZlUmOshugHv5ONl9o6ORAkCNIA==}
 
   prismarine-item@1.16.0:
     resolution: {integrity: sha512-88Tz+/6HquYIsDuseae5G3IbqLeMews2L+ba2gX+p6K6soU9nuFhCfbwN56QuB7d/jZFcWrCYAPE5+UhwWh67w==}
 
-  prismarine-nbt@2.5.0:
-    resolution: {integrity: sha512-F0/8UAa9SDDnAGrBYqZc4nG8h2zj5cE2eAJU5xlDR/IsQQ3moVxkOjE3h3nMv6SbvZrvAcgX7waA/nd9LLHYdA==}
-
   prismarine-nbt@2.7.0:
     resolution: {integrity: sha512-Du9OLQAcCj3y29YtewOJbbV4ARaSUEJiTguw0PPQbPBy83f+eCyDRkyBpnXTi/KPyEpgYCzsjGzElevLpFoYGQ==}
 
@@ -7746,20 +7596,20 @@ packages:
   prop-types@15.8.1:
     resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
 
-  prosemirror-commands@1.5.2:
-    resolution: {integrity: sha512-hgLcPaakxH8tu6YvVAaILV2tXYsW3rAdDR8WNkeKGcgeMVQg3/TMhPdVoh7iAmfgVjZGtcOSjKiQaoeKjzd2mQ==}
+  prosemirror-commands@1.7.0:
+    resolution: {integrity: sha512-6toodS4R/Aah5pdsrIwnTYPEjW70SlO5a66oo5Kk+CIrgJz3ukOoS+FYDGqvQlAX5PxoGWDX1oD++tn5X3pyRA==}
 
   prosemirror-dropcursor@1.8.1:
     resolution: {integrity: sha512-M30WJdJZLyXHi3N8vxN6Zh5O8ZBbQCz0gURTfPmTIBNQ5pxrdU7A58QkNqfa98YEjSAL1HUyyU34f6Pm5xBSGw==}
 
-  prosemirror-example-setup@1.2.2:
-    resolution: {integrity: sha512-pHJc656IgYm249RNp0eQaWNmnyWGk6OrzysWfYI4+NwE14HQ7YNYOlRBLErUS6uCAHIYJLNXf0/XCmf1OCtNbQ==}
+  prosemirror-example-setup@1.2.3:
+    resolution: {integrity: sha512-+hXZi8+xbFvYM465zZH3rdZ9w7EguVKmUYwYLZjIJIjPK+I0nPTwn8j0ByW2avchVczRwZmOJGNvehblyIerSQ==}
 
   prosemirror-gapcursor@1.3.2:
     resolution: {integrity: sha512-wtjswVBd2vaQRrnYZaBCbyDqr232Ed4p2QPtRIUK5FuqHYKGWkEwl08oQM4Tw7DOR0FsasARV5uJFvMZWxdNxQ==}
 
-  prosemirror-history@1.3.2:
-    resolution: {integrity: sha512-/zm0XoU/N/+u7i5zepjmZAEnpvjDtzoPWW6VmKptcAnPadN/SStsBjMImdCEbb3seiNTpveziPTIrXQbHLtU1g==}
+  prosemirror-history@1.4.1:
+    resolution: {integrity: sha512-2JZD8z2JviJrboD9cPuX/Sv/1ChFng+xh2tChQ2X4bB2HeK+rra/bmJ3xGntCcjhOqIzSDG6Id7e8RJ9QPXLEQ==}
 
   prosemirror-inputrules@1.4.0:
     resolution: {integrity: sha512-6ygpPRuTJ2lcOXs9JkefieMst63wVJBgHZGl5QOytN7oSZs3Co/BYbc3Yx9zm9H37Bxw8kVzCnDsihsVsL4yEg==}
@@ -7767,29 +7617,29 @@ packages:
   prosemirror-keymap@1.2.2:
     resolution: {integrity: sha512-EAlXoksqC6Vbocqc0GtzCruZEzYgrn+iiGnNjsJsH4mrnIGex4qbLdWWNza3AW5W36ZRrlBID0eM6bdKH4OStQ==}
 
-  prosemirror-markdown@1.12.0:
-    resolution: {integrity: sha512-6F5HS8Z0HDYiS2VQDZzfZP6A0s/I0gbkJy8NCzzDMtcsz3qrfqyroMMeoSjAmOhDITyon11NbXSzztfKi+frSQ==}
+  prosemirror-markdown@1.13.1:
+    resolution: {integrity: sha512-Sl+oMfMtAjWtlcZoj/5L/Q39MpEnVZ840Xo330WJWUvgyhNmLBLN7MsHn07s53nG/KImevWHSE6fEj4q/GihHw==}
 
   prosemirror-menu@1.2.4:
     resolution: {integrity: sha512-S/bXlc0ODQup6aiBbWVsX/eM+xJgCTAfMq/nLqaO5ID/am4wS0tTCIkzwytmao7ypEtjj39i7YbJjAgO20mIqA==}
 
-  prosemirror-model@1.19.4:
-    resolution: {integrity: sha512-RPmVXxUfOhyFdayHawjuZCxiROsm9L4FCUA6pWI+l7n2yCBsWy9VpdE1hpDHUS8Vad661YLY9AzqfjLhAKQ4iQ==}
+  prosemirror-model@1.24.1:
+    resolution: {integrity: sha512-YM053N+vTThzlWJ/AtPtF1j0ebO36nvbmDy4U7qA2XQB8JVaQp1FmB9Jhrps8s+z+uxhhVTny4m20ptUvhk0Mg==}
 
-  prosemirror-schema-list@1.3.0:
-    resolution: {integrity: sha512-Hz/7gM4skaaYfRPNgr421CU4GSwotmEwBVvJh5ltGiffUJwm7C8GfN/Bc6DR1EKEp5pDKhODmdXXyi9uIsZl5A==}
+  prosemirror-schema-list@1.5.1:
+    resolution: {integrity: sha512-927lFx/uwyQaGwJxLWCZRkjXG0p48KpMj6ueoYiu4JX05GGuGcgzAy62dfiV8eFZftgyBUvLx76RsMe20fJl+Q==}
 
   prosemirror-state@1.4.3:
     resolution: {integrity: sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q==}
 
-  prosemirror-transform@1.8.0:
-    resolution: {integrity: sha512-BaSBsIMv52F1BVVMvOmp1yzD3u65uC3HTzCBQV1WDPqJRQ2LuHKcyfn0jwqodo8sR9vVzMzZyI+Dal5W9E6a9A==}
+  prosemirror-transform@1.10.3:
+    resolution: {integrity: sha512-Nhh/+1kZGRINbEHmVu39oynhcap4hWTs/BlU7NnxWj3+l0qi8I1mu67v6mMdEe/ltD8hHvU4FV6PHiCw2VSpMw==}
 
-  prosemirror-view@1.33.1:
-    resolution: {integrity: sha512-62qkYgSJIkwIMMCpuGuPzc52DiK1Iod6TWoIMxP4ja6BTD4yO8kCUL64PZ/WhH/dJ9fW0CDO39FhH1EMyhUFEg==}
+  prosemirror-view@1.38.1:
+    resolution: {integrity: sha512-4FH/uM1A4PNyrxXbD+RAbAsf0d/mM0D/wAKSVVWK7o0A9Q/oOXJBrw786mBf2Vnrs/Edly6dH6Z2gsb7zWwaUw==}
 
-  protodef-validator@1.3.1:
-    resolution: {integrity: sha512-lZ5FWKZYR9xOjpMw1+EfZRfCjzNRQWPq+Dk+jki47Sikl2EeWEPnTfnJERwnU/EwFq6us+0zqHHzSsmLeYX+Lg==}
+  protodef-validator@1.4.0:
+    resolution: {integrity: sha512-2y2coBolqCEuk5Kc3QwO7ThR+/7TZiOit4FrpAgl+vFMvq8w76nDhh09z08e2NQOdrgPLsN2yzXsvRvtADgUZQ==}
     hasBin: true
 
   protodef@1.18.0:
@@ -7803,6 +7653,9 @@ packages:
   proxy-compare@2.5.1:
     resolution: {integrity: sha512-oyfc0Tx87Cpwva5ZXezSp5V9vht1c7dZBhvuV/y3ctkgMVUmiAGDVeeB0dKhGSyT0v1ZTEQYpe/RXlBVBNuCLA==}
 
+  proxy-compare@2.6.0:
+    resolution: {integrity: sha512-8xuCeM3l8yqdmbPoYeLbrAXCBWu19XEYc5/F28f5qOaoAIMyfmBUkl5axiK+x9olUvRlcekvnm98AP9RDngOIw==}
+
   proxy-from-env@1.0.0:
     resolution: {integrity: sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==}
 
@@ -7813,8 +7666,8 @@ packages:
     resolution: {integrity: sha512-EGCG8SeoIRVMhsqHQUdDigB2i7qU7fCsWASwn54+nPutYO8n4q6EiwMzyfWlC+dzRFExP+kvcnDFdBDHoZBU7Q==}
     engines: {node: '>=0.8.0'}
 
-  psl@1.9.0:
-    resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
+  psl@1.15.0:
+    resolution: {integrity: sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==}
 
   public-encrypt@4.0.3:
     resolution: {integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==}
@@ -7822,8 +7675,8 @@ packages:
   pump@2.0.1:
     resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==}
 
-  pump@3.0.0:
-    resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
+  pump@3.0.2:
+    resolution: {integrity: sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==}
 
   pumpify@1.5.1:
     resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==}
@@ -7843,8 +7696,8 @@ packages:
     resolution: {integrity: sha512-n13AWriBMPYxnpbb6bnaY5YoY6rGj8vPLrz6CZF3o0qJNEwlcfJVxBzYZ0NJsQ21UbdJoijPCDrM++SUVEz7+w==}
     engines: {node: '>=8.16.0'}
 
-  qrcode.react@3.1.0:
-    resolution: {integrity: sha512-oyF+Urr3oAMUG/OiOuONL3HXM+53wvuH3mtIWQrYmsXoAq0DkvZp2RYUWFSMFtbdOpuS++9v+WAkzNVkMlNW6Q==}
+  qrcode.react@3.2.0:
+    resolution: {integrity: sha512-YietHHltOHA4+l5na1srdaMx4sVSOjV9tamHs+mwiLWAMr6QVACRUw1Neax5CptFILcNoITctJY0Ipyn5enQ8g==}
     peerDependencies:
       react: ^18.2.0
 
@@ -7852,12 +7705,12 @@ packages:
     resolution: {integrity: sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==}
     engines: {node: '>=0.6'}
 
-  qs@6.11.0:
-    resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
+  qs@6.13.0:
+    resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
     engines: {node: '>=0.6'}
 
-  qs@6.11.2:
-    resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==}
+  qs@6.14.0:
+    resolution: {integrity: sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==}
     engines: {node: '>=0.6'}
 
   querystring-es3@0.2.1:
@@ -7883,8 +7736,8 @@ packages:
   rambda@6.9.0:
     resolution: {integrity: sha512-yosVdGg1hNGkXPzqGiOYNEpXKjEOxzUCg2rB0l+NKdyCaSf4z+i5ojbN0IqDSezMMf71YEglI+ZUTgTffn5afw==}
 
-  rambda@9.2.0:
-    resolution: {integrity: sha512-RjM8TBNPR+iSvWLqbBpFveDfEf2RPRKHuwBHjQdXsYFDwn3MIvgmJiqVVC1CIQKnOwzeDQd44zqDFgSKQ7RT1Q==}
+  rambda@9.4.2:
+    resolution: {integrity: sha512-++euMfxnl7OgaEKwXh9QqThOjMeta2HH001N1v4mYQzBjJBnmXBh2BCK6dZAbICFVXOFUVD3xFG0R3ZPU0mxXw==}
 
   ramda@0.29.0:
     resolution: {integrity: sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==}
@@ -7912,10 +7765,6 @@ packages:
     engines: {node: '>=0.8'}
     deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
 
-  raw-body@2.5.1:
-    resolution: {integrity: sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==}
-    engines: {node: '>= 0.8'}
-
   raw-body@2.5.2:
     resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==}
     engines: {node: '>= 0.8'}
@@ -7938,13 +7787,12 @@ packages:
     peerDependencies:
       typescript: '>= 4.3.x'
 
-  react-docgen@6.0.0-alpha.3:
-    resolution: {integrity: sha512-DDLvB5EV9As1/zoUsct6Iz2Cupw9FObEGD3DMcIs3EDFIoSKyz8FZtoWj3Wj+oodrU4/NfidN0BL5yrapIcTSA==}
-    engines: {node: '>=12.0.0'}
-    hasBin: true
+  react-docgen@7.1.1:
+    resolution: {integrity: sha512-hlSJDQ2synMPKFZOsKo9Hi8WWZTC7POR8EmWvTSjow+VDgKzkmjQvFm2fk0tmRw+f0vTOIYKlarR0iL4996pdg==}
+    engines: {node: '>=16.14.0'}
 
-  react-dom@18.2.0:
-    resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
+  react-dom@18.3.1:
+    resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
     peerDependencies:
       react: ^18.2.0
 
@@ -7957,14 +7805,9 @@ packages:
   react-fast-compare@3.2.2:
     resolution: {integrity: sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==}
 
-  react-hook-form@7.52.0:
-    resolution: {integrity: sha512-mJX506Xc6mirzLsmXUJyqlAI3Kj9Ph2RhplYhUVffeOQSnubK2uVqBFOBJmvKikvbFV91pxVXmDiR+QMF19x6A==}
-    engines: {node: '>=12.22.0'}
-    peerDependencies:
-      react: ^18.2.0
-
-  react-inspector@6.0.2:
-    resolution: {integrity: sha512-x+b7LxhmHXjHoU/VrFAzw5iutsILRoYyDq97EDYdFpPLcvqtEzk4ZSZSQjnFPbr5T57tLXnHcqFYoN1pI6u8uQ==}
+  react-hook-form@7.54.2:
+    resolution: {integrity: sha512-eHpAUgUjWbZocoQYUHposymRb4ZP6d0uwUnooL2uOybA9/3tPUvoAKqEWK1WaSiTxxOfTpffNZP7QwlnM3/gEg==}
+    engines: {node: '>=18.0.0'}
     peerDependencies:
       react: ^18.2.0
 
@@ -7974,8 +7817,8 @@ packages:
   react-is@18.1.0:
     resolution: {integrity: sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==}
 
-  react-is@18.2.0:
-    resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
+  react-is@18.3.1:
+    resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
 
   react-popper@2.3.0:
     resolution: {integrity: sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==}
@@ -7994,11 +7837,11 @@ packages:
     resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==}
     engines: {node: '>=0.10.0'}
 
-  react-remove-scroll-bar@2.3.4:
-    resolution: {integrity: sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==}
+  react-remove-scroll-bar@2.3.8:
+    resolution: {integrity: sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==}
     engines: {node: '>=10'}
     peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      '@types/react': '*'
       react: ^18.2.0
     peerDependenciesMeta:
       '@types/react':
@@ -8014,17 +7857,17 @@ packages:
       '@types/react':
         optional: true
 
-  react-select@5.8.0:
-    resolution: {integrity: sha512-TfjLDo58XrhP6VG5M/Mi56Us0Yt8X7xD6cDybC7yoRMUNm7BGO7qk8J0TLQOua/prb8vUOtsfnXZwfm30HGsAA==}
+  react-select@5.10.1:
+    resolution: {integrity: sha512-roPEZUL4aRZDx6DcsD+ZNreVl+fM8VsKn0Wtex1v4IazH60ILp5xhdlp464IsEAlJdXeD+BhDAFsBVMfvLQueA==}
     peerDependencies:
       react: ^18.2.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  react-style-singleton@2.2.1:
-    resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==}
+  react-style-singleton@2.2.3:
+    resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==}
     engines: {node: '>=10'}
     peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      '@types/react': '*'
       react: ^18.2.0
     peerDependenciesMeta:
       '@types/react':
@@ -8061,8 +7904,8 @@ packages:
       react: ^18.2.0
       react-dom: '*'
 
-  react@18.2.0:
-    resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
+  react@18.3.1:
+    resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
     engines: {node: '>=0.10.0'}
 
   read-pkg-up@7.0.1:
@@ -8095,8 +7938,8 @@ packages:
     resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
     engines: {node: '>= 6'}
 
-  readable-stream@4.5.2:
-    resolution: {integrity: sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==}
+  readable-stream@4.7.0:
+    resolution: {integrity: sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
   readdirp@2.2.1:
@@ -8110,27 +7953,23 @@ packages:
   readline@1.3.0:
     resolution: {integrity: sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==}
 
-  recast@0.21.5:
-    resolution: {integrity: sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==}
-    engines: {node: '>= 4'}
-
-  recast@0.23.4:
-    resolution: {integrity: sha512-qtEDqIZGVcSZCHniWwZWbRy79Dc6Wp3kT/UmDA2RJKBPg7+7k51aQBZirHmUGn5uvHf2rg8DkjizrN26k61ATw==}
+  recast@0.23.11:
+    resolution: {integrity: sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==}
     engines: {node: '>= 4'}
 
   redent@4.0.0:
     resolution: {integrity: sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==}
     engines: {node: '>=12'}
 
-  reduce-configs@1.0.0:
-    resolution: {integrity: sha512-/JCYSgL/QeXXsq0Lv/7kOZfqvof7vyzHWfyNQPt3c6vc73mU4WRyT8RJ6ZH5Ci08vUOqXwk7jkZy6BycHTDD9w==}
+  reduce-configs@1.1.0:
+    resolution: {integrity: sha512-DQxy6liNadHfrLahZR7lMdc227NYVaQZhY5FMsxLEjX8X0SCuH+ESHSLCoz2yDZFq1/CLMDOAHdsEHwOEXKtvg==}
 
   reflect.getprototypeof@1.0.10:
     resolution: {integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==}
     engines: {node: '>= 0.4'}
 
-  regenerate-unicode-properties@10.1.0:
-    resolution: {integrity: sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==}
+  regenerate-unicode-properties@10.2.0:
+    resolution: {integrity: sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==}
     engines: {node: '>=4'}
 
   regenerate@1.4.2:
@@ -8139,8 +7978,8 @@ packages:
   regenerator-runtime@0.13.11:
     resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
 
-  regenerator-runtime@0.14.0:
-    resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==}
+  regenerator-runtime@0.14.1:
+    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
 
   regenerator-transform@0.15.2:
     resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==}
@@ -8161,16 +8000,19 @@ packages:
     resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
     engines: {node: '>=8'}
 
-  regexpu-core@5.3.2:
-    resolution: {integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==}
+  regexpu-core@6.2.0:
+    resolution: {integrity: sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==}
     engines: {node: '>=4'}
 
+  regjsgen@0.8.0:
+    resolution: {integrity: sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==}
+
   regjsparser@0.10.0:
     resolution: {integrity: sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==}
     hasBin: true
 
-  regjsparser@0.9.1:
-    resolution: {integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==}
+  regjsparser@0.12.0:
+    resolution: {integrity: sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==}
     hasBin: true
 
   remark-external-links@8.0.0:
@@ -8231,8 +8073,9 @@ packages:
     resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
     deprecated: https://github.com/lydell/resolve-url#deprecated
 
-  resolve@1.22.4:
-    resolution: {integrity: sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==}
+  resolve@1.22.10:
+    resolution: {integrity: sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==}
+    engines: {node: '>= 0.4'}
     hasBin: true
 
   resolve@2.0.0-next.5:
@@ -8251,12 +8094,12 @@ packages:
     resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
     engines: {node: '>= 4'}
 
-  reusify@1.0.4:
-    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
+  reusify@1.1.0:
+    resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
-  rfdc@1.3.0:
-    resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
+  rfdc@1.4.1:
+    resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
 
   rimraf@2.6.3:
     resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==}
@@ -8273,32 +8116,25 @@ packages:
     deprecated: Rimraf versions prior to v4 are no longer supported
     hasBin: true
 
-  rimraf@5.0.1:
-    resolution: {integrity: sha512-OfFZdwtd3lZ+XZzYP/6gTACubwFcHdLRqS9UX3UwpU2dnGQYkPFISRwvM3w9IiB2w7bW5qGo/uAwE4SmXXSKvg==}
-    engines: {node: '>=14'}
+  rimraf@5.0.10:
+    resolution: {integrity: sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==}
     hasBin: true
 
   ripemd160@2.0.2:
     resolution: {integrity: sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==}
 
-  rollup-plugin-terser@7.0.2:
-    resolution: {integrity: sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==}
-    deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser
-    peerDependencies:
-      rollup: ^2.0.0
-
-  rollup@2.79.1:
-    resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==}
+  rollup@2.79.2:
+    resolution: {integrity: sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==}
     engines: {node: '>=10.0.0'}
     hasBin: true
 
-  rollup@3.29.4:
-    resolution: {integrity: sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==}
+  rollup@3.29.5:
+    resolution: {integrity: sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
 
-  rollup@4.34.8:
-    resolution: {integrity: sha512-489gTVMzAYdiZHFVA/ig/iYFllCcWFHMvUHI1rpFmkoUtRlQxqh6/yiNqnYibjMZ2b/+FUQwldG+aLsEt6bglQ==}
+  rollup@4.34.9:
+    resolution: {integrity: sha512-nF5XYqWWp9hx/LrpC8sZvvvmq0TeTjQgaZHYmAgwysT9nh8sWnZhBnM8ZyVbbJFIQBLwHDNoMqsBZBbUo4U8sQ==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -8311,8 +8147,8 @@ packages:
   run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
 
-  rxjs@7.8.1:
-    resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
+  rxjs@7.8.2:
+    resolution: {integrity: sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==}
 
   safe-array-concat@1.1.3:
     resolution: {integrity: sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==}
@@ -8344,16 +8180,20 @@ packages:
   sat@0.9.0:
     resolution: {integrity: sha512-mxdv5RZJO4tdMnUURGU3gAMcnDUEwcNJwE+lPO0/V+rBeDvFLH3wEZEOR0fH7cTN0zQaNxBEbHnyQL9DzupwQQ==}
 
-  sax@1.3.0:
-    resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==}
+  sax@1.4.1:
+    resolution: {integrity: sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==}
 
-  scheduler@0.23.0:
-    resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==}
+  scheduler@0.23.2:
+    resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}
 
   schema-utils@3.3.0:
     resolution: {integrity: sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==}
     engines: {node: '>= 10.13.0'}
 
+  schema-utils@4.3.0:
+    resolution: {integrity: sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==}
+    engines: {node: '>= 10.13.0'}
+
   screenfull@5.2.0:
     resolution: {integrity: sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==}
     engines: {node: '>=0.10.0'}
@@ -8372,18 +8212,13 @@ packages:
     resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
     hasBin: true
 
-  semver@7.6.0:
-    resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==}
-    engines: {node: '>=10'}
-    hasBin: true
-
   semver@7.7.1:
     resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==}
     engines: {node: '>=10'}
     hasBin: true
 
-  send@0.18.0:
-    resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
+  send@0.19.0:
+    resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==}
     engines: {node: '>= 0.8.0'}
 
   send@1.2.0:
@@ -8393,9 +8228,6 @@ packages:
   sentence-case@3.0.4:
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
 
-  serialize-javascript@4.0.0:
-    resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==}
-
   serialize-javascript@6.0.2:
     resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==}
 
@@ -8403,8 +8235,8 @@ packages:
     resolution: {integrity: sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==}
     engines: {node: '>= 0.8.0'}
 
-  serve-static@1.15.0:
-    resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==}
+  serve-static@1.16.2:
+    resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==}
     engines: {node: '>= 0.8.0'}
 
   set-blocking@2.0.0:
@@ -8471,8 +8303,9 @@ packages:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
-  shell-quote@1.8.1:
-    resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
+  shell-quote@1.8.2:
+    resolution: {integrity: sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==}
+    engines: {node: '>= 0.4'}
 
   side-channel-list@1.0.0:
     resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
@@ -8512,18 +8345,14 @@ packages:
   simple-swizzle@0.2.2:
     resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
 
-  simple-update-notifier@2.0.0:
-    resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==}
-    engines: {node: '>=10'}
-
   sisteransi@1.0.5:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
 
   skinview-utils@0.7.1:
     resolution: {integrity: sha512-4eLrMqR526ehlZbsd8SuZ/CHpS9GiH0xUMoV+PYlJVi95ZFz5HJu7Spt5XYa72DRS7wgt5qquvHZf0XZJgmu9Q==}
 
-  skinview3d@3.0.1:
-    resolution: {integrity: sha512-2LUSkzGxlZrTQelGT10jcW4TLiFTg5aZqXMEuqAFoWtk3qtaNu0qRFtwK5dN8zEXyKUJ3xlxah5eGtKY/NifQg==}
+  skinview3d@3.1.0:
+    resolution: {integrity: sha512-L+HXXAP4qYjLcY3YHasXKie9KXQpv/mPTMxgLOEd+hVQRdQkPs5xdWaKuOmlZY8UnyZzecQM7yrWRzgT/e7HZw==}
 
   slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
@@ -8541,6 +8370,9 @@ packages:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
 
+  smob@1.5.0:
+    resolution: {integrity: sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==}
+
   snake-case@3.0.4:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
 
@@ -8559,18 +8391,18 @@ packages:
   socket.io-adapter@1.1.2:
     resolution: {integrity: sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==}
 
-  socket.io-adapter@2.5.2:
-    resolution: {integrity: sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==}
+  socket.io-adapter@2.5.5:
+    resolution: {integrity: sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==}
 
   socket.io-client@2.5.0:
     resolution: {integrity: sha512-lOO9clmdgssDykiOmVQQitwBAF3I6mYcQAo7hQ7AM6Ny5X7fp8hIJ3HcQs3Rjz4SoggoxA1OgrQyY8EgTbcPYw==}
 
-  socket.io-client@4.7.2:
-    resolution: {integrity: sha512-vtA0uD4ibrYD793SOIAwlo8cj6haOeMHrGvwPxJsxH7CeIksqJ+3Zc06RvWTIFgiSqx4A3sOnTXpfAEE2Zyz6w==}
+  socket.io-client@4.8.1:
+    resolution: {integrity: sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==}
     engines: {node: '>=10.0.0'}
 
-  socket.io-parser@3.3.3:
-    resolution: {integrity: sha512-qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==}
+  socket.io-parser@3.3.4:
+    resolution: {integrity: sha512-z/pFQB3x+EZldRRzORYW1vwVO8m/3ILkswtnpoeU6Ve3cbMWkmHEWDAVJn4QJtchiiFTo5j7UG2QvwxvaA9vow==}
 
   socket.io-parser@3.4.3:
     resolution: {integrity: sha512-1rE4dZN3kCI/E5wixd393hmbqa78vVpkKmnEJhLeWoS/C5hbFYAbcSfnWoaVH43u9ToUVtzKjguxEZq+1XZfCQ==}
@@ -8580,20 +8412,20 @@ packages:
     resolution: {integrity: sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==}
     engines: {node: '>=10.0.0'}
 
-  socket.io@2.5.0:
-    resolution: {integrity: sha512-gGunfS0od3VpwDBpGwVkzSZx6Aqo9uOcf1afJj2cKnKFAoyl16fvhpsUhmUFd4Ldbvl5JvRQed6eQw6oQp6n8w==}
+  socket.io@2.5.1:
+    resolution: {integrity: sha512-eaTE4tBKRD6RFoetquMbxgvcpvoDtRyIlkIMI/SMK2bsKvbENTsDeeu4GJ/z9c90yOWxB7b/eC+yKLPbHnH6bA==}
 
-  socket.io@4.7.2:
-    resolution: {integrity: sha512-bvKVS29/I5fl2FGLNHuXlQaUH/BlzX1IN6S+NKLNZpBsPZIDH+90eQmCs2Railn4YUiww4SzUedJ6+uzwFnKLw==}
+  socket.io@4.8.1:
+    resolution: {integrity: sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==}
     engines: {node: '>=10.2.0'}
 
   socks-proxy-agent@7.0.0:
     resolution: {integrity: sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==}
     engines: {node: '>= 10'}
 
-  socks@2.7.1:
-    resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==}
-    engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
+  socks@2.8.4:
+    resolution: {integrity: sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==}
+    engines: {node: '>= 10.0.0', npm: '>= 3.0.0'}
 
   source-map-js@1.2.1:
     resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
@@ -8636,14 +8468,14 @@ packages:
   spdx-correct@3.2.0:
     resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==}
 
-  spdx-exceptions@2.3.0:
-    resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==}
+  spdx-exceptions@2.5.0:
+    resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==}
 
   spdx-expression-parse@3.0.1:
     resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
 
-  spdx-license-ids@3.0.13:
-    resolution: {integrity: sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==}
+  spdx-license-ids@3.0.21:
+    resolution: {integrity: sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==}
 
   split-string@3.1.0:
     resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
@@ -8655,8 +8487,11 @@ packages:
   sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
-  sshpk@1.17.0:
-    resolution: {integrity: sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==}
+  sprintf-js@1.1.3:
+    resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
+
+  sshpk@1.18.0:
+    resolution: {integrity: sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==}
     engines: {node: '>=0.10.0'}
     hasBin: true
 
@@ -8683,8 +8518,8 @@ packages:
     resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
     engines: {node: '>=0.10.0'}
 
-  stats-gl@1.0.5:
-    resolution: {integrity: sha512-XimMxvwnf1Qf5KwebhcoA34kcX+fWEkIl0QjNkCbu4IpoyDMMsOajExn7FIq5w569k45+LhmsuRlGSrsvmGdNw==}
+  stats-gl@1.0.7:
+    resolution: {integrity: sha512-vZI82CjefSxLC1bjw36z28v0+QE9rJKymGlXtfWu+ipW70ZEAwa4EbO4LxluAfLfpqiaAS04NzpYBRLDeAwYWQ==}
 
   stats.js@0.17.0:
     resolution: {integrity: sha512-hNKz8phvYLPEcRkeG1rsGmV5ChMjKDAWU7/OJJdDErPBNChQXxCo3WZurGpnWc6gZhAzEPFad1aVgyOANH1sMw==}
@@ -8697,17 +8532,14 @@ packages:
     resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
     engines: {node: '>= 0.8'}
 
-  std-env@3.4.3:
-    resolution: {integrity: sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==}
+  std-env@3.8.1:
+    resolution: {integrity: sha512-vj5lIj3Mwf9D79hBkltk5qmkFI+biIKWS2IBxEyEU3AX1tUf7AoL8nSazCOiiqQsGKIq01SClsKEzweu34uwvA==}
 
-  std-env@3.8.0:
-    resolution: {integrity: sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==}
+  store2@2.14.4:
+    resolution: {integrity: sha512-srTItn1GOvyvOycgxjAnPA63FZNwy0PTyUBFMHRM+hVFltAeoh0LmNBz9SZqUS9mMqGk8rfyWyXn3GH5ReJ8Zw==}
 
-  store2@2.14.2:
-    resolution: {integrity: sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w==}
-
-  storybook@7.4.6:
-    resolution: {integrity: sha512-YkFSpnR47j5zz7yElA+2axLjXN7K7TxDGJRHHlqXmG5iQ0PXzmjrj2RxMDKFz4Ybp/QjEUoJ4rx//ESEY0Nb5A==}
+  storybook@7.6.20:
+    resolution: {integrity: sha512-Wt04pPTO71pwmRmsgkyZhNo4Bvdb/1pBAMsIFb9nQLykEdzzpXjvingxFFvdOG4nIowzwgxD+CLlyRqVJqnATw==}
     hasBin: true
 
   stream-browserify@3.0.0:
@@ -8719,8 +8551,8 @@ packages:
   stream-http@3.2.0:
     resolution: {integrity: sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==}
 
-  stream-shift@1.0.1:
-    resolution: {integrity: sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==}
+  stream-shift@1.0.3:
+    resolution: {integrity: sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==}
 
   strict-event-emitter-types@2.0.0:
     resolution: {integrity: sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA==}
@@ -8737,10 +8569,13 @@ packages:
     resolution: {integrity: sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==}
     engines: {node: '>= 0.4'}
 
-  string.prototype.padend@3.1.4:
-    resolution: {integrity: sha512-67otBXoksdjsnXXRUq+KMVTdlVRZ2af422Y0aTyTjVaoQkGr3mxl2Bc5emi7dOQ3OGVVQQskmLEWwFXwommpNw==}
+  string.prototype.padend@3.1.6:
+    resolution: {integrity: sha512-XZpspuSB7vJWhvJc9DLSlrXl1mcA2BdoY5jjnS135ydXqLoqhs96JjDtCkjJEQHvfqZIp9hBuBMgI589peyx9Q==}
     engines: {node: '>= 0.4'}
 
+  string.prototype.repeat@1.0.0:
+    resolution: {integrity: sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==}
+
   string.prototype.trim@1.2.10:
     resolution: {integrity: sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==}
     engines: {node: '>= 0.4'}
@@ -8808,6 +8643,9 @@ packages:
   stylis@4.2.0:
     resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==}
 
+  stylis@4.3.6:
+    resolution: {integrity: sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==}
+
   supports-color@5.5.0:
     resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
     engines: {node: '>=4'}
@@ -8827,8 +8665,8 @@ packages:
   synchronous-promise@2.0.17:
     resolution: {integrity: sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g==}
 
-  systeminformation@5.22.7:
-    resolution: {integrity: sha512-AWxlP05KeHbpGdgvZkcudJpsmChc2Y5Eo/GvxG/iUA/Aws5LZKHAMSeAo+V+nD+nxWZaxrwpWcnx4SH3oxNL3A==}
+  systeminformation@5.25.11:
+    resolution: {integrity: sha512-jI01fn/t47rrLTQB0FTlMCC+5dYx8o0RRF+R4BPiUNsvg5OdY0s9DKMFmJGrx5SwMZQ4cag0Gl6v8oycso9b/g==}
     engines: {node: '>=8.0.0'}
     os: [darwin, linux, win32, freebsd, openbsd, netbsd, sunos, android]
     hasBin: true
@@ -8840,15 +8678,15 @@ packages:
     resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
     engines: {node: '>=6'}
 
-  tar-fs@2.1.1:
-    resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}
+  tar-fs@2.1.2:
+    resolution: {integrity: sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==}
 
   tar-stream@2.2.0:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
     engines: {node: '>=6'}
 
-  tar@6.2.0:
-    resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==}
+  tar@6.2.1:
+    resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
     engines: {node: '>=10'}
 
   telejson@7.2.0:
@@ -8870,8 +8708,8 @@ packages:
     resolution: {integrity: sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==}
     engines: {node: '>=10'}
 
-  terser-webpack-plugin@5.3.10:
-    resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==}
+  terser-webpack-plugin@5.3.14:
+    resolution: {integrity: sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
       '@swc/core': '*'
@@ -8886,8 +8724,8 @@ packages:
       uglify-js:
         optional: true
 
-  terser@5.31.3:
-    resolution: {integrity: sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==}
+  terser@5.39.0:
+    resolution: {integrity: sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -8905,8 +8743,8 @@ packages:
   thenify@3.3.1:
     resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
 
-  three-stdlib@2.28.5:
-    resolution: {integrity: sha512-JdLMhkpT+1ZWeQPyKQNW1zqUwISI2hsUljS6u3vB9lp5EvwsayaAzGnbVeR35895udOF+zxcTiQY3psk+qqlxg==}
+  three-stdlib@2.35.14:
+    resolution: {integrity: sha512-kpCaEg59M9usFTgHC+YZNKvx7nMoLI2zQxZBV8pjoNW6vNZmGyXpaLBL09A2oLCsS3KepgMFkOuk6lRoebTNvA==}
     peerDependencies:
       three: 0.154.0
 
@@ -8920,8 +8758,8 @@ packages:
     resolution: {integrity: sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==}
     engines: {node: '>=10'}
 
-  throttleit@1.0.0:
-    resolution: {integrity: sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==}
+  throttleit@1.0.1:
+    resolution: {integrity: sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==}
 
   through2@0.6.5:
     resolution: {integrity: sha512-RkK/CCESdTKQZHdmKICijdKKsCRVHs5KsLZ6pACAmF/1GPUQhonHSXWNERctxEp7RmvjdNbZTL5z9V7nSCXKcg==}
@@ -8939,11 +8777,8 @@ packages:
   timm@1.7.1:
     resolution: {integrity: sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw==}
 
-  tiny-invariant@1.3.1:
-    resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
-
-  tinybench@2.5.1:
-    resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==}
+  tiny-invariant@1.3.3:
+    resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
 
   tinybench@2.9.0:
     resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
@@ -8966,8 +8801,8 @@ packages:
     resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
     engines: {node: '>=14.0.0'}
 
-  tinyspy@2.2.0:
-    resolution: {integrity: sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==}
+  tinyspy@2.2.1:
+    resolution: {integrity: sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==}
     engines: {node: '>=14.0.0'}
 
   tinyspy@3.0.2:
@@ -8977,9 +8812,9 @@ packages:
   title-case@3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
 
-  tmp@0.2.1:
-    resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==}
-    engines: {node: '>=8.17.0'}
+  tmp@0.2.3:
+    resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==}
+    engines: {node: '>=14.14'}
 
   tmpl@1.0.5:
     resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
@@ -8987,10 +8822,6 @@ packages:
   to-array@0.1.4:
     resolution: {integrity: sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==}
 
-  to-fast-properties@2.0.0:
-    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
-    engines: {node: '>=4'}
-
   to-object-path@0.3.0:
     resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
     engines: {node: '>=0.10.0'}
@@ -9007,8 +8838,8 @@ packages:
     resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
     engines: {node: '>=0.10.0'}
 
-  tocbot@4.21.2:
-    resolution: {integrity: sha512-R5Muhi/TUu4i4snWVrMgNoXyJm2f8sJfdgIkQvqb+cuIXQEIMAiWGWgCgYXHqX4+XiS/Bnm7IYZ9Zy6NVe6lhw==}
+  tocbot@4.35.0:
+    resolution: {integrity: sha512-i8FoSaP3u60D94e/dtzCk23PIEBnc/l8XqvlK4g8gUCa9XFY4RmyMLYP6X+yN+ljcEijFbmCtNHtBoeTsQkCPg==}
 
   toggle-selection@1.0.6:
     resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==}
@@ -9017,8 +8848,8 @@ packages:
     resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
     engines: {node: '>=0.6'}
 
-  tough-cookie@4.1.3:
-    resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==}
+  tough-cookie@4.1.4:
+    resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==}
     engines: {node: '>=6'}
 
   tr46@0.0.3:
@@ -9037,12 +8868,18 @@ packages:
   truncate-utf8-bytes@1.0.2:
     resolution: {integrity: sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==}
 
-  ts-api-utils@1.3.0:
-    resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==}
+  ts-api-utils@1.4.3:
+    resolution: {integrity: sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==}
     engines: {node: '>=16'}
     peerDependencies:
       typescript: '>=4.2.0'
 
+  ts-api-utils@2.0.1:
+    resolution: {integrity: sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==}
+    engines: {node: '>=18.12'}
+    peerDependencies:
+      typescript: '>=4.8.4'
+
   ts-dedent@2.2.0:
     resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
     engines: {node: '>=6.10'}
@@ -9050,17 +8887,17 @@ packages:
   ts-easing@0.2.0:
     resolution: {integrity: sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==}
 
-  tsconfig-paths@3.14.2:
-    resolution: {integrity: sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==}
+  tsconfig-paths@3.15.0:
+    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
 
   tslib@1.14.1:
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
 
-  tslib@2.6.2:
-    resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
+  tslib@2.8.1:
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
-  tsx@4.7.0:
-    resolution: {integrity: sha512-I+t79RYPlEYlHn9a+KzwrvEwhJg35h/1zHsLC2JXvhC2mdynMv6Zxzvhv5EMV6VF5qJlLlkSnMVvdZV3PSIGcg==}
+  tsx@4.19.3:
+    resolution: {integrity: sha512-4H8vUNGNjQ4V2EOoGw005+c+dGuPSnhpPBPHBtsZdGZBk/iJb4kguGlPWaZTZ3q5nMtFOEsY0nRDlh9PJyd6SQ==}
     engines: {node: '>=18.0.0'}
     hasBin: true
 
@@ -9077,8 +8914,8 @@ packages:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
 
-  type-detect@4.0.8:
-    resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
+  type-detect@4.1.0:
+    resolution: {integrity: sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==}
     engines: {node: '>=4'}
 
   type-fest@0.16.0:
@@ -9143,17 +8980,18 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  ua-parser-js@1.0.37:
-    resolution: {integrity: sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==}
+  ua-parser-js@1.0.40:
+    resolution: {integrity: sha512-z6PJ8Lml+v3ichVojCiB8toQJBuwR42ySM4ezjXIqXK3M0HczmKQ3LF4rhU55PfD99KEEXQG6yb7iOMyvYuHew==}
+    hasBin: true
 
   uc.micro@2.1.0:
     resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==}
 
-  ufo@1.3.1:
-    resolution: {integrity: sha512-uY/99gMLIOlJPwATcMVYfqDSxUR9//AUcgZMzwfSTJPDKzA1S8mX4VLqa+fiAtveraQUBCz4FFcwVZBGbwBXIw==}
+  ufo@1.5.4:
+    resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==}
 
-  uglify-js@3.17.4:
-    resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==}
+  uglify-js@3.19.3:
+    resolution: {integrity: sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==}
     engines: {node: '>=0.8.0'}
     hasBin: true
 
@@ -9164,23 +9002,26 @@ packages:
     resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}
     engines: {node: '>= 0.4'}
 
-  undici-types@6.19.8:
-    resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
+  undici-types@5.26.5:
+    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
 
-  undici@5.25.4:
-    resolution: {integrity: sha512-450yJxT29qKMf3aoudzFpIciqpx6Pji3hEWaXqXmanbXF58LTAGCKxcJjxMXWu3iG+Mudgo3ZUfDB6YDFd/dAw==}
-    engines: {node: '>=14.0'}
+  undici-types@6.20.0:
+    resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==}
 
-  unicode-canonical-property-names-ecmascript@2.0.0:
-    resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
+  undici@6.0.1:
+    resolution: {integrity: sha512-eZFYQLeS9BiXpsU0cuFhCwfeda2MnC48EVmmOz/eCjsTgmyTdaHdVsPSC/kwC2GtW2e0uH0HIPbadf3/bRWSxw==}
+    engines: {node: '>=18.0'}
+
+  unicode-canonical-property-names-ecmascript@2.0.1:
+    resolution: {integrity: sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==}
     engines: {node: '>=4'}
 
   unicode-match-property-ecmascript@2.0.0:
     resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
     engines: {node: '>=4'}
 
-  unicode-match-property-value-ecmascript@2.1.0:
-    resolution: {integrity: sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==}
+  unicode-match-property-value-ecmascript@2.2.0:
+    resolution: {integrity: sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==}
     engines: {node: '>=4'}
 
   unicode-property-aliases-ecmascript@2.1.0:
@@ -9190,8 +9031,8 @@ packages:
   unidiff@1.0.2:
     resolution: {integrity: sha512-2sbEzki5fBmjgAqoafwxRenfMcumMlmVAoJDwYJa3CI4ZVugkdR6qjTw5sVsl29/4JfBBXhWEAd5ars8nRdqXg==}
 
-  unified@11.0.4:
-    resolution: {integrity: sha512-apMPnyLjAX+ty4OrNap7yumyVAMlKx5IWU2wlzzUdYJO9A8f1p9m/gywF/GM2ZDFcjQPrx59Mc90KwmxsoklxQ==}
+  unified@11.0.5:
+    resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==}
 
   union-value@1.0.1:
     resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
@@ -9242,8 +9083,8 @@ packages:
     resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
     engines: {node: '>= 4.0.0'}
 
-  universalify@2.0.0:
-    resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
+  universalify@2.0.1:
+    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
     engines: {node: '>= 10.0.0'}
 
   unix-crypt-td-js@1.1.4:
@@ -9253,8 +9094,9 @@ packages:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
     engines: {node: '>= 0.8'}
 
-  unplugin@1.5.0:
-    resolution: {integrity: sha512-9ZdRwbh/4gcm1JTOkp9lAkIDrtOyOxgHmY7cjuwI8L/2RTikMcVG25GsZwNAgRuap3iDw2jeq7eoqtAsz5rW3A==}
+  unplugin@1.16.1:
+    resolution: {integrity: sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==}
+    engines: {node: '>=14.0.0'}
 
   unset-value@1.0.0:
     resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
@@ -9268,8 +9110,8 @@ packages:
     resolution: {integrity: sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==}
     engines: {node: '>=4'}
 
-  update-browserslist-db@1.1.0:
-    resolution: {integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==}
+  update-browserslist-db@1.1.3:
+    resolution: {integrity: sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==}
     hasBin: true
     peerDependencies:
       browserslist: '>= 4.21.0'
@@ -9293,26 +9135,27 @@ packages:
   url-parse@1.5.10:
     resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
 
-  url@0.11.3:
-    resolution: {integrity: sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==}
+  url@0.11.4:
+    resolution: {integrity: sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==}
+    engines: {node: '>= 0.4'}
 
-  use-callback-ref@1.3.0:
-    resolution: {integrity: sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==}
+  use-callback-ref@1.3.3:
+    resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==}
     engines: {node: '>=10'}
     peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      '@types/react': '*'
       react: ^18.2.0
     peerDependenciesMeta:
       '@types/react':
         optional: true
 
-  use-deep-compare@1.1.0:
-    resolution: {integrity: sha512-6yY3zmKNCJ1jjIivfZMZMReZjr8e6iC6Uqtp701jvWJ6ejC/usXD+JjmslZDPJQgX8P4B1Oi5XSLHkOLeYSJsA==}
+  use-deep-compare@1.3.0:
+    resolution: {integrity: sha512-94iG+dEdEP/Sl3WWde+w9StIunlV8Dgj+vkt5wTwMoFQLaijiEZSXXy8KtcStpmEDtIptRJiNeD4ACTtVvnIKA==}
     peerDependencies:
       react: ^18.2.0
 
-  use-isomorphic-layout-effect@1.1.2:
-    resolution: {integrity: sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==}
+  use-isomorphic-layout-effect@1.2.0:
+    resolution: {integrity: sha512-q6ayo8DWoPZT0VdG4u3D3uxcgONP3Mevx2i2b0434cwWBoL+aelL1DzkXI6w3PhTZzUeR2kaVlZn70iCiseP6w==}
     peerDependencies:
       '@types/react': '*'
       react: ^18.2.0
@@ -9326,11 +9169,11 @@ packages:
       react: ^18.2.0
       react-dom: 16.8.0 - 18
 
-  use-sidecar@1.1.2:
-    resolution: {integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==}
+  use-sidecar@1.1.3:
+    resolution: {integrity: sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==}
     engines: {node: '>=10'}
     peerDependencies:
-      '@types/react': ^16.9.0 || ^17.0.0 || ^18.0.0
+      '@types/react': '*'
       react: ^18.2.0
     peerDependenciesMeta:
       '@types/react':
@@ -9355,8 +9198,8 @@ packages:
     resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
     engines: {node: '>=0.10.0'}
 
-  utf8-byte-length@1.0.4:
-    resolution: {integrity: sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==}
+  utf8-byte-length@1.0.5:
+    resolution: {integrity: sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==}
 
   utif@2.0.1:
     resolution: {integrity: sha512-Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg==}
@@ -9387,10 +9230,6 @@ packages:
     resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
     hasBin: true
 
-  v8-to-istanbul@9.1.3:
-    resolution: {integrity: sha512-9lDD+EVI2fjFsMWXc6dy5JJzBsVTcQ2fVkfBvncZ6xJWG9wtBhOldG+mHkSL0+V1K/xgZz0JDO5UT5hFwHUghg==}
-    engines: {node: '>=10.12.0'}
-
   validate-npm-package-license@3.0.4:
     resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
 
@@ -9406,6 +9245,18 @@ packages:
       react:
         optional: true
 
+  valtio@1.13.2:
+    resolution: {integrity: sha512-Qik0o+DSy741TmkqmRfjq+0xpZBXi/Y6+fXZLn0xNF1z/waFMbE3rkivv5Zcf9RrMUp6zswf2J7sbh2KBlba5A==}
+    engines: {node: '>=12.20.0'}
+    peerDependencies:
+      '@types/react': '>=16.8'
+      react: ^18.2.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      react:
+        optional: true
+
   vary@1.1.2:
     resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
     engines: {node: '>= 0.8'}
@@ -9420,21 +9271,21 @@ packages:
   vfile-message@4.0.2:
     resolution: {integrity: sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==}
 
-  vfile@6.0.1:
-    resolution: {integrity: sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==}
+  vfile@6.0.3:
+    resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
 
   vite-node@0.34.6:
     resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==}
     engines: {node: '>=v14.18.0'}
     hasBin: true
 
-  vite-node@3.0.7:
-    resolution: {integrity: sha512-2fX0QwX4GkkkpULXdT1Pf4q0tC1i1lFOyseKoonavXUNlQ77KpW2XqBGGNIm/J4Ows4KxgGJzDguYVPKwG/n5A==}
+  vite-node@3.0.8:
+    resolution: {integrity: sha512-6PhR4H9VGlcwXZ+KWCdMqbtG649xCPZqfI9j2PsK1FcXgEzro5bGHcVKFCTqPLaNKZES8Evqv4LwvZARsq5qlg==}
     engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
     hasBin: true
 
-  vite@4.5.3:
-    resolution: {integrity: sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==}
+  vite@4.5.9:
+    resolution: {integrity: sha512-qK9W4xjgD3gXbC0NmdNFFnVFLMWSNiR3swj957yutwzzN16xF/E7nmtAyp1rT9hviDroQANjE4HK3H4WqWdFtw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
@@ -9461,8 +9312,8 @@ packages:
       terser:
         optional: true
 
-  vite@6.2.0:
-    resolution: {integrity: sha512-7dPxoo+WsT/64rDcwoOjk76XHj+TqNTIvHKcuMQ1k4/SeHDaQt5GFAeLYzrimZrMpn/O6DtdI03WUjdxuPM0oQ==}
+  vite@6.2.1:
+    resolution: {integrity: sha512-n2GnqDb6XPhlt9B8olZPrgMD/es/Nd1RdChF6CBD/fHW6pUyUTt2sQW2fPRX5GiD9XEa6+8A6A4f2vT6pSsE7Q==}
     engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
     hasBin: true
     peerDependencies:
@@ -9532,16 +9383,16 @@ packages:
       webdriverio:
         optional: true
 
-  vitest@3.0.7:
-    resolution: {integrity: sha512-IP7gPK3LS3Fvn44x30X1dM9vtawm0aesAa2yBIZ9vQf+qB69NXC5776+Qmcr7ohUXIQuLhk7xQR0aSUIDPqavg==}
+  vitest@3.0.8:
+    resolution: {integrity: sha512-dfqAsNqRGUc8hB9OVR2P0w8PZPEckti2+5rdZip0WIz9WW0MnImJ8XiR61QhqLa92EQzKP2uPkzenKOAHyEIbA==}
     engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@types/debug': ^4.1.12
       '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
-      '@vitest/browser': 3.0.7
-      '@vitest/ui': 3.0.7
+      '@vitest/browser': 3.0.8
+      '@vitest/ui': 3.0.8
       happy-dom: '*'
       jsdom: '*'
     peerDependenciesMeta:
@@ -9577,8 +9428,8 @@ packages:
   warning@4.0.3:
     resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
 
-  watchpack@2.4.1:
-    resolution: {integrity: sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==}
+  watchpack@2.4.2:
+    resolution: {integrity: sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==}
     engines: {node: '>=10.13.0'}
 
   wcwidth@1.0.1:
@@ -9594,11 +9445,11 @@ packages:
     resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
     engines: {node: '>=10.13.0'}
 
-  webpack-virtual-modules@0.5.0:
-    resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==}
+  webpack-virtual-modules@0.6.2:
+    resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
 
-  webpack@5.93.0:
-    resolution: {integrity: sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==}
+  webpack@5.98.0:
+    resolution: {integrity: sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==}
     engines: {node: '>=10.13.0'}
     hasBin: true
     peerDependencies:
@@ -9607,8 +9458,8 @@ packages:
       webpack-cli:
         optional: true
 
-  webrtc-adapter@8.2.3:
-    resolution: {integrity: sha512-gnmRz++suzmvxtp3ehQts6s2JtAGPuDPjA1F3a9ckNpG1kYdYuHWYpazoAnL9FS5/B21tKlhkorbdCXat0+4xQ==}
+  webrtc-adapter@9.0.1:
+    resolution: {integrity: sha512-1AQO+d4ElfVSXyzNVTOewgGT/tAomwwztX/6e3totvyyzXPvXIIuUUjAmyZGbKBKbZOXauuJooZm3g6IuFuiNQ==}
     engines: {node: '>=6.0.0', npm: '>=3.10.0'}
 
   websocket-driver@0.7.4:
@@ -9623,8 +9474,8 @@ packages:
     resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
     engines: {node: '>=12'}
 
-  whatwg-fetch@3.6.18:
-    resolution: {integrity: sha512-ltN7j66EneWn5TFDO4L9inYC1D+Czsxlrw2SalgjMmEMkLfA5SIZxEFdE6QtHFiiM6Q7WL32c7AkI3w6yxM84Q==}
+  whatwg-fetch@3.6.20:
+    resolution: {integrity: sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==}
 
   whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
@@ -9657,11 +9508,6 @@ packages:
     engines: {node: '>= 8'}
     hasBin: true
 
-  why-is-node-running@2.2.2:
-    resolution: {integrity: sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==}
-    engines: {node: '>=8'}
-    hasBin: true
-
   why-is-node-running@2.3.0:
     resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
     engines: {node: '>=8'}
@@ -9670,58 +9516,61 @@ packages:
   wide-align@1.1.5:
     resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}
 
+  word-wrap@1.2.5:
+    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
+    engines: {node: '>=0.10.0'}
+
   wordwrap@1.0.0:
     resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}
 
-  workbox-background-sync@7.0.0:
-    resolution: {integrity: sha512-S+m1+84gjdueM+jIKZ+I0Lx0BDHkk5Nu6a3kTVxP4fdj3gKouRNmhO8H290ybnJTOPfBDtTMXSQA/QLTvr7PeA==}
+  workbox-background-sync@7.3.0:
+    resolution: {integrity: sha512-PCSk3eK7Mxeuyatb22pcSx9dlgWNv3+M8PqPaYDokks8Y5/FX4soaOqj3yhAZr5k6Q5JWTOMYgaJBpbw11G9Eg==}
 
-  workbox-broadcast-update@7.0.0:
-    resolution: {integrity: sha512-oUuh4jzZrLySOo0tC0WoKiSg90bVAcnE98uW7F8GFiSOXnhogfNDGZelPJa+6KpGBO5+Qelv04Hqx2UD+BJqNQ==}
+  workbox-broadcast-update@7.3.0:
+    resolution: {integrity: sha512-T9/F5VEdJVhwmrIAE+E/kq5at2OY6+OXXgOWQevnubal6sO92Gjo24v6dCVwQiclAF5NS3hlmsifRrpQzZCdUA==}
 
-  workbox-build@7.0.0:
-    resolution: {integrity: sha512-CttE7WCYW9sZC+nUYhQg3WzzGPr4IHmrPnjKiu3AMXsiNQKx+l4hHl63WTrnicLmKEKHScWDH8xsGBdrYgtBzg==}
+  workbox-build@7.3.0:
+    resolution: {integrity: sha512-JGL6vZTPlxnlqZRhR/K/msqg3wKP+m0wfEUVosK7gsYzSgeIxvZLi1ViJJzVL7CEeI8r7rGFV973RiEqkP3lWQ==}
     engines: {node: '>=16.0.0'}
 
-  workbox-cacheable-response@7.0.0:
-    resolution: {integrity: sha512-0lrtyGHn/LH8kKAJVOQfSu3/80WDc9Ma8ng0p2i/5HuUndGttH+mGMSvOskjOdFImLs2XZIimErp7tSOPmu/6g==}
+  workbox-cacheable-response@7.3.0:
+    resolution: {integrity: sha512-eAFERIg6J2LuyELhLlmeRcJFa5e16Mj8kL2yCDbhWE+HUun9skRQrGIFVUagqWj4DMaaPSMWfAolM7XZZxNmxA==}
 
-  workbox-core@7.0.0:
-    resolution: {integrity: sha512-81JkAAZtfVP8darBpfRTovHg8DGAVrKFgHpOArZbdFd78VqHr5Iw65f2guwjE2NlCFbPFDoez3D3/6ZvhI/rwQ==}
+  workbox-core@7.3.0:
+    resolution: {integrity: sha512-Z+mYrErfh4t3zi7NVTvOuACB0A/jA3bgxUN3PwtAVHvfEsZxV9Iju580VEETug3zYJRc0Dmii/aixI/Uxj8fmw==}
 
-  workbox-expiration@7.0.0:
-    resolution: {integrity: sha512-MLK+fogW+pC3IWU9SFE+FRStvDVutwJMR5if1g7oBJx3qwmO69BNoJQVaMXq41R0gg3MzxVfwOGKx3i9P6sOLQ==}
+  workbox-expiration@7.3.0:
+    resolution: {integrity: sha512-lpnSSLp2BM+K6bgFCWc5bS1LR5pAwDWbcKt1iL87/eTSJRdLdAwGQznZE+1czLgn/X05YChsrEegTNxjM067vQ==}
 
-  workbox-google-analytics@7.0.0:
-    resolution: {integrity: sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==}
-    deprecated: It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained
+  workbox-google-analytics@7.3.0:
+    resolution: {integrity: sha512-ii/tSfFdhjLHZ2BrYgFNTrb/yk04pw2hasgbM70jpZfLk0vdJAXgaiMAWsoE+wfJDNWoZmBYY0hMVI0v5wWDbg==}
 
-  workbox-navigation-preload@7.0.0:
-    resolution: {integrity: sha512-juWCSrxo/fiMz3RsvDspeSLGmbgC0U9tKqcUPZBCf35s64wlaLXyn2KdHHXVQrb2cqF7I0Hc9siQalainmnXJA==}
+  workbox-navigation-preload@7.3.0:
+    resolution: {integrity: sha512-fTJzogmFaTv4bShZ6aA7Bfj4Cewaq5rp30qcxl2iYM45YD79rKIhvzNHiFj1P+u5ZZldroqhASXwwoyusnr2cg==}
 
-  workbox-precaching@7.0.0:
-    resolution: {integrity: sha512-EC0vol623LJqTJo1mkhD9DZmMP604vHqni3EohhQVwhJlTgyKyOkMrZNy5/QHfOby+39xqC01gv4LjOm4HSfnA==}
+  workbox-precaching@7.3.0:
+    resolution: {integrity: sha512-ckp/3t0msgXclVAYaNndAGeAoWQUv7Rwc4fdhWL69CCAb2UHo3Cef0KIUctqfQj1p8h6aGyz3w8Cy3Ihq9OmIw==}
 
-  workbox-range-requests@7.0.0:
-    resolution: {integrity: sha512-SxAzoVl9j/zRU9OT5+IQs7pbJBOUOlriB8Gn9YMvi38BNZRbM+RvkujHMo8FOe9IWrqqwYgDFBfv6sk76I1yaQ==}
+  workbox-range-requests@7.3.0:
+    resolution: {integrity: sha512-EyFmM1KpDzzAouNF3+EWa15yDEenwxoeXu9bgxOEYnFfCxns7eAxA9WSSaVd8kujFFt3eIbShNqa4hLQNFvmVQ==}
 
-  workbox-recipes@7.0.0:
-    resolution: {integrity: sha512-DntcK9wuG3rYQOONWC0PejxYYIDHyWWZB/ueTbOUDQgefaeIj1kJ7pdP3LZV2lfrj8XXXBWt+JDRSw1lLLOnww==}
+  workbox-recipes@7.3.0:
+    resolution: {integrity: sha512-BJro/MpuW35I/zjZQBcoxsctgeB+kyb2JAP5EB3EYzePg8wDGoQuUdyYQS+CheTb+GhqJeWmVs3QxLI8EBP1sg==}
 
-  workbox-routing@7.0.0:
-    resolution: {integrity: sha512-8YxLr3xvqidnbVeGyRGkaV4YdlKkn5qZ1LfEePW3dq+ydE73hUUJJuLmGEykW3fMX8x8mNdL0XrWgotcuZjIvA==}
+  workbox-routing@7.3.0:
+    resolution: {integrity: sha512-ZUlysUVn5ZUzMOmQN3bqu+gK98vNfgX/gSTZ127izJg/pMMy4LryAthnYtjuqcjkN4HEAx1mdgxNiKJMZQM76A==}
 
-  workbox-strategies@7.0.0:
-    resolution: {integrity: sha512-dg3qJU7tR/Gcd/XXOOo7x9QoCI9nk74JopaJaYAQ+ugLi57gPsXycVdBnYbayVj34m6Y8ppPwIuecrzkpBVwbA==}
+  workbox-strategies@7.3.0:
+    resolution: {integrity: sha512-tmZydug+qzDFATwX7QiEL5Hdf7FrkhjaF9db1CbB39sDmEZJg3l9ayDvPxy8Y18C3Y66Nrr9kkN1f/RlkDgllg==}
 
-  workbox-streams@7.0.0:
-    resolution: {integrity: sha512-moVsh+5to//l6IERWceYKGiftc+prNnqOp2sgALJJFbnNVpTXzKISlTIsrWY+ogMqt+x1oMazIdHj25kBSq/HQ==}
+  workbox-streams@7.3.0:
+    resolution: {integrity: sha512-SZnXucyg8x2Y61VGtDjKPO5EgPUG5NDn/v86WYHX+9ZqvAsGOytP0Jxp1bl663YUuMoXSAtsGLL+byHzEuMRpw==}
 
-  workbox-sw@7.0.0:
-    resolution: {integrity: sha512-SWfEouQfjRiZ7GNABzHUKUyj8pCoe+RwjfOIajcx6J5mtgKkN+t8UToHnpaJL5UVVOf5YhJh+OHhbVNIHe+LVA==}
+  workbox-sw@7.3.0:
+    resolution: {integrity: sha512-aCUyoAZU9IZtH05mn0ACUpyHzPs0lMeJimAYkQkBsOWiqaJLgusfDCR+yllkPkFRxWpZKF8vSvgHYeG7LwhlmA==}
 
-  workbox-window@7.0.0:
-    resolution: {integrity: sha512-j7P/bsAWE/a7sxqTzXo3P2ALb1reTfZdvVp6OJ/uLr/C2kZAMvjeWGm8V4htQhor7DOvYg0sSbFN2+flT5U0qA==}
+  workbox-window@7.3.0:
+    resolution: {integrity: sha512-qW8PDy16OV1UBaUNGlTVcepzrlzyzNW/ZJvFQQs2j2TzGsg6IKjcpZC1RSquqQnTOafl5pCj5bGfAHlCjOOjdA==}
 
   wrap-ansi@6.2.0:
     resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
@@ -9745,8 +9594,8 @@ packages:
     resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
 
-  ws@5.2.3:
-    resolution: {integrity: sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==}
+  ws@5.2.4:
+    resolution: {integrity: sha512-fFCejsuC8f9kOSu9FYaOw8CdO68O3h5v0lg4p74o8JqWpwTf9tniOD+nOB78aWoVSS6WptVUmDrp/KPsMVBWFQ==}
     peerDependencies:
       bufferutil: ^4.0.1
       utf-8-validate: ^5.0.2
@@ -9756,8 +9605,8 @@ packages:
       utf-8-validate:
         optional: true
 
-  ws@6.2.2:
-    resolution: {integrity: sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==}
+  ws@6.2.3:
+    resolution: {integrity: sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==}
     peerDependencies:
       bufferutil: ^4.0.1
       utf-8-validate: ^5.0.2
@@ -9767,8 +9616,8 @@ packages:
       utf-8-validate:
         optional: true
 
-  ws@7.4.6:
-    resolution: {integrity: sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==}
+  ws@7.5.10:
+    resolution: {integrity: sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==}
     engines: {node: '>=8.3.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -9779,20 +9628,20 @@ packages:
       utf-8-validate:
         optional: true
 
-  ws@8.11.0:
-    resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==}
+  ws@8.17.1:
+    resolution: {integrity: sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
-      utf-8-validate: ^5.0.2
+      utf-8-validate: '>=5.0.2'
     peerDependenciesMeta:
       bufferutil:
         optional: true
       utf-8-validate:
         optional: true
 
-  ws@8.18.0:
-    resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==}
+  ws@8.18.1:
+    resolution: {integrity: sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -9809,8 +9658,8 @@ packages:
   xml-parse-from-string@1.0.1:
     resolution: {integrity: sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g==}
 
-  xml2js@0.4.23:
-    resolution: {integrity: sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==}
+  xml2js@0.5.0:
+    resolution: {integrity: sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==}
     engines: {node: '>=4.0.0'}
 
   xmlbuilder@11.0.1:
@@ -9821,8 +9670,8 @@ packages:
     resolution: {integrity: sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==}
     engines: {node: '>=0.4.0'}
 
-  xmlhttprequest-ssl@2.0.0:
-    resolution: {integrity: sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==}
+  xmlhttprequest-ssl@2.1.2:
+    resolution: {integrity: sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==}
     engines: {node: '>=0.4.0'}
 
   xtend@4.0.2:
@@ -9846,8 +9695,8 @@ packages:
     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
     engines: {node: '>= 6'}
 
-  yaml@2.4.1:
-    resolution: {integrity: sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==}
+  yaml@2.7.0:
+    resolution: {integrity: sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==}
     engines: {node: '>= 14'}
     hasBin: true
 
@@ -9859,10 +9708,6 @@ packages:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
 
-  yargs@16.2.0:
-    resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
-    engines: {node: '>=10'}
-
   yargs@17.7.2:
     resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
     engines: {node: '>=12'}
@@ -9870,6 +9715,9 @@ packages:
   yauzl@2.10.0:
     resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
 
+  yazl@2.5.1:
+    resolution: {integrity: sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==}
+
   yeast@0.1.2:
     resolution: {integrity: sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==}
 
@@ -9880,12 +9728,12 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
-  yocto-queue@1.0.0:
-    resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
+  yocto-queue@1.2.0:
+    resolution: {integrity: sha512-KHBC7z61OJeaMGnF3wqNZj+GGNXOyypZviiKpQeiHirG5Ib1ImwcLBH70rbMSkKfSmUNBsdf2PwaEJtKvgmkNw==}
     engines: {node: '>=12.20'}
 
-  zod@3.24.1:
-    resolution: {integrity: sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==}
+  zod@3.24.2:
+    resolution: {integrity: sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==}
 
   zustand@3.6.5:
     resolution: {integrity: sha512-/WfLJuXiEJimt61KGMHebrFBwckkCHGhAgVXTgPQHl6IMzjqm6MREb1OnDSnCRiSmRdhgdFCctceg6tSm79hiw==}
@@ -9901,16 +9749,14 @@ packages:
 
 snapshots:
 
-  '@aashutoshrathi/word-wrap@1.2.6': {}
-
-  '@ampproject/remapping@2.2.1':
+  '@ampproject/remapping@2.3.0':
     dependencies:
-      '@jridgewell/gen-mapping': 0.3.3
+      '@jridgewell/gen-mapping': 0.3.8
       '@jridgewell/trace-mapping': 0.3.25
 
-  '@apideck/better-ajv-errors@0.3.6(ajv@8.12.0)':
+  '@apideck/better-ajv-errors@0.3.6(ajv@8.17.1)':
     dependencies:
-      ajv: 8.12.0
+      ajv: 8.17.1
       json-schema: 0.4.0
       jsonpointer: 5.0.1
       leven: 3.1.0
@@ -9919,34 +9765,35 @@ snapshots:
     dependencies:
       default-browser-id: 3.0.0
 
-  '@azure/msal-common@14.9.0': {}
+  '@azure/msal-common@14.16.0': {}
 
-  '@azure/msal-node@2.7.0':
+  '@azure/msal-node@2.16.2':
     dependencies:
-      '@azure/msal-common': 14.9.0
+      '@azure/msal-common': 14.16.0
       jsonwebtoken: 9.0.2
       uuid: 8.3.2
 
-  '@babel/code-frame@7.22.13':
+  '@babel/code-frame@7.26.2':
     dependencies:
-      '@babel/highlight': 7.22.13
-      chalk: 2.4.2
+      '@babel/helper-validator-identifier': 7.25.9
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
 
-  '@babel/compat-data@7.22.9': {}
+  '@babel/compat-data@7.26.8': {}
 
-  '@babel/core@7.22.11':
+  '@babel/core@7.26.9':
     dependencies:
-      '@ampproject/remapping': 2.2.1
-      '@babel/code-frame': 7.22.13
-      '@babel/generator': 7.22.10
-      '@babel/helper-compilation-targets': 7.22.10
-      '@babel/helper-module-transforms': 7.23.0(@babel/core@7.22.11)
-      '@babel/helpers': 7.22.11
-      '@babel/parser': 7.22.13
-      '@babel/template': 7.22.5
-      '@babel/traverse': 7.22.11
-      '@babel/types': 7.23.0
-      convert-source-map: 1.9.0
+      '@ampproject/remapping': 2.3.0
+      '@babel/code-frame': 7.26.2
+      '@babel/generator': 7.26.9
+      '@babel/helper-compilation-targets': 7.26.5
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.9)
+      '@babel/helpers': 7.26.9
+      '@babel/parser': 7.26.9
+      '@babel/template': 7.26.9
+      '@babel/traverse': 7.26.9
+      '@babel/types': 7.26.9
+      convert-source-map: 2.0.0
       debug: 4.4.0(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
@@ -9954,787 +9801,695 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/generator@7.22.10':
+  '@babel/generator@7.26.9':
     dependencies:
-      '@babel/types': 7.23.0
-      '@jridgewell/gen-mapping': 0.3.3
+      '@babel/parser': 7.26.9
+      '@babel/types': 7.26.9
+      '@jridgewell/gen-mapping': 0.3.8
       '@jridgewell/trace-mapping': 0.3.25
-      jsesc: 2.5.2
+      jsesc: 3.1.0
 
-  '@babel/helper-annotate-as-pure@7.22.5':
+  '@babel/helper-annotate-as-pure@7.25.9':
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.26.9
 
-  '@babel/helper-builder-binary-assignment-operator-visitor@7.22.10':
+  '@babel/helper-compilation-targets@7.26.5':
     dependencies:
-      '@babel/types': 7.23.0
-
-  '@babel/helper-compilation-targets@7.22.10':
-    dependencies:
-      '@babel/compat-data': 7.22.9
-      '@babel/helper-validator-option': 7.22.15
-      browserslist: 4.23.2
+      '@babel/compat-data': 7.26.8
+      '@babel/helper-validator-option': 7.25.9
+      browserslist: 4.24.4
       lru-cache: 5.1.1
       semver: 6.3.1
 
-  '@babel/helper-create-class-features-plugin@7.22.15(@babel/core@7.22.11)':
+  '@babel/helper-create-class-features-plugin@7.26.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-function-name': 7.22.5
-      '@babel/helper-member-expression-to-functions': 7.23.0
-      '@babel/helper-optimise-call-expression': 7.22.5
-      '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.11)
-      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
+      '@babel/core': 7.26.9
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/helper-replace-supers': 7.26.5(@babel/core@7.26.9)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/traverse': 7.26.9
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-create-regexp-features-plugin@7.26.3(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-annotate-as-pure': 7.25.9
+      regexpu-core: 6.2.0
       semver: 6.3.1
 
-  '@babel/helper-create-regexp-features-plugin@7.22.9(@babel/core@7.22.11)':
+  '@babel/helper-define-polyfill-provider@0.6.3(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-annotate-as-pure': 7.22.5
-      regexpu-core: 5.3.2
-      semver: 6.3.1
-
-  '@babel/helper-define-polyfill-provider@0.4.2(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-compilation-targets': 7.22.10
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-compilation-targets': 7.26.5
+      '@babel/helper-plugin-utils': 7.26.5
       debug: 4.4.0(supports-color@8.1.1)
       lodash.debounce: 4.0.8
-      resolve: 1.22.4
+      resolve: 1.22.10
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-environment-visitor@7.22.20': {}
-
-  '@babel/helper-function-name@7.22.5':
+  '@babel/helper-member-expression-to-functions@7.25.9':
     dependencies:
-      '@babel/template': 7.22.5
-      '@babel/types': 7.23.0
-
-  '@babel/helper-hoist-variables@7.22.5':
-    dependencies:
-      '@babel/types': 7.23.0
-
-  '@babel/helper-member-expression-to-functions@7.23.0':
-    dependencies:
-      '@babel/types': 7.23.0
-
-  '@babel/helper-module-imports@7.22.15':
-    dependencies:
-      '@babel/types': 7.23.0
-
-  '@babel/helper-module-transforms@7.23.0(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-module-imports': 7.22.15
-      '@babel/helper-simple-access': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/helper-validator-identifier': 7.22.20
-
-  '@babel/helper-optimise-call-expression@7.22.5':
-    dependencies:
-      '@babel/types': 7.23.0
-
-  '@babel/helper-plugin-utils@7.22.5': {}
-
-  '@babel/helper-remap-async-to-generator@7.22.9(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-wrap-function': 7.22.10
-
-  '@babel/helper-replace-supers@7.22.9(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-member-expression-to-functions': 7.23.0
-      '@babel/helper-optimise-call-expression': 7.22.5
-
-  '@babel/helper-simple-access@7.22.5':
-    dependencies:
-      '@babel/types': 7.23.0
-
-  '@babel/helper-skip-transparent-expression-wrappers@7.22.5':
-    dependencies:
-      '@babel/types': 7.23.0
-
-  '@babel/helper-split-export-declaration@7.22.6':
-    dependencies:
-      '@babel/types': 7.23.0
-
-  '@babel/helper-string-parser@7.22.5': {}
-
-  '@babel/helper-validator-identifier@7.22.20': {}
-
-  '@babel/helper-validator-option@7.22.15': {}
-
-  '@babel/helper-wrap-function@7.22.10':
-    dependencies:
-      '@babel/helper-function-name': 7.22.5
-      '@babel/template': 7.22.5
-      '@babel/types': 7.23.0
-
-  '@babel/helpers@7.22.11':
-    dependencies:
-      '@babel/template': 7.22.5
-      '@babel/traverse': 7.22.11
-      '@babel/types': 7.23.0
+      '@babel/traverse': 7.26.9
+      '@babel/types': 7.26.9
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/highlight@7.22.13':
+  '@babel/helper-module-imports@7.25.9':
     dependencies:
-      '@babel/helper-validator-identifier': 7.22.20
-      chalk: 2.4.2
-      js-tokens: 4.0.0
+      '@babel/traverse': 7.26.9
+      '@babel/types': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/parser@7.22.13':
+  '@babel/helper-module-transforms@7.26.0(@babel/core@7.26.9)':
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/core': 7.26.9
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/traverse': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.22.11)':
+  '@babel/helper-optimise-call-expression@7.25.9':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/types': 7.26.9
 
-  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.22.5(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/plugin-transform-optional-chaining': 7.22.12(@babel/core@7.22.11)
+  '@babel/helper-plugin-utils@7.26.5': {}
 
-  '@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.22.11)':
+  '@babel/helper-remap-async-to-generator@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-wrap-function': 7.25.9
+      '@babel/traverse': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.22.11)':
+  '@babel/helper-replace-supers@7.26.5(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/traverse': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.22.11)':
+  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.11)
+      '@babel/traverse': 7.26.9
+      '@babel/types': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
+  '@babel/helper-string-parser@7.25.9': {}
 
-  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+  '@babel/helper-validator-identifier@7.25.9': {}
 
-  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+  '@babel/helper-validator-option@7.25.9': {}
 
-  '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.22.11)':
+  '@babel/helper-wrap-function@7.25.9':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/template': 7.26.9
+      '@babel/traverse': 7.26.9
+      '@babel/types': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.22.11)':
+  '@babel/helpers@7.26.9':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/template': 7.26.9
+      '@babel/types': 7.26.9
 
-  '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.22.11)':
+  '@babel/parser@7.26.9':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/types': 7.26.9
 
-  '@babel/plugin-syntax-flow@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/traverse': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-syntax-import-attributes@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.22.11)':
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.9)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.22.11)':
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/traverse': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
 
-  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.11)':
+  '@babel/plugin-syntax-flow@7.26.0(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.22.11)':
+  '@babel/plugin-syntax-import-assertions@7.26.0(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.22.11)':
+  '@babel/plugin-syntax-import-attributes@7.26.0(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.22.11)':
+  '@babel/plugin-syntax-jsx@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.22.11)':
+  '@babel/plugin-syntax-typescript@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.22.11)':
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-arrow-functions@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-async-generator-functions@7.26.8(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.9)
+      '@babel/traverse': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-async-to-generator@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.9)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.22.11)':
+  '@babel/plugin-transform-block-scoped-functions@7.26.5(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-arrow-functions@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-block-scoping@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-async-generator-functions@7.22.11(@babel/core@7.22.11)':
+  '@babel/plugin-transform-class-properties@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.22.11)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-class-static-block@7.26.0(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-module-imports': 7.22.15
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-block-scoped-functions@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-classes@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-
-  '@babel/plugin-transform-block-scoping@7.22.10(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-
-  '@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
-
-  '@babel/plugin-transform-class-static-block@7.22.11(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.22.11)
-
-  '@babel/plugin-transform-classes@7.22.6(@babel/core@7.22.11)':
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-compilation-targets': 7.22.10
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-function-name': 7.22.5
-      '@babel/helper-optimise-call-expression': 7.22.5
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.11)
-      '@babel/helper-split-export-declaration': 7.22.6
+      '@babel/core': 7.26.9
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-compilation-targets': 7.26.5
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-replace-supers': 7.26.5(@babel/core@7.26.9)
+      '@babel/traverse': 7.26.9
       globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-computed-properties@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-computed-properties@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/template': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/template': 7.26.9
 
-  '@babel/plugin-transform-destructuring@7.22.10(@babel/core@7.22.11)':
+  '@babel/plugin-transform-destructuring@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-dotall-regex@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-dotall-regex@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-duplicate-keys@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-duplicate-keys@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-dynamic-import@7.22.11(@babel/core@7.22.11)':
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-exponentiation-operator@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-dynamic-import@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.10
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-export-namespace-from@7.22.11(@babel/core@7.22.11)':
+  '@babel/plugin-transform-exponentiation-operator@7.26.3(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-flow-strip-types@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-export-namespace-from@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-flow': 7.22.5(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-for-of@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-flow-strip-types@7.26.5(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/plugin-syntax-flow': 7.26.0(@babel/core@7.26.9)
 
-  '@babel/plugin-transform-function-name@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-for-of@7.26.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-compilation-targets': 7.22.10
-      '@babel/helper-function-name': 7.22.5
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-json-strings@7.22.11(@babel/core@7.22.11)':
+  '@babel/plugin-transform-function-name@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-compilation-targets': 7.26.5
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/traverse': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-literals@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-json-strings@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-logical-assignment-operators@7.22.11(@babel/core@7.22.11)':
+  '@babel/plugin-transform-literals@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-member-expression-literals@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-logical-assignment-operators@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-modules-amd@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-member-expression-literals@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-module-transforms': 7.23.0(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-modules-commonjs@7.23.0(@babel/core@7.22.11)':
+  '@babel/plugin-transform-modules-amd@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-module-transforms': 7.23.0(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-simple-access': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-modules-systemjs@7.22.11(@babel/core@7.22.11)':
+  '@babel/plugin-transform-modules-commonjs@7.26.3(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-module-transforms': 7.23.0(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-identifier': 7.22.20
+      '@babel/core': 7.26.9
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-modules-systemjs@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-module-transforms': 7.23.0(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/traverse': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-modules-umd@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-new-target@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-named-capturing-groups-regex@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-nullish-coalescing-operator@7.22.11(@babel/core@7.22.11)':
+  '@babel/plugin-transform-new-target@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-numeric-separator@7.22.11(@babel/core@7.22.11)':
+  '@babel/plugin-transform-nullish-coalescing-operator@7.26.6(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-object-rest-spread@7.22.11(@babel/core@7.22.11)':
+  '@babel/plugin-transform-numeric-separator@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/compat-data': 7.22.9
-      '@babel/core': 7.22.11
-      '@babel/helper-compilation-targets': 7.22.10
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-object-super@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-object-rest-spread@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-compilation-targets': 7.26.5
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.9)
 
-  '@babel/plugin-transform-optional-catch-binding@7.22.11(@babel/core@7.22.11)':
+  '@babel/plugin-transform-object-super@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-replace-supers': 7.26.5(@babel/core@7.26.9)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-optional-chaining@7.22.12(@babel/core@7.22.11)':
+  '@babel/plugin-transform-optional-catch-binding@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-parameters@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-optional-chaining@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-parameters@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-private-property-in-object@7.22.11(@babel/core@7.22.11)':
+  '@babel/plugin-transform-private-methods@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-property-literals@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-private-property-in-object@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-react-jsx-self@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-property-literals@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-react-jsx-source@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-react-jsx-self@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-regenerator@7.22.10(@babel/core@7.22.11)':
+  '@babel/plugin-transform-react-jsx-source@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/plugin-transform-regenerator@7.25.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
       regenerator-transform: 0.15.2
 
-  '@babel/plugin-transform-reserved-words@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-regexp-modifiers@7.26.0(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-shorthand-properties@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-reserved-words@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-spread@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-shorthand-properties@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-sticky-regex@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-spread@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-template-literals@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-sticky-regex@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-typeof-symbol@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-template-literals@7.26.8(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-typescript@7.22.15(@babel/core@7.22.11)':
+  '@babel/plugin-transform-typeof-symbol@7.26.7(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-unicode-escapes@7.22.10(@babel/core@7.22.11)':
+  '@babel/plugin-transform-typescript@7.26.8(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-create-class-features-plugin': 7.26.9(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.9)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-transform-unicode-property-regex@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-unicode-escapes@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-unicode-regex@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-unicode-property-regex@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/plugin-transform-unicode-sets-regex@7.22.5(@babel/core@7.22.11)':
+  '@babel/plugin-transform-unicode-regex@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-regexp-features-plugin': 7.22.9(@babel/core@7.22.11)
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
 
-  '@babel/preset-env@7.22.10(@babel/core@7.22.11)':
+  '@babel/plugin-transform-unicode-sets-regex@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/compat-data': 7.22.9
-      '@babel/core': 7.22.11
-      '@babel/helper-compilation-targets': 7.22.10
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-option': 7.22.15
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.22.11)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.11)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.22.11)
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.22.11)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-import-assertions': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-syntax-import-attributes': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.22.11)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.11)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.11)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.22.11)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.22.11)
-      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.22.11)
-      '@babel/plugin-transform-arrow-functions': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-async-generator-functions': 7.22.11(@babel/core@7.22.11)
-      '@babel/plugin-transform-async-to-generator': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-block-scoped-functions': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-block-scoping': 7.22.10(@babel/core@7.22.11)
-      '@babel/plugin-transform-class-properties': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-class-static-block': 7.22.11(@babel/core@7.22.11)
-      '@babel/plugin-transform-classes': 7.22.6(@babel/core@7.22.11)
-      '@babel/plugin-transform-computed-properties': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-destructuring': 7.22.10(@babel/core@7.22.11)
-      '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-duplicate-keys': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-dynamic-import': 7.22.11(@babel/core@7.22.11)
-      '@babel/plugin-transform-exponentiation-operator': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-export-namespace-from': 7.22.11(@babel/core@7.22.11)
-      '@babel/plugin-transform-for-of': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-function-name': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-json-strings': 7.22.11(@babel/core@7.22.11)
-      '@babel/plugin-transform-literals': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-logical-assignment-operators': 7.22.11(@babel/core@7.22.11)
-      '@babel/plugin-transform-member-expression-literals': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-modules-amd': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-modules-commonjs': 7.23.0(@babel/core@7.22.11)
-      '@babel/plugin-transform-modules-systemjs': 7.22.11(@babel/core@7.22.11)
-      '@babel/plugin-transform-modules-umd': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-new-target': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.22.11(@babel/core@7.22.11)
-      '@babel/plugin-transform-numeric-separator': 7.22.11(@babel/core@7.22.11)
-      '@babel/plugin-transform-object-rest-spread': 7.22.11(@babel/core@7.22.11)
-      '@babel/plugin-transform-object-super': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-optional-catch-binding': 7.22.11(@babel/core@7.22.11)
-      '@babel/plugin-transform-optional-chaining': 7.22.12(@babel/core@7.22.11)
-      '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-private-methods': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-private-property-in-object': 7.22.11(@babel/core@7.22.11)
-      '@babel/plugin-transform-property-literals': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-regenerator': 7.22.10(@babel/core@7.22.11)
-      '@babel/plugin-transform-reserved-words': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-shorthand-properties': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-spread': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-sticky-regex': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-template-literals': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-typeof-symbol': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-unicode-escapes': 7.22.10(@babel/core@7.22.11)
-      '@babel/plugin-transform-unicode-property-regex': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-unicode-regex': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-unicode-sets-regex': 7.22.5(@babel/core@7.22.11)
-      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.22.11)
-      '@babel/types': 7.23.0
-      babel-plugin-polyfill-corejs2: 0.4.5(@babel/core@7.22.11)
-      babel-plugin-polyfill-corejs3: 0.8.3(@babel/core@7.22.11)
-      babel-plugin-polyfill-regenerator: 0.5.2(@babel/core@7.22.11)
-      core-js-compat: 3.32.1
+      '@babel/core': 7.26.9
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.9)
+      '@babel/helper-plugin-utils': 7.26.5
+
+  '@babel/preset-env@7.26.9(@babel/core@7.26.9)':
+    dependencies:
+      '@babel/compat-data': 7.26.8
+      '@babel/core': 7.26.9
+      '@babel/helper-compilation-targets': 7.26.5
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-validator-option': 7.25.9
+      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.9)
+      '@babel/plugin-syntax-import-assertions': 7.26.0(@babel/core@7.26.9)
+      '@babel/plugin-syntax-import-attributes': 7.26.0(@babel/core@7.26.9)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.26.9)
+      '@babel/plugin-transform-arrow-functions': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-async-generator-functions': 7.26.8(@babel/core@7.26.9)
+      '@babel/plugin-transform-async-to-generator': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-block-scoped-functions': 7.26.5(@babel/core@7.26.9)
+      '@babel/plugin-transform-block-scoping': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-class-properties': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-class-static-block': 7.26.0(@babel/core@7.26.9)
+      '@babel/plugin-transform-classes': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-computed-properties': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-destructuring': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-dotall-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-duplicate-keys': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-dynamic-import': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-exponentiation-operator': 7.26.3(@babel/core@7.26.9)
+      '@babel/plugin-transform-export-namespace-from': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-for-of': 7.26.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-function-name': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-json-strings': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-literals': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-logical-assignment-operators': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-member-expression-literals': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-modules-amd': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-modules-commonjs': 7.26.3(@babel/core@7.26.9)
+      '@babel/plugin-transform-modules-systemjs': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-modules-umd': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-new-target': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.26.6(@babel/core@7.26.9)
+      '@babel/plugin-transform-numeric-separator': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-object-rest-spread': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-object-super': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-optional-catch-binding': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-private-methods': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-private-property-in-object': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-property-literals': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-regenerator': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-regexp-modifiers': 7.26.0(@babel/core@7.26.9)
+      '@babel/plugin-transform-reserved-words': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-shorthand-properties': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-spread': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-sticky-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-template-literals': 7.26.8(@babel/core@7.26.9)
+      '@babel/plugin-transform-typeof-symbol': 7.26.7(@babel/core@7.26.9)
+      '@babel/plugin-transform-unicode-escapes': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-unicode-property-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-unicode-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-unicode-sets-regex': 7.25.9(@babel/core@7.26.9)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.26.9)
+      babel-plugin-polyfill-corejs2: 0.4.12(@babel/core@7.26.9)
+      babel-plugin-polyfill-corejs3: 0.11.1(@babel/core@7.26.9)
+      babel-plugin-polyfill-regenerator: 0.6.3(@babel/core@7.26.9)
+      core-js-compat: 3.41.0
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/preset-flow@7.22.15(@babel/core@7.22.11)':
+  '@babel/preset-flow@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-option': 7.22.15
-      '@babel/plugin-transform-flow-strip-types': 7.22.5(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-validator-option': 7.25.9
+      '@babel/plugin-transform-flow-strip-types': 7.26.5(@babel/core@7.26.9)
 
-  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.22.11)':
+  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/types': 7.23.0
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/types': 7.26.9
       esutils: 2.0.3
 
-  '@babel/preset-typescript@7.23.0(@babel/core@7.22.11)':
+  '@babel/preset-typescript@7.26.0(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-option': 7.22.15
-      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-modules-commonjs': 7.23.0(@babel/core@7.22.11)
-      '@babel/plugin-transform-typescript': 7.22.15(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-plugin-utils': 7.26.5
+      '@babel/helper-validator-option': 7.25.9
+      '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-modules-commonjs': 7.26.3(@babel/core@7.26.9)
+      '@babel/plugin-transform-typescript': 7.26.8(@babel/core@7.26.9)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/register@7.22.15(@babel/core@7.22.11)':
+  '@babel/register@7.25.9(@babel/core@7.26.9)':
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.26.9
       clone-deep: 4.0.1
       find-cache-dir: 2.1.0
       make-dir: 2.1.0
       pirates: 4.0.6
       source-map-support: 0.5.21
 
-  '@babel/regjsgen@0.8.0': {}
-
-  '@babel/runtime@7.24.5':
+  '@babel/runtime@7.26.9':
     dependencies:
-      regenerator-runtime: 0.14.0
+      regenerator-runtime: 0.14.1
 
-  '@babel/template@7.22.5':
+  '@babel/template@7.26.9':
     dependencies:
-      '@babel/code-frame': 7.22.13
-      '@babel/parser': 7.22.13
-      '@babel/types': 7.23.0
+      '@babel/code-frame': 7.26.2
+      '@babel/parser': 7.26.9
+      '@babel/types': 7.26.9
 
-  '@babel/traverse@7.22.11':
+  '@babel/traverse@7.26.9':
     dependencies:
-      '@babel/code-frame': 7.22.13
-      '@babel/generator': 7.22.10
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-function-name': 7.22.5
-      '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.22.13
-      '@babel/types': 7.23.0
+      '@babel/code-frame': 7.26.2
+      '@babel/generator': 7.26.9
+      '@babel/parser': 7.26.9
+      '@babel/template': 7.26.9
+      '@babel/types': 7.26.9
       debug: 4.4.0(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/types@7.23.0':
+  '@babel/types@7.26.9':
     dependencies:
-      '@babel/helper-string-parser': 7.22.5
-      '@babel/helper-validator-identifier': 7.22.20
-      to-fast-properties: 2.0.0
+      '@babel/helper-string-parser': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
 
   '@base2/pretty-print-object@1.0.1': {}
 
-  '@bcoe/v8-coverage@0.2.3': {}
-
-  '@cbor-extract/cbor-extract-darwin-arm64@2.2.0':
-    optional: true
-
-  '@cbor-extract/cbor-extract-darwin-x64@2.2.0':
-    optional: true
-
-  '@cbor-extract/cbor-extract-linux-arm64@2.2.0':
-    optional: true
-
-  '@cbor-extract/cbor-extract-linux-arm@2.2.0':
-    optional: true
-
-  '@cbor-extract/cbor-extract-linux-x64@2.2.0':
-    optional: true
-
-  '@cbor-extract/cbor-extract-win32-x64@2.2.0':
-    optional: true
-
   '@colors/colors@1.5.0':
     optional: true
 
   '@cypress/request@2.88.12':
     dependencies:
       aws-sign2: 0.7.0
-      aws4: 1.12.0
+      aws4: 1.13.2
       caseless: 0.12.0
       combined-stream: 1.0.8
       extend: 3.0.2
@@ -10748,7 +10503,7 @@ snapshots:
       performance-now: 2.1.0
       qs: 6.10.4
       safe-buffer: 5.2.1
-      tough-cookie: 4.1.3
+      tough-cookie: 4.1.4
       tunnel-agent: 0.6.0
       uuid: 8.3.2
     optional: true
@@ -10761,103 +10516,110 @@ snapshots:
       - supports-color
     optional: true
 
-  '@dimaka/interface@0.0.3-alpha.0(@babel/core@7.22.11)(@popperjs/core@2.11.8)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@dimaka/interface@0.0.3-alpha.0(@babel/core@7.26.9)(@popperjs/core@2.11.8)(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@emotion/css': 11.5.0(@babel/core@7.22.11)
+      '@emotion/css': 11.5.0(@babel/core@7.26.9)
       '@juggle/resize-observer': 3.3.1
       animejs: 3.2.1
       clsx: 1.1.1
-      react: 18.2.0
-      react-popper: 2.3.0(@popperjs/core@2.11.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      react-portal: 4.2.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      react-use: 17.3.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      react-use-measure: 2.1.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      valtio: 1.11.2(@types/react@18.2.20)(react@18.2.0)
-      zustand: 3.6.5(react@18.2.0)
+      react: 18.3.1
+      react-popper: 2.3.0(@popperjs/core@2.11.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-portal: 4.2.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-use: 17.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-use-measure: 2.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      valtio: 1.11.2(@types/react@18.3.18)(react@18.3.1)
+      zustand: 3.6.5(react@18.3.1)
     transitivePeerDependencies:
       - '@babel/core'
       - '@popperjs/core'
       - '@types/react'
       - react-dom
+      - supports-color
 
   '@discoveryjs/json-ext@0.5.7': {}
 
   '@emnapi/runtime@1.3.1':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.8.1
     optional: true
 
-  '@emotion/babel-plugin@11.12.0':
+  '@emotion/babel-plugin@11.13.5':
     dependencies:
-      '@babel/helper-module-imports': 7.22.15
-      '@babel/runtime': 7.24.5
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/runtime': 7.26.9
       '@emotion/hash': 0.9.2
       '@emotion/memoize': 0.9.0
-      '@emotion/serialize': 1.3.0
+      '@emotion/serialize': 1.3.3
       babel-plugin-macros: 3.1.0
       convert-source-map: 1.9.0
       escape-string-regexp: 4.0.0
       find-root: 1.1.0
       source-map: 0.5.7
       stylis: 4.2.0
+    transitivePeerDependencies:
+      - supports-color
 
-  '@emotion/cache@11.13.1':
+  '@emotion/cache@11.14.0':
     dependencies:
       '@emotion/memoize': 0.9.0
       '@emotion/sheet': 1.4.0
-      '@emotion/utils': 1.4.0
+      '@emotion/utils': 1.4.2
       '@emotion/weak-memoize': 0.4.0
       stylis: 4.2.0
 
-  '@emotion/css@11.5.0(@babel/core@7.22.11)':
+  '@emotion/css@11.5.0(@babel/core@7.26.9)':
     dependencies:
-      '@emotion/babel-plugin': 11.12.0
-      '@emotion/cache': 11.13.1
-      '@emotion/serialize': 1.3.0
+      '@emotion/babel-plugin': 11.13.5
+      '@emotion/cache': 11.14.0
+      '@emotion/serialize': 1.3.3
       '@emotion/sheet': 1.4.0
-      '@emotion/utils': 1.4.0
+      '@emotion/utils': 1.4.2
     optionalDependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.26.9
+    transitivePeerDependencies:
+      - supports-color
 
   '@emotion/hash@0.9.2': {}
 
   '@emotion/memoize@0.9.0': {}
 
-  '@emotion/react@11.13.0(@types/react@18.2.20)(react@18.2.0)':
+  '@emotion/react@11.14.0(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@emotion/babel-plugin': 11.12.0
-      '@emotion/cache': 11.13.1
-      '@emotion/serialize': 1.3.0
-      '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@18.2.0)
-      '@emotion/utils': 1.4.0
+      '@babel/runtime': 7.26.9
+      '@emotion/babel-plugin': 11.13.5
+      '@emotion/cache': 11.14.0
+      '@emotion/serialize': 1.3.3
+      '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@18.3.1)
+      '@emotion/utils': 1.4.2
       '@emotion/weak-memoize': 0.4.0
       hoist-non-react-statics: 3.3.2
-      react: 18.2.0
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
+    transitivePeerDependencies:
+      - supports-color
 
-  '@emotion/serialize@1.3.0':
+  '@emotion/serialize@1.3.3':
     dependencies:
       '@emotion/hash': 0.9.2
       '@emotion/memoize': 0.9.0
-      '@emotion/unitless': 0.9.0
-      '@emotion/utils': 1.4.0
-      csstype: 3.1.2
+      '@emotion/unitless': 0.10.0
+      '@emotion/utils': 1.4.2
+      csstype: 3.1.3
 
   '@emotion/sheet@1.4.0': {}
 
-  '@emotion/unitless@0.9.0': {}
+  '@emotion/unitless@0.10.0': {}
 
-  '@emotion/use-insertion-effect-with-fallbacks@1.1.0(react@18.2.0)':
+  '@emotion/use-insertion-effect-with-fallbacks@1.2.0(react@18.3.1)':
     dependencies:
-      react: 18.2.0
+      react: 18.3.1
 
-  '@emotion/utils@1.4.0': {}
+  '@emotion/utils@1.4.2': {}
 
   '@emotion/weak-memoize@0.4.0': {}
 
-  '@esbuild/aix-ppc64@0.19.11':
+  '@esbuild/aix-ppc64@0.19.12':
     optional: true
 
   '@esbuild/aix-ppc64@0.25.0':
@@ -10866,7 +10628,7 @@ snapshots:
   '@esbuild/android-arm64@0.18.20':
     optional: true
 
-  '@esbuild/android-arm64@0.19.11':
+  '@esbuild/android-arm64@0.19.12':
     optional: true
 
   '@esbuild/android-arm64@0.25.0':
@@ -10875,7 +10637,7 @@ snapshots:
   '@esbuild/android-arm@0.18.20':
     optional: true
 
-  '@esbuild/android-arm@0.19.11':
+  '@esbuild/android-arm@0.19.12':
     optional: true
 
   '@esbuild/android-arm@0.25.0':
@@ -10884,7 +10646,7 @@ snapshots:
   '@esbuild/android-x64@0.18.20':
     optional: true
 
-  '@esbuild/android-x64@0.19.11':
+  '@esbuild/android-x64@0.19.12':
     optional: true
 
   '@esbuild/android-x64@0.25.0':
@@ -10893,7 +10655,7 @@ snapshots:
   '@esbuild/darwin-arm64@0.18.20':
     optional: true
 
-  '@esbuild/darwin-arm64@0.19.11':
+  '@esbuild/darwin-arm64@0.19.12':
     optional: true
 
   '@esbuild/darwin-arm64@0.25.0':
@@ -10902,7 +10664,7 @@ snapshots:
   '@esbuild/darwin-x64@0.18.20':
     optional: true
 
-  '@esbuild/darwin-x64@0.19.11':
+  '@esbuild/darwin-x64@0.19.12':
     optional: true
 
   '@esbuild/darwin-x64@0.25.0':
@@ -10911,7 +10673,7 @@ snapshots:
   '@esbuild/freebsd-arm64@0.18.20':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.19.11':
+  '@esbuild/freebsd-arm64@0.19.12':
     optional: true
 
   '@esbuild/freebsd-arm64@0.25.0':
@@ -10920,7 +10682,7 @@ snapshots:
   '@esbuild/freebsd-x64@0.18.20':
     optional: true
 
-  '@esbuild/freebsd-x64@0.19.11':
+  '@esbuild/freebsd-x64@0.19.12':
     optional: true
 
   '@esbuild/freebsd-x64@0.25.0':
@@ -10929,7 +10691,7 @@ snapshots:
   '@esbuild/linux-arm64@0.18.20':
     optional: true
 
-  '@esbuild/linux-arm64@0.19.11':
+  '@esbuild/linux-arm64@0.19.12':
     optional: true
 
   '@esbuild/linux-arm64@0.25.0':
@@ -10938,7 +10700,7 @@ snapshots:
   '@esbuild/linux-arm@0.18.20':
     optional: true
 
-  '@esbuild/linux-arm@0.19.11':
+  '@esbuild/linux-arm@0.19.12':
     optional: true
 
   '@esbuild/linux-arm@0.25.0':
@@ -10947,7 +10709,7 @@ snapshots:
   '@esbuild/linux-ia32@0.18.20':
     optional: true
 
-  '@esbuild/linux-ia32@0.19.11':
+  '@esbuild/linux-ia32@0.19.12':
     optional: true
 
   '@esbuild/linux-ia32@0.25.0':
@@ -10956,7 +10718,7 @@ snapshots:
   '@esbuild/linux-loong64@0.18.20':
     optional: true
 
-  '@esbuild/linux-loong64@0.19.11':
+  '@esbuild/linux-loong64@0.19.12':
     optional: true
 
   '@esbuild/linux-loong64@0.25.0':
@@ -10965,7 +10727,7 @@ snapshots:
   '@esbuild/linux-mips64el@0.18.20':
     optional: true
 
-  '@esbuild/linux-mips64el@0.19.11':
+  '@esbuild/linux-mips64el@0.19.12':
     optional: true
 
   '@esbuild/linux-mips64el@0.25.0':
@@ -10974,7 +10736,7 @@ snapshots:
   '@esbuild/linux-ppc64@0.18.20':
     optional: true
 
-  '@esbuild/linux-ppc64@0.19.11':
+  '@esbuild/linux-ppc64@0.19.12':
     optional: true
 
   '@esbuild/linux-ppc64@0.25.0':
@@ -10983,7 +10745,7 @@ snapshots:
   '@esbuild/linux-riscv64@0.18.20':
     optional: true
 
-  '@esbuild/linux-riscv64@0.19.11':
+  '@esbuild/linux-riscv64@0.19.12':
     optional: true
 
   '@esbuild/linux-riscv64@0.25.0':
@@ -10992,7 +10754,7 @@ snapshots:
   '@esbuild/linux-s390x@0.18.20':
     optional: true
 
-  '@esbuild/linux-s390x@0.19.11':
+  '@esbuild/linux-s390x@0.19.12':
     optional: true
 
   '@esbuild/linux-s390x@0.25.0':
@@ -11001,7 +10763,7 @@ snapshots:
   '@esbuild/linux-x64@0.18.20':
     optional: true
 
-  '@esbuild/linux-x64@0.19.11':
+  '@esbuild/linux-x64@0.19.12':
     optional: true
 
   '@esbuild/linux-x64@0.25.0':
@@ -11013,7 +10775,7 @@ snapshots:
   '@esbuild/netbsd-x64@0.18.20':
     optional: true
 
-  '@esbuild/netbsd-x64@0.19.11':
+  '@esbuild/netbsd-x64@0.19.12':
     optional: true
 
   '@esbuild/netbsd-x64@0.25.0':
@@ -11025,7 +10787,7 @@ snapshots:
   '@esbuild/openbsd-x64@0.18.20':
     optional: true
 
-  '@esbuild/openbsd-x64@0.19.11':
+  '@esbuild/openbsd-x64@0.19.12':
     optional: true
 
   '@esbuild/openbsd-x64@0.25.0':
@@ -11034,7 +10796,7 @@ snapshots:
   '@esbuild/sunos-x64@0.18.20':
     optional: true
 
-  '@esbuild/sunos-x64@0.19.11':
+  '@esbuild/sunos-x64@0.19.12':
     optional: true
 
   '@esbuild/sunos-x64@0.25.0':
@@ -11043,7 +10805,7 @@ snapshots:
   '@esbuild/win32-arm64@0.18.20':
     optional: true
 
-  '@esbuild/win32-arm64@0.19.11':
+  '@esbuild/win32-arm64@0.19.12':
     optional: true
 
   '@esbuild/win32-arm64@0.25.0':
@@ -11052,7 +10814,7 @@ snapshots:
   '@esbuild/win32-ia32@0.18.20':
     optional: true
 
-  '@esbuild/win32-ia32@0.19.11':
+  '@esbuild/win32-ia32@0.19.12':
     optional: true
 
   '@esbuild/win32-ia32@0.25.0':
@@ -11061,63 +10823,63 @@ snapshots:
   '@esbuild/win32-x64@0.18.20':
     optional: true
 
-  '@esbuild/win32-x64@0.19.11':
+  '@esbuild/win32-x64@0.19.12':
     optional: true
 
   '@esbuild/win32-x64@0.25.0':
     optional: true
 
-  '@eslint-community/eslint-utils@4.4.0(eslint@8.50.0)':
+  '@eslint-community/eslint-utils@4.4.1(eslint@8.57.1)':
     dependencies:
-      eslint: 8.50.0
+      eslint: 8.57.1
       eslint-visitor-keys: 3.4.3
 
-  '@eslint-community/regexpp@4.8.0': {}
+  '@eslint-community/regexpp@4.12.1': {}
 
-  '@eslint/eslintrc@2.1.2':
+  '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.12.6
       debug: 4.4.0(supports-color@8.1.1)
       espree: 9.6.1
-      globals: 13.21.0
-      ignore: 5.2.4
-      import-fresh: 3.3.0
+      globals: 13.24.0
+      ignore: 5.3.2
+      import-fresh: 3.3.1
       js-yaml: 4.1.0
       minimatch: 3.1.2
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/js@8.50.0': {}
+  '@eslint/js@8.57.1': {}
 
   '@fal-works/esbuild-plugin-global-externals@2.1.2': {}
 
-  '@fastify/busboy@2.0.0': {}
+  '@fastify/busboy@2.1.1': {}
 
-  '@floating-ui/core@1.5.0':
+  '@floating-ui/core@1.6.9':
     dependencies:
-      '@floating-ui/utils': 0.1.6
+      '@floating-ui/utils': 0.2.9
 
-  '@floating-ui/dom@1.5.3':
+  '@floating-ui/dom@1.6.13':
     dependencies:
-      '@floating-ui/core': 1.5.0
-      '@floating-ui/utils': 0.1.6
+      '@floating-ui/core': 1.6.9
+      '@floating-ui/utils': 0.2.9
 
-  '@floating-ui/react-dom@2.0.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@floating-ui/react-dom@2.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@floating-ui/dom': 1.5.3
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@floating-ui/dom': 1.6.13
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
 
-  '@floating-ui/react@0.26.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@floating-ui/react@0.26.28(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@floating-ui/react-dom': 2.0.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@floating-ui/utils': 0.1.6
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@floating-ui/react-dom': 2.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@floating-ui/utils': 0.2.9
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
       tabbable: 6.2.0
 
-  '@floating-ui/utils@0.1.6': {}
+  '@floating-ui/utils@0.2.9': {}
 
   '@gar/promisify@1.1.3':
     optional: true
@@ -11128,9 +10890,9 @@ snapshots:
     dependencies:
       '@hapi/hoek': 9.3.0
 
-  '@humanwhocodes/config-array@0.11.11':
+  '@humanwhocodes/config-array@0.13.0':
     dependencies:
-      '@humanwhocodes/object-schema': 1.2.1
+      '@humanwhocodes/object-schema': 2.0.3
       debug: 4.4.0(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
@@ -11138,7 +10900,7 @@ snapshots:
 
   '@humanwhocodes/module-importer@1.0.1': {}
 
-  '@humanwhocodes/object-schema@1.2.1': {}
+  '@humanwhocodes/object-schema@2.0.3': {}
 
   '@img/sharp-darwin-arm64@0.33.5':
     optionalDependencies:
@@ -11240,7 +11002,7 @@ snapshots:
 
   '@jest/transform@29.7.0':
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.26.9
       '@jest/types': 29.6.3
       '@jridgewell/trace-mapping': 0.3.25
       babel-plugin-istanbul: 6.1.1
@@ -11251,7 +11013,7 @@ snapshots:
       jest-haste-map: 29.7.0
       jest-regex-util: 29.6.3
       jest-util: 29.7.0
-      micromatch: 4.0.5
+      micromatch: 4.0.8
       pirates: 4.0.6
       slash: 3.0.0
       write-file-atomic: 4.0.2
@@ -11261,373 +11023,381 @@ snapshots:
   '@jest/types@29.6.3':
     dependencies:
       '@jest/schemas': 29.6.3
-      '@types/istanbul-lib-coverage': 2.0.4
-      '@types/istanbul-reports': 3.0.2
-      '@types/node': 22.8.1
-      '@types/yargs': 17.0.28
+      '@types/istanbul-lib-coverage': 2.0.6
+      '@types/istanbul-reports': 3.0.4
+      '@types/node': 22.13.9
+      '@types/yargs': 17.0.33
       chalk: 4.1.2
 
-  '@jimp/bmp@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/bmp@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
       bmp-js: 0.1.0
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/core@0.10.3':
+  '@jimp/core@0.10.3(debug@4.4.0)':
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.26.9
       '@jimp/utils': 0.10.3
       any-base: 1.1.0
       buffer: 6.0.3
-      core-js: 3.37.1
+      core-js: 3.41.0
       exif-parser: 0.1.12
       file-type: 9.0.0
-      load-bmfont: 1.4.1
+      load-bmfont: 1.4.2(debug@4.4.0)
       mkdirp: 0.5.6
       phin: 2.9.3
       pixelmatch: 4.0.2
       tinycolor2: 1.6.0
+    transitivePeerDependencies:
+      - debug
     optional: true
 
-  '@jimp/custom@0.10.3':
+  '@jimp/custom@0.10.3(debug@4.4.0)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/core': 0.10.3
-      core-js: 3.37.1
+      '@babel/runtime': 7.26.9
+      '@jimp/core': 0.10.3(debug@4.4.0)
+      core-js: 3.41.0
+    transitivePeerDependencies:
+      - debug
     optional: true
 
-  '@jimp/gif@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/gif@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
       omggif: 1.0.10
     optional: true
 
-  '@jimp/jpeg@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/jpeg@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
       jpeg-js: 0.3.7
     optional: true
 
-  '@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-blur@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugin-blur@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-circle@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugin-circle@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-color@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugin-color@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
       tinycolor2: 1.6.0
     optional: true
 
-  '@jimp/plugin-contain@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-scale@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3)))':
+  '@jimp/plugin-contain@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-scale@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
-      '@jimp/plugin-blit': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-scale': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
+      '@jimp/plugin-blit': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-scale': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-cover@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-scale@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3)))':
+  '@jimp/plugin-cover@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-scale@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
-      '@jimp/plugin-crop': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-scale': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
+      '@jimp/plugin-crop': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-scale': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-displace@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugin-displace@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-dither@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugin-dither@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-fisheye@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugin-fisheye@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-flip@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-rotate@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3)))':
+  '@jimp/plugin-flip@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-rotate@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
-      '@jimp/plugin-rotate': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
+      '@jimp/plugin-rotate': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-gaussian@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugin-gaussian@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-invert@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugin-invert@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-mask@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugin-mask@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-normalize@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugin-normalize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-print@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3))':
+  '@jimp/plugin-print@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(debug@4.4.0)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
-      '@jimp/plugin-blit': 0.10.3(@jimp/custom@0.10.3)
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
+      '@jimp/plugin-blit': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
-      load-bmfont: 1.4.1
+      core-js: 3.41.0
+      load-bmfont: 1.4.2(debug@4.4.0)
+    transitivePeerDependencies:
+      - debug
     optional: true
 
-  '@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-rotate@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))':
+  '@jimp/plugin-rotate@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
-      '@jimp/plugin-blit': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-crop': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3)
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
+      '@jimp/plugin-blit': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-crop': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-scale@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))':
+  '@jimp/plugin-scale@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
-      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3)
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
+      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-shadow@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blur@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))':
+  '@jimp/plugin-shadow@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-blur@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
-      '@jimp/plugin-blur': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3)
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
+      '@jimp/plugin-blur': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugin-threshold@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-color@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))':
+  '@jimp/plugin-threshold@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-color@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
-      '@jimp/plugin-color': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3)
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
+      '@jimp/plugin-color': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
     optional: true
 
-  '@jimp/plugins@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/plugins@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(debug@4.4.0)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
-      '@jimp/plugin-blit': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-blur': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-circle': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-color': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-contain': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-scale@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3)))
-      '@jimp/plugin-cover': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-scale@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3)))
-      '@jimp/plugin-crop': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-displace': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-dither': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-fisheye': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-flip': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-rotate@0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3)))
-      '@jimp/plugin-gaussian': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-invert': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-mask': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-normalize': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-print': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3))
-      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/plugin-rotate': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))
-      '@jimp/plugin-scale': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))
-      '@jimp/plugin-shadow': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-blur@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))
-      '@jimp/plugin-threshold': 0.10.3(@jimp/custom@0.10.3)(@jimp/plugin-color@0.10.3(@jimp/custom@0.10.3))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3))
-      core-js: 3.37.1
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
+      '@jimp/plugin-blit': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-blur': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-circle': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-color': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-contain': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-scale@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))))
+      '@jimp/plugin-cover': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-scale@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))))
+      '@jimp/plugin-crop': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-displace': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-dither': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-fisheye': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-flip': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-rotate@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))))
+      '@jimp/plugin-gaussian': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-invert': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-mask': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-normalize': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-print': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(debug@4.4.0)
+      '@jimp/plugin-resize': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/plugin-rotate': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-blit@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-crop@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))
+      '@jimp/plugin-scale': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))
+      '@jimp/plugin-shadow': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-blur@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))
+      '@jimp/plugin-threshold': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(@jimp/plugin-color@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))(@jimp/plugin-resize@0.10.3(@jimp/custom@0.10.3(debug@4.4.0)))
+      core-js: 3.41.0
       timm: 1.7.1
+    transitivePeerDependencies:
+      - debug
     optional: true
 
-  '@jimp/png@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/png@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
       '@jimp/utils': 0.10.3
-      core-js: 3.37.1
+      core-js: 3.41.0
       pngjs: 3.4.0
     optional: true
 
-  '@jimp/tiff@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/tiff@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
-      core-js: 3.37.1
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
+      core-js: 3.41.0
       utif: 2.0.1
     optional: true
 
-  '@jimp/types@0.10.3(@jimp/custom@0.10.3)':
+  '@jimp/types@0.10.3(@jimp/custom@0.10.3(debug@4.4.0))':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/bmp': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/custom': 0.10.3
-      '@jimp/gif': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/jpeg': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/png': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/tiff': 0.10.3(@jimp/custom@0.10.3)
-      core-js: 3.37.1
+      '@babel/runtime': 7.26.9
+      '@jimp/bmp': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/custom': 0.10.3(debug@4.4.0)
+      '@jimp/gif': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/jpeg': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/png': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      '@jimp/tiff': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      core-js: 3.41.0
       timm: 1.7.1
     optional: true
 
   '@jimp/utils@0.10.3':
     dependencies:
-      '@babel/runtime': 7.24.5
-      core-js: 3.37.1
+      '@babel/runtime': 7.26.9
+      core-js: 3.41.0
       regenerator-runtime: 0.13.11
     optional: true
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.2.1(typescript@5.5.4)(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))':
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.3.0(typescript@5.5.4)(vite@6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0))':
     dependencies:
       glob: 7.2.3
       glob-promise: 4.2.2(glob@7.2.3)
       magic-string: 0.27.0
       react-docgen-typescript: 2.2.2(typescript@5.5.4)
-      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+      vite: 6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
     optionalDependencies:
       typescript: 5.5.4
 
-  '@jridgewell/gen-mapping@0.3.3':
+  '@jridgewell/gen-mapping@0.3.8':
     dependencies:
-      '@jridgewell/set-array': 1.1.2
-      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/set-array': 1.2.1
+      '@jridgewell/sourcemap-codec': 1.5.0
       '@jridgewell/trace-mapping': 0.3.25
 
-  '@jridgewell/resolve-uri@3.1.1': {}
+  '@jridgewell/resolve-uri@3.1.2': {}
 
-  '@jridgewell/set-array@1.1.2': {}
+  '@jridgewell/set-array@1.2.1': {}
 
-  '@jridgewell/source-map@0.3.5':
+  '@jridgewell/source-map@0.3.6':
     dependencies:
-      '@jridgewell/gen-mapping': 0.3.3
+      '@jridgewell/gen-mapping': 0.3.8
       '@jridgewell/trace-mapping': 0.3.25
 
-  '@jridgewell/sourcemap-codec@1.4.15': {}
-
   '@jridgewell/sourcemap-codec@1.5.0': {}
 
   '@jridgewell/trace-mapping@0.3.25':
     dependencies:
-      '@jridgewell/resolve-uri': 3.1.1
-      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.0
 
-  '@jspm/core@2.0.1': {}
+  '@jspm/core@2.1.0': {}
 
   '@juggle/resize-observer@3.3.1': {}
 
+  '@juggle/resize-observer@3.4.0': {}
+
   '@mapbox/node-pre-gyp@1.0.11(encoding@0.1.13)':
     dependencies:
-      detect-libc: 2.0.2
+      detect-libc: 2.0.3
       https-proxy-agent: 5.0.1
       make-dir: 3.1.0
       node-fetch: 2.7.0(encoding@0.1.13)
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
-      semver: 7.6.0
-      tar: 6.2.0
+      semver: 7.7.1
+      tar: 6.2.1
     transitivePeerDependencies:
       - encoding
       - supports-color
     optional: true
 
-  '@mdx-js/react@2.3.0(react@18.2.0)':
+  '@mdx-js/react@2.3.0(react@18.3.1)':
     dependencies:
-      '@types/mdx': 2.0.8
-      '@types/react': 18.2.20
-      react: 18.2.0
+      '@types/mdx': 2.0.13
+      '@types/react': 18.3.18
+      react: 18.3.1
 
   '@module-federation/runtime-tools@0.2.3':
     dependencies:
@@ -11650,8 +11420,8 @@ snapshots:
   '@ndelangen/get-tarball@3.0.9':
     dependencies:
       gunzip-maybe: 1.4.2
-      pump: 3.0.0
-      tar-fs: 2.1.1
+      pump: 3.0.2
+      tar-fs: 2.1.2
 
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
@@ -11663,12 +11433,12 @@ snapshots:
   '@nodelib/fs.walk@1.2.8':
     dependencies:
       '@nodelib/fs.scandir': 2.1.5
-      fastq: 1.15.0
+      fastq: 1.19.1
 
   '@npmcli/fs@2.1.2':
     dependencies:
       '@gar/promisify': 1.1.3
-      semver: 7.6.0
+      semver: 7.7.1
     optional: true
 
   '@npmcli/move-file@2.0.1':
@@ -11679,23 +11449,35 @@ snapshots:
 
   '@nxg-org/mineflayer-auto-jump@0.7.12':
     dependencies:
-      '@nxg-org/mineflayer-physics-util': 1.5.8
+      '@nxg-org/mineflayer-physics-util': 1.8.5
       strict-event-emitter-types: 2.0.0
 
-  '@nxg-org/mineflayer-physics-util@1.5.8':
+  '@nxg-org/mineflayer-physics-util@1.8.5':
     dependencies:
-      '@nxg-org/mineflayer-util-plugin': 1.8.3
+      '@nxg-org/mineflayer-util-plugin': 1.8.4
 
-  '@nxg-org/mineflayer-tracker@1.2.1':
+  '@nxg-org/mineflayer-tracker@1.2.1(encoding@0.1.13)':
     dependencies:
-      '@nxg-org/mineflayer-trajectories': 1.1.1
-      '@nxg-org/mineflayer-util-plugin': 1.8.3
+      '@nxg-org/mineflayer-trajectories': 1.2.0(encoding@0.1.13)
+      '@nxg-org/mineflayer-util-plugin': 1.8.4
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
 
-  '@nxg-org/mineflayer-trajectories@1.1.1':
+  '@nxg-org/mineflayer-trajectories@1.2.0(encoding@0.1.13)':
     dependencies:
-      '@nxg-org/mineflayer-util-plugin': 1.8.3
+      '@nxg-org/mineflayer-util-plugin': 1.8.4
+      minecraft-data: 3.83.1
+      mineflayer: 4.27.0(encoding@0.1.13)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-item: 1.16.0
+      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
+      vec3: 0.1.10
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
 
-  '@nxg-org/mineflayer-util-plugin@1.8.3': {}
+  '@nxg-org/mineflayer-util-plugin@1.8.4': {}
 
   '@pkgjs/parseargs@0.11.0':
     optional: true
@@ -11704,413 +11486,492 @@ snapshots:
 
   '@radix-ui/number@1.0.1':
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.26.9
 
   '@radix-ui/primitive@1.0.1':
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.26.9
 
-  '@radix-ui/react-arrow@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/primitive@1.1.1': {}
+
+  '@radix-ui/react-arrow@1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@babel/runtime': 7.26.9
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-collection@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/react-collection@1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-context': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-slot': 1.0.2(@types/react@18.2.20)(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@babel/runtime': 7.26.9
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-context': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-slot': 1.0.2(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.20)(react@18.2.0)':
+  '@radix-ui/react-collection@1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      react: 18.2.0
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-context': 1.1.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-slot': 1.1.2(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-context@1.0.1(@types/react@18.2.20)(react@18.2.0)':
+  '@radix-ui/react-compose-refs@1.0.1(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      react: 18.2.0
+      '@babel/runtime': 7.26.9
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  '@radix-ui/react-direction@1.0.1(@types/react@18.2.20)(react@18.2.0)':
+  '@radix-ui/react-compose-refs@1.1.1(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      react: 18.2.0
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  '@radix-ui/react-dismissable-layer@1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/react-context@1.0.1(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.26.9
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.3.18
+
+  '@radix-ui/react-context@1.1.1(@types/react@18.3.18)(react@18.3.1)':
+    dependencies:
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.3.18
+
+  '@radix-ui/react-direction@1.0.1(@types/react@18.3.18)(react@18.3.1)':
+    dependencies:
+      '@babel/runtime': 7.26.9
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.3.18
+
+  '@radix-ui/react-direction@1.1.0(@types/react@18.3.18)(react@18.3.1)':
+    dependencies:
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.3.18
+
+  '@radix-ui/react-dismissable-layer@1.0.4(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@babel/runtime': 7.26.9
       '@radix-ui/primitive': 1.0.1
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.2.20)(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-focus-guards@1.0.1(@types/react@18.2.20)(react@18.2.0)':
+  '@radix-ui/react-focus-guards@1.0.1(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      react: 18.2.0
+      '@babel/runtime': 7.26.9
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  '@radix-ui/react-focus-scope@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/react-focus-scope@1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@babel/runtime': 7.26.9
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-id@1.0.1(@types/react@18.2.20)(react@18.2.0)':
+  '@radix-ui/react-id@1.0.1(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      react: 18.2.0
+      '@babel/runtime': 7.26.9
+      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  '@radix-ui/react-popper@1.1.2(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/react-id@1.1.0(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@floating-ui/react-dom': 2.0.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-context': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-use-rect': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.20)(react@18.2.0)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.3.18
+
+  '@radix-ui/react-popper@1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@babel/runtime': 7.26.9
+      '@floating-ui/react-dom': 2.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-context': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-use-rect': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-use-size': 1.0.1(@types/react@18.3.18)(react@18.3.1)
       '@radix-ui/rect': 1.0.1
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-portal@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/react-portal@1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@babel/runtime': 7.26.9
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/react-primitive@1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/react-slot': 1.0.2(@types/react@18.2.20)(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@babel/runtime': 7.26.9
+      '@radix-ui/react-slot': 1.0.2(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-roving-focus@1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/react-primitive@2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/primitive': 1.0.1
-      '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-context': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-direction': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-id': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@radix-ui/react-slot': 1.1.2(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-select@1.2.2(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/react-roving-focus@1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-collection': 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-context': 1.1.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
+
+  '@radix-ui/react-select@1.2.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@babel/runtime': 7.26.9
       '@radix-ui/number': 1.0.1
       '@radix-ui/primitive': 1.0.1
-      '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-context': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-direction': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-focus-scope': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-id': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-popper': 1.1.2(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-slot': 1.0.2(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-use-previous': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-visually-hidden': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      aria-hidden: 1.2.3
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      react-remove-scroll: 2.5.5(@types/react@18.2.20)(react@18.2.0)
+      '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-context': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-direction': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-focus-scope': 1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-id': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-popper': 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-slot': 1.0.2(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-use-previous': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-visually-hidden': 1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      aria-hidden: 1.2.4
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      react-remove-scroll: 2.5.5(@types/react@18.3.18)(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-separator@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/react-separator@1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@radix-ui/react-primitive': 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-slot@1.0.2(@types/react@18.2.20)(react@18.2.0)':
+  '@radix-ui/react-slot@1.0.2(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      react: 18.2.0
+      '@babel/runtime': 7.26.9
+      '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  '@radix-ui/react-toggle-group@1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/react-slot@1.1.2(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/primitive': 1.0.1
-      '@radix-ui/react-context': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-direction': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-toggle': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
 
-  '@radix-ui/react-toggle@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/react-toggle-group@1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/primitive': 1.0.1
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-context': 1.1.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-roving-focus': 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-toggle': 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-toolbar@1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/react-toggle@1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/primitive': 1.0.1
-      '@radix-ui/react-context': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-direction': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-separator': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-toggle-group': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-primitive': 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.2.20)(react@18.2.0)':
+  '@radix-ui/react-toolbar@1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      react: 18.2.0
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-context': 1.1.1(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-roving-focus': 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-separator': 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-toggle-group': 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
-  '@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.2.20)(react@18.2.0)':
+  '@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      react: 18.2.0
+      '@babel/runtime': 7.26.9
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  '@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.2.20)(react@18.2.0)':
+  '@radix-ui/react-use-callback-ref@1.1.0(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      react: 18.2.0
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  '@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.2.20)(react@18.2.0)':
+  '@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      react: 18.2.0
+      '@babel/runtime': 7.26.9
+      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  '@radix-ui/react-use-previous@1.0.1(@types/react@18.2.20)(react@18.2.0)':
+  '@radix-ui/react-use-controllable-state@1.1.0(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      react: 18.2.0
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  '@radix-ui/react-use-rect@1.0.1(@types/react@18.2.20)(react@18.2.0)':
+  '@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.26.9
+      '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.3.18
+
+  '@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.3.18)(react@18.3.1)':
+    dependencies:
+      '@babel/runtime': 7.26.9
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.3.18
+
+  '@radix-ui/react-use-layout-effect@1.1.0(@types/react@18.3.18)(react@18.3.1)':
+    dependencies:
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.3.18
+
+  '@radix-ui/react-use-previous@1.0.1(@types/react@18.3.18)(react@18.3.1)':
+    dependencies:
+      '@babel/runtime': 7.26.9
+      react: 18.3.1
+    optionalDependencies:
+      '@types/react': 18.3.18
+
+  '@radix-ui/react-use-rect@1.0.1(@types/react@18.3.18)(react@18.3.1)':
+    dependencies:
+      '@babel/runtime': 7.26.9
       '@radix-ui/rect': 1.0.1
-      react: 18.2.0
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  '@radix-ui/react-use-size@1.0.1(@types/react@18.2.20)(react@18.2.0)':
+  '@radix-ui/react-use-size@1.0.1(@types/react@18.3.18)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.20)(react@18.2.0)
-      react: 18.2.0
+      '@babel/runtime': 7.26.9
+      '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.18)(react@18.3.1)
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  '@radix-ui/react-visually-hidden@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@radix-ui/react-visually-hidden@1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@babel/runtime': 7.26.9
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      '@types/react-dom': 18.2.7
+      '@types/react': 18.3.18
+      '@types/react-dom': 18.3.5(@types/react@18.3.18)
 
   '@radix-ui/rect@1.0.1':
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.26.9
 
-  '@react-oauth/google@0.12.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@react-oauth/google@0.12.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
 
-  '@rollup/plugin-babel@5.3.1(@babel/core@7.22.11)(@types/babel__core@7.20.2)(rollup@2.79.1)':
+  '@rollup/plugin-babel@5.3.1(@babel/core@7.26.9)(@types/babel__core@7.20.5)(rollup@2.79.2)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-module-imports': 7.22.15
-      '@rollup/pluginutils': 3.1.0(rollup@2.79.1)
-      rollup: 2.79.1
+      '@babel/core': 7.26.9
+      '@babel/helper-module-imports': 7.25.9
+      '@rollup/pluginutils': 3.1.0(rollup@2.79.2)
+      rollup: 2.79.2
     optionalDependencies:
-      '@types/babel__core': 7.20.2
+      '@types/babel__core': 7.20.5
+    transitivePeerDependencies:
+      - supports-color
 
-  '@rollup/plugin-node-resolve@11.2.1(rollup@2.79.1)':
+  '@rollup/plugin-node-resolve@15.3.1(rollup@2.79.2)':
     dependencies:
-      '@rollup/pluginutils': 3.1.0(rollup@2.79.1)
-      '@types/resolve': 1.17.1
-      builtin-modules: 3.3.0
+      '@rollup/pluginutils': 5.1.4(rollup@2.79.2)
+      '@types/resolve': 1.20.2
       deepmerge: 4.3.1
       is-module: 1.0.0
-      resolve: 1.22.4
-      rollup: 2.79.1
+      resolve: 1.22.10
+    optionalDependencies:
+      rollup: 2.79.2
 
-  '@rollup/plugin-replace@2.4.2(rollup@2.79.1)':
+  '@rollup/plugin-replace@2.4.2(rollup@2.79.2)':
     dependencies:
-      '@rollup/pluginutils': 3.1.0(rollup@2.79.1)
+      '@rollup/pluginutils': 3.1.0(rollup@2.79.2)
       magic-string: 0.25.9
-      rollup: 2.79.1
+      rollup: 2.79.2
 
-  '@rollup/pluginutils@3.1.0(rollup@2.79.1)':
+  '@rollup/plugin-terser@0.4.4(rollup@2.79.2)':
+    dependencies:
+      serialize-javascript: 6.0.2
+      smob: 1.5.0
+      terser: 5.39.0
+    optionalDependencies:
+      rollup: 2.79.2
+
+  '@rollup/pluginutils@3.1.0(rollup@2.79.2)':
     dependencies:
       '@types/estree': 0.0.39
       estree-walker: 1.0.1
       picomatch: 2.3.1
-      rollup: 2.79.1
+      rollup: 2.79.2
 
-  '@rollup/pluginutils@5.0.5(rollup@2.79.1)':
+  '@rollup/pluginutils@5.1.4(rollup@2.79.2)':
     dependencies:
-      '@types/estree': 1.0.5
+      '@types/estree': 1.0.6
       estree-walker: 2.0.2
-      picomatch: 2.3.1
+      picomatch: 4.0.2
     optionalDependencies:
-      rollup: 2.79.1
+      rollup: 2.79.2
 
-  '@rollup/rollup-android-arm-eabi@4.34.8':
+  '@rollup/rollup-android-arm-eabi@4.34.9':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.34.8':
+  '@rollup/rollup-android-arm64@4.34.9':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.34.8':
+  '@rollup/rollup-darwin-arm64@4.34.9':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.34.8':
+  '@rollup/rollup-darwin-x64@4.34.9':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.34.8':
+  '@rollup/rollup-freebsd-arm64@4.34.9':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.34.8':
+  '@rollup/rollup-freebsd-x64@4.34.9':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.34.8':
+  '@rollup/rollup-linux-arm-gnueabihf@4.34.9':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.34.8':
+  '@rollup/rollup-linux-arm-musleabihf@4.34.9':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.34.8':
+  '@rollup/rollup-linux-arm64-gnu@4.34.9':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.34.8':
+  '@rollup/rollup-linux-arm64-musl@4.34.9':
     optional: true
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.34.8':
+  '@rollup/rollup-linux-loongarch64-gnu@4.34.9':
     optional: true
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.34.8':
+  '@rollup/rollup-linux-powerpc64le-gnu@4.34.9':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.34.8':
+  '@rollup/rollup-linux-riscv64-gnu@4.34.9':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.34.8':
+  '@rollup/rollup-linux-s390x-gnu@4.34.9':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.34.8':
+  '@rollup/rollup-linux-x64-gnu@4.34.9':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.34.8':
+  '@rollup/rollup-linux-x64-musl@4.34.9':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.34.8':
+  '@rollup/rollup-win32-arm64-msvc@4.34.9':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.34.8':
+  '@rollup/rollup-win32-ia32-msvc@4.34.9':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.34.8':
+  '@rollup/rollup-win32-x64-msvc@4.34.9':
     optional: true
 
   '@rsbuild/core@1.0.1-beta.9':
@@ -12118,7 +11979,7 @@ snapshots:
       '@rspack/core': 1.0.0-beta.1(@swc/helpers@0.5.11)
       '@rspack/lite-tapable': 1.0.0-beta.1
       '@swc/helpers': 0.5.11
-      caniuse-lite: 1.0.30001646
+      caniuse-lite: 1.0.30001702
       core-js: 3.37.1
     optionalDependencies:
       fsevents: 2.3.3
@@ -12130,7 +11991,7 @@ snapshots:
       buffer: 6.0.3
       console-browserify: 1.2.0
       constants-browserify: 1.0.0
-      crypto-browserify: 3.12.0
+      crypto-browserify: 3.12.1
       domain-browser: 5.7.0
       events: 3.3.0
       https-browserify: 1.0.0
@@ -12139,13 +12000,13 @@ snapshots:
       process: 0.11.10
       punycode: 2.3.1
       querystring-es3: 0.2.1
-      readable-stream: 4.5.2
+      readable-stream: 4.7.0
       stream-browserify: 3.0.0
       stream-http: 3.2.0
       string_decoder: 1.3.0
       timers-browserify: 2.0.12
       tty-browserify: 0.0.1
-      url: 0.11.3
+      url: 0.11.4
       util: 0.12.5
       vm-browserify: 1.1.2
     optionalDependencies:
@@ -12157,14 +12018,14 @@ snapshots:
       '@rspack/plugin-react-refresh': 1.0.0-beta.1(react-refresh@0.14.2)
       react-refresh: 0.14.2
 
-  '@rsbuild/plugin-type-check@1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)(esbuild@0.19.11)(typescript@5.5.4)':
+  '@rsbuild/plugin-type-check@1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)(esbuild@0.19.12)(typescript@5.5.4)':
     dependencies:
       '@rsbuild/core': 1.0.1-beta.9
       deepmerge: 4.3.1
-      fork-ts-checker-webpack-plugin: 9.0.2(typescript@5.5.4)(webpack@5.93.0(esbuild@0.19.11))
+      fork-ts-checker-webpack-plugin: 9.0.2(typescript@5.5.4)(webpack@5.98.0(esbuild@0.19.12))
       json5: 2.2.3
-      reduce-configs: 1.0.0
-      webpack: 5.93.0(esbuild@0.19.11)
+      reduce-configs: 1.1.0
+      webpack: 5.98.0(esbuild@0.19.12)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild
@@ -12220,7 +12081,7 @@ snapshots:
       '@module-federation/runtime-tools': 0.2.3
       '@rspack/binding': 1.0.0-beta.1
       '@rspack/lite-tapable': 1.0.0-beta.1
-      caniuse-lite: 1.0.30001646
+      caniuse-lite: 1.0.30001702
     optionalDependencies:
       '@swc/helpers': 0.5.11
 
@@ -12233,7 +12094,7 @@ snapshots:
     optionalDependencies:
       react-refresh: 0.14.2
 
-  '@rushstack/eslint-patch@1.4.0': {}
+  '@rushstack/eslint-patch@1.10.5': {}
 
   '@sideway/address@4.1.5':
     dependencies:
@@ -12245,95 +12106,56 @@ snapshots:
 
   '@sinclair/typebox@0.27.8': {}
 
-  '@socket.io/component-emitter@3.1.0': {}
+  '@socket.io/component-emitter@3.1.2': {}
 
-  '@storybook/addon-actions@7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/addon-actions@7.6.20':
     dependencies:
-      '@storybook/client-logger': 7.4.6
-      '@storybook/components': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/core-events': 7.4.6
+      '@storybook/core-events': 7.6.20
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/preview-api': 7.4.6
-      '@storybook/theming': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/types': 7.4.6
+      '@types/uuid': 9.0.8
       dequal: 2.0.3
-      lodash: 4.17.21
-      polished: 4.2.2
-      prop-types: 15.8.1
-      react-inspector: 6.0.2(react@18.2.0)
-      telejson: 7.2.0
-      ts-dedent: 2.2.0
+      polished: 4.3.1
       uuid: 9.0.1
-    optionalDependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-    transitivePeerDependencies:
-      - '@types/react'
-      - '@types/react-dom'
 
-  '@storybook/addon-backgrounds@7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/addon-backgrounds@7.6.20':
     dependencies:
-      '@storybook/client-logger': 7.4.6
-      '@storybook/components': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/core-events': 7.4.6
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/preview-api': 7.4.6
-      '@storybook/theming': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/types': 7.4.6
       memoizerific: 1.11.3
       ts-dedent: 2.2.0
-    optionalDependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-    transitivePeerDependencies:
-      - '@types/react'
-      - '@types/react-dom'
 
-  '@storybook/addon-controls@7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/addon-controls@7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@storybook/blocks': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/client-logger': 7.4.6
-      '@storybook/components': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/core-common': 7.4.6(encoding@0.1.13)
-      '@storybook/core-events': 7.4.6
-      '@storybook/manager-api': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/node-logger': 7.4.6
-      '@storybook/preview-api': 7.4.6
-      '@storybook/theming': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/types': 7.4.6
+      '@storybook/blocks': 7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       lodash: 4.17.21
       ts-dedent: 2.2.0
-    optionalDependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
     transitivePeerDependencies:
       - '@types/react'
       - '@types/react-dom'
       - encoding
+      - react
+      - react-dom
       - supports-color
 
-  '@storybook/addon-docs@7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/addon-docs@7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@jest/transform': 29.7.0
-      '@mdx-js/react': 2.3.0(react@18.2.0)
-      '@storybook/blocks': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/client-logger': 7.4.6
-      '@storybook/components': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/csf-plugin': 7.4.6
-      '@storybook/csf-tools': 7.4.6
+      '@mdx-js/react': 2.3.0(react@18.3.1)
+      '@storybook/blocks': 7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/client-logger': 7.6.20
+      '@storybook/components': 7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/csf-plugin': 7.6.20
+      '@storybook/csf-tools': 7.6.20
       '@storybook/global': 5.0.0
       '@storybook/mdx2-csf': 1.1.0
-      '@storybook/node-logger': 7.4.6
-      '@storybook/postinstall': 7.4.6
-      '@storybook/preview-api': 7.4.6
-      '@storybook/react-dom-shim': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/theming': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/types': 7.4.6
-      fs-extra: 11.1.1
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@storybook/node-logger': 7.6.20
+      '@storybook/postinstall': 7.6.20
+      '@storybook/preview-api': 7.6.20
+      '@storybook/react-dom-shim': 7.6.20(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/theming': 7.6.20(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/types': 7.6.20
+      fs-extra: 11.3.0
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
       remark-external-links: 8.0.0
       remark-slug: 6.1.0
       ts-dedent: 2.2.0
@@ -12343,23 +12165,23 @@ snapshots:
       - encoding
       - supports-color
 
-  '@storybook/addon-essentials@7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/addon-essentials@7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@storybook/addon-actions': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/addon-backgrounds': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/addon-controls': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/addon-docs': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/addon-highlight': 7.4.6
-      '@storybook/addon-measure': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/addon-outline': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/addon-toolbars': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/addon-viewport': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/core-common': 7.4.6(encoding@0.1.13)
-      '@storybook/manager-api': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/node-logger': 7.4.6
-      '@storybook/preview-api': 7.4.6
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@storybook/addon-actions': 7.6.20
+      '@storybook/addon-backgrounds': 7.6.20
+      '@storybook/addon-controls': 7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/addon-docs': 7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/addon-highlight': 7.6.20
+      '@storybook/addon-measure': 7.6.20
+      '@storybook/addon-outline': 7.6.20
+      '@storybook/addon-toolbars': 7.6.20
+      '@storybook/addon-viewport': 7.6.20
+      '@storybook/core-common': 7.6.20(encoding@0.1.13)
+      '@storybook/manager-api': 7.6.20(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/node-logger': 7.6.20
+      '@storybook/preview-api': 7.6.20
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@types/react'
@@ -12367,119 +12189,59 @@ snapshots:
       - encoding
       - supports-color
 
-  '@storybook/addon-highlight@7.4.6':
+  '@storybook/addon-highlight@7.6.20':
     dependencies:
-      '@storybook/core-events': 7.4.6
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 7.4.6
 
-  '@storybook/addon-links@7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/addon-links@7.6.20(react@18.3.1)':
     dependencies:
-      '@storybook/client-logger': 7.4.6
-      '@storybook/core-events': 7.4.6
-      '@storybook/csf': 0.1.1
+      '@storybook/csf': 0.1.13
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/preview-api': 7.4.6
-      '@storybook/router': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/types': 7.4.6
-      prop-types: 15.8.1
       ts-dedent: 2.2.0
     optionalDependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      react: 18.3.1
 
-  '@storybook/addon-measure@7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/addon-measure@7.6.20':
     dependencies:
-      '@storybook/client-logger': 7.4.6
-      '@storybook/components': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/core-events': 7.4.6
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/preview-api': 7.4.6
-      '@storybook/types': 7.4.6
-      tiny-invariant: 1.3.1
-    optionalDependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-    transitivePeerDependencies:
-      - '@types/react'
-      - '@types/react-dom'
+      tiny-invariant: 1.3.3
 
-  '@storybook/addon-outline@7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/addon-outline@7.6.20':
     dependencies:
-      '@storybook/client-logger': 7.4.6
-      '@storybook/components': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/core-events': 7.4.6
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/preview-api': 7.4.6
-      '@storybook/types': 7.4.6
       ts-dedent: 2.2.0
-    optionalDependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-    transitivePeerDependencies:
-      - '@types/react'
-      - '@types/react-dom'
 
-  '@storybook/addon-toolbars@7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
-    dependencies:
-      '@storybook/client-logger': 7.4.6
-      '@storybook/components': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/manager-api': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/preview-api': 7.4.6
-      '@storybook/theming': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-    optionalDependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-    transitivePeerDependencies:
-      - '@types/react'
-      - '@types/react-dom'
+  '@storybook/addon-toolbars@7.6.20': {}
 
-  '@storybook/addon-viewport@7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/addon-viewport@7.6.20':
     dependencies:
-      '@storybook/client-logger': 7.4.6
-      '@storybook/components': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/core-events': 7.4.6
-      '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/preview-api': 7.4.6
-      '@storybook/theming': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       memoizerific: 1.11.3
-      prop-types: 15.8.1
-    optionalDependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-    transitivePeerDependencies:
-      - '@types/react'
-      - '@types/react-dom'
 
-  '@storybook/blocks@7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/blocks@7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@storybook/channels': 7.4.6
-      '@storybook/client-logger': 7.4.6
-      '@storybook/components': 7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/core-events': 7.4.6
-      '@storybook/csf': 0.1.1
-      '@storybook/docs-tools': 7.4.6(encoding@0.1.13)
+      '@storybook/channels': 7.6.20
+      '@storybook/client-logger': 7.6.20
+      '@storybook/components': 7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/core-events': 7.6.20
+      '@storybook/csf': 0.1.13
+      '@storybook/docs-tools': 7.6.20(encoding@0.1.13)
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/preview-api': 7.4.6
-      '@storybook/theming': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/types': 7.4.6
-      '@types/lodash': 4.14.199
+      '@storybook/manager-api': 7.6.20(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/preview-api': 7.6.20
+      '@storybook/theming': 7.6.20(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/types': 7.6.20
+      '@types/lodash': 4.17.16
       color-convert: 2.0.1
       dequal: 2.0.3
       lodash: 4.17.21
-      markdown-to-jsx: 7.3.2(react@18.2.0)
+      markdown-to-jsx: 7.7.4(react@18.3.1)
       memoizerific: 1.11.3
-      polished: 4.2.2
-      react: 18.2.0
-      react-colorful: 5.6.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      react-dom: 18.2.0(react@18.2.0)
+      polished: 4.3.1
+      react: 18.3.1
+      react-colorful: 5.6.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-dom: 18.3.1(react@18.3.1)
       telejson: 7.2.0
-      tocbot: 4.21.2
+      tocbot: 4.35.0
       ts-dedent: 2.2.0
       util-deprecate: 1.0.2
     transitivePeerDependencies:
@@ -12488,104 +12250,100 @@ snapshots:
       - encoding
       - supports-color
 
-  '@storybook/builder-manager@7.4.6(encoding@0.1.13)':
+  '@storybook/builder-manager@7.6.20(encoding@0.1.13)':
     dependencies:
       '@fal-works/esbuild-plugin-global-externals': 2.1.2
-      '@storybook/core-common': 7.4.6(encoding@0.1.13)
-      '@storybook/manager': 7.4.6
-      '@storybook/node-logger': 7.4.6
-      '@types/ejs': 3.1.3
+      '@storybook/core-common': 7.6.20(encoding@0.1.13)
+      '@storybook/manager': 7.6.20
+      '@storybook/node-logger': 7.6.20
+      '@types/ejs': 3.1.5
       '@types/find-cache-dir': 3.2.1
       '@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15(esbuild@0.18.20)
       browser-assert: 1.2.1
-      ejs: 3.1.9
+      ejs: 3.1.10
       esbuild: 0.18.20
       esbuild-plugin-alias: 0.2.1
-      express: 4.18.2
+      express: 4.21.2
       find-cache-dir: 3.3.2
-      fs-extra: 11.1.1
+      fs-extra: 11.3.0
       process: 0.11.10
       util: 0.12.5
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@storybook/builder-vite@7.4.6(encoding@0.1.13)(typescript@5.5.4)(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))':
+  '@storybook/builder-vite@7.6.20(encoding@0.1.13)(typescript@5.5.4)(vite@6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0))':
     dependencies:
-      '@storybook/channels': 7.4.6
-      '@storybook/client-logger': 7.4.6
-      '@storybook/core-common': 7.4.6(encoding@0.1.13)
-      '@storybook/csf-plugin': 7.4.6
-      '@storybook/mdx2-csf': 1.1.0
-      '@storybook/node-logger': 7.4.6
-      '@storybook/preview': 7.4.6
-      '@storybook/preview-api': 7.4.6
-      '@storybook/types': 7.4.6
+      '@storybook/channels': 7.6.20
+      '@storybook/client-logger': 7.6.20
+      '@storybook/core-common': 7.6.20(encoding@0.1.13)
+      '@storybook/csf-plugin': 7.6.20
+      '@storybook/node-logger': 7.6.20
+      '@storybook/preview': 7.6.20
+      '@storybook/preview-api': 7.6.20
+      '@storybook/types': 7.6.20
       '@types/find-cache-dir': 3.2.1
       browser-assert: 1.2.1
       es-module-lexer: 0.9.3
-      express: 4.18.2
+      express: 4.21.2
       find-cache-dir: 3.3.2
-      fs-extra: 11.1.1
-      magic-string: 0.30.4
-      remark-external-links: 8.0.0
-      remark-slug: 6.1.0
-      rollup: 3.29.4
-      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+      fs-extra: 11.3.0
+      magic-string: 0.30.17
+      rollup: 3.29.5
+      vite: 6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
     optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@storybook/channels@7.4.6':
+  '@storybook/channels@7.6.20':
     dependencies:
-      '@storybook/client-logger': 7.4.6
-      '@storybook/core-events': 7.4.6
+      '@storybook/client-logger': 7.6.20
+      '@storybook/core-events': 7.6.20
       '@storybook/global': 5.0.0
-      qs: 6.11.2
+      qs: 6.14.0
       telejson: 7.2.0
-      tiny-invariant: 1.3.1
+      tiny-invariant: 1.3.3
 
-  '@storybook/cli@7.4.6(encoding@0.1.13)':
+  '@storybook/cli@7.6.20(encoding@0.1.13)':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/preset-env': 7.22.10(@babel/core@7.22.11)
-      '@babel/types': 7.23.0
+      '@babel/core': 7.26.9
+      '@babel/preset-env': 7.26.9(@babel/core@7.26.9)
+      '@babel/types': 7.26.9
       '@ndelangen/get-tarball': 3.0.9
-      '@storybook/codemod': 7.4.6
-      '@storybook/core-common': 7.4.6(encoding@0.1.13)
-      '@storybook/core-events': 7.4.6
-      '@storybook/core-server': 7.4.6(encoding@0.1.13)
-      '@storybook/csf-tools': 7.4.6
-      '@storybook/node-logger': 7.4.6
-      '@storybook/telemetry': 7.4.6(encoding@0.1.13)
-      '@storybook/types': 7.4.6
-      '@types/semver': 7.5.3
+      '@storybook/codemod': 7.6.20
+      '@storybook/core-common': 7.6.20(encoding@0.1.13)
+      '@storybook/core-events': 7.6.20
+      '@storybook/core-server': 7.6.20(encoding@0.1.13)
+      '@storybook/csf-tools': 7.6.20
+      '@storybook/node-logger': 7.6.20
+      '@storybook/telemetry': 7.6.20(encoding@0.1.13)
+      '@storybook/types': 7.6.20
+      '@types/semver': 7.5.8
       '@yarnpkg/fslib': 2.10.3
       '@yarnpkg/libzip': 2.3.0
       chalk: 4.1.2
       commander: 6.2.1
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       detect-indent: 6.1.0
-      envinfo: 7.10.0
+      envinfo: 7.14.0
       execa: 5.1.1
-      express: 4.18.2
+      express: 4.21.2
       find-up: 5.0.0
-      fs-extra: 11.1.1
-      get-npm-tarball-url: 2.0.3
+      fs-extra: 11.3.0
+      get-npm-tarball-url: 2.1.0
       get-port: 5.1.1
-      giget: 1.1.3
+      giget: 1.2.5
       globby: 11.1.0
-      jscodeshift: 0.14.0(@babel/preset-env@7.22.10(@babel/core@7.22.11))
+      jscodeshift: 0.15.2(@babel/preset-env@7.26.9(@babel/core@7.26.9))
       leven: 3.1.0
       ora: 5.4.1
       prettier: 2.8.8
       prompts: 2.4.2
       puppeteer-core: 2.1.1
       read-pkg-up: 7.0.1
-      semver: 7.6.0
-      simple-update-notifier: 2.0.0
+      semver: 7.7.1
       strip-json-comments: 3.1.1
       tempy: 1.0.1
       ts-dedent: 2.2.0
@@ -12596,69 +12354,69 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@storybook/client-logger@7.4.6':
+  '@storybook/client-logger@7.6.20':
     dependencies:
       '@storybook/global': 5.0.0
 
-  '@storybook/codemod@7.4.6':
+  '@storybook/codemod@7.6.20':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/preset-env': 7.22.10(@babel/core@7.22.11)
-      '@babel/types': 7.23.0
-      '@storybook/csf': 0.1.1
-      '@storybook/csf-tools': 7.4.6
-      '@storybook/node-logger': 7.4.6
-      '@storybook/types': 7.4.6
-      '@types/cross-spawn': 6.0.3
-      cross-spawn: 7.0.3
+      '@babel/core': 7.26.9
+      '@babel/preset-env': 7.26.9(@babel/core@7.26.9)
+      '@babel/types': 7.26.9
+      '@storybook/csf': 0.1.13
+      '@storybook/csf-tools': 7.6.20
+      '@storybook/node-logger': 7.6.20
+      '@storybook/types': 7.6.20
+      '@types/cross-spawn': 6.0.6
+      cross-spawn: 7.0.6
       globby: 11.1.0
-      jscodeshift: 0.14.0(@babel/preset-env@7.22.10(@babel/core@7.22.11))
+      jscodeshift: 0.15.2(@babel/preset-env@7.26.9(@babel/core@7.26.9))
       lodash: 4.17.21
       prettier: 2.8.8
-      recast: 0.23.4
+      recast: 0.23.11
     transitivePeerDependencies:
       - supports-color
 
-  '@storybook/components@7.4.6(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/components@7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@radix-ui/react-select': 1.2.2(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@radix-ui/react-toolbar': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/client-logger': 7.4.6
-      '@storybook/csf': 0.1.1
+      '@radix-ui/react-select': 1.2.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-toolbar': 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/client-logger': 7.6.20
+      '@storybook/csf': 0.1.13
       '@storybook/global': 5.0.0
-      '@storybook/theming': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/types': 7.4.6
+      '@storybook/theming': 7.6.20(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/types': 7.6.20
       memoizerific: 1.11.3
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      use-resize-observer: 9.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      use-resize-observer: 9.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       util-deprecate: 1.0.2
     transitivePeerDependencies:
       - '@types/react'
       - '@types/react-dom'
 
-  '@storybook/core-client@7.4.6':
+  '@storybook/core-client@7.6.20':
     dependencies:
-      '@storybook/client-logger': 7.4.6
-      '@storybook/preview-api': 7.4.6
+      '@storybook/client-logger': 7.6.20
+      '@storybook/preview-api': 7.6.20
 
-  '@storybook/core-common@7.4.6(encoding@0.1.13)':
+  '@storybook/core-common@7.6.20(encoding@0.1.13)':
     dependencies:
-      '@storybook/core-events': 7.4.6
-      '@storybook/node-logger': 7.4.6
-      '@storybook/types': 7.4.6
+      '@storybook/core-events': 7.6.20
+      '@storybook/node-logger': 7.6.20
+      '@storybook/types': 7.6.20
       '@types/find-cache-dir': 3.2.1
-      '@types/node': 16.18.58
-      '@types/node-fetch': 2.6.6
-      '@types/pretty-hrtime': 1.0.1
+      '@types/node': 18.19.79
+      '@types/node-fetch': 2.6.12
+      '@types/pretty-hrtime': 1.0.3
       chalk: 4.1.2
       esbuild: 0.18.20
-      esbuild-register: 3.5.0(esbuild@0.18.20)
+      esbuild-register: 3.6.0(esbuild@0.18.20)
       file-system-cache: 2.3.0
       find-cache-dir: 3.3.2
       find-up: 5.0.0
-      fs-extra: 11.1.1
-      glob: 10.3.3
+      fs-extra: 11.3.0
+      glob: 10.4.5
       handlebars: 4.7.8
       lazy-universal-dotenv: 4.0.0
       node-fetch: 2.7.0(encoding@0.1.13)
@@ -12671,92 +12429,92 @@ snapshots:
       - encoding
       - supports-color
 
-  '@storybook/core-events@7.4.6':
+  '@storybook/core-events@7.6.20':
     dependencies:
       ts-dedent: 2.2.0
 
-  '@storybook/core-server@7.4.6(encoding@0.1.13)':
+  '@storybook/core-server@7.6.20(encoding@0.1.13)':
     dependencies:
       '@aw-web-design/x-default-browser': 1.4.126
       '@discoveryjs/json-ext': 0.5.7
-      '@storybook/builder-manager': 7.4.6(encoding@0.1.13)
-      '@storybook/channels': 7.4.6
-      '@storybook/core-common': 7.4.6(encoding@0.1.13)
-      '@storybook/core-events': 7.4.6
-      '@storybook/csf': 0.1.1
-      '@storybook/csf-tools': 7.4.6
+      '@storybook/builder-manager': 7.6.20(encoding@0.1.13)
+      '@storybook/channels': 7.6.20
+      '@storybook/core-common': 7.6.20(encoding@0.1.13)
+      '@storybook/core-events': 7.6.20
+      '@storybook/csf': 0.1.13
+      '@storybook/csf-tools': 7.6.20
       '@storybook/docs-mdx': 0.1.0
       '@storybook/global': 5.0.0
-      '@storybook/manager': 7.4.6
-      '@storybook/node-logger': 7.4.6
-      '@storybook/preview-api': 7.4.6
-      '@storybook/telemetry': 7.4.6(encoding@0.1.13)
-      '@storybook/types': 7.4.6
-      '@types/detect-port': 1.3.3
-      '@types/node': 16.18.58
-      '@types/pretty-hrtime': 1.0.1
-      '@types/semver': 7.5.3
+      '@storybook/manager': 7.6.20
+      '@storybook/node-logger': 7.6.20
+      '@storybook/preview-api': 7.6.20
+      '@storybook/telemetry': 7.6.20(encoding@0.1.13)
+      '@storybook/types': 7.6.20
+      '@types/detect-port': 1.3.5
+      '@types/node': 18.19.79
+      '@types/pretty-hrtime': 1.0.3
+      '@types/semver': 7.5.8
       better-opn: 3.0.2
       chalk: 4.1.2
-      cli-table3: 0.6.3
-      compression: 1.7.4
-      detect-port: 1.5.1
-      express: 4.18.2
-      fs-extra: 11.1.1
+      cli-table3: 0.6.5
+      compression: 1.8.0
+      detect-port: 1.6.1
+      express: 4.21.2
+      fs-extra: 11.3.0
       globby: 11.1.0
-      ip: 2.0.0
       lodash: 4.17.21
       open: 8.4.2
       pretty-hrtime: 1.0.3
       prompts: 2.4.2
       read-pkg-up: 7.0.1
-      semver: 7.6.0
+      semver: 7.7.1
       telejson: 7.2.0
-      tiny-invariant: 1.3.1
+      tiny-invariant: 1.3.3
       ts-dedent: 2.2.0
       util: 0.12.5
       util-deprecate: 1.0.2
-      watchpack: 2.4.1
-      ws: 8.18.0
+      watchpack: 2.4.2
+      ws: 8.18.1
     transitivePeerDependencies:
       - bufferutil
       - encoding
       - supports-color
       - utf-8-validate
 
-  '@storybook/csf-plugin@7.4.6':
+  '@storybook/csf-plugin@7.6.20':
     dependencies:
-      '@storybook/csf-tools': 7.4.6
-      unplugin: 1.5.0
+      '@storybook/csf-tools': 7.6.20
+      unplugin: 1.16.1
     transitivePeerDependencies:
       - supports-color
 
-  '@storybook/csf-tools@7.4.6':
+  '@storybook/csf-tools@7.6.20':
     dependencies:
-      '@babel/generator': 7.22.10
-      '@babel/parser': 7.22.13
-      '@babel/traverse': 7.22.11
-      '@babel/types': 7.23.0
-      '@storybook/csf': 0.1.1
-      '@storybook/types': 7.4.6
-      fs-extra: 11.1.1
-      recast: 0.23.4
+      '@babel/generator': 7.26.9
+      '@babel/parser': 7.26.9
+      '@babel/traverse': 7.26.9
+      '@babel/types': 7.26.9
+      '@storybook/csf': 0.1.13
+      '@storybook/types': 7.6.20
+      fs-extra: 11.3.0
+      recast: 0.23.11
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - supports-color
 
-  '@storybook/csf@0.1.1':
+  '@storybook/csf@0.1.13':
     dependencies:
       type-fest: 2.19.0
 
   '@storybook/docs-mdx@0.1.0': {}
 
-  '@storybook/docs-tools@7.4.6(encoding@0.1.13)':
+  '@storybook/docs-tools@7.6.20(encoding@0.1.13)':
     dependencies:
-      '@storybook/core-common': 7.4.6(encoding@0.1.13)
-      '@storybook/preview-api': 7.4.6
-      '@storybook/types': 7.4.6
+      '@storybook/core-common': 7.6.20(encoding@0.1.13)
+      '@storybook/preview-api': 7.6.20
+      '@storybook/types': 7.6.20
       '@types/doctrine': 0.0.3
+      assert: 2.1.0
       doctrine: 3.0.0
       lodash: 4.17.21
     transitivePeerDependencies:
@@ -12765,71 +12523,70 @@ snapshots:
 
   '@storybook/global@5.0.0': {}
 
-  '@storybook/manager-api@7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/manager-api@7.6.20(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@storybook/channels': 7.4.6
-      '@storybook/client-logger': 7.4.6
-      '@storybook/core-events': 7.4.6
-      '@storybook/csf': 0.1.1
+      '@storybook/channels': 7.6.20
+      '@storybook/client-logger': 7.6.20
+      '@storybook/core-events': 7.6.20
+      '@storybook/csf': 0.1.13
       '@storybook/global': 5.0.0
-      '@storybook/router': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/theming': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/types': 7.4.6
+      '@storybook/router': 7.6.20
+      '@storybook/theming': 7.6.20(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/types': 7.6.20
       dequal: 2.0.3
       lodash: 4.17.21
       memoizerific: 1.11.3
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      semver: 7.6.0
-      store2: 2.14.2
+      store2: 2.14.4
       telejson: 7.2.0
       ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - react
+      - react-dom
 
-  '@storybook/manager@7.4.6': {}
+  '@storybook/manager@7.6.20': {}
 
   '@storybook/mdx2-csf@1.1.0': {}
 
-  '@storybook/node-logger@7.4.6': {}
+  '@storybook/node-logger@7.6.20': {}
 
-  '@storybook/postinstall@7.4.6': {}
+  '@storybook/postinstall@7.6.20': {}
 
-  '@storybook/preview-api@7.4.6':
+  '@storybook/preview-api@7.6.20':
     dependencies:
-      '@storybook/channels': 7.4.6
-      '@storybook/client-logger': 7.4.6
-      '@storybook/core-events': 7.4.6
-      '@storybook/csf': 0.1.1
+      '@storybook/channels': 7.6.20
+      '@storybook/client-logger': 7.6.20
+      '@storybook/core-events': 7.6.20
+      '@storybook/csf': 0.1.13
       '@storybook/global': 5.0.0
-      '@storybook/types': 7.4.6
-      '@types/qs': 6.9.8
+      '@storybook/types': 7.6.20
+      '@types/qs': 6.9.18
       dequal: 2.0.3
       lodash: 4.17.21
       memoizerific: 1.11.3
-      qs: 6.11.2
+      qs: 6.14.0
       synchronous-promise: 2.0.17
       ts-dedent: 2.2.0
       util-deprecate: 1.0.2
 
-  '@storybook/preview@7.4.6': {}
+  '@storybook/preview@7.6.20': {}
 
-  '@storybook/react-dom-shim@7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/react-dom-shim@7.6.20(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
 
-  '@storybook/react-vite@7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(rollup@2.79.1)(typescript@5.5.4)(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))':
+  '@storybook/react-vite@7.6.20(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(rollup@2.79.2)(typescript@5.5.4)(vite@6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0))':
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.2.1(typescript@5.5.4)(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))
-      '@rollup/pluginutils': 5.0.5(rollup@2.79.1)
-      '@storybook/builder-vite': 7.4.6(encoding@0.1.13)(typescript@5.5.4)(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))
-      '@storybook/react': 7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
-      '@vitejs/plugin-react': 3.1.0(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))
-      ast-types: 0.14.2
-      magic-string: 0.30.4
-      react: 18.2.0
-      react-docgen: 6.0.0-alpha.3
-      react-dom: 18.2.0(react@18.2.0)
-      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.0(typescript@5.5.4)(vite@6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0))
+      '@rollup/pluginutils': 5.1.4(rollup@2.79.2)
+      '@storybook/builder-vite': 7.6.20(encoding@0.1.13)(typescript@5.5.4)(vite@6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0))
+      '@storybook/react': 7.6.20(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4)
+      '@vitejs/plugin-react': 3.1.0(vite@6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0))
+      magic-string: 0.30.17
+      react: 18.3.1
+      react-docgen: 7.1.1
+      react-dom: 18.3.1(react@18.3.1)
+      vite: 6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - encoding
@@ -12838,18 +12595,18 @@ snapshots:
       - typescript
       - vite-plugin-glimmerx
 
-  '@storybook/react@7.4.6(encoding@0.1.13)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)':
+  '@storybook/react@7.6.20(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4)':
     dependencies:
-      '@storybook/client-logger': 7.4.6
-      '@storybook/core-client': 7.4.6
-      '@storybook/docs-tools': 7.4.6(encoding@0.1.13)
+      '@storybook/client-logger': 7.6.20
+      '@storybook/core-client': 7.6.20
+      '@storybook/docs-tools': 7.6.20(encoding@0.1.13)
       '@storybook/global': 5.0.0
-      '@storybook/preview-api': 7.4.6
-      '@storybook/react-dom-shim': 7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@storybook/types': 7.4.6
+      '@storybook/preview-api': 7.6.20
+      '@storybook/react-dom-shim': 7.6.20(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@storybook/types': 7.6.20
       '@types/escodegen': 0.0.6
       '@types/estree': 0.0.51
-      '@types/node': 16.18.58
+      '@types/node': 18.19.79
       acorn: 7.4.1
       acorn-jsx: 5.3.2(acorn@7.4.1)
       acorn-walk: 7.2.0
@@ -12857,9 +12614,9 @@ snapshots:
       html-tags: 3.3.1
       lodash: 4.17.21
       prop-types: 15.8.1
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      react-element-to-jsx-string: 15.0.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      react-element-to-jsx-string: 15.0.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       ts-dedent: 2.2.0
       type-fest: 2.19.0
       util-deprecate: 1.0.2
@@ -12869,101 +12626,64 @@ snapshots:
       - encoding
       - supports-color
 
-  '@storybook/router@7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/router@7.6.20':
     dependencies:
-      '@storybook/client-logger': 7.4.6
+      '@storybook/client-logger': 7.6.20
       memoizerific: 1.11.3
-      qs: 6.11.2
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      qs: 6.14.0
 
-  '@storybook/telemetry@7.4.6(encoding@0.1.13)':
+  '@storybook/telemetry@7.6.20(encoding@0.1.13)':
     dependencies:
-      '@storybook/client-logger': 7.4.6
-      '@storybook/core-common': 7.4.6(encoding@0.1.13)
-      '@storybook/csf-tools': 7.4.6
+      '@storybook/client-logger': 7.6.20
+      '@storybook/core-common': 7.6.20(encoding@0.1.13)
+      '@storybook/csf-tools': 7.6.20
       chalk: 4.1.2
       detect-package-manager: 2.0.1
       fetch-retry: 5.0.6
-      fs-extra: 11.1.1
+      fs-extra: 11.3.0
       read-pkg-up: 7.0.1
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@storybook/theming@7.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/theming@7.6.20(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@18.2.0)
-      '@storybook/client-logger': 7.4.6
+      '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@18.3.1)
+      '@storybook/client-logger': 7.6.20
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
 
-  '@storybook/types@7.4.6':
+  '@storybook/types@7.6.20':
     dependencies:
-      '@storybook/channels': 7.4.6
-      '@types/babel__core': 7.20.2
-      '@types/express': 4.17.18
+      '@storybook/channels': 7.6.20
+      '@types/babel__core': 7.20.5
+      '@types/express': 4.17.21
       file-system-cache: 2.3.0
 
-  '@stylistic/eslint-plugin-js@2.6.1(eslint@8.50.0)':
+  '@stylistic/eslint-plugin@2.13.0(eslint@8.57.1)(typescript@5.5.4)':
     dependencies:
-      '@types/eslint': 9.6.0
-      acorn: 8.12.1
-      eslint: 8.50.0
-      eslint-visitor-keys: 4.0.0
-      espree: 10.1.0
-
-  '@stylistic/eslint-plugin-jsx@2.6.1(eslint@8.50.0)':
-    dependencies:
-      '@stylistic/eslint-plugin-js': 2.6.1(eslint@8.50.0)
-      '@types/eslint': 9.6.0
-      eslint: 8.50.0
+      '@typescript-eslint/utils': 8.26.0(eslint@8.57.1)(typescript@5.5.4)
+      eslint: 8.57.1
+      eslint-visitor-keys: 4.2.0
+      espree: 10.3.0
       estraverse: 5.3.0
       picomatch: 4.0.2
-
-  '@stylistic/eslint-plugin-plus@2.6.1(eslint@8.50.0)(typescript@5.5.4)':
-    dependencies:
-      '@types/eslint': 9.6.0
-      '@typescript-eslint/utils': 8.0.0(eslint@8.50.0)(typescript@5.5.4)
-      eslint: 8.50.0
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  '@stylistic/eslint-plugin-ts@2.6.1(eslint@8.50.0)(typescript@5.5.4)':
-    dependencies:
-      '@stylistic/eslint-plugin-js': 2.6.1(eslint@8.50.0)
-      '@types/eslint': 9.6.0
-      '@typescript-eslint/utils': 8.0.0(eslint@8.50.0)(typescript@5.5.4)
-      eslint: 8.50.0
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  '@stylistic/eslint-plugin@2.6.1(eslint@8.50.0)(typescript@5.5.4)':
-    dependencies:
-      '@stylistic/eslint-plugin-js': 2.6.1(eslint@8.50.0)
-      '@stylistic/eslint-plugin-jsx': 2.6.1(eslint@8.50.0)
-      '@stylistic/eslint-plugin-plus': 2.6.1(eslint@8.50.0)(typescript@5.5.4)
-      '@stylistic/eslint-plugin-ts': 2.6.1(eslint@8.50.0)(typescript@5.5.4)
-      '@types/eslint': 9.6.0
-      eslint: 8.50.0
     transitivePeerDependencies:
       - supports-color
       - typescript
 
   '@surma/rollup-plugin-off-main-thread@2.2.3':
     dependencies:
-      ejs: 3.1.9
+      ejs: 3.1.10
       json5: 2.2.3
       magic-string: 0.25.9
       string.prototype.matchall: 4.0.12
 
   '@swc/helpers@0.5.11':
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   '@tootallnate/once@2.0.0': {}
 
@@ -12971,101 +12691,99 @@ snapshots:
 
   '@tweenjs/tween.js@20.0.3': {}
 
-  '@types/babel__core@7.20.2':
+  '@types/babel__core@7.20.5':
     dependencies:
-      '@babel/parser': 7.22.13
-      '@babel/types': 7.23.0
-      '@types/babel__generator': 7.6.5
-      '@types/babel__template': 7.4.2
-      '@types/babel__traverse': 7.20.2
+      '@babel/parser': 7.26.9
+      '@babel/types': 7.26.9
+      '@types/babel__generator': 7.6.8
+      '@types/babel__template': 7.4.4
+      '@types/babel__traverse': 7.20.6
 
-  '@types/babel__generator@7.6.5':
+  '@types/babel__generator@7.6.8':
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.26.9
 
-  '@types/babel__template@7.4.2':
+  '@types/babel__template@7.4.4':
     dependencies:
-      '@babel/parser': 7.22.13
-      '@babel/types': 7.23.0
+      '@babel/parser': 7.26.9
+      '@babel/types': 7.26.9
 
-  '@types/babel__traverse@7.20.2':
+  '@types/babel__traverse@7.20.6':
     dependencies:
-      '@babel/types': 7.23.0
+      '@babel/types': 7.26.9
 
-  '@types/body-parser@1.19.3':
+  '@types/body-parser@1.19.5':
     dependencies:
-      '@types/connect': 3.4.36
-      '@types/node': 22.8.1
+      '@types/connect': 3.4.38
+      '@types/node': 22.13.9
 
-  '@types/chai-subset@1.3.3':
+  '@types/chai-subset@1.3.6(@types/chai@4.3.20)':
     dependencies:
-      '@types/chai': 4.3.6
+      '@types/chai': 4.3.20
 
-  '@types/chai@4.3.6': {}
+  '@types/chai@4.3.20': {}
 
-  '@types/connect@3.4.36':
+  '@types/connect@3.4.38':
     dependencies:
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
 
-  '@types/cookie@0.4.1': {}
-
-  '@types/cors@2.8.15':
+  '@types/cors@2.8.17':
     dependencies:
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
 
-  '@types/cross-spawn@6.0.3':
+  '@types/cross-spawn@6.0.6':
     dependencies:
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
 
   '@types/debug@4.1.12':
     dependencies:
-      '@types/ms': 0.7.34
+      '@types/ms': 2.1.0
 
-  '@types/detect-port@1.3.3': {}
+  '@types/detect-port@1.3.5': {}
 
   '@types/diff-match-patch@1.0.36': {}
 
   '@types/doctrine@0.0.3': {}
 
-  '@types/draco3d@1.4.7': {}
+  '@types/doctrine@0.0.9': {}
 
-  '@types/ejs@3.1.3': {}
+  '@types/draco3d@1.4.10': {}
 
-  '@types/emscripten@1.39.8': {}
+  '@types/ejs@3.1.5': {}
+
+  '@types/emscripten@1.40.0': {}
 
   '@types/escodegen@0.0.6': {}
 
   '@types/eslint-scope@3.7.7':
     dependencies:
-      '@types/eslint': 9.6.0
-      '@types/estree': 1.0.5
+      '@types/eslint': 9.6.1
+      '@types/estree': 1.0.6
 
-  '@types/eslint@9.6.0':
+  '@types/eslint@9.6.1':
     dependencies:
-      '@types/estree': 1.0.5
-      '@types/json-schema': 7.0.12
+      '@types/estree': 1.0.6
+      '@types/json-schema': 7.0.15
 
   '@types/estree@0.0.39': {}
 
   '@types/estree@0.0.51': {}
 
-  '@types/estree@1.0.5': {}
-
   '@types/estree@1.0.6': {}
 
-  '@types/express-serve-static-core@4.17.37':
+  '@types/express-serve-static-core@4.19.6':
     dependencies:
-      '@types/node': 22.8.1
-      '@types/qs': 6.9.8
-      '@types/range-parser': 1.2.5
-      '@types/send': 0.17.2
+      '@types/node': 22.13.9
+      '@types/qs': 6.9.18
+      '@types/range-parser': 1.2.7
+      '@types/send': 0.17.4
 
-  '@types/express@4.17.18':
+  '@types/express@4.17.21':
     dependencies:
-      '@types/body-parser': 1.19.3
-      '@types/express-serve-static-core': 4.17.37
-      '@types/qs': 6.9.8
-      '@types/serve-static': 1.15.3
+      '@types/body-parser': 1.19.5
+      '@types/express-serve-static-core': 4.19.6
+      '@types/qs': 6.9.18
+      '@types/serve-static': 1.15.7
 
   '@types/find-cache-dir@3.2.1': {}
 
@@ -13074,209 +12792,217 @@ snapshots:
   '@types/glob@7.2.0':
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
 
-  '@types/graceful-fs@4.1.7':
+  '@types/graceful-fs@4.1.9':
     dependencies:
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
 
-  '@types/http-cache-semantics@4.0.2': {}
+  '@types/http-cache-semantics@4.0.4': {}
 
-  '@types/http-errors@2.0.2': {}
+  '@types/http-errors@2.0.4': {}
 
-  '@types/istanbul-lib-coverage@2.0.4': {}
+  '@types/istanbul-lib-coverage@2.0.6': {}
 
-  '@types/istanbul-lib-report@3.0.1':
+  '@types/istanbul-lib-report@3.0.3':
     dependencies:
-      '@types/istanbul-lib-coverage': 2.0.4
+      '@types/istanbul-lib-coverage': 2.0.6
 
-  '@types/istanbul-reports@3.0.2':
+  '@types/istanbul-reports@3.0.4':
     dependencies:
-      '@types/istanbul-lib-report': 3.0.1
+      '@types/istanbul-lib-report': 3.0.3
 
   '@types/js-cookie@2.2.7': {}
 
-  '@types/json-schema@7.0.12': {}
+  '@types/json-schema@7.0.15': {}
 
   '@types/json5@0.0.29': {}
 
-  '@types/lodash-es@4.17.9':
+  '@types/linkify-it@5.0.0': {}
+
+  '@types/lodash-es@4.17.12':
     dependencies:
-      '@types/lodash': 4.14.199
+      '@types/lodash': 4.17.16
 
-  '@types/lodash@4.14.199': {}
+  '@types/lodash@4.17.16': {}
 
-  '@types/mdast@4.0.3':
+  '@types/markdown-it@14.1.2':
     dependencies:
-      '@types/unist': 3.0.2
+      '@types/linkify-it': 5.0.0
+      '@types/mdurl': 2.0.0
 
-  '@types/mdx@2.0.8': {}
+  '@types/mdast@4.0.4':
+    dependencies:
+      '@types/unist': 3.0.3
 
-  '@types/mime-types@2.1.2': {}
+  '@types/mdurl@2.0.0': {}
 
-  '@types/mime@1.3.3': {}
+  '@types/mdx@2.0.13': {}
 
-  '@types/mime@3.0.2': {}
+  '@types/mime-types@2.1.4': {}
+
+  '@types/mime@1.3.5': {}
 
   '@types/minimatch@5.1.2': {}
 
-  '@types/minimist@1.2.3': {}
+  '@types/minimist@1.2.5': {}
 
-  '@types/ms@0.7.34': {}
+  '@types/ms@2.1.0': {}
 
-  '@types/node-fetch@2.6.6':
+  '@types/node-fetch@2.6.12':
     dependencies:
-      '@types/node': 22.8.1
-      form-data: 4.0.0
+      '@types/node': 18.19.79
+      form-data: 4.0.2
 
   '@types/node-rsa@1.1.4':
     dependencies:
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
 
-  '@types/node@14.18.56':
+  '@types/node@14.18.63':
     optional: true
 
-  '@types/node@16.18.58': {}
-
-  '@types/node@22.8.1':
+  '@types/node@18.19.79':
     dependencies:
-      undici-types: 6.19.8
+      undici-types: 5.26.5
 
-  '@types/normalize-package-data@2.4.2': {}
-
-  '@types/offscreencanvas@2019.7.2': {}
-
-  '@types/parse-json@4.0.0': {}
-
-  '@types/pretty-hrtime@1.0.1': {}
-
-  '@types/prop-types@15.7.12': {}
-
-  '@types/qs@6.9.8': {}
-
-  '@types/range-parser@1.2.5': {}
-
-  '@types/rbush@3.0.1': {}
-
-  '@types/react-dom@18.2.7':
+  '@types/node@22.13.9':
     dependencies:
-      '@types/react': 18.2.20
+      undici-types: 6.20.0
 
-  '@types/react-transition-group@4.4.7':
-    dependencies:
-      '@types/react': 18.2.20
+  '@types/normalize-package-data@2.4.4': {}
 
-  '@types/react@18.2.20':
-    dependencies:
-      '@types/prop-types': 15.7.12
-      '@types/scheduler': 0.16.3
-      csstype: 3.1.2
+  '@types/offscreencanvas@2019.7.3': {}
 
-  '@types/readable-stream@4.0.12':
+  '@types/parse-json@4.0.2': {}
+
+  '@types/pretty-hrtime@1.0.3': {}
+
+  '@types/prop-types@15.7.14': {}
+
+  '@types/qs@6.9.18': {}
+
+  '@types/range-parser@1.2.7': {}
+
+  '@types/rbush@3.0.4': {}
+
+  '@types/react-dom@18.3.5(@types/react@18.3.18)':
     dependencies:
-      '@types/node': 22.8.1
+      '@types/react': 18.3.18
+
+  '@types/react-transition-group@4.4.12(@types/react@18.3.18)':
+    dependencies:
+      '@types/react': 18.3.18
+
+  '@types/react@18.3.18':
+    dependencies:
+      '@types/prop-types': 15.7.14
+      csstype: 3.1.3
+
+  '@types/readable-stream@4.0.18':
+    dependencies:
+      '@types/node': 22.13.9
       safe-buffer: 5.1.2
 
-  '@types/resolve@1.17.1':
-    dependencies:
-      '@types/node': 22.8.1
+  '@types/resolve@1.20.2': {}
+
+  '@types/resolve@1.20.6': {}
 
   '@types/sat@0.0.31': {}
 
-  '@types/scheduler@0.16.3': {}
+  '@types/semver@7.5.8': {}
 
-  '@types/semver@7.5.3': {}
-
-  '@types/send@0.17.2':
+  '@types/send@0.17.4':
     dependencies:
-      '@types/mime': 1.3.3
-      '@types/node': 22.8.1
+      '@types/mime': 1.3.5
+      '@types/node': 22.13.9
 
-  '@types/serve-static@1.15.3':
+  '@types/serve-static@1.15.7':
     dependencies:
-      '@types/http-errors': 2.0.2
-      '@types/mime': 3.0.2
-      '@types/node': 22.8.1
+      '@types/http-errors': 2.0.4
+      '@types/node': 22.13.9
+      '@types/send': 0.17.4
 
   '@types/sinonjs__fake-timers@8.1.1':
     optional: true
 
-  '@types/sizzle@2.3.3':
+  '@types/sizzle@2.3.9':
     optional: true
 
-  '@types/stats.js@0.17.1': {}
+  '@types/stats.js@0.17.3': {}
 
   '@types/three@0.154.0':
     dependencies:
       '@tweenjs/tween.js': 18.6.4
-      '@types/stats.js': 0.17.1
-      '@types/webxr': 0.5.7
+      '@types/stats.js': 0.17.3
+      '@types/webxr': 0.5.21
       fflate: 0.6.10
       lil-gui: 0.17.0
       meshoptimizer: 0.18.1
 
   '@types/three@0.156.0':
     dependencies:
-      '@types/stats.js': 0.17.1
-      '@types/webxr': 0.5.7
+      '@types/stats.js': 0.17.3
+      '@types/webxr': 0.5.21
       fflate: 0.6.10
       meshoptimizer: 0.18.1
 
-  '@types/trusted-types@2.0.3': {}
+  '@types/trusted-types@2.0.7': {}
 
   '@types/ua-parser-js@0.7.39': {}
 
-  '@types/unist@2.0.8': {}
+  '@types/unist@2.0.11': {}
 
-  '@types/unist@3.0.2': {}
+  '@types/unist@3.0.3': {}
+
+  '@types/uuid@9.0.8': {}
 
   '@types/wait-on@5.3.4':
     dependencies:
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
 
-  '@types/webxr@0.5.7': {}
+  '@types/webxr@0.5.21': {}
 
-  '@types/wicg-file-system-access@2023.10.2': {}
+  '@types/wicg-file-system-access@2023.10.5': {}
 
-  '@types/yargs-parser@21.0.1': {}
+  '@types/yargs-parser@21.0.3': {}
 
-  '@types/yargs@17.0.28':
+  '@types/yargs@17.0.33':
     dependencies:
-      '@types/yargs-parser': 21.0.1
+      '@types/yargs-parser': 21.0.3
 
   '@types/yauzl@2.10.3':
     dependencies:
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
 
-  '@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4)':
+  '@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.5.4))(eslint@8.57.1)(typescript@5.5.4)':
     dependencies:
-      '@eslint-community/regexpp': 4.8.0
-      '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.4)
+      '@eslint-community/regexpp': 4.12.1
+      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.5.4)
       '@typescript-eslint/scope-manager': 6.1.0
-      '@typescript-eslint/type-utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4)
-      '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4)
+      '@typescript-eslint/type-utils': 6.1.0(eslint@8.57.1)(typescript@5.5.4)
+      '@typescript-eslint/utils': 6.1.0(eslint@8.57.1)(typescript@5.5.4)
       '@typescript-eslint/visitor-keys': 6.1.0
       debug: 4.4.0(supports-color@8.1.1)
-      eslint: 8.50.0
+      eslint: 8.57.1
       graphemer: 1.4.0
-      ignore: 5.2.4
+      ignore: 5.3.2
       natural-compare: 1.4.0
       natural-compare-lite: 1.4.0
-      semver: 7.6.0
-      ts-api-utils: 1.3.0(typescript@5.5.4)
+      semver: 7.7.1
+      ts-api-utils: 1.4.3(typescript@5.5.4)
     optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4)':
+  '@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/scope-manager': 6.7.3
-      '@typescript-eslint/types': 6.7.3
-      '@typescript-eslint/typescript-estree': 6.7.3(typescript@5.5.4)
-      '@typescript-eslint/visitor-keys': 6.7.3
+      '@typescript-eslint/scope-manager': 6.21.0
+      '@typescript-eslint/types': 6.21.0
+      '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.4)
+      '@typescript-eslint/visitor-keys': 6.21.0
       debug: 4.4.0(supports-color@8.1.1)
-      eslint: 8.50.0
+      eslint: 8.57.1
     optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -13287,23 +13013,23 @@ snapshots:
       '@typescript-eslint/types': 6.1.0
       '@typescript-eslint/visitor-keys': 6.1.0
 
-  '@typescript-eslint/scope-manager@6.7.3':
+  '@typescript-eslint/scope-manager@6.21.0':
     dependencies:
-      '@typescript-eslint/types': 6.7.3
-      '@typescript-eslint/visitor-keys': 6.7.3
+      '@typescript-eslint/types': 6.21.0
+      '@typescript-eslint/visitor-keys': 6.21.0
 
-  '@typescript-eslint/scope-manager@8.0.0':
+  '@typescript-eslint/scope-manager@8.26.0':
     dependencies:
-      '@typescript-eslint/types': 8.0.0
-      '@typescript-eslint/visitor-keys': 8.0.0
+      '@typescript-eslint/types': 8.26.0
+      '@typescript-eslint/visitor-keys': 8.26.0
 
-  '@typescript-eslint/type-utils@6.1.0(eslint@8.50.0)(typescript@5.5.4)':
+  '@typescript-eslint/type-utils@6.1.0(eslint@8.57.1)(typescript@5.5.4)':
     dependencies:
       '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.5.4)
-      '@typescript-eslint/utils': 6.1.0(eslint@8.50.0)(typescript@5.5.4)
+      '@typescript-eslint/utils': 6.1.0(eslint@8.57.1)(typescript@5.5.4)
       debug: 4.4.0(supports-color@8.1.1)
-      eslint: 8.50.0
-      ts-api-utils: 1.3.0(typescript@5.5.4)
+      eslint: 8.57.1
+      ts-api-utils: 1.4.3(typescript@5.5.4)
     optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -13311,9 +13037,9 @@ snapshots:
 
   '@typescript-eslint/types@6.1.0': {}
 
-  '@typescript-eslint/types@6.7.3': {}
+  '@typescript-eslint/types@6.21.0': {}
 
-  '@typescript-eslint/types@8.0.0': {}
+  '@typescript-eslint/types@8.26.0': {}
 
   '@typescript-eslint/typescript-estree@6.1.0(typescript@5.5.4)':
     dependencies:
@@ -13322,90 +13048,92 @@ snapshots:
       debug: 4.4.0(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.6.0
-      ts-api-utils: 1.3.0(typescript@5.5.4)
+      semver: 7.7.1
+      ts-api-utils: 1.4.3(typescript@5.5.4)
     optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@6.7.3(typescript@5.5.4)':
+  '@typescript-eslint/typescript-estree@6.21.0(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/types': 6.7.3
-      '@typescript-eslint/visitor-keys': 6.7.3
+      '@typescript-eslint/types': 6.21.0
+      '@typescript-eslint/visitor-keys': 6.21.0
       debug: 4.4.0(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.6.0
-      ts-api-utils: 1.3.0(typescript@5.5.4)
+      minimatch: 9.0.3
+      semver: 7.7.1
+      ts-api-utils: 1.4.3(typescript@5.5.4)
     optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.0.0(typescript@5.5.4)':
+  '@typescript-eslint/typescript-estree@8.26.0(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/types': 8.0.0
-      '@typescript-eslint/visitor-keys': 8.0.0
+      '@typescript-eslint/types': 8.26.0
+      '@typescript-eslint/visitor-keys': 8.26.0
       debug: 4.4.0(supports-color@8.1.1)
-      globby: 11.1.0
+      fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
-      semver: 7.6.0
-      ts-api-utils: 1.3.0(typescript@5.5.4)
-    optionalDependencies:
+      semver: 7.7.1
+      ts-api-utils: 2.0.1(typescript@5.5.4)
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@6.1.0(eslint@8.50.0)(typescript@5.5.4)':
+  '@typescript-eslint/utils@6.1.0(eslint@8.57.1)(typescript@5.5.4)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.50.0)
-      '@types/json-schema': 7.0.12
-      '@types/semver': 7.5.3
+      '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1)
+      '@types/json-schema': 7.0.15
+      '@types/semver': 7.5.8
       '@typescript-eslint/scope-manager': 6.1.0
       '@typescript-eslint/types': 6.1.0
       '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.5.4)
-      eslint: 8.50.0
-      semver: 7.6.0
+      eslint: 8.57.1
+      semver: 7.7.1
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@typescript-eslint/utils@8.0.0(eslint@8.50.0)(typescript@5.5.4)':
+  '@typescript-eslint/utils@8.26.0(eslint@8.57.1)(typescript@5.5.4)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.50.0)
-      '@typescript-eslint/scope-manager': 8.0.0
-      '@typescript-eslint/types': 8.0.0
-      '@typescript-eslint/typescript-estree': 8.0.0(typescript@5.5.4)
-      eslint: 8.50.0
+      '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1)
+      '@typescript-eslint/scope-manager': 8.26.0
+      '@typescript-eslint/types': 8.26.0
+      '@typescript-eslint/typescript-estree': 8.26.0(typescript@5.5.4)
+      eslint: 8.57.1
+      typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
-      - typescript
 
   '@typescript-eslint/visitor-keys@6.1.0':
     dependencies:
       '@typescript-eslint/types': 6.1.0
       eslint-visitor-keys: 3.4.3
 
-  '@typescript-eslint/visitor-keys@6.7.3':
+  '@typescript-eslint/visitor-keys@6.21.0':
     dependencies:
-      '@typescript-eslint/types': 6.7.3
+      '@typescript-eslint/types': 6.21.0
       eslint-visitor-keys: 3.4.3
 
-  '@typescript-eslint/visitor-keys@8.0.0':
+  '@typescript-eslint/visitor-keys@8.26.0':
     dependencies:
-      '@typescript-eslint/types': 8.0.0
-      eslint-visitor-keys: 3.4.3
+      '@typescript-eslint/types': 8.26.0
+      eslint-visitor-keys: 4.2.0
 
-  '@vitejs/plugin-react@3.1.0(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))':
+  '@ungap/structured-clone@1.3.0': {}
+
+  '@vitejs/plugin-react@3.1.0(vite@6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0))':
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/plugin-transform-react-jsx-self': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/core@7.26.9)
       magic-string: 0.27.0
       react-refresh: 0.14.2
-      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+      vite: 6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -13413,24 +13141,24 @@ snapshots:
     dependencies:
       '@vitest/spy': 0.34.6
       '@vitest/utils': 0.34.6
-      chai: 4.3.10
+      chai: 4.5.0
 
-  '@vitest/expect@3.0.7':
+  '@vitest/expect@3.0.8':
     dependencies:
-      '@vitest/spy': 3.0.7
-      '@vitest/utils': 3.0.7
+      '@vitest/spy': 3.0.8
+      '@vitest/utils': 3.0.8
       chai: 5.2.0
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.0.7(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))':
+  '@vitest/mocker@3.0.8(vite@6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0))':
     dependencies:
-      '@vitest/spy': 3.0.7
+      '@vitest/spy': 3.0.8
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
-      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+      vite: 6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
 
-  '@vitest/pretty-format@3.0.7':
+  '@vitest/pretty-format@3.0.8':
     dependencies:
       tinyrainbow: 2.0.0
 
@@ -13438,119 +13166,119 @@ snapshots:
     dependencies:
       '@vitest/utils': 0.34.6
       p-limit: 4.0.0
-      pathe: 1.1.1
+      pathe: 1.1.2
 
-  '@vitest/runner@3.0.7':
+  '@vitest/runner@3.0.8':
     dependencies:
-      '@vitest/utils': 3.0.7
+      '@vitest/utils': 3.0.8
       pathe: 2.0.3
 
   '@vitest/snapshot@0.34.6':
     dependencies:
-      magic-string: 0.30.4
-      pathe: 1.1.1
+      magic-string: 0.30.17
+      pathe: 1.1.2
       pretty-format: 29.7.0
 
-  '@vitest/snapshot@3.0.7':
+  '@vitest/snapshot@3.0.8':
     dependencies:
-      '@vitest/pretty-format': 3.0.7
+      '@vitest/pretty-format': 3.0.8
       magic-string: 0.30.17
       pathe: 2.0.3
 
   '@vitest/spy@0.34.6':
     dependencies:
-      tinyspy: 2.2.0
+      tinyspy: 2.2.1
 
-  '@vitest/spy@3.0.7':
+  '@vitest/spy@3.0.8':
     dependencies:
       tinyspy: 3.0.2
 
   '@vitest/utils@0.34.6':
     dependencies:
       diff-sequences: 29.6.3
-      loupe: 2.3.6
+      loupe: 2.3.7
       pretty-format: 29.7.0
 
-  '@vitest/utils@3.0.7':
+  '@vitest/utils@3.0.8':
     dependencies:
-      '@vitest/pretty-format': 3.0.7
+      '@vitest/pretty-format': 3.0.8
       loupe: 3.1.3
       tinyrainbow: 2.0.0
 
-  '@webassemblyjs/ast@1.12.1':
+  '@webassemblyjs/ast@1.14.1':
     dependencies:
-      '@webassemblyjs/helper-numbers': 1.11.6
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+      '@webassemblyjs/helper-numbers': 1.13.2
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
 
-  '@webassemblyjs/floating-point-hex-parser@1.11.6': {}
+  '@webassemblyjs/floating-point-hex-parser@1.13.2': {}
 
-  '@webassemblyjs/helper-api-error@1.11.6': {}
+  '@webassemblyjs/helper-api-error@1.13.2': {}
 
-  '@webassemblyjs/helper-buffer@1.12.1': {}
+  '@webassemblyjs/helper-buffer@1.14.1': {}
 
-  '@webassemblyjs/helper-numbers@1.11.6':
+  '@webassemblyjs/helper-numbers@1.13.2':
     dependencies:
-      '@webassemblyjs/floating-point-hex-parser': 1.11.6
-      '@webassemblyjs/helper-api-error': 1.11.6
+      '@webassemblyjs/floating-point-hex-parser': 1.13.2
+      '@webassemblyjs/helper-api-error': 1.13.2
       '@xtuc/long': 4.2.2
 
-  '@webassemblyjs/helper-wasm-bytecode@1.11.6': {}
+  '@webassemblyjs/helper-wasm-bytecode@1.13.2': {}
 
-  '@webassemblyjs/helper-wasm-section@1.12.1':
+  '@webassemblyjs/helper-wasm-section@1.14.1':
     dependencies:
-      '@webassemblyjs/ast': 1.12.1
-      '@webassemblyjs/helper-buffer': 1.12.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
-      '@webassemblyjs/wasm-gen': 1.12.1
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-buffer': 1.14.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+      '@webassemblyjs/wasm-gen': 1.14.1
 
-  '@webassemblyjs/ieee754@1.11.6':
+  '@webassemblyjs/ieee754@1.13.2':
     dependencies:
       '@xtuc/ieee754': 1.2.0
 
-  '@webassemblyjs/leb128@1.11.6':
+  '@webassemblyjs/leb128@1.13.2':
     dependencies:
       '@xtuc/long': 4.2.2
 
-  '@webassemblyjs/utf8@1.11.6': {}
+  '@webassemblyjs/utf8@1.13.2': {}
 
-  '@webassemblyjs/wasm-edit@1.12.1':
+  '@webassemblyjs/wasm-edit@1.14.1':
     dependencies:
-      '@webassemblyjs/ast': 1.12.1
-      '@webassemblyjs/helper-buffer': 1.12.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
-      '@webassemblyjs/helper-wasm-section': 1.12.1
-      '@webassemblyjs/wasm-gen': 1.12.1
-      '@webassemblyjs/wasm-opt': 1.12.1
-      '@webassemblyjs/wasm-parser': 1.12.1
-      '@webassemblyjs/wast-printer': 1.12.1
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-buffer': 1.14.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+      '@webassemblyjs/helper-wasm-section': 1.14.1
+      '@webassemblyjs/wasm-gen': 1.14.1
+      '@webassemblyjs/wasm-opt': 1.14.1
+      '@webassemblyjs/wasm-parser': 1.14.1
+      '@webassemblyjs/wast-printer': 1.14.1
 
-  '@webassemblyjs/wasm-gen@1.12.1':
+  '@webassemblyjs/wasm-gen@1.14.1':
     dependencies:
-      '@webassemblyjs/ast': 1.12.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
-      '@webassemblyjs/ieee754': 1.11.6
-      '@webassemblyjs/leb128': 1.11.6
-      '@webassemblyjs/utf8': 1.11.6
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+      '@webassemblyjs/ieee754': 1.13.2
+      '@webassemblyjs/leb128': 1.13.2
+      '@webassemblyjs/utf8': 1.13.2
 
-  '@webassemblyjs/wasm-opt@1.12.1':
+  '@webassemblyjs/wasm-opt@1.14.1':
     dependencies:
-      '@webassemblyjs/ast': 1.12.1
-      '@webassemblyjs/helper-buffer': 1.12.1
-      '@webassemblyjs/wasm-gen': 1.12.1
-      '@webassemblyjs/wasm-parser': 1.12.1
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-buffer': 1.14.1
+      '@webassemblyjs/wasm-gen': 1.14.1
+      '@webassemblyjs/wasm-parser': 1.14.1
 
-  '@webassemblyjs/wasm-parser@1.12.1':
+  '@webassemblyjs/wasm-parser@1.14.1':
     dependencies:
-      '@webassemblyjs/ast': 1.12.1
-      '@webassemblyjs/helper-api-error': 1.11.6
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
-      '@webassemblyjs/ieee754': 1.11.6
-      '@webassemblyjs/leb128': 1.11.6
-      '@webassemblyjs/utf8': 1.11.6
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-api-error': 1.13.2
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+      '@webassemblyjs/ieee754': 1.13.2
+      '@webassemblyjs/leb128': 1.13.2
+      '@webassemblyjs/utf8': 1.13.2
 
-  '@webassemblyjs/wast-printer@1.12.1':
+  '@webassemblyjs/wast-printer@1.14.1':
     dependencies:
-      '@webassemblyjs/ast': 1.12.1
+      '@webassemblyjs/ast': 1.14.1
       '@xtuc/long': 4.2.2
 
   '@xboxreplay/errors@0.1.0': {}
@@ -13564,34 +13292,35 @@ snapshots:
 
   '@xmcl/asm@1.0.1': {}
 
-  '@xmcl/core@2.12.0(yauzl@2.10.0)':
+  '@xmcl/core@2.13.0(yauzl@2.10.0)':
     dependencies:
       '@xmcl/unzip': 2.1.2(yauzl@2.10.0)
     transitivePeerDependencies:
       - yauzl
 
-  '@xmcl/file-transfer@1.0.3':
+  '@xmcl/file-transfer@1.0.6':
     dependencies:
-      '@types/http-cache-semantics': 4.0.2
+      '@types/http-cache-semantics': 4.0.4
       http-cache-semantics: 4.1.1
-      undici: 5.25.4
+      undici: 6.0.1
 
   '@xmcl/forge-site-parser@2.0.9':
     dependencies:
-      node-html-parser: 6.1.10
+      node-html-parser: 6.1.13
 
-  '@xmcl/installer@5.1.0':
+  '@xmcl/installer@5.4.0':
     dependencies:
       '@xmcl/asm': 1.0.1
-      '@xmcl/core': 2.12.0(yauzl@2.10.0)
-      '@xmcl/file-transfer': 1.0.3
+      '@xmcl/core': 2.13.0(yauzl@2.10.0)
+      '@xmcl/file-transfer': 1.0.6
       '@xmcl/forge-site-parser': 2.0.9
-      '@xmcl/task': 4.0.6
+      '@xmcl/task': 4.1.0
       '@xmcl/unzip': 2.1.2(yauzl@2.10.0)
-      undici: 5.25.4
+      undici: 6.0.1
       yauzl: 2.10.0
+      yazl: 2.5.1
 
-  '@xmcl/task@4.0.6': {}
+  '@xmcl/task@4.1.0': {}
 
   '@xmcl/text-component@2.1.3': {}
 
@@ -13609,7 +13338,7 @@ snapshots:
   '@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15(esbuild@0.18.20)':
     dependencies:
       esbuild: 0.18.20
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   '@yarnpkg/fslib@2.10.3':
     dependencies:
@@ -13618,32 +13347,32 @@ snapshots:
 
   '@yarnpkg/libzip@2.3.0':
     dependencies:
-      '@types/emscripten': 1.39.8
+      '@types/emscripten': 1.40.0
       tslib: 1.14.1
 
   '@zardoy/flying-squid@0.0.49(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
-      chalk: 5.3.0
+      chalk: 5.4.1
       change-case: 4.1.2
       diamond-square: https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71
       emit-then: 2.0.0
       exit-hook: 2.2.1
       flatmap: 0.0.3
-      long: 5.2.3
+      long: 5.3.1
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
-      prismarine-entity: 2.3.1
+      prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
-      prismarine-nbt: 2.5.0
+      prismarine-nbt: 2.7.0
       prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
-      rambda: 9.2.0
+      rambda: 9.4.2
       random-seed: 0.3.0
       range: 0.0.3
       readline: 1.3.0
@@ -13651,7 +13380,7 @@ snapshots:
       typed-emitter: 1.4.0
       uuid-1345: 1.0.2
       vec3: 0.1.10
-      yaml: 2.4.1
+      yaml: 2.7.0
       yargs: 17.7.2
     transitivePeerDependencies:
       - encoding
@@ -13660,26 +13389,26 @@ snapshots:
   '@zardoy/flying-squid@0.0.58(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
-      chalk: 5.3.0
+      chalk: 5.4.1
       change-case: 4.1.2
       diamond-square: https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71
       emit-then: 2.0.0
       exit-hook: 2.2.1
       flatmap: 0.0.3
-      long: 5.2.3
+      long: 5.3.1
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
-      prismarine-entity: 2.3.1
+      prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
-      rambda: 9.2.0
+      rambda: 9.4.2
       random-seed: 0.3.0
       range: 0.0.3
       readline: 1.3.0
@@ -13687,7 +13416,7 @@ snapshots:
       typed-emitter: 1.4.0
       uuid-1345: 1.0.2
       vec3: 0.1.10
-      yaml: 2.4.1
+      yaml: 2.7.0
       yargs: 17.7.2
     transitivePeerDependencies:
       - encoding
@@ -13695,12 +13424,12 @@ snapshots:
 
   '@zardoy/maxrects-packer@2.7.4': {}
 
-  '@zardoy/react-util@0.2.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@zardoy/react-util@0.2.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       classnames: 2.5.1
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      react-hook-form: 7.52.0(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      react-hook-form: 7.54.2(react@18.3.1)
 
   '@zardoy/utils@0.0.11':
     dependencies:
@@ -13723,29 +13452,27 @@ snapshots:
       mime-types: 2.1.35
       negotiator: 0.6.3
 
-  acorn-import-attributes@1.9.5(acorn@8.12.1):
-    dependencies:
-      acorn: 8.12.1
-
   acorn-jsx@5.3.2(acorn@7.4.1):
     dependencies:
       acorn: 7.4.1
 
-  acorn-jsx@5.3.2(acorn@8.12.1):
+  acorn-jsx@5.3.2(acorn@8.14.1):
     dependencies:
-      acorn: 8.12.1
+      acorn: 8.14.1
 
   acorn-walk@7.2.0: {}
 
-  acorn-walk@8.2.0: {}
+  acorn-walk@8.3.4:
+    dependencies:
+      acorn: 8.14.1
 
   acorn@7.4.1: {}
 
-  acorn@8.12.1: {}
+  acorn@8.14.1: {}
 
   address@1.2.2: {}
 
-  adm-zip@0.5.12: {}
+  adm-zip@0.5.16: {}
 
   aes-js@3.1.2: {}
 
@@ -13761,13 +13488,7 @@ snapshots:
       - supports-color
     optional: true
 
-  agent-base@7.1.0:
-    dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - supports-color
-
-  agentkeepalive@4.5.0:
+  agentkeepalive@4.6.0:
     dependencies:
       humanize-ms: 1.2.1
     optional: true
@@ -13777,10 +13498,19 @@ snapshots:
       clean-stack: 2.2.0
       indent-string: 4.0.0
 
+  ajv-formats@2.1.1(ajv@8.17.1):
+    optionalDependencies:
+      ajv: 8.17.1
+
   ajv-keywords@3.5.2(ajv@6.12.6):
     dependencies:
       ajv: 6.12.6
 
+  ajv-keywords@5.1.0(ajv@8.17.1):
+    dependencies:
+      ajv: 8.17.1
+      fast-deep-equal: 3.1.3
+
   ajv@6.12.6:
     dependencies:
       fast-deep-equal: 3.1.3
@@ -13788,12 +13518,12 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  ajv@8.12.0:
+  ajv@8.17.1:
     dependencies:
       fast-deep-equal: 3.1.3
+      fast-uri: 3.0.6
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
-      uri-js: 4.4.1
 
   animejs@3.2.1: {}
 
@@ -13807,7 +13537,7 @@ snapshots:
 
   ansi-regex@5.0.1: {}
 
-  ansi-regex@6.0.1: {}
+  ansi-regex@6.1.0: {}
 
   ansi-styles@3.2.1:
     dependencies:
@@ -13870,9 +13600,9 @@ snapshots:
 
   argparse@2.0.1: {}
 
-  aria-hidden@1.2.3:
+  aria-hidden@1.2.4:
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   arr-diff@4.0.0: {}
 
@@ -13882,7 +13612,7 @@ snapshots:
 
   array-buffer-byte-length@1.0.2:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       is-array-buffer: 3.0.5
 
   array-flatten@1.1.1: {}
@@ -13923,13 +13653,6 @@ snapshots:
       es-abstract: 1.23.9
       es-shim-unscopables: 1.1.0
 
-  array.prototype.toreversed@1.1.2:
-    dependencies:
-      call-bind: 1.0.8
-      define-properties: 1.2.1
-      es-abstract: 1.23.9
-      es-shim-unscopables: 1.1.0
-
   array.prototype.tosorted@1.1.4:
     dependencies:
       call-bind: 1.0.8
@@ -13953,12 +13676,11 @@ snapshots:
 
   arrify@1.0.1: {}
 
-  asn1.js@5.4.1:
+  asn1.js@4.10.1:
     dependencies:
-      bn.js: 4.12.0
+      bn.js: 4.12.1
       inherits: 2.0.4
       minimalistic-assert: 1.0.1
-      safer-buffer: 2.1.2
 
   asn1@0.2.3: {}
 
@@ -13973,7 +13695,7 @@ snapshots:
     dependencies:
       call-bind: 1.0.8
       is-nan: 1.3.2
-      object-is: 1.1.5
+      object-is: 1.1.6
       object.assign: 4.1.7
       util: 0.12.5
 
@@ -13983,17 +13705,9 @@ snapshots:
 
   assign-symbols@1.0.0: {}
 
-  ast-types@0.14.2:
-    dependencies:
-      tslib: 2.6.2
-
-  ast-types@0.15.2:
-    dependencies:
-      tslib: 2.6.2
-
   ast-types@0.16.1:
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   astral-regex@2.0.0:
     optional: true
@@ -14008,7 +13722,7 @@ snapshots:
     dependencies:
       lodash: 4.17.21
 
-  async@3.2.5: {}
+  async@3.2.6: {}
 
   asynckit@0.4.0: {}
 
@@ -14018,35 +13732,35 @@ snapshots:
 
   available-typed-arrays@1.0.7:
     dependencies:
-      possible-typed-array-names: 1.0.0
+      possible-typed-array-names: 1.1.0
 
   aws-sign2@0.7.0:
     optional: true
 
-  aws4@1.12.0:
+  aws4@1.13.2:
     optional: true
 
   axios@0.21.4(debug@4.4.0):
     dependencies:
-      follow-redirects: 1.15.6(debug@4.4.0)
+      follow-redirects: 1.15.9(debug@4.4.0)
     transitivePeerDependencies:
       - debug
 
-  axios@1.7.2(debug@4.4.0):
+  axios@1.8.2(debug@4.4.0):
     dependencies:
-      follow-redirects: 1.15.6(debug@4.4.0)
-      form-data: 4.0.0
+      follow-redirects: 1.15.9(debug@4.4.0)
+      form-data: 4.0.2
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
 
-  babel-core@7.0.0-bridge.0(@babel/core@7.22.11):
+  babel-core@7.0.0-bridge.0(@babel/core@7.26.9):
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.26.9
 
   babel-plugin-istanbul@6.1.1:
     dependencies:
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-plugin-utils': 7.26.5
       '@istanbuljs/load-nyc-config': 1.1.0
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-instrument: 5.2.1
@@ -14056,31 +13770,31 @@ snapshots:
 
   babel-plugin-macros@3.1.0:
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.26.9
       cosmiconfig: 7.1.0
-      resolve: 1.22.4
+      resolve: 1.22.10
 
-  babel-plugin-polyfill-corejs2@0.4.5(@babel/core@7.22.11):
+  babel-plugin-polyfill-corejs2@0.4.12(@babel/core@7.26.9):
     dependencies:
-      '@babel/compat-data': 7.22.9
-      '@babel/core': 7.22.11
-      '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.22.11)
+      '@babel/compat-data': 7.26.8
+      '@babel/core': 7.26.9
+      '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.9)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-polyfill-corejs3@0.8.3(@babel/core@7.22.11):
+  babel-plugin-polyfill-corejs3@0.11.1(@babel/core@7.26.9):
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.22.11)
-      core-js-compat: 3.32.1
+      '@babel/core': 7.26.9
+      '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.9)
+      core-js-compat: 3.41.0
     transitivePeerDependencies:
       - supports-color
 
-  babel-plugin-polyfill-regenerator@0.5.2(@babel/core@7.22.11):
+  babel-plugin-polyfill-regenerator@0.6.3(@babel/core@7.26.9):
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-define-polyfill-provider': 0.4.2(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.9)
     transitivePeerDependencies:
       - supports-color
 
@@ -14102,7 +13816,7 @@ snapshots:
     dependencies:
       cache-base: 1.0.1
       class-utils: 0.3.6
-      component-emitter: 1.3.0
+      component-emitter: 1.3.1
       define-property: 1.0.0
       isobject: 3.0.1
       mixin-deep: 1.3.2
@@ -14125,11 +13839,11 @@ snapshots:
     dependencies:
       open: 8.4.2
 
-  big-integer@1.6.51: {}
+  big-integer@1.6.52: {}
 
   binary-extensions@1.13.1: {}
 
-  binary-extensions@2.2.0: {}
+  binary-extensions@2.3.0: {}
 
   bindings@1.5.0:
     dependencies:
@@ -14157,11 +13871,11 @@ snapshots:
   bmp-js@0.1.0:
     optional: true
 
-  bn.js@4.12.0: {}
+  bn.js@4.12.1: {}
 
   bn.js@5.2.1: {}
 
-  body-parser@1.20.1:
+  body-parser@1.20.3:
     dependencies:
       bytes: 3.1.2
       content-type: 1.0.5
@@ -14171,24 +13885,7 @@ snapshots:
       http-errors: 2.0.0
       iconv-lite: 0.4.24
       on-finished: 2.4.1
-      qs: 6.11.0
-      raw-body: 2.5.1
-      type-is: 1.6.18
-      unpipe: 1.0.0
-    transitivePeerDependencies:
-      - supports-color
-
-  body-parser@1.20.2:
-    dependencies:
-      bytes: 3.1.2
-      content-type: 1.0.5
-      debug: 2.6.9
-      depd: 2.0.0
-      destroy: 1.2.0
-      http-errors: 2.0.0
-      iconv-lite: 0.4.24
-      on-finished: 2.4.1
-      qs: 6.11.0
+      qs: 6.13.0
       raw-body: 2.5.2
       type-is: 1.6.18
       unpipe: 1.0.0
@@ -14199,7 +13896,7 @@ snapshots:
 
   bplist-parser@0.2.0:
     dependencies:
-      big-integer: 1.6.51
+      big-integer: 1.6.52
 
   brace-expansion@1.1.11:
     dependencies:
@@ -14225,9 +13922,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  braces@3.0.2:
+  braces@3.0.3:
     dependencies:
-      fill-range: 7.0.1
+      fill-range: 7.1.1
 
   brorand@1.1.0: {}
 
@@ -14242,7 +13939,7 @@ snapshots:
   browserify-aes@1.2.0:
     dependencies:
       buffer-xor: 1.0.3
-      cipher-base: 1.0.4
+      cipher-base: 1.0.6
       create-hash: 1.2.0
       evp_bytestokey: 1.0.3
       inherits: 2.0.4
@@ -14256,26 +13953,28 @@ snapshots:
 
   browserify-des@1.0.2:
     dependencies:
-      cipher-base: 1.0.4
+      cipher-base: 1.0.6
       des.js: 1.1.0
       inherits: 2.0.4
       safe-buffer: 5.2.1
 
-  browserify-rsa@4.1.0:
+  browserify-rsa@4.1.1:
     dependencies:
       bn.js: 5.2.1
       randombytes: 2.1.0
+      safe-buffer: 5.2.1
 
-  browserify-sign@4.2.1:
+  browserify-sign@4.2.3:
     dependencies:
       bn.js: 5.2.1
-      browserify-rsa: 4.1.0
+      browserify-rsa: 4.1.1
       create-hash: 1.2.0
       create-hmac: 1.1.7
-      elliptic: 6.5.4
+      elliptic: 6.6.1
+      hash-base: 3.0.5
       inherits: 2.0.4
-      parse-asn1: 5.1.6
-      readable-stream: 3.6.2
+      parse-asn1: 5.1.7
+      readable-stream: 2.3.8
       safe-buffer: 5.2.1
 
   browserify-zlib@0.1.4:
@@ -14286,12 +13985,12 @@ snapshots:
     dependencies:
       pako: 1.0.11
 
-  browserslist@4.23.2:
+  browserslist@4.24.4:
     dependencies:
-      caniuse-lite: 1.0.30001646
-      electron-to-chromium: 1.5.0
-      node-releases: 2.0.18
-      update-browserslist-db: 1.1.0(browserslist@4.23.2)
+      caniuse-lite: 1.0.30001702
+      electron-to-chromium: 1.5.113
+      node-releases: 2.0.19
+      update-browserslist-db: 1.1.3(browserslist@4.24.4)
 
   bser@2.1.1:
     dependencies:
@@ -14319,25 +14018,8 @@ snapshots:
 
   builtin-status-codes@3.0.0: {}
 
-  bytes@3.0.0: {}
-
   bytes@3.1.2: {}
 
-  c8@7.14.0:
-    dependencies:
-      '@bcoe/v8-coverage': 0.2.3
-      '@istanbuljs/schema': 0.1.3
-      find-up: 5.0.0
-      foreground-child: 2.0.0
-      istanbul-lib-coverage: 3.2.0
-      istanbul-lib-report: 3.0.1
-      istanbul-reports: 3.1.6
-      rimraf: 3.0.2
-      test-exclude: 6.0.0
-      v8-to-istanbul: 9.1.3
-      yargs: 16.2.0
-      yargs-parser: 20.2.9
-
   cac@6.7.14: {}
 
   cacache@16.1.3:
@@ -14358,7 +14040,7 @@ snapshots:
       promise-inflight: 1.0.1
       rimraf: 3.0.2
       ssri: 9.0.1
-      tar: 6.2.0
+      tar: 6.2.1
       unique-filename: 2.0.1
     transitivePeerDependencies:
       - bluebird
@@ -14367,7 +14049,7 @@ snapshots:
   cache-base@1.0.1:
     dependencies:
       collection-visit: 1.0.0
-      component-emitter: 1.3.0
+      component-emitter: 1.3.1
       get-value: 2.0.6
       has-value: 1.0.0
       isobject: 3.0.1
@@ -14391,11 +14073,6 @@ snapshots:
       get-intrinsic: 1.3.0
       set-function-length: 1.2.2
 
-  call-bound@1.0.3:
-    dependencies:
-      call-bind-apply-helpers: 1.0.2
-      get-intrinsic: 1.3.0
-
   call-bound@1.0.4:
     dependencies:
       call-bind-apply-helpers: 1.0.2
@@ -14406,7 +14083,7 @@ snapshots:
   camel-case@4.1.2:
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   camelcase-keys@7.0.2:
     dependencies:
@@ -14419,12 +14096,12 @@ snapshots:
 
   camelcase@6.3.0: {}
 
-  caniuse-lite@1.0.30001646: {}
+  caniuse-lite@1.0.30001702: {}
 
   canvas@2.11.2(encoding@0.1.13):
     dependencies:
       '@mapbox/node-pre-gyp': 1.0.11(encoding@0.1.13)
-      nan: 2.18.0
+      nan: 2.22.2
       simple-get: 3.1.1
     transitivePeerDependencies:
       - encoding
@@ -14434,37 +14111,28 @@ snapshots:
   capital-case@1.0.4:
     dependencies:
       no-case: 3.0.4
-      tslib: 2.6.2
+      tslib: 2.8.1
       upper-case-first: 2.0.2
 
   caseless@0.12.0:
     optional: true
 
-  cbor-extract@2.2.0:
+  centra@2.7.0(debug@4.4.0):
     dependencies:
-      node-gyp-build-optional-packages: 5.1.1
-    optionalDependencies:
-      '@cbor-extract/cbor-extract-darwin-arm64': 2.2.0
-      '@cbor-extract/cbor-extract-darwin-x64': 2.2.0
-      '@cbor-extract/cbor-extract-linux-arm': 2.2.0
-      '@cbor-extract/cbor-extract-linux-arm64': 2.2.0
-      '@cbor-extract/cbor-extract-linux-x64': 2.2.0
-      '@cbor-extract/cbor-extract-win32-x64': 2.2.0
+      follow-redirects: 1.15.9(debug@4.4.0)
+    transitivePeerDependencies:
+      - debug
     optional: true
 
-  cbor-x@1.5.4:
-    optionalDependencies:
-      cbor-extract: 2.2.0
-
-  chai@4.3.10:
+  chai@4.5.0:
     dependencies:
       assertion-error: 1.1.0
       check-error: 1.0.3
-      deep-eql: 4.1.3
+      deep-eql: 4.1.4
       get-func-name: 2.0.2
-      loupe: 2.3.6
+      loupe: 2.3.7
       pathval: 1.1.1
-      type-detect: 4.0.8
+      type-detect: 4.1.0
 
   chai@5.2.0:
     dependencies:
@@ -14485,7 +14153,7 @@ snapshots:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
-  chalk@5.3.0: {}
+  chalk@5.4.1: {}
 
   change-case@4.1.2:
     dependencies:
@@ -14500,9 +14168,7 @@ snapshots:
       path-case: 3.0.4
       sentence-case: 3.0.4
       snake-case: 3.0.4
-      tslib: 2.6.2
-
-  change-case@5.1.2: {}
+      tslib: 2.8.1
 
   change-case@5.4.4: {}
 
@@ -14537,10 +14203,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  chokidar@3.5.3:
+  chokidar@3.6.0:
     dependencies:
       anymatch: 3.1.3
-      braces: 3.0.2
+      braces: 3.0.3
       glob-parent: 5.1.2
       is-binary-path: 2.1.0
       is-glob: 4.0.3
@@ -14555,13 +14221,17 @@ snapshots:
 
   chrome-trace-event@1.0.4: {}
 
-  ci-info@3.8.0: {}
+  ci-info@3.9.0: {}
 
-  cipher-base@1.0.4:
+  cipher-base@1.0.6:
     dependencies:
       inherits: 2.0.4
       safe-buffer: 5.2.1
 
+  citty@0.1.6:
+    dependencies:
+      consola: 3.4.0
+
   class-utils@0.3.6:
     dependencies:
       arr-union: 3.1.0
@@ -14581,9 +14251,9 @@ snapshots:
     dependencies:
       restore-cursor: 3.1.0
 
-  cli-spinners@2.9.1: {}
+  cli-spinners@2.9.2: {}
 
-  cli-table3@0.6.3:
+  cli-table3@0.6.5:
     dependencies:
       string-width: 4.2.3
     optionalDependencies:
@@ -14595,12 +14265,6 @@ snapshots:
       string-width: 4.2.3
     optional: true
 
-  cliui@7.0.4:
-    dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 7.0.0
-
   cliui@8.0.1:
     dependencies:
       string-width: 4.2.3
@@ -14647,7 +14311,8 @@ snapshots:
       color-convert: 2.0.1
       color-string: 1.9.1
 
-  colorette@2.0.20: {}
+  colorette@2.0.20:
+    optional: true
 
   colors@1.4.0: {}
 
@@ -14672,23 +14337,23 @@ snapshots:
   component-emitter@1.2.1:
     optional: true
 
-  component-emitter@1.3.0: {}
+  component-emitter@1.3.1: {}
 
   component-inherit@0.0.3:
     optional: true
 
   compressible@2.0.18:
     dependencies:
-      mime-db: 1.52.0
+      mime-db: 1.53.0
 
-  compression@1.7.4:
+  compression@1.8.0:
     dependencies:
-      accepts: 1.3.8
-      bytes: 3.0.0
+      bytes: 3.1.2
       compressible: 2.0.18
       debug: 2.6.9
+      negotiator: 0.6.4
       on-headers: 1.0.2
-      safe-buffer: 5.1.2
+      safe-buffer: 5.2.1
       vary: 1.1.2
     transitivePeerDependencies:
       - supports-color
@@ -14702,6 +14367,8 @@ snapshots:
       readable-stream: 2.3.8
       typedarray: 0.0.6
 
+  confbox@0.1.8: {}
+
   confusing-browser-globals@1.0.11: {}
 
   connect@3.7.0:
@@ -14713,6 +14380,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  consola@3.4.0: {}
+
   console-browserify@1.2.0: {}
 
   console-control-strings@1.1.0:
@@ -14721,7 +14390,7 @@ snapshots:
   constant-case@3.0.4:
     dependencies:
       no-case: 3.0.4
-      tslib: 2.6.2
+      tslib: 2.8.1
       upper-case: 2.0.2
 
   constants-browserify@1.0.0: {}
@@ -14738,8 +14407,8 @@ snapshots:
       lodash-es: 4.17.21
       typed-emitter: 2.1.0
     optionalDependencies:
-      react: 18.2.0
-      use-typed-event-listener: 4.0.2(react@18.2.0)(typescript@5.5.4)
+      react: 18.3.1
+      use-typed-event-listener: 4.0.2(react@18.3.1)(typescript@5.5.4)
     transitivePeerDependencies:
       - typescript
 
@@ -14749,9 +14418,12 @@ snapshots:
 
   cookie-signature@1.0.6: {}
 
-  cookie@0.4.2: {}
+  cookie@0.4.2:
+    optional: true
 
-  cookie@0.5.0: {}
+  cookie@0.7.1: {}
+
+  cookie@0.7.2: {}
 
   copy-descriptor@0.1.1: {}
 
@@ -14759,12 +14431,15 @@ snapshots:
     dependencies:
       toggle-selection: 1.0.6
 
-  core-js-compat@3.32.1:
+  core-js-compat@3.41.0:
     dependencies:
-      browserslist: 4.23.2
+      browserslist: 4.24.4
 
   core-js@3.37.1: {}
 
+  core-js@3.41.0:
+    optional: true
+
   core-util-is@1.0.2:
     optional: true
 
@@ -14779,15 +14454,15 @@ snapshots:
 
   cosmiconfig@7.1.0:
     dependencies:
-      '@types/parse-json': 4.0.0
-      import-fresh: 3.3.0
+      '@types/parse-json': 4.0.2
+      import-fresh: 3.3.1
       parse-json: 5.2.0
       path-type: 4.0.0
       yaml: 1.10.2
 
   cosmiconfig@8.3.6(typescript@5.5.4):
     dependencies:
-      import-fresh: 3.3.0
+      import-fresh: 3.3.1
       js-yaml: 4.1.0
       parse-json: 5.2.0
       path-type: 4.0.0
@@ -14796,12 +14471,12 @@ snapshots:
 
   create-ecdh@4.0.4:
     dependencies:
-      bn.js: 4.12.0
-      elliptic: 6.5.4
+      bn.js: 4.12.1
+      elliptic: 6.6.1
 
   create-hash@1.2.0:
     dependencies:
-      cipher-base: 1.0.4
+      cipher-base: 1.0.6
       inherits: 2.0.4
       md5.js: 1.3.5
       ripemd160: 2.0.2
@@ -14809,7 +14484,7 @@ snapshots:
 
   create-hmac@1.1.7:
     dependencies:
-      cipher-base: 1.0.4
+      cipher-base: 1.0.6
       create-hash: 1.2.0
       inherits: 2.0.4
       ripemd160: 2.0.2
@@ -14818,7 +14493,7 @@ snapshots:
 
   crelt@1.0.6: {}
 
-  cross-spawn@6.0.5:
+  cross-spawn@6.0.6:
     dependencies:
       nice-try: 1.0.5
       path-key: 2.0.1
@@ -14826,7 +14501,7 @@ snapshots:
       shebang-command: 1.2.0
       which: 1.3.1
 
-  cross-spawn@7.0.3:
+  cross-spawn@7.0.6:
     dependencies:
       path-key: 3.1.1
       shebang-command: 2.0.0
@@ -14834,14 +14509,15 @@ snapshots:
 
   crypt@0.0.2: {}
 
-  crypto-browserify@3.12.0:
+  crypto-browserify@3.12.1:
     dependencies:
       browserify-cipher: 1.0.1
-      browserify-sign: 4.2.1
+      browserify-sign: 4.2.3
       create-ecdh: 4.0.4
       create-hash: 1.2.0
       create-hmac: 1.1.7
       diffie-hellman: 5.0.3
+      hash-base: 3.0.5
       inherits: 2.0.4
       pbkdf2: 3.1.2
       public-encrypt: 4.0.3
@@ -14852,14 +14528,14 @@ snapshots:
 
   css-in-js-utils@3.1.0:
     dependencies:
-      hyphenate-style-name: 1.0.4
+      hyphenate-style-name: 1.1.0
 
   css-select@5.1.0:
     dependencies:
       boolbase: 1.0.0
       css-what: 6.1.0
       domhandler: 5.0.3
-      domutils: 3.1.0
+      domutils: 3.2.2
       nth-check: 2.1.1
 
   css-tree@1.1.3:
@@ -14869,17 +14545,17 @@ snapshots:
 
   css-what@6.1.0: {}
 
-  csstype@3.1.2: {}
+  csstype@3.1.3: {}
 
   cypress-esbuild-preprocessor@1.0.2: {}
 
-  cypress-plugin-snapshots@1.4.4(cypress@10.11.0):
+  cypress-plugin-snapshots@1.4.4(cypress@10.11.0)(debug@4.4.0):
     dependencies:
       cypress: 10.11.0
       diff2html: 2.12.2
       fs-extra: 7.0.1
       image-size: 0.7.5
-      jimp: 0.10.3
+      jimp: 0.10.3(debug@4.4.0)
       js-base64: 2.6.4
       lodash: 4.17.21
       pixelmatch: 4.0.2
@@ -14887,12 +14563,13 @@ snapshots:
       prettier: 1.19.1
       rimraf: 2.7.1
       sanitize-filename: 1.6.3
-      socket.io: 2.5.0
+      socket.io: 2.5.1
       socket.io-client: 2.5.0
       source-map-support: 0.5.21
       unidiff: 1.0.2
     transitivePeerDependencies:
       - bufferutil
+      - debug
       - supports-color
       - utf-8-validate
     optional: true
@@ -14901,9 +14578,9 @@ snapshots:
     dependencies:
       '@cypress/request': 2.88.12
       '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
-      '@types/node': 14.18.56
+      '@types/node': 14.18.63
       '@types/sinonjs__fake-timers': 8.1.1
-      '@types/sizzle': 2.3.3
+      '@types/sizzle': 2.3.9
       arch: 2.2.0
       blob-util: 2.0.2
       bluebird: 3.7.2
@@ -14912,10 +14589,10 @@ snapshots:
       chalk: 4.1.2
       check-more-types: 2.24.0
       cli-cursor: 3.1.0
-      cli-table3: 0.6.3
+      cli-table3: 0.6.5
       commander: 5.1.0
       common-tags: 1.8.2
-      dayjs: 1.11.9
+      dayjs: 1.11.13
       debug: 4.4.0(supports-color@8.1.1)
       enquirer: 2.4.1
       eventemitter2: 6.4.7
@@ -14936,9 +14613,9 @@ snapshots:
       pretty-bytes: 5.6.0
       proxy-from-env: 1.0.0
       request-progress: 3.0.0
-      semver: 7.6.0
+      semver: 7.7.1
       supports-color: 8.1.1
-      tmp: 0.2.1
+      tmp: 0.2.3
       untildify: 4.0.0
       yauzl: 2.10.0
     optional: true
@@ -14950,23 +14627,23 @@ snapshots:
 
   data-view-buffer@1.0.2:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
       is-data-view: 1.0.2
 
   data-view-byte-length@1.0.2:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
       is-data-view: 1.0.2
 
   data-view-byte-offset@1.0.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
       is-data-view: 1.0.2
 
-  dayjs@1.11.9:
+  dayjs@1.11.13:
     optional: true
 
   debounce@1.2.1: {}
@@ -15010,7 +14687,7 @@ snapshots:
 
   decamelize@5.0.1: {}
 
-  decode-named-character-reference@1.0.2:
+  decode-named-character-reference@1.1.0:
     dependencies:
       character-entities: 2.0.2
 
@@ -15025,9 +14702,9 @@ snapshots:
     dependencies:
       mimic-response: 3.1.0
 
-  deep-eql@4.1.3:
+  deep-eql@4.1.4:
     dependencies:
-      type-detect: 4.0.8
+      type-detect: 4.1.0
 
   deep-eql@5.0.2: {}
 
@@ -15079,7 +14756,7 @@ snapshots:
       is-descriptor: 1.0.3
       isobject: 3.0.1
 
-  defu@6.1.2: {}
+  defu@6.1.4: {}
 
   del@6.1.1:
     dependencies:
@@ -15101,10 +14778,12 @@ snapshots:
 
   depd@2.0.0: {}
 
-  dequal@1.0.0: {}
-
   dequal@2.0.3: {}
 
+  derive-valtio@0.1.0(valtio@1.13.2(@types/react@18.3.18)(react@18.3.1)):
+    dependencies:
+      valtio: 1.13.2(@types/react@18.3.18)(react@18.3.1)
+
   des.js@1.1.0:
     dependencies:
       inherits: 2.0.4
@@ -15114,7 +14793,7 @@ snapshots:
 
   detect-collisions@7.0.5:
     dependencies:
-      '@types/rbush': 3.0.1
+      '@types/rbush': 3.0.4
       '@types/sat': 0.0.31
       poly-decomp: 0.3.0
       rbush: 3.0.1
@@ -15122,10 +14801,7 @@ snapshots:
 
   detect-indent@6.1.0: {}
 
-  detect-libc@2.0.2: {}
-
-  detect-libc@2.0.3:
-    optional: true
+  detect-libc@2.0.3: {}
 
   detect-node-es@1.1.0: {}
 
@@ -15133,7 +14809,7 @@ snapshots:
     dependencies:
       execa: 5.1.1
 
-  detect-port@1.5.1:
+  detect-port@1.6.1:
     dependencies:
       address: 1.2.2
       debug: 4.4.0(supports-color@8.1.1)
@@ -15161,7 +14837,7 @@ snapshots:
       diff: 4.0.2
       hogan.js: 3.0.2
       merge: 1.2.1
-      whatwg-fetch: 3.6.18
+      whatwg-fetch: 3.6.20
     optional: true
 
   diff@2.2.3:
@@ -15172,7 +14848,7 @@ snapshots:
 
   diffie-hellman@5.0.3:
     dependencies:
-      bn.js: 4.12.0
+      bn.js: 4.12.1
       miller-rabin: 4.0.1
       randombytes: 2.1.0
 
@@ -15192,8 +14868,8 @@ snapshots:
 
   dom-helpers@5.2.1:
     dependencies:
-      '@babel/runtime': 7.24.5
-      csstype: 3.1.2
+      '@babel/runtime': 7.26.9
+      csstype: 3.1.3
 
   dom-serializer@2.0.0:
     dependencies:
@@ -15212,7 +14888,7 @@ snapshots:
     dependencies:
       domelementtype: 2.3.0
 
-  domutils@3.1.0:
+  domutils@3.2.2:
     dependencies:
       dom-serializer: 2.0.0
       domelementtype: 2.3.0
@@ -15221,13 +14897,13 @@ snapshots:
   dot-case@3.0.4:
     dependencies:
       no-case: 3.0.4
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   dotenv-expand@10.0.0: {}
 
-  dotenv@16.3.1: {}
+  dotenv@16.4.7: {}
 
-  draco3d@1.5.6: {}
+  draco3d@1.5.7: {}
 
   dunder-proto@1.0.1:
     dependencies:
@@ -15242,7 +14918,7 @@ snapshots:
       end-of-stream: 1.4.4
       inherits: 2.0.4
       readable-stream: 2.3.8
-      stream-shift: 1.0.1
+      stream-shift: 1.0.3
 
   eastasianwidth@0.2.0: {}
 
@@ -15258,15 +14934,15 @@ snapshots:
 
   ee-first@1.1.1: {}
 
-  ejs@3.1.9:
+  ejs@3.1.10:
     dependencies:
-      jake: 10.8.7
+      jake: 10.9.2
 
-  electron-to-chromium@1.5.0: {}
+  electron-to-chromium@1.5.113: {}
 
-  elliptic@6.5.4:
+  elliptic@6.6.1:
     dependencies:
-      bn.js: 4.12.0
+      bn.js: 4.12.1
       brorand: 1.1.0
       hash.js: 1.1.7
       hmac-drbg: 1.0.1
@@ -15295,9 +14971,9 @@ snapshots:
 
   endian-toggle@0.0.0: {}
 
-  engine.io-client@3.5.3:
+  engine.io-client@3.5.4:
     dependencies:
-      component-emitter: 1.3.0
+      component-emitter: 1.3.1
       component-inherit: 0.0.3
       debug: 3.1.0
       engine.io-parser: 2.2.1
@@ -15305,7 +14981,7 @@ snapshots:
       indexof: 0.0.1
       parseqs: 0.0.6
       parseuri: 0.0.6
-      ws: 7.4.6
+      ws: 7.5.10
       xmlhttprequest-ssl: 1.6.3
       yeast: 0.1.2
     transitivePeerDependencies:
@@ -15314,13 +14990,13 @@ snapshots:
       - utf-8-validate
     optional: true
 
-  engine.io-client@6.5.2:
+  engine.io-client@6.6.3:
     dependencies:
-      '@socket.io/component-emitter': 3.1.0
+      '@socket.io/component-emitter': 3.1.2
       debug: 4.3.7
-      engine.io-parser: 5.2.1
-      ws: 8.11.0
-      xmlhttprequest-ssl: 2.0.0
+      engine.io-parser: 5.2.3
+      ws: 8.17.1
+      xmlhttprequest-ssl: 2.1.2
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -15335,40 +15011,39 @@ snapshots:
       has-binary2: 1.0.3
     optional: true
 
-  engine.io-parser@5.2.1: {}
+  engine.io-parser@5.2.3: {}
 
-  engine.io@3.6.1:
+  engine.io@3.6.2:
     dependencies:
       accepts: 1.3.8
       base64id: 2.0.0
       cookie: 0.4.2
       debug: 4.1.1
       engine.io-parser: 2.2.1
-      ws: 7.4.6
+      ws: 7.5.10
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
     optional: true
 
-  engine.io@6.5.3:
+  engine.io@6.6.4:
     dependencies:
-      '@types/cookie': 0.4.1
-      '@types/cors': 2.8.15
-      '@types/node': 22.8.1
+      '@types/cors': 2.8.17
+      '@types/node': 22.13.9
       accepts: 1.3.8
       base64id: 2.0.0
-      cookie: 0.4.2
+      cookie: 0.7.2
       cors: 2.8.5
       debug: 4.3.7
-      engine.io-parser: 5.2.1
-      ws: 8.11.0
+      engine.io-parser: 5.2.3
+      ws: 8.17.1
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
 
-  enhanced-resolve@5.17.1:
+  enhanced-resolve@5.18.1:
     dependencies:
       graceful-fs: 4.2.11
       tapable: 2.2.1
@@ -15384,7 +15059,7 @@ snapshots:
   env-paths@2.2.1:
     optional: true
 
-  envinfo@7.10.0: {}
+  envinfo@7.14.0: {}
 
   err-code@2.0.3:
     optional: true
@@ -15397,7 +15072,7 @@ snapshots:
     dependencies:
       stackframe: 1.3.4
 
-  eruda@3.0.1: {}
+  eruda@3.4.1: {}
 
   es-abstract@1.23.9:
     dependencies:
@@ -15405,7 +15080,7 @@ snapshots:
       arraybuffer.prototype.slice: 1.0.4
       available-typed-arrays: 1.0.7
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       data-view-buffer: 1.0.2
       data-view-byte-length: 1.0.2
       data-view-byte-offset: 1.0.1
@@ -15432,9 +15107,9 @@ snapshots:
       is-shared-array-buffer: 1.0.4
       is-string: 1.1.1
       is-typed-array: 1.1.15
-      is-weakref: 1.1.0
+      is-weakref: 1.1.1
       math-intrinsics: 1.1.0
-      object-inspect: 1.13.3
+      object-inspect: 1.13.4
       object-keys: 1.1.1
       object.assign: 4.1.7
       own-keys: 1.0.1
@@ -15478,8 +15153,6 @@ snapshots:
 
   es-module-lexer@0.9.3: {}
 
-  es-module-lexer@1.5.4: {}
-
   es-module-lexer@1.6.0: {}
 
   es-object-atoms@1.1.1:
@@ -15511,13 +15184,13 @@ snapshots:
 
   esbuild-plugin-alias@0.2.1: {}
 
-  esbuild-plugin-polyfill-node@0.3.0(esbuild@0.19.11):
+  esbuild-plugin-polyfill-node@0.3.0(esbuild@0.19.12):
     dependencies:
-      '@jspm/core': 2.0.1
-      esbuild: 0.19.11
-      import-meta-resolve: 3.0.0
+      '@jspm/core': 2.1.0
+      esbuild: 0.19.12
+      import-meta-resolve: 3.1.1
 
-  esbuild-register@3.5.0(esbuild@0.18.20):
+  esbuild-register@3.6.0(esbuild@0.18.20):
     dependencies:
       debug: 4.4.0(supports-color@8.1.1)
       esbuild: 0.18.20
@@ -15549,31 +15222,31 @@ snapshots:
       '@esbuild/win32-ia32': 0.18.20
       '@esbuild/win32-x64': 0.18.20
 
-  esbuild@0.19.11:
+  esbuild@0.19.12:
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.19.11
-      '@esbuild/android-arm': 0.19.11
-      '@esbuild/android-arm64': 0.19.11
-      '@esbuild/android-x64': 0.19.11
-      '@esbuild/darwin-arm64': 0.19.11
-      '@esbuild/darwin-x64': 0.19.11
-      '@esbuild/freebsd-arm64': 0.19.11
-      '@esbuild/freebsd-x64': 0.19.11
-      '@esbuild/linux-arm': 0.19.11
-      '@esbuild/linux-arm64': 0.19.11
-      '@esbuild/linux-ia32': 0.19.11
-      '@esbuild/linux-loong64': 0.19.11
-      '@esbuild/linux-mips64el': 0.19.11
-      '@esbuild/linux-ppc64': 0.19.11
-      '@esbuild/linux-riscv64': 0.19.11
-      '@esbuild/linux-s390x': 0.19.11
-      '@esbuild/linux-x64': 0.19.11
-      '@esbuild/netbsd-x64': 0.19.11
-      '@esbuild/openbsd-x64': 0.19.11
-      '@esbuild/sunos-x64': 0.19.11
-      '@esbuild/win32-arm64': 0.19.11
-      '@esbuild/win32-ia32': 0.19.11
-      '@esbuild/win32-x64': 0.19.11
+      '@esbuild/aix-ppc64': 0.19.12
+      '@esbuild/android-arm': 0.19.12
+      '@esbuild/android-arm64': 0.19.12
+      '@esbuild/android-x64': 0.19.12
+      '@esbuild/darwin-arm64': 0.19.12
+      '@esbuild/darwin-x64': 0.19.12
+      '@esbuild/freebsd-arm64': 0.19.12
+      '@esbuild/freebsd-x64': 0.19.12
+      '@esbuild/linux-arm': 0.19.12
+      '@esbuild/linux-arm64': 0.19.12
+      '@esbuild/linux-ia32': 0.19.12
+      '@esbuild/linux-loong64': 0.19.12
+      '@esbuild/linux-mips64el': 0.19.12
+      '@esbuild/linux-ppc64': 0.19.12
+      '@esbuild/linux-riscv64': 0.19.12
+      '@esbuild/linux-s390x': 0.19.12
+      '@esbuild/linux-x64': 0.19.12
+      '@esbuild/netbsd-x64': 0.19.12
+      '@esbuild/openbsd-x64': 0.19.12
+      '@esbuild/sunos-x64': 0.19.12
+      '@esbuild/win32-arm64': 0.19.12
+      '@esbuild/win32-ia32': 0.19.12
+      '@esbuild/win32-x64': 0.19.12
 
   esbuild@0.25.0:
     optionalDependencies:
@@ -15603,7 +15276,7 @@ snapshots:
       '@esbuild/win32-ia32': 0.25.0
       '@esbuild/win32-x64': 0.25.0
 
-  escalade@3.1.2: {}
+  escalade@3.2.0: {}
 
   escape-html@1.0.3: {}
 
@@ -15619,43 +15292,43 @@ snapshots:
     optionalDependencies:
       source-map: 0.6.1
 
-  eslint-config-prettier@8.10.0(eslint@8.50.0):
+  eslint-config-prettier@8.10.0(eslint@8.57.1):
     dependencies:
-      eslint: 8.50.0
+      eslint: 8.57.1
 
-  eslint-config-xo-react@0.27.0(eslint-plugin-react-hooks@4.6.0(eslint@8.50.0))(eslint-plugin-react@7.34.1(eslint@8.50.0))(eslint@8.50.0):
+  eslint-config-xo-react@0.27.0(eslint-plugin-react-hooks@5.2.0(eslint@8.57.1))(eslint-plugin-react@7.37.4(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
-      eslint: 8.50.0
-      eslint-plugin-react: 7.34.1(eslint@8.50.0)
-      eslint-plugin-react-hooks: 4.6.0(eslint@8.50.0)
+      eslint: 8.57.1
+      eslint-plugin-react: 7.37.4(eslint@8.57.1)
+      eslint-plugin-react-hooks: 5.2.0(eslint@8.57.1)
 
-  eslint-config-xo-typescript@1.0.1(@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4))(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4):
+  eslint-config-xo-typescript@1.0.1(@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.5.4))(eslint@8.57.1)(typescript@5.5.4))(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.5.4))(eslint@8.57.1)(typescript@5.5.4):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4)
-      '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.4)
-      eslint: 8.50.0
+      '@typescript-eslint/eslint-plugin': 6.1.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.5.4))(eslint@8.57.1)(typescript@5.5.4)
+      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.5.4)
+      eslint: 8.57.1
       typescript: 5.5.4
 
-  eslint-config-xo@0.43.1(eslint@8.50.0):
+  eslint-config-xo@0.43.1(eslint@8.57.1):
     dependencies:
       confusing-browser-globals: 1.0.11
-      eslint: 8.50.0
+      eslint: 8.57.1
 
-  eslint-config-zardoy@0.2.17(eslint-plugin-react-hooks@4.6.0(eslint@8.50.0))(eslint-plugin-react@7.34.1(eslint@8.50.0))(eslint@8.50.0)(typescript@5.5.4):
+  eslint-config-zardoy@0.2.17(eslint-plugin-react-hooks@5.2.0(eslint@8.57.1))(eslint-plugin-react@7.37.4(eslint@8.57.1))(eslint@8.57.1)(typescript@5.5.4):
     dependencies:
-      '@rushstack/eslint-patch': 1.4.0
-      '@typescript-eslint/eslint-plugin': 6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4)
-      '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.4)
-      eslint: 8.50.0
-      eslint-config-prettier: 8.10.0(eslint@8.50.0)
-      eslint-config-xo: 0.43.1(eslint@8.50.0)
-      eslint-config-xo-react: 0.27.0(eslint-plugin-react-hooks@4.6.0(eslint@8.50.0))(eslint-plugin-react@7.34.1(eslint@8.50.0))(eslint@8.50.0)
-      eslint-config-xo-typescript: 1.0.1(@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4))(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)(typescript@5.5.4)
-      eslint-plugin-eslint-comments: 3.2.0(eslint@8.50.0)
-      eslint-plugin-import: 2.27.5(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0)
-      eslint-plugin-node: 11.1.0(eslint@8.50.0)
-      eslint-plugin-sonarjs: 0.19.0(eslint@8.50.0)
-      eslint-plugin-unicorn: 48.0.0(eslint@8.50.0)
+      '@rushstack/eslint-patch': 1.10.5
+      '@typescript-eslint/eslint-plugin': 6.1.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.5.4))(eslint@8.57.1)(typescript@5.5.4)
+      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.5.4)
+      eslint: 8.57.1
+      eslint-config-prettier: 8.10.0(eslint@8.57.1)
+      eslint-config-xo: 0.43.1(eslint@8.57.1)
+      eslint-config-xo-react: 0.27.0(eslint-plugin-react-hooks@5.2.0(eslint@8.57.1))(eslint-plugin-react@7.37.4(eslint@8.57.1))(eslint@8.57.1)
+      eslint-config-xo-typescript: 1.0.1(@typescript-eslint/eslint-plugin@6.1.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.5.4))(eslint@8.57.1)(typescript@5.5.4))(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.5.4))(eslint@8.57.1)(typescript@5.5.4)
+      eslint-plugin-eslint-comments: 3.2.0(eslint@8.57.1)
+      eslint-plugin-import: 2.27.5(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.5.4))(eslint@8.57.1)
+      eslint-plugin-node: 11.1.0(eslint@8.57.1)
+      eslint-plugin-sonarjs: 0.19.0(eslint@8.57.1)
+      eslint-plugin-unicorn: 48.0.0(eslint@8.57.1)
       typescript: 5.5.4
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
@@ -15668,114 +15341,114 @@ snapshots:
     dependencies:
       debug: 3.2.7(supports-color@8.1.1)
       is-core-module: 2.16.1
-      resolve: 1.22.4
+      resolve: 1.22.10
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.8.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@8.50.0):
+  eslint-module-utils@2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1):
     dependencies:
       debug: 3.2.7(supports-color@8.1.1)
     optionalDependencies:
-      '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.4)
-      eslint: 8.50.0
+      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.5.4)
+      eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-es@3.0.1(eslint@8.50.0):
+  eslint-plugin-es@3.0.1(eslint@8.57.1):
     dependencies:
-      eslint: 8.50.0
+      eslint: 8.57.1
       eslint-utils: 2.1.0
       regexpp: 3.2.0
 
-  eslint-plugin-eslint-comments@3.2.0(eslint@8.50.0):
+  eslint-plugin-eslint-comments@3.2.0(eslint@8.57.1):
     dependencies:
       escape-string-regexp: 1.0.5
-      eslint: 8.50.0
-      ignore: 5.2.4
+      eslint: 8.57.1
+      ignore: 5.3.2
 
-  eslint-plugin-import@2.27.5(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint@8.50.0):
+  eslint-plugin-import@2.27.5(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.5.4))(eslint@8.57.1):
     dependencies:
       array-includes: 3.1.8
       array.prototype.flat: 1.3.3
       array.prototype.flatmap: 1.3.3
       debug: 3.2.7(supports-color@8.1.1)
       doctrine: 2.1.0
-      eslint: 8.50.0
+      eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.7.3(eslint@8.50.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@8.50.0)
-      has: 1.0.3
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint@8.57.1)
+      has: 1.0.4
       is-core-module: 2.16.1
       is-glob: 4.0.3
       minimatch: 3.1.2
       object.values: 1.2.1
-      resolve: 1.22.4
+      resolve: 1.22.10
       semver: 6.3.1
-      tsconfig-paths: 3.14.2
+      tsconfig-paths: 3.15.0
     optionalDependencies:
-      '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.5.4)
+      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.5.4)
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-node@11.1.0(eslint@8.50.0):
+  eslint-plugin-node@11.1.0(eslint@8.57.1):
     dependencies:
-      eslint: 8.50.0
-      eslint-plugin-es: 3.0.1(eslint@8.50.0)
+      eslint: 8.57.1
+      eslint-plugin-es: 3.0.1(eslint@8.57.1)
       eslint-utils: 2.1.0
-      ignore: 5.2.4
+      ignore: 5.3.2
       minimatch: 3.1.2
-      resolve: 1.22.4
+      resolve: 1.22.10
       semver: 6.3.1
 
-  eslint-plugin-react-hooks@4.6.0(eslint@8.50.0):
+  eslint-plugin-react-hooks@5.2.0(eslint@8.57.1):
     dependencies:
-      eslint: 8.50.0
+      eslint: 8.57.1
 
-  eslint-plugin-react@7.34.1(eslint@8.50.0):
+  eslint-plugin-react@7.37.4(eslint@8.57.1):
     dependencies:
       array-includes: 3.1.8
       array.prototype.findlast: 1.2.5
       array.prototype.flatmap: 1.3.3
-      array.prototype.toreversed: 1.1.2
       array.prototype.tosorted: 1.1.4
       doctrine: 2.1.0
       es-iterator-helpers: 1.2.1
-      eslint: 8.50.0
+      eslint: 8.57.1
       estraverse: 5.3.0
+      hasown: 2.0.2
       jsx-ast-utils: 3.3.5
       minimatch: 3.1.2
       object.entries: 1.1.9
       object.fromentries: 2.0.8
-      object.hasown: 1.1.4
       object.values: 1.2.1
       prop-types: 15.8.1
       resolve: 2.0.0-next.5
       semver: 6.3.1
       string.prototype.matchall: 4.0.12
+      string.prototype.repeat: 1.0.0
 
-  eslint-plugin-sonarjs@0.19.0(eslint@8.50.0):
+  eslint-plugin-sonarjs@0.19.0(eslint@8.57.1):
     dependencies:
-      eslint: 8.50.0
+      eslint: 8.57.1
 
-  eslint-plugin-unicorn@48.0.0(eslint@8.50.0):
+  eslint-plugin-unicorn@48.0.0(eslint@8.57.1):
     dependencies:
-      '@babel/helper-validator-identifier': 7.22.20
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.50.0)
-      ci-info: 3.8.0
+      '@babel/helper-validator-identifier': 7.25.9
+      '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1)
+      ci-info: 3.9.0
       clean-regexp: 1.0.0
-      eslint: 8.50.0
-      esquery: 1.5.0
+      eslint: 8.57.1
+      esquery: 1.6.0
       indent-string: 4.0.0
       is-builtin-module: 3.2.1
-      jsesc: 3.0.2
+      jsesc: 3.1.0
       lodash: 4.17.21
       pluralize: 8.0.0
       read-pkg-up: 7.0.1
       regexp-tree: 0.1.27
       regjsparser: 0.10.0
-      semver: 7.6.0
+      semver: 7.7.1
       strip-indent: 3.0.0
 
   eslint-scope@5.1.1:
@@ -15796,35 +15469,36 @@ snapshots:
 
   eslint-visitor-keys@3.4.3: {}
 
-  eslint-visitor-keys@4.0.0: {}
+  eslint-visitor-keys@4.2.0: {}
 
-  eslint@8.50.0:
+  eslint@8.57.1:
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@8.50.0)
-      '@eslint-community/regexpp': 4.8.0
-      '@eslint/eslintrc': 2.1.2
-      '@eslint/js': 8.50.0
-      '@humanwhocodes/config-array': 0.11.11
+      '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.1)
+      '@eslint-community/regexpp': 4.12.1
+      '@eslint/eslintrc': 2.1.4
+      '@eslint/js': 8.57.1
+      '@humanwhocodes/config-array': 0.13.0
       '@humanwhocodes/module-importer': 1.0.1
       '@nodelib/fs.walk': 1.2.8
+      '@ungap/structured-clone': 1.3.0
       ajv: 6.12.6
       chalk: 4.1.2
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       debug: 4.4.0(supports-color@8.1.1)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
-      esquery: 1.5.0
+      esquery: 1.6.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
       file-entry-cache: 6.0.1
       find-up: 5.0.0
       glob-parent: 6.0.2
-      globals: 13.21.0
+      globals: 13.24.0
       graphemer: 1.4.0
-      ignore: 5.2.4
+      ignore: 5.3.2
       imurmurhash: 0.1.4
       is-glob: 4.0.3
       is-path-inside: 3.0.3
@@ -15834,27 +15508,27 @@ snapshots:
       lodash.merge: 4.6.2
       minimatch: 3.1.2
       natural-compare: 1.4.0
-      optionator: 0.9.3
+      optionator: 0.9.4
       strip-ansi: 6.0.1
       text-table: 0.2.0
     transitivePeerDependencies:
       - supports-color
 
-  espree@10.1.0:
+  espree@10.3.0:
     dependencies:
-      acorn: 8.12.1
-      acorn-jsx: 5.3.2(acorn@8.12.1)
-      eslint-visitor-keys: 4.0.0
+      acorn: 8.14.1
+      acorn-jsx: 5.3.2(acorn@8.14.1)
+      eslint-visitor-keys: 4.2.0
 
   espree@9.6.1:
     dependencies:
-      acorn: 8.12.1
-      acorn-jsx: 5.3.2(acorn@8.12.1)
+      acorn: 8.14.1
+      acorn-jsx: 5.3.2(acorn@8.14.1)
       eslint-visitor-keys: 3.4.3
 
   esprima@4.0.1: {}
 
-  esquery@1.5.0:
+  esquery@1.6.0:
     dependencies:
       estraverse: 5.3.0
 
@@ -15866,14 +15540,6 @@ snapshots:
 
   estraverse@5.3.0: {}
 
-  estree-to-babel@3.2.1:
-    dependencies:
-      '@babel/traverse': 7.22.11
-      '@babel/types': 7.23.0
-      c8: 7.14.0
-    transitivePeerDependencies:
-      - supports-color
-
   estree-walker@1.0.1: {}
 
   estree-walker@2.0.2: {}
@@ -15912,7 +15578,7 @@ snapshots:
 
   execa@4.1.0:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       get-stream: 5.2.0
       human-signals: 1.1.1
       is-stream: 2.0.1
@@ -15925,7 +15591,7 @@ snapshots:
 
   execa@5.1.1:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       get-stream: 6.0.1
       human-signals: 2.1.0
       is-stream: 2.0.1
@@ -15959,47 +15625,47 @@ snapshots:
 
   expand-template@2.0.3: {}
 
-  expect-type@1.1.0: {}
+  expect-type@1.2.0: {}
 
-  exponential-backoff@3.1.1:
+  exponential-backoff@3.1.2:
     optional: true
 
-  express-ws@4.0.0(express@4.18.2):
+  express-ws@4.0.0(express@4.21.2):
     dependencies:
-      express: 4.18.2
-      ws: 5.2.3
+      express: 4.21.2
+      ws: 5.2.4
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  express@4.18.2:
+  express@4.21.2:
     dependencies:
       accepts: 1.3.8
       array-flatten: 1.1.1
-      body-parser: 1.20.1
+      body-parser: 1.20.3
       content-disposition: 0.5.4
       content-type: 1.0.5
-      cookie: 0.5.0
+      cookie: 0.7.1
       cookie-signature: 1.0.6
       debug: 2.6.9
       depd: 2.0.0
-      encodeurl: 1.0.2
+      encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
-      finalhandler: 1.2.0
+      finalhandler: 1.3.1
       fresh: 0.5.2
       http-errors: 2.0.0
-      merge-descriptors: 1.0.1
+      merge-descriptors: 1.0.3
       methods: 1.1.2
       on-finished: 2.4.1
       parseurl: 1.3.3
-      path-to-regexp: 0.1.7
+      path-to-regexp: 0.1.12
       proxy-addr: 2.0.7
-      qs: 6.11.0
+      qs: 6.13.0
       range-parser: 1.2.1
       safe-buffer: 5.2.1
-      send: 0.18.0
-      serve-static: 1.15.0
+      send: 0.19.0
+      serve-static: 1.16.2
       setprototypeof: 1.2.0
       statuses: 2.0.1
       type-is: 1.6.18
@@ -16056,27 +15722,27 @@ snapshots:
 
   fast-deep-equal@3.1.3: {}
 
-  fast-glob@3.3.1:
+  fast-glob@3.3.3:
     dependencies:
       '@nodelib/fs.stat': 2.0.5
       '@nodelib/fs.walk': 1.2.8
       glob-parent: 5.1.2
       merge2: 1.4.1
-      micromatch: 4.0.5
+      micromatch: 4.0.8
 
   fast-json-stable-stringify@2.1.0: {}
 
   fast-levenshtein@2.0.6: {}
 
-  fast-loops@1.1.3: {}
-
   fast-shallow-equal@1.0.0: {}
 
+  fast-uri@3.0.6: {}
+
   fastest-stable-stringify@2.0.2: {}
 
-  fastq@1.15.0:
+  fastq@1.19.1:
     dependencies:
-      reusify: 1.0.4
+      reusify: 1.1.0
 
   faye-websocket@0.11.4:
     dependencies:
@@ -16101,7 +15767,7 @@ snapshots:
 
   file-entry-cache@6.0.1:
     dependencies:
-      flat-cache: 3.1.0
+      flat-cache: 3.2.0
 
   file-system-cache@2.3.0:
     dependencies:
@@ -16118,7 +15784,7 @@ snapshots:
     dependencies:
       minimatch: 5.1.6
 
-  filesize@10.0.12: {}
+  filesize@10.1.6: {}
 
   fill-range@4.0.0:
     dependencies:
@@ -16127,7 +15793,7 @@ snapshots:
       repeat-string: 1.6.1
       to-regex-range: 2.1.1
 
-  fill-range@7.0.1:
+  fill-range@7.1.1:
     dependencies:
       to-regex-range: 5.0.1
 
@@ -16143,10 +15809,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  finalhandler@1.2.0:
+  finalhandler@1.3.1:
     dependencies:
       debug: 2.6.9
-      encodeurl: 1.0.2
+      encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
       parseurl: 1.3.3
@@ -16183,46 +15849,41 @@ snapshots:
       locate-path: 6.0.0
       path-exists: 4.0.0
 
-  flat-cache@3.1.0:
+  flat-cache@3.2.0:
     dependencies:
-      flatted: 3.2.7
-      keyv: 4.5.3
+      flatted: 3.3.3
+      keyv: 4.5.4
       rimraf: 3.0.2
 
   flatmap@0.0.3: {}
 
-  flatted@3.2.7: {}
+  flatted@3.3.3: {}
 
-  flow-parser@0.218.0: {}
+  flow-parser@0.263.0: {}
 
-  follow-redirects@1.15.6(debug@4.4.0):
+  follow-redirects@1.15.9(debug@4.4.0):
     optionalDependencies:
       debug: 4.4.0(supports-color@8.1.1)
 
-  for-each@0.3.4:
+  for-each@0.3.5:
     dependencies:
       is-callable: 1.2.7
 
   for-in@1.0.2: {}
 
-  foreground-child@2.0.0:
+  foreground-child@3.3.1:
     dependencies:
-      cross-spawn: 7.0.3
-      signal-exit: 3.0.7
-
-  foreground-child@3.1.1:
-    dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       signal-exit: 4.1.0
 
   forever-agent@0.6.1:
     optional: true
 
-  fork-ts-checker-webpack-plugin@9.0.2(typescript@5.5.4)(webpack@5.93.0(esbuild@0.19.11)):
+  fork-ts-checker-webpack-plugin@9.0.2(typescript@5.5.4)(webpack@5.98.0(esbuild@0.19.12)):
     dependencies:
-      '@babel/code-frame': 7.22.13
+      '@babel/code-frame': 7.26.2
       chalk: 4.1.2
-      chokidar: 3.5.3
+      chokidar: 3.6.0
       cosmiconfig: 8.3.6(typescript@5.5.4)
       deepmerge: 4.3.1
       fs-extra: 10.1.0
@@ -16230,10 +15891,10 @@ snapshots:
       minimatch: 3.1.2
       node-abort-controller: 3.1.1
       schema-utils: 3.3.0
-      semver: 7.6.0
+      semver: 7.7.1
       tapable: 2.2.1
       typescript: 5.5.4
-      webpack: 5.93.0(esbuild@0.19.11)
+      webpack: 5.98.0(esbuild@0.19.12)
 
   form-data@2.3.3:
     dependencies:
@@ -16242,10 +15903,11 @@ snapshots:
       mime-types: 2.1.35
     optional: true
 
-  form-data@4.0.0:
+  form-data@4.0.2:
     dependencies:
       asynckit: 0.4.0
       combined-stream: 1.0.8
+      es-set-tostringtag: 2.1.0
       mime-types: 2.1.35
 
   forwarded@0.2.0: {}
@@ -16266,13 +15928,19 @@ snapshots:
     dependencies:
       graceful-fs: 4.2.11
       jsonfile: 6.1.0
-      universalify: 2.0.0
+      universalify: 2.0.1
 
   fs-extra@11.1.1:
     dependencies:
       graceful-fs: 4.2.11
       jsonfile: 6.1.0
-      universalify: 2.0.0
+      universalify: 2.0.1
+
+  fs-extra@11.3.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      jsonfile: 6.1.0
+      universalify: 2.0.1
 
   fs-extra@7.0.1:
     dependencies:
@@ -16286,7 +15954,7 @@ snapshots:
       at-least-node: 1.0.0
       graceful-fs: 4.2.11
       jsonfile: 6.1.0
-      universalify: 2.0.0
+      universalify: 2.0.1
 
   fs-minipass@2.1.0:
     dependencies:
@@ -16299,7 +15967,7 @@ snapshots:
   fsevents@1.2.13:
     dependencies:
       bindings: 1.5.0
-      nan: 2.18.0
+      nan: 2.22.2
     optional: true
 
   fsevents@2.3.3:
@@ -16310,7 +15978,7 @@ snapshots:
   function.prototype.name@1.1.8:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-properties: 1.2.1
       functions-have-names: 1.2.3
       hasown: 2.0.2
@@ -16364,7 +16032,7 @@ snapshots:
 
   get-nonce@1.0.1: {}
 
-  get-npm-tarball-url@2.0.3: {}
+  get-npm-tarball-url@2.1.0: {}
 
   get-own-enumerable-property-symbols@3.0.2: {}
 
@@ -16379,17 +16047,17 @@ snapshots:
 
   get-stream@5.2.0:
     dependencies:
-      pump: 3.0.0
+      pump: 3.0.2
 
   get-stream@6.0.1: {}
 
   get-symbol-description@1.1.0:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
       get-intrinsic: 1.3.0
 
-  get-tsconfig@4.7.2:
+  get-tsconfig@4.10.0:
     dependencies:
       resolve-pkg-maps: 1.0.0
 
@@ -16397,7 +16065,7 @@ snapshots:
 
   getos@3.2.1:
     dependencies:
-      async: 3.2.5
+      async: 3.2.6
     optional: true
 
   getpass@0.1.7:
@@ -16405,17 +16073,15 @@ snapshots:
       assert-plus: 1.0.0
     optional: true
 
-  giget@1.1.3:
+  giget@1.2.5:
     dependencies:
-      colorette: 2.0.20
-      defu: 6.1.2
-      https-proxy-agent: 7.0.2
-      mri: 1.2.0
-      node-fetch-native: 1.4.0
-      pathe: 1.1.1
-      tar: 6.2.0
-    transitivePeerDependencies:
-      - supports-color
+      citty: 0.1.6
+      consola: 3.4.0
+      defu: 6.1.4
+      node-fetch-native: 1.6.6
+      nypm: 0.5.4
+      pathe: 2.0.3
+      tar: 6.2.1
 
   github-from-package@0.0.0: {}
 
@@ -16428,10 +16094,10 @@ snapshots:
       bindings: 1.5.0
       bit-twiddle: 1.0.2
       glsl-tokenizer: 2.1.5
-      nan: 2.18.0
-      node-abi: 3.47.0
+      nan: 2.22.2
+      node-abi: 3.74.0
       node-gyp: 9.4.1
-      prebuild-install: 7.1.1
+      prebuild-install: 7.1.3
     transitivePeerDependencies:
       - bluebird
       - supports-color
@@ -16457,13 +16123,14 @@ snapshots:
 
   glob-to-regexp@0.4.1: {}
 
-  glob@10.3.3:
+  glob@10.4.5:
     dependencies:
-      foreground-child: 3.1.1
-      jackspeak: 2.3.0
+      foreground-child: 3.3.1
+      jackspeak: 3.4.3
       minimatch: 9.0.5
-      minipass: 7.0.3
-      path-scurry: 1.10.1
+      minipass: 7.1.2
+      package-json-from-dist: 1.0.1
+      path-scurry: 1.11.1
 
   glob@7.2.3:
     dependencies:
@@ -16496,7 +16163,7 @@ snapshots:
 
   globals@11.12.0: {}
 
-  globals@13.21.0:
+  globals@13.24.0:
     dependencies:
       type-fest: 0.20.2
 
@@ -16509,8 +16176,8 @@ snapshots:
     dependencies:
       array-union: 2.1.0
       dir-glob: 3.0.1
-      fast-glob: 3.3.1
-      ignore: 5.2.4
+      fast-glob: 3.3.3
+      ignore: 5.3.2
       merge2: 1.4.1
       slash: 3.0.0
 
@@ -16545,7 +16212,7 @@ snapshots:
       source-map: 0.6.1
       wordwrap: 1.0.0
     optionalDependencies:
-      uglify-js: 3.17.4
+      uglify-js: 3.19.3
 
   hard-rejection@2.1.0: {}
 
@@ -16599,14 +16266,11 @@ snapshots:
       is-number: 3.0.0
       kind-of: 4.0.0
 
-  has@1.0.3:
-    dependencies:
-      function-bind: 1.1.2
+  has@1.0.4: {}
 
-  hash-base@3.1.0:
+  hash-base@3.0.5:
     dependencies:
       inherits: 2.0.4
-      readable-stream: 3.6.2
       safe-buffer: 5.2.1
 
   hash.js@1.1.7:
@@ -16623,7 +16287,7 @@ snapshots:
   header-case@2.0.4:
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   hmac-drbg@1.0.1:
     dependencies:
@@ -16653,8 +16317,6 @@ snapshots:
 
   html-entities@2.5.2: {}
 
-  html-escaper@2.0.2: {}
-
   html-tags@3.3.1: {}
 
   http-auth@3.1.3:
@@ -16686,7 +16348,7 @@ snapshots:
       statuses: 2.0.1
       toidentifier: 1.0.1
 
-  http-parser-js@0.5.8: {}
+  http-parser-js@0.5.9: {}
 
   http-proxy-agent@5.0.0:
     dependencies:
@@ -16700,7 +16362,7 @@ snapshots:
   http-proxy@1.18.1(debug@4.4.0):
     dependencies:
       eventemitter3: 4.0.7
-      follow-redirects: 1.15.6(debug@4.4.0)
+      follow-redirects: 1.15.9(debug@4.4.0)
       requires-port: 1.0.0
     transitivePeerDependencies:
       - debug
@@ -16716,7 +16378,7 @@ snapshots:
       mime: 1.6.0
       minimist: 1.2.8
       opener: 1.5.2
-      portfinder: 1.0.32
+      portfinder: 1.0.33
       secure-compare: 3.0.1
       union: 0.5.0
       url-join: 4.0.1
@@ -16728,7 +16390,7 @@ snapshots:
     dependencies:
       assert-plus: 1.0.0
       jsprim: 2.0.2
-      sshpk: 1.17.0
+      sshpk: 1.18.0
     optional: true
 
   https-browserify@1.0.0: {}
@@ -16748,13 +16410,6 @@ snapshots:
       - supports-color
     optional: true
 
-  https-proxy-agent@7.0.2:
-    dependencies:
-      agent-base: 7.1.0
-      debug: 4.4.0(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - supports-color
-
   human-signals@1.1.1:
     optional: true
 
@@ -16765,7 +16420,7 @@ snapshots:
       ms: 2.1.3
     optional: true
 
-  hyphenate-style-name@1.0.4: {}
+  hyphenate-style-name@1.1.0: {}
 
   iconv-lite@0.4.24:
     dependencies:
@@ -16779,19 +16434,19 @@ snapshots:
 
   ieee754@1.2.1: {}
 
-  ignore@5.2.4: {}
+  ignore@5.3.2: {}
 
   image-size@0.7.5:
     optional: true
 
   immediate@3.0.6: {}
 
-  import-fresh@3.3.0:
+  import-fresh@3.3.1:
     dependencies:
       parent-module: 1.0.1
       resolve-from: 4.0.0
 
-  import-meta-resolve@3.0.0: {}
+  import-meta-resolve@3.1.1: {}
 
   imurmurhash@0.1.4: {}
 
@@ -16819,10 +16474,9 @@ snapshots:
   ini@2.0.0:
     optional: true
 
-  inline-style-prefixer@6.0.4:
+  inline-style-prefixer@7.0.1:
     dependencies:
       css-in-js-utils: 3.1.0
-      fast-loops: 1.1.3
 
   internal-slot@1.1.0:
     dependencies:
@@ -16830,11 +16484,11 @@ snapshots:
       hasown: 2.0.2
       side-channel: 1.1.0
 
-  invariant@2.2.4:
+  ip-address@9.0.5:
     dependencies:
-      loose-envify: 1.4.0
-
-  ip@2.0.0: {}
+      jsbn: 1.1.0
+      sprintf-js: 1.1.3
+    optional: true
 
   ipaddr.js@1.9.1: {}
 
@@ -16844,15 +16498,15 @@ snapshots:
     dependencies:
       hasown: 2.0.2
 
-  is-arguments@1.1.1:
+  is-arguments@1.2.0:
     dependencies:
-      call-bind: 1.0.8
+      call-bound: 1.0.4
       has-tostringtag: 1.0.2
 
   is-array-buffer@3.0.5:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       get-intrinsic: 1.3.0
 
   is-arrayish@0.2.1: {}
@@ -16862,7 +16516,7 @@ snapshots:
   is-async-function@2.1.1:
     dependencies:
       async-function: 1.0.0
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       get-proto: 1.0.1
       has-tostringtag: 1.0.2
       safe-regex-test: 1.1.0
@@ -16877,11 +16531,11 @@ snapshots:
 
   is-binary-path@2.1.0:
     dependencies:
-      binary-extensions: 2.2.0
+      binary-extensions: 2.3.0
 
-  is-boolean-object@1.2.1:
+  is-boolean-object@1.2.2:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       has-tostringtag: 1.0.2
 
   is-buffer@1.1.6: {}
@@ -16894,7 +16548,7 @@ snapshots:
 
   is-ci@3.0.1:
     dependencies:
-      ci-info: 3.8.0
+      ci-info: 3.9.0
     optional: true
 
   is-core-module@2.16.1:
@@ -16907,13 +16561,13 @@ snapshots:
 
   is-data-view@1.0.2:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       get-intrinsic: 1.3.0
       is-typed-array: 1.1.15
 
   is-date-object@1.1.0:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       has-tostringtag: 1.0.2
 
   is-deflate@1.0.0: {}
@@ -16940,7 +16594,7 @@ snapshots:
 
   is-finalizationregistry@1.1.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
 
   is-fullwidth-code-point@3.0.0: {}
 
@@ -16949,7 +16603,7 @@ snapshots:
 
   is-generator-function@1.1.0:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       get-proto: 1.0.1
       has-tostringtag: 1.0.2
       safe-regex-test: 1.1.0
@@ -16986,7 +16640,7 @@ snapshots:
 
   is-number-object@1.1.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       has-tostringtag: 1.0.2
 
   is-number@3.0.0:
@@ -17013,7 +16667,7 @@ snapshots:
 
   is-regex@1.2.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       gopd: 1.2.0
       has-tostringtag: 1.0.2
       hasown: 2.0.2
@@ -17024,18 +16678,18 @@ snapshots:
 
   is-shared-array-buffer@1.0.4:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
 
   is-stream@2.0.1: {}
 
   is-string@1.1.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       has-tostringtag: 1.0.2
 
   is-symbol@1.1.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       has-symbols: 1.1.0
       safe-regex-test: 1.1.0
 
@@ -17050,13 +16704,13 @@ snapshots:
 
   is-weakmap@2.0.2: {}
 
-  is-weakref@1.1.0:
+  is-weakref@1.1.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
 
   is-weakset@2.0.4:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       get-intrinsic: 1.3.0
 
   is-windows@1.0.2: {}
@@ -17088,29 +16742,18 @@ snapshots:
   isstream@0.1.2:
     optional: true
 
-  istanbul-lib-coverage@3.2.0: {}
+  istanbul-lib-coverage@3.2.2: {}
 
   istanbul-lib-instrument@5.2.1:
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/parser': 7.22.13
+      '@babel/core': 7.26.9
+      '@babel/parser': 7.26.9
       '@istanbuljs/schema': 0.1.3
-      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-coverage: 3.2.2
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  istanbul-lib-report@3.0.1:
-    dependencies:
-      istanbul-lib-coverage: 3.2.0
-      make-dir: 4.0.0
-      supports-color: 7.2.0
-
-  istanbul-reports@3.1.6:
-    dependencies:
-      html-escaper: 2.0.2
-      istanbul-lib-report: 3.0.1
-
   iterator.prototype@1.1.5:
     dependencies:
       define-data-property: 1.1.4
@@ -17120,15 +16763,15 @@ snapshots:
       has-symbols: 1.1.0
       set-function-name: 2.0.2
 
-  jackspeak@2.3.0:
+  jackspeak@3.4.3:
     dependencies:
       '@isaacs/cliui': 8.0.2
     optionalDependencies:
       '@pkgjs/parseargs': 0.11.0
 
-  jake@10.8.7:
+  jake@10.9.2:
     dependencies:
-      async: 3.2.5
+      async: 3.2.6
       chalk: 4.1.2
       filelist: 1.0.4
       minimatch: 3.1.2
@@ -17136,15 +16779,15 @@ snapshots:
   jest-haste-map@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
-      '@types/graceful-fs': 4.1.7
-      '@types/node': 22.8.1
+      '@types/graceful-fs': 4.1.9
+      '@types/node': 22.13.9
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
       jest-regex-util: 29.6.3
       jest-util: 29.7.0
       jest-worker: 29.7.0
-      micromatch: 4.0.5
+      micromatch: 4.0.8
       walker: 1.0.8
     optionalDependencies:
       fsevents: 2.3.3
@@ -17154,42 +16797,41 @@ snapshots:
   jest-util@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
       chalk: 4.1.2
-      ci-info: 3.8.0
+      ci-info: 3.9.0
       graceful-fs: 4.2.11
       picomatch: 2.3.1
 
-  jest-worker@26.6.2:
-    dependencies:
-      '@types/node': 22.8.1
-      merge-stream: 2.0.0
-      supports-color: 7.2.0
-
   jest-worker@27.5.1:
     dependencies:
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
   jest-worker@29.7.0:
     dependencies:
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
-  jimp@0.10.3:
+  jimp@0.10.3(debug@4.4.0):
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@jimp/custom': 0.10.3
-      '@jimp/plugins': 0.10.3(@jimp/custom@0.10.3)
-      '@jimp/types': 0.10.3(@jimp/custom@0.10.3)
-      core-js: 3.37.1
+      '@babel/runtime': 7.26.9
+      '@jimp/custom': 0.10.3(debug@4.4.0)
+      '@jimp/plugins': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))(debug@4.4.0)
+      '@jimp/types': 0.10.3(@jimp/custom@0.10.3(debug@4.4.0))
+      core-js: 3.41.0
       regenerator-runtime: 0.13.11
+    transitivePeerDependencies:
+      - debug
     optional: true
 
-  joi@17.13.1:
+  jiti@2.4.2:
+    optional: true
+
+  joi@17.13.3:
     dependencies:
       '@hapi/hoek': 9.3.0
       '@hapi/topo': 5.1.0
@@ -17197,8 +16839,6 @@ snapshots:
       '@sideway/formula': 3.0.1
       '@sideway/pinpoint': 2.0.0
 
-  jose@4.15.5: {}
-
   jpeg-js@0.3.7:
     optional: true
 
@@ -17221,37 +16861,42 @@ snapshots:
   jsbn@0.1.1:
     optional: true
 
-  jscodeshift@0.14.0(@babel/preset-env@7.22.10(@babel/core@7.22.11)):
+  jsbn@1.1.0:
+    optional: true
+
+  jscodeshift@0.15.2(@babel/preset-env@7.26.9(@babel/core@7.26.9)):
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/parser': 7.22.13
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.22.11)
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.22.11)
-      '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.22.11)
-      '@babel/plugin-transform-modules-commonjs': 7.23.0(@babel/core@7.22.11)
-      '@babel/preset-env': 7.22.10(@babel/core@7.22.11)
-      '@babel/preset-flow': 7.22.15(@babel/core@7.22.11)
-      '@babel/preset-typescript': 7.23.0(@babel/core@7.22.11)
-      '@babel/register': 7.22.15(@babel/core@7.22.11)
-      babel-core: 7.0.0-bridge.0(@babel/core@7.22.11)
+      '@babel/core': 7.26.9
+      '@babel/parser': 7.26.9
+      '@babel/plugin-transform-class-properties': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-modules-commonjs': 7.26.3(@babel/core@7.26.9)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.26.6(@babel/core@7.26.9)
+      '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.9)
+      '@babel/plugin-transform-private-methods': 7.25.9(@babel/core@7.26.9)
+      '@babel/preset-flow': 7.25.9(@babel/core@7.26.9)
+      '@babel/preset-typescript': 7.26.0(@babel/core@7.26.9)
+      '@babel/register': 7.25.9(@babel/core@7.26.9)
+      babel-core: 7.0.0-bridge.0(@babel/core@7.26.9)
       chalk: 4.1.2
-      flow-parser: 0.218.0
+      flow-parser: 0.263.0
       graceful-fs: 4.2.11
-      micromatch: 4.0.5
+      micromatch: 4.0.8
       neo-async: 2.6.2
       node-dir: 0.1.17
-      recast: 0.21.5
+      recast: 0.23.11
       temp: 0.8.4
       write-file-atomic: 2.4.3
+    optionalDependencies:
+      '@babel/preset-env': 7.26.9(@babel/core@7.26.9)
     transitivePeerDependencies:
       - supports-color
 
   jsesc@0.5.0: {}
 
-  jsesc@2.5.2: {}
-
   jsesc@3.0.2: {}
 
+  jsesc@3.1.0: {}
+
   json-buffer@3.0.1: {}
 
   json-parse-better-errors@1.0.2: {}
@@ -17274,8 +16919,6 @@ snapshots:
 
   json5@2.2.3: {}
 
-  jsonc-parser@3.2.0: {}
-
   jsonfile@4.0.0:
     optionalDependencies:
       graceful-fs: 4.2.11
@@ -17283,7 +16926,7 @@ snapshots:
 
   jsonfile@6.1.0:
     dependencies:
-      universalify: 2.0.0
+      universalify: 2.0.1
     optionalDependencies:
       graceful-fs: 4.2.11
 
@@ -17300,7 +16943,7 @@ snapshots:
       lodash.isstring: 4.0.1
       lodash.once: 4.1.1
       ms: 2.1.3
-      semver: 7.6.0
+      semver: 7.7.1
 
   jsprim@2.0.2:
     dependencies:
@@ -17335,7 +16978,7 @@ snapshots:
       jwa: 1.4.1
       safe-buffer: 5.2.1
 
-  keyv@4.5.3:
+  keyv@4.5.4:
     dependencies:
       json-buffer: 3.0.1
 
@@ -17357,7 +17000,7 @@ snapshots:
   lazy-universal-dotenv@4.0.0:
     dependencies:
       app-root-dir: 1.0.2
-      dotenv: 16.3.1
+      dotenv: 16.4.7
       dotenv-expand: 10.0.0
 
   leven@3.1.0: {}
@@ -17387,8 +17030,8 @@ snapshots:
       colorette: 2.0.20
       log-update: 4.0.0
       p-map: 4.0.0
-      rfdc: 1.3.0
-      rxjs: 7.8.1
+      rfdc: 1.4.1
+      rxjs: 7.8.2
       through: 2.3.8
       wrap-ansi: 7.0.0
     optionalDependencies:
@@ -17413,16 +17056,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  load-bmfont@1.4.1:
+  load-bmfont@1.4.2(debug@4.4.0):
     dependencies:
       buffer-equal: 0.0.1
       mime: 1.6.0
       parse-bmfont-ascii: 1.0.6
       parse-bmfont-binary: 1.0.6
-      parse-bmfont-xml: 1.1.4
-      phin: 2.9.3
+      parse-bmfont-xml: 1.1.6
+      phin: 3.7.1(debug@4.4.0)
       xhr: 2.6.0
       xtend: 4.0.2
+    transitivePeerDependencies:
+      - debug
     optional: true
 
   load-json-file@4.0.0:
@@ -17492,7 +17137,7 @@ snapshots:
       wrap-ansi: 6.2.0
     optional: true
 
-  long@5.2.3: {}
+  long@5.3.1: {}
 
   longest-streak@3.1.0: {}
 
@@ -17500,7 +17145,7 @@ snapshots:
     dependencies:
       js-tokens: 4.0.0
 
-  loupe@2.3.6:
+  loupe@2.3.7:
     dependencies:
       get-func-name: 2.0.2
 
@@ -17508,9 +17153,9 @@ snapshots:
 
   lower-case@2.0.2:
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.8.1
 
-  lru-cache@10.0.1: {}
+  lru-cache@10.4.3: {}
 
   lru-cache@5.1.1:
     dependencies:
@@ -17531,16 +17176,12 @@ snapshots:
 
   magic-string@0.27.0:
     dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/sourcemap-codec': 1.5.0
 
   magic-string@0.30.17:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 
-  magic-string@0.30.4:
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.15
-
   make-dir@2.1.0:
     dependencies:
       pify: 4.0.1
@@ -17550,13 +17191,9 @@ snapshots:
     dependencies:
       semver: 6.3.1
 
-  make-dir@4.0.0:
-    dependencies:
-      semver: 7.6.0
-
   make-fetch-happen@10.2.1:
     dependencies:
-      agentkeepalive: 4.5.0
+      agentkeepalive: 4.6.0
       cacache: 16.1.3
       http-cache-semantics: 4.1.1
       http-proxy-agent: 5.0.0
@@ -17568,7 +17205,7 @@ snapshots:
       minipass-fetch: 2.1.2
       minipass-flush: 1.0.5
       minipass-pipeline: 1.2.4
-      negotiator: 0.6.3
+      negotiator: 0.6.4
       promise-retry: 2.0.1
       socks-proxy-agent: 7.0.0
       ssri: 9.0.1
@@ -17595,7 +17232,7 @@ snapshots:
     dependencies:
       object-visit: 1.0.1
 
-  markdown-it@14.0.0:
+  markdown-it@14.1.0:
     dependencies:
       argparse: 2.0.1
       entities: 4.5.0
@@ -17604,25 +17241,25 @@ snapshots:
       punycode.js: 2.3.1
       uc.micro: 2.1.0
 
-  markdown-to-jsx@7.3.2(react@18.2.0):
+  markdown-to-jsx@7.7.4(react@18.3.1):
     dependencies:
-      react: 18.2.0
+      react: 18.3.1
 
   math-intrinsics@1.1.0: {}
 
   mc-assets@0.2.52:
     dependencies:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
-      zod: 3.24.1
+      zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.14(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.14(encoding@0.1.13)(mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448(encoding@0.1.13)
       prismarine-item: 1.16.0
-      ws: 8.18.0
+      ws: 8.18.1
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -17633,7 +17270,7 @@ snapshots:
 
   md5.js@1.3.5:
     dependencies:
-      hash-base: 3.1.0
+      hash-base: 3.0.5
       inherits: 2.0.4
       safe-buffer: 5.2.1
 
@@ -17647,36 +17284,37 @@ snapshots:
     dependencies:
       unist-util-visit: 2.0.3
 
-  mdast-util-from-markdown@2.0.0:
+  mdast-util-from-markdown@2.0.2:
     dependencies:
-      '@types/mdast': 4.0.3
-      '@types/unist': 3.0.2
-      decode-named-character-reference: 1.0.2
+      '@types/mdast': 4.0.4
+      '@types/unist': 3.0.3
+      decode-named-character-reference: 1.1.0
       devlop: 1.1.0
       mdast-util-to-string: 4.0.0
-      micromark: 4.0.0
-      micromark-util-decode-numeric-character-reference: 2.0.1
-      micromark-util-decode-string: 2.0.0
-      micromark-util-normalize-identifier: 2.0.0
-      micromark-util-symbol: 2.0.0
-      micromark-util-types: 2.0.0
+      micromark: 4.0.2
+      micromark-util-decode-numeric-character-reference: 2.0.2
+      micromark-util-decode-string: 2.0.1
+      micromark-util-normalize-identifier: 2.0.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
       unist-util-stringify-position: 4.0.0
     transitivePeerDependencies:
       - supports-color
 
   mdast-util-phrasing@4.1.0:
     dependencies:
-      '@types/mdast': 4.0.3
+      '@types/mdast': 4.0.4
       unist-util-is: 6.0.0
 
-  mdast-util-to-markdown@2.1.0:
+  mdast-util-to-markdown@2.1.2:
     dependencies:
-      '@types/mdast': 4.0.3
-      '@types/unist': 3.0.2
+      '@types/mdast': 4.0.4
+      '@types/unist': 3.0.3
       longest-streak: 3.1.0
       mdast-util-phrasing: 4.1.0
       mdast-util-to-string: 4.0.0
-      micromark-util-decode-string: 2.0.0
+      micromark-util-classify-character: 2.0.1
+      micromark-util-decode-string: 2.0.1
       unist-util-visit: 5.0.0
       zwitch: 2.0.4
 
@@ -17684,7 +17322,7 @@ snapshots:
 
   mdast-util-to-string@4.0.0:
     dependencies:
-      '@types/mdast': 4.0.3
+      '@types/mdast': 4.0.4
 
   mdn-data@2.0.14: {}
 
@@ -17706,7 +17344,7 @@ snapshots:
 
   meow@10.1.5:
     dependencies:
-      '@types/minimist': 1.2.3
+      '@types/minimist': 1.2.5
       camelcase-keys: 7.0.2
       decamelize: 5.0.1
       decamelize-keys: 1.1.1
@@ -17719,7 +17357,7 @@ snapshots:
       type-fest: 1.4.0
       yargs-parser: 20.2.9
 
-  merge-descriptors@1.0.1: {}
+  merge-descriptors@1.0.3: {}
 
   merge-stream@2.0.0: {}
 
@@ -17732,136 +17370,136 @@ snapshots:
 
   methods@1.1.2: {}
 
-  micromark-core-commonmark@2.0.0:
+  micromark-core-commonmark@2.0.3:
     dependencies:
-      decode-named-character-reference: 1.0.2
+      decode-named-character-reference: 1.1.0
       devlop: 1.1.0
-      micromark-factory-destination: 2.0.0
-      micromark-factory-label: 2.0.0
-      micromark-factory-space: 2.0.0
-      micromark-factory-title: 2.0.0
-      micromark-factory-whitespace: 2.0.0
-      micromark-util-character: 2.1.0
-      micromark-util-chunked: 2.0.0
-      micromark-util-classify-character: 2.0.0
-      micromark-util-html-tag-name: 2.0.0
-      micromark-util-normalize-identifier: 2.0.0
-      micromark-util-resolve-all: 2.0.0
-      micromark-util-subtokenize: 2.0.0
-      micromark-util-symbol: 2.0.0
-      micromark-util-types: 2.0.0
+      micromark-factory-destination: 2.0.1
+      micromark-factory-label: 2.0.1
+      micromark-factory-space: 2.0.1
+      micromark-factory-title: 2.0.1
+      micromark-factory-whitespace: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-chunked: 2.0.1
+      micromark-util-classify-character: 2.0.1
+      micromark-util-html-tag-name: 2.0.1
+      micromark-util-normalize-identifier: 2.0.1
+      micromark-util-resolve-all: 2.0.1
+      micromark-util-subtokenize: 2.1.0
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
 
-  micromark-factory-destination@2.0.0:
+  micromark-factory-destination@2.0.1:
     dependencies:
-      micromark-util-character: 2.1.0
-      micromark-util-symbol: 2.0.0
-      micromark-util-types: 2.0.0
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
 
-  micromark-factory-label@2.0.0:
+  micromark-factory-label@2.0.1:
     dependencies:
       devlop: 1.1.0
-      micromark-util-character: 2.1.0
-      micromark-util-symbol: 2.0.0
-      micromark-util-types: 2.0.0
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
 
-  micromark-factory-space@2.0.0:
+  micromark-factory-space@2.0.1:
     dependencies:
-      micromark-util-character: 2.1.0
-      micromark-util-types: 2.0.0
+      micromark-util-character: 2.1.1
+      micromark-util-types: 2.0.2
 
-  micromark-factory-title@2.0.0:
+  micromark-factory-title@2.0.1:
     dependencies:
-      micromark-factory-space: 2.0.0
-      micromark-util-character: 2.1.0
-      micromark-util-symbol: 2.0.0
-      micromark-util-types: 2.0.0
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
 
-  micromark-factory-whitespace@2.0.0:
+  micromark-factory-whitespace@2.0.1:
     dependencies:
-      micromark-factory-space: 2.0.0
-      micromark-util-character: 2.1.0
-      micromark-util-symbol: 2.0.0
-      micromark-util-types: 2.0.0
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
 
-  micromark-util-character@2.1.0:
+  micromark-util-character@2.1.1:
     dependencies:
-      micromark-util-symbol: 2.0.0
-      micromark-util-types: 2.0.0
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
 
-  micromark-util-chunked@2.0.0:
+  micromark-util-chunked@2.0.1:
     dependencies:
-      micromark-util-symbol: 2.0.0
+      micromark-util-symbol: 2.0.1
 
-  micromark-util-classify-character@2.0.0:
+  micromark-util-classify-character@2.0.1:
     dependencies:
-      micromark-util-character: 2.1.0
-      micromark-util-symbol: 2.0.0
-      micromark-util-types: 2.0.0
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
 
-  micromark-util-combine-extensions@2.0.0:
+  micromark-util-combine-extensions@2.0.1:
     dependencies:
-      micromark-util-chunked: 2.0.0
-      micromark-util-types: 2.0.0
+      micromark-util-chunked: 2.0.1
+      micromark-util-types: 2.0.2
 
-  micromark-util-decode-numeric-character-reference@2.0.1:
+  micromark-util-decode-numeric-character-reference@2.0.2:
     dependencies:
-      micromark-util-symbol: 2.0.0
+      micromark-util-symbol: 2.0.1
 
-  micromark-util-decode-string@2.0.0:
+  micromark-util-decode-string@2.0.1:
     dependencies:
-      decode-named-character-reference: 1.0.2
-      micromark-util-character: 2.1.0
-      micromark-util-decode-numeric-character-reference: 2.0.1
-      micromark-util-symbol: 2.0.0
+      decode-named-character-reference: 1.1.0
+      micromark-util-character: 2.1.1
+      micromark-util-decode-numeric-character-reference: 2.0.2
+      micromark-util-symbol: 2.0.1
 
-  micromark-util-encode@2.0.0: {}
+  micromark-util-encode@2.0.1: {}
 
-  micromark-util-html-tag-name@2.0.0: {}
+  micromark-util-html-tag-name@2.0.1: {}
 
-  micromark-util-normalize-identifier@2.0.0:
+  micromark-util-normalize-identifier@2.0.1:
     dependencies:
-      micromark-util-symbol: 2.0.0
+      micromark-util-symbol: 2.0.1
 
-  micromark-util-resolve-all@2.0.0:
+  micromark-util-resolve-all@2.0.1:
     dependencies:
-      micromark-util-types: 2.0.0
+      micromark-util-types: 2.0.2
 
-  micromark-util-sanitize-uri@2.0.0:
+  micromark-util-sanitize-uri@2.0.1:
     dependencies:
-      micromark-util-character: 2.1.0
-      micromark-util-encode: 2.0.0
-      micromark-util-symbol: 2.0.0
+      micromark-util-character: 2.1.1
+      micromark-util-encode: 2.0.1
+      micromark-util-symbol: 2.0.1
 
-  micromark-util-subtokenize@2.0.0:
+  micromark-util-subtokenize@2.1.0:
     dependencies:
       devlop: 1.1.0
-      micromark-util-chunked: 2.0.0
-      micromark-util-symbol: 2.0.0
-      micromark-util-types: 2.0.0
+      micromark-util-chunked: 2.0.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
 
-  micromark-util-symbol@2.0.0: {}
+  micromark-util-symbol@2.0.1: {}
 
-  micromark-util-types@2.0.0: {}
+  micromark-util-types@2.0.2: {}
 
-  micromark@4.0.0:
+  micromark@4.0.2:
     dependencies:
       '@types/debug': 4.1.12
       debug: 4.4.0(supports-color@8.1.1)
-      decode-named-character-reference: 1.0.2
+      decode-named-character-reference: 1.1.0
       devlop: 1.1.0
-      micromark-core-commonmark: 2.0.0
-      micromark-factory-space: 2.0.0
-      micromark-util-character: 2.1.0
-      micromark-util-chunked: 2.0.0
-      micromark-util-combine-extensions: 2.0.0
-      micromark-util-decode-numeric-character-reference: 2.0.1
-      micromark-util-encode: 2.0.0
-      micromark-util-normalize-identifier: 2.0.0
-      micromark-util-resolve-all: 2.0.0
-      micromark-util-sanitize-uri: 2.0.0
-      micromark-util-subtokenize: 2.0.0
-      micromark-util-symbol: 2.0.0
-      micromark-util-types: 2.0.0
+      micromark-core-commonmark: 2.0.3
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-chunked: 2.0.1
+      micromark-util-combine-extensions: 2.0.1
+      micromark-util-decode-numeric-character-reference: 2.0.2
+      micromark-util-encode: 2.0.1
+      micromark-util-normalize-identifier: 2.0.1
+      micromark-util-resolve-all: 2.0.1
+      micromark-util-sanitize-uri: 2.0.1
+      micromark-util-subtokenize: 2.1.0
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
     transitivePeerDependencies:
       - supports-color
 
@@ -17883,18 +17521,20 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  micromatch@4.0.5:
+  micromatch@4.0.8:
     dependencies:
-      braces: 3.0.2
+      braces: 3.0.3
       picomatch: 2.3.1
 
   miller-rabin@4.0.1:
     dependencies:
-      bn.js: 4.12.0
+      bn.js: 4.12.1
       brorand: 1.1.0
 
   mime-db@1.52.0: {}
 
+  mime-db@1.53.0: {}
+
   mime-db@1.54.0: {}
 
   mime-types@2.1.35:
@@ -17927,9 +17567,9 @@ snapshots:
 
   minecraft-folder-path@1.2.0: {}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00(@types/react@18.2.20)(react@18.2.0):
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.3.18)(react@18.3.1):
     dependencies:
-      valtio: 1.11.2(@types/react@18.2.20)(react@18.2.0)
+      valtio: 1.13.2(@types/react@18.3.18)(react@18.3.1)
     transitivePeerDependencies:
       - '@types/react'
       - react
@@ -17937,7 +17577,7 @@ snapshots:
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
-      '@types/readable-stream': 4.0.12
+      '@types/readable-stream': 4.0.18
       aes-js: 3.1.2
       buffer-equal: 1.0.1
       debug: 4.4.0(supports-color@8.1.1)
@@ -17948,38 +17588,12 @@ snapshots:
       minecraft-folder-path: 1.2.0
       node-fetch: 2.7.0(encoding@0.1.13)
       node-rsa: 0.4.2
-      prismarine-auth: 2.4.2(encoding@0.1.13)
-      prismarine-chat: 1.10.1
-      prismarine-nbt: 2.5.0
+      prismarine-auth: 2.7.0
+      prismarine-chat: 1.11.0
+      prismarine-nbt: 2.7.0
       prismarine-realms: 1.3.2(encoding@0.1.13)
       protodef: 1.18.0
-      readable-stream: 4.5.2
-      uuid-1345: 1.0.2
-      yggdrasil: 1.7.0(encoding@0.1.13)
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13):
-    dependencies:
-      '@types/node-rsa': 1.1.4
-      '@types/readable-stream': 4.0.12
-      aes-js: 3.1.2
-      buffer-equal: 1.0.1
-      debug: 4.4.0(supports-color@8.1.1)
-      endian-toggle: 0.0.0
-      lodash.get: 4.4.2
-      lodash.merge: 4.6.2
-      minecraft-data: 3.83.1
-      minecraft-folder-path: 1.2.0
-      node-fetch: 2.7.0(encoding@0.1.13)
-      node-rsa: 0.4.2
-      prismarine-auth: 2.4.2(encoding@0.1.13)
-      prismarine-chat: 1.10.1
-      prismarine-nbt: 2.5.0
-      prismarine-realms: 1.3.2(encoding@0.1.13)
-      protodef: 1.18.0
-      readable-stream: 4.5.2
+      readable-stream: 4.7.0
       uuid-1345: 1.0.2
       yggdrasil: 1.7.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -17989,7 +17603,7 @@ snapshots:
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
-      '@types/readable-stream': 4.0.12
+      '@types/readable-stream': 4.0.18
       aes-js: 3.1.2
       buffer-equal: 1.0.1
       debug: 4.4.0(supports-color@8.1.1)
@@ -17999,20 +17613,21 @@ snapshots:
       minecraft-folder-path: 1.2.0
       node-fetch: 2.7.0(encoding@0.1.13)
       node-rsa: 0.4.2
-      prismarine-auth: 2.4.2(encoding@0.1.13)
-      prismarine-chat: 1.10.1
+      prismarine-auth: 2.7.0
+      prismarine-chat: 1.11.0
       prismarine-nbt: 2.7.0
       prismarine-realms: 1.3.2(encoding@0.1.13)
       protodef: 1.18.0
-      readable-stream: 4.5.2
+      readable-stream: 4.7.0
       uuid-1345: 1.0.2
       yggdrasil: 1.7.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  minecraft-wrap@1.5.1(encoding@0.1.13):
+  minecraft-wrap@1.6.0(encoding@0.1.13):
     dependencies:
+      adm-zip: 0.5.16
       debug: 4.4.0(supports-color@8.1.1)
       es6-promisify: 5.0.0
       extract-zip: 2.0.1(supports-color@8.1.1)
@@ -18029,26 +17644,27 @@ snapshots:
       - encoding
       - supports-color
 
-  minecrafthawkeye@1.3.6:
+  minecrafthawkeye@1.3.9:
     dependencies:
       detect-collisions: 7.0.5
+      uuid: 9.0.1
       vec3: 0.1.10
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13):
     dependencies:
-      mineflayer: 4.25.0(encoding@0.1.13)
+      mineflayer: 4.27.0(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.7(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  mineflayer-mouse@0.1.7(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0):
     dependencies:
       change-case: 5.4.4
       debug: 4.4.0(supports-color@8.1.1)
       prismarine-item: 1.16.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
-      vitest: 3.0.7(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+      vitest: 3.0.8(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
     transitivePeerDependencies:
       - '@edge-runtime/vm'
       - '@types/debug'
@@ -18070,27 +17686,27 @@ snapshots:
       - tsx
       - yaml
 
-  mineflayer-pathfinder@2.4.4:
+  mineflayer-pathfinder@2.4.5:
     dependencies:
       minecraft-data: 3.83.1
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
-      prismarine-entity: 2.3.1
+      prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
-      prismarine-nbt: 2.5.0
+      prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
 
-  mineflayer@4.25.0(encoding@0.1.13):
+  mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
-      prismarine-chat: 1.10.1
+      prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
-      prismarine-entity: 2.3.1
+      prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
-      prismarine-nbt: 2.5.0
+      prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
       prismarine-registry: 1.11.0
@@ -18103,17 +17719,18 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/06e3050ddf4d9aa655fea6e2bed182937a81705d(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448(encoding@0.1.13):
     dependencies:
+      '@nxg-org/mineflayer-physics-util': 1.8.5
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/5ec3dd4b367fcc039fbcb3edd214fe3cf8178a6d(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
-      prismarine-chat: 1.10.1
+      prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
-      prismarine-entity: 2.3.1
+      prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
-      prismarine-nbt: 2.5.0
+      prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
       prismarine-registry: 1.11.0
@@ -18138,6 +17755,10 @@ snapshots:
     dependencies:
       brace-expansion: 2.0.1
 
+  minimatch@9.0.3:
+    dependencies:
+      brace-expansion: 2.0.1
+
   minimatch@9.0.5:
     dependencies:
       brace-expansion: 2.0.1
@@ -18185,7 +17806,7 @@ snapshots:
 
   minipass@5.0.0: {}
 
-  minipass@7.0.3: {}
+  minipass@7.1.2: {}
 
   minizlib@2.1.2:
     dependencies:
@@ -18210,12 +17831,12 @@ snapshots:
 
   mkdirp@2.1.6: {}
 
-  mlly@1.4.2:
+  mlly@1.7.4:
     dependencies:
-      acorn: 8.12.1
-      pathe: 1.1.1
-      pkg-types: 1.0.3
-      ufo: 1.3.1
+      acorn: 8.14.1
+      pathe: 2.0.3
+      pkg-types: 1.3.1
+      ufo: 1.5.4
 
   mojangson@2.0.4:
     dependencies:
@@ -18233,8 +17854,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mri@1.2.0: {}
-
   ms@2.0.0: {}
 
   ms@2.1.3: {}
@@ -18245,25 +17864,23 @@ snapshots:
       object-assign: 4.1.1
       thenify-all: 1.6.0
 
-  nan@2.18.0:
+  nan@2.22.2:
     optional: true
 
-  nano-css@5.3.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  nano-css@5.6.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.0
       css-tree: 1.1.3
-      csstype: 3.1.2
+      csstype: 3.1.3
       fastest-stable-stringify: 2.0.2
-      inline-style-prefixer: 6.0.4
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      inline-style-prefixer: 7.0.1
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
       rtl-css-js: 1.16.1
-      sourcemap-codec: 1.4.8
       stacktrace-js: 2.0.2
-      stylis: 4.2.0
+      stylis: 4.3.6
 
-  nanoid@3.3.7: {}
-
-  nanoid@3.3.8: {}
+  nanoid@3.3.9: {}
 
   nanomatch@1.2.13:
     dependencies:
@@ -18281,7 +17898,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  napi-build-utils@1.0.2: {}
+  napi-build-utils@2.0.0: {}
 
   natural-compare-lite@1.4.0: {}
 
@@ -18296,13 +17913,15 @@ snapshots:
 
   negotiator@0.6.3: {}
 
+  negotiator@0.6.4: {}
+
   neo-async@2.6.2: {}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/4c6eccc7d7a7468ec811cb6c7398ded4753aea55:
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590:
     dependencies:
-      body-parser: 1.20.2
-      express: 4.18.2
-      express-ws: 4.0.0(express@4.18.2)
+      body-parser: 1.20.3
+      express: 4.21.2
+      express-ws: 4.0.0(express@4.21.2)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -18313,11 +17932,11 @@ snapshots:
   no-case@3.0.4:
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.6.2
+      tslib: 2.8.1
 
-  node-abi@3.47.0:
+  node-abi@3.74.0:
     dependencies:
-      semver: 7.6.0
+      semver: 7.7.1
 
   node-abort-controller@3.1.1: {}
 
@@ -18337,7 +17956,7 @@ snapshots:
     dependencies:
       minimatch: 3.1.2
 
-  node-fetch-native@1.4.0: {}
+  node-fetch-native@1.6.6: {}
 
   node-fetch@2.7.0(encoding@0.1.13):
     dependencies:
@@ -18345,23 +17964,18 @@ snapshots:
     optionalDependencies:
       encoding: 0.1.13
 
-  node-gyp-build-optional-packages@5.1.1:
-    dependencies:
-      detect-libc: 2.0.2
-    optional: true
-
   node-gyp@9.4.1:
     dependencies:
       env-paths: 2.2.1
-      exponential-backoff: 3.1.1
+      exponential-backoff: 3.1.2
       glob: 7.2.3
       graceful-fs: 4.2.11
       make-fetch-happen: 10.2.1
       nopt: 6.0.0
       npmlog: 6.0.2
       rimraf: 3.0.2
-      semver: 7.6.0
-      tar: 6.2.0
+      semver: 7.7.1
+      tar: 6.2.1
       which: 2.0.2
     transitivePeerDependencies:
       - bluebird
@@ -18370,14 +17984,14 @@ snapshots:
 
   node-gzip@1.1.2: {}
 
-  node-html-parser@6.1.10:
+  node-html-parser@6.1.13:
     dependencies:
       css-select: 5.1.0
       he: 1.2.0
 
   node-int64@0.4.0: {}
 
-  node-releases@2.0.18: {}
+  node-releases@2.0.19: {}
 
   node-rsa@0.4.2:
     dependencies:
@@ -18405,7 +18019,7 @@ snapshots:
   normalize-package-data@2.5.0:
     dependencies:
       hosted-git-info: 2.8.9
-      resolve: 1.22.4
+      resolve: 1.22.10
       semver: 5.7.2
       validate-npm-package-license: 3.0.4
 
@@ -18413,7 +18027,7 @@ snapshots:
     dependencies:
       hosted-git-info: 4.1.0
       is-core-module: 2.16.1
-      semver: 7.6.0
+      semver: 7.7.1
       validate-npm-package-license: 3.0.4
 
   normalize-path@2.1.1:
@@ -18426,13 +18040,13 @@ snapshots:
     dependencies:
       ansi-styles: 3.2.1
       chalk: 2.4.2
-      cross-spawn: 6.0.5
+      cross-spawn: 6.0.6
       memorystream: 0.3.1
       minimatch: 3.1.2
       pidtree: 0.3.1
       read-pkg: 3.0.0
-      shell-quote: 1.8.1
-      string.prototype.padend: 3.1.4
+      shell-quote: 1.8.2
+      string.prototype.padend: 3.1.6
 
   npm-run-path@4.0.1:
     dependencies:
@@ -18458,6 +18072,15 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
+  nypm@0.5.4:
+    dependencies:
+      citty: 0.1.6
+      consola: 3.4.0
+      pathe: 2.0.3
+      pkg-types: 1.3.1
+      tinyexec: 0.3.2
+      ufo: 1.5.4
+
   object-assign@4.1.1: {}
 
   object-copy@0.1.0:
@@ -18466,9 +18089,9 @@ snapshots:
       define-property: 0.2.5
       kind-of: 3.2.2
 
-  object-inspect@1.13.3: {}
+  object-inspect@1.13.4: {}
 
-  object-is@1.1.5:
+  object-is@1.1.6:
     dependencies:
       call-bind: 1.0.8
       define-properties: 1.2.1
@@ -18482,7 +18105,7 @@ snapshots:
   object.assign@4.1.7:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
       has-symbols: 1.1.0
@@ -18502,12 +18125,6 @@ snapshots:
       es-abstract: 1.23.9
       es-object-atoms: 1.1.1
 
-  object.hasown@1.1.4:
-    dependencies:
-      define-properties: 1.2.1
-      es-abstract: 1.23.9
-      es-object-atoms: 1.1.1
-
   object.pick@1.3.0:
     dependencies:
       isobject: 3.0.1
@@ -18515,7 +18132,7 @@ snapshots:
   object.values@1.2.1:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
 
@@ -18552,21 +18169,21 @@ snapshots:
     dependencies:
       is-wsl: 1.1.0
 
-  optionator@0.9.3:
+  optionator@0.9.4:
     dependencies:
-      '@aashutoshrathi/word-wrap': 1.2.6
       deep-is: 0.1.4
       fast-levenshtein: 2.0.6
       levn: 0.4.1
       prelude-ls: 1.2.1
       type-check: 0.4.0
+      word-wrap: 1.2.5
 
   ora@5.4.1:
     dependencies:
       bl: 4.1.0
       chalk: 4.1.2
       cli-cursor: 3.1.0
-      cli-spinners: 2.9.1
+      cli-spinners: 2.9.2
       is-interactive: 1.0.0
       is-unicode-supported: 0.1.0
       log-symbols: 4.1.0
@@ -18596,7 +18213,7 @@ snapshots:
 
   p-limit@4.0.0:
     dependencies:
-      yocto-queue: 1.0.0
+      yocto-queue: 1.2.0
 
   p-locate@3.0.0:
     dependencies:
@@ -18616,6 +18233,8 @@ snapshots:
 
   p-try@2.2.0: {}
 
+  package-json-from-dist@1.0.1: {}
+
   pako@0.2.9: {}
 
   pako@1.0.11: {}
@@ -18625,17 +18244,18 @@ snapshots:
   param-case@3.0.4:
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   parent-module@1.0.1:
     dependencies:
       callsites: 3.1.0
 
-  parse-asn1@5.1.6:
+  parse-asn1@5.1.7:
     dependencies:
-      asn1.js: 5.4.1
+      asn1.js: 4.10.1
       browserify-aes: 1.2.0
       evp_bytestokey: 1.0.3
+      hash-base: 3.0.5
       pbkdf2: 3.1.2
       safe-buffer: 5.2.1
 
@@ -18645,10 +18265,10 @@ snapshots:
   parse-bmfont-binary@1.0.6:
     optional: true
 
-  parse-bmfont-xml@1.1.4:
+  parse-bmfont-xml@1.1.6:
     dependencies:
       xml-parse-from-string: 1.0.1
-      xml2js: 0.4.23
+      xml2js: 0.5.0
     optional: true
 
   parse-headers@2.0.5:
@@ -18661,7 +18281,7 @@ snapshots:
 
   parse-json@5.2.0:
     dependencies:
-      '@babel/code-frame': 7.22.13
+      '@babel/code-frame': 7.26.2
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
@@ -18677,7 +18297,7 @@ snapshots:
   pascal-case@3.1.2:
     dependencies:
       no-case: 3.0.4
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   pascalcase@0.1.1: {}
 
@@ -18686,7 +18306,7 @@ snapshots:
   path-case@3.0.4:
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   path-dirname@1.0.2: {}
 
@@ -18709,12 +18329,12 @@ snapshots:
 
   path-parse@1.0.7: {}
 
-  path-scurry@1.10.1:
+  path-scurry@1.11.1:
     dependencies:
-      lru-cache: 10.0.1
-      minipass: 7.0.3
+      lru-cache: 10.4.3
+      minipass: 7.1.2
 
-  path-to-regexp@0.1.7: {}
+  path-to-regexp@0.1.12: {}
 
   path-type@3.0.0:
     dependencies:
@@ -18722,7 +18342,7 @@ snapshots:
 
   path-type@4.0.0: {}
 
-  pathe@1.1.1: {}
+  pathe@1.1.2: {}
 
   pathe@2.0.3: {}
 
@@ -18748,15 +18368,14 @@ snapshots:
       duplexify: 3.7.1
       through2: 2.0.5
 
-  peerjs-js-binarypack@2.0.0: {}
+  peerjs-js-binarypack@2.1.0: {}
 
-  peerjs@1.5.0:
+  peerjs@1.5.4:
     dependencies:
       '@msgpack/msgpack': 2.8.0
-      cbor-x: 1.5.4
       eventemitter3: 4.0.7
-      peerjs-js-binarypack: 2.0.0
-      webrtc-adapter: 8.2.3
+      peerjs-js-binarypack: 2.1.0
+      webrtc-adapter: 9.0.1
 
   pend@1.2.0: {}
 
@@ -18766,6 +18385,13 @@ snapshots:
   phin@2.9.3:
     optional: true
 
+  phin@3.7.1(debug@4.4.0):
+    dependencies:
+      centra: 2.7.0(debug@4.4.0)
+    transitivePeerDependencies:
+      - debug
+    optional: true
+
   picocolors@1.1.1: {}
 
   picomatch@2.3.1: {}
@@ -18802,24 +18428,24 @@ snapshots:
     dependencies:
       find-up: 5.0.0
 
-  pkg-types@1.0.3:
+  pkg-types@1.3.1:
     dependencies:
-      jsonc-parser: 3.2.0
-      mlly: 1.4.2
-      pathe: 1.1.1
+      confbox: 0.1.8
+      mlly: 1.7.4
+      pathe: 2.0.3
 
   pluralize@8.0.0: {}
 
   pngjs@3.4.0:
     optional: true
 
-  polished@4.2.2:
+  polished@4.3.1:
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.26.9
 
   poly-decomp@0.3.0: {}
 
-  portfinder@1.0.32:
+  portfinder@1.0.33:
     dependencies:
       async: 2.6.4
       debug: 3.2.7(supports-color@8.1.1)
@@ -18829,35 +18455,29 @@ snapshots:
 
   posix-character-classes@0.1.1: {}
 
-  possible-typed-array-names@1.0.0: {}
-
-  postcss@8.4.47:
-    dependencies:
-      nanoid: 3.3.7
-      picocolors: 1.1.1
-      source-map-js: 1.2.1
+  possible-typed-array-names@1.1.0: {}
 
   postcss@8.5.3:
     dependencies:
-      nanoid: 3.3.8
+      nanoid: 3.3.9
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
   potpack@1.0.2: {}
 
-  prebuild-install@7.1.1:
+  prebuild-install@7.1.3:
     dependencies:
-      detect-libc: 2.0.2
+      detect-libc: 2.0.3
       expand-template: 2.0.3
       github-from-package: 0.0.0
       minimist: 1.2.8
       mkdirp-classic: 0.5.3
-      napi-build-utils: 1.0.2
-      node-abi: 3.47.0
-      pump: 3.0.0
+      napi-build-utils: 2.0.0
+      node-abi: 3.74.0
+      pump: 3.0.2
       rc: 1.2.8
       simple-get: 4.0.1
-      tar-fs: 2.1.1
+      tar-fs: 2.1.2
       tunnel-agent: 0.6.0
 
   prelude-ls@1.2.1: {}
@@ -18875,21 +18495,18 @@ snapshots:
     dependencies:
       '@jest/schemas': 29.6.3
       ansi-styles: 5.2.0
-      react-is: 18.2.0
+      react-is: 18.3.1
 
   pretty-hrtime@1.0.3: {}
 
-  prismarine-auth@2.4.2(encoding@0.1.13):
+  prismarine-auth@2.7.0:
     dependencies:
-      '@azure/msal-node': 2.7.0
+      '@azure/msal-node': 2.16.2
       '@xboxreplay/xboxlive-auth': 3.3.3(debug@4.4.0)
       debug: 4.4.0(supports-color@8.1.1)
-      jose: 4.15.5
-      node-fetch: 2.7.0(encoding@0.1.13)
       smart-buffer: 4.2.0
       uuid-1345: 1.0.2
     transitivePeerDependencies:
-      - encoding
       - supports-color
 
   prismarine-biome@1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0):
@@ -18901,14 +18518,14 @@ snapshots:
     dependencies:
       minecraft-data: 3.83.1
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-chat: 1.10.1
+      prismarine-chat: 1.11.0
       prismarine-item: 1.16.0
-      prismarine-nbt: 2.5.0
+      prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
     transitivePeerDependencies:
       - prismarine-registry
 
-  prismarine-chat@1.10.1:
+  prismarine-chat@1.11.0:
     dependencies:
       mojangson: 2.0.4
       prismarine-nbt: 2.7.0
@@ -18918,7 +18535,7 @@ snapshots:
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
-      prismarine-nbt: 2.5.0
+      prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
       uint4: 0.1.2
@@ -18927,9 +18544,9 @@ snapshots:
     transitivePeerDependencies:
       - minecraft-data
 
-  prismarine-entity@2.3.1:
+  prismarine-entity@2.5.0:
     dependencies:
-      prismarine-chat: 1.10.1
+      prismarine-chat: 1.11.0
       prismarine-item: 1.16.0
       prismarine-registry: 1.11.0
       vec3: 0.1.10
@@ -18939,10 +18556,6 @@ snapshots:
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
 
-  prismarine-nbt@2.5.0:
-    dependencies:
-      protodef: 1.18.0
-
   prismarine-nbt@2.7.0:
     dependencies:
       protodef: 1.18.0
@@ -18957,7 +18570,7 @@ snapshots:
     dependencies:
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
-      prismarine-nbt: 2.5.0
+      prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       uint4: 0.1.2
       vec3: 0.1.10
@@ -18986,7 +18599,7 @@ snapshots:
     dependencies:
       minecraft-data: 3.83.1
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
-      prismarine-nbt: 2.5.0
+      prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.10
 
@@ -19030,93 +18643,94 @@ snapshots:
       object-assign: 4.1.1
       react-is: 16.13.1
 
-  prosemirror-commands@1.5.2:
+  prosemirror-commands@1.7.0:
     dependencies:
-      prosemirror-model: 1.19.4
+      prosemirror-model: 1.24.1
       prosemirror-state: 1.4.3
-      prosemirror-transform: 1.8.0
+      prosemirror-transform: 1.10.3
 
   prosemirror-dropcursor@1.8.1:
     dependencies:
       prosemirror-state: 1.4.3
-      prosemirror-transform: 1.8.0
-      prosemirror-view: 1.33.1
+      prosemirror-transform: 1.10.3
+      prosemirror-view: 1.38.1
 
-  prosemirror-example-setup@1.2.2:
+  prosemirror-example-setup@1.2.3:
     dependencies:
-      prosemirror-commands: 1.5.2
+      prosemirror-commands: 1.7.0
       prosemirror-dropcursor: 1.8.1
       prosemirror-gapcursor: 1.3.2
-      prosemirror-history: 1.3.2
+      prosemirror-history: 1.4.1
       prosemirror-inputrules: 1.4.0
       prosemirror-keymap: 1.2.2
       prosemirror-menu: 1.2.4
-      prosemirror-schema-list: 1.3.0
+      prosemirror-schema-list: 1.5.1
       prosemirror-state: 1.4.3
 
   prosemirror-gapcursor@1.3.2:
     dependencies:
       prosemirror-keymap: 1.2.2
-      prosemirror-model: 1.19.4
+      prosemirror-model: 1.24.1
       prosemirror-state: 1.4.3
-      prosemirror-view: 1.33.1
+      prosemirror-view: 1.38.1
 
-  prosemirror-history@1.3.2:
+  prosemirror-history@1.4.1:
     dependencies:
       prosemirror-state: 1.4.3
-      prosemirror-transform: 1.8.0
-      prosemirror-view: 1.33.1
+      prosemirror-transform: 1.10.3
+      prosemirror-view: 1.38.1
       rope-sequence: 1.3.4
 
   prosemirror-inputrules@1.4.0:
     dependencies:
       prosemirror-state: 1.4.3
-      prosemirror-transform: 1.8.0
+      prosemirror-transform: 1.10.3
 
   prosemirror-keymap@1.2.2:
     dependencies:
       prosemirror-state: 1.4.3
       w3c-keyname: 2.2.8
 
-  prosemirror-markdown@1.12.0:
+  prosemirror-markdown@1.13.1:
     dependencies:
-      markdown-it: 14.0.0
-      prosemirror-model: 1.19.4
+      '@types/markdown-it': 14.1.2
+      markdown-it: 14.1.0
+      prosemirror-model: 1.24.1
 
   prosemirror-menu@1.2.4:
     dependencies:
       crelt: 1.0.6
-      prosemirror-commands: 1.5.2
-      prosemirror-history: 1.3.2
+      prosemirror-commands: 1.7.0
+      prosemirror-history: 1.4.1
       prosemirror-state: 1.4.3
 
-  prosemirror-model@1.19.4:
+  prosemirror-model@1.24.1:
     dependencies:
       orderedmap: 2.1.1
 
-  prosemirror-schema-list@1.3.0:
+  prosemirror-schema-list@1.5.1:
     dependencies:
-      prosemirror-model: 1.19.4
+      prosemirror-model: 1.24.1
       prosemirror-state: 1.4.3
-      prosemirror-transform: 1.8.0
+      prosemirror-transform: 1.10.3
 
   prosemirror-state@1.4.3:
     dependencies:
-      prosemirror-model: 1.19.4
-      prosemirror-transform: 1.8.0
-      prosemirror-view: 1.33.1
+      prosemirror-model: 1.24.1
+      prosemirror-transform: 1.10.3
+      prosemirror-view: 1.38.1
 
-  prosemirror-transform@1.8.0:
+  prosemirror-transform@1.10.3:
     dependencies:
-      prosemirror-model: 1.19.4
+      prosemirror-model: 1.24.1
 
-  prosemirror-view@1.33.1:
+  prosemirror-view@1.38.1:
     dependencies:
-      prosemirror-model: 1.19.4
+      prosemirror-model: 1.24.1
       prosemirror-state: 1.4.3
-      prosemirror-transform: 1.8.0
+      prosemirror-transform: 1.10.3
 
-  protodef-validator@1.3.1:
+  protodef-validator@1.4.0:
     dependencies:
       ajv: 6.12.6
 
@@ -19124,8 +18738,8 @@ snapshots:
     dependencies:
       lodash.get: 4.4.2
       lodash.reduce: 4.6.0
-      protodef-validator: 1.3.1
-      readable-stream: 4.5.2
+      protodef-validator: 1.4.0
+      readable-stream: 4.7.0
 
   proxy-addr@2.0.7:
     dependencies:
@@ -19134,6 +18748,8 @@ snapshots:
 
   proxy-compare@2.5.1: {}
 
+  proxy-compare@2.6.0: {}
+
   proxy-from-env@1.0.0:
     optional: true
 
@@ -19141,15 +18757,17 @@ snapshots:
 
   proxy-middleware@0.15.0: {}
 
-  psl@1.9.0:
+  psl@1.15.0:
+    dependencies:
+      punycode: 2.3.1
     optional: true
 
   public-encrypt@4.0.3:
     dependencies:
-      bn.js: 4.12.0
-      browserify-rsa: 4.1.0
+      bn.js: 4.12.1
+      browserify-rsa: 4.1.1
       create-hash: 1.2.0
-      parse-asn1: 5.1.6
+      parse-asn1: 5.1.7
       randombytes: 2.1.0
       safe-buffer: 5.2.1
 
@@ -19158,7 +18776,7 @@ snapshots:
       end-of-stream: 1.4.4
       once: 1.4.0
 
-  pump@3.0.0:
+  pump@3.0.2:
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
@@ -19177,7 +18795,7 @@ snapshots:
 
   puppeteer-core@2.1.1:
     dependencies:
-      '@types/mime-types': 2.1.2
+      '@types/mime-types': 2.1.4
       debug: 4.4.0(supports-color@8.1.1)
       extract-zip: 1.7.0
       https-proxy-agent: 4.0.0
@@ -19186,26 +18804,26 @@ snapshots:
       progress: 2.0.3
       proxy-from-env: 1.1.0
       rimraf: 2.7.1
-      ws: 6.2.2
+      ws: 6.2.3
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
 
-  qrcode.react@3.1.0(react@18.2.0):
+  qrcode.react@3.2.0(react@18.3.1):
     dependencies:
-      react: 18.2.0
+      react: 18.3.1
 
   qs@6.10.4:
     dependencies:
       side-channel: 1.1.0
     optional: true
 
-  qs@6.11.0:
+  qs@6.13.0:
     dependencies:
       side-channel: 1.1.0
 
-  qs@6.11.2:
+  qs@6.14.0:
     dependencies:
       side-channel: 1.1.0
 
@@ -19224,7 +18842,7 @@ snapshots:
 
   rambda@6.9.0: {}
 
-  rambda@9.2.0: {}
+  rambda@9.4.2: {}
 
   ramda@0.29.0: {}
 
@@ -19250,13 +18868,6 @@ snapshots:
 
   range@0.0.3: {}
 
-  raw-body@2.5.1:
-    dependencies:
-      bytes: 3.1.2
-      http-errors: 2.0.0
-      iconv-lite: 0.4.24
-      unpipe: 1.0.0
-
   raw-body@2.5.2:
     dependencies:
       bytes: 3.1.2
@@ -19275,141 +18886,137 @@ snapshots:
       minimist: 1.2.8
       strip-json-comments: 2.0.1
 
-  react-colorful@5.6.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  react-colorful@5.6.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
 
   react-docgen-typescript@2.2.2(typescript@5.5.4):
     dependencies:
       typescript: 5.5.4
 
-  react-docgen@6.0.0-alpha.3:
+  react-docgen@7.1.1:
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/generator': 7.22.10
-      ast-types: 0.14.2
-      commander: 2.20.3
+      '@babel/core': 7.26.9
+      '@babel/traverse': 7.26.9
+      '@babel/types': 7.26.9
+      '@types/babel__core': 7.20.5
+      '@types/babel__traverse': 7.20.6
+      '@types/doctrine': 0.0.9
+      '@types/resolve': 1.20.6
       doctrine: 3.0.0
-      estree-to-babel: 3.2.1
-      neo-async: 2.6.2
-      node-dir: 0.1.17
-      resolve: 1.22.4
-      strip-indent: 3.0.0
+      resolve: 1.22.10
+      strip-indent: 4.0.0
     transitivePeerDependencies:
       - supports-color
 
-  react-dom@18.2.0(react@18.2.0):
+  react-dom@18.3.1(react@18.3.1):
     dependencies:
       loose-envify: 1.4.0
-      react: 18.2.0
-      scheduler: 0.23.0
+      react: 18.3.1
+      scheduler: 0.23.2
 
-  react-element-to-jsx-string@15.0.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  react-element-to-jsx-string@15.0.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
       '@base2/pretty-print-object': 1.0.1
       is-plain-object: 5.0.0
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
       react-is: 18.1.0
 
   react-fast-compare@3.2.2: {}
 
-  react-hook-form@7.52.0(react@18.2.0):
+  react-hook-form@7.54.2(react@18.3.1):
     dependencies:
-      react: 18.2.0
-
-  react-inspector@6.0.2(react@18.2.0):
-    dependencies:
-      react: 18.2.0
+      react: 18.3.1
 
   react-is@16.13.1: {}
 
   react-is@18.1.0: {}
 
-  react-is@18.2.0: {}
+  react-is@18.3.1: {}
 
-  react-popper@2.3.0(@popperjs/core@2.11.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  react-popper@2.3.0(@popperjs/core@2.11.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
       '@popperjs/core': 2.11.8
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
       react-fast-compare: 3.2.2
       warning: 4.0.3
 
-  react-portal@4.2.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  react-portal@4.2.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
       prop-types: 15.8.1
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
 
   react-refresh@0.14.2: {}
 
-  react-remove-scroll-bar@2.3.4(@types/react@18.2.20)(react@18.2.0):
+  react-remove-scroll-bar@2.3.8(@types/react@18.3.18)(react@18.3.1):
     dependencies:
-      react: 18.2.0
-      react-style-singleton: 2.2.1(@types/react@18.2.20)(react@18.2.0)
-      tslib: 2.6.2
+      react: 18.3.1
+      react-style-singleton: 2.2.3(@types/react@18.3.18)(react@18.3.1)
+      tslib: 2.8.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  react-remove-scroll@2.5.5(@types/react@18.2.20)(react@18.2.0):
+  react-remove-scroll@2.5.5(@types/react@18.3.18)(react@18.3.1):
     dependencies:
-      react: 18.2.0
-      react-remove-scroll-bar: 2.3.4(@types/react@18.2.20)(react@18.2.0)
-      react-style-singleton: 2.2.1(@types/react@18.2.20)(react@18.2.0)
-      tslib: 2.6.2
-      use-callback-ref: 1.3.0(@types/react@18.2.20)(react@18.2.0)
-      use-sidecar: 1.1.2(@types/react@18.2.20)(react@18.2.0)
+      react: 18.3.1
+      react-remove-scroll-bar: 2.3.8(@types/react@18.3.18)(react@18.3.1)
+      react-style-singleton: 2.2.3(@types/react@18.3.18)(react@18.3.1)
+      tslib: 2.8.1
+      use-callback-ref: 1.3.3(@types/react@18.3.18)(react@18.3.1)
+      use-sidecar: 1.1.3(@types/react@18.3.18)(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  react-select@5.8.0(@types/react@18.2.20)(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  react-select@5.10.1(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
-      '@babel/runtime': 7.24.5
-      '@emotion/cache': 11.13.1
-      '@emotion/react': 11.13.0(@types/react@18.2.20)(react@18.2.0)
-      '@floating-ui/dom': 1.5.3
-      '@types/react-transition-group': 4.4.7
+      '@babel/runtime': 7.26.9
+      '@emotion/cache': 11.14.0
+      '@emotion/react': 11.14.0(@types/react@18.3.18)(react@18.3.1)
+      '@floating-ui/dom': 1.6.13
+      '@types/react-transition-group': 4.4.12(@types/react@18.3.18)
       memoize-one: 6.0.0
       prop-types: 15.8.1
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      react-transition-group: 4.4.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      use-isomorphic-layout-effect: 1.1.2(@types/react@18.2.20)(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      react-transition-group: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      use-isomorphic-layout-effect: 1.2.0(@types/react@18.3.18)(react@18.3.1)
     transitivePeerDependencies:
       - '@types/react'
+      - supports-color
 
-  react-style-singleton@2.2.1(@types/react@18.2.20)(react@18.2.0):
+  react-style-singleton@2.2.3(@types/react@18.3.18)(react@18.3.1):
     dependencies:
       get-nonce: 1.0.1
-      invariant: 2.2.4
-      react: 18.2.0
-      tslib: 2.6.2
+      react: 18.3.1
+      tslib: 2.8.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  react-transition-group@4.4.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  react-transition-group@4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.26.9
       dom-helpers: 5.2.1
       loose-envify: 1.4.0
       prop-types: 15.8.1
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
 
-  react-universal-interface@0.6.2(react@18.2.0)(tslib@2.6.2):
+  react-universal-interface@0.6.2(react@18.3.1)(tslib@2.8.1):
     dependencies:
-      react: 18.2.0
-      tslib: 2.6.2
+      react: 18.3.1
+      tslib: 2.8.1
 
-  react-use-measure@2.1.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  react-use-measure@2.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
       debounce: 1.2.1
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
 
-  react-use@17.3.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  react-use@17.3.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
       '@types/js-cookie': 2.2.7
       '@xobotyi/scrollbar-width': 1.9.5
@@ -19417,23 +19024,23 @@ snapshots:
       fast-deep-equal: 3.1.3
       fast-shallow-equal: 1.0.0
       js-cookie: 2.2.1
-      nano-css: 5.3.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      react-universal-interface: 0.6.2(react@18.2.0)(tslib@2.6.2)
+      nano-css: 5.6.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      react-universal-interface: 0.6.2(react@18.3.1)(tslib@2.8.1)
       resize-observer-polyfill: 1.5.1
       screenfull: 5.2.0
       set-harmonic-interval: 1.0.1
       throttle-debounce: 3.0.1
       ts-easing: 0.2.0
-      tslib: 2.6.2
+      tslib: 2.8.1
 
-  react-zoom-pan-pinch@3.4.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  react-zoom-pan-pinch@3.4.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
 
-  react@18.2.0:
+  react@18.3.1:
     dependencies:
       loose-envify: 1.4.0
 
@@ -19457,14 +19064,14 @@ snapshots:
 
   read-pkg@5.2.0:
     dependencies:
-      '@types/normalize-package-data': 2.4.2
+      '@types/normalize-package-data': 2.4.4
       normalize-package-data: 2.5.0
       parse-json: 5.2.0
       type-fest: 0.6.0
 
   read-pkg@6.0.0:
     dependencies:
-      '@types/normalize-package-data': 2.4.2
+      '@types/normalize-package-data': 2.4.4
       normalize-package-data: 3.0.3
       parse-json: 5.2.0
       type-fest: 1.4.0
@@ -19493,7 +19100,7 @@ snapshots:
       string_decoder: 1.3.0
       util-deprecate: 1.0.2
 
-  readable-stream@4.5.2:
+  readable-stream@4.7.0:
     dependencies:
       abort-controller: 3.0.0
       buffer: 6.0.3
@@ -19515,29 +19122,20 @@ snapshots:
 
   readline@1.3.0: {}
 
-  recast@0.21.5:
+  recast@0.23.11:
     dependencies:
-      ast-types: 0.15.2
-      esprima: 4.0.1
-      source-map: 0.6.1
-      tslib: 2.6.2
-
-  recast@0.23.4:
-    dependencies:
-      assert: 2.1.0
       ast-types: 0.16.1
       esprima: 4.0.1
       source-map: 0.6.1
-      tslib: 2.6.2
+      tiny-invariant: 1.3.3
+      tslib: 2.8.1
 
   redent@4.0.0:
     dependencies:
       indent-string: 5.0.0
       strip-indent: 4.0.0
 
-  reduce-configs@1.0.0:
-    dependencies:
-      browserslist: 4.23.2
+  reduce-configs@1.1.0: {}
 
   reflect.getprototypeof@1.0.10:
     dependencies:
@@ -19550,7 +19148,7 @@ snapshots:
       get-proto: 1.0.1
       which-builtin-type: 1.2.1
 
-  regenerate-unicode-properties@10.1.0:
+  regenerate-unicode-properties@10.2.0:
     dependencies:
       regenerate: 1.4.2
 
@@ -19559,11 +19157,11 @@ snapshots:
   regenerator-runtime@0.13.11:
     optional: true
 
-  regenerator-runtime@0.14.0: {}
+  regenerator-runtime@0.14.1: {}
 
   regenerator-transform@0.15.2:
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.26.9
 
   regex-not@1.0.2:
     dependencies:
@@ -19583,22 +19181,24 @@ snapshots:
 
   regexpp@3.2.0: {}
 
-  regexpu-core@5.3.2:
+  regexpu-core@6.2.0:
     dependencies:
-      '@babel/regjsgen': 0.8.0
       regenerate: 1.4.2
-      regenerate-unicode-properties: 10.1.0
-      regjsparser: 0.9.1
+      regenerate-unicode-properties: 10.2.0
+      regjsgen: 0.8.0
+      regjsparser: 0.12.0
       unicode-match-property-ecmascript: 2.0.0
-      unicode-match-property-value-ecmascript: 2.1.0
+      unicode-match-property-value-ecmascript: 2.2.0
+
+  regjsgen@0.8.0: {}
 
   regjsparser@0.10.0:
     dependencies:
       jsesc: 0.5.0
 
-  regjsparser@0.9.1:
+  regjsparser@0.12.0:
     dependencies:
-      jsesc: 0.5.0
+      jsesc: 3.0.2
 
   remark-external-links@8.0.0:
     dependencies:
@@ -19610,10 +19210,10 @@ snapshots:
 
   remark-parse@11.0.0:
     dependencies:
-      '@types/mdast': 4.0.3
-      mdast-util-from-markdown: 2.0.0
-      micromark-util-types: 2.0.0
-      unified: 11.0.4
+      '@types/mdast': 4.0.4
+      mdast-util-from-markdown: 2.0.2
+      micromark-util-types: 2.0.2
+      unified: 11.0.5
     transitivePeerDependencies:
       - supports-color
 
@@ -19625,16 +19225,16 @@ snapshots:
 
   remark-stringify@11.0.0:
     dependencies:
-      '@types/mdast': 4.0.3
-      mdast-util-to-markdown: 2.1.0
-      unified: 11.0.4
+      '@types/mdast': 4.0.4
+      mdast-util-to-markdown: 2.1.2
+      unified: 11.0.5
 
   remark@15.0.1:
     dependencies:
-      '@types/mdast': 4.0.3
+      '@types/mdast': 4.0.4
       remark-parse: 11.0.0
       remark-stringify: 11.0.0
-      unified: 11.0.4
+      unified: 11.0.5
     transitivePeerDependencies:
       - supports-color
 
@@ -19646,7 +19246,7 @@ snapshots:
 
   request-progress@3.0.0:
     dependencies:
-      throttleit: 1.0.0
+      throttleit: 1.0.1
     optional: true
 
   require-directory@2.1.1: {}
@@ -19665,7 +19265,7 @@ snapshots:
 
   resolve-url@0.2.1: {}
 
-  resolve@1.22.4:
+  resolve@1.22.10:
     dependencies:
       is-core-module: 2.16.1
       path-parse: 1.0.7
@@ -19687,9 +19287,9 @@ snapshots:
   retry@0.12.0:
     optional: true
 
-  reusify@1.0.4: {}
+  reusify@1.1.0: {}
 
-  rfdc@1.3.0:
+  rfdc@1.4.1:
     optional: true
 
   rimraf@2.6.3:
@@ -19704,74 +19304,66 @@ snapshots:
     dependencies:
       glob: 7.2.3
 
-  rimraf@5.0.1:
+  rimraf@5.0.10:
     dependencies:
-      glob: 10.3.3
+      glob: 10.4.5
 
   ripemd160@2.0.2:
     dependencies:
-      hash-base: 3.1.0
+      hash-base: 3.0.5
       inherits: 2.0.4
 
-  rollup-plugin-terser@7.0.2(rollup@2.79.1):
-    dependencies:
-      '@babel/code-frame': 7.22.13
-      jest-worker: 26.6.2
-      rollup: 2.79.1
-      serialize-javascript: 4.0.0
-      terser: 5.31.3
-
-  rollup@2.79.1:
+  rollup@2.79.2:
     optionalDependencies:
       fsevents: 2.3.3
 
-  rollup@3.29.4:
+  rollup@3.29.5:
     optionalDependencies:
       fsevents: 2.3.3
 
-  rollup@4.34.8:
+  rollup@4.34.9:
     dependencies:
       '@types/estree': 1.0.6
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.34.8
-      '@rollup/rollup-android-arm64': 4.34.8
-      '@rollup/rollup-darwin-arm64': 4.34.8
-      '@rollup/rollup-darwin-x64': 4.34.8
-      '@rollup/rollup-freebsd-arm64': 4.34.8
-      '@rollup/rollup-freebsd-x64': 4.34.8
-      '@rollup/rollup-linux-arm-gnueabihf': 4.34.8
-      '@rollup/rollup-linux-arm-musleabihf': 4.34.8
-      '@rollup/rollup-linux-arm64-gnu': 4.34.8
-      '@rollup/rollup-linux-arm64-musl': 4.34.8
-      '@rollup/rollup-linux-loongarch64-gnu': 4.34.8
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.34.8
-      '@rollup/rollup-linux-riscv64-gnu': 4.34.8
-      '@rollup/rollup-linux-s390x-gnu': 4.34.8
-      '@rollup/rollup-linux-x64-gnu': 4.34.8
-      '@rollup/rollup-linux-x64-musl': 4.34.8
-      '@rollup/rollup-win32-arm64-msvc': 4.34.8
-      '@rollup/rollup-win32-ia32-msvc': 4.34.8
-      '@rollup/rollup-win32-x64-msvc': 4.34.8
+      '@rollup/rollup-android-arm-eabi': 4.34.9
+      '@rollup/rollup-android-arm64': 4.34.9
+      '@rollup/rollup-darwin-arm64': 4.34.9
+      '@rollup/rollup-darwin-x64': 4.34.9
+      '@rollup/rollup-freebsd-arm64': 4.34.9
+      '@rollup/rollup-freebsd-x64': 4.34.9
+      '@rollup/rollup-linux-arm-gnueabihf': 4.34.9
+      '@rollup/rollup-linux-arm-musleabihf': 4.34.9
+      '@rollup/rollup-linux-arm64-gnu': 4.34.9
+      '@rollup/rollup-linux-arm64-musl': 4.34.9
+      '@rollup/rollup-linux-loongarch64-gnu': 4.34.9
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.34.9
+      '@rollup/rollup-linux-riscv64-gnu': 4.34.9
+      '@rollup/rollup-linux-s390x-gnu': 4.34.9
+      '@rollup/rollup-linux-x64-gnu': 4.34.9
+      '@rollup/rollup-linux-x64-musl': 4.34.9
+      '@rollup/rollup-win32-arm64-msvc': 4.34.9
+      '@rollup/rollup-win32-ia32-msvc': 4.34.9
+      '@rollup/rollup-win32-x64-msvc': 4.34.9
       fsevents: 2.3.3
 
   rope-sequence@1.3.4: {}
 
   rtl-css-js@1.16.1:
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.26.9
 
   run-parallel@1.2.0:
     dependencies:
       queue-microtask: 1.2.3
 
-  rxjs@7.8.1:
+  rxjs@7.8.2:
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   safe-array-concat@1.1.3:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       get-intrinsic: 1.3.0
       has-symbols: 1.1.0
       isarray: 2.0.5
@@ -19787,7 +19379,7 @@ snapshots:
 
   safe-regex-test@1.1.0:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
       is-regex: 1.2.1
 
@@ -19803,19 +19395,26 @@ snapshots:
 
   sat@0.9.0: {}
 
-  sax@1.3.0:
+  sax@1.4.1:
     optional: true
 
-  scheduler@0.23.0:
+  scheduler@0.23.2:
     dependencies:
       loose-envify: 1.4.0
 
   schema-utils@3.3.0:
     dependencies:
-      '@types/json-schema': 7.0.12
+      '@types/json-schema': 7.0.15
       ajv: 6.12.6
       ajv-keywords: 3.5.2(ajv@6.12.6)
 
+  schema-utils@4.3.0:
+    dependencies:
+      '@types/json-schema': 7.0.15
+      ajv: 8.17.1
+      ajv-formats: 2.1.1(ajv@8.17.1)
+      ajv-keywords: 5.1.0(ajv@8.17.1)
+
   screenfull@5.2.0: {}
 
   sdp@3.2.0: {}
@@ -19826,14 +19425,9 @@ snapshots:
 
   semver@6.3.1: {}
 
-  semver@7.6.0:
-    dependencies:
-      lru-cache: 6.0.0
+  semver@7.7.1: {}
 
-  semver@7.7.1:
-    optional: true
-
-  send@0.18.0:
+  send@0.19.0:
     dependencies:
       debug: 2.6.9
       depd: 2.0.0
@@ -19870,13 +19464,9 @@ snapshots:
   sentence-case@3.0.4:
     dependencies:
       no-case: 3.0.4
-      tslib: 2.6.2
+      tslib: 2.8.1
       upper-case-first: 2.0.2
 
-  serialize-javascript@4.0.0:
-    dependencies:
-      randombytes: 2.1.0
-
   serialize-javascript@6.0.2:
     dependencies:
       randombytes: 2.1.0
@@ -19893,12 +19483,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  serve-static@1.15.0:
+  serve-static@1.16.2:
     dependencies:
-      encodeurl: 1.0.2
+      encodeurl: 2.0.0
       escape-html: 1.0.3
       parseurl: 1.3.3
-      send: 0.18.0
+      send: 0.19.0
     transitivePeerDependencies:
       - supports-color
 
@@ -19954,12 +19544,12 @@ snapshots:
   sharp@0.30.7:
     dependencies:
       color: 4.2.3
-      detect-libc: 2.0.2
+      detect-libc: 2.0.3
       node-addon-api: 5.1.0
-      prebuild-install: 7.1.1
-      semver: 7.6.0
+      prebuild-install: 7.1.3
+      semver: 7.7.1
       simple-get: 4.0.1
-      tar-fs: 2.1.1
+      tar-fs: 2.1.2
       tunnel-agent: 0.6.0
 
   sharp@0.33.5:
@@ -20001,32 +19591,32 @@ snapshots:
 
   shebang-regex@3.0.0: {}
 
-  shell-quote@1.8.1: {}
+  shell-quote@1.8.2: {}
 
   side-channel-list@1.0.0:
     dependencies:
       es-errors: 1.3.0
-      object-inspect: 1.13.3
+      object-inspect: 1.13.4
 
   side-channel-map@1.0.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
       get-intrinsic: 1.3.0
-      object-inspect: 1.13.3
+      object-inspect: 1.13.4
 
   side-channel-weakmap@1.0.2:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
       get-intrinsic: 1.3.0
-      object-inspect: 1.13.3
+      object-inspect: 1.13.4
       side-channel-map: 1.0.1
 
   side-channel@1.1.0:
     dependencies:
       es-errors: 1.3.0
-      object-inspect: 1.13.3
+      object-inspect: 1.13.4
       side-channel-list: 1.0.0
       side-channel-map: 1.0.1
       side-channel-weakmap: 1.0.2
@@ -20056,15 +19646,11 @@ snapshots:
     dependencies:
       is-arrayish: 0.3.2
 
-  simple-update-notifier@2.0.0:
-    dependencies:
-      semver: 7.6.0
-
   sisteransi@1.0.5: {}
 
   skinview-utils@0.7.1: {}
 
-  skinview3d@3.0.1:
+  skinview3d@3.1.0:
     dependencies:
       '@types/three': 0.156.0
       skinview-utils: 0.7.1
@@ -20088,10 +19674,12 @@ snapshots:
 
   smart-buffer@4.2.0: {}
 
+  smob@1.5.0: {}
+
   snake-case@3.0.4:
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   snapdragon-node@2.1.1:
     dependencies:
@@ -20119,25 +19707,27 @@ snapshots:
   socket.io-adapter@1.1.2:
     optional: true
 
-  socket.io-adapter@2.5.2:
+  socket.io-adapter@2.5.5:
     dependencies:
-      ws: 8.11.0
+      debug: 4.3.7
+      ws: 8.17.1
     transitivePeerDependencies:
       - bufferutil
+      - supports-color
       - utf-8-validate
 
   socket.io-client@2.5.0:
     dependencies:
       backo2: 1.0.2
       component-bind: 1.0.0
-      component-emitter: 1.3.0
+      component-emitter: 1.3.1
       debug: 3.1.0
-      engine.io-client: 3.5.3
+      engine.io-client: 3.5.4
       has-binary2: 1.0.3
       indexof: 0.0.1
       parseqs: 0.0.6
       parseuri: 0.0.6
-      socket.io-parser: 3.3.3
+      socket.io-parser: 3.3.4
       to-array: 0.1.4
     transitivePeerDependencies:
       - bufferutil
@@ -20145,20 +19735,20 @@ snapshots:
       - utf-8-validate
     optional: true
 
-  socket.io-client@4.7.2:
+  socket.io-client@4.8.1:
     dependencies:
-      '@socket.io/component-emitter': 3.1.0
+      '@socket.io/component-emitter': 3.1.2
       debug: 4.3.7
-      engine.io-client: 6.5.2
+      engine.io-client: 6.6.3
       socket.io-parser: 4.2.4
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
 
-  socket.io-parser@3.3.3:
+  socket.io-parser@3.3.4:
     dependencies:
-      component-emitter: 1.3.0
+      component-emitter: 1.3.1
       debug: 3.1.0
       isarray: 2.0.1
     transitivePeerDependencies:
@@ -20176,15 +19766,15 @@ snapshots:
 
   socket.io-parser@4.2.4:
     dependencies:
-      '@socket.io/component-emitter': 3.1.0
+      '@socket.io/component-emitter': 3.1.2
       debug: 4.3.7
     transitivePeerDependencies:
       - supports-color
 
-  socket.io@2.5.0:
+  socket.io@2.5.1:
     dependencies:
       debug: 4.1.1
-      engine.io: 3.6.1
+      engine.io: 3.6.2
       has-binary2: 1.0.3
       socket.io-adapter: 1.1.2
       socket.io-client: 2.5.0
@@ -20195,14 +19785,14 @@ snapshots:
       - utf-8-validate
     optional: true
 
-  socket.io@4.7.2:
+  socket.io@4.8.1:
     dependencies:
       accepts: 1.3.8
       base64id: 2.0.0
       cors: 2.8.5
       debug: 4.3.7
-      engine.io: 6.5.3
-      socket.io-adapter: 2.5.2
+      engine.io: 6.6.4
+      socket.io-adapter: 2.5.5
       socket.io-parser: 4.2.4
     transitivePeerDependencies:
       - bufferutil
@@ -20213,14 +19803,14 @@ snapshots:
     dependencies:
       agent-base: 6.0.2
       debug: 4.4.0(supports-color@8.1.1)
-      socks: 2.7.1
+      socks: 2.8.4
     transitivePeerDependencies:
       - supports-color
     optional: true
 
-  socks@2.7.1:
+  socks@2.8.4:
     dependencies:
-      ip: 2.0.0
+      ip-address: 9.0.5
       smart-buffer: 4.2.0
     optional: true
 
@@ -20258,16 +19848,16 @@ snapshots:
   spdx-correct@3.2.0:
     dependencies:
       spdx-expression-parse: 3.0.1
-      spdx-license-ids: 3.0.13
+      spdx-license-ids: 3.0.21
 
-  spdx-exceptions@2.3.0: {}
+  spdx-exceptions@2.5.0: {}
 
   spdx-expression-parse@3.0.1:
     dependencies:
-      spdx-exceptions: 2.3.0
-      spdx-license-ids: 3.0.13
+      spdx-exceptions: 2.5.0
+      spdx-license-ids: 3.0.21
 
-  spdx-license-ids@3.0.13: {}
+  spdx-license-ids@3.0.21: {}
 
   split-string@3.1.0:
     dependencies:
@@ -20279,7 +19869,10 @@ snapshots:
 
   sprintf-js@1.0.3: {}
 
-  sshpk@1.17.0:
+  sprintf-js@1.1.3:
+    optional: true
+
+  sshpk@1.18.0:
     dependencies:
       asn1: 0.2.6
       assert-plus: 1.0.0
@@ -20321,7 +19914,7 @@ snapshots:
       define-property: 0.2.5
       object-copy: 0.1.0
 
-  stats-gl@1.0.5: {}
+  stats-gl@1.0.7: {}
 
   stats.js@0.17.0: {}
 
@@ -20329,15 +19922,13 @@ snapshots:
 
   statuses@2.0.1: {}
 
-  std-env@3.4.3: {}
+  std-env@3.8.1: {}
 
-  std-env@3.8.0: {}
+  store2@2.14.4: {}
 
-  store2@2.14.2: {}
-
-  storybook@7.4.6(encoding@0.1.13):
+  storybook@7.6.20(encoding@0.1.13):
     dependencies:
-      '@storybook/cli': 7.4.6(encoding@0.1.13)
+      '@storybook/cli': 7.6.20(encoding@0.1.13)
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -20360,7 +19951,7 @@ snapshots:
       readable-stream: 3.6.2
       xtend: 4.0.2
 
-  stream-shift@1.0.1: {}
+  stream-shift@1.0.3: {}
 
   strict-event-emitter-types@2.0.0: {}
 
@@ -20379,7 +19970,7 @@ snapshots:
   string.prototype.matchall@4.0.12:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-properties: 1.2.1
       es-abstract: 1.23.9
       es-errors: 1.3.0
@@ -20392,16 +19983,22 @@ snapshots:
       set-function-name: 2.0.2
       side-channel: 1.1.0
 
-  string.prototype.padend@3.1.4:
+  string.prototype.padend@3.1.6:
     dependencies:
       call-bind: 1.0.8
       define-properties: 1.2.1
       es-abstract: 1.23.9
+      es-object-atoms: 1.1.1
+
+  string.prototype.repeat@1.0.0:
+    dependencies:
+      define-properties: 1.2.1
+      es-abstract: 1.23.9
 
   string.prototype.trim@1.2.10:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-data-property: 1.1.4
       define-properties: 1.2.1
       es-abstract: 1.23.9
@@ -20411,7 +20008,7 @@ snapshots:
   string.prototype.trimend@1.0.9:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
 
@@ -20444,7 +20041,7 @@ snapshots:
 
   strip-ansi@7.1.0:
     dependencies:
-      ansi-regex: 6.0.1
+      ansi-regex: 6.1.0
 
   strip-bom@3.0.0: {}
 
@@ -20466,10 +20063,12 @@ snapshots:
 
   strip-literal@1.3.0:
     dependencies:
-      acorn: 8.12.1
+      acorn: 8.14.1
 
   stylis@4.2.0: {}
 
+  stylis@4.3.6: {}
+
   supports-color@5.5.0:
     dependencies:
       has-flag: 3.0.0
@@ -20486,18 +20085,18 @@ snapshots:
 
   synchronous-promise@2.0.17: {}
 
-  systeminformation@5.22.7:
+  systeminformation@5.25.11:
     optional: true
 
   tabbable@6.2.0: {}
 
   tapable@2.2.1: {}
 
-  tar-fs@2.1.1:
+  tar-fs@2.1.2:
     dependencies:
       chownr: 1.1.4
       mkdirp-classic: 0.5.3
-      pump: 3.0.0
+      pump: 3.0.2
       tar-stream: 2.2.0
 
   tar-stream@2.2.0:
@@ -20508,7 +20107,7 @@ snapshots:
       inherits: 2.0.4
       readable-stream: 3.6.2
 
-  tar@6.2.0:
+  tar@6.2.1:
     dependencies:
       chownr: 2.0.0
       fs-minipass: 2.1.0
@@ -20542,21 +20141,21 @@ snapshots:
       type-fest: 0.16.0
       unique-string: 2.0.0
 
-  terser-webpack-plugin@5.3.10(esbuild@0.19.11)(webpack@5.93.0(esbuild@0.19.11)):
+  terser-webpack-plugin@5.3.14(esbuild@0.19.12)(webpack@5.98.0(esbuild@0.19.12)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
       jest-worker: 27.5.1
-      schema-utils: 3.3.0
+      schema-utils: 4.3.0
       serialize-javascript: 6.0.2
-      terser: 5.31.3
-      webpack: 5.93.0(esbuild@0.19.11)
+      terser: 5.39.0
+      webpack: 5.98.0(esbuild@0.19.12)
     optionalDependencies:
-      esbuild: 0.19.11
+      esbuild: 0.19.12
 
-  terser@5.31.3:
+  terser@5.39.0:
     dependencies:
-      '@jridgewell/source-map': 0.3.5
-      acorn: 8.12.1
+      '@jridgewell/source-map': 0.3.6
+      acorn: 8.14.1
       commander: 2.20.3
       source-map-support: 0.5.21
 
@@ -20576,12 +20175,12 @@ snapshots:
     dependencies:
       any-promise: 1.3.0
 
-  three-stdlib@2.28.5(three@0.154.0(patch_hash=sj7ocb4p23jym6bkfgueanti2e)):
+  three-stdlib@2.35.14(three@0.154.0(patch_hash=sj7ocb4p23jym6bkfgueanti2e)):
     dependencies:
-      '@types/draco3d': 1.4.7
-      '@types/offscreencanvas': 2019.7.2
-      '@types/webxr': 0.5.7
-      draco3d: 1.5.6
+      '@types/draco3d': 1.4.10
+      '@types/offscreencanvas': 2019.7.3
+      '@types/webxr': 0.5.21
+      draco3d: 1.5.7
       fflate: 0.6.10
       potpack: 1.0.2
       three: 0.154.0(patch_hash=sj7ocb4p23jym6bkfgueanti2e)
@@ -20592,7 +20191,7 @@ snapshots:
 
   throttle-debounce@3.0.1: {}
 
-  throttleit@1.0.0:
+  throttleit@1.0.1:
     optional: true
 
   through2@0.6.5:
@@ -20615,9 +20214,7 @@ snapshots:
   timm@1.7.1:
     optional: true
 
-  tiny-invariant@1.3.1: {}
-
-  tinybench@2.5.1: {}
+  tiny-invariant@1.3.3: {}
 
   tinybench@2.9.0: {}
 
@@ -20632,17 +20229,15 @@ snapshots:
 
   tinyrainbow@2.0.0: {}
 
-  tinyspy@2.2.0: {}
+  tinyspy@2.2.1: {}
 
   tinyspy@3.0.2: {}
 
   title-case@3.0.3:
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.8.1
 
-  tmp@0.2.1:
-    dependencies:
-      rimraf: 3.0.2
+  tmp@0.2.3:
     optional: true
 
   tmpl@1.0.5: {}
@@ -20650,8 +20245,6 @@ snapshots:
   to-array@0.1.4:
     optional: true
 
-  to-fast-properties@2.0.0: {}
-
   to-object-path@0.3.0:
     dependencies:
       kind-of: 3.2.2
@@ -20672,15 +20265,15 @@ snapshots:
       regex-not: 1.0.2
       safe-regex: 1.1.0
 
-  tocbot@4.21.2: {}
+  tocbot@4.35.0: {}
 
   toggle-selection@1.0.6: {}
 
   toidentifier@1.0.1: {}
 
-  tough-cookie@4.1.3:
+  tough-cookie@4.1.4:
     dependencies:
-      psl: 1.9.0
+      psl: 1.15.0
       punycode: 2.3.1
       universalify: 0.2.0
       url-parse: 1.5.10
@@ -20698,9 +20291,13 @@ snapshots:
 
   truncate-utf8-bytes@1.0.2:
     dependencies:
-      utf8-byte-length: 1.0.4
+      utf8-byte-length: 1.0.5
 
-  ts-api-utils@1.3.0(typescript@5.5.4):
+  ts-api-utils@1.4.3(typescript@5.5.4):
+    dependencies:
+      typescript: 5.5.4
+
+  ts-api-utils@2.0.1(typescript@5.5.4):
     dependencies:
       typescript: 5.5.4
 
@@ -20708,7 +20305,7 @@ snapshots:
 
   ts-easing@0.2.0: {}
 
-  tsconfig-paths@3.14.2:
+  tsconfig-paths@3.15.0:
     dependencies:
       '@types/json5': 0.0.29
       json5: 1.0.2
@@ -20717,12 +20314,12 @@ snapshots:
 
   tslib@1.14.1: {}
 
-  tslib@2.6.2: {}
+  tslib@2.8.1: {}
 
-  tsx@4.7.0:
+  tsx@4.19.3:
     dependencies:
-      esbuild: 0.19.11
-      get-tsconfig: 4.7.2
+      esbuild: 0.25.0
+      get-tsconfig: 4.10.0
     optionalDependencies:
       fsevents: 2.3.3
 
@@ -20739,7 +20336,7 @@ snapshots:
     dependencies:
       prelude-ls: 1.2.1
 
-  type-detect@4.0.8: {}
+  type-detect@4.1.0: {}
 
   type-fest@0.16.0: {}
 
@@ -20763,14 +20360,14 @@ snapshots:
 
   typed-array-buffer@1.0.3:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
       is-typed-array: 1.1.15
 
   typed-array-byte-length@1.0.3:
     dependencies:
       call-bind: 1.0.8
-      for-each: 0.3.4
+      for-each: 0.3.5
       gopd: 1.2.0
       has-proto: 1.2.0
       is-typed-array: 1.1.15
@@ -20779,7 +20376,7 @@ snapshots:
     dependencies:
       available-typed-arrays: 1.0.7
       call-bind: 1.0.8
-      for-each: 0.3.4
+      for-each: 0.3.5
       gopd: 1.2.0
       has-proto: 1.2.0
       is-typed-array: 1.1.15
@@ -20788,54 +20385,56 @@ snapshots:
   typed-array-length@1.0.7:
     dependencies:
       call-bind: 1.0.8
-      for-each: 0.3.4
+      for-each: 0.3.5
       gopd: 1.2.0
       is-typed-array: 1.1.15
-      possible-typed-array-names: 1.0.0
+      possible-typed-array-names: 1.1.0
       reflect.getprototypeof: 1.0.10
 
   typed-emitter@1.4.0: {}
 
   typed-emitter@2.1.0:
     optionalDependencies:
-      rxjs: 7.8.1
+      rxjs: 7.8.2
 
   typedarray@0.0.6: {}
 
   typescript@5.5.4: {}
 
-  ua-parser-js@1.0.37: {}
+  ua-parser-js@1.0.40: {}
 
   uc.micro@2.1.0: {}
 
-  ufo@1.3.1: {}
+  ufo@1.5.4: {}
 
-  uglify-js@3.17.4:
+  uglify-js@3.19.3:
     optional: true
 
   uint4@0.1.2: {}
 
   unbox-primitive@1.1.0:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       has-bigints: 1.1.0
       has-symbols: 1.1.0
       which-boxed-primitive: 1.1.1
 
-  undici-types@6.19.8: {}
+  undici-types@5.26.5: {}
 
-  undici@5.25.4:
+  undici-types@6.20.0: {}
+
+  undici@6.0.1:
     dependencies:
-      '@fastify/busboy': 2.0.0
+      '@fastify/busboy': 2.1.1
 
-  unicode-canonical-property-names-ecmascript@2.0.0: {}
+  unicode-canonical-property-names-ecmascript@2.0.1: {}
 
   unicode-match-property-ecmascript@2.0.0:
     dependencies:
-      unicode-canonical-property-names-ecmascript: 2.0.0
+      unicode-canonical-property-names-ecmascript: 2.0.1
       unicode-property-aliases-ecmascript: 2.1.0
 
-  unicode-match-property-value-ecmascript@2.1.0: {}
+  unicode-match-property-value-ecmascript@2.2.0: {}
 
   unicode-property-aliases-ecmascript@2.1.0: {}
 
@@ -20844,15 +20443,15 @@ snapshots:
       diff: 2.2.3
     optional: true
 
-  unified@11.0.4:
+  unified@11.0.5:
     dependencies:
-      '@types/unist': 3.0.2
+      '@types/unist': 3.0.3
       bail: 2.0.2
       devlop: 1.1.0
       extend: 3.0.2
       is-plain-obj: 4.1.0
       trough: 2.2.0
-      vfile: 6.0.1
+      vfile: 6.0.3
 
   union-value@1.0.1:
     dependencies:
@@ -20863,7 +20462,7 @@ snapshots:
 
   union@0.5.0:
     dependencies:
-      qs: 6.11.2
+      qs: 6.14.0
 
   unique-filename@2.0.1:
     dependencies:
@@ -20883,31 +20482,31 @@ snapshots:
 
   unist-util-is@6.0.0:
     dependencies:
-      '@types/unist': 3.0.2
+      '@types/unist': 3.0.3
 
   unist-util-stringify-position@4.0.0:
     dependencies:
-      '@types/unist': 3.0.2
+      '@types/unist': 3.0.3
 
   unist-util-visit-parents@3.1.1:
     dependencies:
-      '@types/unist': 2.0.8
+      '@types/unist': 2.0.11
       unist-util-is: 4.1.0
 
   unist-util-visit-parents@6.0.1:
     dependencies:
-      '@types/unist': 3.0.2
+      '@types/unist': 3.0.3
       unist-util-is: 6.0.0
 
   unist-util-visit@2.0.3:
     dependencies:
-      '@types/unist': 2.0.8
+      '@types/unist': 2.0.11
       unist-util-is: 4.1.0
       unist-util-visit-parents: 3.1.1
 
   unist-util-visit@5.0.0:
     dependencies:
-      '@types/unist': 3.0.2
+      '@types/unist': 3.0.3
       unist-util-is: 6.0.0
       unist-util-visit-parents: 6.0.1
 
@@ -20917,18 +20516,16 @@ snapshots:
   universalify@0.2.0:
     optional: true
 
-  universalify@2.0.0: {}
+  universalify@2.0.1: {}
 
   unix-crypt-td-js@1.1.4: {}
 
   unpipe@1.0.0: {}
 
-  unplugin@1.5.0:
+  unplugin@1.16.1:
     dependencies:
-      acorn: 8.12.1
-      chokidar: 3.5.3
-      webpack-sources: 3.2.3
-      webpack-virtual-modules: 0.5.0
+      acorn: 8.14.1
+      webpack-virtual-modules: 0.6.2
 
   unset-value@1.0.0:
     dependencies:
@@ -20939,19 +20536,19 @@ snapshots:
 
   upath@1.2.0: {}
 
-  update-browserslist-db@1.1.0(browserslist@4.23.2):
+  update-browserslist-db@1.1.3(browserslist@4.24.4):
     dependencies:
-      browserslist: 4.23.2
-      escalade: 3.1.2
+      browserslist: 4.24.4
+      escalade: 3.2.0
       picocolors: 1.1.1
 
   upper-case-first@2.0.2:
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   upper-case@2.0.2:
     dependencies:
-      tslib: 2.6.2
+      tslib: 2.8.1
 
   uri-js@4.4.1:
     dependencies:
@@ -20967,58 +20564,58 @@ snapshots:
       requires-port: 1.0.0
     optional: true
 
-  url@0.11.3:
+  url@0.11.4:
     dependencies:
       punycode: 1.4.1
-      qs: 6.11.2
+      qs: 6.14.0
 
-  use-callback-ref@1.3.0(@types/react@18.2.20)(react@18.2.0):
+  use-callback-ref@1.3.3(@types/react@18.3.18)(react@18.3.1):
     dependencies:
-      react: 18.2.0
-      tslib: 2.6.2
+      react: 18.3.1
+      tslib: 2.8.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  use-deep-compare@1.1.0(react@18.2.0):
+  use-deep-compare@1.3.0(react@18.3.1):
     dependencies:
-      dequal: 1.0.0
-      react: 18.2.0
+      dequal: 2.0.3
+      react: 18.3.1
 
-  use-isomorphic-layout-effect@1.1.2(@types/react@18.2.20)(react@18.2.0):
+  use-isomorphic-layout-effect@1.2.0(@types/react@18.3.18)(react@18.3.1):
     dependencies:
-      react: 18.2.0
+      react: 18.3.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  use-resize-observer@9.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+  use-resize-observer@9.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
-      '@juggle/resize-observer': 3.3.1
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
+      '@juggle/resize-observer': 3.4.0
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
 
-  use-sidecar@1.1.2(@types/react@18.2.20)(react@18.2.0):
+  use-sidecar@1.1.3(@types/react@18.3.18)(react@18.3.1):
     dependencies:
       detect-node-es: 1.1.0
-      react: 18.2.0
-      tslib: 2.6.2
+      react: 18.3.1
+      tslib: 2.8.1
     optionalDependencies:
-      '@types/react': 18.2.20
+      '@types/react': 18.3.18
 
-  use-sync-external-store@1.2.0(react@18.2.0):
+  use-sync-external-store@1.2.0(react@18.3.1):
     dependencies:
-      react: 18.2.0
+      react: 18.3.1
 
-  use-typed-event-listener@4.0.2(react@18.2.0)(typescript@5.5.4):
+  use-typed-event-listener@4.0.2(react@18.3.1)(typescript@5.5.4):
     dependencies:
-      '@babel/runtime': 7.24.5
-      react: 18.2.0
-      use-deep-compare: 1.1.0(react@18.2.0)
+      '@babel/runtime': 7.26.9
+      react: 18.3.1
+      use-deep-compare: 1.3.0(react@18.3.1)
     optionalDependencies:
       typescript: 5.5.4
 
   use@3.1.1: {}
 
-  utf8-byte-length@1.0.4: {}
+  utf8-byte-length@1.0.5: {}
 
   utif@2.0.1:
     dependencies:
@@ -21030,7 +20627,7 @@ snapshots:
   util@0.12.5:
     dependencies:
       inherits: 2.0.4
-      is-arguments: 1.1.1
+      is-arguments: 1.2.0
       is-generator-function: 1.1.0
       is-typed-array: 1.1.15
       which-typed-array: 1.1.18
@@ -21047,24 +20644,27 @@ snapshots:
 
   uuid@9.0.1: {}
 
-  v8-to-istanbul@9.1.3:
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.25
-      '@types/istanbul-lib-coverage': 2.0.4
-      convert-source-map: 2.0.0
-
   validate-npm-package-license@3.0.4:
     dependencies:
       spdx-correct: 3.2.0
       spdx-expression-parse: 3.0.1
 
-  valtio@1.11.2(@types/react@18.2.20)(react@18.2.0):
+  valtio@1.11.2(@types/react@18.3.18)(react@18.3.1):
     dependencies:
       proxy-compare: 2.5.1
-      use-sync-external-store: 1.2.0(react@18.2.0)
+      use-sync-external-store: 1.2.0(react@18.3.1)
     optionalDependencies:
-      '@types/react': 18.2.20
-      react: 18.2.0
+      '@types/react': 18.3.18
+      react: 18.3.1
+
+  valtio@1.13.2(@types/react@18.3.18)(react@18.3.1):
+    dependencies:
+      derive-valtio: 0.1.0(valtio@1.13.2(@types/react@18.3.18)(react@18.3.1))
+      proxy-compare: 2.6.0
+      use-sync-external-store: 1.2.0(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.3.18
+      react: 18.3.1
 
   vary@1.1.2: {}
 
@@ -21079,23 +20679,22 @@ snapshots:
 
   vfile-message@4.0.2:
     dependencies:
-      '@types/unist': 3.0.2
+      '@types/unist': 3.0.3
       unist-util-stringify-position: 4.0.0
 
-  vfile@6.0.1:
+  vfile@6.0.3:
     dependencies:
-      '@types/unist': 3.0.2
-      unist-util-stringify-position: 4.0.0
+      '@types/unist': 3.0.3
       vfile-message: 4.0.2
 
-  vite-node@0.34.6(@types/node@22.8.1)(terser@5.31.3):
+  vite-node@0.34.6(@types/node@22.13.9)(terser@5.39.0):
     dependencies:
       cac: 6.7.14
       debug: 4.4.0(supports-color@8.1.1)
-      mlly: 1.4.2
-      pathe: 1.1.1
+      mlly: 1.7.4
+      pathe: 1.1.2
       picocolors: 1.1.1
-      vite: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
+      vite: 4.5.9(@types/node@22.13.9)(terser@5.39.0)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -21106,13 +20705,13 @@ snapshots:
       - supports-color
       - terser
 
-  vite-node@3.0.7(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  vite-node@3.0.8(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0):
     dependencies:
       cac: 6.7.14
       debug: 4.4.0(supports-color@8.1.1)
       es-module-lexer: 1.6.0
       pathe: 2.0.3
-      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+      vite: 6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -21127,54 +20726,55 @@ snapshots:
       - tsx
       - yaml
 
-  vite@4.5.3(@types/node@22.8.1)(terser@5.31.3):
+  vite@4.5.9(@types/node@22.13.9)(terser@5.39.0):
     dependencies:
       esbuild: 0.18.20
-      postcss: 8.4.47
-      rollup: 3.29.4
+      postcss: 8.5.3
+      rollup: 3.29.5
     optionalDependencies:
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
       fsevents: 2.3.3
-      terser: 5.31.3
+      terser: 5.39.0
 
-  vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  vite@6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0):
     dependencies:
       esbuild: 0.25.0
       postcss: 8.5.3
-      rollup: 4.34.8
+      rollup: 4.34.9
     optionalDependencies:
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
       fsevents: 2.3.3
-      terser: 5.31.3
-      tsx: 4.7.0
-      yaml: 2.4.1
+      jiti: 2.4.2
+      terser: 5.39.0
+      tsx: 4.19.3
+      yaml: 2.7.0
 
-  vitest@0.34.6(terser@5.31.3):
+  vitest@0.34.6(terser@5.39.0):
     dependencies:
-      '@types/chai': 4.3.6
-      '@types/chai-subset': 1.3.3
-      '@types/node': 22.8.1
+      '@types/chai': 4.3.20
+      '@types/chai-subset': 1.3.6(@types/chai@4.3.20)
+      '@types/node': 22.13.9
       '@vitest/expect': 0.34.6
       '@vitest/runner': 0.34.6
       '@vitest/snapshot': 0.34.6
       '@vitest/spy': 0.34.6
       '@vitest/utils': 0.34.6
-      acorn: 8.12.1
-      acorn-walk: 8.2.0
+      acorn: 8.14.1
+      acorn-walk: 8.3.4
       cac: 6.7.14
-      chai: 4.3.10
+      chai: 4.5.0
       debug: 4.4.0(supports-color@8.1.1)
       local-pkg: 0.4.3
-      magic-string: 0.30.4
-      pathe: 1.1.1
+      magic-string: 0.30.17
+      pathe: 1.1.2
       picocolors: 1.1.1
-      std-env: 3.4.3
+      std-env: 3.8.1
       strip-literal: 1.3.0
-      tinybench: 2.5.1
+      tinybench: 2.9.0
       tinypool: 0.7.0
-      vite: 4.5.3(@types/node@22.8.1)(terser@5.31.3)
-      vite-node: 0.34.6(@types/node@22.8.1)(terser@5.31.3)
-      why-is-node-running: 2.2.2
+      vite: 4.5.9(@types/node@22.13.9)(terser@5.39.0)
+      vite-node: 0.34.6(@types/node@22.13.9)(terser@5.39.0)
+      why-is-node-running: 2.3.0
     transitivePeerDependencies:
       - less
       - lightningcss
@@ -21184,31 +20784,31 @@ snapshots:
       - supports-color
       - terser
 
-  vitest@3.0.7(@types/debug@4.1.12)(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1):
+  vitest@3.0.8(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0):
     dependencies:
-      '@vitest/expect': 3.0.7
-      '@vitest/mocker': 3.0.7(vite@6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1))
-      '@vitest/pretty-format': 3.0.7
-      '@vitest/runner': 3.0.7
-      '@vitest/snapshot': 3.0.7
-      '@vitest/spy': 3.0.7
-      '@vitest/utils': 3.0.7
+      '@vitest/expect': 3.0.8
+      '@vitest/mocker': 3.0.8(vite@6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0))
+      '@vitest/pretty-format': 3.0.8
+      '@vitest/runner': 3.0.8
+      '@vitest/snapshot': 3.0.8
+      '@vitest/spy': 3.0.8
+      '@vitest/utils': 3.0.8
       chai: 5.2.0
       debug: 4.4.0(supports-color@8.1.1)
-      expect-type: 1.1.0
+      expect-type: 1.2.0
       magic-string: 0.30.17
       pathe: 2.0.3
-      std-env: 3.8.0
+      std-env: 3.8.1
       tinybench: 2.9.0
       tinyexec: 0.3.2
       tinypool: 1.0.2
       tinyrainbow: 2.0.0
-      vite: 6.2.0(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
-      vite-node: 3.0.7(@types/node@22.8.1)(terser@5.31.3)(tsx@4.7.0)(yaml@2.4.1)
+      vite: 6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
+      vite-node: 3.0.8(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/debug': 4.1.12
-      '@types/node': 22.8.1
+      '@types/node': 22.13.9
     transitivePeerDependencies:
       - jiti
       - less
@@ -21229,11 +20829,11 @@ snapshots:
 
   wait-on@7.2.0(debug@4.4.0):
     dependencies:
-      axios: 1.7.2(debug@4.4.0)
-      joi: 17.13.1
+      axios: 1.8.2(debug@4.4.0)
+      joi: 17.13.3
       lodash: 4.17.21
       minimist: 1.2.8
-      rxjs: 7.8.1
+      rxjs: 7.8.2
     transitivePeerDependencies:
       - debug
 
@@ -21245,7 +20845,7 @@ snapshots:
     dependencies:
       loose-envify: 1.4.0
 
-  watchpack@2.4.1:
+  watchpack@2.4.2:
     dependencies:
       glob-to-regexp: 0.4.1
       graceful-fs: 4.2.11
@@ -21260,21 +20860,20 @@ snapshots:
 
   webpack-sources@3.2.3: {}
 
-  webpack-virtual-modules@0.5.0: {}
+  webpack-virtual-modules@0.6.2: {}
 
-  webpack@5.93.0(esbuild@0.19.11):
+  webpack@5.98.0(esbuild@0.19.12):
     dependencies:
       '@types/eslint-scope': 3.7.7
-      '@types/estree': 1.0.5
-      '@webassemblyjs/ast': 1.12.1
-      '@webassemblyjs/wasm-edit': 1.12.1
-      '@webassemblyjs/wasm-parser': 1.12.1
-      acorn: 8.12.1
-      acorn-import-attributes: 1.9.5(acorn@8.12.1)
-      browserslist: 4.23.2
+      '@types/estree': 1.0.6
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/wasm-edit': 1.14.1
+      '@webassemblyjs/wasm-parser': 1.14.1
+      acorn: 8.14.1
+      browserslist: 4.24.4
       chrome-trace-event: 1.0.4
-      enhanced-resolve: 5.17.1
-      es-module-lexer: 1.5.4
+      enhanced-resolve: 5.18.1
+      es-module-lexer: 1.6.0
       eslint-scope: 5.1.1
       events: 3.3.0
       glob-to-regexp: 0.4.1
@@ -21283,23 +20882,23 @@ snapshots:
       loader-runner: 4.3.0
       mime-types: 2.1.35
       neo-async: 2.6.2
-      schema-utils: 3.3.0
+      schema-utils: 4.3.0
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.10(esbuild@0.19.11)(webpack@5.93.0(esbuild@0.19.11))
-      watchpack: 2.4.1
+      terser-webpack-plugin: 5.3.14(esbuild@0.19.12)(webpack@5.98.0(esbuild@0.19.12))
+      watchpack: 2.4.2
       webpack-sources: 3.2.3
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild
       - uglify-js
 
-  webrtc-adapter@8.2.3:
+  webrtc-adapter@9.0.1:
     dependencies:
       sdp: 3.2.0
 
   websocket-driver@0.7.4:
     dependencies:
-      http-parser-js: 0.5.8
+      http-parser-js: 0.5.9
       safe-buffer: 5.2.1
       websocket-extensions: 0.1.4
 
@@ -21309,7 +20908,7 @@ snapshots:
     dependencies:
       iconv-lite: 0.6.3
 
-  whatwg-fetch@3.6.18:
+  whatwg-fetch@3.6.20:
     optional: true
 
   whatwg-url@5.0.0:
@@ -21326,14 +20925,14 @@ snapshots:
   which-boxed-primitive@1.1.1:
     dependencies:
       is-bigint: 1.1.0
-      is-boolean-object: 1.2.1
+      is-boolean-object: 1.2.2
       is-number-object: 1.1.1
       is-string: 1.1.1
       is-symbol: 1.1.1
 
   which-builtin-type@1.2.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       function.prototype.name: 1.1.8
       has-tostringtag: 1.0.2
       is-async-function: 2.1.1
@@ -21341,7 +20940,7 @@ snapshots:
       is-finalizationregistry: 1.1.1
       is-generator-function: 1.1.0
       is-regex: 1.2.1
-      is-weakref: 1.1.0
+      is-weakref: 1.1.1
       isarray: 2.0.5
       which-boxed-primitive: 1.1.1
       which-collection: 1.0.2
@@ -21358,8 +20957,8 @@ snapshots:
     dependencies:
       available-typed-arrays: 1.0.7
       call-bind: 1.0.8
-      call-bound: 1.0.3
-      for-each: 0.3.4
+      call-bound: 1.0.4
+      for-each: 0.3.5
       gopd: 1.2.0
       has-tostringtag: 1.0.2
 
@@ -21371,11 +20970,6 @@ snapshots:
     dependencies:
       isexe: 2.0.0
 
-  why-is-node-running@2.2.2:
-    dependencies:
-      siginfo: 2.0.0
-      stackback: 0.0.2
-
   why-is-node-running@2.3.0:
     dependencies:
       siginfo: 2.0.0
@@ -21386,120 +20980,122 @@ snapshots:
       string-width: 4.2.3
     optional: true
 
+  word-wrap@1.2.5: {}
+
   wordwrap@1.0.0: {}
 
-  workbox-background-sync@7.0.0:
+  workbox-background-sync@7.3.0:
     dependencies:
       idb: 7.1.1
-      workbox-core: 7.0.0
+      workbox-core: 7.3.0
 
-  workbox-broadcast-update@7.0.0:
+  workbox-broadcast-update@7.3.0:
     dependencies:
-      workbox-core: 7.0.0
+      workbox-core: 7.3.0
 
-  workbox-build@7.0.0(@types/babel__core@7.20.2):
+  workbox-build@7.3.0(@types/babel__core@7.20.5):
     dependencies:
-      '@apideck/better-ajv-errors': 0.3.6(ajv@8.12.0)
-      '@babel/core': 7.22.11
-      '@babel/preset-env': 7.22.10(@babel/core@7.22.11)
-      '@babel/runtime': 7.24.5
-      '@rollup/plugin-babel': 5.3.1(@babel/core@7.22.11)(@types/babel__core@7.20.2)(rollup@2.79.1)
-      '@rollup/plugin-node-resolve': 11.2.1(rollup@2.79.1)
-      '@rollup/plugin-replace': 2.4.2(rollup@2.79.1)
+      '@apideck/better-ajv-errors': 0.3.6(ajv@8.17.1)
+      '@babel/core': 7.26.9
+      '@babel/preset-env': 7.26.9(@babel/core@7.26.9)
+      '@babel/runtime': 7.26.9
+      '@rollup/plugin-babel': 5.3.1(@babel/core@7.26.9)(@types/babel__core@7.20.5)(rollup@2.79.2)
+      '@rollup/plugin-node-resolve': 15.3.1(rollup@2.79.2)
+      '@rollup/plugin-replace': 2.4.2(rollup@2.79.2)
+      '@rollup/plugin-terser': 0.4.4(rollup@2.79.2)
       '@surma/rollup-plugin-off-main-thread': 2.2.3
-      ajv: 8.12.0
+      ajv: 8.17.1
       common-tags: 1.8.2
       fast-json-stable-stringify: 2.1.0
       fs-extra: 9.1.0
       glob: 7.2.3
       lodash: 4.17.21
       pretty-bytes: 5.6.0
-      rollup: 2.79.1
-      rollup-plugin-terser: 7.0.2(rollup@2.79.1)
+      rollup: 2.79.2
       source-map: 0.8.0-beta.0
       stringify-object: 3.3.0
       strip-comments: 2.0.1
       tempy: 0.6.0
       upath: 1.2.0
-      workbox-background-sync: 7.0.0
-      workbox-broadcast-update: 7.0.0
-      workbox-cacheable-response: 7.0.0
-      workbox-core: 7.0.0
-      workbox-expiration: 7.0.0
-      workbox-google-analytics: 7.0.0
-      workbox-navigation-preload: 7.0.0
-      workbox-precaching: 7.0.0
-      workbox-range-requests: 7.0.0
-      workbox-recipes: 7.0.0
-      workbox-routing: 7.0.0
-      workbox-strategies: 7.0.0
-      workbox-streams: 7.0.0
-      workbox-sw: 7.0.0
-      workbox-window: 7.0.0
+      workbox-background-sync: 7.3.0
+      workbox-broadcast-update: 7.3.0
+      workbox-cacheable-response: 7.3.0
+      workbox-core: 7.3.0
+      workbox-expiration: 7.3.0
+      workbox-google-analytics: 7.3.0
+      workbox-navigation-preload: 7.3.0
+      workbox-precaching: 7.3.0
+      workbox-range-requests: 7.3.0
+      workbox-recipes: 7.3.0
+      workbox-routing: 7.3.0
+      workbox-strategies: 7.3.0
+      workbox-streams: 7.3.0
+      workbox-sw: 7.3.0
+      workbox-window: 7.3.0
     transitivePeerDependencies:
       - '@types/babel__core'
       - supports-color
 
-  workbox-cacheable-response@7.0.0:
+  workbox-cacheable-response@7.3.0:
     dependencies:
-      workbox-core: 7.0.0
+      workbox-core: 7.3.0
 
-  workbox-core@7.0.0: {}
+  workbox-core@7.3.0: {}
 
-  workbox-expiration@7.0.0:
+  workbox-expiration@7.3.0:
     dependencies:
       idb: 7.1.1
-      workbox-core: 7.0.0
+      workbox-core: 7.3.0
 
-  workbox-google-analytics@7.0.0:
+  workbox-google-analytics@7.3.0:
     dependencies:
-      workbox-background-sync: 7.0.0
-      workbox-core: 7.0.0
-      workbox-routing: 7.0.0
-      workbox-strategies: 7.0.0
+      workbox-background-sync: 7.3.0
+      workbox-core: 7.3.0
+      workbox-routing: 7.3.0
+      workbox-strategies: 7.3.0
 
-  workbox-navigation-preload@7.0.0:
+  workbox-navigation-preload@7.3.0:
     dependencies:
-      workbox-core: 7.0.0
+      workbox-core: 7.3.0
 
-  workbox-precaching@7.0.0:
+  workbox-precaching@7.3.0:
     dependencies:
-      workbox-core: 7.0.0
-      workbox-routing: 7.0.0
-      workbox-strategies: 7.0.0
+      workbox-core: 7.3.0
+      workbox-routing: 7.3.0
+      workbox-strategies: 7.3.0
 
-  workbox-range-requests@7.0.0:
+  workbox-range-requests@7.3.0:
     dependencies:
-      workbox-core: 7.0.0
+      workbox-core: 7.3.0
 
-  workbox-recipes@7.0.0:
+  workbox-recipes@7.3.0:
     dependencies:
-      workbox-cacheable-response: 7.0.0
-      workbox-core: 7.0.0
-      workbox-expiration: 7.0.0
-      workbox-precaching: 7.0.0
-      workbox-routing: 7.0.0
-      workbox-strategies: 7.0.0
+      workbox-cacheable-response: 7.3.0
+      workbox-core: 7.3.0
+      workbox-expiration: 7.3.0
+      workbox-precaching: 7.3.0
+      workbox-routing: 7.3.0
+      workbox-strategies: 7.3.0
 
-  workbox-routing@7.0.0:
+  workbox-routing@7.3.0:
     dependencies:
-      workbox-core: 7.0.0
+      workbox-core: 7.3.0
 
-  workbox-strategies@7.0.0:
+  workbox-strategies@7.3.0:
     dependencies:
-      workbox-core: 7.0.0
+      workbox-core: 7.3.0
 
-  workbox-streams@7.0.0:
+  workbox-streams@7.3.0:
     dependencies:
-      workbox-core: 7.0.0
-      workbox-routing: 7.0.0
+      workbox-core: 7.3.0
+      workbox-routing: 7.3.0
 
-  workbox-sw@7.0.0: {}
+  workbox-sw@7.3.0: {}
 
-  workbox-window@7.0.0:
+  workbox-window@7.3.0:
     dependencies:
-      '@types/trusted-types': 2.0.3
-      workbox-core: 7.0.0
+      '@types/trusted-types': 2.0.7
+      workbox-core: 7.3.0
 
   wrap-ansi@6.2.0:
     dependencies:
@@ -21533,20 +21129,20 @@ snapshots:
       imurmurhash: 0.1.4
       signal-exit: 3.0.7
 
-  ws@5.2.3:
+  ws@5.2.4:
     dependencies:
       async-limiter: 1.0.1
 
-  ws@6.2.2:
+  ws@6.2.3:
     dependencies:
       async-limiter: 1.0.1
 
-  ws@7.4.6:
+  ws@7.5.10:
     optional: true
 
-  ws@8.11.0: {}
+  ws@8.17.1: {}
 
-  ws@8.18.0: {}
+  ws@8.18.1: {}
 
   xhr@2.6.0:
     dependencies:
@@ -21559,9 +21155,9 @@ snapshots:
   xml-parse-from-string@1.0.1:
     optional: true
 
-  xml2js@0.4.23:
+  xml2js@0.5.0:
     dependencies:
-      sax: 1.3.0
+      sax: 1.4.1
       xmlbuilder: 11.0.1
     optional: true
 
@@ -21571,7 +21167,7 @@ snapshots:
   xmlhttprequest-ssl@1.6.3:
     optional: true
 
-  xmlhttprequest-ssl@2.0.0: {}
+  xmlhttprequest-ssl@2.1.2: {}
 
   xtend@4.0.2: {}
 
@@ -21585,26 +21181,16 @@ snapshots:
 
   yaml@1.10.2: {}
 
-  yaml@2.4.1: {}
+  yaml@2.7.0: {}
 
   yargs-parser@20.2.9: {}
 
   yargs-parser@21.1.1: {}
 
-  yargs@16.2.0:
-    dependencies:
-      cliui: 7.0.4
-      escalade: 3.1.2
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      string-width: 4.2.3
-      y18n: 5.0.8
-      yargs-parser: 20.2.9
-
   yargs@17.7.2:
     dependencies:
       cliui: 8.0.1
-      escalade: 3.1.2
+      escalade: 3.2.0
       get-caller-file: 2.0.5
       require-directory: 2.1.1
       string-width: 4.2.3
@@ -21616,6 +21202,10 @@ snapshots:
       buffer-crc32: 0.2.13
       fd-slicer: 1.1.0
 
+  yazl@2.5.1:
+    dependencies:
+      buffer-crc32: 0.2.13
+
   yeast@0.1.2:
     optional: true
 
@@ -21628,12 +21218,12 @@ snapshots:
 
   yocto-queue@0.1.0: {}
 
-  yocto-queue@1.0.0: {}
+  yocto-queue@1.2.0: {}
 
-  zod@3.24.1: {}
+  zod@3.24.2: {}
 
-  zustand@3.6.5(react@18.2.0):
+  zustand@3.6.5(react@18.3.1):
     optionalDependencies:
-      react: 18.2.0
+      react: 18.3.1
 
   zwitch@2.0.4: {}
diff --git a/src/controls.ts b/src/controls.ts
index d4522eae..0633ea8e 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -714,142 +714,32 @@ document.addEventListener('visibilitychange', (e) => {
   }
 })
 
-// #region creative fly
-// these controls are more like for gamemode 3
-
-const makeInterval = (fn, interval) => {
-  const intervalId = setInterval(fn, interval)
-
-  const cleanup = () => {
-    clearInterval(intervalId)
-    cleanup.active = false
-  }
-  cleanup.active = true
-  return cleanup
-}
-
-const isFlying = () => bot.physics.gravity === 0
-let endFlyLoop: ReturnType<typeof makeInterval> | undefined
-
-const currentFlyVector = new Vec3(0, 0, 0)
-window.currentFlyVector = currentFlyVector
-
-// todo cleanup
-const flyingPressedKeys = {
-  down: false,
-  up: false
-}
-
-const startFlyLoop = () => {
-  if (!isFlying()) return
-  endFlyLoop?.()
-
-  endFlyLoop = makeInterval(() => {
-    if (!bot) {
-      endFlyLoop?.()
-      return
-    }
-
-    bot.entity.position.add(currentFlyVector.clone().multiply(new Vec3(0, 0.5, 0)))
-  }, 50)
-}
-
-// todo we will get rid of patching it when refactor controls
-let originalSetControlState
-const patchedSetControlState = (action, state) => {
-  if (!isFlying()) {
-    return originalSetControlState(action, state)
-  }
-
-  const actionPerFlyVector = {
-    jump: new Vec3(0, 1, 0),
-    sneak: new Vec3(0, -1, 0),
-  }
-
-  const changeVec = actionPerFlyVector[action]
-  if (!changeVec) {
-    return originalSetControlState(action, state)
-  }
-  if (flyingPressedKeys[state === 'jump' ? 'up' : 'down'] === state) return
-  const toAddVec = changeVec.scaled(state ? 1 : -1)
-  for (const coord of ['x', 'y', 'z']) {
-    if (toAddVec[coord] === 0) continue
-    if (currentFlyVector[coord] === toAddVec[coord]) return
-  }
-  currentFlyVector.add(toAddVec)
-  flyingPressedKeys[state === 'jump' ? 'up' : 'down'] = state
-}
+const isFlying = () => (bot.entity as any).flying
 
 const startFlying = (sendAbilities = true) => {
-  bot.entity['creativeFly'] = true
   if (sendAbilities) {
     bot._client.write('abilities', {
       flags: 2,
     })
   }
-  // window.flyingSpeed will be removed
-  bot.physics['airborneAcceleration'] = window.flyingSpeed ?? 0.1 // todo use abilities
-  bot.entity.velocity = new Vec3(0, 0, 0)
-  bot.creative.startFlying()
-  startFlyLoop()
+  (bot.entity as any).flying = true
 }
 
 const endFlying = (sendAbilities = true) => {
-  bot.entity['creativeFly'] = false
-  if (bot.physics.gravity !== 0) return
+  if (!isFlying()) return
   if (sendAbilities) {
     bot._client.write('abilities', {
       flags: 0,
     })
   }
-  Object.assign(flyingPressedKeys, {
-    up: false,
-    down: false
-  })
-  currentFlyVector.set(0, 0, 0)
-  bot.physics['airborneAcceleration'] = standardAirborneAcceleration
-  bot.creative.stopFlying()
-  endFlyLoop?.()
+  (bot.entity as any).flying = false
 }
 
-let allowFlying = false
-
 export const onBotCreate = () => {
-  let wasSpectatorFlying = false
-  bot._client.on('abilities', ({ flags }) => {
-    allowFlying = !!(flags & 4)
-    if (flags & 2) { // flying
-      toggleFly(true, false)
-    } else {
-      toggleFly(false, false)
-    }
-  })
-  const gamemodeCheck = () => {
-    if (bot.game.gameMode === 'spectator') {
-      allowFlying = true
-      toggleFly(true, false)
-      wasSpectatorFlying = true
-    } else if (wasSpectatorFlying) {
-      toggleFly(false, false)
-      wasSpectatorFlying = false
-    }
-  }
-  bot.on('game', () => {
-    gamemodeCheck()
-  })
-  bot.on('login', () => {
-    gamemodeCheck()
-  })
 }
 
-const standardAirborneAcceleration = 0.02
 const toggleFly = (newState = !isFlying(), sendAbilities?: boolean) => {
-  // if (bot.game.gameMode !== 'creative' && bot.game.gameMode !== 'spectator') return
-  if (!allowFlying) return
-  if (bot.setControlState !== patchedSetControlState) {
-    originalSetControlState = bot.setControlState
-    bot.setControlState = patchedSetControlState
-  }
+  if (!bot.entity.canFly) return
 
   if (newState) {
     startFlying(sendAbilities)
@@ -858,7 +748,6 @@ const toggleFly = (newState = !isFlying(), sendAbilities?: boolean) => {
   }
   gameAdditionalState.isFlying = isFlying()
 }
-// #endregion
 
 const selectItem = async () => {
   const block = bot.blockAtCursor(5)

From a977d09031f2addb715300638001da83484b082b Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 9 Apr 2025 16:53:42 +0300
Subject: [PATCH 447/753] Up physics to fix jump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dba845b2..843f1ff2 100644
--- a/package.json
+++ b/package.json
@@ -195,7 +195,7 @@
   },
   "pnpm": {
     "overrides": {
-      "@nxg-org/mineflayer-physics-util": "1.8.5",
+      "@nxg-org/mineflayer-physics-util": "1.8.6",
       "buffer": "^6.0.3",
       "vec3": "0.1.10",
       "three": "0.154.0",

From bf790861d96f90e409f3da889fcd1c60274f99bf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 10 Apr 2025 01:20:20 +0300
Subject: [PATCH 448/753] fix: finally fix plants rendering in underwater and
 near water!

---
 renderer/viewer/lib/mesher/models.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index ba1fc6e0..66b1fe58 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -2,7 +2,7 @@ import { Vec3 } from 'vec3'
 import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import legacyJson from '../../../../src/preflatMap.json'
 import { BlockType } from '../../../playground/shared'
-import { World, BlockModelPartsResolved, WorldBlock as Block } from './world'
+import { World, BlockModelPartsResolved, WorldBlock as Block, WorldBlock } from './world'
 import { BlockElement, buildRotationMatrix, elemFaces, matmul3, matmulmat3, vecadd3, vecsub3 } from './modelsGeometryCommon'
 import { INVISIBLE_BLOCKS } from './worldConstants'
 import { MesherGeometryOutput, HighestBlockInfo } from './shared'
@@ -103,7 +103,8 @@ function tintToGl (tint) {
   return [r / 255, g / 255, b / 255]
 }
 
-function getLiquidRenderHeight (world, block, type, pos) {
+function getLiquidRenderHeight (world: World, block: WorldBlock | null, type: number, pos: Vec3, isRealWater: boolean) {
+  if (!isRealWater || (block && isBlockWaterlogged(block))) return 8 / 9
   if (!block || block.type !== type) return 1 / 9
   if (block.metadata === 0) { // source block
     const blockAbove = world.getBlock(pos.offset(0, 1, 0))
@@ -124,12 +125,12 @@ const isCube = (block: Block) => {
   }))
 }
 
-function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, type: number, biome: string, water: boolean, attr: Record<string, any>) {
+function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, type: number, biome: string, water: boolean, attr: Record<string, any>, isRealWater: boolean) {
   const heights: number[] = []
   for (let z = -1; z <= 1; z++) {
     for (let x = -1; x <= 1; x++) {
       const pos = cursor.offset(x, 0, z)
-      heights.push(getLiquidRenderHeight(world, world.getBlock(pos), type, pos))
+      heights.push(getLiquidRenderHeight(world, world.getBlock(pos), type, pos, isRealWater))
     }
   }
   const cornerHeights = [
@@ -147,9 +148,8 @@ function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, typ
     const neighborPos = cursor.offset(...dir as [number, number, number])
     const neighbor = world.getBlock(neighborPos)
     if (!neighbor) continue
-    if (neighbor.type === type) continue
-    const isGlass = neighbor.name.includes('glass')
-    if ((isCube(neighbor) && !isUp) || neighbor.material === 'plant' || neighbor.getProperties().waterlogged) continue
+    if (neighbor.type === type || (water && (neighbor.name === 'water' || isBlockWaterlogged(neighbor)))) continue
+    if (isCube(neighbor) && !isUp) continue
 
     let tint = [1, 1, 1]
     if (water) {
@@ -539,11 +539,11 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
           const pos = cursor.clone()
           // eslint-disable-next-line @typescript-eslint/no-loop-func
           delayedRender.push(() => {
-            renderLiquid(world, pos, blockProvider.getTextureInfo('water_still'), block.type, biome, true, attr)
+            renderLiquid(world, pos, blockProvider.getTextureInfo('water_still'), block.type, biome, true, attr, !isWaterlogged)
           })
           attr.blocksCount++
         } else if (block.name === 'lava') {
-          renderLiquid(world, cursor, blockProvider.getTextureInfo('lava_still'), block.type, biome, false, attr)
+          renderLiquid(world, cursor, blockProvider.getTextureInfo('lava_still'), block.type, biome, false, attr, false)
           attr.blocksCount++
         }
         if (block.name !== 'water' && block.name !== 'lava' && !INVISIBLE_BLOCKS.has(block.name)) {

From 3c6ee2dbb3fc795963f288ee1c272f9109c5c8c8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 10 Apr 2025 03:15:01 +0300
Subject: [PATCH 449/753] up lockfile

---
 pnpm-lock.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 44343516..af2069dd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,7 +5,7 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
-  '@nxg-org/mineflayer-physics-util': 1.8.5
+  '@nxg-org/mineflayer-physics-util': 1.8.6
   buffer: ^6.0.3
   vec3: 0.1.10
   three: 0.154.0
@@ -2004,8 +2004,8 @@ packages:
   '@nxg-org/mineflayer-auto-jump@0.7.12':
     resolution: {integrity: sha512-F5vX/lerlWx/5HVlkDNbvrtQ19PL6iG8i4ItPTIRtjGiFzusDefP7DI226zSFR8Wlaw45qHv0jn814p/4/qVdQ==}
 
-  '@nxg-org/mineflayer-physics-util@1.8.5':
-    resolution: {integrity: sha512-+pqS4dvGzcBqkb2cJPDRSXEmWuFeMvTTOJoKUwuSvpk1xAEsc+z6+PiYebtys1Hbg47yoIW2y6Qb+LXYJ9abBA==}
+  '@nxg-org/mineflayer-physics-util@1.8.6':
+    resolution: {integrity: sha512-eRn9e9OMvl1+kEfwPPshAl1A5MX0eDWaI7WVRf7ht9qo9N3fKiw+mM/AGPuhVjEr16zUls77P6Sn9cVZJuUdlw==}
 
   '@nxg-org/mineflayer-tracker@1.2.1':
     resolution: {integrity: sha512-SI1ffF8zvg3/ZNE021Ja2W0FZPN+WbQDZf8yFqOcXtPRXAtM9W6HvoACdzXep8BZid7WYgYLIgjKpB+9RqvCNQ==}
@@ -11449,10 +11449,10 @@ snapshots:
 
   '@nxg-org/mineflayer-auto-jump@0.7.12':
     dependencies:
-      '@nxg-org/mineflayer-physics-util': 1.8.5
+      '@nxg-org/mineflayer-physics-util': 1.8.6
       strict-event-emitter-types: 2.0.0
 
-  '@nxg-org/mineflayer-physics-util@1.8.5':
+  '@nxg-org/mineflayer-physics-util@1.8.6':
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
 
@@ -17721,7 +17721,7 @@ snapshots:
 
   mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448(encoding@0.1.13):
     dependencies:
-      '@nxg-org/mineflayer-physics-util': 1.8.5
+      '@nxg-org/mineflayer-physics-util': 1.8.6
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)

From c755f085d935b3fad0fda7105041075305154629 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 10 Apr 2025 18:53:33 +0300
Subject: [PATCH 450/753] =?UTF-8?q?fix:=20update=20rsbuild=20and=20pnpm=20?=
 =?UTF-8?q?to=20latest=20version=20to=20resolve=20long-standi=E2=80=A6=20(?=
 =?UTF-8?q?#328)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/benchmark.yml               |  11 +-
 CONTRIBUTING.md                               |   4 +-
 Dockerfile                                    |   6 +-
 package.json                                  |  34 +-
 ...@1.54.0.patch => minecraft-protocol.patch} |   0
 patches/three@0.154.0.patch                   |  16 -
 pnpm-lock.yaml                                | 958 ++++++------------
 renderer/rsbuildSharedConfig.ts               |   7 +
 src/benchmark.ts                              |  10 +-
 src/utils.ts                                  |   1 +
 10 files changed, 369 insertions(+), 678 deletions(-)
 rename patches/{minecraft-protocol@1.54.0.patch => minecraft-protocol.patch} (100%)
 delete mode 100644 patches/three@0.154.0.patch

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 70a24af9..f913b9b6 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -13,17 +13,17 @@ jobs:
       (
         github.event_name == 'issue_comment' &&
         github.event.issue.pull_request != '' &&
-        contains(github.event.comment.body, '/benchmark')
+        (startsWith(github.event.comment.body, '/benchmark'))
       )
     permissions:
       pull-requests: write
     steps:
       - run: lscpu
+
       - name: Checkout
         uses: actions/checkout@v2
-        # with:
-          # ref: refs/pull/${{ github.event.issue.number }}/head
-      - run: npm i -g pnpm@9.0.4
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 18
@@ -33,8 +33,10 @@ jobs:
           jq '.dependencies.cypress = .optionalDependencies.cypress | del(.optionalDependencies.cypress)' package.json > package.json.tmp
           mv package.json.tmp package.json
       - run: pnpm install --no-frozen-lockfile
+
       - run: pnpm build
       - run: nohup pnpm prod-start &
+
       - run: pnpm test:benchmark
         id: benchmark
         continue-on-error: true
@@ -49,6 +51,7 @@ jobs:
           else
             echo "BENCHMARK_RESULT=Benchmark failed to run or produce results" >> $GITHUB_ENV
           fi
+
       - uses: mshick/add-pr-comment@v2
         with:
           allow-repeats: true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fb0ae55e..06df61fa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,8 +9,10 @@ After forking the repository, run the following commands to get started:
 4. Let us know if you are working on something and be sure to open a PR if you got any changes. Happy coding!
 
 *(1): If you are getting `Cannot find matching keyid` update corepack to the latest version with `npm i -g corepack`.
+
 *(2): If still something doesn't work ensure you have the right nodejs version with `node -v` (tested on 22.x)
-*(3): For GitHub codespaces (cloud ide): Run `pnpm i @rsbuild/core@1.2.4 @rsbuild/plugin-node-polyfill@1.3.0 @rsbuild/plugin-react@1.1.0 @rsbuild/plugin-typed-css-modules@1.0.2` command to avoid crashes because of limited ram
+
+<!-- *(3): For GitHub codespaces (cloud ide): Run `pnpm i @rsbuild/core@1.2.4 @rsbuild/plugin-node-polyfill@1.3.0 @rsbuild/plugin-react@1.1.0 @rsbuild/plugin-typed-css-modules@1.0.2` command to avoid crashes because of limited ram -->
 
 ## Project Structure
 
diff --git a/Dockerfile b/Dockerfile
index 34641353..cd8cfe2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,8 @@ FROM node:18-alpine AS build
 RUN apk add git
 WORKDIR /app
 COPY . /app
-# install pnpm
-RUN npm i -g pnpm@9.0.4
+# install pnpm with corepack
+RUN corepack enable
 # Build arguments
 ARG DOWNLOAD_SOUNDS=false
 ARG DISABLE_SERVICE_WORKER=false
@@ -35,7 +35,7 @@ WORKDIR /app
 COPY --from=build /app/dist /app/dist
 COPY server.js /app/server.js
 # Install express
-RUN npm i -g pnpm@9.0.4
+RUN npm corepack enable
 RUN npm init -yp
 RUN pnpm i express github:zardoy/prismarinejs-net-browserify compression cors
 EXPOSE 8080
diff --git a/package.json b/package.json
index 843f1ff2..3b3fba7d 100644
--- a/package.json
+++ b/package.json
@@ -81,13 +81,13 @@
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
+    "mcraft-fun-mineflayer": "^0.1.14",
     "minecraft-data": "3.83.1",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
     "net-browserify": "github:zardoy/prismarinejs-net-browserify",
     "node-gzip": "^1.1.2",
-    "mcraft-fun-mineflayer": "^0.1.14",
     "peerjs": "^1.5.0",
     "pixelarticons": "^1.8.1",
     "pretty-bytes": "^6.1.1",
@@ -119,11 +119,11 @@
     "workbox-build": "^7.0.0"
   },
   "devDependencies": {
-    "@rsbuild/core": "1.0.1-beta.9",
-    "@rsbuild/plugin-node-polyfill": "1.0.3",
-    "@rsbuild/plugin-react": "1.0.1-beta.9",
-    "@rsbuild/plugin-type-check": "1.0.1-beta.9",
-    "@rsbuild/plugin-typed-css-modules": "1.0.1",
+    "@rsbuild/core": "1.3.5",
+    "@rsbuild/plugin-node-polyfill": "1.3.0",
+    "@rsbuild/plugin-react": "1.2.0",
+    "@rsbuild/plugin-type-check": "1.2.1",
+    "@rsbuild/plugin-typed-css-modules": "1.0.2",
     "@storybook/addon-essentials": "^7.4.6",
     "@storybook/addon-links": "^7.4.6",
     "@storybook/blocks": "^7.4.6",
@@ -152,16 +152,16 @@
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
     "mc-assets": "^0.2.52",
-    "mineflayer-mouse": "^0.1.7",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:GenerelSchwerz/mineflayer",
+    "mineflayer-mouse": "^0.1.7",
     "mineflayer-pathfinder": "^2.4.4",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
     "path-exists-cli": "^2.0.0",
-    "renderer": "link:renderer",
     "process": "github:PrismarineJS/node-process",
+    "renderer": "link:renderer",
     "rimraf": "^5.0.1",
     "storybook": "^7.4.6",
     "stream-browserify": "^3.0.0",
@@ -214,11 +214,21 @@
       "ignoreDependencies": []
     },
     "patchedDependencies": {
-      "three@0.154.0": "patches/three@0.154.0.patch",
       "pixelarticons@1.8.1": "patches/pixelarticons@1.8.1.patch",
       "mineflayer-item-map-downloader@1.2.0": "patches/mineflayer-item-map-downloader@1.2.0.patch",
-      "minecraft-protocol@1.54.0": "patches/minecraft-protocol@1.54.0.patch"
-    }
+      "minecraft-protocol": "patches/minecraft-protocol.patch"
+    },
+    "ignoredBuiltDependencies": [
+      "canvas",
+      "core-js",
+      "gl",
+      "sharp"
+    ],
+    "onlyBuiltDependencies": [
+      "cypress",
+      "esbuild",
+      "fsevents"
+    ]
   },
-  "packageManager": "pnpm@9.0.4"
+  "packageManager": "pnpm@10.8.0+sha512.0e82714d1b5b43c74610193cb20734897c1d00de89d0e18420aebc5977fa13d780a9cb05734624e81ebd81cc876cd464794850641c48b9544326b5622ca29971"
 }
diff --git a/patches/minecraft-protocol@1.54.0.patch b/patches/minecraft-protocol.patch
similarity index 100%
rename from patches/minecraft-protocol@1.54.0.patch
rename to patches/minecraft-protocol.patch
diff --git a/patches/three@0.154.0.patch b/patches/three@0.154.0.patch
deleted file mode 100644
index e612415c..00000000
--- a/patches/three@0.154.0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/examples/jsm/webxr/VRButton.js b/examples/jsm/webxr/VRButton.js
-index 6856a21b17aa45d7922bbf776fd2d7e63c7a9b4e..0925b706f7629bd52f0bb5af469536af8f5fce2c 100644
---- a/examples/jsm/webxr/VRButton.js
-+++ b/examples/jsm/webxr/VRButton.js
-@@ -62,7 +62,10 @@ class VRButton {
- 					// ('local' is always available for immersive sessions and doesn't need to
- 					// be requested separately.)
- 
--					const sessionInit = { optionalFeatures: [ 'local-floor', 'bounded-floor', 'hand-tracking', 'layers' ] };
-+					const sessionInit = {
-+						optionalFeatures: ['local-floor', 'bounded-floor', 'layers'],
-+						domOverlay: { root: document.body },
-+					};
- 					navigator.xr.requestSession( 'immersive-vr', sessionInit ).then( onSessionStarted );
- 
- 				} else {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index af2069dd..c9e1e66b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,18 +21,15 @@ overrides:
   prismarine-item: latest
 
 patchedDependencies:
-  minecraft-protocol@1.54.0:
-    hash: dkeyukcqlupmk563gwxsmjr3yu
-    path: patches/minecraft-protocol@1.54.0.patch
+  minecraft-protocol:
+    hash: 3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab
+    path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
-    hash: bck55yjvd4wrgz46x7o4vfur5q
+    hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
     path: patches/mineflayer-item-map-downloader@1.2.0.patch
   pixelarticons@1.8.1:
-    hash: cclg2qo6d4yjs4evj64nr2mbwa
+    hash: d6a3d784047beba873565d1198bed425d9eb2de942e3fc8edac55f25473e4325
     path: patches/pixelarticons@1.8.1.patch
-  three@0.154.0:
-    hash: sj7ocb4p23jym6bkfgueanti2e
-    path: patches/three@0.154.0.patch
 
 importers:
 
@@ -136,22 +133,22 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.14
-        version: 0.1.14(encoding@0.1.13)(mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448(encoding@0.1.13))
+        version: 0.1.14(encoding@0.1.13)(mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
-        version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
       mojangson:
         specifier: ^2.0.4
         version: 2.0.4
       net-browserify:
         specifier: github:zardoy/prismarinejs-net-browserify
-        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590
+        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/92707300cce08287ed7750f4447be350fc342d07
       node-gzip:
         specifier: ^1.1.2
         version: 1.1.2
@@ -160,7 +157,7 @@ importers:
         version: 1.5.4
       pixelarticons:
         specifier: ^1.8.1
-        version: 1.8.1(patch_hash=cclg2qo6d4yjs4evj64nr2mbwa)
+        version: 1.8.1(patch_hash=d6a3d784047beba873565d1198bed425d9eb2de942e3fc8edac55f25473e4325)
       pretty-bytes:
         specifier: ^6.1.1
         version: 6.1.1
@@ -242,35 +239,22 @@ importers:
       workbox-build:
         specifier: ^7.0.0
         version: 7.3.0(@types/babel__core@7.20.5)
-    optionalDependencies:
-      cypress:
-        specifier: ^10.11.0
-        version: 10.11.0
-      cypress-plugin-snapshots:
-        specifier: ^1.4.4
-        version: 1.4.4(cypress@10.11.0)(debug@4.4.0)
-      sharp:
-        specifier: ^0.33.5
-        version: 0.33.5
-      systeminformation:
-        specifier: ^5.21.22
-        version: 5.25.11
     devDependencies:
       '@rsbuild/core':
-        specifier: 1.0.1-beta.9
-        version: 1.0.1-beta.9
+        specifier: 1.3.5
+        version: 1.3.5
       '@rsbuild/plugin-node-polyfill':
-        specifier: 1.0.3
-        version: 1.0.3(@rsbuild/core@1.0.1-beta.9)
+        specifier: 1.3.0
+        version: 1.3.0(@rsbuild/core@1.3.5)
       '@rsbuild/plugin-react':
-        specifier: 1.0.1-beta.9
-        version: 1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)
+        specifier: 1.2.0
+        version: 1.2.0(@rsbuild/core@1.3.5)
       '@rsbuild/plugin-type-check':
-        specifier: 1.0.1-beta.9
-        version: 1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)(esbuild@0.19.12)(typescript@5.5.4)
+        specifier: 1.2.1
+        version: 1.2.1(@rsbuild/core@1.3.5)(@rspack/core@1.3.3(@swc/helpers@0.5.15))(typescript@5.5.4)
       '@rsbuild/plugin-typed-css-modules':
-        specifier: 1.0.1
-        version: 1.0.1(@rsbuild/core@1.0.1-beta.9)
+        specifier: 1.0.2
+        version: 1.0.2(@rsbuild/core@1.3.5)
       '@storybook/addon-essentials':
         specifier: ^7.4.6
         version: 7.6.20(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(encoding@0.1.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -357,10 +341,10 @@ importers:
         version: 0.2.52
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
-        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.3.18)(react@18.3.1)
+        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:GenerelSchwerz/mineflayer
-        version: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448(encoding@0.1.13)
+        version: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.7
         version: 0.1.7(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
@@ -396,7 +380,7 @@ importers:
         version: 3.0.0
       three:
         specifier: 0.154.0
-        version: 0.154.0(patch_hash=sj7ocb4p23jym6bkfgueanti2e)
+        version: 0.154.0
       timers-browserify:
         specifier: ^2.0.12
         version: 2.0.12
@@ -409,6 +393,19 @@ importers:
       yaml:
         specifier: ^2.3.2
         version: 2.7.0
+    optionalDependencies:
+      cypress:
+        specifier: ^10.11.0
+        version: 10.11.0
+      cypress-plugin-snapshots:
+        specifier: ^1.4.4
+        version: 1.4.4(cypress@10.11.0)(debug@4.4.0)
+      sharp:
+        specifier: ^0.33.5
+        version: 0.33.5
+      systeminformation:
+        specifier: ^5.21.22
+        version: 5.25.11
 
   renderer:
     dependencies:
@@ -438,7 +435,7 @@ importers:
         version: 1.3.9
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
         version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
@@ -459,7 +456,7 @@ importers:
         version: 4.8.1
       three-stdlib:
         specifier: ^2.26.11
-        version: 2.35.14(three@0.154.0(patch_hash=sj7ocb4p23jym6bkfgueanti2e))
+        version: 2.35.14(three@0.154.0)
       three.meshline:
         specifier: ^1.3.0
         version: 1.4.0
@@ -469,6 +466,10 @@ importers:
       vec3:
         specifier: 0.1.10
         version: 0.1.10
+    devDependencies:
+      live-server:
+        specifier: ^1.2.2
+        version: 1.2.2
     optionalDependencies:
       canvas:
         specifier: ^2.11.2
@@ -476,10 +477,6 @@ importers:
       node-canvas-webgl:
         specifier: ^0.3.0
         version: 0.3.0(encoding@0.1.13)
-    devDependencies:
-      live-server:
-        specifier: ^1.2.2
-        version: 1.2.2
 
   renderer/viewer/sign-renderer:
     dependencies:
@@ -1943,6 +1940,24 @@ packages:
   '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
+  '@jsonjoy.com/base64@1.1.2':
+    resolution: {integrity: sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==}
+    engines: {node: '>=10.0'}
+    peerDependencies:
+      tslib: '2'
+
+  '@jsonjoy.com/json-pack@1.2.0':
+    resolution: {integrity: sha512-io1zEbbYcElht3tdlqEOFxZ0dMTYrHz9iMf0gqn1pPjZFTCgM5R4R5IMA20Chb2UPYYsxjzs8CgZ7Nb5n2K2rA==}
+    engines: {node: '>=10.0'}
+    peerDependencies:
+      tslib: '2'
+
+  '@jsonjoy.com/util@1.5.0':
+    resolution: {integrity: sha512-ojoNsrIuPI9g6o8UxhraZQSyF2ByJanAY4cTFbc8Mf2AXEF4aQRGY1dJxyJpuyav8r9FGflEt/Ff3u5Nt6YMPA==}
+    engines: {node: '>=10.0'}
+    peerDependencies:
+      tslib: '2'
+
   '@jspm/core@2.1.0':
     resolution: {integrity: sha512-3sRl+pkyFY/kLmHl0cgHiFp2xEqErA8N3ECjMs7serSUBmoJ70lBa0PG5t0IM6WJgdZNyyI0R8YFfi5wM8+mzg==}
 
@@ -1961,17 +1976,23 @@ packages:
     peerDependencies:
       react: ^18.2.0
 
-  '@module-federation/runtime-tools@0.2.3':
-    resolution: {integrity: sha512-capN8CVTCEqNAjnl102girrkevczoQfnQYyiYC4WuyKsg7+LUqfirIe1Eiyv6VSE2UgvOTZDnqvervA6rBOlmg==}
+  '@module-federation/error-codes@0.11.2':
+    resolution: {integrity: sha512-ik1Qnn0I+WyEdprTck9WGlH41vGsVdUg8cfO+ZM02qOb2cZm5Vu3SlxGAobj6g7uAj0g8yINnd7h7Dci40BxQA==}
 
-  '@module-federation/runtime@0.2.3':
-    resolution: {integrity: sha512-N+ZxBUb1mkmfO9XT1BwgYQgShtUTlijHbukqQ4afFka5lRAT+ayC7RKfHJLz0HbuexKPCmPBDfdmCnErR5WyTQ==}
+  '@module-federation/runtime-core@0.11.2':
+    resolution: {integrity: sha512-dia5kKybi6MFU0s5PgglJwN27k7n9Sf69Cy5xZ4BWaP0qlaXTsxHKO0PECHNt2Pt8jDdyU29sQ4DwAQfxpnXJQ==}
 
-  '@module-federation/sdk@0.2.3':
-    resolution: {integrity: sha512-W9zrPchLocyCBc/B8CW21akcfJXLl++9xBe1L1EtgxZGfj/xwHt0GcBWE/y+QGvYTL2a1iZjwscbftbUhxgxXg==}
+  '@module-federation/runtime-tools@0.11.2':
+    resolution: {integrity: sha512-4MJTGAxVq6vxQRkTtTlH7Mm9AVqgn0X9kdu+7RsL7T/qU+jeYsbrntN2CWG3GVVA8r5JddXyTI1iJ0VXQZLV1w==}
 
-  '@module-federation/webpack-bundler-runtime@0.2.3':
-    resolution: {integrity: sha512-L/jt2uJ+8dwYiyn9GxryzDR6tr/Wk8rpgvelM2EBeLIhu7YxCHSmSjQYhw3BTux9zZIr47d1K9fGjBFsVRd/SQ==}
+  '@module-federation/runtime@0.11.2':
+    resolution: {integrity: sha512-Ya9u/L6z2LvhgpqxuKCB7LcigIIRf1BbaxAZIH7mzbq/A7rZtTP7v+73E433jvgiAlbAfPSZkeoYGele6hfRwA==}
+
+  '@module-federation/sdk@0.11.2':
+    resolution: {integrity: sha512-SBFe5xOamluT900J4AGBx+2/kCH/JbfqXoUwPSAC6PRzb8Y7LB0posnOGzmqYsLZXT37vp3d6AmJDsVoajDqxw==}
+
+  '@module-federation/webpack-bundler-runtime@0.11.2':
+    resolution: {integrity: sha512-WdwIE6QF+MKs/PdVu0cKPETF743JB9PZ62/qf7Uo3gU4fjsUMc37RnbJZ/qB60EaHHfjwp1v6NnhZw1r4eVsnw==}
 
   '@msgpack/msgpack@2.8.0':
     resolution: {integrity: sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==}
@@ -2582,104 +2603,111 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@rsbuild/core@1.0.1-beta.9':
-    resolution: {integrity: sha512-F9npL47TFmNVhPBqoE6jBvKGxXEKNszBA7skhbi3opskmX7Ako9vfXvtgi2W2jQjq837/WUL8gG/ua9zRqKFEQ==}
+  '@rsbuild/core@1.3.5':
+    resolution: {integrity: sha512-Fn6nJ4YvLO2UtFcoSPxgJoiUdS0Iix7X1BsyZ+DCj3SGpVCxp3Td9x58F5uhcRraMZFPB91wvcS/OabYwT3N2w==}
     engines: {node: '>=16.7.0'}
     hasBin: true
 
-  '@rsbuild/plugin-node-polyfill@1.0.3':
-    resolution: {integrity: sha512-AoPIOV1pyInIz08K1ECwUjFemLLSa5OUq8sfJN1ShXrGR2qc14b1wzwZKwF4vgKnBromqfMLagVbk6KT/nLIvQ==}
+  '@rsbuild/plugin-node-polyfill@1.3.0':
+    resolution: {integrity: sha512-KvckyUg9wq3F1Iv/y4+mlcnO/E7vDklvMY7kF6CxnUYImroQVw/EDS0zDezkPvcm7aKTH5b0Jaa0iIcTNFzhVw==}
     peerDependencies:
       '@rsbuild/core': 1.x
     peerDependenciesMeta:
       '@rsbuild/core':
         optional: true
 
-  '@rsbuild/plugin-react@1.0.1-beta.9':
-    resolution: {integrity: sha512-MX5bWSEW5Nr8jhNAVxWlNVnraJxtOYTEZna5znaypLv7m4V8w0go1Nzb210ueRSbFCEYvP+zJZzkq33m+3TWXQ==}
+  '@rsbuild/plugin-react@1.2.0':
+    resolution: {integrity: sha512-TXd0cvcLPF7OrO215vlGSyRXD6Fc3KQWhFuXFKOtRYp+C1Vc9oeW0GopUIStv2pI2/xtv2XX8GOAdJsnsc6lkA==}
     peerDependencies:
-      '@rsbuild/core': ^1.0.1-beta.9
+      '@rsbuild/core': 1.x
 
-  '@rsbuild/plugin-type-check@1.0.1-beta.9':
-    resolution: {integrity: sha512-nvH1zoxeWE1S+pg4UQ7PNsBjfa+cOYyApn+2qcmVzgTMbglfyqalPtaUSa8zRFmToooJNK3Ko//6w1zvSbOi8w==}
-    peerDependencies:
-      '@rsbuild/core': ^1.0.1-beta.9
-
-  '@rsbuild/plugin-typed-css-modules@1.0.1':
-    resolution: {integrity: sha512-biCSm7+vOgqrqXdAjxnjGNA7KPUfBadfndCeINJ2HApWfuQ2TLWuI5R+MzGvslis13SCKQ55K7NMAkvRhXyi8w==}
+  '@rsbuild/plugin-type-check@1.2.1':
+    resolution: {integrity: sha512-PtbjeMqDQy8IiPDTuaj8ZmvR42b0AsRq6RUF6wxa8dDsOzD0Dl1GcvemVGCto+/Dh8frLUmnlWF+T8riBw5rtA==}
     peerDependencies:
       '@rsbuild/core': 1.x
     peerDependenciesMeta:
       '@rsbuild/core':
         optional: true
 
-  '@rspack/binding-darwin-arm64@1.0.0-beta.1':
-    resolution: {integrity: sha512-KyC+xEMy9Y5JivO2e5rlKFGT74uwDhbwJjSCR5KOLQtZjDWeLwhf7aZhkoSQJUEsK5tAuuUoTP02RJFzK5llpA==}
+  '@rsbuild/plugin-typed-css-modules@1.0.2':
+    resolution: {integrity: sha512-QX376pBXWeBrZBvYLP2HGGrHiWA5O0SDHwRoBNto5BqYDXhi6y+Eol2Hb/cY+h2ARKZVanMfUiJRABULOJ/FCQ==}
+    peerDependencies:
+      '@rsbuild/core': 1.x || ^1.0.1-beta.0
+    peerDependenciesMeta:
+      '@rsbuild/core':
+        optional: true
+
+  '@rspack/binding-darwin-arm64@1.3.3':
+    resolution: {integrity: sha512-vbzEdpRCZl5+HXWsVjzSDqB9ZVIlqldV+udHp4YDD8qiwdQznVaBZke0eMzZ7kaInqRPsZ+UHQuVk6JaH/JkMQ==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rspack/binding-darwin-x64@1.0.0-beta.1':
-    resolution: {integrity: sha512-Onc35+qQ7YwE6+aB66l/ZnRFXfhA1hXH5aNnNJmIFEAmqzkvOGREkWy3CdfsklF/l/xt33iUM7ccnNgdpk7yKw==}
+  '@rspack/binding-darwin-x64@1.3.3':
+    resolution: {integrity: sha512-OXtY2s4nlYtUXkeJt8TQKKNIcN7PI8yDq0nqI75OfJoS4u1ZmRXJ8IMeSALLo8I+xD2RAF79tf7yhM/Y/AaiKQ==}
     cpu: [x64]
     os: [darwin]
 
-  '@rspack/binding-linux-arm64-gnu@1.0.0-beta.1':
-    resolution: {integrity: sha512-NlXtRlKcoBzB6EQEiXegW0nMToEPXD+hExaev0j1+uzsFrMJ0uIY49k6+DapwWZ8A2jUdvH7xdWT+eAXD3l/EA==}
+  '@rspack/binding-linux-arm64-gnu@1.3.3':
+    resolution: {integrity: sha512-Lluq3RLYzyCMdXr/HyALKEPGsr+196x8Ccuy5AmIRosOdWuwtSiomSRH1Ka8REUFNHfYy5y9SzfmIZo/E0QEmg==}
     cpu: [arm64]
     os: [linux]
 
-  '@rspack/binding-linux-arm64-musl@1.0.0-beta.1':
-    resolution: {integrity: sha512-fPS8ukoPgmBSUX4dt74flObcbYzO3uaP1bk4k/98Gr3Bw0ACDZ6h5nqlxoXoeVzhNcNMBcfv45un8H3i411AyA==}
+  '@rspack/binding-linux-arm64-musl@1.3.3':
+    resolution: {integrity: sha512-PIsicXWjOqzmoOutUqxpMNkCoKo+8/wxDyKxHFeu+5WIAxVFphe2d3H5qvEjc2MasWSdRmAVn9XiuIj2LIXFzA==}
     cpu: [arm64]
     os: [linux]
 
-  '@rspack/binding-linux-x64-gnu@1.0.0-beta.1':
-    resolution: {integrity: sha512-9U78G7BtevPZ9GEJ2AhGHt03n+GEhKVvEZ/tgu+flFV0tYGjq75QQX345x4m+uercTqzRBTyuWITweIzppeWuQ==}
+  '@rspack/binding-linux-x64-gnu@1.3.3':
+    resolution: {integrity: sha512-BtksK73ZFdny2T/wU1x0kxBF4ruYUUArZDyeGfpO+vd/1nNYqzzdhGvOksKmtdvsO38ETr2gZ9+XZyr1vpy9uQ==}
     cpu: [x64]
     os: [linux]
 
-  '@rspack/binding-linux-x64-musl@1.0.0-beta.1':
-    resolution: {integrity: sha512-qqNPseWAOKmV33YL7tihY0N9xwY+N1G9na6lT7iqZnsrzPkIZmESI9Z24fXVJqLC/UhfxAth4RKhVBeKTsPk1w==}
+  '@rspack/binding-linux-x64-musl@1.3.3':
+    resolution: {integrity: sha512-jx86CxkTmyBz/eHDqZp1mCqBwY+UTEtaPlPoWFyGkJUR5ey6nQnxS+fhG34Rqz63chW+q/afwpGNGyALYdgc8g==}
     cpu: [x64]
     os: [linux]
 
-  '@rspack/binding-win32-arm64-msvc@1.0.0-beta.1':
-    resolution: {integrity: sha512-VeBGYItHWqImYt23rBChXrk1o7fQxwTv6BEhtMpTnMJV10O6+Db9NckPEplcKLmNKAAA5anxH40GcpPc4nff8A==}
+  '@rspack/binding-win32-arm64-msvc@1.3.3':
+    resolution: {integrity: sha512-uXAdDzajFToVrH3fCNVDP/uKQ9i5FQjJc2aYxsnhS9Su/CZB+UQsOecbq6MnIN2s0B9GBKBG8QdQEtS3RtC6Hg==}
     cpu: [arm64]
     os: [win32]
 
-  '@rspack/binding-win32-ia32-msvc@1.0.0-beta.1':
-    resolution: {integrity: sha512-ZxLQ1zOpyCKefsKvDYGGIHM019avNPfesJKdw7wYqeC+EIvWZfs86lnhlSL5PlZzV5AfFZQyQJFRjAv4JPpe4Q==}
+  '@rspack/binding-win32-ia32-msvc@1.3.3':
+    resolution: {integrity: sha512-VBE6XsJ3IiAlozAywAIxAZ1Aqc2QVnEwBo0gP9998KkwL7wxB6Bg/OJnPbH3Q0ZaNWAQViC99rPC+5hSIdeSxw==}
     cpu: [ia32]
     os: [win32]
 
-  '@rspack/binding-win32-x64-msvc@1.0.0-beta.1':
-    resolution: {integrity: sha512-tMrjEA/2SGMVLbh/zOQoZrr1Xx+oI6RZnkXH6l95ON4yZiD+8wM84w8Ernj1N8KwclTuvBzxM0r3DLHTNZcDhw==}
+  '@rspack/binding-win32-x64-msvc@1.3.3':
+    resolution: {integrity: sha512-rOsNz4/DFgSENjEh0t9kFn89feuXK14/9wbmmFlT8VMpYOCcj4tKcAHjWg+Nzzj4FL+NSOC/81SrUF9J+C2R7w==}
     cpu: [x64]
     os: [win32]
 
-  '@rspack/binding@1.0.0-beta.1':
-    resolution: {integrity: sha512-p7XBvk1+fAmvrlmdeRr5J9wdXx5idVZjHFJu/3qPHWf5mHKRw2/tQVbqzExj+B1nwR6HXFgxCiiddaWauMS/YQ==}
+  '@rspack/binding@1.3.3':
+    resolution: {integrity: sha512-zdwJ801tyC8k+Gu5RjNoc7bEtX0MgJzzVv9qpaMwcAUfUfwZgCzXPTqcGMDoNI+Z47Fw59/2fKCmgZhZn60AgA==}
 
-  '@rspack/core@1.0.0-beta.1':
-    resolution: {integrity: sha512-aUWR/FUUw7x0L/qEZ0qrXC+7YYOL0Ezwd95TqDIDIYkSODJ6ZPt3a8poPwWc7IBdONgb8sGDPTzAXXEjcsBMwQ==}
+  '@rspack/core@1.3.3':
+    resolution: {integrity: sha512-+mXVlFcYr0tWezZfJ/gR0fj8njRc7pzEMtTFa2NO5cfsNAKPF/SXm4rb55kfa63r0b3U3N7f2nKrJG9wyG7zMQ==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
+      '@rspack/tracing': ^1.x
       '@swc/helpers': '>=0.5.1'
     peerDependenciesMeta:
+      '@rspack/tracing':
+        optional: true
       '@swc/helpers':
         optional: true
 
-  '@rspack/lite-tapable@1.0.0-beta.1':
-    resolution: {integrity: sha512-r4xtbJp6QhW6A1twkgTP0UQkPC9cOT3sFjjjlx22j/q669HJRz+CVTlVcNxPomK7Q3Kg6dVsyv16MjGRl/fl5g==}
+  '@rspack/lite-tapable@1.0.1':
+    resolution: {integrity: sha512-VynGOEsVw2s8TAlLf/uESfrgfrq2+rcXB1muPJYBWbsm1Oa6r5qVQhjA5ggM6z/coYPrsVMgovl3Ff7Q7OCp1w==}
     engines: {node: '>=16.0.0'}
 
-  '@rspack/plugin-react-refresh@1.0.0-beta.1':
-    resolution: {integrity: sha512-TLv3aB0NJtGPY38cMktnEkJ64RGLCed7MxQhc7f6V5FzOc3cZldTYSMThTZw1R/APc7GIHC4A26Ny5IogYlzvw==}
+  '@rspack/plugin-react-refresh@1.2.0':
+    resolution: {integrity: sha512-DTsbtggCfsiXE5QQtYMS8rKfEF8GIjwPDbgIT6Kg8BlAjpJY4jT5IisyhfIi7YOT3d5RIvu60iFB6Kr9sSMsnA==}
     peerDependencies:
       react-refresh: '>=0.10.0 <1.0.0'
+      webpack-hot-middleware: 2.x
     peerDependenciesMeta:
-      react-refresh:
+      webpack-hot-middleware:
         optional: true
 
   '@rushstack/eslint-patch@1.10.5':
@@ -2887,8 +2915,8 @@ packages:
   '@surma/rollup-plugin-off-main-thread@2.2.3':
     resolution: {integrity: sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==}
 
-  '@swc/helpers@0.5.11':
-    resolution: {integrity: sha512-YNlnKRWF2sVojTpIyzwou9XoTNbzbzONwRhOoniEioF1AtaitTvVZblaQRrAzChWQ1bLYyYSWzM18y4WwgzJ+A==}
+  '@swc/helpers@0.5.15':
+    resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==}
 
   '@tootallnate/once@2.0.0':
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
@@ -2959,12 +2987,6 @@ packages:
   '@types/escodegen@0.0.6':
     resolution: {integrity: sha512-AjwI4MvWx3HAOaZqYsjKWyEObT9lcVV0Y0V8nXo6cXzN8ZiMxVhf6F3d/UNvXVGKrEzL/Dluc5p+y9GkzlTWig==}
 
-  '@types/eslint-scope@3.7.7':
-    resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}
-
-  '@types/eslint@9.6.1':
-    resolution: {integrity: sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==}
-
   '@types/estree@0.0.39':
     resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==}
 
@@ -3330,51 +3352,6 @@ packages:
   '@vitest/utils@3.0.8':
     resolution: {integrity: sha512-nkBC3aEhfX2PdtQI/QwAWp8qZWwzASsU4Npbcd5RdMPBSSLCpkZp52P3xku3s3uA0HIEhGvEcF8rNkBsz9dQ4Q==}
 
-  '@webassemblyjs/ast@1.14.1':
-    resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==}
-
-  '@webassemblyjs/floating-point-hex-parser@1.13.2':
-    resolution: {integrity: sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==}
-
-  '@webassemblyjs/helper-api-error@1.13.2':
-    resolution: {integrity: sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==}
-
-  '@webassemblyjs/helper-buffer@1.14.1':
-    resolution: {integrity: sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==}
-
-  '@webassemblyjs/helper-numbers@1.13.2':
-    resolution: {integrity: sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==}
-
-  '@webassemblyjs/helper-wasm-bytecode@1.13.2':
-    resolution: {integrity: sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==}
-
-  '@webassemblyjs/helper-wasm-section@1.14.1':
-    resolution: {integrity: sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==}
-
-  '@webassemblyjs/ieee754@1.13.2':
-    resolution: {integrity: sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==}
-
-  '@webassemblyjs/leb128@1.13.2':
-    resolution: {integrity: sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==}
-
-  '@webassemblyjs/utf8@1.13.2':
-    resolution: {integrity: sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==}
-
-  '@webassemblyjs/wasm-edit@1.14.1':
-    resolution: {integrity: sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==}
-
-  '@webassemblyjs/wasm-gen@1.14.1':
-    resolution: {integrity: sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==}
-
-  '@webassemblyjs/wasm-opt@1.14.1':
-    resolution: {integrity: sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==}
-
-  '@webassemblyjs/wasm-parser@1.14.1':
-    resolution: {integrity: sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==}
-
-  '@webassemblyjs/wast-printer@1.14.1':
-    resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==}
-
   '@xboxreplay/errors@0.1.0':
     resolution: {integrity: sha512-Tgz1d/OIPDWPeyOvuL5+aai5VCcqObhPnlI3skQuf80GVF3k1I0lPCnGC+8Cm5PV9aLBT5m8qPcJoIUQ2U4y9g==}
 
@@ -3417,12 +3394,6 @@ packages:
   '@xobotyi/scrollbar-width@1.9.5':
     resolution: {integrity: sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==}
 
-  '@xtuc/ieee754@1.2.0':
-    resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
-
-  '@xtuc/long@4.2.2':
-    resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
-
   '@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15':
     resolution: {integrity: sha512-kYzDJO5CA9sy+on/s2aIW0411AklfCi8Ck/4QDivOqsMKpStZA2SsR+X27VTggGwpStWaLrjJcDcdDMowtG8MA==}
     engines: {node: '>=14.15.0'}
@@ -3532,24 +3503,6 @@ packages:
     resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
     engines: {node: '>=8'}
 
-  ajv-formats@2.1.1:
-    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
-    peerDependencies:
-      ajv: ^8.0.0
-    peerDependenciesMeta:
-      ajv:
-        optional: true
-
-  ajv-keywords@3.5.2:
-    resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
-    peerDependencies:
-      ajv: ^6.9.1
-
-  ajv-keywords@5.1.0:
-    resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==}
-    peerDependencies:
-      ajv: ^8.8.2
-
   ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
 
@@ -4038,8 +3991,8 @@ packages:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
     engines: {node: '>=10'}
 
-  caniuse-lite@1.0.30001702:
-    resolution: {integrity: sha512-LoPe/D7zioC0REI5W73PeR1e1MLCipRGq/VkovJnd6Df+QVqT+vT33OXCp8QUd7kA7RZrHWxb1B36OQKI/0gOA==}
+  caniuse-lite@1.0.30001713:
+    resolution: {integrity: sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==}
 
   canvas@2.11.2:
     resolution: {integrity: sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==}
@@ -4111,10 +4064,6 @@ packages:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
     engines: {node: '>=10'}
 
-  chrome-trace-event@1.0.4:
-    resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==}
-    engines: {node: '>=6.0'}
-
   ci-info@3.9.0:
     resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
     engines: {node: '>=8'}
@@ -4326,9 +4275,6 @@ packages:
   core-js-compat@3.41.0:
     resolution: {integrity: sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==}
 
-  core-js@3.37.1:
-    resolution: {integrity: sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==}
-
   core-js@3.41.0:
     resolution: {integrity: sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==}
 
@@ -4350,15 +4296,6 @@ packages:
     resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==}
     engines: {node: '>=10'}
 
-  cosmiconfig@8.3.6:
-    resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      typescript: '>=4.9.5'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
   create-ecdh@4.0.4:
     resolution: {integrity: sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==}
 
@@ -4797,10 +4734,6 @@ packages:
     resolution: {integrity: sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==}
     engines: {node: '>=10.2.0'}
 
-  enhanced-resolve@5.18.1:
-    resolution: {integrity: sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==}
-    engines: {node: '>=10.13.0'}
-
   enquirer@2.4.1:
     resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==}
     engines: {node: '>=8.6'}
@@ -5041,10 +4974,6 @@ packages:
     peerDependencies:
       eslint: '>=8.44.0'
 
-  eslint-scope@5.1.1:
-    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
-    engines: {node: '>=8.0.0'}
-
   eslint-scope@7.2.2:
     resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5092,10 +5021,6 @@ packages:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
     engines: {node: '>=4.0'}
 
-  estraverse@4.3.0:
-    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
-    engines: {node: '>=4.0'}
-
   estraverse@5.3.0:
     resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
     engines: {node: '>=4.0'}
@@ -5352,13 +5277,6 @@ packages:
   forever-agent@0.6.1:
     resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
 
-  fork-ts-checker-webpack-plugin@9.0.2:
-    resolution: {integrity: sha512-Uochze2R8peoN1XqlSi/rGUkDQpRogtLFocP9+PGu68zk1BDAKXfdeCdyVZpgTk8V8WFVQXdEz426VKjXLO1Gg==}
-    engines: {node: '>=12.13.0', yarn: '>=1.0.0'}
-    peerDependencies:
-      typescript: '>3.6.0'
-      webpack: ^5.11.0
-
   form-data@2.3.3:
     resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
     engines: {node: '>= 0.12'}
@@ -5389,10 +5307,6 @@ packages:
   fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
-  fs-extra@10.1.0:
-    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
-    engines: {node: '>=12'}
-
   fs-extra@11.1.1:
     resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==}
     engines: {node: '>=14.14'}
@@ -5413,9 +5327,6 @@ packages:
     resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
     engines: {node: '>= 8'}
 
-  fs-monkey@1.0.6:
-    resolution: {integrity: sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==}
-
   fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
@@ -5711,8 +5622,8 @@ packages:
     resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==}
     engines: {node: '>=12'}
 
-  html-entities@2.5.2:
-    resolution: {integrity: sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==}
+  html-entities@2.6.0:
+    resolution: {integrity: sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==}
 
   html-tags@3.3.1:
     resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
@@ -5778,6 +5689,10 @@ packages:
   humanize-ms@1.2.1:
     resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
 
+  hyperdyperid@1.2.0:
+    resolution: {integrity: sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==}
+    engines: {node: '>=10.18'}
+
   hyphenate-style-name@1.1.0:
     resolution: {integrity: sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==}
 
@@ -6175,10 +6090,6 @@ packages:
     resolution: {integrity: sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  jest-worker@27.5.1:
-    resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
-    engines: {node: '>= 10.13.0'}
-
   jest-worker@29.7.0:
     resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -6377,10 +6288,6 @@ packages:
     resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
     engines: {node: '>=4'}
 
-  loader-runner@4.3.0:
-    resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
-    engines: {node: '>=6.11.5'}
-
   local-pkg@0.4.3:
     resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==}
     engines: {node: '>=14'}
@@ -6602,8 +6509,8 @@ packages:
     resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
     engines: {node: '>= 0.6'}
 
-  memfs@3.5.3:
-    resolution: {integrity: sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==}
+  memfs@4.17.0:
+    resolution: {integrity: sha512-4eirfZ7thblFmqFjywlTmuWVSvccHAJbn1r8qQLzmTO11qcqpohOjmY2mFce6x7x7WtskzRqApPD0hv+Oa74jg==}
     engines: {node: '>= 4.0.0'}
 
   memoize-one@6.0.0:
@@ -6719,10 +6626,6 @@ packages:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
 
-  mime-db@1.53.0:
-    resolution: {integrity: sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==}
-    engines: {node: '>= 0.6'}
-
   mime-db@1.54.0:
     resolution: {integrity: sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==}
     engines: {node: '>= 0.6'}
@@ -6770,15 +6673,10 @@ packages:
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8:
-    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8}
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00:
+    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1}
-    version: 1.54.0
-    engines: {node: '>=22'}
-
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284:
     resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284}
     version: 1.57.0
@@ -6806,8 +6704,8 @@ packages:
     resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448:
-    resolution: {tarball: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448}
+  mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a:
+    resolution: {tarball: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a}
     version: 4.27.0
     engines: {node: '>=22'}
 
@@ -6964,8 +6862,8 @@ packages:
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590}
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/92707300cce08287ed7750f4447be350fc342d07:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/92707300cce08287ed7750f4447be350fc342d07}
     version: 0.2.4
 
   nice-try@1.0.5:
@@ -6978,9 +6876,6 @@ packages:
     resolution: {integrity: sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==}
     engines: {node: '>=10'}
 
-  node-abort-controller@3.1.1:
-    resolution: {integrity: sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==}
-
   node-addon-api@5.1.0:
     resolution: {integrity: sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==}
 
@@ -7837,6 +7732,10 @@ packages:
     resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==}
     engines: {node: '>=0.10.0'}
 
+  react-refresh@0.17.0:
+    resolution: {integrity: sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==}
+    engines: {node: '>=0.10.0'}
+
   react-remove-scroll-bar@2.3.8:
     resolution: {integrity: sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==}
     engines: {node: '>=10'}
@@ -8186,14 +8085,6 @@ packages:
   scheduler@0.23.2:
     resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}
 
-  schema-utils@3.3.0:
-    resolution: {integrity: sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==}
-    engines: {node: '>= 10.13.0'}
-
-  schema-utils@4.3.0:
-    resolution: {integrity: sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==}
-    engines: {node: '>= 10.13.0'}
-
   screenfull@5.2.0:
     resolution: {integrity: sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==}
     engines: {node: '>=0.10.0'}
@@ -8674,10 +8565,6 @@ packages:
   tabbable@6.2.0:
     resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==}
 
-  tapable@2.2.1:
-    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
-    engines: {node: '>=6'}
-
   tar-fs@2.1.2:
     resolution: {integrity: sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==}
 
@@ -8708,22 +8595,6 @@ packages:
     resolution: {integrity: sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==}
     engines: {node: '>=10'}
 
-  terser-webpack-plugin@5.3.14:
-    resolution: {integrity: sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      '@swc/core': '*'
-      esbuild: '*'
-      uglify-js: '*'
-      webpack: ^5.1.0
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      esbuild:
-        optional: true
-      uglify-js:
-        optional: true
-
   terser@5.39.0:
     resolution: {integrity: sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==}
     engines: {node: '>=10'}
@@ -8743,6 +8614,12 @@ packages:
   thenify@3.3.1:
     resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
 
+  thingies@1.21.0:
+    resolution: {integrity: sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==}
+    engines: {node: '>=10.18'}
+    peerDependencies:
+      tslib: ^2
+
   three-stdlib@2.35.14:
     resolution: {integrity: sha512-kpCaEg59M9usFTgHC+YZNKvx7nMoLI2zQxZBV8pjoNW6vNZmGyXpaLBL09A2oLCsS3KepgMFkOuk6lRoebTNvA==}
     peerDependencies:
@@ -8858,6 +8735,12 @@ packages:
   tr46@1.0.1:
     resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
 
+  tree-dump@1.0.2:
+    resolution: {integrity: sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==}
+    engines: {node: '>=10.0'}
+    peerDependencies:
+      tslib: '2'
+
   trim-newlines@4.1.1:
     resolution: {integrity: sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==}
     engines: {node: '>=12'}
@@ -8880,6 +8763,16 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4'
 
+  ts-checker-rspack-plugin@1.1.1:
+    resolution: {integrity: sha512-BlpPqnfAmV0TcDg58H+1qV8Zb57ilv0x+ajjnxrVQ6BWgC8HzAdc+TycqDOJ4sZZYIV+hywQGozZFGklzbCR6A==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      '@rspack/core': ^1.0.0
+      typescript: '>=3.8.0'
+    peerDependenciesMeta:
+      '@rspack/core':
+        optional: true
+
   ts-dedent@2.2.0:
     resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
     engines: {node: '>=6.10'}
@@ -9441,23 +9334,9 @@ packages:
   webidl-conversions@4.0.2:
     resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
 
-  webpack-sources@3.2.3:
-    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
-    engines: {node: '>=10.13.0'}
-
   webpack-virtual-modules@0.6.2:
     resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
 
-  webpack@5.98.0:
-    resolution: {integrity: sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    peerDependencies:
-      webpack-cli: '*'
-    peerDependenciesMeta:
-      webpack-cli:
-        optional: true
-
   webrtc-adapter@9.0.1:
     resolution: {integrity: sha512-1AQO+d4ElfVSXyzNVTOewgGT/tAomwwztX/6e3totvyyzXPvXIIuUUjAmyZGbKBKbZOXauuJooZm3g6IuFuiNQ==}
     engines: {node: '>=6.0.0', npm: '>=3.10.0'}
@@ -11371,6 +11250,22 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.0
 
+  '@jsonjoy.com/base64@1.1.2(tslib@2.8.1)':
+    dependencies:
+      tslib: 2.8.1
+
+  '@jsonjoy.com/json-pack@1.2.0(tslib@2.8.1)':
+    dependencies:
+      '@jsonjoy.com/base64': 1.1.2(tslib@2.8.1)
+      '@jsonjoy.com/util': 1.5.0(tslib@2.8.1)
+      hyperdyperid: 1.2.0
+      thingies: 1.21.0(tslib@2.8.1)
+      tslib: 2.8.1
+
+  '@jsonjoy.com/util@1.5.0(tslib@2.8.1)':
+    dependencies:
+      tslib: 2.8.1
+
   '@jspm/core@2.1.0': {}
 
   '@juggle/resize-observer@3.3.1': {}
@@ -11399,21 +11294,30 @@ snapshots:
       '@types/react': 18.3.18
       react: 18.3.1
 
-  '@module-federation/runtime-tools@0.2.3':
-    dependencies:
-      '@module-federation/runtime': 0.2.3
-      '@module-federation/webpack-bundler-runtime': 0.2.3
+  '@module-federation/error-codes@0.11.2': {}
 
-  '@module-federation/runtime@0.2.3':
+  '@module-federation/runtime-core@0.11.2':
     dependencies:
-      '@module-federation/sdk': 0.2.3
+      '@module-federation/error-codes': 0.11.2
+      '@module-federation/sdk': 0.11.2
 
-  '@module-federation/sdk@0.2.3': {}
-
-  '@module-federation/webpack-bundler-runtime@0.2.3':
+  '@module-federation/runtime-tools@0.11.2':
     dependencies:
-      '@module-federation/runtime': 0.2.3
-      '@module-federation/sdk': 0.2.3
+      '@module-federation/runtime': 0.11.2
+      '@module-federation/webpack-bundler-runtime': 0.11.2
+
+  '@module-federation/runtime@0.11.2':
+    dependencies:
+      '@module-federation/error-codes': 0.11.2
+      '@module-federation/runtime-core': 0.11.2
+      '@module-federation/sdk': 0.11.2
+
+  '@module-federation/sdk@0.11.2': {}
+
+  '@module-federation/webpack-bundler-runtime@0.11.2':
+    dependencies:
+      '@module-federation/runtime': 0.11.2
+      '@module-federation/sdk': 0.11.2
 
   '@msgpack/msgpack@2.8.0': {}
 
@@ -11469,7 +11373,7 @@ snapshots:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.83.1
       mineflayer: 4.27.0(encoding@0.1.13)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.16.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
@@ -11974,17 +11878,17 @@ snapshots:
   '@rollup/rollup-win32-x64-msvc@4.34.9':
     optional: true
 
-  '@rsbuild/core@1.0.1-beta.9':
+  '@rsbuild/core@1.3.5':
     dependencies:
-      '@rspack/core': 1.0.0-beta.1(@swc/helpers@0.5.11)
-      '@rspack/lite-tapable': 1.0.0-beta.1
-      '@swc/helpers': 0.5.11
-      caniuse-lite: 1.0.30001702
-      core-js: 3.37.1
-    optionalDependencies:
-      fsevents: 2.3.3
+      '@rspack/core': 1.3.3(@swc/helpers@0.5.15)
+      '@rspack/lite-tapable': 1.0.1
+      '@swc/helpers': 0.5.15
+      core-js: 3.41.0
+      jiti: 2.4.2
+    transitivePeerDependencies:
+      - '@rspack/tracing'
 
-  '@rsbuild/plugin-node-polyfill@1.0.3(@rsbuild/core@1.0.1-beta.9)':
+  '@rsbuild/plugin-node-polyfill@1.3.0(@rsbuild/core@1.3.5)':
     dependencies:
       assert: 2.1.0
       browserify-zlib: 0.2.0
@@ -12010,89 +11914,87 @@ snapshots:
       util: 0.12.5
       vm-browserify: 1.1.2
     optionalDependencies:
-      '@rsbuild/core': 1.0.1-beta.9
+      '@rsbuild/core': 1.3.5
 
-  '@rsbuild/plugin-react@1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)':
+  '@rsbuild/plugin-react@1.2.0(@rsbuild/core@1.3.5)':
     dependencies:
-      '@rsbuild/core': 1.0.1-beta.9
-      '@rspack/plugin-react-refresh': 1.0.0-beta.1(react-refresh@0.14.2)
-      react-refresh: 0.14.2
+      '@rsbuild/core': 1.3.5
+      '@rspack/plugin-react-refresh': 1.2.0(react-refresh@0.17.0)
+      react-refresh: 0.17.0
+    transitivePeerDependencies:
+      - webpack-hot-middleware
 
-  '@rsbuild/plugin-type-check@1.0.1-beta.9(@rsbuild/core@1.0.1-beta.9)(esbuild@0.19.12)(typescript@5.5.4)':
+  '@rsbuild/plugin-type-check@1.2.1(@rsbuild/core@1.3.5)(@rspack/core@1.3.3(@swc/helpers@0.5.15))(typescript@5.5.4)':
     dependencies:
-      '@rsbuild/core': 1.0.1-beta.9
       deepmerge: 4.3.1
-      fork-ts-checker-webpack-plugin: 9.0.2(typescript@5.5.4)(webpack@5.98.0(esbuild@0.19.12))
       json5: 2.2.3
       reduce-configs: 1.1.0
-      webpack: 5.98.0(esbuild@0.19.12)
+      ts-checker-rspack-plugin: 1.1.1(@rspack/core@1.3.3(@swc/helpers@0.5.15))(typescript@5.5.4)
+    optionalDependencies:
+      '@rsbuild/core': 1.3.5
     transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
+      - '@rspack/core'
       - typescript
-      - uglify-js
-      - webpack-cli
 
-  '@rsbuild/plugin-typed-css-modules@1.0.1(@rsbuild/core@1.0.1-beta.9)':
+  '@rsbuild/plugin-typed-css-modules@1.0.2(@rsbuild/core@1.3.5)':
     optionalDependencies:
-      '@rsbuild/core': 1.0.1-beta.9
+      '@rsbuild/core': 1.3.5
 
-  '@rspack/binding-darwin-arm64@1.0.0-beta.1':
+  '@rspack/binding-darwin-arm64@1.3.3':
     optional: true
 
-  '@rspack/binding-darwin-x64@1.0.0-beta.1':
+  '@rspack/binding-darwin-x64@1.3.3':
     optional: true
 
-  '@rspack/binding-linux-arm64-gnu@1.0.0-beta.1':
+  '@rspack/binding-linux-arm64-gnu@1.3.3':
     optional: true
 
-  '@rspack/binding-linux-arm64-musl@1.0.0-beta.1':
+  '@rspack/binding-linux-arm64-musl@1.3.3':
     optional: true
 
-  '@rspack/binding-linux-x64-gnu@1.0.0-beta.1':
+  '@rspack/binding-linux-x64-gnu@1.3.3':
     optional: true
 
-  '@rspack/binding-linux-x64-musl@1.0.0-beta.1':
+  '@rspack/binding-linux-x64-musl@1.3.3':
     optional: true
 
-  '@rspack/binding-win32-arm64-msvc@1.0.0-beta.1':
+  '@rspack/binding-win32-arm64-msvc@1.3.3':
     optional: true
 
-  '@rspack/binding-win32-ia32-msvc@1.0.0-beta.1':
+  '@rspack/binding-win32-ia32-msvc@1.3.3':
     optional: true
 
-  '@rspack/binding-win32-x64-msvc@1.0.0-beta.1':
+  '@rspack/binding-win32-x64-msvc@1.3.3':
     optional: true
 
-  '@rspack/binding@1.0.0-beta.1':
+  '@rspack/binding@1.3.3':
     optionalDependencies:
-      '@rspack/binding-darwin-arm64': 1.0.0-beta.1
-      '@rspack/binding-darwin-x64': 1.0.0-beta.1
-      '@rspack/binding-linux-arm64-gnu': 1.0.0-beta.1
-      '@rspack/binding-linux-arm64-musl': 1.0.0-beta.1
-      '@rspack/binding-linux-x64-gnu': 1.0.0-beta.1
-      '@rspack/binding-linux-x64-musl': 1.0.0-beta.1
-      '@rspack/binding-win32-arm64-msvc': 1.0.0-beta.1
-      '@rspack/binding-win32-ia32-msvc': 1.0.0-beta.1
-      '@rspack/binding-win32-x64-msvc': 1.0.0-beta.1
+      '@rspack/binding-darwin-arm64': 1.3.3
+      '@rspack/binding-darwin-x64': 1.3.3
+      '@rspack/binding-linux-arm64-gnu': 1.3.3
+      '@rspack/binding-linux-arm64-musl': 1.3.3
+      '@rspack/binding-linux-x64-gnu': 1.3.3
+      '@rspack/binding-linux-x64-musl': 1.3.3
+      '@rspack/binding-win32-arm64-msvc': 1.3.3
+      '@rspack/binding-win32-ia32-msvc': 1.3.3
+      '@rspack/binding-win32-x64-msvc': 1.3.3
 
-  '@rspack/core@1.0.0-beta.1(@swc/helpers@0.5.11)':
+  '@rspack/core@1.3.3(@swc/helpers@0.5.15)':
     dependencies:
-      '@module-federation/runtime-tools': 0.2.3
-      '@rspack/binding': 1.0.0-beta.1
-      '@rspack/lite-tapable': 1.0.0-beta.1
-      caniuse-lite: 1.0.30001702
+      '@module-federation/runtime-tools': 0.11.2
+      '@rspack/binding': 1.3.3
+      '@rspack/lite-tapable': 1.0.1
+      caniuse-lite: 1.0.30001713
     optionalDependencies:
-      '@swc/helpers': 0.5.11
+      '@swc/helpers': 0.5.15
 
-  '@rspack/lite-tapable@1.0.0-beta.1': {}
+  '@rspack/lite-tapable@1.0.1': {}
 
-  '@rspack/plugin-react-refresh@1.0.0-beta.1(react-refresh@0.14.2)':
+  '@rspack/plugin-react-refresh@1.2.0(react-refresh@0.17.0)':
     dependencies:
       error-stack-parser: 2.1.4
-      html-entities: 2.5.2
-    optionalDependencies:
-      react-refresh: 0.14.2
+      html-entities: 2.6.0
+      react-refresh: 0.17.0
 
   '@rushstack/eslint-patch@1.10.5': {}
 
@@ -12681,7 +12583,7 @@ snapshots:
       magic-string: 0.25.9
       string.prototype.matchall: 4.0.12
 
-  '@swc/helpers@0.5.11':
+  '@swc/helpers@0.5.15':
     dependencies:
       tslib: 2.8.1
 
@@ -12755,16 +12657,6 @@ snapshots:
 
   '@types/escodegen@0.0.6': {}
 
-  '@types/eslint-scope@3.7.7':
-    dependencies:
-      '@types/eslint': 9.6.1
-      '@types/estree': 1.0.6
-
-  '@types/eslint@9.6.1':
-    dependencies:
-      '@types/estree': 1.0.6
-      '@types/json-schema': 7.0.15
-
   '@types/estree@0.0.39': {}
 
   '@types/estree@0.0.51': {}
@@ -12851,7 +12743,7 @@ snapshots:
 
   '@types/node-fetch@2.6.12':
     dependencies:
-      '@types/node': 18.19.79
+      '@types/node': 22.13.9
       form-data: 4.0.2
 
   '@types/node-rsa@1.1.4':
@@ -13205,82 +13097,6 @@ snapshots:
       loupe: 3.1.3
       tinyrainbow: 2.0.0
 
-  '@webassemblyjs/ast@1.14.1':
-    dependencies:
-      '@webassemblyjs/helper-numbers': 1.13.2
-      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
-
-  '@webassemblyjs/floating-point-hex-parser@1.13.2': {}
-
-  '@webassemblyjs/helper-api-error@1.13.2': {}
-
-  '@webassemblyjs/helper-buffer@1.14.1': {}
-
-  '@webassemblyjs/helper-numbers@1.13.2':
-    dependencies:
-      '@webassemblyjs/floating-point-hex-parser': 1.13.2
-      '@webassemblyjs/helper-api-error': 1.13.2
-      '@xtuc/long': 4.2.2
-
-  '@webassemblyjs/helper-wasm-bytecode@1.13.2': {}
-
-  '@webassemblyjs/helper-wasm-section@1.14.1':
-    dependencies:
-      '@webassemblyjs/ast': 1.14.1
-      '@webassemblyjs/helper-buffer': 1.14.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
-      '@webassemblyjs/wasm-gen': 1.14.1
-
-  '@webassemblyjs/ieee754@1.13.2':
-    dependencies:
-      '@xtuc/ieee754': 1.2.0
-
-  '@webassemblyjs/leb128@1.13.2':
-    dependencies:
-      '@xtuc/long': 4.2.2
-
-  '@webassemblyjs/utf8@1.13.2': {}
-
-  '@webassemblyjs/wasm-edit@1.14.1':
-    dependencies:
-      '@webassemblyjs/ast': 1.14.1
-      '@webassemblyjs/helper-buffer': 1.14.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
-      '@webassemblyjs/helper-wasm-section': 1.14.1
-      '@webassemblyjs/wasm-gen': 1.14.1
-      '@webassemblyjs/wasm-opt': 1.14.1
-      '@webassemblyjs/wasm-parser': 1.14.1
-      '@webassemblyjs/wast-printer': 1.14.1
-
-  '@webassemblyjs/wasm-gen@1.14.1':
-    dependencies:
-      '@webassemblyjs/ast': 1.14.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
-      '@webassemblyjs/ieee754': 1.13.2
-      '@webassemblyjs/leb128': 1.13.2
-      '@webassemblyjs/utf8': 1.13.2
-
-  '@webassemblyjs/wasm-opt@1.14.1':
-    dependencies:
-      '@webassemblyjs/ast': 1.14.1
-      '@webassemblyjs/helper-buffer': 1.14.1
-      '@webassemblyjs/wasm-gen': 1.14.1
-      '@webassemblyjs/wasm-parser': 1.14.1
-
-  '@webassemblyjs/wasm-parser@1.14.1':
-    dependencies:
-      '@webassemblyjs/ast': 1.14.1
-      '@webassemblyjs/helper-api-error': 1.13.2
-      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
-      '@webassemblyjs/ieee754': 1.13.2
-      '@webassemblyjs/leb128': 1.13.2
-      '@webassemblyjs/utf8': 1.13.2
-
-  '@webassemblyjs/wast-printer@1.14.1':
-    dependencies:
-      '@webassemblyjs/ast': 1.14.1
-      '@xtuc/long': 4.2.2
-
   '@xboxreplay/errors@0.1.0': {}
 
   '@xboxreplay/xboxlive-auth@3.3.3(debug@4.4.0)':
@@ -13331,10 +13147,6 @@ snapshots:
 
   '@xobotyi/scrollbar-width@1.9.5': {}
 
-  '@xtuc/ieee754@1.2.0': {}
-
-  '@xtuc/long@4.2.2': {}
-
   '@yarnpkg/esbuild-plugin-pnp@3.0.0-rc.15(esbuild@0.18.20)':
     dependencies:
       esbuild: 0.18.20
@@ -13361,7 +13173,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13397,7 +13209,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13498,19 +13310,6 @@ snapshots:
       clean-stack: 2.2.0
       indent-string: 4.0.0
 
-  ajv-formats@2.1.1(ajv@8.17.1):
-    optionalDependencies:
-      ajv: 8.17.1
-
-  ajv-keywords@3.5.2(ajv@6.12.6):
-    dependencies:
-      ajv: 6.12.6
-
-  ajv-keywords@5.1.0(ajv@8.17.1):
-    dependencies:
-      ajv: 8.17.1
-      fast-deep-equal: 3.1.3
-
   ajv@6.12.6:
     dependencies:
       fast-deep-equal: 3.1.3
@@ -13987,7 +13786,7 @@ snapshots:
 
   browserslist@4.24.4:
     dependencies:
-      caniuse-lite: 1.0.30001702
+      caniuse-lite: 1.0.30001713
       electron-to-chromium: 1.5.113
       node-releases: 2.0.19
       update-browserslist-db: 1.1.3(browserslist@4.24.4)
@@ -14096,7 +13895,7 @@ snapshots:
 
   camelcase@6.3.0: {}
 
-  caniuse-lite@1.0.30001702: {}
+  caniuse-lite@1.0.30001713: {}
 
   canvas@2.11.2(encoding@0.1.13):
     dependencies:
@@ -14219,8 +14018,6 @@ snapshots:
 
   chownr@2.0.0: {}
 
-  chrome-trace-event@1.0.4: {}
-
   ci-info@3.9.0: {}
 
   cipher-base@1.0.6:
@@ -14344,7 +14141,7 @@ snapshots:
 
   compressible@2.0.18:
     dependencies:
-      mime-db: 1.53.0
+      mime-db: 1.54.0
 
   compression@1.8.0:
     dependencies:
@@ -14435,10 +14232,7 @@ snapshots:
     dependencies:
       browserslist: 4.24.4
 
-  core-js@3.37.1: {}
-
-  core-js@3.41.0:
-    optional: true
+  core-js@3.41.0: {}
 
   core-util-is@1.0.2:
     optional: true
@@ -14460,15 +14254,6 @@ snapshots:
       path-type: 4.0.0
       yaml: 1.10.2
 
-  cosmiconfig@8.3.6(typescript@5.5.4):
-    dependencies:
-      import-fresh: 3.3.1
-      js-yaml: 4.1.0
-      parse-json: 5.2.0
-      path-type: 4.0.0
-    optionalDependencies:
-      typescript: 5.5.4
-
   create-ecdh@4.0.4:
     dependencies:
       bn.js: 4.12.1
@@ -15043,11 +14828,6 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  enhanced-resolve@5.18.1:
-    dependencies:
-      graceful-fs: 4.2.11
-      tapable: 2.2.1
-
   enquirer@2.4.1:
     dependencies:
       ansi-colors: 4.1.3
@@ -15451,11 +15231,6 @@ snapshots:
       semver: 7.7.1
       strip-indent: 3.0.0
 
-  eslint-scope@5.1.1:
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 4.3.0
-
   eslint-scope@7.2.2:
     dependencies:
       esrecurse: 4.3.0
@@ -15536,8 +15311,6 @@ snapshots:
     dependencies:
       estraverse: 5.3.0
 
-  estraverse@4.3.0: {}
-
   estraverse@5.3.0: {}
 
   estree-walker@1.0.1: {}
@@ -15879,23 +15652,6 @@ snapshots:
   forever-agent@0.6.1:
     optional: true
 
-  fork-ts-checker-webpack-plugin@9.0.2(typescript@5.5.4)(webpack@5.98.0(esbuild@0.19.12)):
-    dependencies:
-      '@babel/code-frame': 7.26.2
-      chalk: 4.1.2
-      chokidar: 3.6.0
-      cosmiconfig: 8.3.6(typescript@5.5.4)
-      deepmerge: 4.3.1
-      fs-extra: 10.1.0
-      memfs: 3.5.3
-      minimatch: 3.1.2
-      node-abort-controller: 3.1.1
-      schema-utils: 3.3.0
-      semver: 7.7.1
-      tapable: 2.2.1
-      typescript: 5.5.4
-      webpack: 5.98.0(esbuild@0.19.12)
-
   form-data@2.3.3:
     dependencies:
       asynckit: 0.4.0
@@ -15924,12 +15680,6 @@ snapshots:
 
   fs-constants@1.0.0: {}
 
-  fs-extra@10.1.0:
-    dependencies:
-      graceful-fs: 4.2.11
-      jsonfile: 6.1.0
-      universalify: 2.0.1
-
   fs-extra@11.1.1:
     dependencies:
       graceful-fs: 4.2.11
@@ -15960,8 +15710,6 @@ snapshots:
     dependencies:
       minipass: 3.3.6
 
-  fs-monkey@1.0.6: {}
-
   fs.realpath@1.0.0: {}
 
   fsevents@1.2.13:
@@ -16315,7 +16063,7 @@ snapshots:
     dependencies:
       whatwg-encoding: 2.0.0
 
-  html-entities@2.5.2: {}
+  html-entities@2.6.0: {}
 
   html-tags@3.3.1: {}
 
@@ -16420,6 +16168,8 @@ snapshots:
       ms: 2.1.3
     optional: true
 
+  hyperdyperid@1.2.0: {}
+
   hyphenate-style-name@1.1.0: {}
 
   iconv-lite@0.4.24:
@@ -16803,12 +16553,6 @@ snapshots:
       graceful-fs: 4.2.11
       picomatch: 2.3.1
 
-  jest-worker@27.5.1:
-    dependencies:
-      '@types/node': 22.13.9
-      merge-stream: 2.0.0
-      supports-color: 8.1.1
-
   jest-worker@29.7.0:
     dependencies:
       '@types/node': 22.13.9
@@ -16828,8 +16572,7 @@ snapshots:
       - debug
     optional: true
 
-  jiti@2.4.2:
-    optional: true
+  jiti@2.4.2: {}
 
   joi@17.13.3:
     dependencies:
@@ -17077,8 +16820,6 @@ snapshots:
       pify: 3.0.0
       strip-bom: 3.0.0
 
-  loader-runner@4.3.0: {}
-
   local-pkg@0.4.3: {}
 
   locate-path@3.0.0:
@@ -17252,12 +16993,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.14(encoding@0.1.13)(mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.14(encoding@0.1.13)(mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17330,9 +17071,12 @@ snapshots:
 
   media-typer@0.3.0: {}
 
-  memfs@3.5.3:
+  memfs@4.17.0:
     dependencies:
-      fs-monkey: 1.0.6
+      '@jsonjoy.com/json-pack': 1.2.0(tslib@2.8.1)
+      '@jsonjoy.com/util': 1.5.0(tslib@2.8.1)
+      tree-dump: 1.0.2(tslib@2.8.1)
+      tslib: 2.8.1
 
   memoize-one@6.0.0: {}
 
@@ -17533,8 +17277,6 @@ snapshots:
 
   mime-db@1.52.0: {}
 
-  mime-db@1.53.0: {}
-
   mime-db@1.54.0: {}
 
   mime-types@2.1.35:
@@ -17567,40 +17309,14 @@ snapshots:
 
   minecraft-folder-path@1.2.0: {}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/75e940a4cd50d89e0ba03db3733d5d704917a3c8(@types/react@18.3.18)(react@18.3.1):
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00(@types/react@18.3.18)(react@18.3.1):
     dependencies:
       valtio: 1.13.2(@types/react@18.3.18)(react@18.3.1)
     transitivePeerDependencies:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/3bd4dc1b2002cd7badfa5b9cf8dda35cd6cc9ac1(patch_hash=dkeyukcqlupmk563gwxsmjr3yu)(encoding@0.1.13):
-    dependencies:
-      '@types/node-rsa': 1.1.4
-      '@types/readable-stream': 4.0.18
-      aes-js: 3.1.2
-      buffer-equal: 1.0.1
-      debug: 4.4.0(supports-color@8.1.1)
-      endian-toggle: 0.0.0
-      lodash.get: 4.4.2
-      lodash.merge: 4.6.2
-      minecraft-data: 3.83.1
-      minecraft-folder-path: 1.2.0
-      node-fetch: 2.7.0(encoding@0.1.13)
-      node-rsa: 0.4.2
-      prismarine-auth: 2.7.0
-      prismarine-chat: 1.11.0
-      prismarine-nbt: 2.7.0
-      prismarine-realms: 1.3.2(encoding@0.1.13)
-      protodef: 1.18.0
-      readable-stream: 4.7.0
-      uuid-1345: 1.0.2
-      yggdrasil: 1.7.0(encoding@0.1.13)
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17650,7 +17366,7 @@ snapshots:
       uuid: 9.0.1
       vec3: 0.1.10
 
-  mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=bck55yjvd4wrgz46x7o4vfur5q)(encoding@0.1.13):
+  mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
       mineflayer: 4.27.0(encoding@0.1.13)
       sharp: 0.30.7
@@ -17689,7 +17405,7 @@ snapshots:
   mineflayer-pathfinder@2.4.5:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -17699,9 +17415,9 @@ snapshots:
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
@@ -17719,13 +17435,13 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/fca01b0c5072dcfc296ddd6a0f6dbf54028b1448(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.6
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
@@ -17917,7 +17633,7 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/624cc67c16f5e8b23b772e7eaabae16ba84b8590:
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/92707300cce08287ed7750f4447be350fc342d07:
     dependencies:
       body-parser: 1.20.3
       express: 4.21.2
@@ -17938,8 +17654,6 @@ snapshots:
     dependencies:
       semver: 7.7.1
 
-  node-abort-controller@3.1.1: {}
-
   node-addon-api@5.1.0: {}
 
   node-canvas-webgl@0.3.0(encoding@0.1.13):
@@ -18409,7 +18123,7 @@ snapshots:
 
   pirates@4.0.6: {}
 
-  pixelarticons@1.8.1(patch_hash=cclg2qo6d4yjs4evj64nr2mbwa): {}
+  pixelarticons@1.8.1(patch_hash=d6a3d784047beba873565d1198bed425d9eb2de942e3fc8edac55f25473e4325): {}
 
   pixelmatch@4.0.2:
     dependencies:
@@ -18514,7 +18228,7 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-registry: 1.11.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0):
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
     dependencies:
       minecraft-data: 3.83.1
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
@@ -18522,8 +18236,6 @@ snapshots:
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
-    transitivePeerDependencies:
-      - prismarine-registry
 
   prismarine-chat@1.11.0:
     dependencies:
@@ -18534,7 +18246,7 @@ snapshots:
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
@@ -18568,7 +18280,7 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -18592,13 +18304,13 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
 
   prismarine-schematic@1.2.3:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.10
@@ -18952,6 +18664,8 @@ snapshots:
 
   react-refresh@0.14.2: {}
 
+  react-refresh@0.17.0: {}
+
   react-remove-scroll-bar@2.3.8(@types/react@18.3.18)(react@18.3.1):
     dependencies:
       react: 18.3.1
@@ -19402,19 +19116,6 @@ snapshots:
     dependencies:
       loose-envify: 1.4.0
 
-  schema-utils@3.3.0:
-    dependencies:
-      '@types/json-schema': 7.0.15
-      ajv: 6.12.6
-      ajv-keywords: 3.5.2(ajv@6.12.6)
-
-  schema-utils@4.3.0:
-    dependencies:
-      '@types/json-schema': 7.0.15
-      ajv: 8.17.1
-      ajv-formats: 2.1.1(ajv@8.17.1)
-      ajv-keywords: 5.1.0(ajv@8.17.1)
-
   screenfull@5.2.0: {}
 
   sdp@3.2.0: {}
@@ -19654,7 +19355,7 @@ snapshots:
     dependencies:
       '@types/three': 0.156.0
       skinview-utils: 0.7.1
-      three: 0.154.0(patch_hash=sj7ocb4p23jym6bkfgueanti2e)
+      three: 0.154.0
 
   slash@3.0.0: {}
 
@@ -20090,8 +19791,6 @@ snapshots:
 
   tabbable@6.2.0: {}
 
-  tapable@2.2.1: {}
-
   tar-fs@2.1.2:
     dependencies:
       chownr: 1.1.4
@@ -20141,17 +19840,6 @@ snapshots:
       type-fest: 0.16.0
       unique-string: 2.0.0
 
-  terser-webpack-plugin@5.3.14(esbuild@0.19.12)(webpack@5.98.0(esbuild@0.19.12)):
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.25
-      jest-worker: 27.5.1
-      schema-utils: 4.3.0
-      serialize-javascript: 6.0.2
-      terser: 5.39.0
-      webpack: 5.98.0(esbuild@0.19.12)
-    optionalDependencies:
-      esbuild: 0.19.12
-
   terser@5.39.0:
     dependencies:
       '@jridgewell/source-map': 0.3.6
@@ -20175,7 +19863,11 @@ snapshots:
     dependencies:
       any-promise: 1.3.0
 
-  three-stdlib@2.35.14(three@0.154.0(patch_hash=sj7ocb4p23jym6bkfgueanti2e)):
+  thingies@1.21.0(tslib@2.8.1):
+    dependencies:
+      tslib: 2.8.1
+
+  three-stdlib@2.35.14(three@0.154.0):
     dependencies:
       '@types/draco3d': 1.4.10
       '@types/offscreencanvas': 2019.7.3
@@ -20183,11 +19875,11 @@ snapshots:
       draco3d: 1.5.7
       fflate: 0.6.10
       potpack: 1.0.2
-      three: 0.154.0(patch_hash=sj7ocb4p23jym6bkfgueanti2e)
+      three: 0.154.0
 
   three.meshline@1.4.0: {}
 
-  three@0.154.0(patch_hash=sj7ocb4p23jym6bkfgueanti2e): {}
+  three@0.154.0: {}
 
   throttle-debounce@3.0.1: {}
 
@@ -20285,6 +19977,10 @@ snapshots:
     dependencies:
       punycode: 2.3.1
 
+  tree-dump@1.0.2(tslib@2.8.1):
+    dependencies:
+      tslib: 2.8.1
+
   trim-newlines@4.1.1: {}
 
   trough@2.2.0: {}
@@ -20301,6 +19997,18 @@ snapshots:
     dependencies:
       typescript: 5.5.4
 
+  ts-checker-rspack-plugin@1.1.1(@rspack/core@1.3.3(@swc/helpers@0.5.15))(typescript@5.5.4):
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@rspack/lite-tapable': 1.0.1
+      chokidar: 3.6.0
+      memfs: 4.17.0
+      minimatch: 9.0.5
+      picocolors: 1.1.1
+      typescript: 5.5.4
+    optionalDependencies:
+      '@rspack/core': 1.3.3(@swc/helpers@0.5.15)
+
   ts-dedent@2.2.0: {}
 
   ts-easing@0.2.0: {}
@@ -20858,40 +20566,8 @@ snapshots:
 
   webidl-conversions@4.0.2: {}
 
-  webpack-sources@3.2.3: {}
-
   webpack-virtual-modules@0.6.2: {}
 
-  webpack@5.98.0(esbuild@0.19.12):
-    dependencies:
-      '@types/eslint-scope': 3.7.7
-      '@types/estree': 1.0.6
-      '@webassemblyjs/ast': 1.14.1
-      '@webassemblyjs/wasm-edit': 1.14.1
-      '@webassemblyjs/wasm-parser': 1.14.1
-      acorn: 8.14.1
-      browserslist: 4.24.4
-      chrome-trace-event: 1.0.4
-      enhanced-resolve: 5.18.1
-      es-module-lexer: 1.6.0
-      eslint-scope: 5.1.1
-      events: 3.3.0
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.11
-      json-parse-even-better-errors: 2.3.1
-      loader-runner: 4.3.0
-      mime-types: 2.1.35
-      neo-async: 2.6.2
-      schema-utils: 4.3.0
-      tapable: 2.2.1
-      terser-webpack-plugin: 5.3.14(esbuild@0.19.12)(webpack@5.98.0(esbuild@0.19.12))
-      watchpack: 2.4.2
-      webpack-sources: 3.2.3
-    transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
-      - uglify-js
-
   webrtc-adapter@9.0.1:
     dependencies:
       sdp: 3.2.0
diff --git a/renderer/rsbuildSharedConfig.ts b/renderer/rsbuildSharedConfig.ts
index c39c4454..57eea041 100644
--- a/renderer/rsbuildSharedConfig.ts
+++ b/renderer/rsbuildSharedConfig.ts
@@ -2,6 +2,7 @@ import { defineConfig, ModifyRspackConfigUtils } from '@rsbuild/core';
 import { pluginNodePolyfill } from '@rsbuild/plugin-node-polyfill';
 import { pluginReact } from '@rsbuild/plugin-react';
 import path from 'path'
+import fs from 'fs'
 
 export const appAndRendererSharedConfig = () => defineConfig({
     dev: {
@@ -60,6 +61,12 @@ export const appAndRendererSharedConfig = () => defineConfig({
     ],
     tools: {
         rspack (config, helpers) {
+            const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, '../package.json'), 'utf8'))
+            const hasFileProtocol = Object.values(packageJson.pnpm.overrides).some((dep) => (dep as string).startsWith('file:'))
+            if (hasFileProtocol) {
+                // enable node_modules watching
+                config.watchOptions.ignored = /\.git/
+            }
             rspackViewerConfig(config, helpers)
         }
     },
diff --git a/src/benchmark.ts b/src/benchmark.ts
index 9539c9b0..42603a10 100644
--- a/src/benchmark.ts
+++ b/src/benchmark.ts
@@ -34,6 +34,7 @@ const fixtures: Record<string, BenchmarkFixture> = {
 
 Error.stackTraceLimit = Error.stackTraceLimit < 30 ? 30 : Error.stackTraceLimit
 
+const SESSION_STORAGE_BACKUP_KEY = 'benchmark-backup'
 export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) => {
   let fixtureNameOpen = appQueryParams.openBenchmark
   if (!fixtureNameOpen || fixtureNameOpen === '1' || fixtureNameOpen === 'true' || fixtureNameOpen === 'zip') {
@@ -41,7 +42,6 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
   }
 
 
-  const SESSION_STORAGE_BACKUP_KEY = 'benchmark-backup'
   if (sessionStorage.getItem(SESSION_STORAGE_BACKUP_KEY)) {
     const backup = JSON.stringify(JSON.parse(sessionStorage.getItem(SESSION_STORAGE_BACKUP_KEY)!), null, 2)
     setLoadingScreenStatus('Either other tab with benchmark is open or page crashed. Last data backup is downloaded. Reload page to retry.')
@@ -103,6 +103,7 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
   if (fixture.spawn) {
     fixtureName += ` - ${fixture.spawn.join(' ')}`
   }
+
   fixtureName += ` - ${renderDistance}`
   if (process.env.NODE_ENV !== 'development') { // do not delay
     setLoadingScreenStatus('Benchmark requested... Getting screen refresh rate')
@@ -212,6 +213,7 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
       },
     }
   })
+
   document.addEventListener('cypress-world-ready', () => {
     clearInterval(saveBackupInterval)
     sessionStorage.removeItem(SESSION_STORAGE_BACKUP_KEY)
@@ -271,6 +273,12 @@ export const openBenchmark = async (renderDistance = DEFAULT_RENDER_DISTANCE) =>
   })
 }
 
+// add before unload
+window.addEventListener('beforeunload', () => {
+  // remove sessionStorage backup
+  sessionStorage.removeItem(SESSION_STORAGE_BACKUP_KEY)
+})
+
 document.addEventListener('pointerlockchange', (e) => {
   const panel = document.querySelector<HTMLDivElement>('#benchmark-panel')
   if (panel) {
diff --git a/src/utils.ts b/src/utils.ts
index 98a4472f..0df6d6d2 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -103,6 +103,7 @@ export async function getScreenRefreshRate (): Promise<number> {
   window.setTimeout(() => {
     window.cancelAnimationFrame(requestId!)
     requestId = null
+    resolve(0)
   }, 500)
 
   return new Promise(_resolve => {

From 024da5bf6d27ba230762837794a194babff4c426 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 10 Apr 2025 18:54:02 +0300
Subject: [PATCH 451/753] fix: now media dont receive global lighting by
 default

---
 renderer/viewer/three/threeJsMedia.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/renderer/viewer/three/threeJsMedia.ts b/renderer/viewer/three/threeJsMedia.ts
index af95f416..b6e3bd34 100644
--- a/renderer/viewer/three/threeJsMedia.ts
+++ b/renderer/viewer/three/threeJsMedia.ts
@@ -16,6 +16,8 @@ interface MediaProperties {
   loop?: boolean
   volume?: number
   autoPlay?: boolean
+
+  allowLighting?: boolean
 }
 
 export class ThreeJsMedia {
@@ -212,7 +214,8 @@ export class ThreeJsMedia {
     const geometry = new THREE.PlaneGeometry(1, 1)
 
     // Create material with initial properties using background texture
-    const material = new THREE.MeshLambertMaterial({
+    const MaterialClass = props.allowLighting ? THREE.MeshLambertMaterial : THREE.MeshBasicMaterial
+    const material = new MaterialClass({
       map: backgroundTexture,
       transparent: true,
       side: props.doubleSide ? THREE.DoubleSide : THREE.FrontSide,

From deb8ec6c0fdb5bf67f7fd35bc0bf4829617d5f23 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 10 Apr 2025 19:25:43 +0300
Subject: [PATCH 452/753] build sharp to avoid crashes

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 3b3fba7d..42f48706 100644
--- a/package.json
+++ b/package.json
@@ -221,10 +221,10 @@
     "ignoredBuiltDependencies": [
       "canvas",
       "core-js",
-      "gl",
-      "sharp"
+      "gl"
     ],
     "onlyBuiltDependencies": [
+      "sharp",
       "cypress",
       "esbuild",
       "fsevents"

From 77449c5c12d4fd5551711d2e474d43fef043b260 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 10 Apr 2025 19:33:39 +0300
Subject: [PATCH 453/753] forgot to fix what codereabbit told to fix

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cd8cfe2d..74f953cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,7 @@ WORKDIR /app
 COPY --from=build /app/dist /app/dist
 COPY server.js /app/server.js
 # Install express
-RUN npm corepack enable
+RUN corepack enable
 RUN npm init -yp
 RUN pnpm i express github:zardoy/prismarinejs-net-browserify compression cors
 EXPOSE 8080

From 27df313f26c596d33542020601252b244fc9543d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 11 Apr 2025 18:08:21 +0300
Subject: [PATCH 454/753] microoptimisation on big number of chunks load

---
 renderer/viewer/lib/ui/newStats.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/ui/newStats.ts b/renderer/viewer/lib/ui/newStats.ts
index 4a1b0a0f..7af5e897 100644
--- a/renderer/viewer/lib/ui/newStats.ts
+++ b/renderer/viewer/lib/ui/newStats.ts
@@ -26,7 +26,7 @@ export const addNewStat = (id: string, width = 80, x = rightOffset, y = lastY) =
 
   return {
     updateText (text: string) {
-      if (pane.innerText === text) return
+      if (pane.innerText === text || pane.style.display === 'none') return
       pane.innerText = text
     },
     setVisibility (visible: boolean) {

From 4b85b16b73316551868748eaffd97010b5fd63d7 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 11 Apr 2025 21:42:55 +0300
Subject: [PATCH 455/753] feat(experimental-part1): rework chunk loading
 strategy by forcing spiral order loading into renderer processor and ignoring
 server order

---
 renderer/viewer/lib/worldDataEmitter.ts | 44 +++++++++++++++++++++----
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index b7c2139f..c9329d01 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -12,8 +12,8 @@ import { delayedIterator } from '../../playground/shared'
 import { playerState } from '../../../src/mineflayer/playerState'
 import { chunkPos } from './simpleUtils'
 
-export type ChunkPosKey = string
-type ChunkPos = { x: number, z: number }
+export type ChunkPosKey = string // like '16,16'
+type ChunkPos = { x: number, z: number } // like { x: 16, z: 16 }
 
 export type WorldDataEmitterEvents = {
   chunkPosUpdate: (data: { pos: Vec3 }) => void
@@ -41,6 +41,9 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
   private readonly lastPos: Vec3
   private eventListeners: Record<string, any> = {}
   private readonly emitter: WorldDataEmitter
+
+  waitingSpiralChunksLoad = {} as Record<ChunkPosKey, (value: boolean) => void>
+
   addWaitTime = 1
   /* config */ keepChunksDistance = 0
   /* config */ isPlayground = false
@@ -65,7 +68,7 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
     if (val) throw new Error('setBlockStateId returned promise (not supported)')
     const chunkX = Math.floor(position.x / 16)
     const chunkZ = Math.floor(position.z / 16)
-    if (!this.loadedChunks[`${chunkX},${chunkZ}`]) {
+    if (!this.loadedChunks[`${chunkX},${chunkZ}`] && !this.waitingSpiralChunksLoad[`${chunkX},${chunkZ}`]) {
       void this.loadChunk({ x: chunkX, z: chunkZ })
       return
     }
@@ -111,7 +114,10 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
         this.emitter.emit('entity', { id: e.id, delete: true })
       },
       chunkColumnLoad: (pos: Vec3) => {
-        void this.loadChunk(pos)
+        if (this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`]) {
+          this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`](true)
+          delete this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`]
+        }
       },
       chunkColumnUnload: (pos: Vec3) => {
         this.unloadChunk(pos)
@@ -134,7 +140,9 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
 
     bot._client.on('update_light', ({ chunkX, chunkZ }) => {
       const chunkPos = new Vec3(chunkX * 16, 0, chunkZ * 16)
-      void this.loadChunk(chunkPos, true)
+      if (!this.waitingSpiralChunksLoad[`${chunkX},${chunkZ}`]) {
+        void this.loadChunk(chunkPos, true)
+      }
     })
 
     this.emitter.on('listening', () => {
@@ -188,9 +196,27 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
   }
 
   async _loadChunks (positions: Vec3[], sliceSize = 5) {
+    // stop loading previous chunks
+    for (const pos of Object.keys(this.waitingSpiralChunksLoad)) {
+      this.waitingSpiralChunksLoad[pos](false)
+      delete this.waitingSpiralChunksLoad[pos]
+    }
+
     const promises = [] as Array<Promise<void>>
-    await delayedIterator(positions, this.addWaitTime, (pos) => {
-      promises.push(this.loadChunk(pos))
+    let continueLoading = true
+    await delayedIterator(positions, this.addWaitTime, async (pos) => {
+      const promise = (async () => {
+        if (!continueLoading || this.loadedChunks[`${pos.x},${pos.z}`]) return
+
+        if (!this.world.getColumnAt(pos)) {
+          continueLoading = await new Promise<boolean>(resolve => {
+            this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`] = resolve
+          })
+        }
+        if (!continueLoading) return
+        await this.loadChunk(pos)
+      })()
+      promises.push(promise)
     })
     await Promise.all(promises)
   }
@@ -261,6 +287,8 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
     const [botX, botZ] = chunkPos(pos)
     if (lastX !== botX || lastZ !== botZ || force) {
       this.emitter.emit('chunkPosUpdate', { pos })
+
+      // unload chunks that are no longer in view
       const newViewToUnload = new ViewRect(botX, botZ, this.viewDistance + this.keepChunksDistance)
       const chunksToUnload: Vec3[] = []
       for (const coords of Object.keys(this.loadedChunks)) {
@@ -276,6 +304,8 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
       for (const p of chunksToUnload) {
         this.unloadChunk(p)
       }
+
+      // load new chunks
       const positions = generateSpiralMatrix(this.viewDistance).map(([x, z]) => {
         const pos = new Vec3((botX + x) * 16, 0, (botZ + z) * 16)
         if (!this.loadedChunks[`${pos.x},${pos.z}`]) return pos

From 7e5a12934c3bd1956d9fb3d49e3c005ee418ad2d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 11 Apr 2025 21:44:08 +0300
Subject: [PATCH 456/753] fix: fix looking camera desync in local saves

---
 package.json   |  2 +-
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 42f48706..ce04e875 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "express": "^4.18.2",
     "filesize": "^10.0.12",
-    "flying-squid": "npm:@zardoy/flying-squid@^0.0.58",
+    "flying-squid": "npm:@zardoy/flying-squid@^0.0.59",
     "fs-extra": "^11.1.1",
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c9e1e66b..388994fe 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -117,8 +117,8 @@ importers:
         specifier: ^10.0.12
         version: 10.1.6
       flying-squid:
-        specifier: npm:@zardoy/flying-squid@^0.0.58
-        version: '@zardoy/flying-squid@0.0.58(encoding@0.1.13)'
+        specifier: npm:@zardoy/flying-squid@^0.0.59
+        version: '@zardoy/flying-squid@0.0.59(encoding@0.1.13)'
       fs-extra:
         specifier: ^11.1.1
         version: 11.3.0
@@ -3413,8 +3413,8 @@ packages:
     engines: {node: '>=8'}
     hasBin: true
 
-  '@zardoy/flying-squid@0.0.58':
-    resolution: {integrity: sha512-qkSoaYRpVQaAvcVgZDTe0i4PxaK2l2B6i7GfRCEsyYFl3UaNQYBwwocXqLrIwhsc63bwXa0XQe8UNUubz+A4eA==}
+  '@zardoy/flying-squid@0.0.59':
+    resolution: {integrity: sha512-Ztrmv127csGovqJEWEtT19y1wGEB5tIVfneQ3+p/TirP/bTGYpLlW+Ns4sSAc4KrewUP9PW/6L0AtB69CWhQFQ==}
     engines: {node: '>=8'}
     hasBin: true
 
@@ -13198,7 +13198,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@zardoy/flying-squid@0.0.58(encoding@0.1.13)':
+  '@zardoy/flying-squid@0.0.59(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
       chalk: 5.4.1

From 70557a62827f8dfaab1feb1948670f042d09b660 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 11 Apr 2025 21:44:40 +0300
Subject: [PATCH 457/753] fix dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 74f953cd..22bcfac6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,7 @@ WORKDIR /app
 COPY --from=build /app/dist /app/dist
 COPY server.js /app/server.js
 # Install express
-RUN corepack enable
+RUN npm i -g pnpm@10.8.0
 RUN npm init -yp
 RUN pnpm i express github:zardoy/prismarinejs-net-browserify compression cors
 EXPOSE 8080

From 83502eba609ab7157c7496727b1cae768c2733fb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 12 Apr 2025 03:10:29 +0300
Subject: [PATCH 458/753] fix(important): Formatted text display: fix reading
 extra when its text which might happen in kick messages or server info

---
 src/chatUtils.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/chatUtils.ts b/src/chatUtils.ts
index 5143c10f..ade800ac 100644
--- a/src/chatUtils.ts
+++ b/src/chatUtils.ts
@@ -89,7 +89,10 @@ export const formatMessage = (message: MessageInput, mcData: IndexedData = globa
     }
 
     if (msg.extra) {
-      for (const ex of msg.extra) {
+      for (let ex of msg.extra) {
+        if (typeof ex === 'string') {
+          ex = { text: ex }
+        }
         readMsg({ ...styles, ...ex })
       }
     }

From 7a53d4de63d6e8c44ee17ae2fdde8d077490f375 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 14 Apr 2025 17:06:13 +0300
Subject: [PATCH 459/753] fix(feedback-controls): prevent default action for
 side mouse buttons to avoid page leave annoying modal on accidental clicks

---
 src/controls.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/controls.ts b/src/controls.ts
index 0633ea8e..c8ff2279 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -761,6 +761,11 @@ const selectItem = async () => {
 }
 
 addEventListener('mousedown', async (e) => {
+  // always prevent default for side buttons (back / forward navigation)
+  if (e.button === 3 || e.button === 4) {
+    e.preventDefault()
+  }
+
   if ((e.target as HTMLElement).matches?.('#VRButton')) return
   if (!isInRealGameSession() && !(e.target as HTMLElement).id.includes('ui-root')) return
   void pointerLock.requestPointerLock()

From c5e8fcb90c8ca23b77ea9704c6ee9b91676d72bc Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 14 Apr 2025 17:21:22 +0300
Subject: [PATCH 460/753] feat: add controls debug interface! Debug happening
 actions in your game & keyboard buttons!!!!

---
 src/controls.ts           |  1 +
 src/optionsGuiScheme.tsx  |  5 +++
 src/optionsStorage.ts     |  1 +
 src/react/ControDebug.tsx | 71 +++++++++++++++++++++++++++++++++++++++
 src/reactUi.tsx           |  2 ++
 5 files changed, 80 insertions(+)
 create mode 100644 src/react/ControDebug.tsx

diff --git a/src/controls.ts b/src/controls.ts
index c8ff2279..0716d68d 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -177,6 +177,7 @@ contro.on('movementUpdate', ({ vector, soleVector, gamepadIndex }) => {
       if (action) {
         void contro.emit('trigger', { command: 'general.forward' } as any)
       } else {
+        void contro.emit('release', { command: 'general.forward' } as any)
         setSprinting(false)
       }
     }
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index ef8d9a8e..55d107ce 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -569,6 +569,11 @@ export const guiOptionsScheme: {
         ],
       },
     },
+    {
+      debugContro: {
+        text: 'Debug Controls',
+      },
+    }
   ],
   'export-import': [
     {
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 4d76ba0c..a69d4e16 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -66,6 +66,7 @@ const defaultOptions = {
   jeiEnabled: true as boolean | Array<'creative' | 'survival' | 'adventure' | 'spectator'>,
   preventBackgroundTimeoutKick: false,
   preventSleep: false,
+  debugContro: false,
 
   // antiAliasing: false,
 
diff --git a/src/react/ControDebug.tsx b/src/react/ControDebug.tsx
new file mode 100644
index 00000000..9c5f272c
--- /dev/null
+++ b/src/react/ControDebug.tsx
@@ -0,0 +1,71 @@
+import { useEffect, useState } from 'react'
+import { options } from '../optionsStorage'
+import { contro } from '../controls'
+
+export default () => {
+  const [pressedKeys, setPressedKeys] = useState<Set<string>>(new Set())
+  const [actions, setActions] = useState<string[]>([])
+
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      setPressedKeys(prev => new Set([...prev, e.code]))
+    }
+
+    const handleKeyUp = (e: KeyboardEvent) => {
+      setPressedKeys(prev => {
+        const newSet = new Set(prev)
+        newSet.delete(e.code)
+        return newSet
+      })
+    }
+
+    const handleBlur = () => {
+      setPressedKeys(new Set())
+    }
+
+    const handleControTrigger = ({ command }) => {
+      setActions(prev => [...prev, command])
+    }
+
+    const handleControReleased = ({ command }) => {
+      setActions(prev => prev.filter(action => action !== command))
+    }
+
+    window.addEventListener('keydown', handleKeyDown)
+    window.addEventListener('keyup', handleKeyUp)
+    window.addEventListener('blur', handleBlur)
+
+    contro.on('trigger', handleControTrigger)
+    contro.on('release', handleControReleased)
+
+    return () => {
+      window.removeEventListener('keydown', handleKeyDown)
+      window.removeEventListener('keyup', handleKeyUp)
+      window.removeEventListener('blur', handleBlur)
+      contro.off('trigger', handleControTrigger)
+      contro.off('released', handleControReleased)
+    }
+  }, [])
+
+  if (!options.debugContro) return null
+
+  return (
+    <div style={{
+      position: 'fixed',
+      right: 0,
+      top: '50%',
+      transform: 'translateY(-50%)',
+      backgroundColor: 'rgba(0, 0, 0, 0.5)',
+      padding: '8px',
+      fontFamily: 'monospace',
+      fontSize: '8px',
+      color: 'white',
+      display: 'flex',
+      flexDirection: 'column',
+      gap: '4px'
+    }}>
+      <div>Keys: {[...pressedKeys].join(', ')}</div>
+      <div style={{ color: 'limegreen' }}>Actions: {actions.join(', ')}</div>
+    </div>
+  )
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 15c09939..bbfbc2ee 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -54,6 +54,7 @@ import { useAppScale } from './scaleInterface'
 import PacketsReplayProvider from './react/PacketsReplayProvider'
 import TouchInteractionHint from './react/TouchInteractionHint'
 import { ua } from './react/utils'
+import ControDebug from './react/ControDebug'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -208,6 +209,7 @@ const App = () => {
                 <HeldMapUi />
               </InGameComponent>
             </div>
+            <ControDebug />
             <div />
           </RobustPortal>
           <EnterFullscreenButton />

From a541e82e04ccd7aece66417b58bfbe92afbfa5a7 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 15 Apr 2025 02:29:09 +0300
Subject: [PATCH 461/753] fix: add freezeSettings param

---
 src/appParams.ts      | 1 +
 src/optionsStorage.ts | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/appParams.ts b/src/appParams.ts
index 994a5e16..4112a99c 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -42,6 +42,7 @@ export type AppQsParams = {
   suggest_save?: string
   noPacketsValidation?: string
   testCrashApp?: string
+  freezeSettings?: string
 
   // Replay params
   replayFilter?: string
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index a69d4e16..c8e6298e 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -1,7 +1,7 @@
 import { proxy, subscribe } from 'valtio/vanilla'
 import { subscribeKey } from 'valtio/utils'
 import { omitObj } from '@zardoy/utils'
-import { appQueryParamsArray } from './appParams'
+import { appQueryParams, appQueryParamsArray } from './appParams'
 import type { AppConfig } from './appConfig'
 import { appStorage } from './react/appStorageProvider'
 
@@ -236,6 +236,7 @@ Object.defineProperty(window, 'debugChangedOptions', {
 })
 
 subscribe(options, (ops) => {
+  if (appQueryParams.freezeSettings === 'true') return
   for (const op of ops) {
     const [type, path, value] = op
     // let patch

From 6a8de1fdfb78f8ce9c89d4e5e07e8800cdd152b3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 16 Apr 2025 03:22:25 +0300
Subject: [PATCH 462/753] fix: sometimes auto login suggestion was not visible
 due to overlapping notification issue

---
 src/react/ChatProvider.tsx | 3 ++-
 src/utils.ts               | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 0b913875..4376006d 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -7,7 +7,7 @@ import { options } from '../optionsStorage'
 import { viewerVersionState } from '../viewerConnector'
 import Chat, { Message, fadeMessage } from './Chat'
 import { useIsModalActive } from './utilsApp'
-import { hideNotification, showNotification } from './NotificationProvider'
+import { hideNotification, notificationProxy, showNotification } from './NotificationProvider'
 import { updateLoadedServerData } from './serversStorage'
 import { lastConnectOptions } from './AppStatusProvider'
 
@@ -65,6 +65,7 @@ export default () => {
           })
           hideNotification()
         })
+        notificationProxy.id = 'auto-login'
         const listener = () => {
           hideNotification()
         }
diff --git a/src/utils.ts b/src/utils.ts
index 0df6d6d2..93e2eb7b 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -39,6 +39,7 @@ export const pointerLock = {
       void goFullscreen()
     }
     const displayBrowserProblem = () => {
+      if (notificationProxy.id === 'auto-login') return // prevent notification hide
       showNotification('Browser Delay Limitation', navigator['keyboard'] ? 'Click on screen, enable Auto Fullscreen or F11' : 'Click on screen or use fullscreen in Chrome')
       notificationProxy.id = 'pointerlockchange'
     }

From f5ed17d2fbcce45fb6683872f561597dd8467c35 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 16 Apr 2025 03:23:41 +0300
Subject: [PATCH 463/753] fix(critical-regression): FIX broken inventory! There
 was a huge regression with a month-old inventory update which was breaking it
 in some ways

---
 pnpm-lock.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 388994fe..f3059dac 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -341,7 +341,7 @@ importers:
         version: 0.2.52
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
-        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00(@types/react@18.3.18)(react@18.3.1)
+        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:GenerelSchwerz/mineflayer
         version: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13)
@@ -6673,8 +6673,8 @@ packages:
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00:
-    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00}
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4:
+    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4}
     version: 1.0.1
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284:
@@ -17309,7 +17309,7 @@ snapshots:
 
   minecraft-folder-path@1.2.0: {}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f57dd78ca8e3b7cdd724d4272d8cbf6743b0cf00(@types/react@18.3.18)(react@18.3.1):
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4(@types/react@18.3.18)(react@18.3.1):
     dependencies:
       valtio: 1.13.2(@types/react@18.3.18)(react@18.3.1)
     transitivePeerDependencies:

From 143d4a3bb3d7b18ac9ceb36eb0dc5a3336d65e26 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 16 Apr 2025 14:34:51 +0300
Subject: [PATCH 464/753] fix: fix double chests. fix inventory crashing when
 it doesnt know the texture to render

---
 package.json            |  2 +-
 pnpm-lock.yaml          | 10 +++++-----
 src/inventoryWindows.ts |  6 +++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index ce04e875..ee07230d 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.52",
+    "mc-assets": "^0.2.53",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:GenerelSchwerz/mineflayer",
     "mineflayer-mouse": "^0.1.7",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f3059dac..d7b1da61 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -337,8 +337,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.52
-        version: 0.2.52
+        specifier: ^0.2.53
+        version: 0.2.53
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4(@types/react@18.3.18)(react@18.3.1)
@@ -6455,8 +6455,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.52:
-    resolution: {integrity: sha512-6mUI63fcUIjB0Ghjls7bLMnse2XUgvhPajsFkRQf10PcXYbfS/OAnX51X8sNx2pzfoHSlA81U7v+v906YwoAUw==}
+  mc-assets@0.2.53:
+    resolution: {integrity: sha512-Ucsu2pDLr/cs8bxbxU9KTszdf/vPTLphYgEHUEWxuYlMkPQUCpsQwkn3YgyykJ7RXaca7zZGlZXaTPXBAqJT6A==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.14:
@@ -16988,7 +16988,7 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.52:
+  mc-assets@0.2.53:
     dependencies:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 40b0e4d7..2906177b 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -216,6 +216,8 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
     }
   }
 
+  const blockToTopTexture = (r) => r.top ?? r
+
   try {
     assertDefined(appViewer.resourcesManager.currentResources?.itemsRenderer)
     itemTexture =
@@ -224,9 +226,11 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
       ?? appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture('item/missing_texture')!
   } catch (err) {
     inGameError(`Failed to render item ${itemModelName} (original: ${originalItemName}) on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
-    itemTexture = appViewer.resourcesManager.currentResources!.itemsRenderer.getItemTexture('block/errored')!
+    itemTexture = blockToTopTexture(appViewer.resourcesManager.currentResources!.itemsRenderer.getItemTexture('errored')!)
   }
 
+  itemTexture ??= blockToTopTexture(appViewer.resourcesManager.currentResources!.itemsRenderer.getItemTexture('unknown')!)
+
 
   if ('type' in itemTexture) {
     // is item

From 73ccb48d02eeaa2962ac43d07bcd3227edd6a94d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 16 Apr 2025 18:24:19 +0300
Subject: [PATCH 465/753] feat: Add F3+H chunks debug screen! not really useful
 for now since chunks not visible bug was not fixed yet

---
 renderer/viewer/lib/worldDataEmitter.ts |   8 +-
 src/controls.ts                         |   7 ++
 src/react/ChunksDebug.tsx               | 130 ++++++++++++++++++++++++
 src/react/ChunksDebugScreen.tsx         | 100 ++++++++++++++++++
 src/react/DebugOverlay.tsx              |   1 +
 src/reactUi.tsx                         |   3 +
 6 files changed, 246 insertions(+), 3 deletions(-)
 create mode 100644 src/react/ChunksDebug.tsx
 create mode 100644 src/react/ChunksDebugScreen.tsx

diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index c9329d01..5e28c007 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -37,8 +37,8 @@ export type WorldDataEmitterEvents = {
  * It's up to the consumer to serialize the data if needed
  */
 export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<WorldDataEmitterEvents>) {
-  private loadedChunks: Record<ChunkPosKey, boolean>
-  private readonly lastPos: Vec3
+  loadedChunks: Record<ChunkPosKey, boolean>
+  readonly lastPos: Vec3
   private eventListeners: Record<string, any> = {}
   private readonly emitter: WorldDataEmitter
 
@@ -140,7 +140,7 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
 
     bot._client.on('update_light', ({ chunkX, chunkZ }) => {
       const chunkPos = new Vec3(chunkX * 16, 0, chunkZ * 16)
-      if (!this.waitingSpiralChunksLoad[`${chunkX},${chunkZ}`]) {
+      if (!this.waitingSpiralChunksLoad[`${chunkX},${chunkZ}`] && this.loadedChunks[`${chunkX},${chunkZ}`]) {
         void this.loadChunk(chunkPos, true)
       }
     })
@@ -242,6 +242,8 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
 
   async loadChunk (pos: ChunkPos, isLightUpdate = false) {
     const [botX, botZ] = chunkPos(this.lastPos)
+    console.log('loadChunk', botX - pos.x / 16, botZ - pos.z / 16)
+
     const dx = Math.abs(botX - Math.floor(pos.x / 16))
     const dz = Math.abs(botZ - Math.floor(pos.z / 16))
     if (dx <= this.viewDistance && dz <= this.viewDistance) {
diff --git a/src/controls.ts b/src/controls.ts
index 0716d68d..83a5f4eb 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -614,6 +614,13 @@ export const f3Keybinds: Array<{
     },
     mobileTitle: 'Toggle chunk borders',
   },
+  {
+    key: 'KeyH',
+    action () {
+      showModal({ reactType: 'chunks-debug' })
+    },
+    mobileTitle: 'Show Chunks Debug',
+  },
   {
     key: 'KeyY',
     async action () {
diff --git a/src/react/ChunksDebug.tsx b/src/react/ChunksDebug.tsx
new file mode 100644
index 00000000..d3eb52a7
--- /dev/null
+++ b/src/react/ChunksDebug.tsx
@@ -0,0 +1,130 @@
+import { useEffect, useRef, useState } from 'react'
+import './LoadingChunks.css'
+
+export interface ChunkDebug {
+  x: number // like -32
+  z: number // like -32
+  lines: string[]
+  sidebarLines: string[]
+  state: 'server-waiting' | 'order-queued' | 'client-waiting' | 'client-processing' | 'done-empty' | 'done'
+}
+
+interface ProcessedChunk extends ChunkDebug {
+  relX: number
+  relZ: number
+  displayLines: string[]
+}
+
+const stateColors: Record<ChunkDebug['state'], string> = {
+  'server-waiting': 'gray',
+  'order-queued': 'darkorange',
+  'client-waiting': 'yellow',
+  'client-processing': 'yellow',
+  'done-empty': 'darkgreen',
+  'done': 'limegreen',
+}
+
+export default ({
+  chunks,
+  playerChunk,
+  maxDistance,
+  tileSize = 16,
+  fontSize = 5,
+}: {
+  chunks: ChunkDebug[]
+  playerChunk: { x: number, z: number }
+  maxDistance: number,
+  tileSize?: number
+  fontSize?: number
+}) => {
+  const [selectedChunk, setSelectedChunk] = useState<ProcessedChunk | null>(null)
+  const [showSidebar, setShowSidebar] = useState(false)
+
+  // Calculate grid dimensions based on maxDistance
+  const gridSize = maxDistance * 2 + 1
+  const centerIndex = maxDistance
+
+  // Process chunks to get only the last one for each position and within maxDistance
+  const processedChunks = chunks.reduce<Record<string, ProcessedChunk>>((acc, chunk) => {
+    const relX = Math.floor((chunk.x - playerChunk.x) / 16)
+    const relZ = Math.floor((chunk.z - playerChunk.z) / 16)
+
+    // Skip chunks outside maxDistance
+    if (Math.abs(relX) > maxDistance || Math.abs(relZ) > maxDistance) return acc
+
+    const key = `${chunk.x},${chunk.z}`
+    acc[key] = {
+      ...chunk,
+      relX,
+      relZ,
+      displayLines: [`${relX},${relZ} (${chunk.x},${chunk.z})`, ...chunk.lines]
+    }
+    return acc
+  }, {})
+
+  return (
+    <div style={{ display: 'flex', gap: '10px' }}>
+      <div style={{
+        display: 'grid',
+        gridTemplateColumns: `repeat(${gridSize}, 1fr)`,
+        gridTemplateRows: `repeat(${gridSize}, 1fr)`,
+        gap: 1,
+        // width: `${tileSize * gridSize}px`,
+        // height: `${tileSize * gridSize}px`,
+      }}>
+        {Array.from({ length: gridSize * gridSize }).map((_, i) => {
+          const relX = -maxDistance + (i % gridSize)
+          const relZ = -maxDistance + Math.floor(i / gridSize)
+          const x = playerChunk.x + relX * 16
+          const z = playerChunk.z + relZ * 16
+          const chunk = processedChunks[`${x},${z}`]
+
+          return (
+            <div
+              key={`${x},${z}`}
+              onClick={() => {
+                if (chunk) {
+                  setSelectedChunk(chunk)
+                  setShowSidebar(true)
+                }
+              }}
+              style={{
+                display: 'flex',
+                justifyContent: 'center',
+                alignItems: 'center',
+                background: chunk ? stateColors[chunk.state] : 'black',
+                color: 'white',
+                fontSize: `${fontSize}px`,
+                cursor: chunk ? 'pointer' : 'default',
+                position: 'relative',
+                width: `${tileSize}px`,
+                height: `${tileSize}px`,
+                // pre-wrap
+                whiteSpace: 'pre',
+              }}
+            >
+              {relX}, {relZ}{'\n'}
+              {chunk?.lines.join('\n')}
+            </div>
+          )
+        })}
+      </div>
+
+      {showSidebar && selectedChunk && (
+        <div style={{ display: 'flex', flexDirection: 'column', gap: '5px' }}>
+          {selectedChunk.displayLines.map((line, i) => (
+            <div key={i} style={{ fontSize: '10px', wordBreak: 'break-word' }}>
+              {line}
+            </div>
+          ))}
+          <div style={{ marginTop: '10px', fontSize: '10px' }} className='text-select'>
+            <div>Sidebar Info:</div>
+            {selectedChunk.sidebarLines.map((line, i) => (
+              <div key={i}>{line}</div>
+            ))}
+          </div>
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/src/react/ChunksDebugScreen.tsx b/src/react/ChunksDebugScreen.tsx
new file mode 100644
index 00000000..c65eee16
--- /dev/null
+++ b/src/react/ChunksDebugScreen.tsx
@@ -0,0 +1,100 @@
+import { useEffect, useState } from 'react'
+import { useUtilsEffect } from '@zardoy/react-util'
+import { WorldRendererCommon } from 'renderer/viewer/lib/worldrendererCommon'
+import { WorldRendererThree } from 'renderer/viewer/three/worldrendererThree'
+import Screen from './Screen'
+import ChunksDebug, { ChunkDebug } from './ChunksDebug'
+import { useIsModalActive } from './utilsApp'
+
+const Inner = () => {
+  const [playerX, setPlayerX] = useState(Math.floor(worldView!.lastPos.x / 16) * 16)
+  const [playerZ, setPlayerZ] = useState(Math.floor(worldView!.lastPos.z / 16) * 16)
+  const [update, setUpdate] = useState(0)
+
+  useUtilsEffect(({ interval }) => {
+    interval(
+      500,
+      () => {
+        setPlayerX(Math.floor(worldView!.lastPos.x / 16) * 16)
+        setPlayerZ(Math.floor(worldView!.lastPos.z / 16) * 16)
+        setUpdate(u => u + 1)
+      }
+    )
+  }, [])
+
+  const chunksWaitingServer = Object.keys(worldView!.waitingSpiralChunksLoad).map((x): ChunkDebug => ({
+    x: Number(x.split(',')[0]),
+    z: Number(x.split(',')[1]),
+    state: 'server-waiting',
+    lines: [],
+    sidebarLines: [],
+  }))
+
+  const world = globalThis.world as WorldRendererThree
+
+  const loadedSectionsChunks = Object.fromEntries(Object.keys(world.sectionObjects).map(sectionPos => {
+    const [x, y, z] = sectionPos.split(',').map(Number)
+    return [`${x},${z}`, true]
+  }))
+
+  const chunksWaitingClient = Object.keys(worldView!.loadedChunks).map((x): ChunkDebug => ({
+    x: Number(x.split(',')[0]),
+    z: Number(x.split(',')[1]),
+    state: 'client-waiting',
+    lines: [],
+    sidebarLines: [],
+  }))
+
+  const clientProcessingChunks = Object.keys(world.loadedChunks).map((x): ChunkDebug => ({
+    x: Number(x.split(',')[0]),
+    z: Number(x.split(',')[1]),
+    state: 'client-processing',
+    lines: [],
+    sidebarLines: [],
+  }))
+
+  const chunksDoneEmpty = Object.keys(world.finishedChunks)
+    .filter(chunkPos => !loadedSectionsChunks[chunkPos])
+    .map((x): ChunkDebug => ({
+      x: Number(x.split(',')[0]),
+      z: Number(x.split(',')[1]),
+      state: 'done-empty',
+      lines: [],
+      sidebarLines: [],
+    }))
+
+  const chunksDone = Object.keys(world.finishedChunks).map((x): ChunkDebug => ({
+    x: Number(x.split(',')[0]),
+    z: Number(x.split(',')[1]),
+    state: 'done',
+    lines: [],
+    sidebarLines: [],
+  }))
+
+  const allChunks = [
+    ...chunksWaitingServer,
+    ...chunksWaitingClient,
+    ...clientProcessingChunks,
+    ...chunksDone,
+    ...chunksDoneEmpty,
+  ]
+  return <Screen title="Chunks Debug">
+    <ChunksDebug
+      chunks={allChunks}
+      playerChunk={{
+        x: playerX,
+        z: playerZ
+      }}
+      maxDistance={worldView!.viewDistance}
+      tileSize={32}
+      fontSize={8}
+    />
+  </Screen>
+}
+
+export default () => {
+  const isActive = useIsModalActive('chunks-debug')
+  if (!isActive) return null
+
+  return <Inner />
+}
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index af0d6675..610bcea9 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -180,6 +180,7 @@ export default () => {
       <div className={styles.empty} />
       <p>XYZ: {pos.x.toFixed(3)} / {pos.y.toFixed(3)} / {pos.z.toFixed(3)}</p>
       <p>Chunk: {Math.floor(pos.x % 16)} ~ {Math.floor(pos.z % 16)} in {Math.floor(pos.x / 16)} ~ {Math.floor(pos.z / 16)}</p>
+      <p>Section: {Math.floor(pos.x / 16) * 16}, {Math.floor(pos.y / 16) * 16}, {Math.floor(pos.z / 16) * 16}</p>
       <p>Packets: {packetsString}</p>
       <p>Client TPS: {clientTps}</p>
       <p>Facing (viewer): {bot.entity.yaw.toFixed(3)} {bot.entity.pitch.toFixed(3)}</p>
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index bbfbc2ee..93db7706 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -55,6 +55,8 @@ import PacketsReplayProvider from './react/PacketsReplayProvider'
 import TouchInteractionHint from './react/TouchInteractionHint'
 import { ua } from './react/utils'
 import ControDebug from './react/ControDebug'
+import ChunksDebug from './react/ChunksDebug'
+import ChunksDebugScreen from './react/ChunksDebugScreen'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -157,6 +159,7 @@ const InGameUi = () => {
           {!disabledUiParts.includes('crosshair') && <Crosshair />}
           {!disabledUiParts.includes('books') && <BookProvider />}
           {!disabledUiParts.includes('bossbars') && displayBossBars && <BossBarOverlayProvider />}
+          <ChunksDebugScreen />
         </PerComponentErrorBoundary>
       </div>
 

From e8b1f190a7d50c0ebe42b1b973a6887076ff1f46 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 17 Apr 2025 19:58:03 +0300
Subject: [PATCH 466/753] add more debug into to f3+h

---
 src/react/ChunksDebug.tsx       |  4 +--
 src/react/ChunksDebugScreen.tsx | 54 ++++++++++++---------------------
 2 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/src/react/ChunksDebug.tsx b/src/react/ChunksDebug.tsx
index d3eb52a7..7b42cf4d 100644
--- a/src/react/ChunksDebug.tsx
+++ b/src/react/ChunksDebug.tsx
@@ -111,13 +111,13 @@ export default ({
       </div>
 
       {showSidebar && selectedChunk && (
-        <div style={{ display: 'flex', flexDirection: 'column', gap: '5px' }}>
+        <div style={{ display: 'flex', flexDirection: 'column', gap: '5px' }} className='text-select'>
           {selectedChunk.displayLines.map((line, i) => (
             <div key={i} style={{ fontSize: '10px', wordBreak: 'break-word' }}>
               {line}
             </div>
           ))}
-          <div style={{ marginTop: '10px', fontSize: '10px' }} className='text-select'>
+          <div style={{ marginTop: '10px', fontSize: '10px', whiteSpace: 'pre', maxWidth: 100, }}>
             <div>Sidebar Info:</div>
             {selectedChunk.sidebarLines.map((line, i) => (
               <div key={i}>{line}</div>
diff --git a/src/react/ChunksDebugScreen.tsx b/src/react/ChunksDebugScreen.tsx
index c65eee16..80e926d8 100644
--- a/src/react/ChunksDebugScreen.tsx
+++ b/src/react/ChunksDebugScreen.tsx
@@ -22,13 +22,21 @@ const Inner = () => {
     )
   }, [])
 
-  const chunksWaitingServer = Object.keys(worldView!.waitingSpiralChunksLoad).map((x): ChunkDebug => ({
-    x: Number(x.split(',')[0]),
-    z: Number(x.split(',')[1]),
-    state: 'server-waiting',
-    lines: [],
-    sidebarLines: [],
-  }))
+  const mapChunk = (key: string, state: ChunkDebug['state']): ChunkDebug => {
+    const chunk = worldView!.debugChunksInfo[key]
+    return {
+      x: Number(key.split(',')[0]),
+      z: Number(key.split(',')[1]),
+      state,
+      lines: [String(chunk?.loads.length ?? 0)],
+      sidebarLines: [
+        `loads: ${chunk.loads.map(l => `${l.reason} ${l.dataLength} ${l.time}`).join('\n')}`,
+        // `blockUpdates: ${chunk.blockUpdates}`,
+      ],
+    }
+  }
+
+  const chunksWaitingServer = Object.keys(worldView!.waitingSpiralChunksLoad).map(key => mapChunk(key, 'server-waiting'))
 
   const world = globalThis.world as WorldRendererThree
 
@@ -37,39 +45,15 @@ const Inner = () => {
     return [`${x},${z}`, true]
   }))
 
-  const chunksWaitingClient = Object.keys(worldView!.loadedChunks).map((x): ChunkDebug => ({
-    x: Number(x.split(',')[0]),
-    z: Number(x.split(',')[1]),
-    state: 'client-waiting',
-    lines: [],
-    sidebarLines: [],
-  }))
+  const chunksWaitingClient = Object.keys(worldView!.loadedChunks).map(key => mapChunk(key, 'client-waiting'))
 
-  const clientProcessingChunks = Object.keys(world.loadedChunks).map((x): ChunkDebug => ({
-    x: Number(x.split(',')[0]),
-    z: Number(x.split(',')[1]),
-    state: 'client-processing',
-    lines: [],
-    sidebarLines: [],
-  }))
+  const clientProcessingChunks = Object.keys(world.loadedChunks).map(key => mapChunk(key, 'client-processing'))
 
   const chunksDoneEmpty = Object.keys(world.finishedChunks)
     .filter(chunkPos => !loadedSectionsChunks[chunkPos])
-    .map((x): ChunkDebug => ({
-      x: Number(x.split(',')[0]),
-      z: Number(x.split(',')[1]),
-      state: 'done-empty',
-      lines: [],
-      sidebarLines: [],
-    }))
+    .map(key => mapChunk(key, 'done-empty'))
 
-  const chunksDone = Object.keys(world.finishedChunks).map((x): ChunkDebug => ({
-    x: Number(x.split(',')[0]),
-    z: Number(x.split(',')[1]),
-    state: 'done',
-    lines: [],
-    sidebarLines: [],
-  }))
+  const chunksDone = Object.keys(world.finishedChunks).map(key => mapChunk(key, 'done'))
 
   const allChunks = [
     ...chunksWaitingServer,

From 1582e16d3b72ee9d35f6af98fb6938f89b99e28f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 17 Apr 2025 19:58:30 +0300
Subject: [PATCH 467/753] fix critical regression that led to not loading
 chunks twice that was a valid behavior before

---
 renderer/viewer/lib/worldDataEmitter.ts | 36 +++++++++++++++++++------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 5e28c007..7dc49ac3 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -41,6 +41,14 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
   readonly lastPos: Vec3
   private eventListeners: Record<string, any> = {}
   private readonly emitter: WorldDataEmitter
+  debugChunksInfo: Record<ChunkPosKey, {
+    loads: Array<{
+      dataLength: number
+      reason: string
+      time: number
+    }>
+    // blockUpdates: number
+  }> = {}
 
   waitingSpiralChunksLoad = {} as Record<ChunkPosKey, (value: boolean) => void>
 
@@ -66,12 +74,12 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
   setBlockStateId (position: Vec3, stateId: number) {
     const val = this.world.setBlockStateId(position, stateId) as Promise<void> | void
     if (val) throw new Error('setBlockStateId returned promise (not supported)')
-    const chunkX = Math.floor(position.x / 16)
-    const chunkZ = Math.floor(position.z / 16)
-    if (!this.loadedChunks[`${chunkX},${chunkZ}`] && !this.waitingSpiralChunksLoad[`${chunkX},${chunkZ}`]) {
-      void this.loadChunk({ x: chunkX, z: chunkZ })
-      return
-    }
+    // const chunkX = Math.floor(position.x / 16)
+    // const chunkZ = Math.floor(position.z / 16)
+    // if (!this.loadedChunks[`${chunkX},${chunkZ}`] && !this.waitingSpiralChunksLoad[`${chunkX},${chunkZ}`]) {
+    //   void this.loadChunk({ x: chunkX, z: chunkZ })
+    //   return
+    // }
 
     this.emit('blockUpdate', { pos: position, stateId })
   }
@@ -117,6 +125,8 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
         if (this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`]) {
           this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`](true)
           delete this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`]
+        } else if (this.loadedChunks[`${pos.x},${pos.z}`]) {
+          void this.loadChunk(pos, false, 'Received another chunkColumnLoad event while already loaded')
         }
       },
       chunkColumnUnload: (pos: Vec3) => {
@@ -141,7 +151,7 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
     bot._client.on('update_light', ({ chunkX, chunkZ }) => {
       const chunkPos = new Vec3(chunkX * 16, 0, chunkZ * 16)
       if (!this.waitingSpiralChunksLoad[`${chunkX},${chunkZ}`] && this.loadedChunks[`${chunkX},${chunkZ}`]) {
-        void this.loadChunk(chunkPos, true)
+        void this.loadChunk(chunkPos, true, 'update_light')
       }
     })
 
@@ -240,7 +250,7 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
   // debugGotChunkLatency = [] as number[]
   // lastTime = 0
 
-  async loadChunk (pos: ChunkPos, isLightUpdate = false) {
+  async loadChunk (pos: ChunkPos, isLightUpdate = false, reason = 'spiral') {
     const [botX, botZ] = chunkPos(this.lastPos)
     console.log('loadChunk', botX - pos.x / 16, botZ - pos.z / 16)
 
@@ -263,6 +273,15 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
         //@ts-expect-error
         this.emitter.emit('loadChunk', { x: pos.x, z: pos.z, chunk, blockEntities: column.blockEntities, worldConfig, isLightUpdate })
         this.loadedChunks[`${pos.x},${pos.z}`] = true
+
+        this.debugChunksInfo[`${pos.x},${pos.z}`] ??= {
+          loads: []
+        }
+        this.debugChunksInfo[`${pos.x},${pos.z}`].loads.push({
+          dataLength: chunk.length,
+          reason,
+          time: Math.floor(performance.now()),
+        })
       } else if (this.isPlayground) { // don't allow in real worlds pre-flag chunks as loaded to avoid race condition when the chunk might still be loading. In playground it's assumed we always pre-load all chunks first
         this.emitter.emit('markAsLoaded', { x: pos.x, z: pos.z })
       }
@@ -281,6 +300,7 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
   unloadChunk (pos: ChunkPos) {
     this.emitter.emit('unloadChunk', { x: pos.x, z: pos.z })
     delete this.loadedChunks[`${pos.x},${pos.z}`]
+    delete this.debugChunksInfo[`${pos.x},${pos.z}`]
   }
 
   async updatePosition (pos: Vec3, force = false) {

From 529b465d327261cf219f8f52995d47f68a649194 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 17 Apr 2025 20:51:06 +0300
Subject: [PATCH 468/753] sync for changes between forks fix: sometimes
 autlogin save prompt is not displayed fix: add connect server only ui add
 some other components for future usage fix: make some fields custommization
 in main menu from config.json fix: adjust logic on player disconnect in some
 rare cases

---
 config.json                        |  2 +
 src/appConfig.ts                   |  2 +
 src/appParams.ts                   |  2 +
 src/cameraRotationControls.ts      |  5 +-
 src/controls.ts                    | 21 ++++++--
 src/core/progressReporter.ts       |  5 +-
 src/customChannels.ts              |  4 --
 src/globalState.ts                 | 14 ++++--
 src/index.ts                       | 34 +++++++++++--
 src/react/Chat.tsx                 |  6 +--
 src/react/ConnectOnlyServerUi.tsx  | 80 ++++++++++++++++++++++++++++++
 src/react/MainMenu.tsx             |  8 ++-
 src/react/NotificationProvider.tsx | 14 ++++--
 src/react/VoiceMicrophone.tsx      | 77 ++++++++++++++++++++++++++++
 src/reactUi.tsx                    |  4 ++
 src/screens.css                    |  1 +
 src/shims/patchShims.ts            |  2 +
 17 files changed, 246 insertions(+), 35 deletions(-)
 create mode 100644 src/react/ConnectOnlyServerUi.tsx
 create mode 100644 src/react/VoiceMicrophone.tsx

diff --git a/config.json b/config.json
index 2ede8070..ea27ca5a 100644
--- a/config.json
+++ b/config.json
@@ -25,6 +25,8 @@
       "description": "Very nice a polite server. Must try for everyone!"
     }
   ],
+  "rightSideText": "A Minecraft client clone in the browser!",
+  "splashText": "Gen is cooking!",
   "pauseLinks": [
     [
       {
diff --git a/src/appConfig.ts b/src/appConfig.ts
index b8f83ad1..c5b61b69 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -15,11 +15,13 @@ export type AppConfig = {
   mapsProvider?: string
 
   appParams?: Record<string, any> // query string params
+  rightSideText?: string
 
   defaultSettings?: Record<string, any>
   forceSettings?: Record<string, boolean>
   // hideSettings?: Record<string, boolean>
   allowAutoConnect?: boolean
+  splashText?: string
   pauseLinks?: Array<Array<Record<string, any>>>
 }
 
diff --git a/src/appParams.ts b/src/appParams.ts
index 4112a99c..aec6fd0b 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -42,6 +42,8 @@ export type AppQsParams = {
   suggest_save?: string
   noPacketsValidation?: string
   testCrashApp?: string
+  onlyConnect?: string
+  connectText?: string
   freezeSettings?: string
 
   // Replay params
diff --git a/src/cameraRotationControls.ts b/src/cameraRotationControls.ts
index 8b21e53d..3368666f 100644
--- a/src/cameraRotationControls.ts
+++ b/src/cameraRotationControls.ts
@@ -74,9 +74,8 @@ export const onControInit = () => {
 }
 
 function pointerLockChangeCallback () {
-  if (notificationProxy.id === 'pointerlockchange') {
-    hideNotification()
-  }
+  hideNotification('pointerlockchange')
+
   if (appViewer.rendererState.preventEscapeMenu) return
   if (!pointerLock.hasPointerLock && activeModalStack.length === 0 && miscUiState.gameLoaded) {
     showModal({ reactType: 'pause-screen' })
diff --git a/src/controls.ts b/src/controls.ts
index 83a5f4eb..f8160cfd 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -41,36 +41,43 @@ const controlOptions = {
 export const contro = new ControMax({
   commands: {
     general: {
+      // movement
       jump: ['Space', 'A'],
       inventory: ['KeyE', 'X'],
       drop: ['KeyQ', 'B'],
       sneak: ['ShiftLeft'],
       toggleSneakOrDown: [null, 'Right Stick'],
       sprint: ['ControlLeft', 'Left Stick'],
+      // game interactions
       nextHotbarSlot: [null, 'Right Bumper'],
       prevHotbarSlot: [null, 'Left Bumper'],
       attackDestroy: [null, 'Right Trigger'],
       interactPlace: [null, 'Left Trigger'],
-      chat: [['KeyT', 'Enter']],
-      command: ['Slash'],
       swapHands: ['KeyF'],
-      zoom: ['KeyC'],
       selectItem: ['KeyH'], // default will be removed
       rotateCameraLeft: [null],
       rotateCameraRight: [null],
       rotateCameraUp: [null],
       rotateCameraDown: [null],
-      viewerConsole: ['Backquote']
+      // ui?
+      chat: [['KeyT', 'Enter']],
+      command: ['Slash'],
+      // client side
+      zoom: ['KeyC'],
+      viewerConsole: ['Backquote'],
     },
     ui: {
       toggleFullscreen: ['F11'],
       back: [null/* 'Escape' */, 'B'],
-      toggleMap: ['KeyM'],
+      toggleMap: ['KeyJ'],
       leftClick: [null, 'A'],
       rightClick: [null, 'Y'],
       speedupCursor: [null, 'Left Stick'],
       pauseMenu: [null, 'Start']
     },
+    communication: {
+      toggleMicrophone: ['KeyK'],
+    },
     advanced: {
       lockUrl: ['KeyY'],
     },
@@ -550,6 +557,10 @@ contro.on('trigger', ({ command }) => {
     }
   }
 
+  if (command === 'communication.toggleMicrophone') {
+    // toggleMicrophoneMuted()
+  }
+
   if (command === 'ui.pauseMenu') {
     showModal({ reactType: 'pause-screen' })
   }
diff --git a/src/core/progressReporter.ts b/src/core/progressReporter.ts
index f4e4e701..a222272d 100644
--- a/src/core/progressReporter.ts
+++ b/src/core/progressReporter.ts
@@ -163,15 +163,16 @@ export const createFullScreenProgressReporter = (): ProgressReporter => {
 }
 
 export const createNotificationProgressReporter = (endMessage?: string): ProgressReporter => {
+  const id = `progress-reporter-${Math.random().toString(36).slice(2)}`
   return createProgressReporter({
     setMessage (message: string) {
-      showNotification(`${message}...`, '', false, '', undefined, true)
+      showNotification(`${message}...`, '', false, '', undefined, true, id)
     },
     end () {
       if (endMessage) {
         showNotification(endMessage, '', false, '', undefined, true)
       } else {
-        hideNotification()
+        hideNotification(id)
       }
     },
 
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 7cdd6c32..57c057d5 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -218,10 +218,6 @@ const registerMediaChannels = () => {
       { name: 'z', type: 'f32' },
       { name: 'width', type: 'f32' },
       { name: 'height', type: 'f32' },
-      // N, 0
-      // W, 3
-      // S, 2
-      // E, 1
       { name: 'rotation', type: 'i16' }, // 0: 0° - towards positive z, 1: 90° - positive x, 2: 180° - negative z, 3: 270° - negative x (3-6 is same but double side)
       { name: 'source', type: ['pstring', { countType: 'i16' }] },
       { name: 'loop', type: 'bool' },
diff --git a/src/globalState.ts b/src/globalState.ts
index 2d77b720..bd845195 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -8,7 +8,11 @@ import { AppConfig } from './appConfig'
 
 // todo: refactor structure with support of hideNext=false
 
-export const notHideableModalsWithoutForce = new Set(['app-status'])
+export const notHideableModalsWithoutForce = new Set([
+  'app-status',
+  'divkit:nonclosable',
+  'only-connect-server',
+])
 
 type Modal = ({ elem?: HTMLElement & Record<string, any> } & { reactType: string })
 
@@ -35,10 +39,10 @@ const showModalInner = (modal: Modal) => {
   return true
 }
 
-export const showModal = (elem: /* (HTMLElement & Record<string, any>) |  */{ reactType: string }) => {
-  const resolved = elem
+export const showModal = (elem: /* (HTMLElement & Record<string, any>) |  */{ reactType: string } | string) => {
+  const resolved = typeof elem === 'string' ? { reactType: elem } : elem
   const curModal = activeModalStack.at(-1)
-  if (/* elem === curModal?.elem ||  */(elem.reactType && elem.reactType === curModal?.reactType) || !showModalInner(resolved)) return
+  if ((resolved.reactType && resolved.reactType === curModal?.reactType) || !showModalInner(resolved)) return
   activeModalStack.push(resolved)
 }
 
@@ -49,7 +53,7 @@ export const showModal = (elem: /* (HTMLElement & Record<string, any>) |  */{ re
 export const hideModal = (modal = activeModalStack.at(-1), data: any = undefined, options: { force?: boolean; restorePrevious?: boolean } = {}) => {
   const { force = false, restorePrevious = true } = options
   if (!modal) return
-  let cancel = notHideableModalsWithoutForce.has(modal.reactType) ? !force : undefined
+  let cancel = [...notHideableModalsWithoutForce].some(m => modal.reactType.startsWith(m)) ? !force : undefined
   if (force) {
     cancel = undefined
   }
diff --git a/src/index.ts b/src/index.ts
index 42346606..3da14257 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -97,6 +97,7 @@ import { createConsoleLogProgressReporter, createFullScreenProgressReporter, Pro
 import { appViewer } from './appViewer'
 import './appViewerLoad'
 import { registerOpenBenchmarkListener } from './benchmark'
+import { tryHandleBuiltinCommand } from './builtinCommands'
 
 window.debug = debug
 window.beforeRenderFrame = []
@@ -208,8 +209,12 @@ export async function connect (connectOptions: ConnectOptions) {
 
   let ended = false
   let bot!: typeof __type_bot
-  const destroyAll = () => {
+  const destroyAll = (wasKicked = false) => {
     if (ended) return
+    const hadConnected = !!bot
+    if (!wasKicked && miscUiState.appConfig?.allowAutoConnect && appQueryParams.autoConnect && hadConnected) {
+      location.reload()
+    }
     errorAbortController.abort()
     ended = true
     progress.end()
@@ -251,6 +256,10 @@ export async function connect (connectOptions: ConnectOptions) {
     if (isCypress()) throw err
     miscUiState.hasErrors = true
     if (miscUiState.gameLoaded) return
+    // close all modals
+    for (const modal of activeModalStack) {
+      hideModal(modal)
+    }
 
     setLoadingScreenStatus(`Error encountered. ${err}`, true)
     appStatusState.showReconnect = true
@@ -280,7 +289,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
   if (connectOptions.server && !connectOptions.viewerWsConnect && !parsedServer.isWebSocket) {
     console.log(`using proxy ${proxy.host}:${proxy.port || location.port}`)
-    net['setProxy']({ hostname: proxy.host, port: proxy.port })
+    net['setProxy']({ hostname: proxy.host, port: proxy.port, headers: { Authorization: `Bearer ${new URLSearchParams(location.search).get('token') ?? ''}` } })
   }
 
   const renderDistance = singleplayer ? renderDistanceSingleplayer : multiplayerRenderDistance
@@ -622,9 +631,13 @@ export async function connect (connectOptions: ConnectOptions) {
   bot.on('kicked', (kickReason) => {
     console.log('You were kicked!', kickReason)
     const { formatted: kickReasonFormatted, plain: kickReasonString } = parseFormattedMessagePacket(kickReason)
+    // close all modals
+    for (const modal of activeModalStack) {
+      hideModal(modal)
+    }
     setLoadingScreenStatus(`The Minecraft server kicked you. Kick reason: ${kickReasonString}`, true, undefined, undefined, kickReasonFormatted)
     appStatusState.showReconnect = true
-    destroyAll()
+    destroyAll(true)
   })
 
   const packetBeforePlay = (_, __, ___, fullBuffer) => {
@@ -644,6 +657,10 @@ export async function connect (connectOptions: ConnectOptions) {
     if (endReason === 'socketClosed') {
       endReason = lastKnownKickReason ?? 'Connection with proxy server lost'
     }
+    // close all modals
+    for (const modal of activeModalStack) {
+      hideModal(modal)
+    }
     setLoadingScreenStatus(`You have been disconnected from the server. End reason:\n${endReason}`, true)
     appStatusState.showReconnect = true
     onPossibleErrorDisconnect()
@@ -799,7 +816,10 @@ export async function connect (connectOptions: ConnectOptions) {
       const commands = appQueryParamsArray.command ?? []
       for (let command of commands) {
         if (!command.startsWith('/')) command = `/${command}`
-        bot.chat(command)
+        const builtinHandled = tryHandleBuiltinCommand(command)
+        if (!builtinHandled) {
+          bot.chat(command)
+        }
       }
     })
   }
@@ -888,7 +908,11 @@ if (!reconnectOptions) {
       const waitAppConfigLoad = !appQueryParams.proxy
       const openServerEditor = () => {
         hideModal()
-        showModal({ reactType: 'editServer' })
+        if (appQueryParams.onlyConnect) {
+          showModal({ reactType: 'only-connect-server' })
+        } else {
+          showModal({ reactType: 'editServer' })
+        }
       }
       showModal({ reactType: 'empty' })
       if (waitAppConfigLoad) {
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 78c69bec..0a2843c8 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -283,10 +283,8 @@ export default ({
             const message = chatInput.current.value
             if (message) {
               setSendHistory([...sendHistoryRef.current, message])
-              const result = sendMessage?.(message)
-              if (result !== false) {
-                onClose?.()
-              }
+              onClose?.()
+              sendMessage?.(message)
               // Always scroll to bottom after sending a message
               scrollToBottom()
             }
diff --git a/src/react/ConnectOnlyServerUi.tsx b/src/react/ConnectOnlyServerUi.tsx
new file mode 100644
index 00000000..213fa19b
--- /dev/null
+++ b/src/react/ConnectOnlyServerUi.tsx
@@ -0,0 +1,80 @@
+import { useMemo } from 'react'
+import { useSnapshot } from 'valtio'
+import { appQueryParams } from '../appParams'
+import { ConnectOptions } from '../connect'
+import { lastConnectOptions } from './AppStatusProvider'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+import { useIsModalActive } from './utilsApp'
+import Button from './Button'
+
+const VERTICAL_LAYOUT = false
+
+export default () => {
+  const { ip, version, proxy, username, connectText } = appQueryParams
+  const isModalActive = useIsModalActive('only-connect-server')
+
+  if (!isModalActive) return null
+
+  const handleConnect = () => {
+    const connectOptions: ConnectOptions = {
+      username: username || '',
+      server: ip,
+      proxy,
+      botVersion: version,
+    }
+    window.dispatchEvent(new CustomEvent('connect', { detail: connectOptions }))
+  }
+
+  return (
+    <div style={{
+      position: 'fixed',
+      top: 0,
+      left: 0,
+      width: '100%',
+      height: '100%',
+      background: 'rgba(0, 0, 0, 0.25)',
+      zIndex: 1000,
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center'
+    }}>
+      <div style={{
+        display: 'flex',
+        gap: '40px',
+        alignItems: 'center',
+        background: 'rgba(0, 0, 0, 0.5)',
+        padding: VERTICAL_LAYOUT ? '15px 40px' : '25px',
+        // paddingRight: VERTICAL_LAYOUT ? '0' : '40px',
+        borderRadius: '5px',
+        flexDirection: VERTICAL_LAYOUT ? 'column' : 'row',
+      }}>
+        <div style={{
+          color: 'white',
+          fontSize: '13px'
+        }}>
+          <div style={{ display: 'flex', alignItems: 'center', marginBottom: '10px' }}>
+            <PixelartIcon iconName={pixelartIcons.server} width={16} />
+            <span style={{ marginLeft: '8px' }}>{ip}</span>
+            {proxy && <span style={{ marginLeft: '8px', color: 'lightgray' }}>({proxy})</span>}
+          </div>
+          <div style={{ display: 'flex', alignItems: 'center' }}>
+            <PixelartIcon iconName={pixelartIcons.user} width={16} />
+            <span style={{ marginLeft: '8px' }}>{username}</span>
+            {version && <span style={{ marginLeft: '8px', color: 'lightgray' }}>({version})</span>}
+          </div>
+        </div>
+        <Button
+          onClick={handleConnect}
+          style={{
+            width: 'auto',
+            padding: '0 12px',
+            transform: 'scale(1.4)',
+            transformOrigin: 'center'
+          }}
+        >
+          {connectText || 'Connect'}
+        </Button>
+      </div>
+    </div>
+  )
+}
diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 85c5367e..7ed257c0 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -1,7 +1,9 @@
 import React from 'react'
 import { openURL } from 'renderer/viewer/lib/simpleUtils'
+import { useSnapshot } from 'valtio'
 import { haveDirectoryPicker } from '../utils'
 import { ConnectOptions } from '../connect'
+import { miscUiState } from '../globalState'
 import styles from './mainMenu.module.css'
 import Button from './Button'
 import ButtonWithTooltip from './ButtonWithTooltip'
@@ -44,6 +46,8 @@ export default ({
   bottomRightLinks,
   singleplayerAvailable = true
 }: Props) => {
+  const { appConfig } = useSnapshot(miscUiState)
+
   if (!bottomRightLinks?.trim()) bottomRightLinks = undefined
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
   const linksParsed = bottomRightLinks?.split(/;|\n/g).map(l => {
@@ -89,7 +93,7 @@ export default ({
       <div className={styles['game-title']}>
         <div className={styles.minecraft}>
           <div className={styles.edition} />
-          <span className={styles.splash}>Prismarine is a beautiful block</span>
+          <span className={styles.splash}>{appConfig?.splashText}</span>
         </div>
       </div>
 
@@ -177,7 +181,7 @@ export default ({
               </div>
             })}
           </div>
-          <span>A Minecraft client clone in the browser!</span>
+          <span>{appConfig?.rightSideText}</span>
         </span>
       </div>
     </div>
diff --git a/src/react/NotificationProvider.tsx b/src/react/NotificationProvider.tsx
index 6460c0e9..8a8e4df6 100644
--- a/src/react/NotificationProvider.tsx
+++ b/src/react/NotificationProvider.tsx
@@ -25,7 +25,8 @@ export const showNotification = (
   isError = false,
   icon = '',
   action = undefined as (() => void) | undefined,
-  autoHide = true
+  autoHide = true,
+  id = ''
 ) => {
   notificationProxy.message = message
   notificationProxy.subMessage = subMessage
@@ -34,11 +35,14 @@ export const showNotification = (
   notificationProxy.open = true
   notificationProxy.autoHide = autoHide
   notificationProxy.action = action
+  notificationProxy.id = id
 }
 globalThis.showNotification = showNotification
-export const hideNotification = () => {
-  // openNotification('') // reset
-  notificationProxy.open = false
+export const hideNotification = (id?: string) => {
+  if (id === undefined || notificationProxy.id === id) {
+    // openNotification('') // reset
+    notificationProxy.open = false
+  }
 }
 
 export default () => {
@@ -47,7 +51,7 @@ export default () => {
   useEffect(() => {
     if (autoHide && open) {
       setTimeout(() => {
-        hideNotification()
+        hideNotification(notificationProxy.id)
       }, 7000)
     }
   }, [autoHide, open])
diff --git a/src/react/VoiceMicrophone.tsx b/src/react/VoiceMicrophone.tsx
new file mode 100644
index 00000000..af2c3fc2
--- /dev/null
+++ b/src/react/VoiceMicrophone.tsx
@@ -0,0 +1,77 @@
+import { proxy, useSnapshot } from 'valtio'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+
+export const voiceChatStatus = proxy({
+  active: false,
+  muted: false,
+  hasInputVoice: false,
+  isErrored: false,
+  isConnected: false,
+  isAlone: false,
+
+  isSharingScreen: false,
+})
+
+window.voiceChatStatus = voiceChatStatus
+
+const Icon = () => {
+  return <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path fill="currentColor" d="M9 14H8v-2h3v-1H8V9h3V8H8V6h3V5H8V3h1V2h1V1h4v1h1v1h1v2h-3v1h3v2h-3v1h3v2h-3v1h3v2h-1v1h-1v1h-4v-1H9z" />
+    <path fill="currentColor" d="M19 12v3h-1v2h-1v1h-2v1h-2v2h3v2H8v-2h3v-2H9v-1H7v-1H6v-2H5v-3h1v2h1v2h1v1h2v1h4v-1h2v-1h1v-2h1v-2z" />
+  </svg>
+}
+
+export default () => {
+  const SIZE = 48
+  const { active, muted, hasInputVoice, isSharingScreen, isConnected, isErrored, isAlone } = useSnapshot(voiceChatStatus)
+  if (!active) return null
+
+  const getRingColor = () => {
+    if (isErrored) return 'rgba(214, 4, 4, 0.5)' // red with opacity
+    if (isConnected) {
+      if (isAlone) return 'rgba(183, 255, 0, 0.5)' // lime yellow
+      return 'rgba(50, 205, 50, 0.5)' // green with opacity
+    }
+    return 'rgba(128, 128, 128, 0.5)' // gray with opacity
+  }
+
+  return (
+    <div
+      className='voice-chat-microphone'
+      onClick={() => {
+        // toggleMicrophoneMuted()
+      }}
+    >
+      <div style={{
+        position: 'fixed',
+        bottom: '20px',
+        zIndex: 10,
+        left: '20px',
+        width: SIZE,
+        height: SIZE,
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        color: muted ? 'rgb(214 4 4)' : hasInputVoice ? '#32cd32' : '#ffffff',
+        border: `2px solid ${getRingColor()}`,
+        borderRadius: '50%',
+        boxShadow: '0 2px 8px rgba(0, 0, 0, 0.2)',
+        transition: 'background-color 0.2s ease',
+      }}>
+        <Icon />
+      </div>
+      {/* stop sharing screen */}
+      {isSharingScreen && <div style={{
+        position: 'fixed',
+        bottom: '20px',
+        left: '20px',
+        width: SIZE,
+        height: SIZE,
+        display: 'flex',
+        alignItems: 'center',
+      }}>
+        <PixelartIcon iconName={pixelartIcons.cast} /> Stop Sharing Screen
+      </div>}
+    </div>
+  )
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 93db7706..04a02ec8 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -54,6 +54,8 @@ import { useAppScale } from './scaleInterface'
 import PacketsReplayProvider from './react/PacketsReplayProvider'
 import TouchInteractionHint from './react/TouchInteractionHint'
 import { ua } from './react/utils'
+import VoiceMicrophone from './react/VoiceMicrophone'
+import ConnectOnlyServerUi from './react/ConnectOnlyServerUi'
 import ControDebug from './react/ControDebug'
 import ChunksDebug from './react/ChunksDebug'
 import ChunksDebugScreen from './react/ChunksDebugScreen'
@@ -159,6 +161,7 @@ const InGameUi = () => {
           {!disabledUiParts.includes('crosshair') && <Crosshair />}
           {!disabledUiParts.includes('books') && <BookProvider />}
           {!disabledUiParts.includes('bossbars') && displayBossBars && <BossBarOverlayProvider />}
+          <VoiceMicrophone />
           <ChunksDebugScreen />
         </PerComponentErrorBoundary>
       </div>
@@ -227,6 +230,7 @@ const App = () => {
             <ServersListProvider />
             <OptionsRenderApp />
             <MainMenuRenderApp />
+            <ConnectOnlyServerUi />
             <TouchAreasControlsProvider />
             <SignInMessageProvider />
             <PacketsReplayProvider />
diff --git a/src/screens.css b/src/screens.css
index 289fe129..8d9c2b75 100644
--- a/src/screens.css
+++ b/src/screens.css
@@ -17,6 +17,7 @@
     inset: 0;
     height: 100dvh;
     background: rgba(0, 0, 0, 0.75);
+    z-index: 12;
 }
 
 .fullscreen {
diff --git a/src/shims/patchShims.ts b/src/shims/patchShims.ts
index 1890edf6..4a374b7e 100644
--- a/src/shims/patchShims.ts
+++ b/src/shims/patchShims.ts
@@ -1,5 +1,7 @@
 import { EventEmitter } from 'events'
 
+EventEmitter.defaultMaxListeners = 200
+
 const oldEmit = EventEmitter.prototype.emit
 EventEmitter.prototype.emit = function (...args) {
   if (args[0] === 'error' && !this._events.error) {

From a7c35df95984702d3b88fca48412b1f9889271a6 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Apr 2025 17:46:10 +0300
Subject: [PATCH 469/753] fix: fix movement sound

---
 src/sounds/botSoundSystem.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 882fd2b7..33ad42e0 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -134,10 +134,12 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
   const movementHappening = async () => {
     if (!bot.entity || !soundMap) return // no info yet
     const VELOCITY_THRESHOLD = 0.1
+    const RUN_THRESHOLD = 0.15
     const { x, z, y } = bot.entity.velocity
-    if (bot.entity.onGround && Math.abs(x) < VELOCITY_THRESHOLD && (Math.abs(z) > VELOCITY_THRESHOLD || Math.abs(y) > VELOCITY_THRESHOLD)) {
+    if (bot.entity.onGround && (Math.abs(x) > VELOCITY_THRESHOLD || Math.abs(z) > VELOCITY_THRESHOLD)) {
+      const isRunning = (Math.abs(x) > RUN_THRESHOLD || Math.abs(z) > RUN_THRESHOLD)
       // movement happening
-      if (Date.now() - lastStepSound > 300) {
+      if (Date.now() - lastStepSound > (isRunning ? 100 : 300)) {
         const blockUnder = bot.world.getBlock(bot.entity.position.offset(0, -1, 0))
         if (blockUnder) {
           const stepSound = soundMap.getStepSound(blockUnder.name)

From 9646fbbc0f3d655606035daa8c0575109969c354 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Apr 2025 23:42:51 +0300
Subject: [PATCH 470/753] fix(regression): hotbar switch on mobile was broken

---
 src/react/HotbarRenderApp.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index e1eeb47a..84dc11e2 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -81,6 +81,9 @@ const HotbarInner = () => {
     const controller = new AbortController()
 
     const inv = openItemsCanvas('HotbarWin', {
+      _client: {
+        write () {}
+      },
       clickWindow (slot, mouseButton, mode) {
         if (mouseButton === 1) {
           console.log('right click')

From dbfd2b23f62b82cc6892dc898f60f949613a5f7c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Apr 2025 23:43:26 +0300
Subject: [PATCH 471/753] up physics

---
 package.json   |  2 +-
 pnpm-lock.yaml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index ee07230d..2a92c0a1 100644
--- a/package.json
+++ b/package.json
@@ -195,7 +195,7 @@
   },
   "pnpm": {
     "overrides": {
-      "@nxg-org/mineflayer-physics-util": "1.8.6",
+      "@nxg-org/mineflayer-physics-util": "1.8.7",
       "buffer": "^6.0.3",
       "vec3": "0.1.10",
       "three": "0.154.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d7b1da61..120e5646 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,7 +5,7 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
-  '@nxg-org/mineflayer-physics-util': 1.8.6
+  '@nxg-org/mineflayer-physics-util': 1.8.7
   buffer: ^6.0.3
   vec3: 0.1.10
   three: 0.154.0
@@ -2025,8 +2025,8 @@ packages:
   '@nxg-org/mineflayer-auto-jump@0.7.12':
     resolution: {integrity: sha512-F5vX/lerlWx/5HVlkDNbvrtQ19PL6iG8i4ItPTIRtjGiFzusDefP7DI226zSFR8Wlaw45qHv0jn814p/4/qVdQ==}
 
-  '@nxg-org/mineflayer-physics-util@1.8.6':
-    resolution: {integrity: sha512-eRn9e9OMvl1+kEfwPPshAl1A5MX0eDWaI7WVRf7ht9qo9N3fKiw+mM/AGPuhVjEr16zUls77P6Sn9cVZJuUdlw==}
+  '@nxg-org/mineflayer-physics-util@1.8.7':
+    resolution: {integrity: sha512-wtLYvHqoEFr/j0ny2lyogwjbMvwpFuG2aWI8sI14+EAiGFRpL5+cog2ujSDsnRTZruO7tUXMTiPc1kebjXwfJg==}
 
   '@nxg-org/mineflayer-tracker@1.2.1':
     resolution: {integrity: sha512-SI1ffF8zvg3/ZNE021Ja2W0FZPN+WbQDZf8yFqOcXtPRXAtM9W6HvoACdzXep8BZid7WYgYLIgjKpB+9RqvCNQ==}
@@ -11353,10 +11353,10 @@ snapshots:
 
   '@nxg-org/mineflayer-auto-jump@0.7.12':
     dependencies:
-      '@nxg-org/mineflayer-physics-util': 1.8.6
+      '@nxg-org/mineflayer-physics-util': 1.8.7
       strict-event-emitter-types: 2.0.0
 
-  '@nxg-org/mineflayer-physics-util@1.8.6':
+  '@nxg-org/mineflayer-physics-util@1.8.7':
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
 
@@ -17437,7 +17437,7 @@ snapshots:
 
   mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13):
     dependencies:
-      '@nxg-org/mineflayer-physics-util': 1.8.6
+      '@nxg-org/mineflayer-physics-util': 1.8.7
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)

From c3112794c070615d76d19e9351ed96149c78f901 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 19 Apr 2025 00:07:41 +0300
Subject: [PATCH 472/753] try to fix scroll chat bug

---
 src/react/hooks/useScrollBehavior.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/react/hooks/useScrollBehavior.ts b/src/react/hooks/useScrollBehavior.ts
index c7c4499a..3b9499a6 100644
--- a/src/react/hooks/useScrollBehavior.ts
+++ b/src/react/hooks/useScrollBehavior.ts
@@ -23,6 +23,13 @@ export const useScrollBehavior = (
   const scrollToBottom = () => {
     if (elementRef.current) {
       elementRef.current.scrollTop = elementRef.current.scrollHeight
+      setTimeout(() => {
+        if (!elementRef.current) return
+        elementRef.current.scrollTo({
+          top: elementRef.current.scrollHeight,
+          behavior: 'instant'
+        })
+      }, 0)
     }
   }
 

From 193c748feb6f4487c260b6f99ea1d0de3c667c92 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 19 Apr 2025 00:43:20 +0300
Subject: [PATCH 473/753] fix: add chunks a little faster on low tier devices:
 use indicies

---
 renderer/viewer/lib/mesher/models.ts        | 40 ++++++++++++++-------
 renderer/viewer/lib/mesher/shared.ts        |  3 +-
 renderer/viewer/three/worldrendererThree.ts |  2 +-
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index 66b1fe58..1fc5acda 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -423,13 +423,19 @@ function renderElement (world: World, cursor: Vec3, element: BlockElement, doAO:
 
     if (!needTiles) {
       if (doAO && aos[0] + aos[3] >= aos[1] + aos[2]) {
-        attr.indices.push(
-          ndx, ndx + 3, ndx + 2, ndx, ndx + 1, ndx + 3
-        )
+        attr.indices[attr.indicesCount++] = ndx
+        attr.indices[attr.indicesCount++] = ndx + 3
+        attr.indices[attr.indicesCount++] = ndx + 2
+        attr.indices[attr.indicesCount++] = ndx
+        attr.indices[attr.indicesCount++] = ndx + 1
+        attr.indices[attr.indicesCount++] = ndx + 3
       } else {
-        attr.indices.push(
-          ndx, ndx + 1, ndx + 2, ndx + 2, ndx + 1, ndx + 3
-        )
+        attr.indices[attr.indicesCount++] = ndx
+        attr.indices[attr.indicesCount++] = ndx + 1
+        attr.indices[attr.indicesCount++] = ndx + 2
+        attr.indices[attr.indicesCount++] = ndx + 2
+        attr.indices[attr.indicesCount++] = ndx + 1
+        attr.indices[attr.indicesCount++] = ndx + 3
       }
     }
   }
@@ -462,7 +468,8 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
     t_normals: [],
     t_colors: [],
     t_uvs: [],
-    indices: [],
+    indices: new Uint32Array(442_368), // Maximum possible indices
+    indicesCount: 0, // Track current index position
     tiles: {},
     // todo this can be removed here
     heads: {},
@@ -605,12 +612,19 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
 
   let ndx = attr.positions.length / 3
   for (let i = 0; i < attr.t_positions!.length / 12; i++) {
-    attr.indices.push(
-      ndx, ndx + 1, ndx + 2, ndx + 2, ndx + 1, ndx + 3,
-      // eslint-disable-next-line @stylistic/function-call-argument-newline
-      // back face
-      ndx, ndx + 2, ndx + 1, ndx + 2, ndx + 3, ndx + 1
-    )
+    attr.indices[attr.indicesCount++] = ndx
+    attr.indices[attr.indicesCount++] = ndx + 1
+    attr.indices[attr.indicesCount++] = ndx + 2
+    attr.indices[attr.indicesCount++] = ndx + 2
+    attr.indices[attr.indicesCount++] = ndx + 1
+    attr.indices[attr.indicesCount++] = ndx + 3
+    // back face
+    attr.indices[attr.indicesCount++] = ndx
+    attr.indices[attr.indicesCount++] = ndx + 2
+    attr.indices[attr.indicesCount++] = ndx + 1
+    attr.indices[attr.indicesCount++] = ndx + 2
+    attr.indices[attr.indicesCount++] = ndx + 3
+    attr.indices[attr.indicesCount++] = ndx + 1
     ndx += 4
   }
 
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index 0e36c73b..1ebbb087 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -33,7 +33,8 @@ export type MesherGeometryOutput = {
   t_colors?: number[],
   t_uvs?: number[],
 
-  indices: number[],
+  indices: Uint32Array,
+  indicesCount: number,
   tiles: Record<string, BlockType>,
   heads: Record<string, any>,
   signs: Record<string, any>,
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 482b0255..3d03dc47 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -333,7 +333,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     geometry.setAttribute('normal', new THREE.BufferAttribute(data.geometry.normals, 3))
     geometry.setAttribute('color', new THREE.BufferAttribute(data.geometry.colors, 3))
     geometry.setAttribute('uv', new THREE.BufferAttribute(data.geometry.uvs, 2))
-    geometry.setIndex(data.geometry.indices)
+    geometry.index = new THREE.Uint16BufferAttribute(data.geometry.indices, 1)
 
     const mesh = new THREE.Mesh(geometry, this.material)
     mesh.position.set(data.geometry.sx, data.geometry.sy, data.geometry.sz)

From a0bfa275afc9b5427ed082be7e01e86dc8fe1b88 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 19 Apr 2025 00:43:31 +0300
Subject: [PATCH 474/753] lets be safer and use 32array

---
 renderer/viewer/lib/mesher/models.ts        | 1 +
 renderer/viewer/lib/mesher/shared.ts        | 1 +
 renderer/viewer/three/worldrendererThree.ts | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index 1fc5acda..c5d34e9d 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -470,6 +470,7 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
     t_uvs: [],
     indices: new Uint32Array(442_368), // Maximum possible indices
     indicesCount: 0, // Track current index position
+    using32Array: true,
     tiles: {},
     // todo this can be removed here
     heads: {},
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index 1ebbb087..ea56e016 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -35,6 +35,7 @@ export type MesherGeometryOutput = {
 
   indices: Uint32Array,
   indicesCount: number,
+  using32Array: boolean,
   tiles: Record<string, BlockType>,
   heads: Record<string, any>,
   signs: Record<string, any>,
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 3d03dc47..bb4c1805 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -333,7 +333,11 @@ export class WorldRendererThree extends WorldRendererCommon {
     geometry.setAttribute('normal', new THREE.BufferAttribute(data.geometry.normals, 3))
     geometry.setAttribute('color', new THREE.BufferAttribute(data.geometry.colors, 3))
     geometry.setAttribute('uv', new THREE.BufferAttribute(data.geometry.uvs, 2))
-    geometry.index = new THREE.Uint16BufferAttribute(data.geometry.indices, 1)
+    if (data.geometry.using32Array) {
+      geometry.index = new THREE.Uint32BufferAttribute(data.geometry.indices, 1)
+    } else {
+      geometry.index = new THREE.Uint16BufferAttribute(data.geometry.indices, 1)
+    }
 
     const mesh = new THREE.Mesh(geometry, this.material)
     mesh.position.set(data.geometry.sx, data.geometry.sy, data.geometry.sz)

From 2b881ea5ba135f488c8533bed4a449ba67dfc59d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 21 Apr 2025 16:06:01 +0300
Subject: [PATCH 475/753] fix: disable physics for viewer

---
 src/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/index.ts b/src/index.ts
index 3da14257..ecc824b4 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -543,6 +543,7 @@ export async function connect (connectOptions: ConnectOptions) {
     window.bot = bot
     if (connectOptions.viewerWsConnect) {
       void handleCustomChannel()
+      bot.physicsEnabled = false
     }
     customEvents.emit('mineflayerBotCreated')
     if (singleplayer || p2pMultiplayer || localReplaySession) {

From 71f63a3be0bd73cf6cfc120d8c31110d9b48881b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 22 Apr 2025 19:01:04 +0300
Subject: [PATCH 476/753] sync fork: add loading timer for debug, better
 connecting messages, better recording panel

---
 src/appConfig.ts                           |   8 ++
 src/entities.ts                            |   3 +-
 src/index.ts                               |  15 ++-
 src/mineflayer/entityStatus.ts             |  70 ++++++++++++++
 src/mineflayer/mc-protocol.ts              |  14 ++-
 src/mineflayer/plugins/packetsRecording.ts |  17 ++++
 src/optionsStorage.ts                      |  12 ++-
 src/packetsReplay/packetsReplayLegacy.ts   |   2 +-
 src/react/AppStatus.tsx                    | 103 +++++++++++----------
 src/react/AppStatusProvider.tsx            |   3 +-
 src/react/DebugOverlay.tsx                 |   6 +-
 src/react/HotbarRenderApp.tsx              |   3 -
 src/react/LoadingTimer.tsx                 |  50 ++++++++++
 src/react/PauseScreen.tsx                  |   2 +
 src/react/ReplayPanel.tsx                  |  20 +++-
 src/react/ServersListProvider.tsx          |  38 ++++++++
 src/react/components/replay/PacketList.tsx |  13 +--
 src/react/state/packetsReplayState.ts      |   1 +
 src/scaleInterface.ts                      |   1 +
 src/screens.css                            |  16 ++++
 src/shims/dns.js                           |  10 +-
 21 files changed, 335 insertions(+), 72 deletions(-)
 create mode 100644 src/mineflayer/entityStatus.ts
 create mode 100644 src/react/LoadingTimer.tsx

diff --git a/src/appConfig.ts b/src/appConfig.ts
index c5b61b69..531c258d 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -1,7 +1,9 @@
+import { defaultsDeep } from 'lodash'
 import { disabledSettings, options, qsOptions } from './optionsStorage'
 import { miscUiState } from './globalState'
 import { setLoadingScreenStatus } from './appStatus'
 import { setStorageDataOnAppConfigLoad } from './react/appStorageProvider'
+import { customKeymaps, updateBinds } from './controls'
 
 export type AppConfig = {
   // defaultHost?: string
@@ -23,6 +25,7 @@ export type AppConfig = {
   allowAutoConnect?: boolean
   splashText?: string
   pauseLinks?: Array<Array<Record<string, any>>>
+  keybindings?: Record<string, any>
 }
 
 export const loadAppConfig = (appConfig: AppConfig) => {
@@ -46,6 +49,11 @@ export const loadAppConfig = (appConfig: AppConfig) => {
     }
   }
 
+  if (appConfig.keybindings) {
+    Object.assign(customKeymaps, defaultsDeep(appConfig.keybindings, customKeymaps))
+    updateBinds(customKeymaps)
+  }
+
   setStorageDataOnAppConfigLoad()
 }
 
diff --git a/src/entities.ts b/src/entities.ts
index 9ba31f2e..68e18df3 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -6,6 +6,7 @@ import { subscribeKey } from 'valtio/utils'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import { options, watchValue } from './optionsStorage'
 import { miscUiState } from './globalState'
+import { EntityStatus } from './mineflayer/entityStatus'
 
 
 const updateAutoJump = () => {
@@ -85,7 +86,7 @@ customEvents.on('gameLoaded', () => {
   bot._client.on('entity_status', (data) => {
     if (versionToNumber(bot.version) >= versionToNumber('1.19.4')) return
     const { entityId, entityStatus } = data
-    if (entityStatus === 2) {
+    if (entityStatus === EntityStatus.HURT) {
       getThreeJsRendererMethods()?.damageEntity(entityId, entityStatus)
     }
   })
diff --git a/src/index.ts b/src/index.ts
index ecc824b4..a94aa35d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -93,11 +93,12 @@ import ping from './mineflayer/plugins/ping'
 import mouse from './mineflayer/plugins/mouse'
 import { startLocalReplayServer } from './packetsReplay/replayPackets'
 import { localRelayServerPlugin } from './mineflayer/plugins/packetsRecording'
-import { createConsoleLogProgressReporter, createFullScreenProgressReporter, ProgressReporter } from './core/progressReporter'
+import { createConsoleLogProgressReporter, createFullScreenProgressReporter, createWrappedProgressReporter, ProgressReporter } from './core/progressReporter'
 import { appViewer } from './appViewer'
 import './appViewerLoad'
 import { registerOpenBenchmarkListener } from './benchmark'
 import { tryHandleBuiltinCommand } from './builtinCommands'
+import { loadingTimerState } from './react/LoadingTimer'
 
 window.debug = debug
 window.beforeRenderFrame = []
@@ -168,6 +169,8 @@ export async function connect (connectOptions: ConnectOptions) {
     })
   }
 
+  loadingTimerState.loading = true
+  loadingTimerState.start = Date.now()
   miscUiState.hasErrors = false
   lastConnectOptions.value = connectOptions
 
@@ -211,6 +214,7 @@ export async function connect (connectOptions: ConnectOptions) {
   let bot!: typeof __type_bot
   const destroyAll = (wasKicked = false) => {
     if (ended) return
+    loadingTimerState.loading = false
     const hadConnected = !!bot
     if (!wasKicked && miscUiState.appConfig?.allowAutoConnect && appQueryParams.autoConnect && hadConnected) {
       location.reload()
@@ -302,10 +306,12 @@ export async function connect (connectOptions: ConnectOptions) {
     Object.assign(serverOptions, connectOptions.serverOverridesFlat ?? {})
 
     await progress.executeWithMessage('Downloading minecraft data', 'download-mcdata', async () => {
+      loadingTimerState.networkOnlyStart = Date.now()
       await Promise.all([
         downloadAllMinecraftData(),
         downloadOtherGameData()
       ])
+      loadingTimerState.networkOnlyStart = 0
     })
 
     let dataDownloaded = false
@@ -401,8 +407,10 @@ export async function connect (connectOptions: ConnectOptions) {
     } else if (connectOptions.server) {
       if (!finalVersion) {
         const versionAutoSelect = getVersionAutoSelect()
-        setLoadingScreenStatus(`Fetching server version. Preffered: ${versionAutoSelect}`)
+        const wrapped = createWrappedProgressReporter(progress, `Fetching server version. Preffered: ${versionAutoSelect}`)
+        loadingTimerState.networkOnlyStart = Date.now()
         const autoVersionSelect = await getServerInfo(server.host, server.port ? Number(server.port) : undefined, versionAutoSelect)
+        wrapped.end()
         finalVersion = autoVersionSelect.version
       }
       initialLoadingText = `Connecting to server ${server.host}:${server.port ?? 25_565} with version ${finalVersion}`
@@ -416,6 +424,7 @@ export async function connect (connectOptions: ConnectOptions) {
     setLoadingScreenStatus(initialLoadingText)
 
     if (parsedServer.isWebSocket) {
+      loadingTimerState.networkOnlyStart = Date.now()
       clientDataStream = (await getWebsocketStream(server.host)).mineflayerStream
     }
 
@@ -459,6 +468,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
     if (finalVersion) {
       // ensure data is downloaded
+      loadingTimerState.networkOnlyStart ??= Date.now()
       await downloadMcData(finalVersion)
     }
 
@@ -672,6 +682,7 @@ export async function connect (connectOptions: ConnectOptions) {
   onBotCreate()
 
   bot.once('login', () => {
+    loadingTimerState.networkOnlyStart = 0
     setLoadingScreenStatus('Loading world')
   })
 
diff --git a/src/mineflayer/entityStatus.ts b/src/mineflayer/entityStatus.ts
new file mode 100644
index 00000000..e13784bc
--- /dev/null
+++ b/src/mineflayer/entityStatus.ts
@@ -0,0 +1,70 @@
+export const EntityStatus = {
+  JUMP: 1,
+  HURT: 2, // legacy
+  DEATH: 3,
+  START_ATTACKING: 4,
+  STOP_ATTACKING: 5,
+  TAMING_FAILED: 6,
+  TAMING_SUCCEEDED: 7,
+  SHAKE_WETNESS: 8,
+  USE_ITEM_COMPLETE: 9,
+  EAT_GRASS: 10,
+  OFFER_FLOWER: 11,
+  LOVE_HEARTS: 12,
+  VILLAGER_ANGRY: 13,
+  VILLAGER_HAPPY: 14,
+  WITCH_HAT_MAGIC: 15,
+  ZOMBIE_CONVERTING: 16,
+  FIREWORKS_EXPLODE: 17,
+  IN_LOVE_HEARTS: 18,
+  SQUID_ANIM_SYNCH: 19,
+  SILVERFISH_MERGE_ANIM: 20,
+  GUARDIAN_ATTACK_SOUND: 21,
+  REDUCED_DEBUG_INFO: 22,
+  FULL_DEBUG_INFO: 23,
+  PERMISSION_LEVEL_ALL: 24,
+  PERMISSION_LEVEL_MODERATORS: 25,
+  PERMISSION_LEVEL_GAMEMASTERS: 26,
+  PERMISSION_LEVEL_ADMINS: 27,
+  PERMISSION_LEVEL_OWNERS: 28,
+  ATTACK_BLOCKED: 29,
+  SHIELD_DISABLED: 30,
+  FISHING_ROD_REEL_IN: 31,
+  ARMORSTAND_WOBBLE: 32,
+  THORNED: 33, // legacy
+  STOP_OFFER_FLOWER: 34,
+  TALISMAN_ACTIVATE: 35, // legacy
+  DROWNED: 36, // legacy
+  BURNED: 37, // legacy
+  DOLPHIN_LOOKING_FOR_TREASURE: 38,
+  RAVAGER_STUNNED: 39,
+  TRUSTING_FAILED: 40,
+  TRUSTING_SUCCEEDED: 41,
+  VILLAGER_SWEAT: 42,
+  BAD_OMEN_TRIGGERED: 43, // legacy
+  POKED: 44, // legacy
+  FOX_EAT: 45,
+  TELEPORT: 46,
+  MAINHAND_BREAK: 47,
+  OFFHAND_BREAK: 48,
+  HEAD_BREAK: 49,
+  CHEST_BREAK: 50,
+  LEGS_BREAK: 51,
+  FEET_BREAK: 52,
+  HONEY_SLIDE: 53,
+  HONEY_JUMP: 54,
+  SWAP_HANDS: 55,
+  CANCEL_SHAKE_WETNESS: 56,
+  FROZEN: 57, // legacy
+  START_RAM: 58,
+  END_RAM: 59,
+  POOF: 60,
+  TENDRILS_SHIVER: 61,
+  SONIC_CHARGE: 62,
+  SNIFFER_DIGGING_SOUND: 63,
+  ARMADILLO_PEEK: 64,
+  BODY_BREAK: 65,
+  SHAKE: 66
+} as const
+
+export type EntityStatusName = keyof typeof EntityStatus
diff --git a/src/mineflayer/mc-protocol.ts b/src/mineflayer/mc-protocol.ts
index 63a90fa4..2376cd03 100644
--- a/src/mineflayer/mc-protocol.ts
+++ b/src/mineflayer/mc-protocol.ts
@@ -2,6 +2,7 @@ import { Client } from 'minecraft-protocol'
 import { appQueryParams } from '../appParams'
 import { downloadAllMinecraftData, getVersionAutoSelect } from '../connect'
 import { gameAdditionalState } from '../globalState'
+import { ProgressReporter } from '../core/progressReporter'
 import { pingServerVersion, validatePacket } from './minecraft-protocol-extra'
 import { getWebsocketStream } from './websocket-core'
 
@@ -34,16 +35,27 @@ setInterval(() => {
 }, 1000)
 
 
-export const getServerInfo = async (ip: string, port?: number, preferredVersion = getVersionAutoSelect(), ping = false) => {
+export const getServerInfo = async (ip: string, port?: number, preferredVersion = getVersionAutoSelect(), ping = false, progressReporter?: ProgressReporter) => {
   await downloadAllMinecraftData()
   const isWebSocket = ip.startsWith('ws://') || ip.startsWith('wss://')
   let stream
   if (isWebSocket) {
+    progressReporter?.setMessage('Connecting to WebSocket server')
     stream = (await getWebsocketStream(ip)).mineflayerStream
+    progressReporter?.setMessage('WebSocket connected. Ping packet sent, waiting for response')
+  }
+  window.setLoadingMessage = (message?: string) => {
+    if (message === undefined) {
+      progressReporter?.endStage('dns')
+    } else {
+      progressReporter?.beginStage('dns', message)
+    }
   }
   return pingServerVersion(ip, port, {
     ...(stream ? { stream } : {}),
     ...(ping ? { noPongTimeout: 3000 } : {}),
     ...(preferredVersion ? { version: preferredVersion } : {}),
+  }).finally(() => {
+    window.setLoadingMessage = undefined
   })
 }
diff --git a/src/mineflayer/plugins/packetsRecording.ts b/src/mineflayer/plugins/packetsRecording.ts
index 53a63bd8..b9ba028c 100644
--- a/src/mineflayer/plugins/packetsRecording.ts
+++ b/src/mineflayer/plugins/packetsRecording.ts
@@ -72,6 +72,7 @@ export const localRelayServerPlugin = (bot: Bot) => {
         position: position++,
         timestamp: Date.now(),
       })
+      packetsReplayState.progress.current++
     }
   })
   bot._client.on('packet', (data, { name }) => {
@@ -86,8 +87,22 @@ export const localRelayServerPlugin = (bot: Bot) => {
         position: position++,
         timestamp: Date.now(),
       })
+      packetsReplayState.progress.total++
     }
   })
+  const oldWriteChannel = bot._client.writeChannel.bind(bot._client)
+  bot._client.writeChannel = (channel, params) => {
+    packetsReplayState.packetsPlayback.push({
+      name: channel,
+      data: params,
+      isFromClient: true,
+      isUpcoming: false,
+      position: position++,
+      timestamp: Date.now(),
+      isCustomChannel: true,
+    })
+    oldWriteChannel(channel, params)
+  }
 
   upPacketsReplayPanel()
 }
@@ -95,6 +110,8 @@ export const localRelayServerPlugin = (bot: Bot) => {
 const upPacketsReplayPanel = () => {
   if (packetsRecordingState.active && bot) {
     packetsReplayState.isOpen = true
+    packetsReplayState.isMinimized = true
+    packetsReplayState.isRecording = true
     packetsReplayState.replayName = 'Recording all packets for ' + bot.username
   }
 }
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index c8e6298e..3cc91517 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -59,10 +59,11 @@ const defaultOptions = {
   serversAutoVersionSelect: 'auto' as 'auto' | 'latest' | '1.20.4' | string,
   customChannels: false,
   remoteContentNotSameOrigin: false as boolean | string[],
-  packetsReplayAutoStart: false,
+  packetsRecordingAutoStart: false,
+  locale: 'auto',
   preciseMouseInput: false,
   // todo ui setting, maybe enable by default?
-  waitForChunksRender: 'sp-only' as 'sp-only' | boolean,
+  waitForChunksRender: false as 'sp-only' | boolean,
   jeiEnabled: true as boolean | Array<'creative' | 'survival' | 'adventure' | 'spectator'>,
   preventBackgroundTimeoutKick: false,
   preventSleep: false,
@@ -293,3 +294,10 @@ export const useOptionValue = (setting, valueCallback) => {
   valueCallback(setting)
   subscribe(setting, valueCallback)
 }
+
+export const getLocale = () => {
+  if (options.locale === 'auto') {
+    return navigator.language
+  }
+  return options.locale
+}
diff --git a/src/packetsReplay/packetsReplayLegacy.ts b/src/packetsReplay/packetsReplayLegacy.ts
index dc9b7a2d..a9cc71ec 100644
--- a/src/packetsReplay/packetsReplayLegacy.ts
+++ b/src/packetsReplay/packetsReplayLegacy.ts
@@ -3,7 +3,7 @@ import { PacketsLogger } from 'mcraft-fun-mineflayer/build/packetsLogger'
 import { options } from '../optionsStorage'
 
 export const packetsRecordingState = proxy({
-  active: options.packetsReplayAutoStart,
+  active: options.packetsRecordingAutoStart,
   hasRecordedPackets: false
 })
 
diff --git a/src/react/AppStatus.tsx b/src/react/AppStatus.tsx
index c083e445..b8c7dbde 100644
--- a/src/react/AppStatus.tsx
+++ b/src/react/AppStatus.tsx
@@ -4,6 +4,7 @@ import styles from './appStatus.module.css'
 import Button from './Button'
 import Screen from './Screen'
 import LoadingChunks from './LoadingChunks'
+import LoadingTimer from './LoadingTimer'
 
 export default ({
   status,
@@ -37,57 +38,61 @@ export default ({
     void statusRunner()
   }, [])
 
+  const lockConnect = appQueryParams.lockConnect === 'true'
 
   return (
-    <Screen
-      className='small-content'
-      titleSelectable={isError}
-      title={
-        <>
-          <span style={{
-            wordBreak: 'break-word',
-            whiteSpace: 'pre-wrap',
-          }}
-          >
-            {status}
-          </span>
-          <div style={{ display: 'inline-flex', gap: '1px', }} hidden={hideDots || isError}>
-            {
-              [...'...'].map((dot, i) => {
-                return <span
-                  key={i} style={{
-                    visibility: loadingDotIndex <= i ? 'hidden' : 'visible',
-                  }}>{dot}</span>
-              })
-            }
-          </div>
-          <p className={styles.description}>{description}</p>
-          <p className={styles['last-status']}>{lastStatus ? `Last status: ${lastStatus}` : lastStatus}</p>
-        </>
-      }
-      backdrop='dirt'
-    >
-      {isError && (
-        <>
-          {showReconnect && onReconnect && <Button onClick={onReconnect}>
-            <b>Reconnect</b>
-          </Button>}
-          {actionsSlot}
-          <Button
-            onClick={() => {
-              if (location.search) {
-                location.search = ''
-              } else {
-                window.location.reload()
-              }
+    <div className=''>
+      <Screen
+        className='small-content'
+        titleSelectable={isError}
+        title={
+          <>
+            <span style={{
+              wordBreak: 'break-word',
+              whiteSpace: 'pre-wrap',
             }}
-          >
-            <b>Reset App (recommended)</b>
-          </Button>
-          {backAction && <Button label="Back" onClick={backAction} />}
-        </>
-      )}
-      {children}
-    </Screen>
+            >
+              {status}
+            </span>
+            <div style={{ display: 'inline-flex', gap: '1px', }} hidden={hideDots || isError}>
+              {
+                [...'...'].map((dot, i) => {
+                  return <span
+                    key={i} style={{
+                      visibility: loadingDotIndex <= i ? 'hidden' : 'visible',
+                    }}>{dot}</span>
+                })
+              }
+            </div>
+            <p className={styles.description}>{description}</p>
+            <p className={styles['last-status']}>{lastStatus ? `Last status: ${lastStatus}` : lastStatus}</p>
+          </>
+        }
+        backdrop='dirt'
+      >
+        {isError && (
+          <>
+            {showReconnect && onReconnect && <Button onClick={onReconnect}>
+              <b>Reconnect</b>
+            </Button>}
+            {actionsSlot}
+            {!lockConnect && <Button
+              onClick={() => {
+                if (location.search) {
+                  location.search = ''
+                } else {
+                  window.location.reload()
+                }
+              }}
+            >
+              <b>Reset App (recommended)</b>
+            </Button>}
+            {backAction && <Button label="Back" onClick={backAction} />}
+          </>
+        )}
+        {children}
+        <LoadingTimer />
+      </Screen>
+    </div>
   )
 }
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index 24fb91e7..4a81f88e 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -127,7 +127,8 @@ export default () => {
   }, [])
 
   const displayAuthButton = status.includes('This server appears to be an online server and you are providing no authentication.')
-  const displayVpnButton = status.includes('VPN') || status.includes('Proxy')
+  const hasVpnText = (text: string) => text.includes('VPN') || text.includes('Proxy')
+  const displayVpnButton = hasVpnText(status) || (minecraftJsonMessage && hasVpnText(JSON.stringify(minecraftJsonMessage)))
   const authReconnectAction = async () => {
     let accounts = [] as AuthenticatedAccount[]
     updateAuthenticatedAccountData(oldAccounts => {
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index 610bcea9..a7eb068f 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -39,6 +39,7 @@ export default () => {
   const [cursorBlock, setCursorBlock] = useState<Block | null>(null)
   const [blockInfo, setBlockInfo] = useState<{ customBlockName?: string, modelInfo?: BlockStateModelInfo } | null>(null)
   const [clientTps, setClientTps] = useState(0)
+  const [serverTps, setServerTps] = useState(null as null | { value: number, frozen: boolean })
   const minecraftYaw = useRef(0)
   const minecraftQuad = useRef(0)
   const rendererDevice = appViewer.rendererState.renderer ?? 'No render backend'
@@ -155,6 +156,9 @@ export default () => {
       sent.current.count++
       managePackets('sent', name, data)
     })
+    bot._client.on('set_ticking_state' as any, (data) => {
+      setServerTps({ value: data.tick_rate, frozen: data.is_frozen })
+    })
 
     return () => {
       document.removeEventListener('keydown', handleF3)
@@ -182,7 +186,7 @@ export default () => {
       <p>Chunk: {Math.floor(pos.x % 16)} ~ {Math.floor(pos.z % 16)} in {Math.floor(pos.x / 16)} ~ {Math.floor(pos.z / 16)}</p>
       <p>Section: {Math.floor(pos.x / 16) * 16}, {Math.floor(pos.y / 16) * 16}, {Math.floor(pos.z / 16) * 16}</p>
       <p>Packets: {packetsString}</p>
-      <p>Client TPS: {clientTps}</p>
+      <p>Client TPS: {clientTps} {serverTps ? `Server TPS: ${serverTps.value} ${serverTps.frozen ? '(frozen)' : ''}` : ''}</p>
       <p>Facing (viewer): {bot.entity.yaw.toFixed(3)} {bot.entity.pitch.toFixed(3)}</p>
       <p>Facing (minecraft): {quadsDescription[minecraftQuad.current]} ({minecraftYaw.current.toFixed(1)} {(bot.entity.pitch * -180 / Math.PI).toFixed(1)})</p>
       <p>Light: {blockL} ({skyL} sky)</p>
diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index 84dc11e2..e1eeb47a 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -81,9 +81,6 @@ const HotbarInner = () => {
     const controller = new AbortController()
 
     const inv = openItemsCanvas('HotbarWin', {
-      _client: {
-        write () {}
-      },
       clickWindow (slot, mouseButton, mode) {
         if (mouseButton === 1) {
           console.log('right click')
diff --git a/src/react/LoadingTimer.tsx b/src/react/LoadingTimer.tsx
new file mode 100644
index 00000000..c0ef19d1
--- /dev/null
+++ b/src/react/LoadingTimer.tsx
@@ -0,0 +1,50 @@
+import { useEffect, useState } from 'react'
+import { createPortal } from 'react-dom'
+import { proxy, useSnapshot } from 'valtio'
+
+export const loadingTimerState = proxy({
+  start: 0,
+  loading: false,
+  total: '0.00',
+
+  networkOnlyStart: 0,
+  networkTimeTotal: '0.0'
+})
+
+customEvents.on('gameLoaded', () => {
+  loadingTimerState.loading = false
+})
+
+export default () => {
+  // const time = useSnapshot(timerState).start
+  const { networkTimeTotal, total } = useSnapshot(loadingTimerState)
+
+  useEffect(() => {
+    const interval = setInterval(() => {
+      if (!loadingTimerState.loading) return
+      if (loadingTimerState.networkOnlyStart) {
+        loadingTimerState.networkTimeTotal = ((Date.now() - loadingTimerState.networkOnlyStart) / 1000).toFixed(2)
+      } else {
+        loadingTimerState.total = ((Date.now() - loadingTimerState.start) / 1000).toFixed(2)
+      }
+    }, 100)
+    return () => clearInterval(interval)
+  }, [])
+
+  return <Portal to={document.getElementById('ui-root')!}>
+    <div style={{
+      position: 'absolute',
+      left: 0,
+      bottom: 0,
+      color: 'gray',
+      fontSize: '0.6em',
+      paddingLeft: 'calc(env(safe-area-inset-left) / 2)'
+    }}>
+      {total}/{networkTimeTotal}
+    </div>
+  </Portal>
+}
+
+const Portal = ({ children, to = document.body }) => {
+  return createPortal(children, to)
+}
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 75da9dfa..22e00ded 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -36,6 +36,7 @@ import { appStatusState, reconnectReload } from './AppStatusProvider'
 import NetworkStatus from './NetworkStatus'
 import PauseLinkButtons from './PauseLinkButtons'
 import { pixelartIcons } from './PixelartIcon'
+import LoadingTimer from './LoadingTimer'
 
 const waitForPotentialRender = async () => {
   return new Promise<void>(resolve => {
@@ -298,5 +299,6 @@ export default () => {
         </Button>
       )}
     </div>
+    <LoadingTimer />
   </Screen>
 }
diff --git a/src/react/ReplayPanel.tsx b/src/react/ReplayPanel.tsx
index 3b709882..ca7b2aec 100644
--- a/src/react/ReplayPanel.tsx
+++ b/src/react/ReplayPanel.tsx
@@ -43,7 +43,7 @@ export default function ReplayPanel ({
   style
 }: Props) {
   const [filter, setFilter] = useState(defaultFilter)
-  const { isMinimized } = useSnapshot(packetsReplayState)
+  const { isMinimized, isRecording } = useSnapshot(packetsReplayState)
   const { filtered: filteredPackets, hiddenCount } = filterPackets(packets.slice(-500), filter)
 
   useEffect(() => {
@@ -70,7 +70,9 @@ export default function ReplayPanel ({
       }}
     >
       <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor">
-        {isPlaying ? (
+        {isRecording ? (
+          <circle cx="12" cy="12" r="8" fill="red" />
+        ) : isPlaying ? (
           <path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/>
         ) : (
           <path d="M8 5v14l11-7z"/>
@@ -137,7 +139,9 @@ export default function ReplayPanel ({
         </button>
       </div>
 
-      <div style={{ fontSize: '8px', color: '#888888', marginTop: '-8px' }}>Integrated server emulation. Testing client...</div>
+      <div style={{ fontSize: '8px', color: '#888888', marginTop: '-8px' }}>
+        {isRecording ? 'Recording packets...' : 'Integrated server emulation. Testing client...'}
+      </div>
 
       <FilterInput
         value={filter}
@@ -155,7 +159,14 @@ export default function ReplayPanel ({
         maxHeight={300}
       />
 
-      <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
+      <div style={{
+        display: 'flex',
+        alignItems: 'center',
+        gap: '8px',
+        // grayscale if recording
+        filter: isRecording ? 'grayscale(100%)' : 'none',
+        cursor: isRecording ? 'not-allowed' : 'default'
+      }}>
         {playPauseButton}
         <ProgressBar current={progress.current} total={progress.total} />
       </div>
@@ -228,4 +239,5 @@ export interface PacketData {
   actualVersion?: any
   position: number
   timestamp: number
+  isCustomChannel?: boolean
 }
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index db1d7d77..cd44a27a 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -16,6 +16,11 @@ import { showOptionsModal } from './SelectOption'
 import { useCopyKeybinding } from './simpleHooks'
 import { AuthenticatedAccount, getInitialServersList, getServerConnectionHistory, setNewServersList } from './serversStorage'
 import { appStorage, StoreServerItem } from './appStorageProvider'
+import Button from './Button'
+import { pixelartIcons } from './PixelartIcon'
+import { showNotification } from './NotificationProvider'
+
+const EXPLICIT_SHARE_SERVER_MODE = false
 
 if (appQueryParams.lockConnect) {
   notHideableModalsWithoutForce.add('editServer')
@@ -350,6 +355,27 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
     }}
     worldData={serversListSorted.map(server => {
       const additional = additionalServerData[server.ip]
+      const handleShare = async () => {
+        try {
+          const qs = new URLSearchParams()
+          qs.set('ip', server.ip)
+          if (server.proxyOverride) qs.set('proxy', server.proxyOverride)
+          if (server.versionOverride) qs.set('version', server.versionOverride)
+          qs.set('username', server.usernameOverride ?? '')
+          const shareUrl = `${window.location.origin}${window.location.pathname}?${qs.toString()}`
+          await navigator.clipboard.writeText(shareUrl)
+          const MESSAGE = 'Server link copied to clipboard'
+          if (EXPLICIT_SHARE_SERVER_MODE) {
+            await showOptionsModal(MESSAGE, [])
+          } else {
+            showNotification(MESSAGE)
+          }
+        } catch (err) {
+          console.error(err)
+          showNotification('Failed to copy server link to clipboard')
+        }
+      }
+
       return {
         name: server.index.toString(),
         title: server.name || server.ip,
@@ -359,6 +385,16 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         worldNameRightGrayed: additional?.textNameRightGrayed ?? '',
         iconSrc: additional?.icon,
         offline: additional?.offline,
+        afterTitleUi: (
+          <Button
+            icon="external-link"
+            style={{ marginRight: 8, width: 20, height: 20 }}
+            onClick={(e) => {
+              e.stopPropagation()
+              void handleShare()
+            }}
+          />
+        ),
         group: customServersList ? 'Provided Servers' : 'Saved Servers'
       }
     })}
@@ -397,6 +433,8 @@ export default () => {
   const modalStack = useSnapshot(activeModalStack)
   const hasServersListModal = modalStack.some(x => x.reactType === 'serversList')
   const editServerModalActive = useIsModalActive('editServer')
+  const generalSelectActive = useIsModalActive('general-select')
+  // const isServersListModalActive = useIsModalActive('serversList') || (modalStack.some(x => x.reactType === 'serversList') && generalSelectActive)
   const isServersListModalActive = useIsModalActive('serversList')
 
   const eitherModal = isServersListModalActive || editServerModalActive
diff --git a/src/react/components/replay/PacketList.tsx b/src/react/components/replay/PacketList.tsx
index 5183bf3f..ca5b8373 100644
--- a/src/react/components/replay/PacketList.tsx
+++ b/src/react/components/replay/PacketList.tsx
@@ -16,11 +16,12 @@ const formatters: Record<string, (data: any) => string> = {
   default: (data) => processPacketDataForLogging(data)
 }
 
-const getPacketIcon = (name: string): string => {
-  if (name.includes('position')) return '📍'
-  if (name.includes('chat')) return '💬'
-  if (name.includes('block') || name.includes('chunk') || name.includes('light')) return '📦'
-  if (name.includes('entity') || name.includes('player') || name.includes('passenger')) return '🎯'
+const getPacketIcon = (packet: PacketData): string => {
+  if (packet.isCustomChannel) return '🔗'
+  if (packet.name.includes('position')) return '📍'
+  if (packet.name.includes('chat')) return '💬'
+  if (packet.name.includes('block') || packet.name.includes('chunk') || packet.name.includes('light')) return '📦'
+  if (packet.name.includes('entity') || packet.name.includes('player') || packet.name.includes('passenger')) return '🎯'
   return '📄'
 }
 
@@ -102,7 +103,7 @@ export default function PacketList ({ packets, filter, maxHeight = 300 }: Props)
                     opacity: packet.isUpcoming ? 0.5 : 1
                   }}
                 >
-                  <span>{getPacketIcon(packet.name)}</span>
+                  <span>{getPacketIcon(packet)}</span>
                   <span style={{ color: DARK_COLORS.textDim }}>
                     #{packet.position}
                     {timeDiff && <span style={{ marginLeft: '4px' }}>{timeDiff}</span>}
diff --git a/src/react/state/packetsReplayState.ts b/src/react/state/packetsReplayState.ts
index 5a612f43..94866bd5 100644
--- a/src/react/state/packetsReplayState.ts
+++ b/src/react/state/packetsReplayState.ts
@@ -6,6 +6,7 @@ export const packetsReplayState = proxy({
   packetsPlayback: [] as PacketData[],
   isOpen: false,
   isMinimized: false,
+  isRecording: false,
   replayName: '',
   isPlaying: false,
   progress: {
diff --git a/src/scaleInterface.ts b/src/scaleInterface.ts
index 28fcc690..8177f6de 100644
--- a/src/scaleInterface.ts
+++ b/src/scaleInterface.ts
@@ -35,6 +35,7 @@ setScale()
 subscribeKey(options, 'guiScale', setScale)
 watchValue(currentScaling, (c) => {
   document.documentElement.style.setProperty('--guiScale', String(c.scale))
+  document.documentElement.style.setProperty('--scale', String(c.scale))
 })
 window.addEventListener('resize', setScale)
 
diff --git a/src/screens.css b/src/screens.css
index 8d9c2b75..036d1300 100644
--- a/src/screens.css
+++ b/src/screens.css
@@ -44,9 +44,25 @@
     gap: 10px;
 }
 
+.scaled-content-container {
+    font-size: calc(16px * var(--scale));
+}
+
+.scaled-content-container .screen-title {
+    font-size: calc(10px * var(--scale));
+    margin-top: calc(35px * var(--scale));
+}
+
+.scaled-content-container .dirt-bg {
+    image-rendering: pixelated;
+    background-size: calc(32px * var(--scale));
+    transform: none;
+}
+
 @media screen and (max-height: 426px) {
     .fullscreen:not(.small-content) {
         .screen-content {
+            /* margin-top: calc(14px * var(--scale)); */
             margin-top: 14px;
         }
 
diff --git a/src/shims/dns.js b/src/shims/dns.js
index a2bcc34c..37d193af 100644
--- a/src/shims/dns.js
+++ b/src/shims/dns.js
@@ -2,7 +2,14 @@
 
 // Custom DNS resolver made by SiebeDW. Powered by google dns.
 // Supported: SRV (not all errors support)
-module.exports.resolveSrv = function (hostname, callback) {
+module.exports.resolveSrv = function (hostname, _callback) {
+  globalThis.setLoadingMessage?.(`Getting SRV using Google DNS`)
+
+  const callback = (err, result) => {
+    globalThis.setLoadingMessage?.(undefined)
+    _callback(err, result)
+  }
+
   const Http = new XMLHttpRequest()
   const url = `https://dns.google.com/resolve?name=${hostname}&type=SRV`
   Http.open('GET', url)
@@ -14,6 +21,7 @@ module.exports.resolveSrv = function (hostname, callback) {
     Http.onerror = async function () {
       try {
         if (!globalThis.resolveDnsFallback) return
+        globalThis.setLoadingMessage?.('Resolving SRV using fallback')
         const result = await globalThis.resolveDnsFallback(minecraftServerHostname)
         callback(null, result ? [{
           priority: 0,

From 585b19d8dcc42d4cf853ae467bb01fb930cc5c23 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 22 Apr 2025 19:19:59 +0300
Subject: [PATCH 477/753] up mcraft-fun-mineflayer support

---
 README.MD                             |  1 +
 package.json                          |  2 +-
 pnpm-lock.yaml                        | 12 ++++-----
 src/index.ts                          |  5 ++--
 src/react/MineflayerPluginConsole.tsx |  1 +
 src/viewerConnector.ts                | 36 ++++++++++++++++++++++++++-
 6 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/README.MD b/README.MD
index ef65ca01..aa36f7e8 100644
--- a/README.MD
+++ b/README.MD
@@ -12,6 +12,7 @@ For building the project yourself / contributing, see [Development, Debugging &
 
 ### Big Features
 
+- Official Mineflayer [plugin integration](https://github.com/zardoy/mcraft-fun-mineflayer-plugin)! View / Control your bot remotely.
 - Open any zip world file or even folder in read-write mode!
 - Connect to Java servers running in both offline (cracked) and online mode* (it's possible because of proxy servers, see below)
 - Integrated JS server clone capable of opening Java world saves in any way (folders, zip, web chunks streaming, etc)
diff --git a/package.json b/package.json
index 2a92c0a1..9d776082 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
-    "mcraft-fun-mineflayer": "^0.1.14",
+    "mcraft-fun-mineflayer": "^0.1.21",
     "minecraft-data": "3.83.1",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 120e5646..faf6991a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -132,8 +132,8 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       mcraft-fun-mineflayer:
-        specifier: ^0.1.14
-        version: 0.1.14(encoding@0.1.13)(mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13))
+        specifier: ^0.1.21
+        version: 0.1.21(encoding@0.1.13)(mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -6459,9 +6459,9 @@ packages:
     resolution: {integrity: sha512-Ucsu2pDLr/cs8bxbxU9KTszdf/vPTLphYgEHUEWxuYlMkPQUCpsQwkn3YgyykJ7RXaca7zZGlZXaTPXBAqJT6A==}
     engines: {node: '>=18.0.0'}
 
-  mcraft-fun-mineflayer@0.1.14:
-    resolution: {integrity: sha512-q/qXQaNbkGJIvXjRvudUT7/k0EsJgphFcvYjrSRWYyGDJeb61MKRVqq1hhMjqx7UK7FMfBKvjfPSxq/QlAP7WQ==}
-    version: 0.1.14
+  mcraft-fun-mineflayer@0.1.21:
+    resolution: {integrity: sha512-FtzebYMvLvunApQy9ilF1RGqiX01DJn8y7q4xAONiIhBrIT7BrHK3O63IA50YgklldvdgVxn7s3m4QANvsH2JA==}
+    version: 0.1.21
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       '@roamhq/wrtc': '*'
@@ -16993,7 +16993,7 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.14(encoding@0.1.13)(mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.21(encoding@0.1.13)(mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
diff --git a/src/index.ts b/src/index.ts
index a94aa35d..e370e8be 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -82,7 +82,7 @@ import packetsPatcher from './mineflayer/plugins/packetsPatcher'
 import { mainMenuState } from './react/MainMenuRenderApp'
 import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
-import { getViewerVersionData, getWsProtocolStream, handleCustomChannel } from './viewerConnector'
+import { getViewerVersionData, getWsProtocolStream, onBotCreatedViewerHandler } from './viewerConnector'
 import { getWebsocketStream } from './mineflayer/websocket-core'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 import { playerState } from './mineflayer/playerState'
@@ -552,8 +552,7 @@ export async function connect (connectOptions: ConnectOptions) {
     }) as unknown as typeof __type_bot
     window.bot = bot
     if (connectOptions.viewerWsConnect) {
-      void handleCustomChannel()
-      bot.physicsEnabled = false
+      void onBotCreatedViewerHandler()
     }
     customEvents.emit('mineflayerBotCreated')
     if (singleplayer || p2pMultiplayer || localReplaySession) {
diff --git a/src/react/MineflayerPluginConsole.tsx b/src/react/MineflayerPluginConsole.tsx
index e681f882..2e1b6c1a 100644
--- a/src/react/MineflayerPluginConsole.tsx
+++ b/src/react/MineflayerPluginConsole.tsx
@@ -17,6 +17,7 @@ export const mineflayerConsoleState = proxy({
   messages: [] as ConsoleMessage[],
   replEnabled: false,
   consoleEnabled: false,
+  takeoverMode: false
 })
 
 const MessageLine = ({ message }: { message: ConsoleMessage }) => {
diff --git a/src/viewerConnector.ts b/src/viewerConnector.ts
index 69e2115a..6a8a7d73 100644
--- a/src/viewerConnector.ts
+++ b/src/viewerConnector.ts
@@ -8,6 +8,7 @@ import { CustomChannelPacketFromClient, CustomChannelPacketFromServer, UIDefinit
 import { activeModalStack } from './globalState'
 import { mineflayerPluginHudState } from './react/MineflayerPluginHud'
 import { mineflayerConsoleState } from './react/MineflayerPluginConsole'
+import { showNotification } from './react/NotificationProvider'
 
 export const viewerVersionState = proxy({
   forwardChat: true,
@@ -43,6 +44,7 @@ export const getViewerVersionData = async (url: string) => {
     requiresPass: boolean,
     forwardChat: boolean,
     clientIgnoredPackets?: string[]
+    takeoverMode?: boolean
   }>((resolve, reject) => {
     ws.addEventListener('message', async (message) => {
       const { data } = message
@@ -67,6 +69,7 @@ export const getViewerVersionData = async (url: string) => {
   })
   mineflayerConsoleState.consoleEnabled = result.consoleEnabled
   mineflayerConsoleState.replEnabled = result.replEnabled
+  mineflayerConsoleState.takeoverMode = result.takeoverMode ?? false
   return result
 }
 
@@ -125,7 +128,7 @@ export const getWsProtocolStream = async (url: string) => {
 
 const CHANNEL_NAME = 'minecraft-web-client:data'
 
-export const handleCustomChannel = async () => {
+const handleCustomChannel = () => {
   bot._client.registerChannel(CHANNEL_NAME, ['string', []])
   const toCleanup = [] as Array<() => void>
   subscribe(activeModalStack, () => {
@@ -288,4 +291,35 @@ export const handleCustomChannel = async () => {
       // No default
     }
   })
+
+  return {
+    send
+  }
+}
+
+export const onBotCreatedViewerHandler = async () => {
+  const { send } = handleCustomChannel()
+  bot.physicsEnabled = false
+
+  await new Promise<void>(resolve => {
+    bot.once('inject_allowed', resolve)
+  })
+
+  const originalSetControlState = bot.setControlState.bind(bot)
+  bot.setControlState = (control, state) => {
+    if (bot.controlState[control] === state) {
+      return
+    }
+    if (!mineflayerConsoleState.takeoverMode) {
+      showNotification('Remote control is not enabled', 'Enable takeoverMode in bot plugin settings first')
+      return
+    }
+    // send command to viewer
+    send({
+      type: 'setControlState',
+      control,
+      value: state
+    })
+    originalSetControlState(control, state)
+  }
 }

From 14ad1c59347d7873547e6e1aa053dee1fe961de2 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 23 Apr 2025 05:55:59 +0300
Subject: [PATCH 478/753] sync fork: add a bunch of not needed side core
 features like translation AND fix critical performance regression (& ram)

---
 renderer/rsbuildSharedConfig.ts             |   4 +
 renderer/viewer/lib/mesher/models.ts        |  23 ++-
 renderer/viewer/lib/mesher/shared.ts        |   2 +-
 renderer/viewer/lib/mesherlogReader.ts      | 131 ++++++++++++++++
 renderer/viewer/lib/ui/newStats.ts          |   2 +-
 renderer/viewer/lib/worldDataEmitter.ts     |   3 +-
 renderer/viewer/lib/worldrendererCommon.ts  | 116 +++++++++-----
 renderer/viewer/three/documentRenderer.ts   |   8 +-
 renderer/viewer/three/graphicsBackend.ts    |   3 +-
 renderer/viewer/three/threeJsMedia.ts       |  22 ++-
 renderer/viewer/three/threeJsParticles.ts   | 160 ++++++++++++++++++++
 renderer/viewer/three/worldrendererThree.ts |  24 ++-
 src/appConfig.ts                            |   3 +
 src/index.ts                                |  13 +-
 src/mineflayer/plugins/index.ts             |  21 +++
 src/mineflayer/plugins/webFeatures.ts       |  12 ++
 src/optionsGuiScheme.tsx                    |  12 ++
 src/optionsStorage.ts                       |  11 +-
 src/react/Button.tsx                        |  18 ++-
 19 files changed, 512 insertions(+), 76 deletions(-)
 create mode 100644 renderer/viewer/lib/mesherlogReader.ts
 create mode 100644 renderer/viewer/three/threeJsParticles.ts
 create mode 100644 src/mineflayer/plugins/index.ts
 create mode 100644 src/mineflayer/plugins/webFeatures.ts

diff --git a/renderer/rsbuildSharedConfig.ts b/renderer/rsbuildSharedConfig.ts
index 57eea041..57091d99 100644
--- a/renderer/rsbuildSharedConfig.ts
+++ b/renderer/rsbuildSharedConfig.ts
@@ -108,6 +108,10 @@ export const rspackViewerConfig = (config, { appendPlugins, addRules, rspack }:
         {
             test: /\.txt$/,
             type: 'asset/source',
+        },
+        {
+            test: /\.log$/,
+            type: 'asset/source',
         }
     ])
     config.ignoreWarnings = [
diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index c5d34e9d..fc57d2b3 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -468,7 +468,7 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
     t_normals: [],
     t_colors: [],
     t_uvs: [],
-    indices: new Uint32Array(442_368), // Maximum possible indices
+    indices: [],
     indicesCount: 0, // Track current index position
     using32Array: true,
     tiles: {},
@@ -643,6 +643,12 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
   attr.normals = new Float32Array(attr.normals) as any
   attr.colors = new Float32Array(attr.colors) as any
   attr.uvs = new Float32Array(attr.uvs) as any
+  attr.using32Array = arrayNeedsUint32(attr.indices)
+  if (attr.using32Array) {
+    attr.indices = new Uint32Array(attr.indices)
+  } else {
+    attr.indices = new Uint16Array(attr.indices)
+  }
 
   if (needTiles) {
     delete attr.positions
@@ -654,6 +660,21 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
   return attr
 }
 
+// copied from three.js
+function arrayNeedsUint32 (array) {
+
+  // assumes larger values usually on last
+
+  for (let i = array.length - 1; i >= 0; -- i) {
+
+    if (array[i] >= 65_535) return true // account for PRIMITIVE_RESTART_FIXED_INDEX, #24565
+
+  }
+
+  return false
+
+}
+
 export const setBlockStatesData = (blockstatesModels, blocksAtlas: any, _needTiles = false, useUnknownBlockModel = true, version = 'latest') => {
   blockProvider = worldBlockProvider(blockstatesModels, blocksAtlas, version)
   globalThis.blockProvider = blockProvider
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index ea56e016..eb1346f4 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -33,7 +33,7 @@ export type MesherGeometryOutput = {
   t_colors?: number[],
   t_uvs?: number[],
 
-  indices: Uint32Array,
+  indices: Uint32Array | Uint16Array | number[],
   indicesCount: number,
   using32Array: boolean,
   tiles: Record<string, BlockType>,
diff --git a/renderer/viewer/lib/mesherlogReader.ts b/renderer/viewer/lib/mesherlogReader.ts
new file mode 100644
index 00000000..0f1e74c0
--- /dev/null
+++ b/renderer/viewer/lib/mesherlogReader.ts
@@ -0,0 +1,131 @@
+/* eslint-disable no-await-in-loop */
+import { Vec3 } from 'vec3'
+
+// import log from '../../../../../Downloads/mesher (2).log'
+import { WorldRendererCommon } from './worldrendererCommon'
+const log = ''
+
+
+export class MesherLogReader {
+  chunksToReceive: Array<{
+    x: number
+    z: number
+    chunkLength: number
+  }> = []
+  messagesQueue: Array<{
+    fromWorker: boolean
+    workerIndex: number
+    message: any
+  }> = []
+
+  sectionFinishedToReceive = null as {
+    messagesLeft: string[]
+    resolve: () => void
+  } | null
+  replayStarted = false
+
+  constructor (private readonly worldRenderer: WorldRendererCommon) {
+    this.parseMesherLog()
+  }
+
+  chunkReceived (x: number, z: number, chunkLength: number) {
+    // remove existing chunks with same x and z
+    const existingChunkIndex = this.chunksToReceive.findIndex(chunk => chunk.x === x && chunk.z === z)
+    if (existingChunkIndex === -1) {
+      // console.error('Chunk not found', x, z)
+    } else {
+      // warn if chunkLength is different
+      if (this.chunksToReceive[existingChunkIndex].chunkLength !== chunkLength) {
+        // console.warn('Chunk length mismatch', x, z, this.chunksToReceive[existingChunkIndex].chunkLength, chunkLength)
+      }
+      // remove chunk
+      this.chunksToReceive = this.chunksToReceive.filter((chunk, index) => chunk.x !== x || chunk.z !== z)
+    }
+    this.maybeStartReplay()
+  }
+
+  async maybeStartReplay () {
+    if (this.chunksToReceive.length !== 0 || this.replayStarted) return
+    const lines = log.split('\n')
+    console.log('starting replay')
+    this.replayStarted = true
+    const waitForWorkersMessages = async () => {
+      if (!this.sectionFinishedToReceive) return
+      await new Promise<void>(resolve => {
+        this.sectionFinishedToReceive!.resolve = resolve
+      })
+    }
+
+    for (const line of lines) {
+      if (line.includes('dispatchMessages dirty')) {
+        await waitForWorkersMessages()
+        this.worldRenderer.stopMesherMessagesProcessing = true
+        const message = JSON.parse(line.slice(line.indexOf('{'), line.lastIndexOf('}') + 1))
+        if (!message.value) continue
+        const index = line.split(' ')[1]
+        const type = line.split(' ')[3]
+        // console.log('sending message', message.x, message.y, message.z)
+        this.worldRenderer.forceCallFromMesherReplayer = true
+        this.worldRenderer.setSectionDirty(new Vec3(message.x, message.y, message.z), message.value)
+        this.worldRenderer.forceCallFromMesherReplayer = false
+      }
+      if (line.includes('-> blockUpdate')) {
+        await waitForWorkersMessages()
+        this.worldRenderer.stopMesherMessagesProcessing = true
+        const message = JSON.parse(line.slice(line.indexOf('{'), line.lastIndexOf('}') + 1))
+        this.worldRenderer.forceCallFromMesherReplayer = true
+        this.worldRenderer.setBlockStateIdInner(new Vec3(message.pos.x, message.pos.y, message.pos.z), message.stateId)
+        this.worldRenderer.forceCallFromMesherReplayer = false
+      }
+
+      if (line.includes(' sectionFinished ')) {
+        if (!this.sectionFinishedToReceive) {
+          console.log('starting worker message processing validating')
+          this.worldRenderer.stopMesherMessagesProcessing = false
+          this.sectionFinishedToReceive = {
+            messagesLeft: [],
+            resolve: () => {
+              this.sectionFinishedToReceive = null
+            }
+          }
+        }
+        const parts = line.split(' ')
+        const coordsPart = parts.find(part => part.split(',').length === 3)
+        if (!coordsPart) throw new Error(`no coords part found ${line}`)
+        const [x, y, z] = coordsPart.split(',').map(Number)
+        this.sectionFinishedToReceive.messagesLeft.push(`${x},${y},${z}`)
+      }
+    }
+  }
+
+  workerMessageReceived (type: string, message: any) {
+    if (type === 'sectionFinished') {
+      const { key } = message
+      if (!this.sectionFinishedToReceive) {
+        console.warn(`received sectionFinished message but no sectionFinishedToReceive ${key}`)
+        return
+      }
+
+      const idx = this.sectionFinishedToReceive.messagesLeft.indexOf(key)
+      if (idx === -1) {
+        console.warn(`received sectionFinished message for non-outstanding section ${key}`)
+        return
+      }
+      this.sectionFinishedToReceive.messagesLeft.splice(idx, 1)
+      if (this.sectionFinishedToReceive.messagesLeft.length === 0) {
+        this.sectionFinishedToReceive.resolve()
+      }
+    }
+  }
+
+  parseMesherLog () {
+    const lines = log.split('\n')
+    for (const line of lines) {
+      if (line.startsWith('-> chunk')) {
+        const chunk = JSON.parse(line.slice('-> chunk'.length))
+        this.chunksToReceive.push(chunk)
+        continue
+      }
+    }
+  }
+}
diff --git a/renderer/viewer/lib/ui/newStats.ts b/renderer/viewer/lib/ui/newStats.ts
index 7af5e897..4a1b0a0f 100644
--- a/renderer/viewer/lib/ui/newStats.ts
+++ b/renderer/viewer/lib/ui/newStats.ts
@@ -26,7 +26,7 @@ export const addNewStat = (id: string, width = 80, x = rightOffset, y = lastY) =
 
   return {
     updateText (text: string) {
-      if (pane.innerText === text || pane.style.display === 'none') return
+      if (pane.innerText === text) return
       pane.innerText = text
     },
     setVisibility (visible: boolean) {
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 7dc49ac3..56c71d40 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -252,7 +252,6 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
 
   async loadChunk (pos: ChunkPos, isLightUpdate = false, reason = 'spiral') {
     const [botX, botZ] = chunkPos(this.lastPos)
-    console.log('loadChunk', botX - pos.x / 16, botZ - pos.z / 16)
 
     const dx = Math.abs(botX - Math.floor(pos.x / 16))
     const dz = Math.abs(botZ - Math.floor(pos.z / 16))
@@ -280,7 +279,7 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
         this.debugChunksInfo[`${pos.x},${pos.z}`].loads.push({
           dataLength: chunk.length,
           reason,
-          time: Math.floor(performance.now()),
+          time: Date.now(),
         })
       } else if (this.isPlayground) { // don't allow in real worlds pre-flag chunks as loaded to avoid race condition when the chunk might still be loading. In playground it's assumed we always pre-load all chunks first
         this.emitter.emit('markAsLoaded', { x: pos.x, z: pos.z })
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 8454ed16..bff991ef 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -19,6 +19,7 @@ import { chunkPos } from './simpleUtils'
 import { addNewStat, removeAllStats, removeStat, updatePanesVisibility, updateStatText } from './ui/newStats'
 import { WorldDataEmitter } from './worldDataEmitter'
 import { IPlayerState } from './basePlayerState'
+import { MesherLogReader } from './mesherlogReader'
 
 function mod (x, n) {
   return ((x % n) + n) % n
@@ -53,6 +54,8 @@ export const defaultWorldRendererConfig = {
 export type WorldRendererConfig = typeof defaultWorldRendererConfig
 
 export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any> {
+  worldReadyResolvers = Promise.withResolvers<void>()
+  worldReadyPromise = this.worldReadyResolvers.promise
   timeOfTheDay = 0
   worldSizeParams = { minY: 0, worldHeight: 256 }
 
@@ -136,12 +139,15 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   worldRendererConfig: WorldRendererConfig
   playerState: IPlayerState
   reactiveState: RendererReactiveState
+  mesherLogReader: MesherLogReader | undefined
+  forceCallFromMesherReplayer = false
+  stopMesherMessagesProcessing = false
 
   abortController = new AbortController()
   lastRendered = 0
   renderingActive = true
   geometryReceiveCountPerSec = 0
-  workerLogger = {
+  mesherLogger = {
     contents: [] as string[],
     active: new URL(location.href).searchParams.get('mesherlog') === 'true'
   }
@@ -152,6 +158,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   mainThreadRendering = true
   backendInfoReport = '-'
   chunksFullInfo = '-'
+  workerCustomHandleTime = 0
 
   get version () {
     return this.displayOptions.version
@@ -167,7 +174,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.worldRendererConfig = displayOptions.inWorldRenderingConfig
     this.playerState = displayOptions.playerState
     this.reactiveState = displayOptions.rendererState
-
+    // this.mesherLogReader = new MesherLogReader(this)
     this.renderUpdateEmitter.on('update', () => {
       const loadedChunks = Object.keys(this.finishedChunks).length
       updateStatText('loaded-chunks', `${loadedChunks}/${this.chunksLength} chunks (${this.lastChunkDistance}/${this.viewDistance})`)
@@ -200,22 +207,33 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   logWorkerWork (message: string | (() => string)) {
-    if (!this.workerLogger.active) return
-    this.workerLogger.contents.push(typeof message === 'function' ? message() : message)
+    if (!this.mesherLogger.active) return
+    this.mesherLogger.contents.push(typeof message === 'function' ? message() : message)
   }
 
-  init () {
+  async init () {
     if (this.active) throw new Error('WorldRendererCommon is already initialized')
-    this.watchReactivePlayerState()
-    void this.setVersion(this.version).then(() => {
-      this.resourcesManager.on('assetsTexturesUpdated', () => {
-        if (!this.active) return
-        void this.updateAssetsData()
-      })
-      if (this.resourcesManager.currentResources) {
-        void this.updateAssetsData()
-      }
+    await this.resourcesManager.loadMcData(this.version)
+    if (!this.resourcesManager.currentResources) {
+      await this.resourcesManager.updateAssetsData({ })
+    }
+
+    await Promise.all([
+      this.resetWorkers(),
+      (async () => {
+        if (this.resourcesManager.currentResources) {
+          await this.updateAssetsData()
+        }
+      })()
+    ])
+
+    this.resourcesManager.on('assetsTexturesUpdated', async () => {
+      if (!this.active) return
+      await this.updateAssetsData()
     })
+
+    this.watchReactivePlayerState()
+    this.worldReadyResolvers.resolve()
   }
 
   snapshotInitialValues () { }
@@ -295,7 +313,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   async processMessageQueue (source: string) {
     if (this.isProcessingQueue || this.messageQueue.length === 0) return
     this.logWorkerWork(`# ${source} processing queue`)
-    if (this.lastRendered && performance.now() - this.lastRendered > 30 && this.worldRendererConfig._experimentalSmoothChunkLoading && this.renderingActive) {
+    if (this.lastRendered && performance.now() - this.lastRendered > this.ONMESSAGE_TIME_LIMIT && this.worldRendererConfig._experimentalSmoothChunkLoading && this.renderingActive) {
       const start = performance.now()
       await new Promise(resolve => {
         requestAnimationFrame(resolve)
@@ -308,12 +326,15 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     let processedCount = 0
 
     while (this.messageQueue.length > 0) {
-      const data = this.messageQueue.shift()!
-      this.handleMessage(data)
-      processedCount++
+      const processingStopped = this.stopMesherMessagesProcessing
+      if (!processingStopped) {
+        const data = this.messageQueue.shift()!
+        this.handleMessage(data)
+        processedCount++
+      }
 
       // Check if we've exceeded the time limit
-      if (performance.now() - startTime > this.ONMESSAGE_TIME_LIMIT && this.renderingActive && this.worldRendererConfig._experimentalSmoothChunkLoading) {
+      if (processingStopped || (performance.now() - startTime > this.ONMESSAGE_TIME_LIMIT && this.renderingActive && this.worldRendererConfig._experimentalSmoothChunkLoading)) {
         // If we have more messages and exceeded time limit, schedule next batch
         if (this.messageQueue.length > 0) {
           requestAnimationFrame(async () => {
@@ -331,8 +352,11 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   handleMessage (data) {
     if (!this.active) return
+    this.mesherLogReader?.workerMessageReceived(data.type, data)
     if (data.type !== 'geometry' || !this.debugStopGeometryUpdate) {
+      const start = performance.now()
       this.handleWorkerMessage(data)
+      this.workerCustomHandleTime += performance.now() - start
     }
     if (data.type === 'geometry') {
       this.logWorkerWork(() => `-> ${data.workerIndex} geometry ${data.key} ${JSON.stringify({ dataSize: JSON.stringify(data).length })}`)
@@ -344,7 +368,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       this.lastChunkDistance = Math.max(...this.getDistance(new Vec3(chunkCoords[0], 0, chunkCoords[2])))
     }
     if (data.type === 'sectionFinished') { // on after load & unload section
-      this.logWorkerWork(`-> ${data.workerIndex} sectionFinished ${data.key} ${JSON.stringify({ processTime: data.processTime })}`)
+      this.logWorkerWork(`<- ${data.workerIndex} sectionFinished ${data.key} ${JSON.stringify({ processTime: data.processTime })}`)
       if (!this.sectionsWaiting.has(data.key)) throw new Error(`sectionFinished event for non-outstanding section ${data.key}`)
       this.sectionsWaiting.set(data.key, this.sectionsWaiting.get(data.key)! - 1)
       if (this.sectionsWaiting.get(data.key) === 0) {
@@ -407,7 +431,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   downloadMesherLog () {
     const a = document.createElement('a')
-    a.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(this.workerLogger.contents.join('\n'))
+    a.href = 'data:text/plain;charset=utf-8,' + encodeURIComponent(this.mesherLogger.contents.join('\n'))
     a.download = 'mesher.log'
     a.click()
   }
@@ -474,8 +498,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.workers = []
   }
 
-  // new game load happens here
-  async setVersion (version: string) {
+  async resetWorkers () {
     this.resetWorld()
 
     // for workers in single file build
@@ -488,11 +511,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.initWorkers()
     this.active = true
 
-    await this.resourcesManager.loadMcData(version)
     this.sendMesherMcData()
-    if (!this.resourcesManager.currentResources) {
-      await this.resourcesManager.updateAssetsData({ })
-    }
   }
 
   getMesherConfig (): MesherConfig {
@@ -594,7 +613,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         customBlockModels: customBlockModels || undefined
       })
     }
-    this.logWorkerWork(`-> chunk ${JSON.stringify({ x, z, chunkLength: chunk.length, customBlockModelsLength: customBlockModels ? Object.keys(customBlockModels).length : 0 })}`)
+    this.logWorkerWork(() => `-> chunk ${JSON.stringify({ x, z, chunkLength: chunk.length, customBlockModelsLength: customBlockModels ? Object.keys(customBlockModels).length : 0 })}`)
+    this.mesherLogReader?.chunkReceived(x, z, chunk.length)
     for (let y = this.worldMinYRender; y < this.worldSizeParams.worldHeight; y += 16) {
       const loc = new Vec3(x, y, z)
       this.setSectionDirty(loc)
@@ -636,8 +656,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.updateChunksStats()
 
     if (Object.keys(this.loadedChunks).length === 0) {
-      this.workerLogger.contents = []
+      this.mesherLogger.contents = []
       this.logWorkerWork('# all chunks unloaded. New log started')
+      void this.mesherLogReader?.maybeStartReplay()
     }
   }
 
@@ -848,6 +869,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   setSectionDirty (pos: Vec3, value = true, useChangeWorker = false) { // value false is used for unloading chunks
+    if (!this.forceCallFromMesherReplayer && this.mesherLogReader) return
+
     if (this.viewDistance === -1) throw new Error('viewDistance not set')
     this.reactiveState.world.mesherWork = true
     const distance = this.getDistance(pos)
@@ -859,19 +882,30 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     // Dispatch sections to workers based on position
     // This guarantees uniformity accross workers and that a given section
     // is always dispatched to the same worker
-    const hash = this.getWorkerNumber(pos, useChangeWorker)
+    const hash = this.getWorkerNumber(pos, useChangeWorker && this.mesherLogger.active)
     this.sectionsWaiting.set(key, (this.sectionsWaiting.get(key) ?? 0) + 1)
-    this.toWorkerMessagesQueue[hash] ??= []
-    this.toWorkerMessagesQueue[hash].push({
-      // this.workers[hash].postMessage({
-      type: 'dirty',
-      x: pos.x,
-      y: pos.y,
-      z: pos.z,
-      value,
-      config: this.getMesherConfig(),
-    })
-    this.dispatchMessages()
+    if (this.forceCallFromMesherReplayer) {
+      this.workers[hash].postMessage({
+        type: 'dirty',
+        x: pos.x,
+        y: pos.y,
+        z: pos.z,
+        value,
+        config: this.getMesherConfig(),
+      })
+    } else {
+      this.toWorkerMessagesQueue[hash] ??= []
+      this.toWorkerMessagesQueue[hash].push({
+        // this.workers[hash].postMessage({
+        type: 'dirty',
+        x: pos.x,
+        y: pos.y,
+        z: pos.z,
+        value,
+        config: this.getMesherConfig(),
+      })
+      this.dispatchMessages()
+    }
   }
 
   dispatchMessages () {
diff --git a/renderer/viewer/three/documentRenderer.ts b/renderer/viewer/three/documentRenderer.ts
index dbea1205..46672b74 100644
--- a/renderer/viewer/three/documentRenderer.ts
+++ b/renderer/viewer/three/documentRenderer.ts
@@ -120,7 +120,9 @@ export class DocumentRenderer {
       this.preRender()
       this.stats.markStart()
       tween.update()
-      this.render(sizeChanged)
+      if (!window.freezeRender) {
+        this.render(sizeChanged)
+      }
       for (const fn of this.onRender) {
         fn(sizeChanged)
       }
@@ -189,6 +191,10 @@ class TopRightStats {
     const hasRamPanel = this.stats2.dom.children.length === 3
 
     this.addStat(this.stats.dom)
+    if (process.env.NODE_ENV === 'development' && document.exitPointerLock) {
+      this.stats.dom.style.top = ''
+      this.stats.dom.style.bottom = '0'
+    }
     if (hasRamPanel) {
       this.addStat(this.stats2.dom)
     }
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index f8cf14a4..b0fe5f28 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -68,12 +68,13 @@ const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitO
     await initOptions.resourcesManager.updateAssetsData({ })
   }
 
-  const startWorld = (displayOptions: DisplayWorldOptions) => {
+  const startWorld = async (displayOptions: DisplayWorldOptions) => {
     if (panoramaRenderer) {
       panoramaRenderer.dispose()
       panoramaRenderer = null
     }
     worldRenderer = new WorldRendererThree(documentRenderer.renderer, initOptions, displayOptions)
+    await worldRenderer.worldReadyPromise
     documentRenderer.render = (sizeChanged: boolean) => {
       worldRenderer?.render(sizeChanged)
     }
diff --git a/renderer/viewer/three/threeJsMedia.ts b/renderer/viewer/three/threeJsMedia.ts
index b6e3bd34..582273d1 100644
--- a/renderer/viewer/three/threeJsMedia.ts
+++ b/renderer/viewer/three/threeJsMedia.ts
@@ -35,6 +35,10 @@ export class ThreeJsMedia {
     this.worldRenderer.onWorldSwitched.push(() => {
       this.onWorldGone()
     })
+
+    this.worldRenderer.onRender.push(() => {
+      this.render()
+    })
   }
 
   onWorldGone () {
@@ -304,6 +308,18 @@ export class ThreeJsMedia {
     return id
   }
 
+  render () {
+    for (const [id, videoData] of this.customMedia.entries()) {
+      const chunkX = Math.floor(videoData.props.position.x / 16) * 16
+      const chunkZ = Math.floor(videoData.props.position.z / 16) * 16
+      const sectionY = Math.floor(videoData.props.position.y / 16) * 16
+
+      const chunkKey = `${chunkX},${chunkZ}`
+      const sectionKey = `${chunkX},${sectionY},${chunkZ}`
+      videoData.mesh.visible = !!this.worldRenderer.sectionObjects[sectionKey] || !!this.worldRenderer.finishedChunks[chunkKey]
+    }
+  }
+
   setVideoPlaying (id: string, playing: boolean) {
     const videoData = this.customMedia.get(id)
     if (videoData?.video) {
@@ -531,9 +547,13 @@ export class ThreeJsMedia {
     console.log('Exact test mesh added with dimensions:', width, height, 'and rotation:', rotation)
   }
 
+  lastCheck = 0
+  THROTTLE_TIME = 100
   tryIntersectMedia () {
-    // hack: need to optimize this by pulling only in distance of interaction instead (or throttle)!
+    // hack: need to optimize this by pulling only in distance of interaction instead and throttle
     if (this.customMedia.size === 0) return
+    if (Date.now() - this.lastCheck < this.THROTTLE_TIME) return
+    this.lastCheck = Date.now()
 
     const { camera, scene } = this.worldRenderer
     const raycaster = new THREE.Raycaster()
diff --git a/renderer/viewer/three/threeJsParticles.ts b/renderer/viewer/three/threeJsParticles.ts
new file mode 100644
index 00000000..993f2b62
--- /dev/null
+++ b/renderer/viewer/three/threeJsParticles.ts
@@ -0,0 +1,160 @@
+import * as THREE from 'three'
+
+interface ParticleMesh extends THREE.Mesh {
+  velocity: THREE.Vector3;
+}
+
+interface ParticleConfig {
+  fountainHeight: number;
+  resetHeight: number;
+  xVelocityRange: number;
+  zVelocityRange: number;
+  particleCount: number;
+  particleRadiusRange: { min: number; max: number };
+  yVelocityRange: { min: number; max: number };
+}
+
+export interface FountainOptions {
+  position?: { x: number, y: number, z: number }
+  particleConfig?: Partial<ParticleConfig>;
+}
+
+export class Fountain {
+  private readonly particles: ParticleMesh[] = []
+  private readonly config: { particleConfig: ParticleConfig }
+  private readonly position: THREE.Vector3
+  container: THREE.Object3D | undefined
+
+  constructor (public sectionId: string, options: FountainOptions = {}) {
+    this.position = options.position ? new THREE.Vector3(options.position.x, options.position.y, options.position.z) : new THREE.Vector3(0, 0, 0)
+    this.config = this.createConfig(options.particleConfig)
+  }
+
+  private createConfig (
+    particleConfigOverride?: Partial<ParticleConfig>
+  ): { particleConfig: ParticleConfig } {
+    const particleConfig: ParticleConfig = {
+      fountainHeight: 10,
+      resetHeight: 0,
+      xVelocityRange: 0.4,
+      zVelocityRange: 0.4,
+      particleCount: 400,
+      particleRadiusRange: { min: 0.1, max: 0.6 },
+      yVelocityRange: { min: 0.1, max: 2 },
+      ...particleConfigOverride
+    }
+
+    return { particleConfig }
+  }
+
+
+  createParticles (container: THREE.Object3D): void {
+    this.container = container
+    const colorStart = new THREE.Color(0xff_ff_00)
+    const colorEnd = new THREE.Color(0xff_a5_00)
+
+    for (let i = 0; i < this.config.particleConfig.particleCount; i++) {
+      const radius = Math.random() *
+        (this.config.particleConfig.particleRadiusRange.max - this.config.particleConfig.particleRadiusRange.min) +
+        this.config.particleConfig.particleRadiusRange.min
+      const geometry = new THREE.SphereGeometry(radius)
+      const material = new THREE.MeshBasicMaterial({
+        color: colorStart.clone().lerp(colorEnd, Math.random())
+      })
+      const mesh = new THREE.Mesh(geometry, material)
+      const particle = mesh as unknown as ParticleMesh
+
+      particle.position.set(
+        this.position.x + (Math.random() - 0.5) * this.config.particleConfig.xVelocityRange * 2,
+        this.position.y + this.config.particleConfig.fountainHeight,
+        this.position.z + (Math.random() - 0.5) * this.config.particleConfig.zVelocityRange * 2
+      )
+
+      particle.velocity = new THREE.Vector3(
+        (Math.random() - 0.5) * this.config.particleConfig.xVelocityRange,
+        -Math.random() * this.config.particleConfig.yVelocityRange.max,
+        (Math.random() - 0.5) * this.config.particleConfig.zVelocityRange
+      )
+
+      this.particles.push(particle)
+      this.container.add(particle)
+
+      // this.container.onBeforeRender = () => {
+      //   this.render()
+      // }
+    }
+  }
+
+  render (): void {
+    for (const particle of this.particles) {
+      particle.velocity.y -= 0.01 + Math.random() * 0.1
+      particle.position.add(particle.velocity)
+
+      if (particle.position.y < this.position.y + this.config.particleConfig.resetHeight) {
+        particle.position.set(
+          this.position.x + (Math.random() - 0.5) * this.config.particleConfig.xVelocityRange * 2,
+          this.position.y + this.config.particleConfig.fountainHeight,
+          this.position.z + (Math.random() - 0.5) * this.config.particleConfig.zVelocityRange * 2
+        )
+        particle.velocity.set(
+          (Math.random() - 0.5) * this.config.particleConfig.xVelocityRange,
+          -Math.random() * this.config.particleConfig.yVelocityRange.max,
+          (Math.random() - 0.5) * this.config.particleConfig.zVelocityRange
+        )
+      }
+    }
+  }
+
+  private updateParticleCount (newCount: number): void {
+    if (newCount !== this.config.particleConfig.particleCount) {
+      this.config.particleConfig.particleCount = newCount
+      const currentCount = this.particles.length
+
+      if (newCount > currentCount) {
+        this.addParticles(newCount - currentCount)
+      } else if (newCount < currentCount) {
+        this.removeParticles(currentCount - newCount)
+      }
+    }
+  }
+
+  private addParticles (count: number): void {
+    const geometry = new THREE.SphereGeometry(0.1)
+    const material = new THREE.MeshBasicMaterial({ color: 0x00_ff_00 })
+
+    for (let i = 0; i < count; i++) {
+      const mesh = new THREE.Mesh(geometry, material)
+      const particle = mesh as unknown as ParticleMesh
+      particle.position.copy(this.position)
+      particle.velocity = new THREE.Vector3(
+        Math.random() * this.config.particleConfig.xVelocityRange -
+        this.config.particleConfig.xVelocityRange / 2,
+        Math.random() * 2,
+        Math.random() * this.config.particleConfig.zVelocityRange -
+        this.config.particleConfig.zVelocityRange / 2
+      )
+      this.particles.push(particle)
+      this.container!.add(particle)
+    }
+  }
+
+  private removeParticles (count: number): void {
+    for (let i = 0; i < count; i++) {
+      const particle = this.particles.pop()
+      if (particle) {
+        this.container!.remove(particle)
+      }
+    }
+  }
+
+  public dispose (): void {
+    for (const particle of this.particles) {
+      particle.geometry.dispose()
+      if (Array.isArray(particle.material)) {
+        for (const material of particle.material) material.dispose()
+      } else {
+        particle.material.dispose()
+      }
+    }
+  }
+}
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index bb4c1805..14270367 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -25,12 +25,13 @@ import { Entities } from './entities'
 import { ThreeJsSound } from './threeJsSound'
 import { CameraShake } from './cameraShake'
 import { ThreeJsMedia } from './threeJsMedia'
+import { Fountain } from './threeJsParticles'
 
 type SectionKey = string
 
 export class WorldRendererThree extends WorldRendererCommon {
   outputFormat = 'threeJs' as const
-  sectionObjects: Record<string, THREE.Object3D> = {}
+  sectionObjects: Record<string, THREE.Object3D & { foutain?: boolean }> = {}
   chunkTextures = new Map<string, { [pos: string]: THREE.Texture }>()
   signsCache = new Map<string, any>()
   starField: StarField
@@ -68,6 +69,7 @@ export class WorldRendererThree extends WorldRendererCommon {
       limitZ?: number,
     }
   }
+  fountains: Fountain[] = []
 
   get tilesRendered () {
     return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).tilesCount, 0)
@@ -88,12 +90,15 @@ export class WorldRendererThree extends WorldRendererCommon {
 
     this.addDebugOverlay()
     this.resetScene()
-    this.init()
+    void this.init()
     void initVR(this)
 
     this.soundSystem = new ThreeJsSound(this)
     this.cameraShake = new CameraShake(this.camera, this.onRender)
     this.media = new ThreeJsMedia(this)
+    // this.fountain = new Fountain(this.scene, this.scene, {
+    //   position: new THREE.Vector3(0, 10, 0),
+    // })
 
     this.renderUpdateEmitter.on('chunkFinished', (chunkKey: string) => {
       this.finishChunk(chunkKey)
@@ -333,11 +338,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     geometry.setAttribute('normal', new THREE.BufferAttribute(data.geometry.normals, 3))
     geometry.setAttribute('color', new THREE.BufferAttribute(data.geometry.colors, 3))
     geometry.setAttribute('uv', new THREE.BufferAttribute(data.geometry.uvs, 2))
-    if (data.geometry.using32Array) {
-      geometry.index = new THREE.Uint32BufferAttribute(data.geometry.indices, 1)
-    } else {
-      geometry.index = new THREE.Uint16BufferAttribute(data.geometry.indices, 1)
-    }
+    geometry.index = new THREE.BufferAttribute(data.geometry.indices as Uint32Array | Uint16Array, 1)
 
     const mesh = new THREE.Mesh(geometry, this.material)
     mesh.position.set(data.geometry.sx, data.geometry.sy, data.geometry.sz)
@@ -447,7 +448,6 @@ export class WorldRendererThree extends WorldRendererCommon {
     const start = performance.now()
     this.lastRendered = performance.now()
     this.cursorBlock.render()
-
     this.updateSectionOffsets()
 
     const sizeOrFovChanged = sizeChanged || this.displayOptions.inWorldRenderingConfig.fov !== this.camera.fov
@@ -468,6 +468,14 @@ export class WorldRendererThree extends WorldRendererCommon {
       this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
     }
 
+    for (const fountain of this.fountains) {
+      if (this.sectionObjects[fountain.sectionId] && !this.sectionObjects[fountain.sectionId].foutain) {
+        fountain.createParticles(this.sectionObjects[fountain.sectionId])
+        this.sectionObjects[fountain.sectionId].foutain = true
+      }
+      fountain.render()
+    }
+
     for (const onRender of this.onRender) {
       onRender()
     }
diff --git a/src/appConfig.ts b/src/appConfig.ts
index 531c258d..497b95ec 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -26,6 +26,9 @@ export type AppConfig = {
   splashText?: string
   pauseLinks?: Array<Array<Record<string, any>>>
   keybindings?: Record<string, any>
+  defaultLanguage?: string
+  displayLanguageSelector?: boolean
+  supportedLanguages?: string[]
 }
 
 export const loadAppConfig = (appConfig: AppConfig) => {
diff --git a/src/index.ts b/src/index.ts
index e370e8be..4919e099 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -14,6 +14,7 @@ import './mineflayer/java-tester/index'
 import './external'
 import './appConfig'
 import './mineflayer/timers'
+import './mineflayer/plugins'
 import { getServerInfo } from './mineflayer/mc-protocol'
 import { onGameLoad } from './inventoryWindows'
 import initCollisionShapes from './getCollisionInteractionShapes'
@@ -78,11 +79,10 @@ import { ConnectOptions, loadMinecraftData, getVersionAutoSelect, downloadOtherG
 import { ref, subscribe } from 'valtio'
 import { signInMessageState } from './react/SignInMessageProvider'
 import { updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/serversStorage'
-import packetsPatcher from './mineflayer/plugins/packetsPatcher'
 import { mainMenuState } from './react/MainMenuRenderApp'
 import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
-import { getViewerVersionData, getWsProtocolStream, onBotCreatedViewerHandler } from './viewerConnector'
+import { getViewerVersionData, getWsProtocolStream, handleCustomChannel } from './viewerConnector'
 import { getWebsocketStream } from './mineflayer/websocket-core'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 import { playerState } from './mineflayer/playerState'
@@ -111,7 +111,6 @@ void registerServiceWorker().then(() => {
 watchFov()
 initCollisionShapes()
 initializePacketsReplay()
-packetsPatcher()
 onAppLoad()
 customChannels()
 
@@ -622,14 +621,6 @@ export async function connect (connectOptions: ConnectOptions) {
   }
   if (!bot) return
 
-  if (connectOptions.server) {
-    bot.loadPlugin(ping)
-  }
-  bot.loadPlugin(mouse)
-  if (!localReplaySession) {
-    bot.loadPlugin(localRelayServerPlugin)
-  }
-
   const p2pConnectTimeout = p2pMultiplayer ? setTimeout(() => { throw new UserError('Spawn timeout. There might be error on the other side, check console.') }, 20_000) : undefined
 
   // bot.on('inject_allowed', () => {
diff --git a/src/mineflayer/plugins/index.ts b/src/mineflayer/plugins/index.ts
new file mode 100644
index 00000000..6ac11376
--- /dev/null
+++ b/src/mineflayer/plugins/index.ts
@@ -0,0 +1,21 @@
+import { lastConnectOptions } from '../../react/AppStatusProvider'
+import mouse from './mouse'
+import packetsPatcher from './packetsPatcher'
+import { localRelayServerPlugin } from './packetsRecording'
+import ping from './ping'
+import webFeatures from './webFeatures'
+
+// register
+webFeatures()
+packetsPatcher()
+
+
+customEvents.on('mineflayerBotCreated', () => {
+  if (lastConnectOptions.value!.server) {
+    bot.loadPlugin(ping)
+  }
+  bot.loadPlugin(mouse)
+  if (!lastConnectOptions.value!.worldStateFileContents) {
+    bot.loadPlugin(localRelayServerPlugin)
+  }
+})
diff --git a/src/mineflayer/plugins/webFeatures.ts b/src/mineflayer/plugins/webFeatures.ts
new file mode 100644
index 00000000..c56d7d66
--- /dev/null
+++ b/src/mineflayer/plugins/webFeatures.ts
@@ -0,0 +1,12 @@
+import { Bot } from 'mineflayer'
+import { getAppLanguage } from '../../optionsStorage'
+
+export default () => {
+  customEvents.on('mineflayerBotCreated', () => {
+    bot.loadPlugin(plugin)
+  })
+}
+
+const plugin = (bot: Bot) => {
+  bot.settings['locale'] = getAppLanguage()
+}
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 55d107ce..975c0e5b 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -231,6 +231,18 @@ export const guiOptionsScheme: {
       custom () {
         return <Button label='VR...' onClick={() => openOptionsMenu('VR')} inScreen />
       },
+    },
+    {
+      custom () {
+        const { appConfig } = useSnapshot(miscUiState)
+        if (!appConfig?.displayLanguageSelector) return null
+        return <Button
+          label='Language...' onClick={async () => {
+            const newLang = await showOptionsModal('Set Language', (appConfig.supportedLanguages ?? []) as string[])
+            if (!newLang) return
+            options.language = newLang.split(' - ')[0]
+          }} inScreen />
+      },
     }
   ],
   interface: [
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 3cc91517..e9aa3dfe 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -4,6 +4,7 @@ import { omitObj } from '@zardoy/utils'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 import type { AppConfig } from './appConfig'
 import { appStorage } from './react/appStorageProvider'
+import { miscUiState } from './globalState'
 
 const isDev = process.env.NODE_ENV === 'development'
 const initialAppConfig = process.env?.INLINED_APP_CONFIG as AppConfig ?? {}
@@ -60,7 +61,7 @@ const defaultOptions = {
   customChannels: false,
   remoteContentNotSameOrigin: false as boolean | string[],
   packetsRecordingAutoStart: false,
-  locale: 'auto',
+  language: 'auto',
   preciseMouseInput: false,
   // todo ui setting, maybe enable by default?
   waitForChunksRender: false as 'sp-only' | boolean,
@@ -295,9 +296,9 @@ export const useOptionValue = (setting, valueCallback) => {
   subscribe(setting, valueCallback)
 }
 
-export const getLocale = () => {
-  if (options.locale === 'auto') {
-    return navigator.language
+export const getAppLanguage = () => {
+  if (options.language === 'auto') {
+    return miscUiState.appConfig?.defaultLanguage ?? navigator.language
   }
-  return options.locale
+  return options.language
 }
diff --git a/src/react/Button.tsx b/src/react/Button.tsx
index 23bef5d0..1ef9be33 100644
--- a/src/react/Button.tsx
+++ b/src/react/Button.tsx
@@ -14,6 +14,7 @@ interface Props extends React.ComponentProps<'button'> {
   inScreen?: boolean
   rootRef?: Ref<HTMLButtonElement>
   overlayColor?: string
+  noTranslate?: boolean
 }
 
 const ButtonContext = createContext({
@@ -24,7 +25,7 @@ export const ButtonProvider: FC<{ children, onClick }> = ({ children, onClick })
   return <ButtonContext.Provider value={{ onClick }}>{children}</ButtonContext.Provider>
 }
 
-export default (({ label, icon, children, inScreen, rootRef, type = 'button', postLabel, overlayColor, ...args }) => {
+export default (({ label, icon, children, inScreen, rootRef, type = 'button', postLabel, overlayColor, noTranslate, ...args }) => {
   const ctx = useContext(ButtonContext)
 
   const onClick = (e) => {
@@ -40,12 +41,23 @@ export default (({ label, icon, children, inScreen, rootRef, type = 'button', po
     args.style.width = 20
   }
 
+  const tryToTranslate = (maybeText: any) => {
+    if (noTranslate) return maybeText
+    if (typeof maybeText === 'string') {
+      return window.translateText?.(maybeText) ?? maybeText
+    }
+    if (Array.isArray(maybeText)) {
+      return maybeText.map(tryToTranslate)
+    }
+    return maybeText
+  }
+
   return <SharedHudVars>
     <button ref={rootRef} {...args} className={classNames(buttonCss.button, args.className)} onClick={onClick} type={type}>
       {icon && <PixelartIcon className={buttonCss.icon} iconName={icon} />}
-      {label}
+      {tryToTranslate(label)}
       {postLabel}
-      {children}
+      {tryToTranslate(children)}
       {overlayColor && <div style={{
         position: 'absolute',
         inset: 0,

From 109daa278337af0b745d1a5ddf9e38d30dec04d8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 23 Apr 2025 05:59:49 +0300
Subject: [PATCH 479/753] fix imports

---
 src/index.ts | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 4919e099..434c47eb 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -28,8 +28,7 @@ import { options } from './optionsStorage'
 import './reactUi'
 import { lockUrl, onBotCreate } from './controls'
 import './dragndrop'
-import { possiblyCleanHandle, resetStateAfterDisconnect } from './browserfs'
-import { watchOptionsAfterViewerInit, watchOptionsAfterWorldViewInit } from './watchOptions'
+import { possiblyCleanHandle } from './browserfs'
 import downloadAndOpenFile from './downloadAndOpenFile'
 
 import fs from 'fs'
@@ -75,25 +74,22 @@ import { showNotification } from './react/NotificationProvider'
 import { saveToBrowserMemory } from './react/PauseScreen'
 import './devReload'
 import './water'
-import { ConnectOptions, loadMinecraftData, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData } from './connect'
+import { ConnectOptions, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData } from './connect'
 import { ref, subscribe } from 'valtio'
 import { signInMessageState } from './react/SignInMessageProvider'
 import { updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/serversStorage'
 import { mainMenuState } from './react/MainMenuRenderApp'
 import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
-import { getViewerVersionData, getWsProtocolStream, handleCustomChannel } from './viewerConnector'
+import { getViewerVersionData, getWsProtocolStream, onBotCreatedViewerHandler } from './viewerConnector'
 import { getWebsocketStream } from './mineflayer/websocket-core'
 import { appQueryParams, appQueryParamsArray } from './appParams'
 import { playerState } from './mineflayer/playerState'
 import { states } from 'minecraft-protocol'
 import { initMotionTracking } from './react/uiMotion'
 import { UserError } from './mineflayer/userError'
-import ping from './mineflayer/plugins/ping'
-import mouse from './mineflayer/plugins/mouse'
 import { startLocalReplayServer } from './packetsReplay/replayPackets'
-import { localRelayServerPlugin } from './mineflayer/plugins/packetsRecording'
-import { createConsoleLogProgressReporter, createFullScreenProgressReporter, createWrappedProgressReporter, ProgressReporter } from './core/progressReporter'
+import { createFullScreenProgressReporter, createWrappedProgressReporter, ProgressReporter } from './core/progressReporter'
 import { appViewer } from './appViewer'
 import './appViewerLoad'
 import { registerOpenBenchmarkListener } from './benchmark'

From 28faa9417a8c9a8d27f447ff1f05794d990c443d Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 23 Apr 2025 09:17:33 +0300
Subject: [PATCH 480/753] feat: Client side js mods. Modding! (#255)

---
 assets/config.html                         |  39 ++
 renderer/viewer/three/entity/EntityMesh.ts |   1 +
 renderer/viewer/three/graphicsBackend.ts   |  27 +-
 rsbuild.config.ts                          |   1 +
 src/appConfig.ts                           |   1 +
 src/appViewer.ts                           |   7 +-
 src/appViewerLoad.ts                       |  14 +-
 src/clientMods.ts                          | 582 +++++++++++++++++++++
 src/core/progressReporter.ts               |   3 +-
 src/defaultLocalServerOptions.js           |   1 +
 src/index.ts                               |  15 +-
 src/optionsGuiScheme.tsx                   |  10 +
 src/optionsStorage.ts                      |   3 +
 src/react/CreateWorld.tsx                  |  47 +-
 src/react/CreateWorldProvider.tsx          |  21 +-
 src/react/Input.tsx                        |   2 +-
 src/react/ModsPage.tsx                     | 483 +++++++++++++++++
 src/react/Screen.tsx                       |   5 +-
 src/react/SelectOption.tsx                 |  32 +-
 src/react/appStorageProvider.ts            |   6 +-
 src/react/mods.module.css                  | 193 +++++++
 src/react/mods.module.css.d.ts             |  25 +
 src/reactUi.tsx                            |   5 +-
 23 files changed, 1494 insertions(+), 29 deletions(-)
 create mode 100644 assets/config.html
 create mode 100644 src/clientMods.ts
 create mode 100644 src/react/ModsPage.tsx
 create mode 100644 src/react/mods.module.css
 create mode 100644 src/react/mods.module.css.d.ts

diff --git a/assets/config.html b/assets/config.html
new file mode 100644
index 00000000..9bd2dd8e
--- /dev/null
+++ b/assets/config.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Configure client</title>
+    <script>
+        function removeSettings() {
+            if (confirm('Are you sure you want to RESET ALL SETTINGS?')) {
+                localStorage.setItem('options', '{}');
+                location.reload();
+            }
+        }
+
+        function removeAllData() {
+            localStorage.removeItem('serversList')
+            localStorage.removeItem('serversHistory')
+            localStorage.removeItem('authenticatedAccounts')
+            localStorage.removeItem('modsAutoUpdateLastCheck')
+            localStorage.removeItem('firstModsPageVisit')
+            localStorage.removeItem('proxiesData')
+            localStorage.removeItem('keybindings')
+            localStorage.removeItem('username')
+            localStorage.removeItem('customCommands')
+            localStorage.removeItem('options')
+        }
+    </script>
+</head>
+<body>
+    <div style="display: flex;gap: 10px;">
+        <button onclick="removeSettings()">Reset all settings</button>
+        <button onclick="removeAllData()">Remove all user data (but not mods or worlds)</button>
+        <!-- <button>Remove all user data (worlds, resourcepacks)</button> -->
+        <!-- <button>Remove all mods</button> -->
+        <!-- <button>Remove all mod repositories</button> -->
+    </div>
+    <input />
+</body>
+</html>
diff --git a/renderer/viewer/three/entity/EntityMesh.ts b/renderer/viewer/three/entity/EntityMesh.ts
index af6cc576..488a0f86 100644
--- a/renderer/viewer/three/entity/EntityMesh.ts
+++ b/renderer/viewer/three/entity/EntityMesh.ts
@@ -551,3 +551,4 @@ export class EntityMesh {
     }
   }
 }
+window.EntityMesh = EntityMesh
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index b0fe5f28..14534d40 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -1,8 +1,8 @@
 import * as THREE from 'three'
 import { Vec3 } from 'vec3'
-import { proxy } from 'valtio'
-import { GraphicsBackendLoader, GraphicsBackend, GraphicsInitOptions, DisplayWorldOptions, RendererReactiveState } from '../../../src/appViewer'
+import { GraphicsBackendLoader, GraphicsBackend, GraphicsInitOptions, DisplayWorldOptions } from '../../../src/appViewer'
 import { ProgressReporter } from '../../../src/core/progressReporter'
+import { showNotification } from '../../../src/react/NotificationProvider'
 import { WorldRendererThree } from './worldrendererThree'
 import { DocumentRenderer } from './documentRenderer'
 import { PanoramaRenderer } from './panorama'
@@ -53,12 +53,14 @@ const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitO
   let panoramaRenderer: PanoramaRenderer | null = null
   let worldRenderer: WorldRendererThree | null = null
 
-  const startPanorama = () => {
+  const startPanorama = async () => {
     if (worldRenderer) return
     if (!panoramaRenderer) {
       panoramaRenderer = new PanoramaRenderer(documentRenderer, initOptions, !!process.env.SINGLE_FILE_BUILD_MODE)
-      void panoramaRenderer.start()
       window.panoramaRenderer = panoramaRenderer
+      callModsMethod('panoramaCreated', panoramaRenderer)
+      await panoramaRenderer.start()
+      callModsMethod('panoramaReady', panoramaRenderer)
     }
   }
 
@@ -79,6 +81,7 @@ const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitO
       worldRenderer?.render(sizeChanged)
     }
     window.world = worldRenderer
+    callModsMethod('worldReady', worldRenderer)
   }
 
   const disconnect = () => {
@@ -120,8 +123,24 @@ const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitO
     }
   }
 
+  globalThis.threeJsBackend = backend
+  globalThis.resourcesManager = initOptions.resourcesManager
+  callModsMethod('default', backend)
+
   return backend
 }
 
+const callModsMethod = (method: string, ...args: any[]) => {
+  for (const mod of Object.values((window.loadedMods ?? {}) as Record<string, any>)) {
+    try {
+      mod.threeJsBackendModule?.[method]?.(...args)
+    } catch (err) {
+      const errorMessage = `[mod three.js] Error calling ${method} on ${mod.name}: ${err}`
+      showNotification(errorMessage, 'error')
+      throw new Error(errorMessage)
+    }
+  }
+}
+
 createGraphicsBackend.id = 'threejs'
 export default createGraphicsBackend
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 36ccb9b0..b1567c6e 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -173,6 +173,7 @@ const appConfig = defineConfig({
                     fs.copyFileSync('./assets/favicon.png', './dist/favicon.png')
                     fs.copyFileSync('./assets/playground.html', './dist/playground.html')
                     fs.copyFileSync('./assets/manifest.json', './dist/manifest.json')
+                    fs.copyFileSync('./assets/config.html', './dist/config.html')
                     fs.copyFileSync('./assets/loading-bg.jpg', './dist/loading-bg.jpg')
                     if (fs.existsSync('./assets/release.json')) {
                         fs.copyFileSync('./assets/release.json', './dist/release.json')
diff --git a/src/appConfig.ts b/src/appConfig.ts
index 497b95ec..156c5974 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -29,6 +29,7 @@ export type AppConfig = {
   defaultLanguage?: string
   displayLanguageSelector?: boolean
   supportedLanguages?: string[]
+  showModsButton?: boolean
 }
 
 export const loadAppConfig = (appConfig: AppConfig) => {
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 0f29b9a6..ca62bd1b 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -89,6 +89,8 @@ export interface GraphicsBackend {
 }
 
 export class AppViewer {
+  waitBackendLoadPromises = [] as Array<Promise<void>>
+
   resourcesManager = new ResourcesManager()
   worldView: WorldDataEmitter | undefined
   readonly config: GraphicsBackendConfig = {
@@ -114,11 +116,14 @@ export class AppViewer {
     this.disconnectBackend()
   }
 
-  loadBackend (loader: GraphicsBackendLoader) {
+  async loadBackend (loader: GraphicsBackendLoader) {
     if (this.backend) {
       this.disconnectBackend()
     }
 
+    await Promise.all(this.waitBackendLoadPromises)
+    this.waitBackendLoadPromises = []
+
     this.backendLoader = loader
     const rendererSpecificSettings = {} as Record<string, any>
     const rendererSettingsKey = `renderer.${this.backendLoader?.id}`
diff --git a/src/appViewerLoad.ts b/src/appViewerLoad.ts
index 96e3bf03..53260662 100644
--- a/src/appViewerLoad.ts
+++ b/src/appViewerLoad.ts
@@ -9,25 +9,27 @@ import { showNotification } from './react/NotificationProvider'
 const backends = [
   createGraphicsBackend,
 ]
-const loadBackend = () => {
+const loadBackend = async () => {
   let backend = backends.find(backend => backend.id === options.activeRenderer)
   if (!backend) {
     showNotification(`No backend found for renderer ${options.activeRenderer}`, `Falling back to ${backends[0].id}`, true)
     backend = backends[0]
   }
-  appViewer.loadBackend(backend)
+  await appViewer.loadBackend(backend)
 }
 window.loadBackend = loadBackend
 if (process.env.SINGLE_FILE_BUILD_MODE) {
   const unsub = subscribeKey(miscUiState, 'fsReady', () => {
     if (miscUiState.fsReady) {
       // don't do it earlier to load fs and display menu faster
-      loadBackend()
+      void loadBackend()
       unsub()
     }
   })
 } else {
-  loadBackend()
+  setTimeout(() => {
+    void loadBackend()
+  })
 }
 
 const animLoop = () => {
@@ -40,10 +42,10 @@ watchOptionsAfterViewerInit()
 
 // reset backend when renderer changes
 
-subscribeKey(options, 'activeRenderer', () => {
+subscribeKey(options, 'activeRenderer', async () => {
   if (appViewer.currentDisplay === 'world' && bot) {
     appViewer.resetBackend(true)
-    loadBackend()
+    await loadBackend()
     void appViewer.startWithBot()
   }
 })
diff --git a/src/clientMods.ts b/src/clientMods.ts
new file mode 100644
index 00000000..a6242d1a
--- /dev/null
+++ b/src/clientMods.ts
@@ -0,0 +1,582 @@
+/* eslint-disable no-await-in-loop */
+import { openDB } from 'idb'
+import * as React from 'react'
+import * as valtio from 'valtio'
+import * as valtioUtils from 'valtio/utils'
+import { gt } from 'semver'
+import { proxy } from 'valtio'
+import { options } from './optionsStorage'
+import { appStorage } from './react/appStorageProvider'
+import { showInputsModal, showOptionsModal } from './react/SelectOption'
+import { ProgressReporter } from './core/progressReporter'
+
+let sillyProtection = false
+const protectRuntime = () => {
+  if (sillyProtection) return
+  sillyProtection = true
+  const sensetiveKeys = new Set(['authenticatedAccounts', 'serversList', 'username'])
+  const proxy = new Proxy(window.localStorage, {
+    get (target, prop) {
+      if (typeof prop === 'string') {
+        if (sensetiveKeys.has(prop)) {
+          console.warn(`Access to sensitive key "${prop}" was blocked`)
+          return null
+        }
+        if (prop === 'getItem') {
+          return (key: string) => {
+            if (sensetiveKeys.has(key)) {
+              console.warn(`Access to sensitive key "${key}" via getItem was blocked`)
+              return null
+            }
+            return target.getItem(key)
+          }
+        }
+        if (prop === 'setItem') {
+          return (key: string, value: string) => {
+            if (sensetiveKeys.has(key)) {
+              console.warn(`Attempt to set sensitive key "${key}" via setItem was blocked`)
+              return
+            }
+            target.setItem(key, value)
+          }
+        }
+        if (prop === 'removeItem') {
+          return (key: string) => {
+            if (sensetiveKeys.has(key)) {
+              console.warn(`Attempt to delete sensitive key "${key}" via removeItem was blocked`)
+              return
+            }
+            target.removeItem(key)
+          }
+        }
+        if (prop === 'clear') {
+          console.warn('Attempt to clear localStorage was blocked')
+          return () => {}
+        }
+      }
+      return Reflect.get(target, prop)
+    },
+    set (target, prop, value) {
+      if (typeof prop === 'string' && sensetiveKeys.has(prop)) {
+        console.warn(`Attempt to set sensitive key "${prop}" was blocked`)
+        return false
+      }
+      return Reflect.set(target, prop, value)
+    },
+    deleteProperty (target, prop) {
+      if (typeof prop === 'string' && sensetiveKeys.has(prop)) {
+        console.warn(`Attempt to delete sensitive key "${prop}" was blocked`)
+        return false
+      }
+      return Reflect.deleteProperty(target, prop)
+    }
+  })
+  Object.defineProperty(window, 'localStorage', {
+    value: proxy,
+    writable: false,
+    configurable: false,
+  })
+}
+
+// #region Database
+const dbPromise = openDB('mods-db', 1, {
+  upgrade (db) {
+    db.createObjectStore('mods', {
+      keyPath: 'name',
+    })
+    db.createObjectStore('repositories', {
+      keyPath: 'url',
+    })
+  },
+})
+
+// mcraft-repo.json
+export interface McraftRepoFile {
+  packages: ClientModDefinition[]
+  /** @default true */
+  prefix?: string | boolean
+  name?: string // display name
+  description?: string
+  mirrorUrls?: string[]
+  autoUpdateOverride?: boolean
+  lastUpdated?: number
+}
+export interface Repository extends McraftRepoFile {
+  url: string
+}
+
+export interface ClientMod {
+  name: string; // unique identifier like owner.name
+  version: string
+  enabled?: boolean
+
+  scriptMainUnstable?: string;
+  serverPlugin?: string
+  // serverPlugins?: string[]
+  // mesherThread?: string
+  stylesGlobal?: string
+  threeJsBackend?: string // three.js
+  // stylesLocal?: string
+
+  requiresNetwork?: boolean
+  fullyOffline?: boolean
+  description?: string
+  author?: string
+  section?: string
+  autoUpdateOverride?: boolean
+  lastUpdated?: number
+  wasModifiedLocally?: boolean
+  // todo depends, hashsum
+}
+
+const cleanupFetchedModData = (mod: ClientModDefinition | Record<string, any>) => {
+  delete mod['enabled']
+  delete mod['repo']
+  delete mod['autoUpdateOverride']
+  delete mod['lastUpdated']
+  delete mod['wasModifiedLocally']
+  return mod
+}
+
+export type ClientModDefinition = Omit<ClientMod, 'enabled' | 'wasModifiedLocally'> & {
+  scriptMainUnstable?: boolean
+  stylesGlobal?: boolean
+  serverPlugin?: boolean
+  threeJsBackend?: boolean
+}
+
+export async function saveClientModData (data: ClientMod) {
+  const db = await dbPromise
+  data.lastUpdated = Date.now()
+  await db.put('mods', data)
+  modsReactiveUpdater.counter++
+}
+
+async function getPlugin (name: string) {
+  const db = await dbPromise
+  return db.get('mods', name) as Promise<ClientMod | undefined>
+}
+
+async function getAllMods () {
+  const db = await dbPromise
+  return db.getAll('mods') as Promise<ClientMod[]>
+}
+
+async function deletePlugin (name) {
+  const db = await dbPromise
+  await db.delete('mods', name)
+  modsReactiveUpdater.counter++
+}
+
+async function removeAllMods () {
+  const db = await dbPromise
+  await db.clear('mods')
+  modsReactiveUpdater.counter++
+}
+
+// ---
+
+async function saveRepository (data: Repository) {
+  const db = await dbPromise
+  data.lastUpdated = Date.now()
+  await db.put('repositories', data)
+}
+
+async function getRepository (url: string) {
+  const db = await dbPromise
+  return db.get('repositories', url) as Promise<Repository | undefined>
+}
+
+async function getAllRepositories () {
+  const db = await dbPromise
+  return db.getAll('repositories') as Promise<Repository[]>
+}
+window.getAllRepositories = getAllRepositories
+
+async function deleteRepository (url) {
+  const db = await dbPromise
+  await db.delete('repositories', url)
+}
+
+// ---
+
+// #endregion
+
+window.mcraft = {
+  version: process.env.RELEASE_TAG,
+  build: process.env.BUILD_VERSION,
+  ui: {},
+  React,
+  valtio: {
+    ...valtio,
+    ...valtioUtils,
+  },
+  // openDB
+}
+
+const activateMod = async (mod: ClientMod, reason: string) => {
+  if (mod.enabled === false) return false
+  protectRuntime()
+  console.debug(`Activating mod ${mod.name} (${reason})...`)
+  window.loadedMods ??= {}
+  if (window.loadedMods[mod.name]) {
+    console.warn(`Mod is ${mod.name} already loaded, skipping activation...`)
+    return false
+  }
+  if (mod.stylesGlobal) {
+    const style = document.createElement('style')
+    style.textContent = mod.stylesGlobal
+    style.id = `mod-${mod.name}`
+    document.head.appendChild(style)
+  }
+  if (mod.scriptMainUnstable) {
+    const blob = new Blob([mod.scriptMainUnstable], { type: 'text/javascript' })
+    const url = URL.createObjectURL(blob)
+    // eslint-disable-next-line no-useless-catch
+    try {
+      const module = await import(/* webpackIgnore: true */ url)
+      module.default?.(structuredClone(mod))
+      window.loadedMods[mod.name] ??= {}
+      window.loadedMods[mod.name].mainUnstableModule = module
+    } catch (e) {
+      throw e
+    }
+    URL.revokeObjectURL(url)
+  }
+  if (mod.threeJsBackend) {
+    const blob = new Blob([mod.threeJsBackend], { type: 'text/javascript' })
+    const url = URL.createObjectURL(blob)
+    // eslint-disable-next-line no-useless-catch
+    try {
+      const module = await import(/* webpackIgnore: true */ url)
+      // todo
+      window.loadedMods[mod.name] ??= {}
+      // for accessing global world var
+      window.loadedMods[mod.name].threeJsBackendModule = module
+    } catch (e) {
+      throw e
+    }
+    URL.revokeObjectURL(url)
+  }
+  mod.enabled = true
+  return true
+}
+
+export const appStartup = async () => {
+  void checkModsUpdates()
+
+  const mods = await getAllMods()
+  for (const mod of mods) {
+    await activateMod(mod, 'autostart').catch(e => {
+      modsErrors[mod.name] ??= []
+      modsErrors[mod.name].push(`startup: ${String(e)}`)
+      console.error(`Error activating mod on startup ${mod.name}:`, e)
+    })
+  }
+}
+
+export const modsUpdateStatus = proxy({} as Record<string, [string, string]>)
+export const modsWaitingReloadStatus = proxy({} as Record<string, boolean>)
+export const modsErrors = proxy({} as Record<string, string[]>)
+
+const normalizeRepoUrl = (url: string) => {
+  if (url.startsWith('https://')) return url
+  if (url.startsWith('http://')) return url
+  if (url.startsWith('//')) return `https:${url}`
+  return `https://raw.githubusercontent.com/${url}/master`
+}
+
+const installOrUpdateMod = async (repo: Repository, mod: ClientModDefinition, activate = true, progress?: ProgressReporter) => {
+  // eslint-disable-next-line no-useless-catch
+  try {
+    const fetchData = async (urls: string[]) => {
+      const errored = [] as string[]
+      // eslint-disable-next-line no-unreachable-loop
+      for (const urlTemplate of urls) {
+        const modNameOnly = mod.name.split('.').pop()
+        const modFolder = repo.prefix === false ? modNameOnly : typeof repo.prefix === 'string' ? `${repo.prefix}/${modNameOnly}` : mod.name
+        const url = new URL(`${modFolder}/${urlTemplate}`, normalizeRepoUrl(repo.url).replace(/\/$/, '') + '/').href
+        // eslint-disable-next-line no-useless-catch
+        try {
+          const response = await fetch(url)
+          if (!response.ok) throw new Error(`Failed to fetch ${url}: ${response.status} ${response.statusText}`)
+          return await response.text()
+        } catch (e) {
+          // errored.push(String(e))
+          throw e
+        }
+      }
+      console.warn(`[${mod.name}] Error installing component of ${urls[0]}: ${errored.join(', ')}`)
+      return undefined
+    }
+    if (mod.stylesGlobal) {
+      await progress?.executeWithMessage(
+        `Downloading ${mod.name} styles`,
+        async () => {
+          mod.stylesGlobal = await fetchData(['global.css']) as any
+        }
+      )
+    }
+    if (mod.scriptMainUnstable) {
+      await progress?.executeWithMessage(
+        `Downloading ${mod.name} script`,
+        async () => {
+          mod.scriptMainUnstable = await fetchData(['mainUnstable.js']) as any
+        }
+      )
+    }
+    if (mod.threeJsBackend) {
+      await progress?.executeWithMessage(
+        `Downloading ${mod.name} three.js backend`,
+        async () => {
+          mod.threeJsBackend = await fetchData(['three.js']) as any
+        }
+      )
+    }
+    if (mod.serverPlugin) {
+      if (mod.name.endsWith('.disabled')) throw new Error(`Mod name ${mod.name} can't end with .disabled`)
+      await progress?.executeWithMessage(
+        `Downloading ${mod.name} server plugin`,
+        async () => {
+          mod.serverPlugin = await fetchData(['serverPlugin.js']) as any
+        }
+      )
+    }
+    if (activate) {
+      // todo try to de-activate mod if it's already loaded
+      if (window.loadedMods?.[mod.name]) {
+        modsWaitingReloadStatus[mod.name] = true
+      } else {
+        await activateMod(mod as ClientMod, 'install')
+      }
+    }
+    await saveClientModData(mod as ClientMod)
+    delete modsUpdateStatus[mod.name]
+  } catch (e) {
+    // console.error(`Error installing mod ${mod.name}:`, e)
+    throw e
+  }
+}
+
+const checkRepositoryUpdates = async (repo: Repository) => {
+  for (const mod of repo.packages) {
+
+    const modExisting = await getPlugin(mod.name)
+    if (modExisting?.version && gt(mod.version, modExisting.version)) {
+      modsUpdateStatus[mod.name] = [modExisting.version, mod.version]
+      if (options.modsAutoUpdate === 'always' && (!repo.autoUpdateOverride && !modExisting.autoUpdateOverride)) {
+        void installOrUpdateMod(repo, mod).catch(e => {
+          console.error(`Error updating mod ${mod.name}:`, e)
+        })
+      }
+    }
+  }
+
+}
+
+export const fetchRepository = async (urlOriginal: string, url: string, hasMirrors = false) => {
+  const fetchUrl = normalizeRepoUrl(url).replace(/\/$/, '') + '/mcraft-repo.json'
+  try {
+    const response = await fetch(fetchUrl).then(async res => res.json())
+    if (!response.packages) throw new Error(`No packages field in the response json of the repository: ${fetchUrl}`)
+    response.autoUpdateOverride = (await getRepository(urlOriginal))?.autoUpdateOverride
+    response.url = urlOriginal
+    void saveRepository(response)
+    modsReactiveUpdater.counter++
+    return true
+  } catch (e) {
+    console.warn(`Error fetching repository (trying other mirrors) ${url}:`, e)
+    return false
+  }
+}
+
+export const fetchAllRepositories = async () => {
+  const repositories = await getAllRepositories()
+  await Promise.all(repositories.map(async (repo) => {
+    const allUrls = [repo.url, ...(repo.mirrorUrls || [])]
+    for (const [i, url] of allUrls.entries()) {
+      const isLast = i === allUrls.length - 1
+
+      if (await fetchRepository(repo.url, url, !isLast)) break
+    }
+  }))
+  appStorage.modsAutoUpdateLastCheck = Date.now()
+}
+
+const checkModsUpdates = async () => {
+  await autoRefreshModRepositories()
+  for (const repo of await getAllRepositories()) {
+
+    await checkRepositoryUpdates(repo)
+  }
+}
+
+const autoRefreshModRepositories = async () => {
+  if (options.modsAutoUpdate === 'never') return
+  const lastCheck = appStorage.modsAutoUpdateLastCheck
+  if (lastCheck && Date.now() - lastCheck < 1000 * 60 * 60 * options.modsUpdatePeriodCheck) return
+  await fetchAllRepositories()
+  // todo think of not updating check timestamp on offline access
+}
+
+export const installModByName = async (repoUrl: string, name: string, progress?: ProgressReporter) => {
+  progress?.beginStage('main', `Installing ${name}`)
+  const repo = await getRepository(repoUrl)
+  if (!repo) throw new Error(`Repository ${repoUrl} not found`)
+  const mod = repo.packages.find(m => m.name === name)
+  if (!mod) throw new Error(`Mod ${name} not found in repository ${repoUrl}`)
+  await installOrUpdateMod(repo, mod, undefined, progress)
+  progress?.endStage('main')
+}
+
+export const uninstallModAction = async (name: string) => {
+  const choice = await showOptionsModal(`Uninstall mod ${name}?`, ['Yes'])
+  if (!choice) return
+  await deletePlugin(name)
+  window.loadedMods ??= {}
+  if (window.loadedMods[name]) {
+    // window.loadedMods[name].default?.(null)
+    delete window.loadedMods[name]
+    modsWaitingReloadStatus[name] = true
+  }
+  // Clear any errors associated with the mod
+  delete modsErrors[name]
+}
+
+export const setEnabledModAction = async (name: string, newEnabled: boolean) => {
+  const mod = await getPlugin(name)
+  if (!mod) throw new Error(`Mod ${name} not found`)
+  if (newEnabled) {
+    mod.enabled = true
+    if (!window.loadedMods?.[mod.name]) {
+      await activateMod(mod, 'manual')
+    }
+  } else {
+    // todo deactivate mod
+    mod.enabled = false
+    if (window.loadedMods?.[mod.name]) {
+      if (window.loadedMods[mod.name]?.threeJsBackendModule) {
+        window.loadedMods[mod.name].threeJsBackendModule.deactivate()
+        delete window.loadedMods[mod.name].threeJsBackendModule
+      }
+      if (window.loadedMods[mod.name]?.mainUnstableModule) {
+        window.loadedMods[mod.name].mainUnstableModule.deactivate()
+        delete window.loadedMods[mod.name].mainUnstableModule
+      }
+
+      if (Object.keys(window.loadedMods[mod.name]).length === 0) {
+        delete window.loadedMods[mod.name]
+      }
+    }
+  }
+  await saveClientModData(mod)
+}
+
+export const modsReactiveUpdater = proxy({
+  counter: 0
+})
+
+export const getAllModsDisplayList = async () => {
+  const repos = await getAllRepositories()
+  const installedMods = await getAllMods()
+  const modsWithoutRepos = installedMods.filter(mod => !repos.some(repo => repo.packages.some(m => m.name === mod.name)))
+  const mapMods = (mapMods: ClientMod[]) => mapMods.map(mod => ({
+    ...mod,
+    installed: installedMods.find(m => m.name === mod.name),
+    activated: !!window.loadedMods?.[mod.name],
+    installedVersion: installedMods.find(m => m.name === mod.name)?.version,
+    canBeActivated: mod.scriptMainUnstable || mod.stylesGlobal,
+  }))
+  return {
+    repos: repos.map(repo => ({
+      ...repo,
+      packages: mapMods(repo.packages as ClientMod[]),
+    })),
+    modsWithoutRepos: mapMods(modsWithoutRepos),
+  }
+}
+
+export const removeRepositoryAction = async (url: string) => {
+  // todo remove mods
+  const choice = await showOptionsModal('Remove repository? Installed mods wont be automatically removed.', ['Yes'])
+  if (!choice) return
+  await deleteRepository(url)
+  modsReactiveUpdater.counter++
+}
+
+export const selectAndRemoveRepository = async () => {
+  const repos = await getAllRepositories()
+  const choice = await showOptionsModal('Select repository to remove', repos.map(repo => repo.url))
+  if (!choice) return
+  await removeRepositoryAction(choice)
+}
+
+export const addRepositoryAction = async () => {
+  const { url } = await showInputsModal('Add repository', {
+    url: {
+      type: 'text',
+      label: 'Repository URL or slug',
+      placeholder: 'github-owner/repo-name',
+    },
+  })
+  if (!url) return
+  await fetchRepository(url, url)
+}
+
+export const getServerPlugin = async (plugin: string) => {
+  const mod = await getPlugin(plugin)
+  if (!mod) return null
+  if (mod.serverPlugin) {
+    return {
+      content: mod.serverPlugin,
+      version: mod.version
+    }
+  }
+  return null
+}
+
+export const getAvailableServerPlugins = async () => {
+  const mods = await getAllMods()
+  return mods.filter(mod => mod.serverPlugin)
+}
+
+window.inspectInstalledMods = getAllMods
+
+type ModifiableField = {
+  field: string
+  label: string
+  language: string
+  getContent?: () => string
+}
+
+// ---
+
+export const getAllModsModifiableFields = () => {
+  const fields: ModifiableField[] = [
+    {
+      field: 'scriptMainUnstable',
+      label: 'Main Thread Script (unstable)',
+      language: 'js'
+    },
+    {
+      field: 'stylesGlobal',
+      label: 'Global CSS Styles',
+      language: 'css'
+    },
+    {
+      field: 'threeJsBackend',
+      label: 'Three.js Renderer Backend Thread',
+      language: 'js'
+    },
+    {
+      field: 'serverPlugin',
+      label: 'Built-in server plugin',
+      language: 'js'
+    }
+  ]
+  return fields
+}
+
+export const getModModifiableFields = (mod: ClientMod): ModifiableField[] => {
+  return getAllModsModifiableFields().filter(field => mod[field.field])
+}
diff --git a/src/core/progressReporter.ts b/src/core/progressReporter.ts
index a222272d..c76bfb0b 100644
--- a/src/core/progressReporter.ts
+++ b/src/core/progressReporter.ts
@@ -1,6 +1,7 @@
 import { setLoadingScreenStatus } from '../appStatus'
 import { appStatusState } from '../react/AppStatusProvider'
 import { hideNotification, showNotification } from '../react/NotificationProvider'
+import { pixelartIcons } from '../react/PixelartIcon'
 
 export interface ProgressReporter {
   currentMessage: string | undefined
@@ -170,7 +171,7 @@ export const createNotificationProgressReporter = (endMessage?: string): Progres
     },
     end () {
       if (endMessage) {
-        showNotification(endMessage, '', false, '', undefined, true)
+        showNotification(endMessage, '', false, pixelartIcons.check, undefined, true)
       } else {
         hideNotification(id)
       }
diff --git a/src/defaultLocalServerOptions.js b/src/defaultLocalServerOptions.js
index cd949567..2acd3bce 100644
--- a/src/defaultLocalServerOptions.js
+++ b/src/defaultLocalServerOptions.js
@@ -8,6 +8,7 @@ module.exports = {
   'gameMode': 0,
   'difficulty': 0,
   'worldFolder': 'world',
+  'pluginsFolder': true,
   // todo set sid, disable entities auto-spawn
   'generation': {
     // grass_field
diff --git a/src/index.ts b/src/index.ts
index 434c47eb..8678c26e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -81,6 +81,7 @@ import { updateAuthenticatedAccountData, updateLoadedServerData, updateServerCon
 import { mainMenuState } from './react/MainMenuRenderApp'
 import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
+import { appStartup } from './clientMods'
 import { getViewerVersionData, getWsProtocolStream, onBotCreatedViewerHandler } from './viewerConnector'
 import { getWebsocketStream } from './mineflayer/websocket-core'
 import { appQueryParams, appQueryParamsArray } from './appParams'
@@ -95,6 +96,7 @@ import './appViewerLoad'
 import { registerOpenBenchmarkListener } from './benchmark'
 import { tryHandleBuiltinCommand } from './builtinCommands'
 import { loadingTimerState } from './react/LoadingTimer'
+import { loadPluginsIntoWorld } from './react/CreateWorldProvider'
 
 window.debug = debug
 window.beforeRenderFrame = []
@@ -369,6 +371,16 @@ export async function connect (connectOptions: ConnectOptions) {
       // Client (class) of flying-squid (in server/login.js of mc-protocol): onLogin handler: skip most logic & go to loginClient() which assigns uuid and sends 'success' back to client (onLogin handler) and emits 'login' on the server (login.js in flying-squid handler)
       // flying-squid: 'login' -> player.login -> now sends 'login' event to the client (handled in many plugins in mineflayer) -> then 'update_health' is sent which emits 'spawn' in mineflayer
 
+      const serverPlugins = new URLSearchParams(location.search).getAll('serverPlugin')
+      if (serverPlugins.length > 0 && !serverOptions.worldFolder) {
+        console.log('Placing server plugins', serverPlugins)
+
+        serverOptions.worldFolder ??= '/temp'
+        await loadPluginsIntoWorld('/temp', serverPlugins)
+
+        console.log('Server plugins placed')
+      }
+
       localServer = window.localServer = window.server = startLocalServer(serverOptions)
       connectOptions?.connectEvents?.serverCreated?.()
       // todo need just to call quit if started
@@ -669,7 +681,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
   bot.once('login', () => {
     loadingTimerState.networkOnlyStart = 0
-    setLoadingScreenStatus('Loading world')
+    progress.setMessage('Loading world')
   })
 
   let worldWasReady = false
@@ -984,4 +996,5 @@ if (initialLoader) {
 window.pageLoaded = true
 
 void possiblyHandleStateVariable()
+appViewer.waitBackendLoadPromises.push(appStartup())
 registerOpenBenchmarkListener()
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 975c0e5b..20514489 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -14,6 +14,7 @@ import { openFilePicker, resetLocalStorage } from './browserfs'
 import { completeResourcepackPackInstall, getResourcePackNames, resourcepackReload, resourcePackState, uninstallResourcePack } from './resourcePack'
 import { downloadPacketsReplay, packetsRecordingState } from './packetsReplay/packetsReplayLegacy'
 import { showInputsModal, showOptionsModal } from './react/SelectOption'
+import { modsUpdateStatus } from './clientMods'
 import supportedVersions from './supportedVersions.mjs'
 import { getVersionAutoSelect } from './connect'
 import { createNotificationProgressReporter } from './core/progressReporter'
@@ -227,6 +228,15 @@ export const guiOptionsScheme: {
         return <Button label='Advanced...' onClick={() => openOptionsMenu('advanced')} inScreen />
       },
     },
+    {
+      custom () {
+        const { appConfig } = useSnapshot(miscUiState)
+        const modsUpdateSnapshot = useSnapshot(modsUpdateStatus)
+
+        if (appConfig?.showModsButton === false) return null
+        return <Button label={`Client Mods: ${Object.keys(window.loadedMods ?? {}).length} (${Object.keys(modsUpdateSnapshot).length})`} onClick={() => showModal({ reactType: 'mods' })} inScreen />
+      },
+    },
     {
       custom () {
         return <Button label='VR...' onClick={() => openOptionsMenu('VR')} inScreen />
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index e9aa3dfe..61dfa87f 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -66,6 +66,9 @@ const defaultOptions = {
   // todo ui setting, maybe enable by default?
   waitForChunksRender: false as 'sp-only' | boolean,
   jeiEnabled: true as boolean | Array<'creative' | 'survival' | 'adventure' | 'spectator'>,
+  modsSupport: false,
+  modsAutoUpdate: 'check' as 'check' | 'never' | 'always',
+  modsUpdatePeriodCheck: 24, // hours
   preventBackgroundTimeoutKick: false,
   preventSleep: false,
   debugContro: false,
diff --git a/src/react/CreateWorld.tsx b/src/react/CreateWorld.tsx
index a936594b..32e67ddb 100644
--- a/src/react/CreateWorld.tsx
+++ b/src/react/CreateWorld.tsx
@@ -1,11 +1,14 @@
 import { useEffect, useState } from 'react'
 import { proxy, useSnapshot } from 'valtio'
 import { filesize } from 'filesize'
+import { getAvailableServerPlugins } from '../clientMods'
+import { showModal } from '../globalState'
 import Input from './Input'
 import Screen from './Screen'
 import Button from './Button'
 import SelectGameVersion from './SelectGameVersion'
 import styles from './createWorld.module.css'
+import { InputOption, showInputsModal, showOptionsModal } from './SelectOption'
 
 // const worldTypes = ['default', 'flat', 'largeBiomes', 'amplified', 'customized', 'buffet', 'debug_all_block_states']
 const worldTypes = ['default', 'flat'/* , 'void' */]
@@ -15,13 +18,14 @@ export const creatingWorldState = proxy({
   title: '',
   type: worldTypes[0],
   gameMode: gameModes[0],
-  version: ''
+  version: '',
+  plugins: [] as string[]
 })
 
 export default ({ cancelClick, createClick, customizeClick, versions, defaultVersion }) => {
   const [quota, setQuota] = useState('')
 
-  const { title, type, version, gameMode } = useSnapshot(creatingWorldState)
+  const { title, type, version, gameMode, plugins } = useSnapshot(creatingWorldState)
   useEffect(() => {
     creatingWorldState.version = defaultVersion
     void navigator.storage?.estimate?.().then(({ quota, usage }) => {
@@ -69,7 +73,38 @@ export default ({ cancelClick, createClick, customizeClick, versions, defaultVer
         creatingWorldState.gameMode = gameModes[index === gameModes.length - 1 ? 0 : index + 1]
       }}
       >
-        Gamemode: {gameMode}
+        Game Mode: {gameMode}
+      </Button>
+    </div>
+    <div style={{ display: 'flex' }}>
+      <Button onClick={async () => {
+        const availableServerPlugins = await getAvailableServerPlugins()
+        const availableModNames = availableServerPlugins.map(mod => mod.name)
+        const choices: Record<string, InputOption> = Object.fromEntries(availableServerPlugins.map(mod => [mod.name, {
+          type: 'checkbox' as const,
+          defaultValue: creatingWorldState.plugins.includes(mod.name),
+          label: mod.name
+        }]))
+        choices.installMore = {
+          type: 'button' as const,
+          onButtonClick () {
+            showModal({ reactType: 'mods' })
+          }
+        }
+        const choice = await showInputsModal('Select server plugins from mods to install:', choices)
+        if (!choice) return
+        creatingWorldState.plugins = availableModNames.filter(modName => choice[modName])
+      }}
+      >Use Mods ({plugins.length})
+      </Button>
+      <Button
+        onClick={() => {
+          const index = gameModes.indexOf(gameMode)
+          creatingWorldState.gameMode = gameModes[index === gameModes.length - 1 ? 0 : index + 1]
+        }}
+        disabled
+      >
+        Save Type: Java
       </Button>
     </div>
     <div className='muted' style={{ fontSize: 8 }}>Default and other world types are WIP</div>
@@ -80,7 +115,11 @@ export default ({ cancelClick, createClick, customizeClick, versions, defaultVer
       }}
       >Cancel
       </Button>
-      <Button disabled={!title} onClick={createClick}>Create</Button>
+      <Button disabled={!title} onClick={createClick}>
+        <b>
+          Create
+        </b>
+      </Button>
     </div>
     <div className='muted' style={{ fontSize: 9 }}>Note: save important worlds in folders on your hard drive!</div>
     <div className='muted' style={{ fontSize: 9 }}>{quota}</div>
diff --git a/src/react/CreateWorldProvider.tsx b/src/react/CreateWorldProvider.tsx
index b01f129c..6872474d 100644
--- a/src/react/CreateWorldProvider.tsx
+++ b/src/react/CreateWorldProvider.tsx
@@ -1,7 +1,10 @@
+import fs from 'fs'
+import path from 'path'
 import { hideCurrentModal, showModal } from '../globalState'
 import defaultLocalServerOptions from '../defaultLocalServerOptions'
 import { mkdirRecursive, uniqueFileNameFromWorldName } from '../browserfs'
 import supportedVersions from '../supportedVersions.mjs'
+import { getServerPlugin } from '../clientMods'
 import CreateWorld, { WorldCustomize, creatingWorldState } from './CreateWorld'
 import { getWorldsPath } from './SingleplayerProvider'
 import { useIsModalActive } from './utilsApp'
@@ -14,7 +17,7 @@ export default () => {
     const versions = Object.values(versionsPerMinor).map(x => {
       return {
         version: x,
-        label: x === defaultLocalServerOptions.version ? `${x} (available offline)` : x
+        label: x === defaultLocalServerOptions.version ? `${x} (default)` : x
       }
     })
     return <CreateWorld
@@ -24,10 +27,11 @@ export default () => {
       }}
       createClick={async () => {
         // create new world
-        const { title, type, version, gameMode } = creatingWorldState
+        const { title, type, version, gameMode, plugins } = creatingWorldState
         // todo display path in ui + disable if exist
         const savePath = await uniqueFileNameFromWorldName(title, getWorldsPath())
         await mkdirRecursive(savePath)
+        await loadPluginsIntoWorld(savePath, plugins)
         let generation
         if (type === 'flat') {
           generation = {
@@ -68,3 +72,16 @@ export default () => {
   }
   return null
 }
+
+export const loadPluginsIntoWorld = async (worldPath: string, plugins: string[]) => {
+  for (const plugin of plugins) {
+    // eslint-disable-next-line no-await-in-loop
+    const { content, version } = await getServerPlugin(plugin) ?? {}
+    if (content) {
+      // eslint-disable-next-line no-await-in-loop
+      await mkdirRecursive(path.join(worldPath, 'plugins'))
+      // eslint-disable-next-line no-await-in-loop
+      await fs.promises.writeFile(path.join(worldPath, 'plugins', `${plugin}-${version}.js`), content)
+    }
+  }
+}
diff --git a/src/react/Input.tsx b/src/react/Input.tsx
index 169e880d..9b36c5ce 100644
--- a/src/react/Input.tsx
+++ b/src/react/Input.tsx
@@ -35,7 +35,6 @@ const Input = ({ autoFocus, rootStyles, inputRef, validateInput, defaultValue, w
   return <div id='input-container' className={styles.container} style={rootStyles}>
     <input
       ref={ref}
-      className={styles.input}
       autoComplete='off'
       autoCapitalize='off'
       autoCorrect='off'
@@ -43,6 +42,7 @@ const Input = ({ autoFocus, rootStyles, inputRef, validateInput, defaultValue, w
       spellCheck='false'
       style={{ ...validationStyle }}
       {...inputProps}
+      className={styles.input + ' ' + (inputProps.className ?? '')}
       value={value}
       onChange={(e) => {
         setValue(e.target.value)
diff --git a/src/react/ModsPage.tsx b/src/react/ModsPage.tsx
new file mode 100644
index 00000000..6f849fbd
--- /dev/null
+++ b/src/react/ModsPage.tsx
@@ -0,0 +1,483 @@
+import { useEffect, useState, useMemo, useRef } from 'react'
+import { useSnapshot } from 'valtio'
+import { openURL } from 'renderer/viewer/lib/simpleUtils'
+import { addRepositoryAction, setEnabledModAction, getAllModsDisplayList, installModByName, selectAndRemoveRepository, uninstallModAction, fetchAllRepositories, modsReactiveUpdater, modsErrors, fetchRepository, getModModifiableFields, saveClientModData, getAllModsModifiableFields } from '../clientMods'
+import { createNotificationProgressReporter, ProgressReporter } from '../core/progressReporter'
+import { hideModal } from '../globalState'
+import { useIsModalActive } from './utilsApp'
+import Input from './Input'
+import Button from './Button'
+import styles from './mods.module.css'
+import { showOptionsModal, showInputsModal } from './SelectOption'
+import Screen from './Screen'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+import { showNotification } from './NotificationProvider'
+import { usePassesScaledDimensions } from './UIProvider'
+import { appStorage } from './appStorageProvider'
+
+type ModsData = Awaited<ReturnType<typeof getAllModsDisplayList>>
+
+const ModListItem = ({
+  mod,
+  onClick,
+  hasError
+}: {
+  mod: ModsData['repos'][0]['packages'][0],
+  onClick: () => void,
+  hasError: boolean
+}) => (
+  <div
+    className={styles.modRow}
+    onClick={onClick}
+    data-enabled={mod.installed ? '' : mod.activated}
+    data-has-error={hasError}
+  >
+    <div className={styles.modRowTitle}>
+      {mod.name}
+      {mod.installedVersion && mod.installedVersion !== mod.version && (
+        <PixelartIcon
+          iconName={pixelartIcons['arrow-up-box']}
+          styles={{ fontSize: 14, marginLeft: 3 }}
+        />
+      )}
+    </div>
+    <div className={styles.modRowInfo}>
+      {mod.description}
+      {mod.author && ` • By ${mod.author}`}
+      {mod.version && ` • v${mod.version}`}
+      {mod.serverPlugin && ` • World plugin`}
+    </div>
+  </div>
+)
+
+const ModSidebar = ({ mod }: { mod: (ModsData['repos'][0]['packages'][0] & { repo?: string }) | null }) => {
+  const errors = useSnapshot(modsErrors)
+  const [editingField, setEditingField] = useState<{ name: string, content: string, language: string } | null>(null)
+
+  const handleAction = async (action: () => Promise<void>, errorMessage: string, progress?: ProgressReporter) => {
+    try {
+      await action()
+      progress?.end()
+    } catch (error) {
+      console.error(error)
+      progress?.end()
+      showNotification(errorMessage, error.message, true)
+    }
+  }
+
+  if (!mod) {
+    return <div className={styles.modInfoText}>Select a mod to view details</div>
+  }
+
+  const modifiableFields = mod.installed ? getModModifiableFields(mod.installed) : []
+
+  const handleSaveField = async (newContents: string) => {
+    if (!editingField) return
+    try {
+      mod[editingField.name] = newContents
+      mod.wasModifiedLocally = true
+      await saveClientModData(mod)
+      setEditingField(null)
+      showNotification('Success', 'Contents saved successfully')
+    } catch (error) {
+      showNotification('Error', 'Failed to save contents: ' + error.message, true)
+    }
+  }
+
+  if (editingField) {
+    return (
+      <EditingCodeWindow
+        contents={editingField.content}
+        language={editingField.language}
+        onClose={newContents => {
+          if (newContents === undefined) {
+            setEditingField(null)
+            return
+          }
+          void handleSaveField(newContents)
+        }}
+      />
+    )
+  }
+
+  return (
+    <>
+      <div className={styles.modInfo}>
+        <div className={styles.modInfoTitle}>
+          {mod.name} {mod.installed?.wasModifiedLocally ? '(modified)' : ''}
+        </div>
+        <div className={styles.modInfoText}>
+          {mod.description}
+        </div>
+        <div className={styles.modInfoText}>
+          {mod.author && `Author: ${mod.author}\n`}
+          {mod.version && `Version: ${mod.version}\n`}
+          {mod.installedVersion && mod.installedVersion !== mod.version && `Installed version: ${mod.installedVersion}\n`}
+          {mod.section && `Section: ${mod.section}\n`}
+        </div>
+        {errors[mod.name]?.length > 0 && (
+          <div className={styles.modErrorList}>
+            <ul>
+              {errors[mod.name].map((error, i) => (
+                <li key={i}>{error}</li>
+              ))}
+            </ul>
+          </div>
+        )}
+      </div>
+      <div className={styles.modActions}>
+        {mod.installed ? (
+          <>
+            {mod.activated ? (
+              <Button
+                onClick={async () => handleAction(
+                  async () => setEnabledModAction(mod.name, false),
+                  'Failed to disable mod:'
+                )}
+                icon={pixelartIcons['remove-box']}
+                title="Disable"
+              />
+            ) : (
+              <Button
+                onClick={async () => handleAction(
+                  async () => setEnabledModAction(mod.name, true),
+                  'Failed to enable mod:'
+                )}
+                icon={pixelartIcons['add-box']}
+                title="Enable"
+                disabled={!mod.canBeActivated}
+              />
+            )}
+            <Button
+              onClick={async () => handleAction(
+                async () => uninstallModAction(mod.name),
+                'Failed to uninstall mod:'
+              )}
+              icon={pixelartIcons.trash}
+              title="Delete"
+            />
+            {mod.installedVersion && mod.installedVersion !== mod.version && (
+              <Button
+                onClick={async () => {
+                  if (!mod.repo) return
+                  const progress = createNotificationProgressReporter(`${mod.name} updated and activated`)
+                  await handleAction(
+                    async () => {
+                      await installModByName(mod.repo!, mod.name, progress)
+                    },
+                    'Failed to update mod:',
+                    progress
+                  )
+                }}
+                icon={pixelartIcons['arrow-up-box']}
+                title="Update"
+              />
+            )}
+            {mod.serverPlugin && (
+              <Button
+                onClick={async () => {
+                  const url = new URL(window.location.href)
+                  url.searchParams.set('sp', '1')
+                  url.searchParams.set('serverPlugin', mod.name)
+                  openURL(url.toString())
+                }}
+                icon={pixelartIcons.play}
+                title="Try in blank world"
+              />
+            )}
+          </>
+        ) : (
+          <Button
+            onClick={async () => {
+              if (!mod.repo) return
+              const progress = createNotificationProgressReporter(`${mod.name} installed and enabled`)
+              await handleAction(
+                async () => {
+                  await installModByName(mod.repo!, mod.name, progress)
+                },
+                'Failed to install & activate mod:',
+                progress
+              )
+            }}
+            icon={pixelartIcons.download}
+            title="Install"
+          />
+        )}
+        {modifiableFields.length > 0 && (
+          <Button
+            onClick={async (e) => {
+              const fields = e.shiftKey ? getAllModsModifiableFields() : modifiableFields
+              const result = await showInputsModal('Edit Mod Field', Object.fromEntries(fields.map(field => {
+                return [field.field, {
+                  type: 'button' as const,
+                  label: field.label,
+                  onButtonClick () {
+                    setEditingField({
+                      name: field.field,
+                      content: field.getContent?.() || mod.installed![field.field] || '',
+                      language: field.language
+                    })
+                  }
+                }]
+              })), {
+                showConfirm: false
+              })
+            }}
+            icon={pixelartIcons['edit']}
+            title="Edit Mod"
+          />
+        )}
+      </div>
+    </>
+  )
+}
+
+const EditingCodeWindow = ({
+  contents,
+  language,
+  onClose
+}: {
+  contents: string,
+  language: string,
+  onClose: (newContents?: string) => void
+}) => {
+  const ref = useRef<HTMLTextAreaElement>(null)
+
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      if (e.key === 'Escape') {
+        e.preventDefault()
+        e.stopImmediatePropagation()
+      }
+    }
+    window.addEventListener('keydown', handleKeyDown, { capture: true })
+    return () => window.removeEventListener('keydown', handleKeyDown, { capture: true })
+  }, [])
+
+  return <Screen title="Editing code">
+    <div className="">
+      <textarea
+        ref={ref}
+        className={styles.fieldEditorTextarea}
+        defaultValue={contents}
+      />
+      <Button
+        style={{ position: 'absolute', bottom: 10, left: 10, backgroundColor: 'red' }}
+        onClick={() => onClose(undefined)}
+        icon={pixelartIcons.close}
+        title="Cancel"
+      />
+      <Button
+        style={{ position: 'absolute', bottom: 10, right: 10, backgroundColor: '#4CAF50' }}
+        onClick={() => onClose(ref.current?.value)}
+        icon={pixelartIcons.check}
+        title="Save"
+      />
+    </div>
+  </Screen>
+}
+
+export default () => {
+  const isModalActive = useIsModalActive('mods', true)
+  const [modsData, setModsData] = useState<ModsData | null>(null)
+  const [search, setSearch] = useState('')
+  const [showOnlyInstalled, setShowOnlyInstalled] = useState(false)
+  const [showOnlyEnabled, setShowOnlyEnabled] = useState(false)
+  const [selectedModIndex, setSelectedModIndex] = useState<number | null>(null)
+  const [expandedRepos, setExpandedRepos] = useState<Record<string, boolean>>({})
+  const useHorizontalLayout = usePassesScaledDimensions(400)
+  const { counter } = useSnapshot(modsReactiveUpdater)
+  const errors = useSnapshot(modsErrors)
+
+  const allModsArray = useMemo(() => {
+    if (!modsData) return []
+    return [
+      ...modsData.repos.flatMap(repo => repo.packages.map(mod => ({ ...mod, repo: repo.url }))),
+      ...modsData.modsWithoutRepos
+    ]
+  }, [modsData])
+
+  useEffect(() => {
+    if (isModalActive) {
+      if (appStorage.firstModsPageVisit) {
+        appStorage.firstModsPageVisit = false
+        const defaultRepo = 'zardoy/mcraft-client-mods'
+        void fetchRepository(defaultRepo, defaultRepo)
+      }
+      void getAllModsDisplayList().then(mods => {
+        setModsData(mods)
+        // Update selected mod index if needed
+        if (selectedModIndex !== null && selectedModIndex < allModsArray.length) {
+          setSelectedModIndex(selectedModIndex)
+        }
+      })
+    }
+  }, [isModalActive, counter])
+
+  if (!isModalActive) return null
+
+  const toggleRepo = (repoUrl: string) => {
+    setExpandedRepos(prev => ({
+      ...prev,
+      [repoUrl]: !prev[repoUrl]
+    }))
+  }
+
+  const modFilter = (mod: ModsData['repos'][0]['packages'][0]) => {
+    const matchesSearch = mod.name.toLowerCase().includes(search.toLowerCase()) ||
+      mod.description?.toLowerCase().includes(search.toLowerCase())
+    const matchesInstalledFilter = !showOnlyInstalled || mod.installed
+    const matchesEnabledFilter = !showOnlyEnabled || mod.activated
+    return matchesSearch && matchesInstalledFilter && matchesEnabledFilter
+  }
+
+  const filteredMods = modsData ? {
+    repos: modsData.repos.map(repo => ({
+      ...repo,
+      packages: repo.packages.filter(modFilter)
+    })),
+    modsWithoutRepos: modsData.modsWithoutRepos.filter(modFilter)
+  } : null
+
+  const filteredModsCount = filteredMods ?
+    filteredMods.repos.reduce((acc, repo) => acc + repo.packages.length, 0) + filteredMods.modsWithoutRepos.length : 0
+
+  const totalRepos = modsData?.repos.length ?? 0
+
+  const getStatsText = () => {
+    if (!filteredMods) return 'Loading...'
+    if (showOnlyEnabled) {
+      return `Showing ${filteredMods.repos.reduce((acc, repo) => acc + repo.packages.filter(mod => mod.activated).length, 0)} enabled mods in ${totalRepos} repos`
+    } else if (showOnlyInstalled) {
+      return `Showing ${filteredMods.repos.reduce((acc, repo) => acc + repo.packages.filter(mod => mod.installed).length, 0)} installed mods in ${totalRepos} repos`
+    }
+    return `Showing all ${totalRepos} repos with ${filteredModsCount} mods`
+  }
+
+  const selectedMod = selectedModIndex === null ? null : allModsArray[selectedModIndex]
+
+  return <Screen backdrop="dirt" title="Client Mods (Preview)" titleMarginTop={0} contentStyle={{ paddingTop: 15, height: '100%', width: '100%' }}>
+    <Button
+      icon={pixelartIcons['close']}
+      onClick={() => {
+        hideModal()
+      }}
+      style={{
+        color: '#ff5d5d',
+        position: 'fixed',
+        top: 10,
+        left: 20
+      }}
+    />
+    <div className={styles.root}>
+      <div className={styles.header}>
+        <Button
+          style={{}}
+          icon={pixelartIcons['sliders']}
+          onClick={() => {
+            if (showOnlyEnabled) {
+              setShowOnlyEnabled(false)
+            } else if (showOnlyInstalled) {
+              setShowOnlyInstalled(false)
+              setShowOnlyEnabled(true)
+            } else {
+              setShowOnlyInstalled(true)
+            }
+          }}
+          title={showOnlyEnabled ? 'Show all mods' : showOnlyInstalled ? 'Show enabled mods' : 'Show installed mods'}
+        />
+        <Button
+          onClick={async () => {
+            // const refreshButton = `Refresh repositories (last update)`
+            const refreshButton = `Refresh repositories`
+            const choice = await showOptionsModal(`Manage repositories (${modsData?.repos.length ?? '-'} repos)`, ['Add repository', 'Remove repository', refreshButton])
+            switch (choice) {
+              case 'Add repository': {
+                await addRepositoryAction()
+                break
+              }
+              case 'Remove repository': {
+                await selectAndRemoveRepository()
+                break
+              }
+              case refreshButton: {
+                await fetchAllRepositories()
+                break
+              }
+              case undefined:
+                break
+            }
+          }}
+          icon={pixelartIcons['list-box']}
+          title="Manage repositories"
+        />
+        <Input
+          className={styles.searchBar}
+          value={search}
+          onChange={e => setSearch(e.target.value)}
+          placeholder="Search mods in added repositories..."
+          autoFocus
+        />
+      </div>
+      <div className={styles.statsRow}>
+        {getStatsText()}
+      </div>
+      <div className={`${styles.content} ${useHorizontalLayout ? '' : styles.verticalContent}`}>
+        <div className={styles.modList}>
+          {filteredMods ? (
+            <>
+              {filteredMods.repos.map(repo => (
+                <div key={repo.url}>
+                  <div
+                    className={styles.repoHeader}
+                    onClick={() => toggleRepo(repo.url)}
+                  >
+                    <span>{expandedRepos[repo.url] ? '▼' : '▶'}</span>
+                    <span>{repo.name || repo.url}</span>
+                    <span>({repo.packages.length})</span>
+                  </div>
+                  {expandedRepos[repo.url] && (
+                    <div className={styles.repoContent}>
+                      {repo.packages.map((mod) => (
+                        <ModListItem
+                          key={mod.name}
+                          mod={mod}
+                          onClick={() => setSelectedModIndex(allModsArray.findIndex(m => m.name === mod.name))}
+                          hasError={errors[mod.name]?.length > 0}
+                        />
+                      ))}
+                    </div>
+                  )}
+                </div>
+              ))}
+              {filteredMods.modsWithoutRepos.length > 0 && (
+                <div>
+                  <div className={styles.repoHeader}>
+                    <span>▼</span>
+                    <span>Other Mods</span>
+                    <span>({filteredMods.modsWithoutRepos.length})</span>
+                  </div>
+                  <div className={styles.repoContent}>
+                    {filteredMods.modsWithoutRepos.map(mod => (
+                      <ModListItem
+                        key={mod.name}
+                        mod={mod}
+                        onClick={() => setSelectedModIndex(allModsArray.findIndex(m => m.name === mod.name))}
+                        hasError={errors[mod.name]?.length > 0}
+                      />
+                    ))}
+                  </div>
+                </div>
+              )}
+            </>
+          ) : (
+            <div className={styles.modRowInfo}>Loading mods...</div>
+          )}
+        </div>
+        <div className={styles.sidebar}>
+          <ModSidebar mod={selectedMod} />
+        </div>
+      </div>
+    </div>
+  </Screen>
+}
diff --git a/src/react/Screen.tsx b/src/react/Screen.tsx
index a17ede40..605ec28f 100644
--- a/src/react/Screen.tsx
+++ b/src/react/Screen.tsx
@@ -6,14 +6,15 @@ interface Props {
   className?: string
   titleSelectable?: boolean
   titleMarginTop?: number
+  contentStyle?: React.CSSProperties
 }
 
-export default ({ title, children, backdrop = true, style, className = '', titleSelectable, titleMarginTop }: Props) => {
+export default ({ title, children, backdrop = true, style, className = '', titleSelectable, titleMarginTop, contentStyle }: Props) => {
   return (
     <>
       {backdrop === 'dirt' ? <div className='dirt-bg' /> : backdrop ? <div className="backdrop" /> : null}
       <div className={`fullscreen ${className}`} style={{ overflow: 'auto', ...style }}>
-        <div className="screen-content" style={titleMarginTop === undefined ? {} : { marginTop: titleMarginTop }}>
+        <div className="screen-content" style={{ ...contentStyle, ...(titleMarginTop === undefined ? {} : { marginTop: titleMarginTop }) }}>
           <div className={`screen-title ${titleSelectable ? 'text-select' : ''}`}>{title}</div>
           {children}
         </div>
diff --git a/src/react/SelectOption.tsx b/src/react/SelectOption.tsx
index 4df471c0..c7b7ab38 100644
--- a/src/react/SelectOption.tsx
+++ b/src/react/SelectOption.tsx
@@ -48,21 +48,33 @@ export const showOptionsModal = async <T extends string> (
   })
 }
 
-type InputOption = {
-  type: 'text' | 'checkbox'
+export type InputOption = {
+  type: 'text' | 'checkbox' | 'button'
   defaultValue?: string | boolean
   label?: string
+  placeholder?: string
+  onButtonClick?: () => void
 }
 export const showInputsModal = async <T extends Record<string, InputOption>>(
   title: string,
   inputs: T,
-  { cancel = true, minecraftJsonMessage }: { cancel?: boolean, minecraftJsonMessage? } = {}
+  {
+    cancel = true,
+    minecraftJsonMessage,
+    showConfirm = true
+  }: {
+    cancel?: boolean,
+    minecraftJsonMessage?
+    showConfirm?: boolean
+  } = {}
 ): Promise<{
   [K in keyof T]: T[K] extends { type: 'text' }
     ? string
     : T[K] extends { type: 'checkbox' }
       ? boolean
-      : never
+      : T[K] extends { type: 'button' }
+        ? string
+        : never
 }> => {
   showModal({ reactType: 'general-select' })
   let minecraftJsonMessageParsed
@@ -81,7 +93,7 @@ export const showInputsModal = async <T extends Record<string, InputOption>>(
       showCancel: cancel,
       minecraftJsonMessage: minecraftJsonMessageParsed,
       options: [],
-      inputsConfirmButton: 'Confirm'
+      inputsConfirmButton: showConfirm ? 'Confirm' : ''
     })
   })
 }
@@ -130,6 +142,7 @@ export default () => {
                 autoFocus
                 type='text'
                 defaultValue={input.defaultValue as string}
+                placeholder={input.placeholder}
                 onChange={(e) => {
                   inputValues.current[key] = e.target.value
                 }}
@@ -148,6 +161,15 @@ export default () => {
                 {label}
               </label>
             )}
+            {input.type === 'button' && (
+              <Button
+                onClick={() => {
+                  resolveClose(inputValues.current)
+                  input.onButtonClick?.()
+                }}
+              >{label}
+              </Button>
+            )}
           </div>
         })}
       </div>
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index 01420b39..5cef34c1 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -7,6 +7,7 @@ import type { BaseServerInfo } from './AddServerOrConnect'
 
 // when opening html file locally in browser, localStorage is shared between all ever opened html files, so we try to avoid conflicts
 const localStoragePrefix = process.env?.SINGLE_FILE_BUILD ? 'minecraft-web-client:' : ''
+const { localStorage } = window
 
 export interface SavedProxiesData {
   proxies: string[]
@@ -39,6 +40,8 @@ type StorageData = {
   serversHistory: ServerHistoryEntry[]
   authenticatedAccounts: AuthenticatedAccount[]
   serversList: StoreServerItem[] | undefined
+  modsAutoUpdateLastCheck: number | undefined
+  firstModsPageVisit: boolean
 }
 
 const oldKeysAliases: Partial<Record<keyof StorageData, string>> = {
@@ -79,6 +82,8 @@ const defaultStorageData: StorageData = {
   serversHistory: [],
   authenticatedAccounts: [],
   serversList: undefined,
+  modsAutoUpdateLastCheck: undefined,
+  firstModsPageVisit: true,
 }
 
 export const setStorageDataOnAppConfigLoad = () => {
@@ -86,7 +91,6 @@ export const setStorageDataOnAppConfigLoad = () => {
 }
 
 export const appStorage = proxy({ ...defaultStorageData })
-window.appStorage = appStorage
 
 // Restore data from localStorage
 for (const key of Object.keys(defaultStorageData)) {
diff --git a/src/react/mods.module.css b/src/react/mods.module.css
new file mode 100644
index 00000000..2b3184bb
--- /dev/null
+++ b/src/react/mods.module.css
@@ -0,0 +1,193 @@
+.root {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  width: 100%;
+  padding: 10px;
+  padding-top: 0;
+  box-sizing: border-box;
+  gap: 10px;
+}
+
+.header {
+  display: flex;
+  gap: 5px;
+}
+
+.statsRow {
+  color: #999;
+  font-size: 10px;
+  margin-bottom: 8px;
+}
+
+.statsRow {
+  color: #999;
+  font-size: 10px;
+  margin-bottom: 8px;
+}
+
+.searchBar {
+  flex: 1;
+}
+
+.content {
+  display: flex;
+  flex: 1;
+  gap: 10px;
+  overflow: hidden;
+  min-height: 0; /* Important for Firefox */
+}
+
+.verticalContent {
+  flex-direction: column;
+}
+
+.verticalContent .modList {
+  height: 50%;
+  min-height: 200px;
+}
+
+.verticalContent .sidebar {
+  height: 50%;
+  width: 100%;
+}
+
+.modList {
+  flex: 1;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+  background: rgba(0, 0, 0, 0.2);
+  border-radius: 4px;
+  padding: 5px;
+  min-height: 0; /* Important for Firefox */
+  height: 100%;
+}
+
+.sidebar {
+  width: 200px;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  padding: 10px;
+  background: rgba(0, 0, 0, 0.3);
+  border-radius: 4px;
+  flex-shrink: 0;
+  height: 100%;
+}
+
+.modInfo {
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+}
+
+.modInfoTitle {
+  font-size: 12px;
+  font-weight: bold;
+  color: white;
+}
+
+.modInfoText {
+  font-size: 10px;
+  white-space: pre-wrap;
+  color: #bcbcbc;
+}
+
+.modActions {
+  display: flex;
+  gap: 5px;
+}
+
+.modRow {
+  display: flex;
+  flex-direction: column;
+  padding: 8px;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+.modRow:hover {
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.modRowTitle {
+  font-size: 12px;
+  color: white;
+  margin-bottom: 4px;
+  display: flex;
+}
+
+.modRowInfo {
+  font-size: 10px;
+  color: #bcbcbc;
+}
+
+.repoHeader {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  color: #bcbcbc;
+  font-size: 8px;
+  cursor: pointer;
+  padding: 4px;
+  border-radius: 4px;
+}
+
+.repoHeader:hover {
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.repoContent {
+  margin-left: 10px;
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+}
+
+/* Mod state styles */
+.modRow[data-enabled="false"] {
+  opacity: 0.5;
+}
+
+.modRow[data-enabled="true"] {
+  color: lime;
+}
+
+.modRow[data-enabled="true"] .modRowTitle {
+  color: lime;
+}
+
+/* Error state styles */
+.modRow[data-has-error="true"] {
+  background: rgba(255, 0, 0, 0.1);
+}
+
+.modRow[data-has-error="true"] .modRowTitle {
+  color: #ff6b6b;
+}
+
+.modErrorList {
+  font-size: 8px;
+  color: #ff6b6b;
+  margin-top: 5px;
+  padding-left: 10px;
+  list-style-type: disc;
+}
+
+.fieldEditorTextarea {
+  position: absolute;
+  inset: 0;
+  width: 100%;
+  height: 100%;
+  font-size: 7px;
+}
+
+.fieldEditorTextarea {
+  position: absolute;
+
+  width: 100%;
+  height: 100%;
+  padding: 10px;
+}
diff --git a/src/react/mods.module.css.d.ts b/src/react/mods.module.css.d.ts
new file mode 100644
index 00000000..d72d09a1
--- /dev/null
+++ b/src/react/mods.module.css.d.ts
@@ -0,0 +1,25 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  content: string;
+  fieldEditorTextarea: string;
+  header: string;
+  modActions: string;
+  modErrorList: string;
+  modInfo: string;
+  modInfoText: string;
+  modInfoTitle: string;
+  modList: string;
+  modRow: string;
+  modRowInfo: string;
+  modRowTitle: string;
+  repoContent: string;
+  repoHeader: string;
+  root: string;
+  searchBar: string;
+  sidebar: string;
+  statsRow: string;
+  verticalContent: string;
+}
+declare const cssExports: CssExports;
+export default cssExports;
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 04a02ec8..72aff0ef 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -45,6 +45,7 @@ import SignInMessageProvider from './react/SignInMessageProvider'
 import BookProvider from './react/BookProvider'
 import { options } from './optionsStorage'
 import BossBarOverlayProvider from './react/BossBarOverlayProvider'
+import ModsPage from './react/ModsPage'
 import DebugEdges from './react/DebugEdges'
 import GameInteractionOverlay from './react/GameInteractionOverlay'
 import MineflayerPluginHud from './react/MineflayerPluginHud'
@@ -226,7 +227,6 @@ const App = () => {
             <CreateWorldProvider />
             <AppStatusProvider />
             <KeybindingsScreenProvider />
-            <SelectOption />
             <ServersListProvider />
             <OptionsRenderApp />
             <MainMenuRenderApp />
@@ -235,6 +235,9 @@ const App = () => {
             <SignInMessageProvider />
             <PacketsReplayProvider />
             <NotificationProvider />
+            <ModsPage />
+
+            <SelectOption />
 
             <NoModalFoundProvider />
           </RobustPortal>

From d7fdf18416923472bbdd136564d12b5c750dabc8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 24 Apr 2025 03:40:40 +0300
Subject: [PATCH 481/753] feat: jokes over. use a reliable source (thanks to
 ViaVersion!) for sound id mappings to avoid screamers on mobs in latest
 versions

---
 scripts/prepareSounds.mjs    | 47 ++++++++++++++++++++++++++++++------
 src/sounds/botSoundSystem.ts |  2 +-
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/scripts/prepareSounds.mjs b/scripts/prepareSounds.mjs
index 7ff614a2..02026a04 100644
--- a/scripts/prepareSounds.mjs
+++ b/scripts/prepareSounds.mjs
@@ -11,7 +11,12 @@ import supportedVersions from '../src/supportedVersions.mjs'
 
 const __dirname = path.dirname(fileURLToPath(new URL(import.meta.url)))
 
-const targetedVersions = supportedVersions.reverse()
+export const versionToNumber = (ver) => {
+  const [x, y = '0', z = '0'] = ver.split('.')
+  return +`${x.padStart(2, '0')}${y.padStart(2, '0')}${z.padStart(2, '0')}`
+}
+
+const targetedVersions = [...supportedVersions].sort((a, b) => versionToNumber(b) - versionToNumber(a))
 
 /** @type {{name, size, hash}[]} */
 let prevSounds = null
@@ -173,13 +178,36 @@ const writeSoundsMap = async () => {
 
   // todo REMAP ONLY IDS. Do diffs, as mostly only ids are changed between versions
   // const localTargetedVersions = targetedVersions.slice(0, 2)
+  let lastMappingsJson
   const localTargetedVersions = targetedVersions
-  for (const targetedVersion of localTargetedVersions) {
+  for (const targetedVersion of [...localTargetedVersions].reverse()) {
+    console.log('Processing version', targetedVersion)
+
     const burgerData = await fetch(burgerDataUrl(targetedVersion)).then((r) => r.json()).catch((err) => {
-      console.error('error fetching burger data', targetedVersion, err)
+      // console.error('error fetching burger data', targetedVersion, err)
       return null
     })
-    if (!burgerData) continue
+    /** @type {{sounds: string[]}} */
+    const mappingJson = await fetch(`https://raw.githubusercontent.com/ViaVersion/Mappings/7a45c1f9dbc1f1fdadacfecdb205ba84e55766fc/mappings/mapping-${targetedVersion}.json`).then(async (r) => {
+      return r.json()
+      // lastMappingsJson = r.status === 404 ? lastMappingsJson : (await r.json())
+      // if (r.status === 404) {
+      //   console.warn('using prev mappings json for ' + targetedVersion)
+      // }
+      // return lastMappingsJson
+    }).catch((err) => {
+      // console.error('error fetching mapping json', targetedVersion, err)
+      return null
+    })
+    // if (!mappingJson) throw new Error('no initial mapping json for ' + targetedVersion)
+    if (burgerData && !mappingJson) {
+      console.warn('has burger but no mapping json for ' + targetedVersion)
+      continue
+    }
+    if (!mappingJson || !burgerData) {
+      console.warn('no mapping json or burger data for ' + targetedVersion)
+      continue
+    }
     const allSoundsMap = getSoundsMap(burgerData)
     // console.log(Object.keys(sounds).length, 'ids')
     const outputIdMap = {}
@@ -190,7 +218,7 @@ const writeSoundsMap = async () => {
       new: 0,
       same: 0
     }
-    for (const { id, subtitle, sounds, name } of Object.values(allSoundsMap)) {
+    for (const { _id, subtitle, sounds, name } of Object.values(allSoundsMap)) {
       if (!sounds?.length /* && !subtitle */) continue
       const firstName = sounds[0].name
       // const includeSound = isSoundWhitelisted(firstName)
@@ -210,6 +238,11 @@ const writeSoundsMap = async () => {
         if (sound.weight && isNaN(sound.weight)) debugger
         outputUseSoundLine.push(`${sound.volume ?? 1};${sound.name};${sound.weight ?? minWeight}`)
       }
+      const id = mappingJson.sounds.findIndex(x => x === name)
+      if (id === -1) {
+        console.warn('no id for sound', name, targetedVersion)
+        continue
+      }
       const key = `${id};${name}`
       outputIdMap[key] = outputUseSoundLine.join(',')
       if (prevMap && prevMap[key]) {
@@ -283,6 +316,6 @@ if (action) {
 } else {
   // downloadAllSoundsAndCreateMap()
   // convertSounds()
-  // writeSoundsMap()
-  makeSoundsBundle()
+  writeSoundsMap()
+  // makeSoundsBundle()
 }
diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 33ad42e0..251f77f4 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -115,7 +115,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
     const soundResource = packet['soundEvent']?.resource as string | undefined
     const pos = new Vec3(packet.x / 8, packet.y / 8, packet.z / 8)
     if (packet.soundId !== 0 || !soundResource) {
-      const soundKey = soundMap!.soundsIdToName[packet.soundId]
+      const soundKey = soundMap!.soundsIdToName[packet.soundId - 1]
       if (soundKey === undefined) return
       await playGeneralSound(soundKey, pos, packet.volume, packet.pitch)
       return

From b30e7fc15215a3b5c4565ed12c49db0d288ece78 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 24 Apr 2025 05:36:35 +0300
Subject: [PATCH 482/753] dont display no sound id mapping in default sp

---
 src/defaultLocalServerOptions.js | 2 +-
 src/sounds/botSoundSystem.ts     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/defaultLocalServerOptions.js b/src/defaultLocalServerOptions.js
index 2acd3bce..3b93910d 100644
--- a/src/defaultLocalServerOptions.js
+++ b/src/defaultLocalServerOptions.js
@@ -34,6 +34,6 @@ module.exports = {
   keepAlive: false,
   'everybody-op': true,
   'max-entities': 100,
-  'version': '1.18.2',
+  'version': '1.18',
   versionMajor: '1.18'
 }
diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 251f77f4..3234652b 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -8,6 +8,7 @@ import { options } from '../optionsStorage'
 import { loadOrPlaySound } from '../basicSounds'
 import { getActiveResourcepackBasePath, resourcePackState } from '../resourcePack'
 import { showNotification } from '../react/NotificationProvider'
+import { pixelartIcons } from '../react/PixelartIcon'
 import { createSoundMap, SoundMap } from './soundsMap'
 import { musicSystem } from './musicSystem'
 
@@ -33,7 +34,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
   globalThis.soundMap = soundMap
   if (!soundMap) return
   if (soundMap.noVersionIdMapping) {
-    showNotification('No sound ID mapping for this version', undefined, true)
+    showNotification('No exact sound ID mappings for this version', undefined, false, pixelartIcons['warning-box'])
   }
   void updateResourcePack()
   startMusicSystem()

From 97533cfddbdd66f9d6c4031cd603699b8166816c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 24 Apr 2025 21:37:49 +0300
Subject: [PATCH 483/753] cache sounds, report downloading assets

---
 scripts/build.js |  1 +
 src/connect.ts   | 16 +++++++++++++---
 src/index.ts     | 19 +++++++++++++++----
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/scripts/build.js b/scripts/build.js
index 028a9fdc..2d5e0a2e 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -55,6 +55,7 @@ exports.getSwAdditionalEntries = () => {
         'manifest.json',
         'worldSaveWorker.js',
         `textures/entity/squid/squid.png`,
+        'sounds.js',
         // everything but not .map
         'static/**/!(*.map)',
     ]
diff --git a/src/connect.ts b/src/connect.ts
index 134b86da..b68e4325 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -70,8 +70,12 @@ export const loadMinecraftData = async (version: string) => {
   miscUiState.loadedDataVersion = version
 }
 
-export const downloadAllMinecraftData = async () => {
+export type AssetDownloadReporter = (asset: string, isDone: boolean) => void
+
+export const downloadAllMinecraftData = async (reporter?: AssetDownloadReporter) => {
+  reporter?.('mc-data', false)
   await window._LOAD_MC_DATA()
+  reporter?.('mc-data', true)
 }
 
 const loadFonts = async () => {
@@ -84,6 +88,12 @@ const loadFonts = async () => {
   }
 }
 
-export const downloadOtherGameData = async () => {
-  await Promise.all([loadFonts(), downloadSoundsIfNeeded()])
+export const downloadOtherGameData = async (reporter?: AssetDownloadReporter) => {
+  reporter?.('fonts', false)
+  reporter?.('sounds', false)
+
+  await Promise.all([
+    loadFonts().then(() => reporter?.('fonts', true)),
+    downloadSoundsIfNeeded().then(() => reporter?.('sounds', true))
+  ])
 }
diff --git a/src/index.ts b/src/index.ts
index 8678c26e..3c897619 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -302,11 +302,22 @@ export async function connect (connectOptions: ConnectOptions) {
     const serverOptions = defaultsDeep({}, connectOptions.serverOverrides ?? {}, options.localServerOptions, defaultServerOptions)
     Object.assign(serverOptions, connectOptions.serverOverridesFlat ?? {})
 
-    await progress.executeWithMessage('Downloading minecraft data', 'download-mcdata', async () => {
+    await progress.executeWithMessage('Downloading Minecraft data', 'download-mcdata', async () => {
       loadingTimerState.networkOnlyStart = Date.now()
+
+      let downloadingAssets = [] as string[]
+      const reportAssetDownload = (asset: string, isDone: boolean) => {
+        if (isDone) {
+          downloadingAssets = downloadingAssets.filter(a => a !== asset)
+        } else {
+          downloadingAssets.push(asset)
+        }
+        progress.setSubStage('download-mcdata', `(${downloadingAssets.join(', ')})`)
+      }
+
       await Promise.all([
-        downloadAllMinecraftData(),
-        downloadOtherGameData()
+        downloadAllMinecraftData(reportAssetDownload),
+        downloadOtherGameData(reportAssetDownload)
       ])
       loadingTimerState.networkOnlyStart = 0
     })
@@ -318,7 +329,7 @@ export async function connect (connectOptions: ConnectOptions) {
       appViewer.resourcesManager.currentConfig = { version, texturesVersion: options.useVersionsTextures || undefined }
 
       await progress.executeWithMessage(
-        'Loading minecraft data',
+        'Processing downloaded Minecraft data',
         async () => {
           await appViewer.resourcesManager.loadSourceData(version)
         }

From 510d1630670b941d8a63853fe3a6819090420c08 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 24 Apr 2025 23:19:12 +0300
Subject: [PATCH 484/753] allow client to be loaded from other domains

---
 rsbuild.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index b1567c6e..5e76646e 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -69,7 +69,7 @@ const appConfig = defineConfig({
                     tag: 'link',
                     attrs: {
                         rel: 'manifest',
-                        crossorigin: 'use-credentials',
+                        crossorigin: 'anonymous',
                         href: 'manifest.json'
                     },
                 }

From 4ca9a801a8897e804d5c03871a5dce0c47499270 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 25 Apr 2025 04:04:59 +0300
Subject: [PATCH 485/753] fix sound.js caching, increase priority of scripts
 (make difference only in very rare cases)

---
 .github/workflows/next-deploy.yml | 4 ++--
 .github/workflows/preview.yml     | 4 ++--
 .github/workflows/publish.yml     | 4 ++--
 renderer/viewer/lib/utils.ts      | 6 +++++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml
index 042302a4..943727eb 100644
--- a/.github/workflows/next-deploy.yml
+++ b/.github/workflows/next-deploy.yml
@@ -30,6 +30,8 @@ jobs:
       - name: Write Release Info
         run: |
           echo "{\"latestTag\": \"$(git rev-parse --short $GITHUB_SHA)\", \"isCommit\": true}" > assets/release.json
+      - name: Download Generated Sounds map
+        run: node scripts/downloadSoundsMap.mjs
       - name: Build Project Artifacts
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
         env:
@@ -40,8 +42,6 @@ jobs:
           mkdir -p .vercel/output/static/playground
           pnpm build-playground
           cp -r renderer/dist/* .vercel/output/static/playground/
-      - name: Download Generated Sounds map
-        run: node scripts/downloadSoundsMap.mjs
       - name: Deploy Project Artifacts to Vercel
         uses: mathiasvr/command-output@v2.0.0
         with:
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 4b755f7b..b4908d8d 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -72,6 +72,8 @@ jobs:
       - name: Write Release Info
         run: |
           echo "{\"latestTag\": \"$(git rev-parse --short ${{ github.event.pull_request.head.sha }})\", \"isCommit\": true}" > assets/release.json
+      - name: Download Generated Sounds map
+        run: node scripts/downloadSoundsMap.mjs
       - name: Build Project Artifacts
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
         env:
@@ -90,8 +92,6 @@ jobs:
         run: |
           mkdir -p .vercel/output/static/commit
           echo "<meta http-equiv='refresh' content='0;url=https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number || github.event.pull_request.number }}/commits/${{ github.event.pull_request.head.sha }}'>" > .vercel/output/static/commit/index.html
-      - name: Download Generated Sounds map
-        run: node scripts/downloadSoundsMap.mjs
       - name: Deploy Project Artifacts to Vercel
         uses: mathiasvr/command-output@v2.0.0
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 986bf6cc..1294f9ff 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -29,6 +29,8 @@ jobs:
         run: pnpx zardoy-release empty --skip-github --output-file assets/release.json
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Download Generated Sounds map
+        run: node scripts/downloadSoundsMap.mjs
       - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod
         env:
           CONFIG_JSON_SOURCE: BUNDLED
@@ -38,8 +40,6 @@ jobs:
           mkdir -p .vercel/output/static/playground
           pnpm build-playground
           cp -r renderer/dist/* .vercel/output/static/playground/
-      - name: Download Generated Sounds map
-        run: node scripts/downloadSoundsMap.mjs
       - name: Deploy Project to Vercel
         uses: mathiasvr/command-output@v2.0.0
         with:
diff --git a/renderer/viewer/lib/utils.ts b/renderer/viewer/lib/utils.ts
index 240dfa7f..a1574b5c 100644
--- a/renderer/viewer/lib/utils.ts
+++ b/renderer/viewer/lib/utils.ts
@@ -22,7 +22,7 @@ export const clearTextureCache = () => {
   imagesPromises = {}
 }
 
-export const loadScript = async function (scriptSrc: string): Promise<HTMLScriptElement> {
+export const loadScript = async function (scriptSrc: string, highPriority = true): Promise<HTMLScriptElement> {
   const existingScript = document.querySelector<HTMLScriptElement>(`script[src="${scriptSrc}"]`)
   if (existingScript) {
     return existingScript
@@ -31,6 +31,10 @@ export const loadScript = async function (scriptSrc: string): Promise<HTMLScript
   return new Promise((resolve, reject) => {
     const scriptElement = document.createElement('script')
     scriptElement.src = scriptSrc
+
+    if (highPriority) {
+      scriptElement.fetchPriority = 'high'
+    }
     scriptElement.async = true
 
     scriptElement.addEventListener('load', () => {

From d0ac00843d1b6d9f127561676e5196b84304d5ae Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 25 Apr 2025 04:45:59 +0300
Subject: [PATCH 486/753] up packets list

---
 src/react/DebugOverlay.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index a7eb068f..aabd50e7 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -271,14 +271,17 @@ const hardcodedListOfDebugPacketsToIgnore = {
     'playerlist_header',
     'scoreboard_objective',
     'scoreboard_score',
-    'entity_status'
+    'entity_status',
+    'set_ticking_state',
+    'ping_response'
   ],
   sent: [
     'pong',
     'position',
     'look',
     'keep_alive',
-    'position_look'
+    'position_look',
+    'ping_request'
   ]
 }
 

From 948a52a2a59fe053767973e9ec36275b6d24d2a0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 25 Apr 2025 07:26:23 +0300
Subject: [PATCH 487/753] feat: restore skins display with new API (thanks to
 Nodecraft!). Unfortunately capes are not supported from API anymore. Restore
 skin display from server properties.

---
 renderer/viewer/lib/hand.ts                 |  7 +-
 renderer/viewer/lib/utils/skins.ts          | 48 ++++++++++++-
 renderer/viewer/lib/worldrendererCommon.ts  | 19 +++++-
 renderer/viewer/three/entities.ts           | 76 ++++++++++++---------
 renderer/viewer/three/holdingBlock.ts       | 35 ++++++----
 renderer/viewer/three/worldrendererThree.ts | 10 ++-
 src/entities.ts                             |  2 +-
 src/react/DebugOverlay.tsx                  |  3 +-
 8 files changed, 143 insertions(+), 57 deletions(-)

diff --git a/renderer/viewer/lib/hand.ts b/renderer/viewer/lib/hand.ts
index 3743aca9..8bfa051b 100644
--- a/renderer/viewer/lib/hand.ts
+++ b/renderer/viewer/lib/hand.ts
@@ -1,6 +1,6 @@
 import * as THREE from 'three'
 import { loadSkinToCanvas } from 'skinview-utils'
-import { getLookupUrl, loadSkinImage, steveTexture } from './utils/skins'
+import { loadSkinFromUsername, loadSkinImage, steveTexture } from './utils/skins'
 
 export const getMyHand = async (image?: string, userName?: string) => {
   let newMap: THREE.Texture
@@ -8,7 +8,10 @@ export const getMyHand = async (image?: string, userName?: string) => {
     newMap = await steveTexture
   } else {
     if (!image) {
-      image = getLookupUrl(userName!, 'skin')
+      image = await loadSkinFromUsername(userName!, 'skin')
+    }
+    if (!image) {
+      return
     }
     const { canvas } = await loadSkinImage(image)
     newMap = new THREE.CanvasTexture(canvas)
diff --git a/renderer/viewer/lib/utils/skins.ts b/renderer/viewer/lib/utils/skins.ts
index 385c16c1..4b8251c1 100644
--- a/renderer/viewer/lib/utils/skins.ts
+++ b/renderer/viewer/lib/utils/skins.ts
@@ -15,13 +15,57 @@ export async function loadImageFromUrl (imageUrl: string): Promise<HTMLImageElem
   return img
 }
 
-export function getLookupUrl (username: string, type: 'skin' | 'cape'): string {
-  return `https://mulv.tycrek.dev/api/lookup?username=${username}&type=${type}`
+const config = {
+  apiEnabled: true,
+}
+
+export const setSkinsConfig = (newConfig: Partial<typeof config>) => {
+  Object.assign(config, newConfig)
+}
+
+export async function loadSkinFromUsername (username: string, type: 'skin' | 'cape'): Promise<string | undefined> {
+  if (!config.apiEnabled) return
+
+  if (type === 'cape') return
+  const url = `https://playerdb.co/api/player/minecraft/${username}`
+  const response = await fetch(url)
+  if (!response.ok) return
+
+  const data: {
+    data: {
+      player: {
+        skin_texture: string
+      }
+    }
+  } = await response.json()
+  return data.data.player.skin_texture
+}
+
+export const parseSkinTexturesValue = (value: string) => {
+  const decodedData: {
+    textures: {
+      SKIN: {
+        url: string
+      }
+    }
+  } = JSON.parse(Buffer.from(value, 'base64').toString())
+  return decodedData.textures?.SKIN?.url
 }
 
 export async function loadSkinImage (skinUrl: string): Promise<{ canvas: HTMLCanvasElement, image: HTMLImageElement }> {
+  if (!skinUrl.startsWith('data:')) {
+    skinUrl = await fetchAndConvertBase64Skin(skinUrl)
+  }
+
   const image = await loadImageFromUrl(skinUrl)
   const skinCanvas = document.createElement('canvas')
   loadSkinToCanvas(skinCanvas, image)
   return { canvas: skinCanvas, image }
 }
+
+const fetchAndConvertBase64Skin = async (skinUrl: string) => {
+  const response = await fetch(skinUrl, { })
+  const arrayBuffer = await response.arrayBuffer()
+  const base64 = Buffer.from(arrayBuffer).toString('base64')
+  return `data:image/png;base64,${base64}`
+}
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index bff991ef..516e4264 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -20,6 +20,7 @@ import { addNewStat, removeAllStats, removeStat, updatePanesVisibility, updateSt
 import { WorldDataEmitter } from './worldDataEmitter'
 import { IPlayerState } from './basePlayerState'
 import { MesherLogReader } from './mesherlogReader'
+import { setSkinsConfig } from './utils/skins'
 
 function mod (x, n) {
   return ((x % n) + n) % n
@@ -169,7 +170,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   constructor (public readonly resourcesManager: ResourcesManager, public displayOptions: DisplayWorldOptions, public initOptions: GraphicsInitOptions) {
-    // this.initWorkers(1) // preload script on page load
     this.snapshotInitialValues()
     this.worldRendererConfig = displayOptions.inWorldRenderingConfig
     this.playerState = displayOptions.playerState
@@ -184,7 +184,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
     this.connect(this.displayOptions.worldView)
 
-    setInterval(() => {
+    const interval = setInterval(() => {
       this.geometryReceiveCountPerSec = Object.values(this.geometryReceiveCount).reduce((acc, curr) => acc + curr, 0)
       this.geometryReceiveCount = {}
       updatePanesVisibility(this.displayAdvancedStats)
@@ -193,6 +193,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         this.fpsUpdate()
       }
     }, 500)
+    this.abortController.signal.addEventListener('abort', () => {
+      clearInterval(interval)
+    })
   }
 
   fpsUpdate () {
@@ -233,6 +236,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     })
 
     this.watchReactivePlayerState()
+    this.watchReactiveConfig()
     this.worldReadyResolvers.resolve()
   }
 
@@ -304,12 +308,23 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     subscribeKey(this.displayOptions.playerState.reactive, key, callback)
   }
 
+  onReactiveConfigUpdated<T extends keyof typeof this.worldRendererConfig>(key: T, callback: (value: typeof this.worldRendererConfig[T]) => void) {
+    callback(this.worldRendererConfig[key])
+    subscribeKey(this.worldRendererConfig, key, callback)
+  }
+
   watchReactivePlayerState () {
     this.onReactiveValueUpdated('backgroundColor', (value) => {
       this.changeBackgroundColor(value)
     })
   }
 
+  watchReactiveConfig () {
+    this.onReactiveConfigUpdated('fetchPlayerSkins', (value) => {
+      setSkinsConfig({ apiEnabled: value })
+    })
+  }
+
   async processMessageQueue (source: string) {
     if (this.isProcessingQueue || this.messageQueue.length === 0) return
     this.logWorkerWork(`# ${source} processing queue`)
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 35872deb..d7914ac3 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -18,7 +18,7 @@ import { isEntityAttackable } from 'mineflayer-mouse/dist/attackableEntity'
 import { Vec3 } from 'vec3'
 import { EntityMetadataVersions } from '../../../src/mcDataTypes'
 import { ItemSpecificContextProperties } from '../lib/basePlayerState'
-import { loadSkinImage, getLookupUrl, stevePngUrl, steveTexture } from '../lib/utils/skins'
+import { loadSkinImage, loadSkinFromUsername, stevePngUrl, steveTexture } from '../lib/utils/skins'
 import { loadTexture } from '../lib/utils'
 import { getBlockMeshFromModel } from './holdingBlock'
 import * as Entity from './entity/EntityMesh'
@@ -30,7 +30,11 @@ import { WorldRendererThree } from './worldrendererThree'
 
 export const TWEEN_DURATION = 120
 
-type PlayerObjectType = PlayerObject & { animation?: PlayerAnimation }
+type PlayerObjectType = PlayerObject & {
+  animation?: PlayerAnimation
+  realPlayerUuid: string
+  realUsername: string
+}
 
 function convert2sComplementToHex (complement: number) {
   if (complement < 0) {
@@ -201,9 +205,7 @@ function getEntityMesh (entity: import('prismarine-entity').Entity & { delete?:
 }
 
 export type SceneEntity = THREE.Object3D & {
-  playerObject?: PlayerObject & {
-    animation?: PlayerAnimation
-  }
+  playerObject?: PlayerObjectType
   username?: string
   uuid?: string
   additionalCleanup?: () => void
@@ -283,7 +285,7 @@ export class Entities {
 
     for (const entityId of Object.keys(this.entities)) {
       const entity = this.entities[entityId]
-      const playerObject = entity.playerObject as PlayerObjectType | undefined
+      const { playerObject } = entity
 
       // Update animations
       if (playerObject?.animation) {
@@ -304,12 +306,14 @@ export class Entities {
 
         // Entity is visible if within 16 blocks OR in a finished chunk
         entity.visible = !!(distanceSquared < VISIBLE_DISTANCE || this.worldRenderer.finishedChunks[chunkKey])
+
+        this.maybeRenderPlayerSkin(entityId)
       }
     }
   }
 
   getPlayerObject (entityId: string | number) {
-    const playerObject = this.entities[entityId]?.playerObject as PlayerObjectType | undefined
+    const playerObject = this.entities[entityId]?.playerObject
     return playerObject
   }
 
@@ -322,15 +326,15 @@ export class Entities {
   }
 
   // eslint-disable-next-line max-params
-  updatePlayerSkin (entityId: string | number, username: string | undefined, uuid: string | undefined, skinUrl: string | true, capeUrl: string | true | undefined = undefined) {
-    if (uuid) {
-      if (typeof skinUrl === 'string' || typeof capeUrl === 'string') this.uuidPerSkinUrlsCache[uuid] = {}
-      if (typeof skinUrl === 'string') this.uuidPerSkinUrlsCache[uuid].skinUrl = skinUrl
-      if (typeof capeUrl === 'string') this.uuidPerSkinUrlsCache[uuid].capeUrl = capeUrl
+  async updatePlayerSkin (entityId: string | number, username: string | undefined, uuidCache: string | undefined, skinUrl: string | true, capeUrl: string | true | undefined = undefined) {
+    if (uuidCache) {
+      if (typeof skinUrl === 'string' || typeof capeUrl === 'string') this.uuidPerSkinUrlsCache[uuidCache] = {}
+      if (typeof skinUrl === 'string') this.uuidPerSkinUrlsCache[uuidCache].skinUrl = skinUrl
+      if (typeof capeUrl === 'string') this.uuidPerSkinUrlsCache[uuidCache].capeUrl = capeUrl
       if (skinUrl === true) {
-        skinUrl = this.uuidPerSkinUrlsCache[uuid]?.skinUrl ?? skinUrl
+        skinUrl = this.uuidPerSkinUrlsCache[uuidCache]?.skinUrl ?? skinUrl
       }
-      capeUrl ??= this.uuidPerSkinUrlsCache[uuid]?.capeUrl
+      capeUrl ??= this.uuidPerSkinUrlsCache[uuidCache]?.capeUrl
     }
 
     const playerObject = this.getPlayerObject(entityId)
@@ -338,15 +342,21 @@ export class Entities {
 
     if (skinUrl === true) {
       if (!username) return
-      skinUrl = getLookupUrl(username, 'skin')
+      const newSkinUrl = await loadSkinFromUsername(username, 'skin')
+      if (!this.getPlayerObject(entityId)) return
+      if (!newSkinUrl) return
+      skinUrl = newSkinUrl
     }
 
     if (typeof skinUrl !== 'string') throw new Error('Invalid skin url')
     const renderEars = this.worldRenderer.worldRendererConfig.renderEars || username === 'deadmau5'
-    void this.loadAndApplySkin(entityId, skinUrl, renderEars).then(() => {
+    void this.loadAndApplySkin(entityId, skinUrl, renderEars).then(async () => {
       if (capeUrl) {
         if (capeUrl === true && username) {
-          capeUrl = getLookupUrl(username, 'cape')
+          const newCapeUrl = await loadSkinFromUsername(username, 'cape')
+          if (!this.getPlayerObject(entityId)) return
+          if (!newCapeUrl) return
+          capeUrl = newCapeUrl
         }
         if (typeof capeUrl === 'string') {
           void this.loadAndApplyCape(entityId, capeUrl)
@@ -640,6 +650,8 @@ export class Entities {
         // CREATE NEW PLAYER ENTITY
         const wrapper = new THREE.Group()
         const playerObject = new PlayerObject() as PlayerObjectType
+        playerObject.realPlayerUuid = entity.uuid ?? ''
+        playerObject.realUsername = entity.username ?? ''
         playerObject.position.set(0, 16, 0)
 
         // fix issues with starfield
@@ -702,7 +714,7 @@ export class Entities {
       this.onAddEntity(entity)
 
       if (isPlayerModel) {
-        this.updatePlayerSkin(entity.id, entity.username, entity.uuid, overrides?.texture || stevePngUrl)
+        void this.updatePlayerSkin(entity.id, entity.username, overrides?.texture ? entity.uuid : undefined, overrides?.texture || stevePngUrl)
       }
       this.setDebugMode(this.debugMode, group)
       this.setRendering(this.currentlyRendering, group)
@@ -907,38 +919,36 @@ export class Entities {
     }
 
     if (e?.playerObject && overrides?.rotation?.head) {
-      const playerObject = e.playerObject as PlayerObjectType
+      const { playerObject } = e
       const headRotationDiff = overrides.rotation.head.y ? overrides.rotation.head.y - entity.yaw : 0
       playerObject.skin.head.rotation.y = -headRotationDiff
       playerObject.skin.head.rotation.x = overrides.rotation.head.x ? - overrides.rotation.head.x : 0
     }
-
-    this.maybeRenderPlayerSkin(entity)
   }
 
   onAddEntity (entity: import('prismarine-entity').Entity) {
   }
 
-  loadedSkinEntityIds = new Set<number>()
-  maybeRenderPlayerSkin (entity: import('prismarine-entity').Entity) {
-    const mesh = this.entities[entity.id]
+  loadedSkinEntityIds = new Set<string>()
+  maybeRenderPlayerSkin (entityId: string) {
+    const mesh = this.entities[entityId]
     if (!mesh) return
-    if (!mesh.playerObject || !this.worldRenderer.worldRendererConfig.fetchPlayerSkins) return
+    if (!mesh.playerObject) return
+    if (!mesh.visible) return
+
     const MAX_DISTANCE_SKIN_LOAD = 128
     const cameraPos = this.worldRenderer.camera.position
-    const distance = entity.position.distanceTo(new Vec3(cameraPos.x, cameraPos.y, cameraPos.z))
+    const distance = mesh.position.distanceTo(cameraPos)
     if (distance < MAX_DISTANCE_SKIN_LOAD && distance < (this.worldRenderer.viewDistance * 16)) {
-      if (this.entities[entity.id]) {
-        if (this.loadedSkinEntityIds.has(entity.id)) return
-        this.loadedSkinEntityIds.add(entity.id)
-        this.updatePlayerSkin(entity.id, entity.username, entity.uuid, true, true)
-      }
+      if (this.loadedSkinEntityIds.has(entityId)) return
+      this.loadedSkinEntityIds.add(entityId)
+      void this.updatePlayerSkin(entityId, mesh.playerObject.realUsername, mesh.playerObject.realPlayerUuid, true, true)
     }
   }
 
   playerPerAnimation = {} as Record<number, string>
   onRemoveEntity (entity: import('prismarine-entity').Entity) {
-    this.loadedSkinEntityIds.delete(entity.id)
+    this.loadedSkinEntityIds.delete(entity.id.toString())
   }
 
   updateMap (mapNumber: string | number, data: string) {
@@ -1129,7 +1139,7 @@ function addArmorModel (worldRenderer: WorldRendererThree, entityMesh: THREE.Obj
   let material
   if (mesh) {
     material = mesh.material
-    loadTexture(texturePath, texture => {
+    void loadTexture(texturePath, texture => {
       texture.magFilter = THREE.NearestFilter
       texture.minFilter = THREE.NearestFilter
       texture.flipY = false
diff --git a/renderer/viewer/three/holdingBlock.ts b/renderer/viewer/three/holdingBlock.ts
index cf294016..3f1327f1 100644
--- a/renderer/viewer/three/holdingBlock.ts
+++ b/renderer/viewer/three/holdingBlock.ts
@@ -130,20 +130,27 @@ export default class HoldingBlock {
     this.offHandDisplay = this.offHand
     // this.offHandDisplay = true
     if (!this.offHand) {
-      // watch over my hand
-      watchProperty(
-        async () => {
-          return getMyHand(this.playerState.reactive.playerSkin, this.playerState.onlineMode ? this.playerState.username : undefined)
-        },
-        this.playerState.reactive,
-        'playerSkin',
-        (newHand) => {
-          this.playerHand = newHand
-        },
-        (oldHand) => {
-          disposeObject(oldHand, true)
-        }
-      )
+      // load default hand
+      void getMyHand().then((hand) => {
+        this.playerHand = hand
+      }).then(() => {
+        // now watch over the player skin
+        watchProperty(
+          async () => {
+            return getMyHand(this.playerState.reactive.playerSkin, this.playerState.onlineMode ? this.playerState.username : undefined)
+          },
+          this.playerState.reactive,
+          'playerSkin',
+          (newHand) => {
+            if (newHand) {
+              this.playerHand = newHand
+            }
+          },
+          (oldHand) => {
+            disposeObject(oldHand!, true)
+          }
+        )
+      })
     }
   }
 
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 14270367..088f0ee7 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -165,6 +165,13 @@ export class WorldRendererThree extends WorldRendererCommon {
     })
   }
 
+  override watchReactiveConfig () {
+    super.watchReactiveConfig()
+    this.onReactiveConfigUpdated('showChunkBorders', (value) => {
+      this.updateShowChunksBorder(value)
+    })
+  }
+
   changeHandSwingingState (isAnimationPlaying: boolean, isLeft = false) {
     const holdingBlock = isLeft ? this.holdingBlockLeft : this.holdingBlock
     if (isAnimationPlaying) {
@@ -237,7 +244,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     //@ts-expect-error
     const pos = cursorBlockRel(0, 1, 0).position
 
-    const mesh = await getMyHand()
+    const mesh = (await getMyHand())!
     // mesh.rotation.y = THREE.MathUtils.degToRad(90)
     setBlockPosition(mesh, pos)
     const helper = new THREE.BoxHelper(mesh, 0xff_ff_00)
@@ -573,7 +580,6 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   updateShowChunksBorder (value: boolean) {
-    this.displayOptions.inWorldRenderingConfig.showChunkBorders = value
     for (const object of Object.values(this.sectionObjects)) {
       for (const child of object.children) {
         if (child.name === 'helper') {
diff --git a/src/entities.ts b/src/entities.ts
index 68e18df3..13358f04 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -137,7 +137,7 @@ customEvents.on('gameLoaded', () => {
             }
           }
           // even if not found, still record to cache
-          getThreeJsRendererMethods()?.updatePlayerSkin(entityId, playerEntry.player?.name, playerEntry.uuid, skinUrl, capeUrl)
+          void getThreeJsRendererMethods()?.updatePlayerSkin(entityId, playerEntry.player?.name, playerEntry.uuid, skinUrl, capeUrl)
         } catch (err) {
           console.error('Error decoding player texture:', err)
         }
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index aabd50e7..cde85467 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -273,7 +273,8 @@ const hardcodedListOfDebugPacketsToIgnore = {
     'scoreboard_score',
     'entity_status',
     'set_ticking_state',
-    'ping_response'
+    'ping_response',
+    'block_change'
   ],
   sent: [
     'pong',

From a6543962385ea4ab588b627f81afedc8e7e0a13a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 25 Apr 2025 07:40:31 +0300
Subject: [PATCH 488/753] try to not to use unreliable bot.player

---
 src/mineflayer/playerState.ts           | 2 +-
 src/mineflayer/plugins/ping.ts          | 2 +-
 src/react/ChatProvider.tsx              | 2 +-
 src/react/MinimapProvider.tsx           | 4 ++--
 src/react/NetworkStatus.tsx             | 2 +-
 src/react/PlayerListOverlayProvider.tsx | 6 ++++--
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
index e88933b9..85f0b00c 100644
--- a/src/mineflayer/playerState.ts
+++ b/src/mineflayer/playerState.ts
@@ -26,7 +26,7 @@ export class PlayerStateManager implements IPlayerState {
   private ready = false
   onlineMode = false
   get username () {
-    return bot.player?.username ?? ''
+    return bot.username ?? ''
   }
 
   reactive: IPlayerState['reactive'] = new BasePlayerState().reactive
diff --git a/src/mineflayer/plugins/ping.ts b/src/mineflayer/plugins/ping.ts
index 9753e4ed..d6a23554 100644
--- a/src/mineflayer/plugins/ping.ts
+++ b/src/mineflayer/plugins/ping.ts
@@ -19,7 +19,7 @@ export default () => {
 
   let pingId = 0
   bot.pingServer = async () => {
-    if (versionToNumber(bot.version) < versionToNumber('1.20.2')) return bot.player.ping
+    if (versionToNumber(bot.version) < versionToNumber('1.20.2')) return bot.player?.ping ?? -1
     return new Promise<number>((resolve) => {
       const curId = pingId++
       bot._client.write('ping_request', { id: BigInt(curId) })
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 4376006d..646ce079 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -60,7 +60,7 @@ export default () => {
           updateLoadedServerData((server) => {
             server.autoLogin ??= {}
             const password = message.split(' ')[1]
-            server.autoLogin[bot.player.username] = password
+            server.autoLogin[bot.username] = password
             return server
           })
           hideNotification()
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
index 86670954..6e7e01ff 100644
--- a/src/react/MinimapProvider.tsx
+++ b/src/react/MinimapProvider.tsx
@@ -169,9 +169,9 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
       // type suppressed until server is updated. It works fine
       void (localServer as any).setWarp(warp, remove)
     } else if (remove) {
-      localStorage.removeItem(`warps: ${bot.player.username} ${lastConnectOptions.value!.server}`)
+      localStorage.removeItem(`warps: ${bot.username} ${lastConnectOptions.value!.server}`)
     } else {
-      localStorage.setItem(`warps: ${bot.player.username} ${lastConnectOptions.value!.server}`, JSON.stringify(this.warps))
+      localStorage.setItem(`warps: ${bot.username} ${lastConnectOptions.value!.server}`, JSON.stringify(this.warps))
     }
     this.emit('updateWarps')
   }
diff --git a/src/react/NetworkStatus.tsx b/src/react/NetworkStatus.tsx
index 1eeb9584..3499379b 100644
--- a/src/react/NetworkStatus.tsx
+++ b/src/react/NetworkStatus.tsx
@@ -66,7 +66,7 @@ export default () => {
 
   if (!serverIp) return null
 
-  const { username } = bot.player
+  const { username } = bot
   const { proxy: proxyUrl } = lastConnectOptions.value!
   const pingTotal = serverPing
 
diff --git a/src/react/PlayerListOverlayProvider.tsx b/src/react/PlayerListOverlayProvider.tsx
index 2f2cac54..4d971687 100644
--- a/src/react/PlayerListOverlayProvider.tsx
+++ b/src/react/PlayerListOverlayProvider.tsx
@@ -11,7 +11,7 @@ type Players = typeof bot.players
 
 export default () => {
   const serverIp = lastConnectOptions.value?.server
-  const [clientId, setClientId] = useState('')
+  const [clientId, setClientId] = useState(bot._client.uuid)
   const [players, setPlayers] = useState<Players>({})
   const [isOpen, setIsOpen] = useState(false)
 
@@ -51,7 +51,9 @@ export default () => {
       setClientId(bot.player.uuid)
     } else {
       bot._client.on('player_info', () => {
-        setClientId(bot.player?.uuid)
+        if (bot.player?.uuid) {
+          setClientId(bot.player?.uuid)
+        }
       })
     }
 

From 01b6d87331da9a83c76f9d612de4f3c78aada8d7 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 25 Apr 2025 08:29:18 +0300
Subject: [PATCH 489/753] feat: player crouching and better hit animation

---
 renderer/viewer/three/entities.ts          |  6 +-
 renderer/viewer/three/entity/animations.js | 78 ++++++++++++++++++++--
 src/entities.ts                            |  7 +-
 src/react/DebugOverlay.tsx                 |  3 +-
 4 files changed, 84 insertions(+), 10 deletions(-)

diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index d7914ac3..26bfcaec 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -464,7 +464,7 @@ export class Entities {
     }
   }
 
-  playAnimation (entityPlayerId, animation: 'walking' | 'running' | 'oneSwing' | 'idle') {
+  playAnimation (entityPlayerId, animation: 'walking' | 'running' | 'oneSwing' | 'idle' | 'crouch' | 'crouchWalking') {
     const playerObject = this.getPlayerObject(entityPlayerId)
     if (!playerObject) return
 
@@ -477,11 +477,11 @@ export class Entities {
     if (playerObject.animation instanceof WalkingGeneralSwing) {
       playerObject.animation.switchAnimationCallback = () => {
         if (!(playerObject.animation instanceof WalkingGeneralSwing)) throw new Error('Expected WalkingGeneralSwing')
-        playerObject.animation.isMoving = animation !== 'idle'
+        playerObject.animation.isMoving = animation === 'walking' || animation === 'running' || animation === 'crouchWalking'
         playerObject.animation.isRunning = animation === 'running'
+        playerObject.animation.isCrouched = animation === 'crouch' || animation === 'crouchWalking'
       }
     }
-
   }
 
   parseEntityLabel (jsonLike) {
diff --git a/renderer/viewer/three/entity/animations.js b/renderer/viewer/three/entity/animations.js
index a6cabdbb..3295556f 100644
--- a/renderer/viewer/three/entity/animations.js
+++ b/renderer/viewer/three/entity/animations.js
@@ -1,3 +1,4 @@
+//@ts-check
 import { PlayerAnimation } from 'skinview3d'
 
 export class WalkingGeneralSwing extends PlayerAnimation {
@@ -6,6 +7,7 @@ export class WalkingGeneralSwing extends PlayerAnimation {
 
   isRunning = false
   isMoving = true
+  isCrouched = false
 
   _startArmSwing
 
@@ -15,7 +17,7 @@ export class WalkingGeneralSwing extends PlayerAnimation {
 
   animate(player) {
     // Multiply by animation's natural speed
-    let t
+    let t = 0
     const updateT = () => {
       if (!this.isMoving) {
         t = 0
@@ -30,6 +32,8 @@ export class WalkingGeneralSwing extends PlayerAnimation {
     updateT()
     let reset = false
 
+    croughAnimation(player, this.isCrouched)
+
     if ((this.isRunning ? Math.cos(t) : Math.sin(t)) < 0.01) {
       if (this.switchAnimationCallback) {
         reset = true
@@ -50,11 +54,12 @@ export class WalkingGeneralSwing extends PlayerAnimation {
 
     if (this._startArmSwing) {
       const tHand = (this.progress - this._startArmSwing) * 18 + Math.PI * 0.5
-      player.skin.rightArm.rotation.x = Math.cos(tHand) * 1.5
-      const basicArmRotationZ = Math.PI * 0.1
-      player.skin.rightArm.rotation.z = Math.cos(t + Math.PI) * 0.3 - basicArmRotationZ
+      // player.skin.rightArm.rotation.x = Math.cos(tHand) * 1.5
+      // const basicArmRotationZ = Math.PI * 0.1
+      // player.skin.rightArm.rotation.z = Math.cos(t + Math.PI) * 0.3 - basicArmRotationZ
+      HitAnimation.animate((this.progress - this._startArmSwing), player, this.isMoving)
 
-      if (tHand > Math.PI + Math.PI * 0.5) {
+      if (tHand > Math.PI + Math.PI) {
         this._startArmSwing = null
         player.skin.rightArm.rotation.z = 0
       }
@@ -101,3 +106,66 @@ export class WalkingGeneralSwing extends PlayerAnimation {
     }
   }
 }
+
+const HitAnimation = {
+  animate(progress, player, isMovingOrRunning) {
+    const t = progress * 18
+    player.skin.rightArm.rotation.x = -0.453_786_055_2 * 2 + 2 * Math.sin(t + Math.PI) * 0.3
+
+    if (!isMovingOrRunning) {
+      const basicArmRotationZ = 0.01 * Math.PI + 0.06
+      player.skin.rightArm.rotation.z = -Math.cos(t) * 0.403 + basicArmRotationZ
+      player.skin.body.rotation.y = -Math.cos(t) * 0.06
+      player.skin.leftArm.rotation.x = Math.sin(t + Math.PI) * 0.077
+      player.skin.leftArm.rotation.z = -Math.cos(t) * 0.015 + 0.13 - 0.05
+      player.skin.leftArm.position.z = Math.cos(t) * 0.3
+      player.skin.leftArm.position.x = 5 - Math.cos(t) * 0.05
+    }
+  },
+}
+
+const croughAnimation = (player, isCrouched) => {
+  const erp = 0
+
+  // let pr = this.progress * 8;
+  let pr = isCrouched ? 1 : 0
+  const showProgress = false
+  if (showProgress) {
+    pr = Math.floor(pr)
+  }
+  player.skin.body.rotation.x = 0.453_786_055_2 * Math.abs(Math.sin((pr * Math.PI) / 2))
+  player.skin.body.position.z =
+			1.325_618_1 * Math.abs(Math.sin((pr * Math.PI) / 2)) - 3.450_031_037_7 * Math.abs(Math.sin((pr * Math.PI) / 2))
+  player.skin.body.position.y = -6 - 2.103_677_462 * Math.abs(Math.sin((pr * Math.PI) / 2))
+  player.cape.position.y = 8 - 1.851_236_166_577_372 * Math.abs(Math.sin((pr * Math.PI) / 2))
+  player.cape.rotation.x = (10.8 * Math.PI) / 180 + 0.294_220_265_771 * Math.abs(Math.sin((pr * Math.PI) / 2))
+  player.cape.position.z =
+			-2 + 3.786_619_432 * Math.abs(Math.sin((pr * Math.PI) / 2)) - 3.450_031_037_7 * Math.abs(Math.sin((pr * Math.PI) / 2))
+  player.elytra.position.x = player.cape.position.x
+  player.elytra.position.y = player.cape.position.y
+  player.elytra.position.z = player.cape.position.z
+  player.elytra.rotation.x = player.cape.rotation.x - (10.8 * Math.PI) / 180
+  // const pr1 = this.progress / this.speed;
+  const pr1 = 1
+  if (Math.abs(Math.sin((pr * Math.PI) / 2)) === 1) {
+    player.elytra.leftWing.rotation.z =
+				0.261_799_44 + 0.458_200_6 * Math.abs(Math.sin((Math.min(pr1 - erp, 1) * Math.PI) / 2))
+    player.elytra.updateRightWing()
+  } else if (isCrouched !== undefined) {
+    player.elytra.leftWing.rotation.z =
+				0.72 - 0.458_200_6 * Math.abs(Math.sin((Math.min(pr1 - erp, 1) * Math.PI) / 2))
+    player.elytra.updateRightWing()
+  }
+  player.skin.head.position.y = -3.618_325_234_674 * Math.abs(Math.sin((pr * Math.PI) / 2))
+  player.skin.leftArm.position.z =
+			3.618_325_234_674 * Math.abs(Math.sin((pr * Math.PI) / 2)) - 3.450_031_037_7 * Math.abs(Math.sin((pr * Math.PI) / 2))
+  player.skin.rightArm.position.z = player.skin.leftArm.position.z
+  player.skin.leftArm.rotation.x = 0.410_367_746_202 * Math.abs(Math.sin((pr * Math.PI) / 2))
+  player.skin.rightArm.rotation.x = player.skin.leftArm.rotation.x
+  player.skin.leftArm.rotation.z = 0.1
+  player.skin.rightArm.rotation.z = -player.skin.leftArm.rotation.z
+  player.skin.leftArm.position.y = -2 - 2.539_433_18 * Math.abs(Math.sin((pr * Math.PI) / 2))
+  player.skin.rightArm.position.y = player.skin.leftArm.position.y
+  player.skin.rightLeg.position.z = -3.450_031_037_7 * Math.abs(Math.sin((pr * Math.PI) / 2))
+  player.skin.leftLeg.position.z = player.skin.rightLeg.position.z
+}
diff --git a/src/entities.ts b/src/entities.ts
index 13358f04..919d6818 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -64,9 +64,14 @@ customEvents.on('gameLoaded', () => {
       const speed = info.avgSpeed
       const WALKING_SPEED = 0.03
       const SPRINTING_SPEED = 0.18
+      const isCrouched = e['crouching']
       const isWalking = Math.abs(speed.x) > WALKING_SPEED || Math.abs(speed.z) > WALKING_SPEED
       const isSprinting = Math.abs(speed.x) > SPRINTING_SPEED || Math.abs(speed.z) > SPRINTING_SPEED
-      const newAnimation = isWalking ? (isSprinting ? 'running' : 'walking') : 'idle'
+
+      const newAnimation =
+        isCrouched ? (isWalking ? 'crouchWalking' : 'crouch')
+          : isWalking ? (isSprinting ? 'running' : 'walking')
+            : 'idle'
       if (newAnimation !== playerPerAnimation[id]) {
         getThreeJsRendererMethods()?.playEntityAnimation(e.id, newAnimation)
         playerPerAnimation[id] = newAnimation
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index cde85467..25c102b7 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -274,7 +274,8 @@ const hardcodedListOfDebugPacketsToIgnore = {
     'entity_status',
     'set_ticking_state',
     'ping_response',
-    'block_change'
+    'block_change',
+    'damage_event'
   ],
   sent: [
     'pong',

From 89fc31a2c2af01424dc6599badc50d72e3d9044f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 25 Apr 2025 09:05:49 +0300
Subject: [PATCH 490/753] feat: holding item/block display for players!

---
 renderer/viewer/lib/worldDataEmitter.ts |  3 +++
 renderer/viewer/three/entities.ts       | 26 +++++++++++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 56c71d40..3f31ad8b 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -115,6 +115,9 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
       entityUpdate (e: any) {
         emitEntity(e)
       },
+      entityEquip (e: any) {
+        emitEntity(e)
+      },
       entityMoved (e: any) {
         emitEntity(e, 'entityMoved')
       },
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 26bfcaec..38b482f2 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -724,8 +724,9 @@ export class Entities {
 
     // check if entity has armor
     if (entity.equipment) {
-      this.addItemModel(e, 'left', entity.equipment[0])
-      this.addItemModel(e, 'right', entity.equipment[1])
+      const isPlayer = entity.type === 'player'
+      this.addItemModel(e, isPlayer ? 'right' : 'left', entity.equipment[0], isPlayer)
+      this.addItemModel(e, isPlayer ? 'left' : 'right', entity.equipment[1], isPlayer)
       addArmorModel(this.worldRenderer, e, 'feet', entity.equipment[2])
       addArmorModel(this.worldRenderer, e, 'legs', entity.equipment[3], 2)
       addArmorModel(this.worldRenderer, e, 'chest', entity.equipment[4])
@@ -1019,11 +1020,13 @@ export class Entities {
     return texture
   }
 
-  addItemModel (entityMesh: SceneEntity, hand: 'left' | 'right', item: Item) {
-    const parentName = `bone_${hand}item`
+  addItemModel (entityMesh: SceneEntity, hand: 'left' | 'right', item: Item, isPlayer = false) {
+    const bedrockParentName = `bone_${hand}item`
+    const itemName = `custom_item_${hand}`
+
     // remove existing item
     entityMesh.traverse(c => {
-      if (c.parent?.name.toLowerCase() === parentName) {
+      if (c.name === itemName) {
         c.removeFromParent()
         if (c['additionalCleanup']) c['additionalCleanup']()
       }
@@ -1035,7 +1038,7 @@ export class Entities {
     })
     if (itemObject?.mesh) {
       entityMesh.traverse(c => {
-        if (c.name.toLowerCase() === parentName) {
+        if (c.name.toLowerCase() === bedrockParentName || c.name === `${hand}Arm`) {
           const group = new THREE.Object3D()
           group['additionalCleanup'] = () => {
             // important: avoid texture memory leak and gpu slowdown
@@ -1051,7 +1054,18 @@ export class Entities {
             group.rotation.y = Math.PI / 2
             group.scale.multiplyScalar(2)
           }
+
+          // if player, move item below and forward a bit
+          if (isPlayer) {
+            group.position.y = -8
+            group.position.z = 5
+            group.position.x = hand === 'left' ? 1 : -1
+            group.rotation.x = Math.PI
+          }
+
           group.add(itemMesh)
+
+          group.name = itemName
           c.add(group)
         }
       })

From db1b72a582e4b90c44487662de9b61008ae3564a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 25 Apr 2025 09:27:41 +0300
Subject: [PATCH 491/753] fix: fix bow usage visually

---
 package.json   |  2 +-
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 9d776082..4402bdc8 100644
--- a/package.json
+++ b/package.json
@@ -154,7 +154,7 @@
     "mc-assets": "^0.2.53",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:GenerelSchwerz/mineflayer",
-    "mineflayer-mouse": "^0.1.7",
+    "mineflayer-mouse": "^0.1.9",
     "mineflayer-pathfinder": "^2.4.4",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index faf6991a..ebe52b4c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -346,8 +346,8 @@ importers:
         specifier: github:GenerelSchwerz/mineflayer
         version: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.7
-        version: 0.1.7(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
+        specifier: ^0.1.9
+        version: 0.1.9(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.5
@@ -6693,8 +6693,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.7:
-    resolution: {integrity: sha512-sUX77P8Z94N6N/KEvplZdXLwtuCHLx3lmU4Y1FB8189+jFCl3jH/+bdzwtksObmrXWW+evJ5nAPpzmOOxqcfag==}
+  mineflayer-mouse@0.1.9:
+    resolution: {integrity: sha512-Cl+0FDUKFt8f+W6ed3XWfadWqbJkhl999XNPBkiaP0QwxAcJC7f+iAMiH1SLB+e5p50GLxANhAs6Q7t9d37kTg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.5:
@@ -17374,7 +17374,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.7(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0):
+  mineflayer-mouse@0.1.9(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0):
     dependencies:
       change-case: 5.4.4
       debug: 4.4.0(supports-color@8.1.1)

From 4ded3b5d2b55ca345ebfcbd4ef9b30f3a23fa637 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 26 Apr 2025 05:01:20 +0300
Subject: [PATCH 492/753] feat: implement safe features for chat: limit length,
 avoid sending formatting symbol to avoid kicks (with very nice ux!)

---
 src/chatUtils.test.ts      | 14 +++++++++++++-
 src/chatUtils.ts           | 24 ++++++++++++++++++++++++
 src/optionsStorage.ts      |  1 +
 src/react/Chat.tsx         | 13 ++++++++-----
 src/react/ChatProvider.tsx | 24 +++++++++++++++++++-----
 vitest.config.ts           |  1 +
 6 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/src/chatUtils.test.ts b/src/chatUtils.test.ts
index e717da28..4c86f904 100644
--- a/src/chatUtils.test.ts
+++ b/src/chatUtils.test.ts
@@ -1,6 +1,6 @@
 import { test, expect } from 'vitest'
 import mcData from 'minecraft-data'
-import { formatMessage } from './chatUtils'
+import { formatMessage, isAllowedChatCharacter, isStringAllowed } from './chatUtils'
 
 //@ts-expect-error
 globalThis.loadedData ??= mcData('1.20.1')
@@ -64,3 +64,15 @@ test('formatMessage', () => {
     ]
   `)
 })
+
+test('isAllowedChatCharacter', () => {
+  expect(isAllowedChatCharacter('a')).toBe(true)
+  expect(isAllowedChatCharacter('a')).toBe(true)
+  expect(isAllowedChatCharacter('§')).toBe(false)
+  expect(isAllowedChatCharacter(' ')).toBe(true)
+  expect(isAllowedChatCharacter('ツ')).toBe(true)
+  expect(isStringAllowed('🟢')).toMatchObject({
+    valid: true,
+    invalid: null
+  })
+})
diff --git a/src/chatUtils.ts b/src/chatUtils.ts
index ade800ac..6253569e 100644
--- a/src/chatUtils.ts
+++ b/src/chatUtils.ts
@@ -125,3 +125,27 @@ export const getItemFromBlock = (block: import('prismarine-block').Block) => {
   const item = global.loadedData.itemsByName[blockToItemRemaps[block.name] ?? block.name]
   return item
 }
+
+export function isAllowedChatCharacter (char: string): boolean {
+  // if (char.length !== 1) {
+  //   throw new Error('Input must be a single character')
+  // }
+
+  const charCode = char.codePointAt(0)!
+  return charCode !== 167 && charCode >= 32 && charCode !== 127
+}
+
+export const isStringAllowed = (str: string) => {
+  const invalidChars = new Set<string>()
+  for (const char of str) {
+    if (!isAllowedChatCharacter(char)) {
+      invalidChars.add(char)
+    }
+  }
+
+  return {
+    valid: invalidChars.size === 0,
+    clean: [...str].filter(c => !invalidChars.has(c)).join(''),
+    invalid: [...invalidChars]
+  }
+}
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 61dfa87f..a327c590 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -72,6 +72,7 @@ const defaultOptions = {
   preventBackgroundTimeoutKick: false,
   preventSleep: false,
   debugContro: false,
+  chatVanillaRestrictions: true,
 
   // antiAliasing: false,
 
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 0a2843c8..130f25a0 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -1,6 +1,6 @@
 import { proxy, subscribe } from 'valtio'
 import { useEffect, useMemo, useRef, useState } from 'react'
-import { MessageFormatPart } from '../chatUtils'
+import { isStringAllowed, MessageFormatPart } from '../chatUtils'
 import { MessagePart } from './MessageFormatted'
 import './Chat.css'
 import { isIos, reactKeyForMessage } from './utils'
@@ -34,12 +34,13 @@ type Props = {
   opacity?: number
   opened?: boolean
   onClose?: () => void
-  sendMessage?: (message: string) => boolean | void
+  sendMessage?: (message: string) => Promise<void> | void
   fetchCompletionItems?: (triggerKind: 'implicit' | 'explicit', completeValue: string, fullValue: string, abortController?: AbortController) => Promise<string[] | void>
   // width?: number
   allowSelection?: boolean
   inputDisabled?: string
   placeholder?: string
+  chatVanillaRestrictions?: boolean
 }
 
 export const chatInputValueGlobal = proxy({
@@ -67,7 +68,8 @@ export default ({
   usingTouch,
   allowSelection,
   inputDisabled,
-  placeholder
+  placeholder,
+  chatVanillaRestrictions
 }: Props) => {
   const sendHistoryRef = useRef(JSON.parse(window.sessionStorage.chatHistory || '[]'))
   const [isInputFocused, setIsInputFocused] = useState(false)
@@ -278,13 +280,13 @@ export default ({
               </div>
             </div>
           ) : null}
-          <form onSubmit={(e) => {
+          <form onSubmit={async (e) => {
             e.preventDefault()
             const message = chatInput.current.value
             if (message) {
               setSendHistory([...sendHistoryRef.current, message])
               onClose?.()
-              sendMessage?.(message)
+              await sendMessage?.(message)
               // Always scroll to bottom after sending a message
               scrollToBottom()
             }
@@ -301,6 +303,7 @@ export default ({
               onChange={() => { }}
             />}
             <input
+              maxLength={chatVanillaRestrictions ? 256 : undefined}
               defaultValue=''
               // ios doesn't support toggling autoCorrect on the fly so we need to re-create the input
               key={spellCheckEnabled ? 'true' : 'false'}
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 646ce079..58c9912c 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
 import { useSnapshot } from 'valtio'
-import { formatMessage } from '../chatUtils'
+import { formatMessage, isStringAllowed } from '../chatUtils'
 import { getBuiltinCommandsList, tryHandleBuiltinCommand } from '../builtinCommands'
 import { gameAdditionalState, hideCurrentModal, miscUiState } from '../globalState'
 import { options } from '../optionsStorage'
@@ -10,14 +10,14 @@ import { useIsModalActive } from './utilsApp'
 import { hideNotification, notificationProxy, showNotification } from './NotificationProvider'
 import { updateLoadedServerData } from './serversStorage'
 import { lastConnectOptions } from './AppStatusProvider'
+import { showOptionsModal } from './SelectOption'
 
 export default () => {
   const [messages, setMessages] = useState([] as Message[])
   const isChatActive = useIsModalActive('chat')
-  const { messagesLimit, chatOpacity, chatOpacityOpened } = options
   const lastMessageId = useRef(0)
   const usingTouch = useSnapshot(miscUiState).currentTouch
-  const { chatSelect } = useSnapshot(options)
+  const { chatSelect, messagesLimit, chatOpacity, chatOpacityOpened, chatVanillaRestrictions } = useSnapshot(options)
   const isUsingMicrosoftAuth = useMemo(() => !!lastConnectOptions.value?.authenticatedAccount, [])
   const { forwardChat } = useSnapshot(viewerVersionState)
   const { viewerConnection } = useSnapshot(gameAdditionalState)
@@ -47,13 +47,14 @@ export default () => {
   }, [])
 
   return <Chat
+    chatVanillaRestrictions={chatVanillaRestrictions}
     allowSelection={chatSelect}
     usingTouch={!!usingTouch}
     opacity={(isChatActive ? chatOpacityOpened : chatOpacity) / 100}
     messages={messages}
     opened={isChatActive}
     placeholder={forwardChat || !viewerConnection ? undefined : 'Chat forwarding is not enabled in the plugin settings'}
-    sendMessage={(message) => {
+    sendMessage={async (message) => {
       const builtinHandled = tryHandleBuiltinCommand(message)
       if (miscUiState.loadedServerIndex && (message.startsWith('/login') || message.startsWith('/register'))) {
         showNotification('Click here to save your password in browser for auto-login', undefined, false, undefined, () => {
@@ -75,7 +76,20 @@ export default () => {
         }, 2000)
       }
       if (!builtinHandled) {
-        bot.chat(message)
+        if (chatVanillaRestrictions && !miscUiState.flyingSquid) {
+          const validation = isStringAllowed(message)
+          if (!validation.valid) {
+            const choice = await showOptionsModal(`Can't send invalid characters to vanilla server (${validation.invalid.join(', ')}). You can use them only in command blocks.`, [
+              'Remove Them & Send'
+            ])
+            if (!choice) return
+            message = validation.clean
+          }
+        }
+
+        if (message) {
+          bot.chat(message)
+        }
       }
     }}
     onClose={() => {
diff --git a/vitest.config.ts b/vitest.config.ts
index 1d1588e4..7da46199 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -7,6 +7,7 @@ export default defineConfig({
       '../../src/botUtils.test.ts',
       '../../src/markdownToFormattedText.test.ts',
       '../../src/react/parseKeybindingName.test.ts',
+      '../../src/chatUtils.test.ts',
       'lib/mesher/test/tests.test.ts',
       'sign-renderer/tests.test.ts',
       '../../src/utils.test.ts'

From 8c37db405102c3cbf02ce64838776cfdd43443af Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 26 Apr 2025 05:14:33 +0300
Subject: [PATCH 493/753] fix(critical-regression): chunks never loaded when
 dimension was changed but position chunk was the same (eg spawn 0,0)

---
 renderer/viewer/lib/worldDataEmitter.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 3f31ad8b..42c071dd 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -142,12 +142,17 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
       time: () => {
         this.emitter.emit('time', bot.time.timeOfDay)
       },
-      respawn: () => {
-        this.emitter.emit('onWorldSwitch')
-      },
       end: () => {
         this.emitter.emit('end')
       },
+      // when dimension might change
+      login: () => {
+        void this.updatePosition(bot.entity.position, true)
+      },
+      respawn: () => {
+        void this.updatePosition(bot.entity.position, true)
+        this.emitter.emit('onWorldSwitch')
+      },
     } satisfies Partial<BotEvents>
 
 

From 0c7900a655f2ce5ba6e4af44a62979cfd4339d36 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 26 Apr 2025 05:19:06 +0300
Subject: [PATCH 494/753] fix skins loading on real prod

---
 renderer/viewer/lib/utils/skins.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/utils/skins.ts b/renderer/viewer/lib/utils/skins.ts
index 4b8251c1..98792820 100644
--- a/renderer/viewer/lib/utils/skins.ts
+++ b/renderer/viewer/lib/utils/skins.ts
@@ -54,7 +54,7 @@ export const parseSkinTexturesValue = (value: string) => {
 
 export async function loadSkinImage (skinUrl: string): Promise<{ canvas: HTMLCanvasElement, image: HTMLImageElement }> {
   if (!skinUrl.startsWith('data:')) {
-    skinUrl = await fetchAndConvertBase64Skin(skinUrl)
+    skinUrl = await fetchAndConvertBase64Skin(skinUrl.replace('http://', 'https://'))
   }
 
   const image = await loadImageFromUrl(skinUrl)

From 86ef4f268e67de382453a14a044607c4fa4b1182 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 26 Apr 2025 05:32:17 +0300
Subject: [PATCH 495/753] fix sound id mapping for versions before 1.19.3

---
 src/sounds/botSoundSystem.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 3234652b..225aa345 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -113,10 +113,12 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
   })
 
   bot._client.on('sound_effect', async (packet) => {
+    const hasNamedSoundEffect = versionToNumber(bot.version) < versionToNumber('1.19.3')
+
     const soundResource = packet['soundEvent']?.resource as string | undefined
     const pos = new Vec3(packet.x / 8, packet.y / 8, packet.z / 8)
     if (packet.soundId !== 0 || !soundResource) {
-      const soundKey = soundMap!.soundsIdToName[packet.soundId - 1]
+      const soundKey = soundMap!.soundsIdToName[packet.soundId - (hasNamedSoundEffect ? 0 : 1)]
       if (soundKey === undefined) return
       await playGeneralSound(soundKey, pos, packet.volume, packet.pitch)
       return

From 305f4d8a310361ced88b0482ee3c9cf424dd1171 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 26 Apr 2025 05:51:00 +0300
Subject: [PATCH 496/753] fix surrogate pair check in js

---
 src/chatUtils.test.ts | 12 +++++++++---
 src/chatUtils.ts      | 14 ++++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/chatUtils.test.ts b/src/chatUtils.test.ts
index 4c86f904..6d683919 100644
--- a/src/chatUtils.test.ts
+++ b/src/chatUtils.test.ts
@@ -70,9 +70,15 @@ test('isAllowedChatCharacter', () => {
   expect(isAllowedChatCharacter('a')).toBe(true)
   expect(isAllowedChatCharacter('§')).toBe(false)
   expect(isAllowedChatCharacter(' ')).toBe(true)
-  expect(isAllowedChatCharacter('ツ')).toBe(true)
-  expect(isStringAllowed('🟢')).toMatchObject({
+  expect(isStringAllowed('a§b')).toMatchObject({
+    valid: false,
+    clean: 'ab',
+    invalid: ['§']
+  })
+  expect(isStringAllowed('aツ')).toMatchObject({
+    valid: true,
+  })
+  expect(isStringAllowed('a🟢')).toMatchObject({
     valid: true,
-    invalid: null
   })
 })
diff --git a/src/chatUtils.ts b/src/chatUtils.ts
index 6253569e..384dbdae 100644
--- a/src/chatUtils.ts
+++ b/src/chatUtils.ts
@@ -137,14 +137,24 @@ export function isAllowedChatCharacter (char: string): boolean {
 
 export const isStringAllowed = (str: string) => {
   const invalidChars = new Set<string>()
-  for (const char of str) {
+  for (const [i, char] of [...str].entries()) {
+    const isSurrogatePair = str.codePointAt(i) !== str['charCodeAt'](i)
+    if (isSurrogatePair) continue
+
     if (!isAllowedChatCharacter(char)) {
       invalidChars.add(char)
     }
   }
 
+  const valid = invalidChars.size === 0
+  if (valid) {
+    return {
+      valid: true
+    }
+  }
+
   return {
-    valid: invalidChars.size === 0,
+    valid,
     clean: [...str].filter(c => !invalidChars.has(c)).join(''),
     invalid: [...invalidChars]
   }

From fa36ed2678565966c8d5023c1683da9507612802 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 26 Apr 2025 06:19:05 +0300
Subject: [PATCH 497/753] fix tsc

---
 src/react/ChatProvider.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 58c9912c..50912820 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -79,11 +79,11 @@ export default () => {
         if (chatVanillaRestrictions && !miscUiState.flyingSquid) {
           const validation = isStringAllowed(message)
           if (!validation.valid) {
-            const choice = await showOptionsModal(`Can't send invalid characters to vanilla server (${validation.invalid.join(', ')}). You can use them only in command blocks.`, [
+            const choice = await showOptionsModal(`Can't send invalid characters to vanilla server (${validation.invalid?.join(', ')}). You can use them only in command blocks.`, [
               'Remove Them & Send'
             ])
             if (!choice) return
-            message = validation.clean
+            message = validation.clean!
           }
         }
 

From cd2ff62d6ddbe12dcc7a8bbf5f89c067464d995c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 26 Apr 2025 09:51:43 +0300
Subject: [PATCH 498/753] fix: remove skeleton helper which was causing them
 flying for ALL bedrock entities fixes #270

---
 renderer/viewer/three/entity/EntityMesh.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/renderer/viewer/three/entity/EntityMesh.ts b/renderer/viewer/three/entity/EntityMesh.ts
index 488a0f86..42d2fb2b 100644
--- a/renderer/viewer/three/entity/EntityMesh.ts
+++ b/renderer/viewer/three/entity/EntityMesh.ts
@@ -527,12 +527,6 @@ export class EntityMesh {
         debugFlags)
       mesh.name = `geometry_${name}`
       this.mesh.add(mesh)
-
-      const skeletonHelper = new THREE.SkeletonHelper(mesh)
-      //@ts-expect-error
-      skeletonHelper.material.linewidth = 2
-      skeletonHelper.visible = false
-      this.mesh.add(skeletonHelper)
     }
     debugFlags.type = 'bedrock'
   }

From e20fb8be533ed01083394bc7633502f52b38edcb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 26 Apr 2025 10:38:19 +0300
Subject: [PATCH 499/753] add ?debugEntities for list of supported entities

---
 renderer/playground/scenes/allEntities.ts | 157 +---------------------
 renderer/viewer/three/entities.ts         |  14 +-
 renderer/viewer/three/graphicsBackend.ts  |  11 ++
 3 files changed, 21 insertions(+), 161 deletions(-)

diff --git a/renderer/playground/scenes/allEntities.ts b/renderer/playground/scenes/allEntities.ts
index 68714cf8..281af807 100644
--- a/renderer/playground/scenes/allEntities.ts
+++ b/renderer/playground/scenes/allEntities.ts
@@ -1,6 +1,6 @@
-//@ts-nocheck
 import { BasePlaygroundScene } from '../baseScene'
 import { EntityDebugFlags, EntityMesh, rendererSpecialHandled } from '../../viewer/three/entity/EntityMesh'
+import { displayEntitiesDebugList } from '../allEntitiesDebug'
 
 export default class AllEntities extends BasePlaygroundScene {
   continuousRender = false
@@ -8,159 +8,6 @@ export default class AllEntities extends BasePlaygroundScene {
 
   async initData () {
     await super.initData()
-
-    // Create results container
-    const container = document.createElement('div')
-    container.style.cssText = `
-      position: fixed;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      max-height: 90vh;
-      overflow-y: auto;
-      background: rgba(0,0,0,0.8);
-      color: white;
-      padding: 20px;
-      border-radius: 8px;
-      font-family: monospace;
-      min-width: 400px;
-    `
-    document.body.appendChild(container)
-
-    // Add title
-    const title = document.createElement('h2')
-    title.textContent = 'Minecraft Entity Support'
-    title.style.cssText = 'margin-top: 0; text-align: center;'
-    container.appendChild(title)
-
-    // Test entities
-    const results: Array<{
-      entity: string;
-      supported: boolean;
-      type?: 'obj' | 'bedrock';
-      mappedFrom?: string;
-      textureMap?: boolean;
-      errors?: string[];
-    }> = []
-    const { mcData } = window
-    const entityNames = Object.keys(mcData.entitiesArray.reduce((acc, entity) => {
-      acc[entity.name] = true
-      return acc
-    }, {}))
-
-    // Add loading indicator
-    const loading = document.createElement('div')
-    loading.textContent = 'Testing entities...'
-    loading.style.textAlign = 'center'
-    container.appendChild(loading)
-
-    for (const entity of entityNames) {
-      const debugFlags: EntityDebugFlags = {}
-
-      try {
-        // eslint-disable-next-line no-new
-        new EntityMesh(this.version, entity, viewer.world, {}, debugFlags)
-
-        results.push({
-          entity,
-          supported: !!debugFlags.type || rendererSpecialHandled.includes(entity),
-          type: debugFlags.type,
-          mappedFrom: debugFlags.tempMap,
-          textureMap: debugFlags.textureMap,
-          errors: debugFlags.errors
-        })
-      } catch (e) {
-        console.error(e)
-        results.push({
-          entity,
-          supported: false,
-          mappedFrom: debugFlags.tempMap
-        })
-      }
-    }
-
-    // Remove loading indicator
-    loading.remove()
-
-    const createSection = (title: string, items: any[], filter: (item: any) => boolean) => {
-      const section = document.createElement('div')
-      section.style.marginBottom = '20px'
-
-      const sectionTitle = document.createElement('h3')
-      sectionTitle.textContent = title
-      sectionTitle.style.textAlign = 'center'
-      section.appendChild(sectionTitle)
-
-      const list = document.createElement('ul')
-      list.style.cssText = 'padding-left: 20px; list-style-type: none; margin: 0;'
-
-      const filteredItems = items.filter(filter)
-      for (const item of filteredItems) {
-        const listItem = document.createElement('li')
-        listItem.style.cssText = 'line-height: 1.4; margin: 8px 0;'
-
-        const entityName = document.createElement('strong')
-        entityName.style.cssText = 'user-select: text;-webkit-user-select: text;'
-        entityName.textContent = item.entity
-        listItem.appendChild(entityName)
-
-        let text = ''
-        if (item.mappedFrom) {
-          text += ` -> ${item.mappedFrom}`
-        }
-        if (item.type) {
-          text += ` - ${item.type}`
-        }
-        if (item.textureMap) {
-          text += ' ⚠️'
-        }
-        if (item.errors) {
-          text += ' ❌'
-        }
-
-        listItem.appendChild(document.createTextNode(text))
-        list.appendChild(listItem)
-      }
-
-      section.appendChild(list)
-      return { section, count: filteredItems.length }
-    }
-
-    // Sort results - bedrock first
-    results.sort((a, b) => {
-      if (a.type === 'bedrock' && b.type !== 'bedrock') return -1
-      if (a.type !== 'bedrock' && b.type === 'bedrock') return 1
-      return a.entity.localeCompare(b.entity)
-    })
-
-    // Add sections
-    const sections = [
-      {
-        title: '❌ Unsupported Entities',
-        filter: (r: any) => !r.supported && !r.mappedFrom
-      },
-      {
-        title: '⚠️ Partially Supported Entities',
-        filter: (r: any) => r.mappedFrom
-      },
-      {
-        title: '✅ Supported Entities',
-        filter: (r: any) => r.supported && !r.mappedFrom
-      }
-    ]
-
-    for (const { title, filter } of sections) {
-      const { section, count } = createSection(title, results, filter)
-      if (count > 0) {
-        container.appendChild(section)
-      }
-    }
-
-    // log object with errors per entity
-    const errors = results.filter(r => r.errors).map(r => ({
-      entity: r.entity,
-      errors: r.errors
-    }))
-    console.log(errors)
+    displayEntitiesDebugList(this.version)
   }
 }
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 38b482f2..04357c2c 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -1089,6 +1089,14 @@ export class Entities {
       })
     }
   }
+
+  raycastScene () {
+    // return any object from scene. raycast from camera
+    const raycaster = new THREE.Raycaster()
+    raycaster.setFromCamera(new THREE.Vector2(0, 0), this.worldRenderer.camera)
+    const intersects = raycaster.intersectObjects(this.worldRenderer.scene.children)
+    return intersects[0]?.object
+  }
 }
 
 function getGeneralEntitiesMetadata (entity: { name; metadata }): Partial<UnionToIntersection<EntityMetadataVersions[keyof EntityMetadataVersions]>> {
@@ -1187,12 +1195,6 @@ function addArmorModel (worldRenderer: WorldRendererThree, entityMesh: THREE.Obj
   group.name = `armor_${slotType}${overlay ? '_overlay' : ''}`
   group.add(mesh)
 
-  const skeletonHelper = new THREE.SkeletonHelper(mesh)
-  //@ts-expect-error
-  skeletonHelper.material.linewidth = 2
-  skeletonHelper.visible = false
-  group.add(skeletonHelper)
-
   entityMesh.add(mesh)
 }
 
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index 14534d40..6ac068d7 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -3,6 +3,8 @@ import { Vec3 } from 'vec3'
 import { GraphicsBackendLoader, GraphicsBackend, GraphicsInitOptions, DisplayWorldOptions } from '../../../src/appViewer'
 import { ProgressReporter } from '../../../src/core/progressReporter'
 import { showNotification } from '../../../src/react/NotificationProvider'
+import { displayEntitiesDebugList } from '../../playground/allEntitiesDebug'
+import supportedVersions from '../../../src/supportedVersions.mjs'
 import { WorldRendererThree } from './worldrendererThree'
 import { DocumentRenderer } from './documentRenderer'
 import { PanoramaRenderer } from './panorama'
@@ -55,6 +57,15 @@ const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitO
 
   const startPanorama = async () => {
     if (worldRenderer) return
+    const qs = new URLSearchParams(window.location.search)
+    if (qs.get('debugEntities')) {
+      initOptions.resourcesManager.currentConfig = { version: qs.get('version') || supportedVersions.at(-1)!, noInventoryGui: true }
+      await initOptions.resourcesManager.updateAssetsData({ })
+
+      displayEntitiesDebugList(initOptions.resourcesManager.currentConfig.version)
+      return
+    }
+
     if (!panoramaRenderer) {
       panoramaRenderer = new PanoramaRenderer(documentRenderer, initOptions, !!process.env.SINGLE_FILE_BUILD_MODE)
       window.panoramaRenderer = panoramaRenderer

From e706f7d086e4f85fa35e6d66d0cc6ca822b50f36 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 26 Apr 2025 10:38:32 +0300
Subject: [PATCH 500/753] fix ocelot rendering

---
 renderer/viewer/three/entity/EntityMesh.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/renderer/viewer/three/entity/EntityMesh.ts b/renderer/viewer/three/entity/EntityMesh.ts
index 42d2fb2b..2db09dd5 100644
--- a/renderer/viewer/three/entity/EntityMesh.ts
+++ b/renderer/viewer/three/entity/EntityMesh.ts
@@ -2,6 +2,7 @@ import * as THREE from 'three'
 import { OBJLoader } from 'three-stdlib'
 import huskPng from 'mc-assets/dist/other-textures/latest/entity/zombie/husk.png'
 import { Vec3 } from 'vec3'
+import ocelotPng from '../../../../node_modules/mc-assets/dist/other-textures/latest/entity/cat/ocelot.png'
 import arrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/arrow.png'
 import spectralArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/spectral_arrow.png'
 import tippedArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/tipped_arrow.png'
@@ -456,7 +457,7 @@ export class EntityMesh {
         'skeleton_horse': `textures/${version}/entity/horse/horse_skeleton.png`,
         'donkey': `textures/${version}/entity/horse/donkey.png`,
         'mule': `textures/${version}/entity/horse/mule.png`,
-        'ocelot': `textures/${version}/entity/cat/ocelot.png`,
+        'ocelot': ocelotPng,
         'arrow': arrowTexture,
         'spectral_arrow': spectralArrowTexture,
         'tipped_arrow': tippedArrowTexture

From 1599917134a940d8f7ce2e386115ab5193bc9ebc Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 26 Apr 2025 10:38:59 +0300
Subject: [PATCH 501/753] feat: falling block & summoned tnt entities rendering
 support

---
 renderer/viewer/lib/worldDataEmitter.ts |  8 +++++
 renderer/viewer/three/appShared.ts      |  6 +++-
 renderer/viewer/three/entities.ts       | 48 ++++++++++++++++++++-----
 3 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 42c071dd..9e483ee2 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -90,9 +90,17 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
   }
 
   listenToBot (bot: typeof __type_bot) {
+    const entitiesObjectData = new Map<string, number>()
+    bot._client.prependListener('spawn_entity', (data) => {
+      if (data.objectData && data.entityId !== undefined) {
+        entitiesObjectData.set(data.entityId, data.objectData)
+      }
+    })
+
     const emitEntity = (e, name = 'entity') => {
       if (!e || e === bot.entity) return
       if (!e.name) return // mineflayer received update for not spawned entity
+      e.objectData = entitiesObjectData.get(e.id)
       this.emitter.emit(name as any, {
         ...e,
         pos: e.position,
diff --git a/renderer/viewer/three/appShared.ts b/renderer/viewer/three/appShared.ts
index 9afbe563..1dfb343c 100644
--- a/renderer/viewer/three/appShared.ts
+++ b/renderer/viewer/three/appShared.ts
@@ -19,8 +19,12 @@ export const getItemUv = (item: Record<string, any>, specificProps: ItemSpecific
   const resources = resourcesManager.currentResources
   if (!resources) throw new Error('Resources not loaded')
   const idOrName = item.itemId ?? item.blockId ?? item.name
+  const { blockState } = item
   try {
-    const name = typeof idOrName === 'number' ? loadedData.items[idOrName]?.name : idOrName
+    const name =
+      blockState
+        ? loadedData.blocksByStateId[blockState]?.name
+        : typeof idOrName === 'number' ? loadedData.items[idOrName]?.name : idOrName
     if (!name) throw new Error(`Item not found: ${idOrName}`)
 
     const model = getItemModelName({
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 04357c2c..320daff9 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -620,24 +620,56 @@ export class Entities {
     let mesh
     if (e === undefined) {
       const group = new THREE.Group()
-      if (entity.name === 'item') {
-        const item = entity.metadata?.find((m: any) => typeof m === 'object' && m?.itemCount)
+      if (entity.name === 'item' || entity.name === 'tnt' || entity.name === 'falling_block') {
+        const item = entity.name === 'tnt'
+          ? { name: 'tnt' }
+          : entity.name === 'falling_block'
+            ? { blockState: entity['objectData'] }
+            : entity.metadata?.find((m: any) => typeof m === 'object' && m?.itemCount)
         if (item) {
           const object = this.getItemMesh(item, {
             'minecraft:display_context': 'ground',
           })
           if (object) {
             mesh = object.mesh
-            mesh.scale.set(0.5, 0.5, 0.5)
-            mesh.position.set(0, 0.2, 0)
+            if (entity.name === 'item') {
+              mesh.scale.set(0.5, 0.5, 0.5)
+              mesh.position.set(0, 0.2, 0)
+            } else {
+              mesh.scale.set(2, 2, 2)
+              mesh.position.set(0, 0.5, 0)
+            }
             // set faces
             // mesh.position.set(targetPos.x + 0.5 + 2, targetPos.y + 0.5, targetPos.z + 0.5)
             // viewer.scene.add(mesh)
             const clock = new THREE.Clock()
-            mesh.onBeforeRender = () => {
-              const delta = clock.getDelta()
-              mesh.rotation.y += delta
+            if (entity.name === 'item') {
+              mesh.onBeforeRender = () => {
+                const delta = clock.getDelta()
+                mesh.rotation.y += delta
+              }
             }
+
+            // TNT blinking
+            // if (entity.name === 'tnt') {
+            //   let lastBlink = 0
+            //   const blinkInterval = 500 // ms between blinks
+            //   mesh.onBeforeRender = () => {
+            //     const now = Date.now()
+            //     if (now - lastBlink > blinkInterval) {
+            //       lastBlink = now
+            //       mesh.traverse((child) => {
+            //         if (child instanceof THREE.Mesh) {
+            //           const material = child.material as THREE.MeshLambertMaterial
+            //           material.color.set(material.color?.equals(new THREE.Color(0xff_ff_ff))
+            //             ? new THREE.Color(0xff_00_00)
+            //             : new THREE.Color(0xff_ff_ff))
+            //         }
+            //       })
+            //     }
+            //   }
+            // }
+
             //@ts-expect-error
             group.additionalCleanup = () => {
               // important: avoid texture memory leak and gpu slowdown
@@ -1076,7 +1108,7 @@ export class Entities {
     const entityMesh = this.entities[entityId]?.children.find(c => c.name === 'mesh')
     if (entityMesh) {
       entityMesh.traverse((child) => {
-        if (child instanceof THREE.Mesh) {
+        if (child instanceof THREE.Mesh && child.material.clone) {
           const clonedMaterial = child.material.clone()
           clonedMaterial.dispose()
           child.material = child.material.clone()

From aa0024faa2058f0df9d7c517b6796a86d1021b98 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 26 Apr 2025 10:39:12 +0300
Subject: [PATCH 502/753] experimental mods actions

---
 src/clientMods.ts        | 59 ++++++++++++++++++++++++++++++++++++++--
 src/optionsGuiScheme.tsx | 11 ++++++--
 src/react/ModsPage.tsx   | 14 +++++++++-
 3 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/src/clientMods.ts b/src/clientMods.ts
index a6242d1a..204a5861 100644
--- a/src/clientMods.ts
+++ b/src/clientMods.ts
@@ -9,6 +9,7 @@ import { options } from './optionsStorage'
 import { appStorage } from './react/appStorageProvider'
 import { showInputsModal, showOptionsModal } from './react/SelectOption'
 import { ProgressReporter } from './core/progressReporter'
+import { showNotification } from './react/NotificationProvider'
 
 let sillyProtection = false
 const protectRuntime = () => {
@@ -90,6 +91,29 @@ const dbPromise = openDB('mods-db', 1, {
   },
 })
 
+export interface ModSetting {
+  label?: string
+  type: 'toggle' | 'choice' | 'input' | 'slider'
+  hidden?: boolean
+  values?: string[]
+  inputType?: string
+  hint?: string
+  default?: any
+}
+
+export interface ModSettingsDict {
+  [settingId: string]: ModSetting
+}
+
+export interface ModAction {
+  method?: string
+  label?: string
+  /** @default false */
+  gameGlobal?: boolean
+  /** @default false */
+  onlyForeground?: boolean
+}
+
 // mcraft-repo.json
 export interface McraftRepoFile {
   packages: ClientModDefinition[]
@@ -127,6 +151,9 @@ export interface ClientMod {
   lastUpdated?: number
   wasModifiedLocally?: boolean
   // todo depends, hashsum
+
+  settings?: ModSettingsDict
+  actionsMain?: Record<string, ModAction>
 }
 
 const cleanupFetchedModData = (mod: ClientModDefinition | Record<string, any>) => {
@@ -157,7 +184,7 @@ async function getPlugin (name: string) {
   return db.get('mods', name) as Promise<ClientMod | undefined>
 }
 
-async function getAllMods () {
+export async function getAllMods () {
   const db = await dbPromise
   return db.getAll('mods') as Promise<ClientMod[]>
 }
@@ -235,7 +262,7 @@ const activateMod = async (mod: ClientMod, reason: string) => {
     // eslint-disable-next-line no-useless-catch
     try {
       const module = await import(/* webpackIgnore: true */ url)
-      module.default?.(structuredClone(mod))
+      module.default?.(structuredClone(mod), { settings: getModSettingsProxy(mod) })
       window.loadedMods[mod.name] ??= {}
       window.loadedMods[mod.name].mainUnstableModule = module
     } catch (e) {
@@ -580,3 +607,31 @@ export const getAllModsModifiableFields = () => {
 export const getModModifiableFields = (mod: ClientMod): ModifiableField[] => {
   return getAllModsModifiableFields().filter(field => mod[field.field])
 }
+
+export const getModSettingsProxy = (mod: ClientMod) => {
+  if (!mod.settings) return valtio.proxy({})
+
+  const proxy = valtio.proxy({})
+  for (const [key, setting] of Object.entries(mod.settings)) {
+    proxy[key] = options[`mod-${mod.name}-${key}`] ?? setting.default
+  }
+
+  valtio.subscribe(proxy, (ops) => {
+    for (const op of ops) {
+      const [type, path, value] = op
+      const key = path[0] as string
+      options[`mod-${mod.name}-${key}`] = value
+    }
+  })
+
+  return proxy
+}
+
+export const callMethodAction = async (modName: string, type: 'main', method: string) => {
+  try {
+    const mod = window.loadedMods?.[modName]
+    await mod[method]()
+  } catch (err) {
+    showNotification(`Failed to execute ${method}`, `Problem in ${type} js script of ${modName}`, true)
+  }
+}
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 20514489..4e38c98e 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -1,4 +1,4 @@
-import { useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { useSnapshot } from 'valtio'
 import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { noCase } from 'change-case'
@@ -14,7 +14,7 @@ import { openFilePicker, resetLocalStorage } from './browserfs'
 import { completeResourcepackPackInstall, getResourcePackNames, resourcepackReload, resourcePackState, uninstallResourcePack } from './resourcePack'
 import { downloadPacketsReplay, packetsRecordingState } from './packetsReplay/packetsReplayLegacy'
 import { showInputsModal, showOptionsModal } from './react/SelectOption'
-import { modsUpdateStatus } from './clientMods'
+import { ClientMod, getAllMods, modsUpdateStatus } from './clientMods'
 import supportedVersions from './supportedVersions.mjs'
 import { getVersionAutoSelect } from './connect'
 import { createNotificationProgressReporter } from './core/progressReporter'
@@ -232,9 +232,14 @@ export const guiOptionsScheme: {
       custom () {
         const { appConfig } = useSnapshot(miscUiState)
         const modsUpdateSnapshot = useSnapshot(modsUpdateStatus)
+        const [clientMods, setClientMods] = useState<ClientMod[]>([])
+        useEffect(() => {
+          void getAllMods().then(setClientMods)
+        }, [])
 
         if (appConfig?.showModsButton === false) return null
-        return <Button label={`Client Mods: ${Object.keys(window.loadedMods ?? {}).length} (${Object.keys(modsUpdateSnapshot).length})`} onClick={() => showModal({ reactType: 'mods' })} inScreen />
+        const enabledModsCount = Object.keys(clientMods.filter(mod => mod.enabled)).length
+        return <Button label={`Client Mods: ${enabledModsCount} (${Object.keys(modsUpdateSnapshot).length})`} onClick={() => showModal({ reactType: 'mods' })} inScreen />
       },
     },
     {
diff --git a/src/react/ModsPage.tsx b/src/react/ModsPage.tsx
index 6f849fbd..bdcc30c4 100644
--- a/src/react/ModsPage.tsx
+++ b/src/react/ModsPage.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState, useMemo, useRef } from 'react'
 import { useSnapshot } from 'valtio'
 import { openURL } from 'renderer/viewer/lib/simpleUtils'
-import { addRepositoryAction, setEnabledModAction, getAllModsDisplayList, installModByName, selectAndRemoveRepository, uninstallModAction, fetchAllRepositories, modsReactiveUpdater, modsErrors, fetchRepository, getModModifiableFields, saveClientModData, getAllModsModifiableFields } from '../clientMods'
+import { addRepositoryAction, setEnabledModAction, getAllModsDisplayList, installModByName, selectAndRemoveRepository, uninstallModAction, fetchAllRepositories, modsReactiveUpdater, modsErrors, fetchRepository, getModModifiableFields, saveClientModData, getAllModsModifiableFields, callMethodAction } from '../clientMods'
 import { createNotificationProgressReporter, ProgressReporter } from '../core/progressReporter'
 import { hideModal } from '../globalState'
 import { useIsModalActive } from './utilsApp'
@@ -228,6 +228,18 @@ const ModSidebar = ({ mod }: { mod: (ModsData['repos'][0]['packages'][0] & { rep
           />
         )}
       </div>
+
+      {window.loadedMods?.[mod.name] && mod.actionsMain && (
+        <div style={{ display: 'flex', flexDirection: 'column', gap: 3 }}>
+          Actions:
+          {Object.entries(mod.actionsMain).map(([key, setting]) => (
+            <div
+              key={key} onClick={() => {
+                void callMethodAction(mod.name, 'main', key)
+              }}>{key}</div>
+          ))}
+        </div>
+      )}
     </>
   )
 }

From 0f2e4f13292c5c8b4c89489c13d7116c322f8c61 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 26 Apr 2025 10:50:29 +0300
Subject: [PATCH 503/753] add allEntitiesDebug

---
 renderer/playground/allEntitiesDebug.ts | 170 ++++++++++++++++++++++++
 1 file changed, 170 insertions(+)
 create mode 100644 renderer/playground/allEntitiesDebug.ts

diff --git a/renderer/playground/allEntitiesDebug.ts b/renderer/playground/allEntitiesDebug.ts
new file mode 100644
index 00000000..5bc56ca6
--- /dev/null
+++ b/renderer/playground/allEntitiesDebug.ts
@@ -0,0 +1,170 @@
+import { EntityMesh, rendererSpecialHandled, EntityDebugFlags } from '../viewer/three/entity/EntityMesh'
+
+export const displayEntitiesDebugList = (version: string) => {
+  // Create results container
+  const container = document.createElement('div')
+  container.style.cssText = `
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    max-height: 90vh;
+    overflow-y: auto;
+    background: rgba(0,0,0,0.8);
+    color: white;
+    padding: 20px;
+    border-radius: 8px;
+    font-family: monospace;
+    min-width: 400px;
+    z-index: 1000;
+  `
+  document.body.appendChild(container)
+
+  // Add title
+  const title = document.createElement('h2')
+  title.textContent = 'Minecraft Entity Support'
+  title.style.cssText = 'margin-top: 0; text-align: center;'
+  container.appendChild(title)
+
+  // Test entities
+  const results: Array<{
+    entity: string;
+    supported: boolean;
+    type?: 'obj' | 'bedrock' | 'special';
+    mappedFrom?: string;
+    textureMap?: boolean;
+    errors?: string[];
+  }> = []
+  const { mcData } = window
+  const entityNames = Object.keys(mcData.entitiesArray.reduce((acc, entity) => {
+    acc[entity.name] = true
+    return acc
+  }, {}))
+
+  // Add loading indicator
+  const loading = document.createElement('div')
+  loading.textContent = 'Testing entities...'
+  loading.style.textAlign = 'center'
+  container.appendChild(loading)
+
+  for (const entity of entityNames) {
+    const debugFlags: EntityDebugFlags = {}
+
+    if (rendererSpecialHandled.includes(entity)) {
+      results.push({
+        entity,
+        supported: true,
+        type: 'special',
+      })
+      continue
+    }
+
+    try {
+
+      const { mesh: entityMesh } = new EntityMesh(version, entity, undefined, {}, debugFlags)
+      // find the most distant pos child
+      window.objects ??= {}
+      window.objects[entity] = entityMesh
+
+      results.push({
+        entity,
+        supported: !!debugFlags.type || rendererSpecialHandled.includes(entity),
+        type: debugFlags.type,
+        mappedFrom: debugFlags.tempMap,
+        textureMap: debugFlags.textureMap,
+        errors: debugFlags.errors
+      })
+    } catch (e) {
+      console.error(e)
+      results.push({
+        entity,
+        supported: false,
+        mappedFrom: debugFlags.tempMap
+      })
+    }
+  }
+
+  // Remove loading indicator
+  loading.remove()
+
+  const createSection = (title: string, items: any[], filter: (item: any) => boolean) => {
+    const section = document.createElement('div')
+    section.style.marginBottom = '20px'
+
+    const sectionTitle = document.createElement('h3')
+    sectionTitle.textContent = title
+    sectionTitle.style.textAlign = 'center'
+    section.appendChild(sectionTitle)
+
+    const list = document.createElement('ul')
+    list.style.cssText = 'padding-left: 20px; list-style-type: none; margin: 0;'
+
+    const filteredItems = items.filter(filter)
+    for (const item of filteredItems) {
+      const listItem = document.createElement('li')
+      listItem.style.cssText = 'line-height: 1.4; margin: 8px 0;'
+
+      const entityName = document.createElement('strong')
+      entityName.style.cssText = 'user-select: text;-webkit-user-select: text;'
+      entityName.textContent = item.entity
+      listItem.appendChild(entityName)
+
+      let text = ''
+      if (item.mappedFrom) {
+        text += ` -> ${item.mappedFrom}`
+      }
+      if (item.type) {
+        text += ` - ${item.type}`
+      }
+      if (item.textureMap) {
+        text += ' ⚠️'
+      }
+      if (item.errors) {
+        text += ' ❌'
+      }
+
+      listItem.appendChild(document.createTextNode(text))
+      list.appendChild(listItem)
+    }
+
+    section.appendChild(list)
+    return { section, count: filteredItems.length }
+  }
+
+  // Sort results - bedrock first
+  results.sort((a, b) => {
+    if (a.type === 'bedrock' && b.type !== 'bedrock') return -1
+    if (a.type !== 'bedrock' && b.type === 'bedrock') return 1
+    return a.entity.localeCompare(b.entity)
+  })
+
+  // Add sections
+  const sections = [
+    {
+      title: '❌ Unsupported Entities',
+      filter: (r: any) => !r.supported && !r.mappedFrom
+    },
+    {
+      title: '⚠️ Partially Supported Entities',
+      filter: (r: any) => r.mappedFrom
+    },
+    {
+      title: '✅ Supported Entities',
+      filter: (r: any) => r.supported && !r.mappedFrom
+    }
+  ]
+
+  for (const { title, filter } of sections) {
+    const { section, count } = createSection(title, results, filter)
+    if (count > 0) {
+      container.appendChild(section)
+    }
+  }
+
+  // log object with errors per entity
+  const errors = results.filter(r => r.errors).map(r => ({
+    entity: r.entity,
+    errors: r.errors
+  }))
+  console.log(errors)
+}

From 95163fb288da31bfe2148bb94e5f00e019ed66a3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 27 Apr 2025 11:19:29 +0300
Subject: [PATCH 504/753] update page description and tech

---
 TECH.md    | 13 +++++++------
 index.html |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/TECH.md b/TECH.md
index c7f4ef4e..2d15993a 100644
--- a/TECH.md
+++ b/TECH.md
@@ -10,26 +10,27 @@ This client generally has better performance but some features reproduction migh
 | Gamepad Support                   | ✅                       | ❌           |                                                                                                                                                                                                                          |
 | A11Y                              | ✅                       | ❌           | We have DOM for almost all UI so your extensions and other browser features will work natively like on any other web page (but maybe it's not needed)                                                                    |
 | Game Features                     |                         |             |                                                                                                                                                                                                                          |
-| Servers Support (quality)         | ❌                       | ✅           | Eaglercraft is vanilla Minecraft, while this project tries to emulate original game behavior at protocol level (Mineflayer is used)                                                                                      |
+| Servers Support (quality)         | ❌(+)                    | ✅           | Eaglercraft is vanilla Minecraft, while this project tries to emulate original game behavior at protocol level (Mineflayer is used)                                                                                      |
 | Servers Support (any version, ip) | ✅                       | ❌           | We support almost all Minecraft versions, only important if you connect to a server where you need new content like blocks or if you play with friends. And you can connect to almost any server using proxy servers!    |
+| Servers Support (online mode)     | ✅                       | ❌           | Join to online servers like Hypixel using your Microsoft account without additional proxies    |
 | Singleplayer Survival Features    | ❌                       | ✅           | Just like Eaglercraft this project can generate and save worlds, but generator is simple and only a few survival features are supported (look here for [supported features list](https://github.com/zardoy/space-squid)) |
 | Singleplayer Maps                 | ✅                       | ✅           | We support any version, but adventure maps won't work, but simple parkour and build maps might be interesting to explore...                                                                                              |
 | Singleplayer Maps World Streaming | ✅                       | ❌           | Thanks to Browserfs, saves can be loaded to local singleplayer server using multiple ways: from local folder, server directory (not zip), dropbox or other cloud *backend* etc...                                        |
 | P2P Multiplayer                   | ✅                       | ✅           | A way to connect to other browser running the project. But it's almost useless here since many survival features are not implemented. Maybe only to build / explore maps together...                                     |
-| Voice Chat                        | ❌                       | ✅           | Eaglercraft has custom WebRTC voice chat implementation, though it could also be easily implemented there                                                                                                                |
+| Voice Chat                        | ❌(+)                    | ✅           | Eaglercraft has custom WebRTC voice chat implementation, though it could also be easily implemented there                                                                                                                |
 | Online Servers                    | ✅                       | ❌           | We have custom implementation (including integration on proxy side) for joining to servers                                                                                                                               |
 | Plugin Features                   | ✅                       | ❌           | We have Mineflayer plugins support, like Auto Jump & Auto Parkour was added here that way                                                                                                                                |
 | Direct Connection                 | ✅                       | ✅           | We have DOM for almost all UI so your extensions and other browser features will work natively like on any other web page                                                                                                |
-| Moding                            | ❌(roadmap, client-side) | ❌           | This project will support mods for singleplayer. In theory its possible to implement support for modded servers on protocol level (including all needed mods)                                                            |
-| Video Recording                   | ❌                       | ✅           | Don't feel needed                                                                                                                                                                                                        |
-| Metaverse Features                | ❌(roadmap)              | ❌           | Iframes, video streams inside of game world (custom protocol channel)                                                                                                                                                    |
+| Moding                            | ✅(own js mods)          | ❌           | This project will support mods for singleplayer. In theory its possible to implement support for modded servers on protocol level (including all needed mods)                                                            |
+| Video Recording                   | ❌                       | ✅           | Doesn't feel needed                                                                                                                                                                                                        |
+| Metaverse Features                | ✅(50%)                  | ❌           | We have videos / images support inside world, but not iframes (custom protocol channel)                                                                                                                                                    |
 | Sounds                            | ✅                       | ✅           |                                                                                                                                                                                                                          |
 | Resource Packs                    | ✅(+extras)              | ✅           | This project has very limited support for them (only textures images are loadable for now)                                                                                                                               |
 | Assets Compressing & Splitting    | ✅                       | ❌           | We have advanced Minecraft data processing and good code chunk splitting so the web app will open much faster and use less memory                                                                                        |
 | Graphics                          |                         |             |                                                                                                                                                                                                                          |
 | Fancy Graphics                    | ❌                       | ✅           | While Eaglercraft has top-level shaders we don't even support lighting                                                                                                                                                   |
 | Fast & Efficient Graphics         | ❌(+)                    | ❌           | Feels like no one needs to have 64 rendering distance work smoothly                                                                                                                                                      |
-| VR                                | ✅                       | ❌           | Feels like not needed feature. UI is missing in this project since DOM can't be rendered in VR so Eaglercraft could be better in that aspect                                                                             |
+| VR                                | ✅(-)                    | ❌           | Feels like not needed feature. UI is missing in this project since DOM can't be rendered in VR so Eaglercraft could be better in that aspect                                                                             |
 | AR                                | ❌                       | ❌           | Would be the most useless feature                                                                                                                                                                                        |
 | Minimap & Waypoints               | ✅(-)                    | ❌           | We have buggy minimap, which can be enabled in settings and full map is opened by pressing `M` key                                                                                                                       |
 
diff --git a/index.html b/index.html
index 891aeff3..5a6318ec 100644
--- a/index.html
+++ b/index.html
@@ -130,7 +130,7 @@
     </script> -->
     <title>Minecraft Web Client</title>
     <!-- <link rel="canonical" href="https://mcraft.fun"> -->
-    <meta name="description" content="Minecraft web client running in your browser">
+    <meta name="description" content="Minecraft Java Edition Client in Browser — Full Multiplayer Support, Server Connect, Offline Play — Join real Minecraft servers">
     <meta name="keywords" content="Play, Minecraft, Online, Web, Java, Server, Single player, Javascript, PrismarineJS, Voxel, WebGL, Three.js">
     <meta name="date" content="2024-07-11" scheme="YYYY-MM-DD">
     <meta name="language" content="English">

From 5caca68e8e2e7a48085b2807f7bd81c389e0b5c9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 28 Apr 2025 07:09:54 +0300
Subject: [PATCH 505/753] disable pr update desc

---
 .github/workflows/ci.yml | 52 ++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d624be53..cc344aad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -124,35 +124,35 @@ jobs:
       #       content['${{ github.event.pull_request.base.ref }}'] = stats;
       #       await updateGistContent(content);
 
-      - name: Update PR Description
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const { data: pr } = await github.rest.pulls.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: context.issue.number
-            });
+      # - name: Update PR Description
+      #   uses: actions/github-script@v6
+      #   with:
+      #     script: |
+      #       const { data: pr } = await github.rest.pulls.get({
+      #         owner: context.repo.owner,
+      #         repo: context.repo.repo,
+      #         pull_number: context.issue.number
+      #       });
 
-            let body = pr.body || '';
-            const statsMarker = '### Bundle Size';
-            const comparison = '${{ steps.compare.outputs.stats }}';
+      #       let body = pr.body || '';
+      #       const statsMarker = '### Bundle Size';
+      #       const comparison = '${{ steps.compare.outputs.stats }}';
 
-            if (body.includes(statsMarker)) {
-              body = body.replace(
-                new RegExp(`${statsMarker}[^\n]*\n[^\n]*`),
-                `${statsMarker}\n${comparison}`
-              );
-            } else {
-              body += `\n\n${statsMarker}\n${comparison}`;
-            }
+      #       if (body.includes(statsMarker)) {
+      #         body = body.replace(
+      #           new RegExp(`${statsMarker}[^\n]*\n[^\n]*`),
+      #           `${statsMarker}\n${comparison}`
+      #         );
+      #       } else {
+      #         body += `\n\n${statsMarker}\n${comparison}`;
+      #       }
 
-            await github.rest.pulls.update({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: context.issue.number,
-              body
-            });
+      #       await github.rest.pulls.update({
+      #         owner: context.repo.owner,
+      #         repo: context.repo.repo,
+      #         pull_number: context.issue.number,
+      #         body
+      #       });
   # dedupe-check:
   #   runs-on: ubuntu-latest
   #   if: github.event.pull_request.head.ref == 'next'

From 5bf66b8e50a63b8a7045b9d2efdf7a7733d09add Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 29 Apr 2025 04:22:59 +0300
Subject: [PATCH 506/753] ci: add fixed short link for released version eg
 v90.mcraft.fun

---
 .github/workflows/preview.yml                  |  2 +-
 .github/workflows/{publish.yml => release.yml} | 11 ++++++++++-
 scripts/githubActions.mjs                      | 10 ++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 rename .github/workflows/{publish.yml => release.yml} (83%)

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index b4908d8d..f35e6a00 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -1,4 +1,4 @@
-name: Vercel Deploy Preview
+name: Vercel PR Deploy (Preview)
 env:
   VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
   VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/release.yml
similarity index 83%
rename from .github/workflows/publish.yml
rename to .github/workflows/release.yml
index 1294f9ff..28c1e34c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/release.yml
@@ -29,6 +29,9 @@ jobs:
         run: pnpx zardoy-release empty --skip-github --output-file assets/release.json
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Get releasing alias
+        run: node scripts/githubActions.mjs getReleasingAlias
+        id: alias
       - name: Download Generated Sounds map
         run: node scripts/downloadSoundsMap.mjs
       - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod
@@ -45,6 +48,12 @@ jobs:
         with:
           run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} --prod
         id: deploy
+      - name: Set deployment alias
+        if: ${{ steps.alias.outputs.alias != '' && steps.alias.outputs.alias != 'mcraft.fun' && steps.alias.outputs.alias != 's.mcraft.fun' }}
+        run: |
+          for alias in $(echo ${{ steps.alias.outputs.alias }} | tr "," "\n"); do
+            vercel alias set ${{ steps.deploy.outputs.stdout }} $alias --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro
+          done
       # publish to github
       - run: cp vercel.json .vercel/output/static/vercel.json
       - uses: peaceiris/actions-gh-pages@v3
@@ -70,7 +79,7 @@ jobs:
           zip -r ../self-host.zip .
 
       - run: |
-          pnpx zardoy-release node --footer "This release URL: ${{ steps.deploy.outputs.stdout }}"
+          pnpx zardoy-release node --footer "This release URL: $(echo ${{ steps.alias.outputs.alias }} | cut -d',' -f1) (Vercel URL: ${{ steps.deploy.outputs.stdout }})"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # has possible output: tag
diff --git a/scripts/githubActions.mjs b/scripts/githubActions.mjs
index ab786ea9..3864d6c2 100644
--- a/scripts/githubActions.mjs
+++ b/scripts/githubActions.mjs
@@ -15,6 +15,16 @@ const fns = {
       // set github output
       setOutput('alias', alias[1])
     }
+  },
+  getReleasingAlias() {
+    const final = (ver) => `${ver}.mcraft.fun,${ver}.pcm.gg`
+    const releaseJson = JSON.parse(fs.readFileSync('./assets/release.json', 'utf8'))
+    const tag = releaseJson.latestTag
+    const [major, minor, patch] = tag.replace('v', '').split('.')
+    if (major === '0' && minor === '1') {
+      return final(`v${patch}`)
+    }
+    return final(tag)
   }
 }
 

From 4f1cb853011cc42e1b7c5b3c83912ef553f6bbd3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 30 Apr 2025 08:11:38 +0300
Subject: [PATCH 507/753] fix: fix p2p where peerjs server works

---
 src/core/progressReporter.ts  |  2 ++
 src/index.ts                  |  4 ++--
 src/localServerMultiplayer.ts | 18 +++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/core/progressReporter.ts b/src/core/progressReporter.ts
index c76bfb0b..75878fd2 100644
--- a/src/core/progressReporter.ts
+++ b/src/core/progressReporter.ts
@@ -122,6 +122,7 @@ const createProgressReporter = (implementation: ReporterDisplayImplementation):
     },
 
     setMessage (message: string): void {
+      if (ended) return
       implementation.setMessage(message)
     },
 
@@ -130,6 +131,7 @@ const createProgressReporter = (implementation: ReporterDisplayImplementation):
     },
 
     error (message: string): void {
+      if (ended) return
       implementation.error(message)
     }
   }
diff --git a/src/index.ts b/src/index.ts
index 3c897619..26bba494 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -439,7 +439,7 @@ export async function connect (connectOptions: ConnectOptions) {
     } else {
       initialLoadingText = 'We have no idea what to do'
     }
-    setLoadingScreenStatus(initialLoadingText)
+    progress.setMessage(initialLoadingText)
 
     if (parsedServer.isWebSocket) {
       loadingTimerState.networkOnlyStart = Date.now()
@@ -452,7 +452,7 @@ export async function connect (connectOptions: ConnectOptions) {
       tokenCaches: cachedTokens,
       proxyBaseUrl: connectOptions.proxy,
       setProgressText (text) {
-        setLoadingScreenStatus(text)
+        progress.setMessage(text)
       },
       setCacheResult (result) {
         newTokensCacheResult = result
diff --git a/src/localServerMultiplayer.ts b/src/localServerMultiplayer.ts
index bbbf0db6..7eaa2427 100644
--- a/src/localServerMultiplayer.ts
+++ b/src/localServerMultiplayer.ts
@@ -59,6 +59,7 @@ export const openToWanAndCopyJoinLink = async (writeText: (text) => void, doCopy
   const params = host ? parseUrl(host) : undefined
   const peer = new Peer({
     debug: 3,
+    secure: true,
     ...params
   })
   peerInstance = peer
@@ -119,11 +120,18 @@ export const openToWanAndCopyJoinLink = async (writeText: (text) => void, doCopy
       await copyJoinLink()
       resolve('Copied join link to clipboard')
     })
-    timeout = setTimeout(() => {
+    timeout = setTimeout(async () => {
       if (!hadErrorReported && timeout !== undefined) {
-        writeText('timeout')
+        if (hasFallback && overridePeerJsServer === null) {
+          destroy()
+          overridePeerJsServer = fallbackServer
+          console.log('Trying fallback server due to timeout', fallbackServer)
+          resolve((await openToWanAndCopyJoinLink(writeText, doCopy))!)
+        } else {
+          writeText('timeout')
+          resolve('Failed to open to wan (timeout)')
+        }
       }
-      resolve('Failed to open to wan (timeout)')
     }, 6000)
 
     // fallback
@@ -139,7 +147,7 @@ export const openToWanAndCopyJoinLink = async (writeText: (text) => void, doCopy
       }
     })
   })
-  if (!peerInstance.open) {
+  if (peerInstance && !peerInstance.open) {
     destroy()
   }
   miscUiState.wanOpening = false
@@ -200,7 +208,7 @@ export const connectToPeer = async (peerId: string, options: ConnectPeerOptions
   const clientDuplex = new CustomDuplex({}, (data) => {
     // todo debug until play state
     // console.debug('sending', data.toString())
-    connection.send(data)
+    void connection.send(data)
   })
   connection.on('data', (data: any) => {
     console.debug('received', Buffer.from(data).toString())

From 221f99ffdf2e553e4ebfafa2f39938552635cf95 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 30 Apr 2025 12:17:47 +0300
Subject: [PATCH 508/753] fix: fix players list disappear on dimension switch

---
 package.json   |  2 +-
 pnpm-lock.yaml | 72 +++++++++++++++++++++++++++++++++-----------------
 2 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index 4402bdc8..8559b44f 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "https-browserify": "^1.0.0",
     "mc-assets": "^0.2.53",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
-    "mineflayer": "github:GenerelSchwerz/mineflayer",
+    "mineflayer": "github:zardoy/mineflayer#gen-the-master",
     "mineflayer-mouse": "^0.1.9",
     "mineflayer-pathfinder": "^2.4.4",
     "npm-run-all": "^4.1.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ebe52b4c..14bfbb8a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -133,7 +133,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.21
-        version: 0.1.21(encoding@0.1.13)(mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13))
+        version: 0.1.21(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -343,14 +343,14 @@ importers:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
-        specifier: github:GenerelSchwerz/mineflayer
-        version: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13)
+        specifier: github:zardoy/mineflayer#gen-the-master
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.9
         version: 0.1.9(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
       mineflayer-pathfinder:
         specifier: ^2.4.4
-        version: 2.4.5
+        version: 2.4.5(prismarine-registry@1.11.0)
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -435,13 +435,13 @@ importers:
         version: 1.3.9
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
         version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-schematic:
         specifier: ^1.2.0
-        version: 1.2.3
+        version: 1.2.3(prismarine-registry@1.11.0)
       process:
         specifier: ^0.11.10
         version: 0.11.10
@@ -6704,8 +6704,8 @@ packages:
     resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a:
-    resolution: {tarball: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4}
     version: 4.27.0
     engines: {node: '>=22'}
 
@@ -7408,6 +7408,11 @@ packages:
   prismarine-chat@1.11.0:
     resolution: {integrity: sha512-VJT/MWYB3qoiznUhrgvSQh76YFpzpCZpY85kJKxHLbd3UVoM0wsfs43Eg8dOltiZG92wc5/DTMLlT07TEeoa9w==}
 
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5}
+    version: 1.38.1
+    engines: {node: '>=14'}
+
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374:
     resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374}
     version: 1.38.1
@@ -11373,7 +11378,7 @@ snapshots:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.83.1
       mineflayer: 4.27.0(encoding@0.1.13)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-item: 1.16.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
@@ -14608,7 +14613,7 @@ snapshots:
   diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
       prismarine-registry: 1.11.0
       random-seed: 0.3.0
       vec3: 0.1.10
@@ -16993,12 +16998,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.21(encoding@0.1.13)(mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.21(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17402,22 +17407,24 @@ snapshots:
       - tsx
       - yaml
 
-  mineflayer-pathfinder@2.4.5:
+  mineflayer-pathfinder@2.4.5(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
+    transitivePeerDependencies:
+      - prismarine-registry
 
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
@@ -17435,15 +17442,15 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/GenerelSchwerz/mineflayer/tar.gz/d459d2ed76a997af1a7c94718ed7d5dee4478b8a(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.7
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -18228,7 +18235,7 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-registry: 1.11.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.83.1
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
@@ -18236,6 +18243,8 @@ snapshots:
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
+    transitivePeerDependencies:
+      - prismarine-registry
 
   prismarine-chat@1.11.0:
     dependencies:
@@ -18243,10 +18252,23 @@ snapshots:
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
 
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1):
+    dependencies:
+      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-nbt: 2.7.0
+      prismarine-registry: 1.11.0
+      smart-buffer: 4.2.0
+      uint4: 0.1.2
+      vec3: 0.1.10
+      xxhash-wasm: 0.4.2
+    transitivePeerDependencies:
+      - minecraft-data
+
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
@@ -18280,7 +18302,7 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -18304,16 +18326,18 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.7.0
 
-  prismarine-schematic@1.2.3:
+  prismarine-schematic@1.2.3(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.10
+    transitivePeerDependencies:
+      - prismarine-registry
 
   prismarine-windows@2.9.0:
     dependencies:

From 0d9cb0625e59579703277a6a0126975fe92e0c03 Mon Sep 17 00:00:00 2001
From: M G <118717627+mgDentist@users.noreply.github.com>
Date: Wed, 30 Apr 2025 14:26:59 +0300
Subject: [PATCH 509/753] chore: migrated from react-transition-group to
 framer-motion (#339)

Co-authored-by: nikandrovaelena93@gmail.com <ashcat2507@gmail.com>
---
 package.json                    |   5 +-
 pnpm-lock.yaml                  |  52 ++++++++++++---
 src/react/AppStatusProvider.tsx |   4 +-
 src/react/DiveTransition.tsx    |  53 ++++++---------
 src/react/HotbarRenderApp.tsx   |  41 ++++++------
 src/react/MainMenuRenderApp.tsx |  79 +++++++++++++----------
 src/react/Notification.tsx      |  58 ++++++-----------
 src/react/Title.css             |   2 +-
 src/react/Title.tsx             | 110 +++++++++++---------------------
 9 files changed, 192 insertions(+), 212 deletions(-)

diff --git a/package.json b/package.json
index 8559b44f..d465d505 100644
--- a/package.json
+++ b/package.json
@@ -77,6 +77,7 @@
     "express": "^4.18.2",
     "filesize": "^10.0.12",
     "flying-squid": "npm:@zardoy/flying-squid@^0.0.59",
+    "framer-motion": "^12.9.2",
     "fs-extra": "^11.1.1",
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
@@ -101,7 +102,6 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-select": "^5.8.0",
-    "react-transition-group": "^4.4.5",
     "react-zoom-pan-pinch": "3.4.4",
     "remark": "^15.0.1",
     "sanitize-filename": "^1.6.3",
@@ -131,7 +131,6 @@
     "@storybook/react-vite": "^7.4.6",
     "@types/diff-match-patch": "^1.0.36",
     "@types/lodash-es": "^4.17.9",
-    "@types/react-transition-group": "^4.4.7",
     "@types/stats.js": "^0.17.1",
     "@types/three": "0.154.0",
     "@types/ua-parser-js": "^0.7.39",
@@ -231,4 +230,4 @@
     ]
   },
   "packageManager": "pnpm@10.8.0+sha512.0e82714d1b5b43c74610193cb20734897c1d00de89d0e18420aebc5977fa13d780a9cb05734624e81ebd81cc876cd464794850641c48b9544326b5622ca29971"
-}
+}
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 14bfbb8a..590886c8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -119,6 +119,9 @@ importers:
       flying-squid:
         specifier: npm:@zardoy/flying-squid@^0.0.59
         version: '@zardoy/flying-squid@0.0.59(encoding@0.1.13)'
+      framer-motion:
+        specifier: ^12.9.2
+        version: 12.9.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       fs-extra:
         specifier: ^11.1.1
         version: 11.3.0
@@ -148,7 +151,7 @@ importers:
         version: 2.0.4
       net-browserify:
         specifier: github:zardoy/prismarinejs-net-browserify
-        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/92707300cce08287ed7750f4447be350fc342d07
+        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/356edb3b061be0753f53fc2cf7fa995d40d05469
       node-gzip:
         specifier: ^1.1.2
         version: 1.1.2
@@ -191,9 +194,6 @@ importers:
       react-select:
         specifier: ^5.8.0
         version: 5.10.1(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      react-transition-group:
-        specifier: ^4.4.5
-        version: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react-zoom-pan-pinch:
         specifier: 3.4.4
         version: 3.4.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -276,9 +276,6 @@ importers:
       '@types/lodash-es':
         specifier: ^4.17.9
         version: 4.17.12
-      '@types/react-transition-group':
-        specifier: ^4.4.7
-        version: 4.4.12(@types/react@18.3.18)
       '@types/stats.js':
         specifier: ^0.17.1
         version: 0.17.3
@@ -5293,6 +5290,20 @@ packages:
     resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==}
     engines: {node: '>=0.10.0'}
 
+  framer-motion@12.9.2:
+    resolution: {integrity: sha512-R0O3Jdqbfwywpm45obP+8sTgafmdEcUoShQTAV+rB5pi+Y1Px/FYL5qLLRe5tPtBdN1J4jos7M+xN2VV2oEAbQ==}
+    peerDependencies:
+      '@emotion/is-prop-valid': '*'
+      react: ^18.2.0
+      react-dom: ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@emotion/is-prop-valid':
+        optional: true
+      react:
+        optional: true
+      react-dom:
+        optional: true
+
   fresh@0.5.2:
     resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
     engines: {node: '>= 0.6'}
@@ -6811,6 +6822,12 @@ packages:
     resolution: {integrity: sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==}
     engines: {node: '>= 0.8.0'}
 
+  motion-dom@12.9.1:
+    resolution: {integrity: sha512-xqXEwRLDYDTzOgXobSoWtytRtGlf7zdkRfFbrrdP7eojaGQZ5Go4OOKtgnx7uF8sAkfr1ZjMvbCJSCIT2h6fkQ==}
+
+  motion-utils@12.8.3:
+    resolution: {integrity: sha512-GYVauZEbca8/zOhEiYOY9/uJeedYQld6co/GJFKOy//0c/4lDqk0zB549sBYqqV2iMuX+uHrY1E5zd8A2L+1Lw==}
+
   ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 
@@ -6862,8 +6879,8 @@ packages:
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/92707300cce08287ed7750f4447be350fc342d07:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/92707300cce08287ed7750f4447be350fc342d07}
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/356edb3b061be0753f53fc2cf7fa995d40d05469:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/356edb3b061be0753f53fc2cf7fa995d40d05469}
     version: 0.2.4
 
   nice-try@1.0.5:
@@ -15677,6 +15694,15 @@ snapshots:
     dependencies:
       map-cache: 0.2.2
 
+  framer-motion@12.9.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+    dependencies:
+      motion-dom: 12.9.1
+      motion-utils: 12.8.3
+      tslib: 2.8.1
+    optionalDependencies:
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+
   fresh@0.5.2: {}
 
   fresh@2.0.0: {}
@@ -17577,6 +17603,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  motion-dom@12.9.1:
+    dependencies:
+      motion-utils: 12.8.3
+
+  motion-utils@12.8.3: {}
+
   ms@2.0.0: {}
 
   ms@2.1.3: {}
@@ -17640,7 +17672,7 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/92707300cce08287ed7750f4447be350fc342d07:
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/356edb3b061be0753f53fc2cf7fa995d40d05469:
     dependencies:
       body-parser: 1.20.3
       express: 4.21.2
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index 4a81f88e..8bfed645 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -166,10 +166,10 @@ export default () => {
       }
     }
   }
-  return <DiveTransition open={isOpen}>
+  return <DiveTransition open={isOpen} isError={isError}>
     <AppStatus
       status={status}
-      isError={isError || status === ''} // display back button if status is empty as probably our app is errored // display back button if status is empty as probably our app is errored
+      isError={isError || status === ''} // display back button if status is empty as probably our app is errored
       hideDots={hideDots}
       lastStatus={lastStatus}
       showReconnect={showReconnect}
diff --git a/src/react/DiveTransition.tsx b/src/react/DiveTransition.tsx
index 82837876..754ed8b2 100644
--- a/src/react/DiveTransition.tsx
+++ b/src/react/DiveTransition.tsx
@@ -1,25 +1,11 @@
 import { useEffect, useState } from 'react'
-import { Transition } from 'react-transition-group'
+import { motion, AnimatePresence } from 'framer-motion'
 import styles from './DiveTransition.module.css'
 
-// dive animation from framework7
+const durationInSeconds = 0.3
+const durationInMs = durationInSeconds * 1000
 
-const startStyle = { opacity: 0, transform: 'translateZ(-150px)' }
-const endExitStyle = { opacity: 0, transform: 'translateZ(150px)' }
-const endStyle = { opacity: 1, transform: 'translateZ(0)' }
-
-const stateStyles = {
-  entering: endStyle,
-  entered: endStyle,
-  exiting: endExitStyle,
-  exited: endExitStyle,
-}
-const duration = 300
-const basicStyle = {
-  transition: `${duration}ms ease-in-out all`,
-}
-
-export default ({ children, open }) => {
+export default ({ children, open, isError = false }) => {
   const [mounted, setMounted] = useState(false)
 
   useEffect(() => {
@@ -30,7 +16,7 @@ export default ({ children, open }) => {
     if (mounted && !open) {
       timeout = setTimeout(() => {
         setMounted(false)
-      }, duration)
+      }, durationInMs)
     }
     return () => {
       if (timeout) clearTimeout(timeout)
@@ -39,17 +25,20 @@ export default ({ children, open }) => {
 
   if (!mounted) return null
 
-  return <Transition
-    in={open}
-    timeout={duration}
-    mountOnEnter
-    unmountOnExit
-  >
-    {(state) => {
-      return <div className={styles.container}>
-        {/* todo resolve compl */}
-        <div style={{ ...basicStyle, ...stateStyles[state] }} className={styles.main}>{children}</div>
-      </div>
-    }}
-  </Transition>
+  return (
+    <AnimatePresence initial={false}>
+      {open && (
+        <div className={styles.container}>
+          <motion.div
+            initial={false}
+            exit={isError ? undefined : { opacity: 0 }}
+            transition={{ duration: durationInSeconds }}
+            className={styles.main}
+          >
+            {children}
+          </motion.div>
+        </div>
+      )}
+    </AnimatePresence>
+  )
 }
diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index e1eeb47a..039f283f 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from 'react'
-import { Transition } from 'react-transition-group'
+import { motion, AnimatePresence } from 'framer-motion'
 import { createPortal } from 'react-dom'
 import { subscribe, useSnapshot } from 'valtio'
 import { openItemsCanvas, openPlayerInventory, upInventoryItems } from '../inventoryWindows'
@@ -14,11 +14,10 @@ import { packetsReplayState } from './state/packetsReplayState'
 
 
 const ItemName = ({ itemKey }: { itemKey: string }) => {
-  const nodeRef = useRef(null)
   const [show, setShow] = useState(false)
   const [itemName, setItemName] = useState<Record<string, any> | string>('')
 
-  const duration = 300
+  const duration = 0.3
 
   const defaultStyle: React.CSSProperties = {
     position: 'fixed',
@@ -27,18 +26,9 @@ const ItemName = ({ itemKey }: { itemKey: string }) => {
     right: 0,
     fontSize: 10,
     textAlign: 'center',
-    transition: `opacity ${duration}ms ease-in-out`,
-    opacity: 0,
     pointerEvents: 'none',
   }
 
-  const transitionStyles = {
-    entering: { opacity: 1 },
-    entered: { opacity: 1 },
-    exiting: { opacity: 0 },
-    exited: { opacity: 0 },
-  }
-
   useEffect(() => {
     const item = bot.heldItem
     if (item) {
@@ -61,15 +51,24 @@ const ItemName = ({ itemKey }: { itemKey: string }) => {
     }
   }, [itemKey])
 
-  return <Transition nodeRef={nodeRef} in={show} timeout={duration} >
-    {state => (
-      <SharedHudVars>
-        <div ref={nodeRef} style={{ ...defaultStyle, ...transitionStyles[state] }} className='item-display-name'>
-          <MessageFormattedString message={itemName} />
-        </div>
-      </SharedHudVars>
-    )}
-  </Transition>
+  return (
+    <AnimatePresence>
+      {show && (
+        <SharedHudVars>
+          <motion.div
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            exit={{ opacity: 0 }}
+            transition={{ duration }}
+            style={defaultStyle}
+            className='item-display-name'
+          >
+            <MessageFormattedString message={itemName} />
+          </motion.div>
+        </SharedHudVars>
+      )}
+    </AnimatePresence>
+  )
 }
 
 const HotbarInner = () => {
diff --git a/src/react/MainMenuRenderApp.tsx b/src/react/MainMenuRenderApp.tsx
index b1b4bc47..c6c36ca3 100644
--- a/src/react/MainMenuRenderApp.tsx
+++ b/src/react/MainMenuRenderApp.tsx
@@ -1,5 +1,5 @@
 import fs from 'fs'
-import { Transition } from 'react-transition-group'
+import { motion, AnimatePresence } from 'framer-motion'
 import { proxy, subscribe, useSnapshot } from 'valtio'
 import { useEffect, useState } from 'react'
 import { activeModalStack, miscUiState, openOptionsMenu, showModal } from '../globalState'
@@ -117,37 +117,48 @@ export default () => {
     mapsProviderUrl.searchParams.set('to', location.href)
   }
 
-  // todo clean, use custom csstransition
-  return <Transition in={!noDisplay} timeout={disableAnimation ? 0 : 100} mountOnEnter unmountOnExit>
-    {(state) => <div style={{ transition: state === 'exiting' || disableAnimation ? '' : '100ms opacity ease-in', ...state === 'entered' ? { opacity: 1 } : { opacity: 0 } }}>
-      <MainMenu
-        singleplayerAvailable={singleplayerAvailable}
-        connectToServerAction={() => showModal({ reactType: 'serversList' })}
-        singleplayerAction={async () => {
-          showModal({ reactType: 'singleplayer' })
-        }}
-        githubAction={() => openGithub()}
-        optionsAction={() => openOptionsMenu('main')}
-        bottomRightLinks={process.env.MAIN_MENU_LINKS}
-        openFileAction={e => {
-          if (!!window.showDirectoryPicker && !e.shiftKey) {
-            void openWorldDirectory()
-          } else {
-            openFilePicker()
-          }
-        }}
-        mapsProvider={mapsProviderUrl?.toString()}
-        versionStatus={versionStatus}
-        versionTitle={versionTitle}
-        onVersionStatusClick={async () => {
-          setVersionStatus('(reloading)')
-          await refreshApp()
-        }}
-        onVersionTextClick={async () => {
-          openGithub(process.env.RELEASE_LINK)
-        }}
-        versionText={process.env.RELEASE_TAG}
-      />
-    </div>}
-  </Transition>
+  return (
+    <AnimatePresence>
+      {!noDisplay && (
+        <motion.div
+          initial={{ opacity: 0 }}
+          animate={{ opacity: 1 }}
+          exit={{ opacity: 0 }}
+          transition={{
+            duration: disableAnimation ? 0 : 0.1,
+            ease: 'easeInOut'
+          }}
+        >
+          <MainMenu
+            singleplayerAvailable={singleplayerAvailable}
+            connectToServerAction={() => showModal({ reactType: 'serversList' })}
+            singleplayerAction={async () => {
+              showModal({ reactType: 'singleplayer' })
+            }}
+            githubAction={() => openGithub()}
+            optionsAction={() => openOptionsMenu('main')}
+            bottomRightLinks={process.env.MAIN_MENU_LINKS}
+            openFileAction={e => {
+              if (!!window.showDirectoryPicker && !e.shiftKey) {
+                void openWorldDirectory()
+              } else {
+                openFilePicker()
+              }
+            }}
+            mapsProvider={mapsProviderUrl?.toString()}
+            versionStatus={versionStatus}
+            versionTitle={versionTitle}
+            onVersionStatusClick={async () => {
+              setVersionStatus('(reloading)')
+              await refreshApp()
+            }}
+            onVersionTextClick={async () => {
+              openGithub(process.env.RELEASE_LINK)
+            }}
+            versionText={process.env.RELEASE_TAG}
+          />
+        </motion.div>
+      )}
+    </AnimatePresence>
+  )
 }
diff --git a/src/react/Notification.tsx b/src/react/Notification.tsx
index ec2f8f2b..7463c9a7 100644
--- a/src/react/Notification.tsx
+++ b/src/react/Notification.tsx
@@ -1,21 +1,7 @@
-import { Transition } from 'react-transition-group'
+import { motion, AnimatePresence } from 'framer-motion'
 import PixelartIcon from './PixelartIcon'
 
-// slide up
-const startStyle = { opacity: 0, transform: 'translateY(100%)' }
-const endExitStyle = { opacity: 0, transform: 'translateY(-100%)' }
-const endStyle = { opacity: 1, transform: 'translateY(0)' }
-
-const stateStyles = {
-  entering: startStyle,
-  entered: endStyle,
-  exiting: endExitStyle,
-  exited: endExitStyle,
-}
-const duration = 200
-const basicStyle = {
-  transition: `${duration}ms ease-in-out all`,
-}
+const duration = 0.2
 
 // save pass: login
 
@@ -23,17 +9,16 @@ export default ({ type = 'message', message, subMessage = '', open, icon = '', a
   const isError = type === 'error'
   icon ||= isError ? 'alert' : 'message'
 
-  return <Transition
-    in={open}
-    timeout={duration}
-    mountOnEnter
-    unmountOnExit
-  >
-    {state => {
-      const addStyles = { ...basicStyle, ...stateStyles[state] }
-
-      return <div
-        className={`app-notification ${isError ? 'error-notification' : ''}`} onClick={action} style={{
+  return <AnimatePresence>
+    {open && (
+      <motion.div
+        initial={{ opacity: 0, y: 0 }}
+        animate={{ opacity: 1, y: 0 }}
+        exit={{ opacity: 0, y: '-100%' }}
+        transition={{ duration }}
+        className={`app-notification ${isError ? 'error-notification' : ''}`}
+        onClick={action}
+        style={{
           position: 'fixed',
           top: 0,
           right: 0,
@@ -46,9 +31,8 @@ export default ({ type = 'message', message, subMessage = '', open, icon = '', a
           padding: '3px 5px',
           background: isError ? 'rgba(255, 0, 0, 0.7)' : 'rgba(0, 0, 0, 0.7)',
           borderRadius: '0 0 0 5px',
-          pointerEvents: action ? '' : 'none',
-          zIndex: 1200, // even above stats
-          ...addStyles
+          pointerEvents: action ? 'auto' : 'none',
+          zIndex: 1200,
         }}
       >
         <PixelartIcon iconName={icon} styles={{ fontSize: 12 }} />
@@ -56,8 +40,7 @@ export default ({ type = 'message', message, subMessage = '', open, icon = '', a
           display: 'flex',
           flexDirection: 'column',
           gap: 2,
-        }}
-        >
+        }}>
           <div style={{
             whiteSpace: 'normal',
           }}>
@@ -67,12 +50,11 @@ export default ({ type = 'message', message, subMessage = '', open, icon = '', a
             fontSize: '7px',
             whiteSpace: 'nowrap',
             color: 'lightgray',
-          }}
-          >{subMessage}
+          }}>
+            {subMessage}
           </div>
         </div>
-      </div>
-    }}
-  </Transition>
-
+      </motion.div>
+    )}
+  </AnimatePresence>
 }
diff --git a/src/react/Title.css b/src/react/Title.css
index 289b3a2a..026361ce 100644
--- a/src/react/Title.css
+++ b/src/react/Title.css
@@ -32,7 +32,7 @@
     padding: 0px;
 }
 
-.action-bar {
+.message-action-bar {
     position: fixed;
     bottom: calc(var(--safe-area-inset-bottom)  + 60px);
     left: 0;
diff --git a/src/react/Title.tsx b/src/react/Title.tsx
index fd53e1c0..5d9237be 100644
--- a/src/react/Title.tsx
+++ b/src/react/Title.tsx
@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react'
-import { Transition } from 'react-transition-group'
+import { motion, AnimatePresence } from 'framer-motion'
 import MessageFormattedString from './MessageFormattedString'
 import './Title.css'
 
@@ -27,23 +27,9 @@ const Title = ({
   openActionBar = false
 }: TitleProps) => {
   const [mounted, setMounted] = useState(false)
-  const [useEnterTransition, setUseEnterTransition] = useState(true)
 
-  const defaultFadeIn = 500
-  const defaultFadeOut = 1000
-  const startStyle = {
-    opacity: 1,
-    transition: `${transitionTimes.fadeIn}ms ease-in-out all` }
-  const endExitStyle = {
-    opacity: 0,
-    transition: `${transitionTimes.fadeOut}ms ease-in-out all` }
-
-  const stateStyles = {
-    entering: startStyle,
-    entered: { opacity: 1 },
-    exiting: endExitStyle,
-    exited: { opacity: 0 },
-  }
+  const defaultFadeIn = 0.5
+  const defaultFadeOut = 1
 
   useEffect(() => {
     if (!mounted && (openTitle || openActionBar)) {
@@ -53,61 +39,43 @@ const Title = ({
 
   return (
     <div className='title-container'>
-      <Transition
-        in={openTitle}
-        timeout={{
-          enter: transitionTimes?.fadeIn ?? defaultFadeIn,
-          exit: transitionTimes?.fadeOut ?? defaultFadeOut,
-        }}
-        mountOnEnter
-        unmountOnExit
-        enter={useEnterTransition}
-        onExiting={() => {
-          setUseEnterTransition(prev => false)
-        }}
-        onExited={() => {
-          setUseEnterTransition(prev => true)
-        }}
-      >
-        {(state) => {
-          return (
-            <div style={{ ...stateStyles[state] }}>
-              <h1 className='message-title'>
-                <MessageFormattedString message={title} />
-              </h1>
-              <h4 className='message-subtitle'>
-                <MessageFormattedString message={subtitle} />
-              </h4>
+      <AnimatePresence>
+        {openTitle && (
+          <motion.div
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            exit={{ opacity: 0 }}
+            transition={{
+              duration: transitionTimes?.fadeIn ? transitionTimes.fadeIn / 1000 : defaultFadeIn,
+              exit: { duration: transitionTimes?.fadeOut ? transitionTimes.fadeOut / 1000 : defaultFadeOut }
+            }}
+          >
+            <h1 className='message-title'>
+              <MessageFormattedString message={title} />
+            </h1>
+            <h4 className='message-subtitle'>
+              <MessageFormattedString message={subtitle} />
+            </h4>
+          </motion.div>
+        )}
+      </AnimatePresence>
+      <AnimatePresence>
+        {openActionBar && (
+          <motion.div
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            exit={{ opacity: 0 }}
+            transition={{
+              duration: transitionTimes?.fadeIn ? transitionTimes.fadeIn / 1000 : defaultFadeIn,
+              exit: { duration: transitionTimes?.fadeOut ? transitionTimes.fadeOut / 1000 : defaultFadeOut }
+            }}
+          >
+            <div className='message-action-bar'>
+              <MessageFormattedString message={actionBar} />
             </div>
-          )
-        }}
-      </Transition>
-      <Transition
-        in={openActionBar}
-        timeout={{
-          enter: transitionTimes?.fadeIn ?? defaultFadeIn,
-          exit: transitionTimes?.fadeOut ?? defaultFadeOut,
-        }}
-        mountOnEnter
-        unmountOnExit
-        // enter={useEnterTransition}
-        // onExiting={() => {
-        //   setUseEnterTransition(prev => false)
-        // }}
-        // onExited={() => {
-        //   setUseEnterTransition(prev => true)
-        // }}
-      >
-        {(state) => {
-          return (
-            <div style={{ ...stateStyles[state] }}>
-              <div className='action-bar'>
-                <MessageFormattedString message={actionBar} />
-              </div>
-            </div>
-          )
-        }}
-      </Transition>
+          </motion.div>
+        )}
+      </AnimatePresence>
     </div>
   )
 }

From 378b668d46af287cd3494a1ee89824dc4c4f02ee Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 30 Apr 2025 18:29:39 +0300
Subject: [PATCH 510/753] fix: sometimes walking animation was stuck

---
 package.json                       |  6 +--
 pnpm-lock.yaml                     | 60 ++++++++++++++----------------
 src/packetsReplay/replayPackets.ts |  8 ++--
 3 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index d465d505..3b540152 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "@dimaka/interface": "0.0.3-alpha.0",
     "@floating-ui/react": "^0.26.1",
     "@nxg-org/mineflayer-auto-jump": "^0.7.12",
-    "@nxg-org/mineflayer-tracker": "1.2.1",
+    "@nxg-org/mineflayer-tracker": "1.2.3",
     "@react-oauth/google": "^0.12.1",
     "@stylistic/eslint-plugin": "^2.6.1",
     "@types/gapi": "^0.0.47",
@@ -82,7 +82,7 @@
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
-    "mcraft-fun-mineflayer": "^0.1.21",
+    "mcraft-fun-mineflayer": "^0.1.23",
     "minecraft-data": "3.83.1",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
@@ -230,4 +230,4 @@
     ]
   },
   "packageManager": "pnpm@10.8.0+sha512.0e82714d1b5b43c74610193cb20734897c1d00de89d0e18420aebc5977fa13d780a9cb05734624e81ebd81cc876cd464794850641c48b9544326b5622ca29971"
-}
\ No newline at end of file
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 590886c8..6c26d2b6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,8 +45,8 @@ importers:
         specifier: ^0.7.12
         version: 0.7.12
       '@nxg-org/mineflayer-tracker':
-        specifier: 1.2.1
-        version: 1.2.1(encoding@0.1.13)
+        specifier: 1.2.3
+        version: 1.2.3(encoding@0.1.13)
       '@react-oauth/google':
         specifier: ^0.12.1
         version: 0.12.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -135,8 +135,8 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       mcraft-fun-mineflayer:
-        specifier: ^0.1.21
-        version: 0.1.21(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13))
+        specifier: ^0.1.23
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -347,7 +347,7 @@ importers:
         version: 0.1.9(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
       mineflayer-pathfinder:
         specifier: ^2.4.4
-        version: 2.4.5(prismarine-registry@1.11.0)
+        version: 2.4.5
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -432,13 +432,13 @@ importers:
         version: 1.3.9
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
         version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-schematic:
         specifier: ^1.2.0
-        version: 1.2.3(prismarine-registry@1.11.0)
+        version: 1.2.3
       process:
         specifier: ^0.11.10
         version: 0.11.10
@@ -2025,8 +2025,8 @@ packages:
   '@nxg-org/mineflayer-physics-util@1.8.7':
     resolution: {integrity: sha512-wtLYvHqoEFr/j0ny2lyogwjbMvwpFuG2aWI8sI14+EAiGFRpL5+cog2ujSDsnRTZruO7tUXMTiPc1kebjXwfJg==}
 
-  '@nxg-org/mineflayer-tracker@1.2.1':
-    resolution: {integrity: sha512-SI1ffF8zvg3/ZNE021Ja2W0FZPN+WbQDZf8yFqOcXtPRXAtM9W6HvoACdzXep8BZid7WYgYLIgjKpB+9RqvCNQ==}
+  '@nxg-org/mineflayer-tracker@1.2.3':
+    resolution: {integrity: sha512-E7Ik/scU117Rr6kQUHHMBk8qOGh63YlTCGN33jMfeP7L8xmLeSHN3JtV/fbog8Y+R+HgO99yfZiRAaV7z1T6gQ==}
 
   '@nxg-org/mineflayer-trajectories@1.2.0':
     resolution: {integrity: sha512-yTDHn96fyWLKwdHdOGIrnt8nss4SJmxXwJn101o7aNI4sgdnUmwaX4FoNbmrEa9eZn6IwxaXIxDf+fJmKj9RIw==}
@@ -6470,9 +6470,9 @@ packages:
     resolution: {integrity: sha512-Ucsu2pDLr/cs8bxbxU9KTszdf/vPTLphYgEHUEWxuYlMkPQUCpsQwkn3YgyykJ7RXaca7zZGlZXaTPXBAqJT6A==}
     engines: {node: '>=18.0.0'}
 
-  mcraft-fun-mineflayer@0.1.21:
-    resolution: {integrity: sha512-FtzebYMvLvunApQy9ilF1RGqiX01DJn8y7q4xAONiIhBrIT7BrHK3O63IA50YgklldvdgVxn7s3m4QANvsH2JA==}
-    version: 0.1.21
+  mcraft-fun-mineflayer@0.1.23:
+    resolution: {integrity: sha512-qmI1rQQ0Ro5zJdi99rClWLF+mS9JZffgNX2vyWWesS3Hsk3Xblp/8swYTJKHSaFpNgzkVfXV92fEIrBqeH6iKA==}
+    version: 0.1.23
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       '@roamhq/wrtc': '*'
@@ -11382,7 +11382,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
 
-  '@nxg-org/mineflayer-tracker@1.2.1(encoding@0.1.13)':
+  '@nxg-org/mineflayer-tracker@1.2.3(encoding@0.1.13)':
     dependencies:
       '@nxg-org/mineflayer-trajectories': 1.2.0(encoding@0.1.13)
       '@nxg-org/mineflayer-util-plugin': 1.8.4
@@ -11395,7 +11395,7 @@ snapshots:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.83.1
       mineflayer: 4.27.0(encoding@0.1.13)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.16.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
@@ -13199,7 +13199,7 @@ snapshots:
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -17024,7 +17024,7 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.21(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
@@ -17433,24 +17433,22 @@ snapshots:
       - tsx
       - yaml
 
-  mineflayer-pathfinder@2.4.5(prismarine-registry@1.11.0):
+  mineflayer-pathfinder@2.4.5:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
-    transitivePeerDependencies:
-      - prismarine-registry
 
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
@@ -17474,7 +17472,7 @@ snapshots:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
@@ -18267,7 +18265,7 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-registry: 1.11.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0):
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
     dependencies:
       minecraft-data: 3.83.1
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
@@ -18275,8 +18273,6 @@ snapshots:
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
-    transitivePeerDependencies:
-      - prismarine-registry
 
   prismarine-chat@1.11.0:
     dependencies:
@@ -18287,7 +18283,7 @@ snapshots:
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
@@ -18300,7 +18296,7 @@ snapshots:
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
@@ -18334,7 +18330,7 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -18358,18 +18354,16 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
 
-  prismarine-schematic@1.2.3(prismarine-registry@1.11.0):
+  prismarine-schematic@1.2.3:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.10
-    transitivePeerDependencies:
-      - prismarine-registry
 
   prismarine-windows@2.9.0:
     dependencies:
diff --git a/src/packetsReplay/replayPackets.ts b/src/packetsReplay/replayPackets.ts
index 87d03a9c..d0d95da8 100644
--- a/src/packetsReplay/replayPackets.ts
+++ b/src/packetsReplay/replayPackets.ts
@@ -194,9 +194,11 @@ const mainPacketsReplayer = async (client: ServerClient, packets: ParsedReplayPa
           continue
         }
         playServerPacket(packet.name, packet.params)
-        await new Promise(resolve => {
-          setTimeout(resolve, packet.diff * packetsReplayState.speed + ADDITIONAL_DELAY * (packetsReplayState.customButtons.packetsSenderDelay.state ? 1 : 0))
-        })
+        if (packet.diff) {
+          await new Promise(resolve => {
+            setTimeout(resolve, packet.diff * packetsReplayState.speed + ADDITIONAL_DELAY * (packetsReplayState.customButtons.packetsSenderDelay.state ? 1 : 0))
+          })
+        }
       } else if (ignoreClientPacketsWait !== true && !ignoreClientPacketsWait.includes(packet.name)) {
         clientPackets.push({ name: packet.name, params: packet.params })
         if (playPackets[i + 1]?.isFromServer) {

From ec142c0ce4b456ec5af344faec5c36b87d3ffa2f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 30 Apr 2025 18:33:30 +0300
Subject: [PATCH 511/753] fix heads & server lighting

---
 pnpm-lock.yaml | 40 +++++++++++-----------------------------
 1 file changed, 11 insertions(+), 29 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6c26d2b6..589152fa 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,7 +136,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.9
         version: 0.1.9(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
@@ -435,7 +435,7 @@ importers:
         version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
-        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
+        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
@@ -6715,8 +6715,8 @@ packages:
     resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0}
     version: 4.27.0
     engines: {node: '>=22'}
 
@@ -7430,11 +7430,6 @@ packages:
     version: 1.38.1
     engines: {node: '>=14'}
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374}
-    version: 1.38.1
-    engines: {node: '>=14'}
-
   prismarine-entity@2.5.0:
     resolution: {integrity: sha512-nRPCawUwf9r3iKqi4I7mZRlir1Ix+DffWYdWq6p/KNnmiXve+xHE5zv8XCdhZlUmOshugHv5ONl9o6ORAkCNIA==}
 
@@ -13235,7 +13230,7 @@ snapshots:
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -17024,12 +17019,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17450,7 +17445,7 @@ snapshots:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -17466,7 +17461,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/79c59bd340a1898971e1ea508b2294d936af39e4(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.7
       minecraft-data: 3.83.1
@@ -18293,19 +18288,6 @@ snapshots:
     transitivePeerDependencies:
       - minecraft-data
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1):
-    dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-nbt: 2.7.0
-      prismarine-registry: 1.11.0
-      smart-buffer: 4.2.0
-      uint4: 0.1.2
-      vec3: 0.1.10
-      xxhash-wasm: 0.4.2
-    transitivePeerDependencies:
-      - minecraft-data
-
   prismarine-entity@2.5.0:
     dependencies:
       prismarine-chat: 1.11.0
@@ -18331,7 +18313,7 @@ snapshots:
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
     dependencies:
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/e68e9a423b5b1907535878fb636f12c28a1a9374(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       uint4: 0.1.2

From 813c952420500a8eaf64b25a824c96f35e9602dd Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 1 May 2025 12:53:44 +0300
Subject: [PATCH 512/753] fix: fix lava rendering

---
 renderer/viewer/lib/mesher/models.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index fc57d2b3..46258134 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -103,8 +103,8 @@ function tintToGl (tint) {
   return [r / 255, g / 255, b / 255]
 }
 
-function getLiquidRenderHeight (world: World, block: WorldBlock | null, type: number, pos: Vec3, isRealWater: boolean) {
-  if (!isRealWater || (block && isBlockWaterlogged(block))) return 8 / 9
+function getLiquidRenderHeight (world: World, block: WorldBlock | null, type: number, pos: Vec3, isWater: boolean, isRealWater: boolean) {
+  if ((isWater && !isRealWater) || (block && isBlockWaterlogged(block))) return 8 / 9
   if (!block || block.type !== type) return 1 / 9
   if (block.metadata === 0) { // source block
     const blockAbove = world.getBlock(pos.offset(0, 1, 0))
@@ -130,7 +130,7 @@ function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, typ
   for (let z = -1; z <= 1; z++) {
     for (let x = -1; x <= 1; x++) {
       const pos = cursor.offset(x, 0, z)
-      heights.push(getLiquidRenderHeight(world, world.getBlock(pos), type, pos, isRealWater))
+      heights.push(getLiquidRenderHeight(world, world.getBlock(pos), type, pos, water, isRealWater))
     }
   }
   const cornerHeights = [

From f12de4ea238c057d436c11e864ffbbefc9a7809b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 1 May 2025 15:23:58 +0300
Subject: [PATCH 513/753] fix releasing alias

---
 .github/workflows/release.yml | 7 +++----
 scripts/githubActions.mjs     | 5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 28c1e34c..3cda1011 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,9 +29,6 @@ jobs:
         run: pnpx zardoy-release empty --skip-github --output-file assets/release.json
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Get releasing alias
-        run: node scripts/githubActions.mjs getReleasingAlias
-        id: alias
       - name: Download Generated Sounds map
         run: node scripts/downloadSoundsMap.mjs
       - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod
@@ -48,8 +45,10 @@ jobs:
         with:
           run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} --prod
         id: deploy
+      - name: Get releasing alias
+        run: node scripts/githubActions.mjs getReleasingAlias
+        id: alias
       - name: Set deployment alias
-        if: ${{ steps.alias.outputs.alias != '' && steps.alias.outputs.alias != 'mcraft.fun' && steps.alias.outputs.alias != 's.mcraft.fun' }}
         run: |
           for alias in $(echo ${{ steps.alias.outputs.alias }} | tr "," "\n"); do
             vercel alias set ${{ steps.deploy.outputs.stdout }} $alias --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro
diff --git a/scripts/githubActions.mjs b/scripts/githubActions.mjs
index 3864d6c2..3e8eb0f6 100644
--- a/scripts/githubActions.mjs
+++ b/scripts/githubActions.mjs
@@ -22,9 +22,10 @@ const fns = {
     const tag = releaseJson.latestTag
     const [major, minor, patch] = tag.replace('v', '').split('.')
     if (major === '0' && minor === '1') {
-      return final(`v${patch}`)
+      setOutput('alias', final(`v${patch}`))
+    } else {
+      setOutput('alias', final(tag))
     }
-    return final(tag)
   }
 }
 

From c5f72f2fb36dcc0e42476b783f32b79a6909519f Mon Sep 17 00:00:00 2001
From: M G <118717627+mgDentist@users.noreply.github.com>
Date: Fri, 2 May 2025 19:10:43 +0300
Subject: [PATCH 514/753] fix: corrected scroll of main component at client
 mods; feat: improoved ux (#341)

---
 src/react/Screen.tsx      |  2 +-
 src/react/mods.module.css | 24 +++++++++++++++---------
 src/screens.css           |  5 +++--
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/react/Screen.tsx b/src/react/Screen.tsx
index 605ec28f..66e7b8d8 100644
--- a/src/react/Screen.tsx
+++ b/src/react/Screen.tsx
@@ -13,7 +13,7 @@ export default ({ title, children, backdrop = true, style, className = '', title
   return (
     <>
       {backdrop === 'dirt' ? <div className='dirt-bg' /> : backdrop ? <div className="backdrop" /> : null}
-      <div className={`fullscreen ${className}`} style={{ overflow: 'auto', ...style }}>
+      <div className={`fullscreen ${className}`} style={{ ...style }}>
         <div className="screen-content" style={{ ...contentStyle, ...(titleMarginTop === undefined ? {} : { marginTop: titleMarginTop }) }}>
           <div className={`screen-title ${titleSelectable ? 'text-select' : ''}`}>{title}</div>
           {children}
diff --git a/src/react/mods.module.css b/src/react/mods.module.css
index 2b3184bb..00b586f0 100644
--- a/src/react/mods.module.css
+++ b/src/react/mods.module.css
@@ -1,4 +1,5 @@
 .root {
+  min-height: 0; 
   display: flex;
   flex-direction: column;
   height: 100%;
@@ -31,7 +32,8 @@
 }
 
 .content {
-  display: flex;
+  display: grid;
+  grid-template-columns: 60% 40%;
   flex: 1;
   gap: 10px;
   overflow: hidden;
@@ -39,21 +41,24 @@
 }
 
 .verticalContent {
-  flex-direction: column;
+  display: grid;
+  grid-template-columns: none;
+  grid-template-rows: 60% 40%;
+  overflow: hidden;
 }
 
 .verticalContent .modList {
-  height: 50%;
-  min-height: 200px;
+  max-height: 100%;
+  overflow-y: auto;
 }
 
 .verticalContent .sidebar {
-  height: 50%;
+  max-height: 100%;
   width: 100%;
+  overflow-y: auto;
 }
 
 .modList {
-  flex: 1;
   overflow-y: auto;
   display: flex;
   flex-direction: column;
@@ -63,18 +68,19 @@
   padding: 5px;
   min-height: 0; /* Important for Firefox */
   height: 100%;
+  width: 100%;
 }
 
 .sidebar {
-  width: 200px;
+  overflow-y: auto;
+  width: 100%;
+  height: 100%;
   display: flex;
   flex-direction: column;
   gap: 10px;
   padding: 10px;
   background: rgba(0, 0, 0, 0.3);
   border-radius: 4px;
-  flex-shrink: 0;
-  height: 100%;
 }
 
 .modInfo {
diff --git a/src/screens.css b/src/screens.css
index 036d1300..8ba37aff 100644
--- a/src/screens.css
+++ b/src/screens.css
@@ -33,8 +33,9 @@
     flex-direction: column;
     margin-top: 35px;
     /* todo remove it but without it in chrome android the screen is not scrollable */
-    overflow: auto;
-    height: fit-content;
+    /*! upd: changed from "overflow: auto" to "overflow: hidden" to fix main component scroll - delete this comment after testing */
+    overflow: hidden;
+    /* height: fit-content; */ /*! delete this line after testing previous line */
     /* todo I'm not sure about it */
     /* margin-top: calc(100% / 6 - 16px); */
     align-items: center;

From 951790dad632cd3752a62a31faa4b302ac141b34 Mon Sep 17 00:00:00 2001
From: M G <118717627+mgDentist@users.noreply.github.com>
Date: Sat, 3 May 2025 11:00:31 +0300
Subject: [PATCH 515/753] feat: Debug Response Time Indicator (#342)

---
 src/optionsGuiScheme.tsx                      |  5 +++
 src/optionsStorage.ts                         |  2 +-
 .../DebugResponseTimeIndicator.module.css     | 10 ++++++
 ...DebugResponseTimeIndicator.module.css.d.ts |  7 ++++
 .../debugs/DebugResponseTimeIndicator.tsx     | 32 +++++++++++++++++++
 src/reactUi.tsx                               |  2 ++
 6 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 src/react/debugs/DebugResponseTimeIndicator.module.css
 create mode 100644 src/react/debugs/DebugResponseTimeIndicator.module.css.d.ts
 create mode 100644 src/react/debugs/DebugResponseTimeIndicator.tsx

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 4e38c98e..b9c44b29 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -600,6 +600,11 @@ export const guiOptionsScheme: {
       debugContro: {
         text: 'Debug Controls',
       },
+    },
+    {
+      debugResponseTimeIndicator: {
+        text: 'Debug Input Lag',
+      },
     }
   ],
   'export-import': [
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index a327c590..65c0b4ba 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -73,7 +73,7 @@ const defaultOptions = {
   preventSleep: false,
   debugContro: false,
   chatVanillaRestrictions: true,
-
+  debugResponseTimeIndicator: false,
   // antiAliasing: false,
 
   clipWorldBelowY: undefined as undefined | number, // will be removed
diff --git a/src/react/debugs/DebugResponseTimeIndicator.module.css b/src/react/debugs/DebugResponseTimeIndicator.module.css
new file mode 100644
index 00000000..65196a29
--- /dev/null
+++ b/src/react/debugs/DebugResponseTimeIndicator.module.css
@@ -0,0 +1,10 @@
+.debugResponseTimeIndicator {
+    z-index: 100;
+    position: fixed;
+    left: 15px;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 40px;
+    height: 40px;
+    background-color: white;
+}
diff --git a/src/react/debugs/DebugResponseTimeIndicator.module.css.d.ts b/src/react/debugs/DebugResponseTimeIndicator.module.css.d.ts
new file mode 100644
index 00000000..b79d5d59
--- /dev/null
+++ b/src/react/debugs/DebugResponseTimeIndicator.module.css.d.ts
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  debugResponseTimeIndicator: string;
+}
+declare const cssExports: CssExports;
+export default cssExports;
diff --git a/src/react/debugs/DebugResponseTimeIndicator.tsx b/src/react/debugs/DebugResponseTimeIndicator.tsx
new file mode 100644
index 00000000..b6b3fdcd
--- /dev/null
+++ b/src/react/debugs/DebugResponseTimeIndicator.tsx
@@ -0,0 +1,32 @@
+import { useEffect, useState } from 'react'
+import { options } from '../../optionsStorage'
+
+import styles from './DebugResponseTimeIndicator.module.css'
+
+export default () => {
+  const [isPointerDown, setIsPointerDown] = useState(false)
+
+  useEffect(() => {
+    const handlePointerDown = () => {
+      setIsPointerDown(true)
+    }
+
+    const handlePointerUp = () => {
+      setIsPointerDown(false)
+    }
+
+    window.addEventListener('pointerdown', handlePointerDown)
+    window.addEventListener('pointerup', handlePointerUp)
+
+    return () => {
+      window.removeEventListener('pointerdown', handlePointerDown)
+      window.removeEventListener('pointerup', handlePointerUp)
+    }
+  }, [])
+
+  if (!('debugResponseTimeIndicator' in options) || !options.debugResponseTimeIndicator) return null
+
+  return isPointerDown ? (
+    <div className={styles.debugResponseTimeIndicator} />
+  ) : null
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 72aff0ef..c91c37d6 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -60,6 +60,7 @@ import ConnectOnlyServerUi from './react/ConnectOnlyServerUi'
 import ControDebug from './react/ControDebug'
 import ChunksDebug from './react/ChunksDebug'
 import ChunksDebugScreen from './react/ChunksDebugScreen'
+import DebugResponseTimeIndicator from './react/debugs/DebugResponseTimeIndicator'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -247,6 +248,7 @@ const App = () => {
             </div>
             <div />
             <DebugEdges />
+            <DebugResponseTimeIndicator />
           </RobustPortal>
         </ButtonAppProvider>
       </div>

From 5bfb9bebd764597230e4961a3cd60dd4d0ab633b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 3 May 2025 12:49:32 +0300
Subject: [PATCH 516/753] f3 hint

---
 src/react/MobileTopButtons.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/react/MobileTopButtons.tsx b/src/react/MobileTopButtons.tsx
index 4d18f817..a2f1a1da 100644
--- a/src/react/MobileTopButtons.tsx
+++ b/src/react/MobileTopButtons.tsx
@@ -21,10 +21,14 @@ export default () => {
   }, [])
 
   const onLongPress = async () => {
-    const select = await showOptionsModal('', f3Keybinds.filter(f3Keybind => f3Keybind.mobileTitle && (f3Keybind.enabled?.() ?? true)).map(f3Keybind => f3Keybind.mobileTitle))
+    const select = await showOptionsModal('', f3Keybinds.filter(f3Keybind => {
+      return f3Keybind.mobileTitle && (f3Keybind.enabled?.() ?? true)
+    }).map(f3Keybind => {
+      return `${f3Keybind.mobileTitle}${f3Keybind.key ? ` (F3+${f3Keybind.key})` : ''}`
+    }))
     if (!select) return
     const f3Keybind = f3Keybinds.find(f3Keybind => f3Keybind.mobileTitle === select)
-    if (f3Keybind) f3Keybind.action()
+    if (f3Keybind) void f3Keybind.action()
   }
 
   const defaultOptions = {

From cd7c053a3c5bc7cfe55219e52cba6dc5afe263bd Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 3 May 2025 12:50:23 +0300
Subject: [PATCH 517/753] fix(critical-regression): player animation was
 glitching just a lot

---
 package.json   |  2 +-
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 3b540152..c3939647 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "@dimaka/interface": "0.0.3-alpha.0",
     "@floating-ui/react": "^0.26.1",
     "@nxg-org/mineflayer-auto-jump": "^0.7.12",
-    "@nxg-org/mineflayer-tracker": "1.2.3",
+    "@nxg-org/mineflayer-tracker": "1.2.1",
     "@react-oauth/google": "^0.12.1",
     "@stylistic/eslint-plugin": "^2.6.1",
     "@types/gapi": "^0.0.47",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 589152fa..4c4f3e6d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,8 +45,8 @@ importers:
         specifier: ^0.7.12
         version: 0.7.12
       '@nxg-org/mineflayer-tracker':
-        specifier: 1.2.3
-        version: 1.2.3(encoding@0.1.13)
+        specifier: 1.2.1
+        version: 1.2.1(encoding@0.1.13)
       '@react-oauth/google':
         specifier: ^0.12.1
         version: 0.12.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -2025,8 +2025,8 @@ packages:
   '@nxg-org/mineflayer-physics-util@1.8.7':
     resolution: {integrity: sha512-wtLYvHqoEFr/j0ny2lyogwjbMvwpFuG2aWI8sI14+EAiGFRpL5+cog2ujSDsnRTZruO7tUXMTiPc1kebjXwfJg==}
 
-  '@nxg-org/mineflayer-tracker@1.2.3':
-    resolution: {integrity: sha512-E7Ik/scU117Rr6kQUHHMBk8qOGh63YlTCGN33jMfeP7L8xmLeSHN3JtV/fbog8Y+R+HgO99yfZiRAaV7z1T6gQ==}
+  '@nxg-org/mineflayer-tracker@1.2.1':
+    resolution: {integrity: sha512-SI1ffF8zvg3/ZNE021Ja2W0FZPN+WbQDZf8yFqOcXtPRXAtM9W6HvoACdzXep8BZid7WYgYLIgjKpB+9RqvCNQ==}
 
   '@nxg-org/mineflayer-trajectories@1.2.0':
     resolution: {integrity: sha512-yTDHn96fyWLKwdHdOGIrnt8nss4SJmxXwJn101o7aNI4sgdnUmwaX4FoNbmrEa9eZn6IwxaXIxDf+fJmKj9RIw==}
@@ -11377,7 +11377,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
 
-  '@nxg-org/mineflayer-tracker@1.2.3(encoding@0.1.13)':
+  '@nxg-org/mineflayer-tracker@1.2.1(encoding@0.1.13)':
     dependencies:
       '@nxg-org/mineflayer-trajectories': 1.2.0(encoding@0.1.13)
       '@nxg-org/mineflayer-util-plugin': 1.8.4

From 29c6a3d739a68a3040c60726fb52569b24d263f8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 3 May 2025 12:50:45 +0300
Subject: [PATCH 518/753] up browserify and mineflayer to fix a few bugs

---
 pnpm-lock.yaml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4c4f3e6d..9dbe20b2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,7 +136,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -151,7 +151,7 @@ importers:
         version: 2.0.4
       net-browserify:
         specifier: github:zardoy/prismarinejs-net-browserify
-        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/356edb3b061be0753f53fc2cf7fa995d40d05469
+        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/64e351867c5711de8a183464284a8eb7d77d5f39
       node-gzip:
         specifier: ^1.1.2
         version: 1.1.2
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.9
         version: 0.1.9(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
@@ -6715,8 +6715,8 @@ packages:
     resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6}
     version: 4.27.0
     engines: {node: '>=22'}
 
@@ -6879,8 +6879,8 @@ packages:
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/356edb3b061be0753f53fc2cf7fa995d40d05469:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/356edb3b061be0753f53fc2cf7fa995d40d05469}
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/64e351867c5711de8a183464284a8eb7d77d5f39:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/64e351867c5711de8a183464284a8eb7d77d5f39}
     version: 0.2.4
 
   nice-try@1.0.5:
@@ -17019,12 +17019,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17461,7 +17461,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/aadfaaff1f55447a4d20e3ffb34db52791d9b1e0(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.7
       minecraft-data: 3.83.1
@@ -17665,7 +17665,7 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/356edb3b061be0753f53fc2cf7fa995d40d05469:
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/64e351867c5711de8a183464284a8eb7d77d5f39:
     dependencies:
       body-parser: 1.20.3
       express: 4.21.2

From 1fd9a29192cd4e6670a27425dc754ae4b7ee2277 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 3 May 2025 23:01:47 +0300
Subject: [PATCH 519/753] up mouse & chunk

---
 package.json   |  2 +-
 pnpm-lock.yaml | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index c3939647..16f009f0 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "mc-assets": "^0.2.53",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
-    "mineflayer-mouse": "^0.1.9",
+    "mineflayer-mouse": "^0.1.10",
     "mineflayer-pathfinder": "^2.4.4",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9dbe20b2..f099a85f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -343,8 +343,8 @@ importers:
         specifier: github:zardoy/mineflayer#gen-the-master
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.9
-        version: 0.1.9(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
+        specifier: ^0.1.10
+        version: 0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.5
@@ -435,7 +435,7 @@ importers:
         version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
-        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
+        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
@@ -6704,8 +6704,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.9:
-    resolution: {integrity: sha512-Cl+0FDUKFt8f+W6ed3XWfadWqbJkhl999XNPBkiaP0QwxAcJC7f+iAMiH1SLB+e5p50GLxANhAs6Q7t9d37kTg==}
+  mineflayer-mouse@0.1.10:
+    resolution: {integrity: sha512-bxrBzOVQX2Ok5KOiJMaoOLYaHMDecMkJpLn5oGIdyLRqiTF3WAnZc9oYQq+/f3YNA88W1vBIjai3v3vZe6wyaQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.5:
@@ -7425,8 +7425,8 @@ packages:
   prismarine-chat@1.11.0:
     resolution: {integrity: sha512-VJT/MWYB3qoiznUhrgvSQh76YFpzpCZpY85kJKxHLbd3UVoM0wsfs43Eg8dOltiZG92wc5/DTMLlT07TEeoa9w==}
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5}
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f}
     version: 1.38.1
     engines: {node: '>=14'}
 
@@ -13194,7 +13194,7 @@ snapshots:
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -13230,7 +13230,7 @@ snapshots:
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -14625,7 +14625,7 @@ snapshots:
   diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-registry: 1.11.0
       random-seed: 0.3.0
       vec3: 0.1.10
@@ -17400,7 +17400,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.9(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0):
+  mineflayer-mouse@0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0):
     dependencies:
       change-case: 5.4.4
       debug: 4.4.0(supports-color@8.1.1)
@@ -17445,7 +17445,7 @@ snapshots:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -17469,7 +17469,7 @@ snapshots:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -18275,7 +18275,7 @@ snapshots:
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1):
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
@@ -18313,7 +18313,7 @@ snapshots:
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
     dependencies:
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/47e0e5b7ff7759b8d222de7746f71023df7ce8e5(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       uint4: 0.1.2

From e250061757b20251103bab5221b60b4a10a2903e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 3 May 2025 23:11:15 +0300
Subject: [PATCH 520/753] smooth appear panorama on load textures

---
 renderer/viewer/three/panorama.ts | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
index 682d25d2..30310957 100644
--- a/renderer/viewer/three/panorama.ts
+++ b/renderer/viewer/three/panorama.ts
@@ -34,7 +34,8 @@ export class PanoramaRenderer {
 
   constructor (private readonly documentRenderer: DocumentRenderer, private readonly options: GraphicsInitOptions, private readonly doWorldBlocksPanorama = false) {
     this.scene = new THREE.Scene()
-    this.scene.background = new THREE.Color(this.options.config.sceneBackground)
+    // dark blue background
+    this.scene.background = new THREE.Color(0x00_22_11)
 
     // Add ambient light
     this.ambientLight = new THREE.AmbientLight(0xcc_cc_cc)
@@ -72,9 +73,14 @@ export class PanoramaRenderer {
     const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000)
     const loader = new THREE.TextureLoader()
     const panorMaterials = [] as THREE.MeshBasicMaterial[]
+    const startTimes = new Map<THREE.MeshBasicMaterial, number>()
+    const fadeInDuration = 200
 
     for (const file of panoramaFiles) {
-      const texture = loader.load(join('background', file))
+      const texture = loader.load(join('background', file), () => {
+        // Start fade-in when texture is loaded
+        startTimes.set(material, Date.now())
+      })
 
       // Instead of using repeat/offset to flip, we'll use the texture matrix
       texture.matrixAutoUpdate = false
@@ -82,17 +88,19 @@ export class PanoramaRenderer {
         -1, 0, 1, 0, 1, 0, 0, 0, 1
       )
 
-      texture.wrapS = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
-      texture.wrapT = THREE.ClampToEdgeWrapping // Changed from RepeatWrapping
+      texture.wrapS = THREE.ClampToEdgeWrapping
+      texture.wrapT = THREE.ClampToEdgeWrapping
       texture.minFilter = THREE.LinearFilter
       texture.magFilter = THREE.LinearFilter
 
-      panorMaterials.push(new THREE.MeshBasicMaterial({
+      const material = new THREE.MeshBasicMaterial({
         map: texture,
         transparent: true,
         side: THREE.DoubleSide,
         depthWrite: false,
-      }))
+        opacity: 0 // Start with 0 opacity
+      })
+      panorMaterials.push(material)
     }
 
     const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials)
@@ -100,6 +108,16 @@ export class PanoramaRenderer {
       this.time += 0.01
       panoramaBox.rotation.y = Math.PI + this.time * 0.01
       panoramaBox.rotation.z = Math.sin(-this.time * 0.001) * 0.001
+
+      // Time-based fade in animation for each material
+      for (const material of panorMaterials) {
+        const startTime = startTimes.get(material)
+        if (startTime) {
+          const elapsed = Date.now() - startTime
+          const progress = Math.min(1, elapsed / fadeInDuration)
+          material.opacity = progress
+        }
+      }
     }
 
     const group = new THREE.Object3D()

From 22483d7a76e2891292366810034292198d2d20a4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 4 May 2025 11:24:15 +0300
Subject: [PATCH 521/753] regression: some UIs like settings became not
 scrollable

---
 src/screens.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/screens.css b/src/screens.css
index 8ba37aff..f0040e2d 100644
--- a/src/screens.css
+++ b/src/screens.css
@@ -33,8 +33,7 @@
     flex-direction: column;
     margin-top: 35px;
     /* todo remove it but without it in chrome android the screen is not scrollable */
-    /*! upd: changed from "overflow: auto" to "overflow: hidden" to fix main component scroll - delete this comment after testing */
-    overflow: hidden;
+    overflow: auto;
     /* height: fit-content; */ /*! delete this line after testing previous line */
     /* todo I'm not sure about it */
     /* margin-top: calc(100% / 6 - 16px); */

From b01cfe475de6e8b927493a6ec2a68d73bdd66b55 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 4 May 2025 11:35:43 +0300
Subject: [PATCH 522/753] change color and fix rsbuild hoisting var bug

---
 renderer/viewer/three/panorama.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
index 30310957..ba1c4ac2 100644
--- a/renderer/viewer/three/panorama.ts
+++ b/renderer/viewer/three/panorama.ts
@@ -31,11 +31,12 @@ export class PanoramaRenderer {
   private readonly abortController = new AbortController()
   private worldRenderer: WorldRendererCommon | WorldRendererThree | undefined
   public WorldRendererClass = WorldRendererThree
+  public startTimes = new Map<THREE.MeshBasicMaterial, number>()
 
   constructor (private readonly documentRenderer: DocumentRenderer, private readonly options: GraphicsInitOptions, private readonly doWorldBlocksPanorama = false) {
     this.scene = new THREE.Scene()
-    // dark blue background
-    this.scene.background = new THREE.Color(0x00_22_11)
+    // #324568
+    this.scene.background = new THREE.Color(0x32_45_68)
 
     // Add ambient light
     this.ambientLight = new THREE.AmbientLight(0xcc_cc_cc)
@@ -73,13 +74,15 @@ export class PanoramaRenderer {
     const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000)
     const loader = new THREE.TextureLoader()
     const panorMaterials = [] as THREE.MeshBasicMaterial[]
-    const startTimes = new Map<THREE.MeshBasicMaterial, number>()
     const fadeInDuration = 200
 
     for (const file of panoramaFiles) {
+      // eslint-disable-next-line prefer-const
+      let material: THREE.MeshBasicMaterial
+
       const texture = loader.load(join('background', file), () => {
         // Start fade-in when texture is loaded
-        startTimes.set(material, Date.now())
+        this.startTimes.set(material, Date.now())
       })
 
       // Instead of using repeat/offset to flip, we'll use the texture matrix
@@ -93,7 +96,7 @@ export class PanoramaRenderer {
       texture.minFilter = THREE.LinearFilter
       texture.magFilter = THREE.LinearFilter
 
-      const material = new THREE.MeshBasicMaterial({
+      material = new THREE.MeshBasicMaterial({
         map: texture,
         transparent: true,
         side: THREE.DoubleSide,
@@ -111,7 +114,7 @@ export class PanoramaRenderer {
 
       // Time-based fade in animation for each material
       for (const material of panorMaterials) {
-        const startTime = startTimes.get(material)
+        const startTime = this.startTimes.get(material)
         if (startTime) {
           const elapsed = Date.now() - startTime
           const progress = Math.min(1, elapsed / fadeInDuration)

From 1845530e22ab09ed430472b2a0ae1c06cf932c8e Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sun, 4 May 2025 14:21:05 +0300
Subject: [PATCH 523/753] Make link clickable in release body

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3cda1011..422b6e64 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -78,7 +78,7 @@ jobs:
           zip -r ../self-host.zip .
 
       - run: |
-          pnpx zardoy-release node --footer "This release URL: $(echo ${{ steps.alias.outputs.alias }} | cut -d',' -f1) (Vercel URL: ${{ steps.deploy.outputs.stdout }})"
+          pnpx zardoy-release node --footer "This release URL: https://$(echo ${{ steps.alias.outputs.alias }} | cut -d',' -f1) (Vercel URL: ${{ steps.deploy.outputs.stdout }})"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # has possible output: tag

From 28022a20546fb9b6185773780f6232cf6bb87e50 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 6 May 2025 16:36:31 +0300
Subject: [PATCH 524/753] feat: rework server data saving and auto login by
 using more aggressive strategy

---
 src/connect.ts                    |  1 -
 src/index.ts                      |  7 ++++---
 src/react/ChatProvider.tsx        |  6 +++---
 src/react/ServersListProvider.tsx |  1 -
 src/react/serversStorage.ts       | 30 ++++++++++++++++++++++++++++--
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/connect.ts b/src/connect.ts
index b68e4325..914303c6 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -21,7 +21,6 @@ export type ConnectOptions = {
   peerId?: string
   ignoreQs?: boolean
   onSuccessfulPlay?: () => void
-  autoLoginPassword?: string
   serverIndex?: string
   authenticatedAccount?: AuthenticatedAccount | true
   peerOptions?: any
diff --git a/src/index.ts b/src/index.ts
index 26bba494..afa349fa 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -77,7 +77,7 @@ import './water'
 import { ConnectOptions, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData } from './connect'
 import { ref, subscribe } from 'valtio'
 import { signInMessageState } from './react/SignInMessageProvider'
-import { updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/serversStorage'
+import { findServerPassword, updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/serversStorage'
 import { mainMenuState } from './react/MainMenuRenderApp'
 import './mobileShim'
 import { parseFormattedMessagePacket } from './botUtils'
@@ -754,9 +754,10 @@ export async function connect (connectOptions: ConnectOptions) {
       }
       connectOptions.onSuccessfulPlay?.()
       updateDataAfterJoin()
-      if (connectOptions.autoLoginPassword) {
+      const password = findServerPassword()
+      if (password) {
         setTimeout(() => {
-          bot.chat(`/login ${connectOptions.autoLoginPassword}`)
+          bot.chat(`/login ${password}`)
         }, 500)
       }
 
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 50912820..4acc9e79 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -8,7 +8,7 @@ import { viewerVersionState } from '../viewerConnector'
 import Chat, { Message, fadeMessage } from './Chat'
 import { useIsModalActive } from './utilsApp'
 import { hideNotification, notificationProxy, showNotification } from './NotificationProvider'
-import { updateLoadedServerData } from './serversStorage'
+import { getServerIndex, updateLoadedServerData } from './serversStorage'
 import { lastConnectOptions } from './AppStatusProvider'
 import { showOptionsModal } from './SelectOption'
 
@@ -56,13 +56,13 @@ export default () => {
     placeholder={forwardChat || !viewerConnection ? undefined : 'Chat forwarding is not enabled in the plugin settings'}
     sendMessage={async (message) => {
       const builtinHandled = tryHandleBuiltinCommand(message)
-      if (miscUiState.loadedServerIndex && (message.startsWith('/login') || message.startsWith('/register'))) {
+      if (getServerIndex() !== undefined && (message.startsWith('/login') || message.startsWith('/register'))) {
         showNotification('Click here to save your password in browser for auto-login', undefined, false, undefined, () => {
           updateLoadedServerData((server) => {
             server.autoLogin ??= {}
             const password = message.split(' ')[1]
             server.autoLogin[bot.username] = password
-            return server
+            return { ...server }
           })
           hideNotification()
         })
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index cd44a27a..8692e0bd 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -287,7 +287,6 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         proxy: overrides.proxyOverride || getCurrentProxy(),
         botVersion: overrides.versionOverride ?? /* legacy */ overrides['version'],
         ignoreQs: true,
-        autoLoginPassword: server?.autoLogin?.[username],
         authenticatedAccount,
         saveServerToHistory: shouldSave,
         onSuccessfulPlay () {
diff --git a/src/react/serversStorage.ts b/src/react/serversStorage.ts
index b320e2f3..9b095454 100644
--- a/src/react/serversStorage.ts
+++ b/src/react/serversStorage.ts
@@ -1,6 +1,7 @@
 import { appQueryParams } from '../appParams'
 import { miscUiState } from '../globalState'
 import { BaseServerInfo } from './AddServerOrConnect'
+import { lastConnectOptions } from './AppStatusProvider'
 import { appStorage, StoreServerItem } from './appStorageProvider'
 
 const serversListQs = appQueryParams.serversList
@@ -43,9 +44,34 @@ export function updateServerConnectionHistory (ip: string, version?: string) {
   }
 }
 
-export const updateLoadedServerData = (callback: (data: StoreServerItem) => StoreServerItem, index = miscUiState.loadedServerIndex) => {
-  if (index === undefined) index = miscUiState.loadedServerIndex
+export const getServerIndex = () => {
+  const lastConnectedIp = lastConnectOptions.value?.server
+  const index = miscUiState.loadedServerIndex
+  if (index !== undefined) return index
+  if (lastConnectedIp) {
+    const idx = appStorage.serversList?.findIndex(s => s.ip === lastConnectedIp).toString()
+    if (idx === '-1') return undefined
+    return idx
+  }
+  return undefined
+}
+
+export const findServerPassword = () => {
+  const { username } = bot
+  const index = getServerIndex()
   if (index === undefined) return
+  const pswd = appStorage.serversList?.[index]?.autoLogin?.[username]
+  if (pswd) return pswd
+  // try other servers with same host
+  return appStorage.serversList?.find(s => s.ip === lastConnectOptions.value?.server && s.autoLogin?.[username])?.autoLogin?.[username]
+}
+
+export const updateLoadedServerData = (callback: (data: StoreServerItem) => StoreServerItem, index = miscUiState.loadedServerIndex) => {
+  if (index === undefined) {
+    const idx = getServerIndex()
+    if (idx === undefined) return
+    index = idx
+  }
 
   const servers = [...(appStorage.serversList ?? [])]
   const server = servers[index]

From bb9bb48efd60d3e617e48748988e86e1ce03d1a0 Mon Sep 17 00:00:00 2001
From: M G <118717627+mgDentist@users.noreply.github.com>
Date: Tue, 6 May 2025 16:39:42 +0300
Subject: [PATCH 525/753] feat: Combine IP and port input fields (#345)

---
 src/react/AddServerOrConnect.tsx | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index 08ef7f29..19332472 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -46,8 +46,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   const parsedInitialIp = parseServerAddress(initialData?.ip)
 
   const [serverName, setServerName] = React.useState(initialData?.name ?? qsParamName ?? '')
-  const [serverIp, setServerIp] = React.useState(parsedQsIp.host || parsedInitialIp.host || '')
-  const [serverPort, setServerPort] = React.useState(parsedQsIp.port || parsedInitialIp.port || '')
+  const [serverIp, setServerIp] = React.useState(parsedQsIp.serverIpFull || parsedInitialIp.serverIpFull || '')
   const [versionOverride, setVersionOverride] = React.useState(initialData?.versionOverride ?? /* legacy */ initialData?.['version'] ?? qsParamVersion ?? '')
   const [proxyOverride, setProxyOverride] = React.useState(initialData?.proxyOverride ?? qsParamProxy ?? '')
   const [usernameOverride, setUsernameOverride] = React.useState(initialData?.usernameOverride ?? qsParamUsername ?? '')
@@ -61,7 +60,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   const noAccountSelected = accountIndex === -1
   const authenticatedAccountOverride = noAccountSelected ? undefined : freshAccount ? true : accounts?.[accountIndex]
 
-  let ipFinal = serverIp.includes(':') ? serverIp : `${serverIp}${serverPort ? `:${serverPort}` : ''}`
+  let ipFinal = serverIp
   ipFinal = ipFinal.replace(/:$/, '')
   const commonUseOptions: BaseServerInfo = {
     name: serverName,
@@ -126,6 +125,9 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   }, [])
 
   const displayConnectButton = qsParamIp
+  const serverExamples = ['example.com:25565', 'play.hypixel.net', 'ws://play.pcm.gg']
+  // pick random example
+  const example = serverExamples[Math.floor(Math.random() * serverExamples.length)]
 
   return <Screen title={qsParamIp ? 'Connect to Server' : title} backdrop>
     <form
@@ -149,11 +151,6 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
         })
       }}
       >
-        {!lockConnect && <>
-          <div style={{ gridColumn: smallWidth ? '' : 'span 2', display: 'flex', justifyContent: 'center' }}>
-            <InputWithLabel label="Server Name" value={serverName} onChange={({ target: { value } }) => setServerName(value)} placeholder='Defaults to IP' />
-          </div>
-        </>}
         <InputWithLabel
           required
           label="Server IP"
@@ -165,8 +162,13 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
             setServerOnline(false)
           }}
           validateInput={serverOnline === null || fetchedServerInfoIp !== serverIp ? undefined : validateServerIp}
+          placeholder={example}
         />
-        <InputWithLabel label="Server Port" value={serverPort} disabled={lockConnect && parsedQsIp.port !== null} onChange={({ target: { value } }) => setServerPort(value)} placeholder={serverIp.startsWith('ws://') || serverIp.startsWith('wss://') ? '' : '25565'} />
+        {!lockConnect && <>
+          <div style={{ display: 'flex', justifyContent: 'center' }}>
+            <InputWithLabel label="Server Name" value={serverName} onChange={({ target: { value } }) => setServerName(value)} placeholder='Defaults to IP' />
+          </div>
+        </>}
         {isSmallHeight ? <div style={{ gridColumn: 'span 2', marginTop: 10, }} /> : <div style={{ gridColumn: smallWidth ? '' : 'span 2' }}>Overrides:</div>}
         <div style={{
           display: 'flex',

From bf3381c80390b458291b80042e5ba4f4b1056321 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 7 May 2025 15:03:48 +0300
Subject: [PATCH 526/753] Do not automatically enable renderer debug in dev

---
 src/optionsStorage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 65c0b4ba..bc58d21c 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -103,7 +103,7 @@ const defaultOptions = {
   autoJump: 'auto' as 'auto' | 'always' | 'never',
   autoParkour: false,
   vrSupport: true, // doesn't directly affect the VR mode, should only disable the button which is annoying to android users
-  renderDebug: (isDev ? 'advanced' : 'basic') as 'none' | 'advanced' | 'basic',
+  renderDebug: 'basic' as 'none' | 'advanced' | 'basic',
 
   // advanced bot options
   autoRespawn: false,

From b3392bea6bdc0ec3776ababf0a7235cfaa852360 Mon Sep 17 00:00:00 2001
From: M G <118717627+mgDentist@users.noreply.github.com>
Date: Wed, 7 May 2025 16:31:36 +0300
Subject: [PATCH 527/753] feat: Entity interaction button for mobile (#346)

---
 src/react/TouchInteractionHint.module.css |  7 ++++-
 src/react/TouchInteractionHint.tsx        | 36 ++++++++++++++++++-----
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/react/TouchInteractionHint.module.css b/src/react/TouchInteractionHint.module.css
index 026b49c8..73fae1fc 100644
--- a/src/react/TouchInteractionHint.module.css
+++ b/src/react/TouchInteractionHint.module.css
@@ -1,8 +1,8 @@
 .hint_container {
   position: fixed;
-  top: 20%;
   left: 0;
   right: 0;
+  bottom: calc(var(--safe-area-inset-bottom) + 55px); 
   margin: 0 auto;
   width: fit-content;
   display: flex;
@@ -13,6 +13,11 @@
   text-shadow: 1px 1px 8px rgba(0, 0, 0, 1);
 }
 
+.hint_container > button {
+  width: auto;
+  padding: 0 10px;
+}
+
 .hint_text {
   color: white;
   font-size: 10px;
diff --git a/src/react/TouchInteractionHint.tsx b/src/react/TouchInteractionHint.tsx
index e08e4634..bf2b42f0 100644
--- a/src/react/TouchInteractionHint.tsx
+++ b/src/react/TouchInteractionHint.tsx
@@ -3,28 +3,33 @@ import { useSnapshot } from 'valtio'
 import { options } from '../optionsStorage'
 import { activeModalStack } from '../globalState'
 import { videoCursorInteraction } from '../customChannels'
-import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+// import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import styles from './TouchInteractionHint.module.css'
 import { useUsingTouch } from './utilsApp'
+import Button from './Button'
 
 export default () => {
   const usingTouch = useUsingTouch()
   const modalStack = useSnapshot(activeModalStack)
   const { touchInteractionType } = useSnapshot(options)
   const [hintText, setHintText] = useState<string | null>(null)
+  const [entityName, setEntityName] = useState<string | null>(null)
 
   useEffect(() => {
     const update = () => {
       const videoInteraction = videoCursorInteraction()
       if (videoInteraction) {
         setHintText(`Interact with video`)
+        setEntityName(null)
       } else {
         const cursorState = bot.mouse.getCursorState()
         if (cursorState.entity) {
-          const entityName = cursorState.entity.displayName ?? cursorState.entity.name
-          setHintText(`Attack ${entityName}`)
+          const name = cursorState.entity.displayName ?? cursorState.entity.name ?? 'Entity'
+          setHintText(`Attack ${name}`)
+          setEntityName(name)
         } else {
           setHintText(null)
+          setEntityName(null)
         }
       }
     }
@@ -40,13 +45,30 @@ export default () => {
     }
   }, [])
 
+  const handleUseButtonClick = (e: React.MouseEvent) => {
+    e.preventDefault()
+    e.stopPropagation()
+
+    document.dispatchEvent(new MouseEvent('mousedown', { button: 2 }))
+    bot.mouse.update()
+    document.dispatchEvent(new MouseEvent('mouseup', { button: 2 }))
+  }
+
   if (!usingTouch || touchInteractionType !== 'classic' || modalStack.length > 0) return null
-  if (!hintText) return null
+  if (!hintText && !entityName) return null
 
   return (
-    <div className={`${styles.hint_container} interaction-hint`}>
-      <PixelartIcon iconName={pixelartIcons['sun-alt']} width={14} />
-      <span className={styles.hint_text}>{hintText}</span>
+    <div
+      className={`${styles.hint_container} interaction-hint`}
+    >
+      {/* temporary hide hint indicator and text */}
+      {/* <PixelartIcon iconName={pixelartIcons['sun-alt']} width={14} />
+      <span className={styles.hint_text}>{hintText || 'Attack entity'}</span> */}
+      <Button
+        onClick={handleUseButtonClick}
+      >
+        {`Use ${entityName}`}
+      </Button>
     </div>
   )
 }

From 58799d973caaa19b6214658a6f3aa86638c0868e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 8 May 2025 00:07:33 +0300
Subject: [PATCH 528/753] fix transfer on 1.20 and above (should have added
 patch a long time ago)

---
 patches/minecraft-protocol.patch | 16 ++++++++++++++++
 pnpm-lock.yaml                   | 16 ++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch
index 29111f69..efc79176 100644
--- a/patches/minecraft-protocol.patch
+++ b/patches/minecraft-protocol.patch
@@ -1,3 +1,6 @@
+diff --git a/README.md b/README.md
+deleted file mode 100644
+index fbcaa43667323a58b8110a4495938c2c6d2d6f83..0000000000000000000000000000000000000000
 diff --git a/src/client/chat.js b/src/client/chat.js
 index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aae0d1d337 100644
 --- a/src/client/chat.js
@@ -73,6 +76,19 @@ index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108
        }
  
        function onJoinServerResponse (err) {
+diff --git a/src/client/play.js b/src/client/play.js
+index 6e06dc15291b38e1eeeec8d7102187b2a23d70a3..f67454942db9276cbb9eab99c281cfe182cb8a1f 100644
+--- a/src/client/play.js
++++ b/src/client/play.js
+@@ -53,7 +53,7 @@ module.exports = function (client, options) {
+         client.write('configuration_acknowledged', {})
+       }
+       client.state = states.CONFIGURATION
+-      client.on('select_known_packs', () => {
++      client.once('select_known_packs', () => {
+         client.write('select_known_packs', { packs: [] })
+       })
+       // Server should send finish_configuration on its own right after sending the client a dimension codec
 diff --git a/src/client.js b/src/client.js
 index 74749698f8cee05b5dc749c271544f78d06645b0..e77e0a3f41c1ee780c3abbd54b0801d248c2a07c 100644
 --- a/src/client.js
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f099a85f..19248ee1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,7 +22,7 @@ overrides:
 
 patchedDependencies:
   minecraft-protocol:
-    hash: 3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab
+    hash: 1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37
     path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
@@ -142,7 +142,7 @@ importers:
         version: 3.83.1
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
@@ -13190,7 +13190,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13226,7 +13226,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -17023,7 +17023,7 @@ snapshots:
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
@@ -17342,7 +17342,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17441,7 +17441,7 @@ snapshots:
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
@@ -17465,7 +17465,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.7
       minecraft-data: 3.83.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=3a55a278c417cc34ff3172cd1de8e22852935cba0586875cbd0635f1ffdaa5ab)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From aa817139b73ee5ba23d442744a78bb85ec285f7c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 8 May 2025 04:11:17 +0300
Subject: [PATCH 529/753] fix: fix auto jump on mobile!

---
 package.json   |  2 +-
 pnpm-lock.yaml | 44 +++++++++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 16f009f0..e1f2b6fc 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
   "dependencies": {
     "@dimaka/interface": "0.0.3-alpha.0",
     "@floating-ui/react": "^0.26.1",
-    "@nxg-org/mineflayer-auto-jump": "^0.7.12",
+    "@nxg-org/mineflayer-auto-jump": "^0.7.17",
     "@nxg-org/mineflayer-tracker": "1.2.1",
     "@react-oauth/google": "^0.12.1",
     "@stylistic/eslint-plugin": "^2.6.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 19248ee1..f3c88f2a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,8 +42,8 @@ importers:
         specifier: ^0.26.1
         version: 0.26.28(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@nxg-org/mineflayer-auto-jump':
-        specifier: ^0.7.12
-        version: 0.7.12
+        specifier: ^0.7.17
+        version: 0.7.17
       '@nxg-org/mineflayer-tracker':
         specifier: 1.2.1
         version: 1.2.1(encoding@0.1.13)
@@ -347,7 +347,7 @@ importers:
         version: 0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
       mineflayer-pathfinder:
         specifier: ^2.4.4
-        version: 2.4.5
+        version: 2.4.5(prismarine-registry@1.11.0)
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -432,13 +432,13 @@ importers:
         version: 1.3.9
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
         version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-schematic:
         specifier: ^1.2.0
-        version: 1.2.3
+        version: 1.2.3(prismarine-registry@1.11.0)
       process:
         specifier: ^0.11.10
         version: 0.11.10
@@ -2019,8 +2019,8 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     deprecated: This functionality has been moved to @npmcli/fs
 
-  '@nxg-org/mineflayer-auto-jump@0.7.12':
-    resolution: {integrity: sha512-F5vX/lerlWx/5HVlkDNbvrtQ19PL6iG8i4ItPTIRtjGiFzusDefP7DI226zSFR8Wlaw45qHv0jn814p/4/qVdQ==}
+  '@nxg-org/mineflayer-auto-jump@0.7.17':
+    resolution: {integrity: sha512-AgIiJcyh9y8bZjwNHZ2Wp/mbC6+XfE8cM/nOLcZaQYLdoUgncUeaNinFTYLvwi1RMQ42S5bxvwI9kKUwjRhlDA==}
 
   '@nxg-org/mineflayer-physics-util@1.8.7':
     resolution: {integrity: sha512-wtLYvHqoEFr/j0ny2lyogwjbMvwpFuG2aWI8sI14+EAiGFRpL5+cog2ujSDsnRTZruO7tUXMTiPc1kebjXwfJg==}
@@ -11368,7 +11368,7 @@ snapshots:
       rimraf: 3.0.2
     optional: true
 
-  '@nxg-org/mineflayer-auto-jump@0.7.12':
+  '@nxg-org/mineflayer-auto-jump@0.7.17':
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.7
       strict-event-emitter-types: 2.0.0
@@ -11390,7 +11390,7 @@ snapshots:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.83.1
       mineflayer: 4.27.0(encoding@0.1.13)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-item: 1.16.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
@@ -17428,22 +17428,24 @@ snapshots:
       - tsx
       - yaml
 
-  mineflayer-pathfinder@2.4.5:
+  mineflayer-pathfinder@2.4.5(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
+    transitivePeerDependencies:
+      - prismarine-registry
 
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
@@ -17467,7 +17469,7 @@ snapshots:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
@@ -18260,7 +18262,7 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-registry: 1.11.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.83.1
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
@@ -18268,6 +18270,8 @@ snapshots:
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
+    transitivePeerDependencies:
+      - prismarine-registry
 
   prismarine-chat@1.11.0:
     dependencies:
@@ -18278,7 +18282,7 @@ snapshots:
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
@@ -18312,7 +18316,7 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -18336,16 +18340,18 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.7.0
 
-  prismarine-schematic@1.2.3:
+  prismarine-schematic@1.2.3(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.10
+    transitivePeerDependencies:
+      - prismarine-registry
 
   prismarine-windows@2.9.0:
     dependencies:

From f76c7fb782416e768f2a1610628c750c23ef4bb5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 8 May 2025 19:51:42 +0300
Subject: [PATCH 530/753] fix: water now supports lighting when its enabled

---
 renderer/viewer/lib/mesher/models.ts | 38 ++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index 46258134..802ecaf0 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -125,6 +125,13 @@ const isCube = (block: Block) => {
   }))
 }
 
+const getVec = (v: Vec3, dir: Vec3) => {
+  for (const coord of ['x', 'y', 'z']) {
+    if (Math.abs(dir[coord]) > 0) v[coord] = 0
+  }
+  return v.plus(dir)
+}
+
 function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, type: number, biome: string, water: boolean, attr: Record<string, any>, isRealWater: boolean) {
   const heights: number[] = []
   for (let z = -1; z <= 1; z++) {
@@ -142,7 +149,7 @@ function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, typ
 
   // eslint-disable-next-line guard-for-in
   for (const face in elemFaces) {
-    const { dir, corners } = elemFaces[face]
+    const { dir, corners, mask1, mask2 } = elemFaces[face]
     const isUp = dir[1] === 1
 
     const neighborPos = cursor.offset(...dir as [number, number, number])
@@ -180,6 +187,9 @@ function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, typ
     const { su } = texture
     const { sv } = texture
 
+    // Get base light value for the face
+    const baseLight = world.getLight(neighborPos, undefined, undefined, water ? 'water' : 'lava') / 15
+
     for (const pos of corners) {
       const height = cornerHeights[pos[2] * 2 + pos[0]]
       attr.t_positions.push(
@@ -189,7 +199,31 @@ function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, typ
       )
       attr.t_normals.push(...dir)
       attr.t_uvs.push(pos[3] * su + u, pos[4] * sv * (pos[1] ? 1 : height) + v)
-      attr.t_colors.push(tint[0], tint[1], tint[2])
+
+      let cornerLightResult = baseLight
+      if (world.config.smoothLighting) {
+        const dx = pos[0] * 2 - 1
+        const dy = pos[1] * 2 - 1
+        const dz = pos[2] * 2 - 1
+        const cornerDir: [number, number, number] = [dx, dy, dz]
+        const side1Dir: [number, number, number] = [dx * mask1[0], dy * mask1[1], dz * mask1[2]]
+        const side2Dir: [number, number, number] = [dx * mask2[0], dy * mask2[1], dz * mask2[2]]
+
+        const dirVec = new Vec3(...dir as [number, number, number])
+
+        const side1LightDir = getVec(new Vec3(...side1Dir), dirVec)
+        const side1Light = world.getLight(cursor.plus(side1LightDir)) / 15
+        const side2DirLight = getVec(new Vec3(...side2Dir), dirVec)
+        const side2Light = world.getLight(cursor.plus(side2DirLight)) / 15
+        const cornerLightDir = getVec(new Vec3(...cornerDir), dirVec)
+        const cornerLight = world.getLight(cursor.plus(cornerLightDir)) / 15
+        // interpolate
+        const lights = [side1Light, side2Light, cornerLight, baseLight]
+        cornerLightResult = lights.reduce((acc, cur) => acc + cur, 0) / lights.length
+      }
+
+      // Apply light value to tint
+      attr.t_colors.push(tint[0] * cornerLightResult, tint[1] * cornerLightResult, tint[2] * cornerLightResult)
     }
   }
 }

From 25f2fdef4e766a2d53bcbe24e95ce796f95d2e90 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 8 May 2025 19:56:13 +0300
Subject: [PATCH 531/753] fix: dont display hand & cursor block outline in
 spectator.

---
 renderer/viewer/lib/basePlayerState.ts      |  2 ++
 renderer/viewer/three/worldrendererThree.ts |  2 +-
 src/mineflayer/playerState.ts               | 22 ++++++++++++++++++++-
 src/mineflayer/plugins/mouse.ts             |  6 +++++-
 src/react/ChunksDebugScreen.tsx             |  2 +-
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index df8cbc61..856772b1 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -31,6 +31,8 @@ export interface IPlayerState {
   getHeldItem?(isLeftHand: boolean): HandItemBlock | undefined
   username?: string
   onlineMode?: boolean
+  lightingDisabled?: boolean
+  shouldHideHand?: boolean
 
   events: TypedEmitter<PlayerStateEvents>
 
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 088f0ee7..5c16aa9a 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -470,7 +470,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     const cam = this.camera instanceof THREE.Group ? this.camera.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
 
-    if (this.displayOptions.inWorldRenderingConfig.showHand/*  && !this.freeFlyMode */) {
+    if (this.displayOptions.inWorldRenderingConfig.showHand && !this.playerState.shouldHideHand /*  && !this.freeFlyMode */) {
       this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
       this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
     }
diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
index 85f0b00c..16739c86 100644
--- a/src/mineflayer/playerState.ts
+++ b/src/mineflayer/playerState.ts
@@ -24,6 +24,7 @@ export class PlayerStateManager implements IPlayerState {
   private itemUsageTicks = 0
   private isUsingItem = false
   private ready = false
+  public lightingDisabled = false
   onlineMode = false
   get username () {
     return bot.username ?? ''
@@ -51,6 +52,21 @@ export class PlayerStateManager implements IPlayerState {
   }
 
   private botCreated () {
+    const handleDimensionData = (data) => {
+      let hasSkyLight = 1
+      try {
+        hasSkyLight = data.dimension.value.has_skylight.value
+      } catch {}
+      this.lightingDisabled = bot.game.dimension === 'the_nether' || bot.game.dimension === 'the_end' || !hasSkyLight
+    }
+
+    bot._client.on('login', (packet) => {
+      handleDimensionData(packet)
+    })
+    bot._client.on('respawn', (packet) => {
+      handleDimensionData(packet)
+    })
+
     // Movement tracking
     bot.on('move', this.updateState)
 
@@ -75,6 +91,10 @@ export class PlayerStateManager implements IPlayerState {
     this.reactive.gameMode = bot.game?.gameMode
   }
 
+  get shouldHideHand () {
+    return this.reactive.gameMode === 'spectator'
+  }
+
   // #region Movement and Physics State
   private updateState () {
     if (!bot?.entity || this.disableStateUpdates) return
@@ -118,7 +138,7 @@ export class PlayerStateManager implements IPlayerState {
   }
 
   getEyeHeight (): number {
-    return bot.controlState.sneak ? 1.27 : 1.62
+    return bot.controlState.sneak && !this.isFlying() ? 1.27 : 1.62
   }
 
   isOnGround (): boolean {
diff --git a/src/mineflayer/plugins/mouse.ts b/src/mineflayer/plugins/mouse.ts
index 4e82b770..fc1ce0fd 100644
--- a/src/mineflayer/plugins/mouse.ts
+++ b/src/mineflayer/plugins/mouse.ts
@@ -10,7 +10,7 @@ import { sendVideoInteraction, videoCursorInteraction } from '../../customChanne
 
 function cursorBlockDisplay (bot: Bot) {
   const updateCursorBlock = (data?: { block: Block }) => {
-    if (!data?.block) {
+    if (!data?.block || bot.game.gameMode === 'spectator') {
       playerState.reactive.lookingAtBlock = undefined
       return
     }
@@ -27,6 +27,10 @@ function cursorBlockDisplay (bot: Bot) {
   }
 
   bot.on('highlightCursorBlock', updateCursorBlock)
+  bot.on('game', () => {
+    const block = bot.mouse.getCursorState().cursorBlock
+    updateCursorBlock(block ? { block } : undefined)
+  })
 
   bot.on('blockBreakProgressStage', (block, stage) => {
     const mergedShape = bot.mouse.getMergedCursorShape(block)
diff --git a/src/react/ChunksDebugScreen.tsx b/src/react/ChunksDebugScreen.tsx
index 80e926d8..9f47d023 100644
--- a/src/react/ChunksDebugScreen.tsx
+++ b/src/react/ChunksDebugScreen.tsx
@@ -30,7 +30,7 @@ const Inner = () => {
       state,
       lines: [String(chunk?.loads.length ?? 0)],
       sidebarLines: [
-        `loads: ${chunk.loads.map(l => `${l.reason} ${l.dataLength} ${l.time}`).join('\n')}`,
+        `loads: ${chunk.loads?.map(l => `${l.reason} ${l.dataLength} ${l.time}`).join('\n')}`,
         // `blockUpdates: ${chunk.blockUpdates}`,
       ],
     }

From 674b6ab00daadcb1caefcffe93b30e17d0f83e81 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 8 May 2025 21:23:04 +0300
Subject: [PATCH 532/753] feat: add chat scroll debug and use alternative ways
 of forcing scroll in DOM!

---
 src/optionsGuiScheme.tsx             |  4 ++
 src/optionsStorage.ts                |  1 +
 src/react/Chat.tsx                   | 64 +++++++++++++++++++++++++++-
 src/react/ChatProvider.tsx           |  3 +-
 src/react/hooks/useScrollBehavior.ts | 59 ++++++++++++++++++-------
 5 files changed, 112 insertions(+), 19 deletions(-)

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index b9c44b29..d4be46f6 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -605,6 +605,10 @@ export const guiOptionsScheme: {
       debugResponseTimeIndicator: {
         text: 'Debug Input Lag',
       },
+    },
+    {
+      debugChatScroll: {
+      },
     }
   ],
   'export-import': [
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index bc58d21c..ab164454 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -72,6 +72,7 @@ const defaultOptions = {
   preventBackgroundTimeoutKick: false,
   preventSleep: false,
   debugContro: false,
+  debugChatScroll: false,
   chatVanillaRestrictions: true,
   debugResponseTimeIndicator: false,
   // antiAliasing: false,
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 130f25a0..c2e59b07 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -41,6 +41,7 @@ type Props = {
   inputDisabled?: string
   placeholder?: string
   chatVanillaRestrictions?: boolean
+  debugChatScroll?: boolean
 }
 
 export const chatInputValueGlobal = proxy({
@@ -69,7 +70,8 @@ export default ({
   allowSelection,
   inputDisabled,
   placeholder,
-  chatVanillaRestrictions
+  chatVanillaRestrictions,
+  debugChatScroll
 }: Props) => {
   const sendHistoryRef = useRef(JSON.parse(window.sessionStorage.chatHistory || '[]'))
   const [isInputFocused, setIsInputFocused] = useState(false)
@@ -86,7 +88,16 @@ export default ({
   const chatHistoryPos = useRef(sendHistoryRef.current.length)
   const inputCurrentlyEnteredValue = useRef('')
 
-  const { scrollToBottom } = useScrollBehavior(chatMessages, { messages, opened })
+  const { scrollToBottom, isAtBottom, wasAtBottom, currentlyAtBottom } = useScrollBehavior(chatMessages, { messages, opened })
+  const [rightNowAtBottom, setRightNowAtBottom] = useState(false)
+
+  useEffect(() => {
+    if (!debugChatScroll) return
+    const interval = setInterval(() => {
+      setRightNowAtBottom(isAtBottom())
+    }, 50)
+    return () => clearInterval(interval)
+  }, [debugChatScroll])
 
   const setSendHistory = (newHistory: string[]) => {
     sendHistoryRef.current = newHistory
@@ -252,6 +263,55 @@ export default ({
         }}
       >
         {opacity && <div ref={chatMessages} className={`chat ${opened ? 'opened' : ''}`} id="chat-messages" style={{ opacity }}>
+          {debugChatScroll && (
+            <div
+              style={{
+                position: 'absolute',
+                top: 5,
+                left: 5,
+                display: 'flex',
+                gap: 4,
+                zIndex: 100,
+              }}
+            >
+              <div
+                title="Right now is at bottom (updated every 50ms)"
+                style={{
+                  width: 12,
+                  height: 12,
+                  backgroundColor: rightNowAtBottom ? '#00ff00' : '#ff0000',
+                  border: '1px solid #fff',
+                }}
+              />
+              <div
+                title="Currently at bottom"
+                style={{
+                  width: 12,
+                  height: 12,
+                  backgroundColor: currentlyAtBottom ? '#00ff00' : '#ff0000',
+                  border: '1px solid #fff',
+                }}
+              />
+              <div
+                title="Was at bottom"
+                style={{
+                  width: 12,
+                  height: 12,
+                  backgroundColor: wasAtBottom() ? '#00ff00' : '#ff0000',
+                  border: '1px solid #fff',
+                }}
+              />
+              <div
+                title="Chat opened"
+                style={{
+                  width: 12,
+                  height: 12,
+                  backgroundColor: opened ? '#00ff00' : '#ff0000',
+                  border: '1px solid #fff',
+                }}
+              />
+            </div>
+          )}
           {messages.map((m) => (
             <MessageLine key={reactKeyForMessage(m)} message={m} />
           ))}
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 4acc9e79..5c499029 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -17,7 +17,7 @@ export default () => {
   const isChatActive = useIsModalActive('chat')
   const lastMessageId = useRef(0)
   const usingTouch = useSnapshot(miscUiState).currentTouch
-  const { chatSelect, messagesLimit, chatOpacity, chatOpacityOpened, chatVanillaRestrictions } = useSnapshot(options)
+  const { chatSelect, messagesLimit, chatOpacity, chatOpacityOpened, chatVanillaRestrictions, debugChatScroll } = useSnapshot(options)
   const isUsingMicrosoftAuth = useMemo(() => !!lastConnectOptions.value?.authenticatedAccount, [])
   const { forwardChat } = useSnapshot(viewerVersionState)
   const { viewerConnection } = useSnapshot(gameAdditionalState)
@@ -48,6 +48,7 @@ export default () => {
 
   return <Chat
     chatVanillaRestrictions={chatVanillaRestrictions}
+    debugChatScroll={debugChatScroll}
     allowSelection={chatSelect}
     usingTouch={!!usingTouch}
     opacity={(isChatActive ? chatOpacityOpened : chatOpacity) / 100}
diff --git a/src/react/hooks/useScrollBehavior.ts b/src/react/hooks/useScrollBehavior.ts
index 3b9499a6..5a839066 100644
--- a/src/react/hooks/useScrollBehavior.ts
+++ b/src/react/hooks/useScrollBehavior.ts
@@ -1,4 +1,4 @@
-import { RefObject, useEffect, useLayoutEffect, useRef } from 'react'
+import { RefObject, useEffect, useLayoutEffect, useRef, useState } from 'react'
 import { pixelartIcons } from '../PixelartIcon'
 
 export const useScrollBehavior = (
@@ -12,6 +12,8 @@ export const useScrollBehavior = (
   }
 ) => {
   const openedWasAtBottom = useRef(true) // before new messages
+  const [currentlyAtBottom, setCurrentlyAtBottom] = useState(true)
+  const scrollTimeoutRef = useRef<NodeJS.Timeout | null>(null)
 
   const isAtBottom = () => {
     if (!elementRef.current) return true
@@ -20,17 +22,30 @@ export const useScrollBehavior = (
     return distanceFromBottom < 1
   }
 
-  const scrollToBottom = () => {
-    if (elementRef.current) {
-      elementRef.current.scrollTop = elementRef.current.scrollHeight
-      setTimeout(() => {
-        if (!elementRef.current) return
-        elementRef.current.scrollTo({
-          top: elementRef.current.scrollHeight,
-          behavior: 'instant'
-        })
-      }, 0)
+  const scrollToBottom = (behavior: ScrollBehavior = 'instant') => {
+    if (!elementRef.current) return
+
+    // Clear any existing scroll timeout
+    if (scrollTimeoutRef.current) {
+      clearTimeout(scrollTimeoutRef.current)
     }
+
+    const el = elementRef.current
+
+    // Immediate scroll
+    el.scrollTop = el.scrollHeight
+
+    // Double-check after a short delay to ensure we're really at the bottom
+    scrollTimeoutRef.current = setTimeout(() => {
+      if (!elementRef.current) return
+      const el = elementRef.current
+      el.scrollTo({
+        top: el.scrollHeight,
+        behavior
+      })
+      setCurrentlyAtBottom(true)
+      openedWasAtBottom.current = true
+    }, 5)
   }
 
   // Handle scroll position tracking
@@ -39,18 +54,28 @@ export const useScrollBehavior = (
     if (!element) return
 
     const handleScroll = () => {
-      openedWasAtBottom.current = isAtBottom()
+      const atBottom = isAtBottom()
+      openedWasAtBottom.current = atBottom
+      setCurrentlyAtBottom(atBottom)
     }
 
     element.addEventListener('scroll', handleScroll)
-    return () => element.removeEventListener('scroll', handleScroll)
+    return () => {
+      element.removeEventListener('scroll', handleScroll)
+      if (scrollTimeoutRef.current) {
+        clearTimeout(scrollTimeoutRef.current)
+      }
+    }
   }, [])
 
   // Handle opened state changes
   useLayoutEffect(() => {
     if (opened) {
-      openedWasAtBottom.current = true
-    } else {
+      // Wait a frame before scrolling to ensure DOM has updated
+      requestAnimationFrame(() => {
+        scrollToBottom()
+      })
+    } else if (elementRef.current) {
       scrollToBottom()
     }
   }, [opened])
@@ -64,6 +89,8 @@ export const useScrollBehavior = (
 
   return {
     scrollToBottom,
-    isAtBottom
+    isAtBottom,
+    wasAtBottom: () => openedWasAtBottom.current,
+    currentlyAtBottom
   }
 }

From a58ff0776e8a3d63029c30f46669261be58274ca Mon Sep 17 00:00:00 2001
From: M G <118717627+mgDentist@users.noreply.github.com>
Date: Mon, 12 May 2025 18:09:10 +0300
Subject: [PATCH 533/753] server name field "flex-start" now (#351)

---
 src/react/AddServerOrConnect.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index 19332472..08e4d69e 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -165,7 +165,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
           placeholder={example}
         />
         {!lockConnect && <>
-          <div style={{ display: 'flex', justifyContent: 'center' }}>
+          <div style={{ display: 'flex' }}>
             <InputWithLabel label="Server Name" value={serverName} onChange={({ target: { value } }) => setServerName(value)} placeholder='Defaults to IP' />
           </div>
         </>}

From e2400ee667a1bedd8796653838d9a56feae499d4 Mon Sep 17 00:00:00 2001
From: M G <118717627+mgDentist@users.noreply.github.com>
Date: Mon, 12 May 2025 18:15:45 +0300
Subject: [PATCH 534/753] Entity Interaction Button works now (#352)

---
 src/react/TouchInteractionHint.module.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/TouchInteractionHint.module.css b/src/react/TouchInteractionHint.module.css
index 73fae1fc..da11a65c 100644
--- a/src/react/TouchInteractionHint.module.css
+++ b/src/react/TouchInteractionHint.module.css
@@ -8,7 +8,7 @@
   display: flex;
   align-items: center;
   gap: 8px;
-  pointer-events: none;
+  pointer-events: auto;
   z-index: 1000;
   text-shadow: 1px 1px 8px rgba(0, 0, 0, 1);
 }

From 48cdd9484fe024ed224349d40fac909c06a6a606 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 12 May 2025 18:56:20 +0300
Subject: [PATCH 535/753] annoying contextmenu on windows on right click
 sometimes was appearing

---
 src/globalDomListeners.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/globalDomListeners.ts b/src/globalDomListeners.ts
index 5055c600..bfce0d42 100644
--- a/src/globalDomListeners.ts
+++ b/src/globalDomListeners.ts
@@ -35,3 +35,12 @@ window.addEventListener('beforeunload', (event) => {
   event.returnValue = '' // Required for some browsers
   return 'The game is running. Are you sure you want to close this page?'
 })
+
+window.addEventListener('contextmenu', (e) => {
+  const ALLOW_TAGS = ['INPUT', 'TEXTAREA', 'A']
+  // allow if target is in ALLOW_TAGS or has selection text
+  if (ALLOW_TAGS.includes((e.target as HTMLElement)?.tagName) || window.getSelection()?.toString()) {
+    return
+  }
+  e.preventDefault()
+})

From 489c16793be6619812cbe8b41779b4d3794a8591 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 14 May 2025 01:24:53 +0300
Subject: [PATCH 536/753] fix original name logging on error

---
 src/inventoryWindows.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 2906177b..21e3061f 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -189,7 +189,6 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
   image?: HTMLImageElement
 } | undefined => {
   let itemModelName = model.modelName
-  const originalItemName = itemModelName
   const isItem = loadedData.itemsByName[itemModelName]
 
   // #region normalize item name
@@ -225,7 +224,7 @@ export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = fal
       ?? (model.originalItemName ? appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture(model.originalItemName, {}, false, fullBlockModelSupport) : undefined)
       ?? appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture('item/missing_texture')!
   } catch (err) {
-    inGameError(`Failed to render item ${itemModelName} (original: ${originalItemName}) on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
+    inGameError(`Failed to render item ${itemModelName} (original: ${model.originalItemName}) on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
     itemTexture = blockToTopTexture(appViewer.resourcesManager.currentResources!.itemsRenderer.getItemTexture('errored')!)
   }
 

From 75adc29bf080f87236b21ac8bcf452c2f7b76f8f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 14 May 2025 03:07:02 +0300
Subject: [PATCH 537/753] up mc assets

---
 package.json   |  2 +-
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index e1f2b6fc..2388d508 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.53",
+    "mc-assets": "^0.2.54",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
     "mineflayer-mouse": "^0.1.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f3c88f2a..7da635c6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -334,8 +334,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.53
-        version: 0.2.53
+        specifier: ^0.2.54
+        version: 0.2.54
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4(@types/react@18.3.18)(react@18.3.1)
@@ -6466,8 +6466,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.53:
-    resolution: {integrity: sha512-Ucsu2pDLr/cs8bxbxU9KTszdf/vPTLphYgEHUEWxuYlMkPQUCpsQwkn3YgyykJ7RXaca7zZGlZXaTPXBAqJT6A==}
+  mc-assets@0.2.54:
+    resolution: {integrity: sha512-ZEaa9IcqfOt4cFGLVJVkZMemKPfbjQskvIxuDepkXWkJb9T+xQ+Hj86zDMh1Ah8WZWNeGx2x26CuXt8QNr6pcw==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.23:
@@ -17014,7 +17014,7 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.53:
+  mc-assets@0.2.54:
     dependencies:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2

From 7ed3413b28ac7915b17400cd5b7834ae1ef541dd Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 14 May 2025 03:12:55 +0300
Subject: [PATCH 538/753] fix save is undefined in rare cases

---
 src/flyingSquidUtils.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/flyingSquidUtils.ts b/src/flyingSquidUtils.ts
index 012830d9..2ae0be7c 100644
--- a/src/flyingSquidUtils.ts
+++ b/src/flyingSquidUtils.ts
@@ -18,9 +18,10 @@ export function nameToMcOfflineUUID (name) {
 }
 
 export async function savePlayers (autoSave: boolean) {
+  if (!localServer?.players[0]) return
   if (autoSave && new URL(location.href).searchParams.get('noSave') === 'true') return
   //@ts-expect-error TODO
-  await localServer!.savePlayersSingleplayer()
+  await localServer.savePlayersSingleplayer()
 }
 
 // todo flying squid should expose save function instead

From 0a61bbba757c47c62f2b4d82ef54aaa213cdfc13 Mon Sep 17 00:00:00 2001
From: M G <118717627+mgDentist@users.noreply.github.com>
Date: Wed, 14 May 2025 18:15:21 +0300
Subject: [PATCH 539/753] Fixed button shown even when cursor is not over the
 entity (e.g., a video) (#356)

fix: button shown even when cursor is not over the entity (e.g., a video)
---
 src/react/TouchInteractionHint.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/react/TouchInteractionHint.tsx b/src/react/TouchInteractionHint.tsx
index bf2b42f0..b3cbe268 100644
--- a/src/react/TouchInteractionHint.tsx
+++ b/src/react/TouchInteractionHint.tsx
@@ -57,6 +57,9 @@ export default () => {
   if (!usingTouch || touchInteractionType !== 'classic' || modalStack.length > 0) return null
   if (!hintText && !entityName) return null
 
+  // need to hide "Use" button if there isn't an entity name, but there is a hint text
+  if (!entityName) return null
+
   return (
     <div
       className={`${styles.hint_container} interaction-hint`}

From 6302a3815fa830b82d3ded28b05ad7cef7538754 Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Fri, 16 May 2025 20:19:23 +0700
Subject: [PATCH 540/753] feat: Add remote splash text loading via URLs

---
 config.json             |  4 ++--
 src/react/MainMenu.tsx  | 20 ++++++++++++++++---
 src/utils/splashText.ts | 43 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 src/utils/splashText.ts

diff --git a/config.json b/config.json
index ea27ca5a..0515aa40 100644
--- a/config.json
+++ b/config.json
@@ -26,7 +26,7 @@
     }
   ],
   "rightSideText": "A Minecraft client clone in the browser!",
-  "splashText": "Gen is cooking!",
+  "splashText": "https://jsonplaceholder.typicode.com/posts/1",
   "pauseLinks": [
     [
       {
@@ -37,4 +37,4 @@
       }
     ]
   ]
-}
+}
\ No newline at end of file
diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 7ed257c0..e706a3a8 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -1,9 +1,10 @@
-import React from 'react'
+import React, { useEffect, useState } from 'react'
 import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { useSnapshot } from 'valtio'
 import { haveDirectoryPicker } from '../utils'
 import { ConnectOptions } from '../connect'
 import { miscUiState } from '../globalState'
+import { isRemoteSplashText, loadRemoteSplashText } from '../utils/splashText'
 import styles from './mainMenu.module.css'
 import Button from './Button'
 import ButtonWithTooltip from './ButtonWithTooltip'
@@ -47,6 +48,19 @@ export default ({
   singleplayerAvailable = true
 }: Props) => {
   const { appConfig } = useSnapshot(miscUiState)
+  const [splashText, setSplashText] = useState(appConfig?.splashText || '')
+
+  useEffect(() => {
+    const loadSplashText = async () => {
+      if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
+        const text = await loadRemoteSplashText(appConfig.splashText)
+        setSplashText(text)
+      } else {
+        setSplashText(appConfig?.splashText || '')
+      }
+    }
+    void loadSplashText()
+  }, [appConfig?.splashText])
 
   if (!bottomRightLinks?.trim()) bottomRightLinks = undefined
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
@@ -75,7 +89,7 @@ export default ({
   const connectToServerLongPress = useLongPress(
     () => {
       if (process.env.NODE_ENV === 'development') {
-      // Connect to <origin>:25565
+        // Connect to <origin>:25565
         const origin = window.location.hostname
         const connectOptions: ConnectOptions = {
           server: `${origin}:25565`,
@@ -93,7 +107,7 @@ export default ({
       <div className={styles['game-title']}>
         <div className={styles.minecraft}>
           <div className={styles.edition} />
-          <span className={styles.splash}>{appConfig?.splashText}</span>
+          <span className={styles.splash}>{splashText}</span>
         </div>
       </div>
 
diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
new file mode 100644
index 00000000..a46da218
--- /dev/null
+++ b/src/utils/splashText.ts
@@ -0,0 +1,43 @@
+const MAX_WORDS = 5
+const HTTPS_REGEX = /^https?:\/\//
+
+const limitWords = (text: string): string => {
+  const words = text.split(/\s+/)
+  if (words.length <= MAX_WORDS) {
+    return text
+  }
+  return words.slice(0, MAX_WORDS).join(' ') + '...'
+}
+
+export const isRemoteSplashText = (text: string): boolean => {
+  return HTTPS_REGEX.test(text)
+}
+
+export const loadRemoteSplashText = async (url: string): Promise<string> => {
+  try {
+    const response = await fetch(url)
+    if (!response.ok) {
+      throw new Error(`Failed to fetch splash text: ${response.statusText}`)
+    }
+    try {
+      const json = await response.json()
+
+      if (typeof json === 'object' && json !== null) {
+        if (json.title) return limitWords(json.title)
+        if (json.text) return limitWords(json.text)
+        if (json.message) return limitWords(json.message)
+
+        return limitWords(JSON.stringify(json))
+      }
+
+      return limitWords(String(json))
+    } catch (jsonError) {
+
+      const text = await response.text()
+      return limitWords(text.trim())
+    }
+  } catch (error) {
+    console.error('Error loading remote splash text:', error)
+    return 'Failed to load splash text!'
+  }
+}

From 2b0f178fe080d9ee315fef7087a8e92e2c4adafd Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Fri, 16 May 2025 20:35:04 +0700
Subject: [PATCH 541/753] feat: improoved the code

---
 src/react/MainMenu.tsx  | 15 ++++++++++-----
 src/utils/splashText.ts |  7 ++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index e706a3a8..86e2b1ea 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -52,11 +52,16 @@ export default ({
 
   useEffect(() => {
     const loadSplashText = async () => {
-      if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
-        const text = await loadRemoteSplashText(appConfig.splashText)
-        setSplashText(text)
-      } else {
-        setSplashText(appConfig?.splashText || '')
+      try {
+        if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
+          const text = await loadRemoteSplashText(appConfig.splashText)
+          setSplashText(text)
+        } else {
+          setSplashText(appConfig?.splashText || '')
+        }
+      } catch (error) {
+        console.error('Failed to load splash text:', error)
+        setSplashText('Error loading splash text')
       }
     }
     void loadSplashText()
diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
index a46da218..f60b5296 100644
--- a/src/utils/splashText.ts
+++ b/src/utils/splashText.ts
@@ -1,5 +1,5 @@
 const MAX_WORDS = 5
-const HTTPS_REGEX = /^https?:\/\//
+const HTTPS_REGEX = /^https?:\/\/[-\w@:%.+~#=]{1,256}\.[a-zA-Z\d()]{1,6}\b([-\w()@:%+.~#?&/=]*)$/
 
 const limitWords = (text: string): string => {
   const words = text.split(/\s+/)
@@ -19,6 +19,8 @@ export const loadRemoteSplashText = async (url: string): Promise<string> => {
     if (!response.ok) {
       throw new Error(`Failed to fetch splash text: ${response.statusText}`)
     }
+
+    const clonedResponse = response.clone()
     try {
       const json = await response.json()
 
@@ -32,8 +34,7 @@ export const loadRemoteSplashText = async (url: string): Promise<string> => {
 
       return limitWords(String(json))
     } catch (jsonError) {
-
-      const text = await response.text()
+      const text = await clonedResponse.text()
       return limitWords(text.trim())
     }
   } catch (error) {

From f921275c876699500b8a73301623d3eec31a8f15 Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Fri, 16 May 2025 20:44:32 +0700
Subject: [PATCH 542/753] feat: improoved code safety

---
 src/utils/splashText.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
index f60b5296..9ebe157d 100644
--- a/src/utils/splashText.ts
+++ b/src/utils/splashText.ts
@@ -1,12 +1,17 @@
 const MAX_WORDS = 5
 const HTTPS_REGEX = /^https?:\/\/[-\w@:%.+~#=]{1,256}\.[a-zA-Z\d()]{1,6}\b([-\w()@:%+.~#?&/=]*)$/
+const TIMEOUT_MS = 5000
+
+const sanitizeText = (text: string): string => {
+  return text.replaceAll(/<[^>]*>/g, '').replaceAll(/[^\w\s.,!?-]/g, '')
+}
 
 const limitWords = (text: string): string => {
   const words = text.split(/\s+/)
   if (words.length <= MAX_WORDS) {
-    return text
+    return sanitizeText(text)
   }
-  return words.slice(0, MAX_WORDS).join(' ') + '...'
+  return sanitizeText(words.slice(0, MAX_WORDS).join(' ') + '...')
 }
 
 export const isRemoteSplashText = (text: string): boolean => {
@@ -15,7 +20,10 @@ export const isRemoteSplashText = (text: string): boolean => {
 
 export const loadRemoteSplashText = async (url: string): Promise<string> => {
   try {
-    const response = await fetch(url)
+    const controller = new AbortController()
+    const timeoutId = setTimeout(() => controller.abort(), TIMEOUT_MS)
+    const response = await fetch(url, { signal: controller.signal })
+    clearTimeout(timeoutId)
     if (!response.ok) {
       throw new Error(`Failed to fetch splash text: ${response.statusText}`)
     }

From 051cc5b35c8687dc2f0a75f29ef7a4a1a93ffb88 Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Fri, 16 May 2025 22:47:59 +0700
Subject: [PATCH 543/753] fix: optimized splashText working process

---
 config.json             |  1 +
 src/appConfig.ts        |  1 +
 src/react/MainMenu.tsx  | 46 +++++++++++++++++++++++++++------
 src/utils/splashText.ts | 57 ++++++++++++++++++++++++++++++++++++-----
 4 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/config.json b/config.json
index 0515aa40..e45b4052 100644
--- a/config.json
+++ b/config.json
@@ -26,6 +26,7 @@
     }
   ],
   "rightSideText": "A Minecraft client clone in the browser!",
+  "splashTextFallback": "GEN is cooking",
   "splashText": "https://jsonplaceholder.typicode.com/posts/1",
   "pauseLinks": [
     [
diff --git a/src/appConfig.ts b/src/appConfig.ts
index 156c5974..769ef14d 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -24,6 +24,7 @@ export type AppConfig = {
   // hideSettings?: Record<string, boolean>
   allowAutoConnect?: boolean
   splashText?: string
+  splashTextFallback?: string
   pauseLinks?: Array<Array<Record<string, any>>>
   keybindings?: Record<string, any>
   defaultLanguage?: string
diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 86e2b1ea..9f5d5357 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -4,7 +4,15 @@ import { useSnapshot } from 'valtio'
 import { haveDirectoryPicker } from '../utils'
 import { ConnectOptions } from '../connect'
 import { miscUiState } from '../globalState'
-import { isRemoteSplashText, loadRemoteSplashText } from '../utils/splashText'
+import {
+  isRemoteSplashText,
+  loadRemoteSplashText,
+  getDisplayText,
+  cacheSplashText,
+  hasSourceUrlChanged,
+  cacheSourceUrl,
+  clearSplashCache
+} from '../utils/splashText'
 import styles from './mainMenu.module.css'
 import Button from './Button'
 import ButtonWithTooltip from './ButtonWithTooltip'
@@ -48,24 +56,46 @@ export default ({
   singleplayerAvailable = true
 }: Props) => {
   const { appConfig } = useSnapshot(miscUiState)
-  const [splashText, setSplashText] = useState(appConfig?.splashText || '')
+
+  useEffect(() => {
+    if (hasSourceUrlChanged(appConfig?.splashText)) {
+      clearSplashCache()
+      if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
+        cacheSourceUrl(appConfig.splashText)
+      }
+    }
+  }, [appConfig?.splashText])
+
+  const initialSplashText = getDisplayText(appConfig?.splashText, appConfig?.splashTextFallback)
+  const [splashText, setSplashText] = useState(initialSplashText)
+  const [showSplash, setShowSplash] = useState(false)
+
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setShowSplash(true)
+    }, 100)
+    return () => clearTimeout(timer)
+  }, [])
 
   useEffect(() => {
     const loadSplashText = async () => {
       try {
         if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
           const text = await loadRemoteSplashText(appConfig.splashText)
-          setSplashText(text)
-        } else {
-          setSplashText(appConfig?.splashText || '')
+
+          if (text && text.trim() !== '') {
+            setSplashText(text)
+            cacheSplashText(text)
+          }
+        } else if (appConfig?.splashText && !isRemoteSplashText(appConfig.splashText)) {
+          setSplashText(appConfig.splashText)
         }
       } catch (error) {
         console.error('Failed to load splash text:', error)
-        setSplashText('Error loading splash text')
       }
     }
     void loadSplashText()
-  }, [appConfig?.splashText])
+  }, [appConfig?.splashText, appConfig?.splashTextFallback])
 
   if (!bottomRightLinks?.trim()) bottomRightLinks = undefined
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
@@ -112,7 +142,7 @@ export default ({
       <div className={styles['game-title']}>
         <div className={styles.minecraft}>
           <div className={styles.edition} />
-          <span className={styles.splash}>{splashText}</span>
+          {showSplash && <span className={styles.splash}>{splashText}</span>}
         </div>
       </div>
 
diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
index 9ebe157d..2332c22a 100644
--- a/src/utils/splashText.ts
+++ b/src/utils/splashText.ts
@@ -1,17 +1,15 @@
 const MAX_WORDS = 5
 const HTTPS_REGEX = /^https?:\/\/[-\w@:%.+~#=]{1,256}\.[a-zA-Z\d()]{1,6}\b([-\w()@:%+.~#?&/=]*)$/
 const TIMEOUT_MS = 5000
-
-const sanitizeText = (text: string): string => {
-  return text.replaceAll(/<[^>]*>/g, '').replaceAll(/[^\w\s.,!?-]/g, '')
-}
+const SPLASH_CACHE_KEY = 'minecraft_splash_text_cache'
+const SPLASH_URL_KEY = 'minecraft_splash_url'
 
 const limitWords = (text: string): string => {
   const words = text.split(/\s+/)
   if (words.length <= MAX_WORDS) {
-    return sanitizeText(text)
+    return text
   }
-  return sanitizeText(words.slice(0, MAX_WORDS).join(' ') + '...')
+  return words.slice(0, MAX_WORDS).join(' ') + '...'
 }
 
 export const isRemoteSplashText = (text: string): boolean => {
@@ -50,3 +48,50 @@ export const loadRemoteSplashText = async (url: string): Promise<string> => {
     return 'Failed to load splash text!'
   }
 }
+
+export const cacheSourceUrl = (url: string): void => {
+  localStorage.setItem(SPLASH_URL_KEY, url)
+}
+
+export const hasSourceUrlChanged = (newUrl?: string): boolean => {
+  const cachedUrl = localStorage.getItem(SPLASH_URL_KEY)
+
+  if ((!cachedUrl && newUrl) || (cachedUrl && !newUrl)) {
+    return true
+  }
+
+  return cachedUrl !== newUrl
+}
+
+export const clearSplashCache = (): void => {
+  localStorage.removeItem(SPLASH_CACHE_KEY)
+}
+
+export const getCachedSplashText = (): string | null => {
+  return localStorage.getItem(SPLASH_CACHE_KEY)
+}
+
+export const cacheSplashText = (text: string): void => {
+  localStorage.setItem(SPLASH_CACHE_KEY, text)
+}
+
+export const getDisplayText = (splashText?: string, fallbackText?: string): string => {
+  const cachedText = getCachedSplashText()
+
+  if (cachedText) return cachedText
+
+  if (fallbackText) return fallbackText
+
+  if (splashText && isRemoteSplashText(splashText)) return ''
+
+  return splashText || ''
+}
+
+export const getDirectDisplayText = (splashText?: string, fallbackText?: string): string => {
+
+  if (splashText && !isRemoteSplashText(splashText)) return splashText
+
+  if (fallbackText) return fallbackText
+
+  return ''
+}

From ff29fc1fc53acfce5c42ac9b25b1297c5bbabf36 Mon Sep 17 00:00:00 2001
From: Maksim Grigorev <gmi1987@gmail.com>
Date: Fri, 16 May 2025 19:50:38 +0300
Subject: [PATCH 544/753] feat: Credits modal (#354)

---
 src/react/CreditsAboutModal.module.css      | 84 +++++++++++++++++++++
 src/react/CreditsAboutModal.module.css.d.ts | 18 +++++
 src/react/CreditsAboutModal.tsx             | 57 ++++++++++++++
 src/react/CreditsBookButton.module.css      | 27 +++++++
 src/react/CreditsBookButton.module.css.d.ts |  7 ++
 src/react/CreditsBookButton.tsx             | 22 ++++++
 src/react/MainMenu.tsx                      |  6 +-
 src/reactUi.tsx                             |  3 +-
 8 files changed, 221 insertions(+), 3 deletions(-)
 create mode 100644 src/react/CreditsAboutModal.module.css
 create mode 100644 src/react/CreditsAboutModal.module.css.d.ts
 create mode 100644 src/react/CreditsAboutModal.tsx
 create mode 100644 src/react/CreditsBookButton.module.css
 create mode 100644 src/react/CreditsBookButton.module.css.d.ts
 create mode 100644 src/react/CreditsBookButton.tsx

diff --git a/src/react/CreditsAboutModal.module.css b/src/react/CreditsAboutModal.module.css
new file mode 100644
index 00000000..753d0448
--- /dev/null
+++ b/src/react/CreditsAboutModal.module.css
@@ -0,0 +1,84 @@
+.modalScreen {
+  margin-top: -15px;
+}
+
+.container {
+  position: relative;
+  background-color: #eee0c3;
+  border: 5px solid #7A5C3E;
+  padding: 15px;
+  width: 80%;
+  margin: 0 auto;
+  color: #3F2A14;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
+  max-height: 70vh;
+  overflow-y: auto;
+}
+
+.title {
+  text-align: center;
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: 10px;
+}
+
+.contentWrapper {
+  margin-bottom: 5px;
+}
+
+.subtitle {
+  font-size: 6px;
+  margin-bottom: 4px;
+  font-style: italic;
+}
+
+.paragraph {
+  font-size: 6px;
+  margin-bottom: 4px;
+}
+
+.list {
+  list-style-type: none;
+  padding: 0;
+  font-size: 6px;
+}
+
+.listItem {
+  margin-bottom: 2px;
+}
+
+.link {
+  color: #0000AA;
+  text-decoration: none;
+}
+
+.sectionTitle {
+  margin-top: 7px;
+  margin-bottom: 5px;
+  font-size: 8px;
+}
+
+.closeButton {
+  position: absolute;
+  top: 1px;
+  right: 1px;
+  display: flex;
+  justify-content: center;
+  cursor: pointer;
+  padding: 5px;
+  background: none;
+  border: none;
+  outline: none;
+}
+
+.closeButton:hover {
+  opacity: 0.8;
+}
+
+.closeButton:focus-visible {
+  outline: 1px dashed #7A5C3E;
+}
+
+.closeIcon {
+  color: #3F2A14;
+} 
\ No newline at end of file
diff --git a/src/react/CreditsAboutModal.module.css.d.ts b/src/react/CreditsAboutModal.module.css.d.ts
new file mode 100644
index 00000000..30ac3261
--- /dev/null
+++ b/src/react/CreditsAboutModal.module.css.d.ts
@@ -0,0 +1,18 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  closeButton: string;
+  closeIcon: string;
+  container: string;
+  contentWrapper: string;
+  link: string;
+  list: string;
+  listItem: string;
+  modalScreen: string;
+  paragraph: string;
+  sectionTitle: string;
+  subtitle: string;
+  title: string;
+}
+declare const cssExports: CssExports;
+export default cssExports;
diff --git a/src/react/CreditsAboutModal.tsx b/src/react/CreditsAboutModal.tsx
new file mode 100644
index 00000000..24826cd3
--- /dev/null
+++ b/src/react/CreditsAboutModal.tsx
@@ -0,0 +1,57 @@
+import { hideCurrentModal } from '../globalState'
+import { useIsModalActive } from './utilsApp'
+import Screen from './Screen'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+import styles from './CreditsAboutModal.module.css'
+
+export default () => {
+  const isModalActive = useIsModalActive('credits-about')
+
+  if (!isModalActive) return null
+
+  return (
+    <Screen
+      title=""
+      backdrop
+      className={styles.modalScreen}>
+      <div className={styles.container}>
+        <h2 className={styles.title}>Minecraft Open Source JS Edition</h2>
+
+        <div className={styles.contentWrapper}>
+          <small className={styles.subtitle}><i>What if Minecraft was an online game?</i></small>
+          <p className={styles.paragraph}>
+            Hey! You are on the safest modern Minecraft clone rewritten in JavaScript. A huge amount of work has gone into this project to make it fast and complete, and many features would not be possible without these awesome people and projects:
+          </p>
+          <ul className={styles.list}>
+            <li className={styles.listItem}>- Everyone who provided awesome mods for the game</li>
+            <li className={styles.listItem}>- <span><a className={styles.link} href="https://discord.com/users/gen6442" target="_blank" rel="noopener noreferrer">[Gen]</a></span> for rewriting the physics engine to be Grim-compliant</li>
+            <li className={styles.listItem}>- <span><a className={styles.link} href="https://viaversion.com/" target="_blank" rel="noopener noreferrer">[ViaVersion]</a></span> for providing reliable sound id mappings</li>
+            <li className={styles.listItem}>- <span><a className={styles.link} href="https://github.com/BlueMap-Minecraft/BlueMap" target="_blank" rel="noopener noreferrer">[Bluemap]</a></span> for providing block entity models like chest</li>
+            <li className={styles.listItem}>- <span><a className={styles.link} href="https://github.com/misode/deepslate" target="_blank" rel="noopener noreferrer">[Deepslate]</a></span> for rendering 3d blocks in GUI (inventory)</li>
+            <li className={styles.listItem}>- <span><a className={styles.link} href="https://www.npmjs.com/package/skinview3d" target="_blank" rel="noopener noreferrer">[skinview3d]</a></span> for rendering skins & player geometry</li>
+            <li className={styles.listItem}>- <span><a className={styles.link} href="https://github.com/atxi/Polymer" target="_blank" rel="noopener noreferrer">[Polymer]</a></span> (c++ project) for providing fast & accurate server light implementation</li>
+          </ul>
+
+          <h3 className={styles.sectionTitle}>Current contributors:</h3>
+          <ul className={styles.list}>
+            <li className={styles.listItem}>- <span className={styles.link}><a className={styles.link} href="https://github.com/mgDentist" target="_blank" rel="noopener noreferrer">Maxim Grigorev</a></span> - React UI & Core Developer Maintainer</li>
+            <li className={styles.listItem}>- And many more community contributors!</li>
+          </ul>
+
+          <button
+            className={styles.closeButton}
+            onClick={() => hideCurrentModal()}
+            aria-label="Close"
+            type="button"
+          >
+            <PixelartIcon
+              iconName={pixelartIcons.close}
+              width={12}
+              className={styles.closeIcon}
+            />
+          </button>
+        </div>
+      </div>
+    </Screen>
+  )
+}
diff --git a/src/react/CreditsBookButton.module.css b/src/react/CreditsBookButton.module.css
new file mode 100644
index 00000000..83af5d80
--- /dev/null
+++ b/src/react/CreditsBookButton.module.css
@@ -0,0 +1,27 @@
+.creditsButton {
+  position: absolute;
+  top: 1px;
+  right: -30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: none;
+  border: none;
+  cursor: pointer;
+  color: white;
+  opacity: 1;
+  transition: opacity 0.2s ease;
+}
+
+.creditsButton:hover {
+  opacity: 0.9;
+}
+
+.creditsButton:focus:not(:hover) {
+  outline: 1px solid #fff;
+}
+
+.creditsButton svg {
+  width: 15px;
+  height: 15px;
+}
diff --git a/src/react/CreditsBookButton.module.css.d.ts b/src/react/CreditsBookButton.module.css.d.ts
new file mode 100644
index 00000000..72f94435
--- /dev/null
+++ b/src/react/CreditsBookButton.module.css.d.ts
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  creditsButton: string;
+}
+declare const cssExports: CssExports;
+export default cssExports;
diff --git a/src/react/CreditsBookButton.tsx b/src/react/CreditsBookButton.tsx
new file mode 100644
index 00000000..a3be740f
--- /dev/null
+++ b/src/react/CreditsBookButton.tsx
@@ -0,0 +1,22 @@
+import { showModal } from '../globalState'
+import styles from './CreditsBookButton.module.css'
+
+export default () => {
+  const handleClick = () => {
+    showModal({ reactType: 'credits-about' })
+  }
+
+  return (
+    <button
+      className={styles.creditsButton}
+      onClick={handleClick}
+      aria-label="Credits"
+      title="Credits"
+    >
+      <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <path d="M15.4375 15.1238L15.625 15.3113V16.8113L15.4375 16.9988H14.6875L14.5 16.8113V16.4363L14.3125 16.2488H12.8125L12.625 16.0613V15.3113L12.4375 15.1238H10.9375L10.75 14.9363V14.1863L10.5625 13.9988H7.9375L7.75 14.1863V14.9363L7.5625 15.1238H6.0625L5.875 15.3113V16.0613L5.6875 16.2488H4.1875L4 16.4363V16.8113L3.8125 16.9988H3.0625L2.875 16.8113V15.3113L3.0625 15.1238H3.4375L3.625 14.9363V13.8113L3.8125 13.6238H4.1875L4.375 13.4363V11.9363L4.5625 11.7488H4.9375L5.125 11.5613V10.0613L4.9375 9.87384H4.1875L4 9.68634V8.93634L3.8125 8.74884H2.6875L2.5 8.56134V7.81134L2.3125 7.62384H1.1875L1 7.43634V6.68634L1.1875 6.49884H6.63738L6.82488 6.31134V5.61543V4.60586L7.01238 4.41836H7.5625L7.75 4.23086V2.6875L7.9375 2.5H8.43022L8.61772 2.3125V1.1875L8.80522 1H9.66735L9.85485 1.1875V2.3125L10.0424 2.5H10.5625L10.75 2.6875V4.23086L10.9375 4.41836H11.4375L11.625 4.60586V6.31134L11.8125 6.49884H17.3125L17.5 6.68634V7.43634L17.3125 7.62384H16.1875L16 7.81134V8.56134L15.8125 8.74884H14.6875L14.5 8.93634V9.68634L14.3125 9.87384H13.5625L13.375 10.0613V11.5613L13.5625 11.7488H13.9375L14.125 11.9363V13.4363L14.3125 13.6238H14.6875L14.875 13.8113V14.9363L15.0625 15.1238H15.4375Z" fill="#FFD700" />
+      </svg>
+
+    </button>
+  )
+}
diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 7ed257c0..40751b72 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -10,6 +10,7 @@ import ButtonWithTooltip from './ButtonWithTooltip'
 import { pixelartIcons } from './PixelartIcon'
 import useLongPress from './useLongPress'
 import PauseLinkButtons from './PauseLinkButtons'
+import CreditsBookButton from './CreditsBookButton'
 
 type Action = (e: React.MouseEvent<HTMLButtonElement>) => void
 
@@ -44,7 +45,7 @@ export default ({
   versionTitle,
   onVersionStatusClick,
   bottomRightLinks,
-  singleplayerAvailable = true
+  singleplayerAvailable = true,
 }: Props) => {
   const { appConfig } = useSnapshot(miscUiState)
 
@@ -75,7 +76,7 @@ export default ({
   const connectToServerLongPress = useLongPress(
     () => {
       if (process.env.NODE_ENV === 'development') {
-      // Connect to <origin>:25565
+        // Connect to <origin>:25565
         const origin = window.location.hostname
         const connectOptions: ConnectOptions = {
           server: `${origin}:25565`,
@@ -149,6 +150,7 @@ export default ({
         <div className={styles['menu-row']}>
           <PauseLinkButtons />
         </div>
+        <CreditsBookButton />
       </div>
 
       <div className={styles['bottom-info']}>
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index c91c37d6..4409c10a 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -61,6 +61,7 @@ import ControDebug from './react/ControDebug'
 import ChunksDebug from './react/ChunksDebug'
 import ChunksDebugScreen from './react/ChunksDebugScreen'
 import DebugResponseTimeIndicator from './react/debugs/DebugResponseTimeIndicator'
+import CreditsAboutModal from './react/CreditsAboutModal'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -239,7 +240,7 @@ const App = () => {
             <ModsPage />
 
             <SelectOption />
-
+            <CreditsAboutModal />
             <NoModalFoundProvider />
           </RobustPortal>
           <RobustPortal to={document.body}>

From 42f973e05728b028946dc2d8e1ceab97147ee049 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 17 May 2025 05:33:31 +0300
Subject: [PATCH 545/753] Update config.json

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index e45b4052..c1589ef9 100644
--- a/config.json
+++ b/config.json
@@ -26,7 +26,7 @@
     }
   ],
   "rightSideText": "A Minecraft client clone in the browser!",
-  "splashTextFallback": "GEN is cooking",
+  "splashTextFallback": "Welcome!",
   "splashText": "https://jsonplaceholder.typicode.com/posts/1",
   "pauseLinks": [
     [

From a9b94ec897607b66491a8c2a40be41c761340209 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 17 May 2025 06:58:33 +0300
Subject: [PATCH 546/753] fix: fix sneaking didnt work with water

---
 package.json   |  2 +-
 pnpm-lock.yaml | 46 ++++++++++++++++++++--------------------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index 2388d508..4d07ffe7 100644
--- a/package.json
+++ b/package.json
@@ -194,7 +194,7 @@
   },
   "pnpm": {
     "overrides": {
-      "@nxg-org/mineflayer-physics-util": "1.8.7",
+      "@nxg-org/mineflayer-physics-util": "1.8.8",
       "buffer": "^6.0.3",
       "vec3": "0.1.10",
       "three": "0.154.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7da635c6..150468f3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,7 +5,7 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
-  '@nxg-org/mineflayer-physics-util': 1.8.7
+  '@nxg-org/mineflayer-physics-util': 1.8.8
   buffer: ^6.0.3
   vec3: 0.1.10
   three: 0.154.0
@@ -347,7 +347,7 @@ importers:
         version: 0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
       mineflayer-pathfinder:
         specifier: ^2.4.4
-        version: 2.4.5(prismarine-registry@1.11.0)
+        version: 2.4.5
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -432,13 +432,13 @@ importers:
         version: 1.3.9
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
         version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-schematic:
         specifier: ^1.2.0
-        version: 1.2.3(prismarine-registry@1.11.0)
+        version: 1.2.3
       process:
         specifier: ^0.11.10
         version: 0.11.10
@@ -2022,8 +2022,8 @@ packages:
   '@nxg-org/mineflayer-auto-jump@0.7.17':
     resolution: {integrity: sha512-AgIiJcyh9y8bZjwNHZ2Wp/mbC6+XfE8cM/nOLcZaQYLdoUgncUeaNinFTYLvwi1RMQ42S5bxvwI9kKUwjRhlDA==}
 
-  '@nxg-org/mineflayer-physics-util@1.8.7':
-    resolution: {integrity: sha512-wtLYvHqoEFr/j0ny2lyogwjbMvwpFuG2aWI8sI14+EAiGFRpL5+cog2ujSDsnRTZruO7tUXMTiPc1kebjXwfJg==}
+  '@nxg-org/mineflayer-physics-util@1.8.8':
+    resolution: {integrity: sha512-u7CiKCroGrxtqGpIVWKo40GsE7aLc2cH1lvCDBW+Y/V4h1SaCDXzYBOADUKMeOemFss90au/AOGtkahezaoF8A==}
 
   '@nxg-org/mineflayer-tracker@1.2.1':
     resolution: {integrity: sha512-SI1ffF8zvg3/ZNE021Ja2W0FZPN+WbQDZf8yFqOcXtPRXAtM9W6HvoACdzXep8BZid7WYgYLIgjKpB+9RqvCNQ==}
@@ -11370,10 +11370,10 @@ snapshots:
 
   '@nxg-org/mineflayer-auto-jump@0.7.17':
     dependencies:
-      '@nxg-org/mineflayer-physics-util': 1.8.7
+      '@nxg-org/mineflayer-physics-util': 1.8.8
       strict-event-emitter-types: 2.0.0
 
-  '@nxg-org/mineflayer-physics-util@1.8.7':
+  '@nxg-org/mineflayer-physics-util@1.8.8':
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
 
@@ -11390,7 +11390,7 @@ snapshots:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.83.1
       mineflayer: 4.27.0(encoding@0.1.13)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.16.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
@@ -17428,24 +17428,22 @@ snapshots:
       - tsx
       - yaml
 
-  mineflayer-pathfinder@2.4.5(prismarine-registry@1.11.0):
+  mineflayer-pathfinder@2.4.5:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
-    transitivePeerDependencies:
-      - prismarine-registry
 
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
@@ -17465,11 +17463,11 @@ snapshots:
 
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13):
     dependencies:
-      '@nxg-org/mineflayer-physics-util': 1.8.7
+      '@nxg-org/mineflayer-physics-util': 1.8.8
       minecraft-data: 3.83.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-entity: 2.5.0
@@ -18262,7 +18260,7 @@ snapshots:
       minecraft-data: 3.83.1
       prismarine-registry: 1.11.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0):
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
     dependencies:
       minecraft-data: 3.83.1
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
@@ -18270,8 +18268,6 @@ snapshots:
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
-    transitivePeerDependencies:
-      - prismarine-registry
 
   prismarine-chat@1.11.0:
     dependencies:
@@ -18282,7 +18278,7 @@ snapshots:
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
@@ -18316,7 +18312,7 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -18340,18 +18336,16 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
 
-  prismarine-schematic@1.2.3(prismarine-registry@1.11.0):
+  prismarine-schematic@1.2.3:
     dependencies:
       minecraft-data: 3.83.1
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.10
-    transitivePeerDependencies:
-      - prismarine-registry
 
   prismarine-windows@2.9.0:
     dependencies:

From 785ab490f2fe76bcdd760dac046baa014c09b529 Mon Sep 17 00:00:00 2001
From: gguio <109200692+gguio@users.noreply.github.com>
Date: Sun, 18 May 2025 10:58:52 +0400
Subject: [PATCH 547/753] fix: restore minimal and full map (#348)

Co-authored-by: gguio <nikvish150@gmail.com>
---
 renderer/viewer/baseGraphicsBackend.ts     |  3 +-
 renderer/viewer/lib/mesher/mesher.ts       | 23 +++++++++++++
 renderer/viewer/lib/mesher/models.ts       |  6 ++--
 renderer/viewer/lib/mesher/shared.ts       | 11 +++++-
 renderer/viewer/lib/worldrendererCommon.ts | 33 ++++++++++++------
 src/appViewer.ts                           |  5 +--
 src/index.ts                               |  2 +-
 src/react/Minimap.tsx                      |  3 +-
 src/react/MinimapProvider.tsx              | 39 +++++++++++-----------
 9 files changed, 85 insertions(+), 40 deletions(-)

diff --git a/renderer/viewer/baseGraphicsBackend.ts b/renderer/viewer/baseGraphicsBackend.ts
index 79607695..4724076a 100644
--- a/renderer/viewer/baseGraphicsBackend.ts
+++ b/renderer/viewer/baseGraphicsBackend.ts
@@ -3,7 +3,8 @@ import { RendererReactiveState } from '../../src/appViewer'
 export const getDefaultRendererState = (): RendererReactiveState => {
   return {
     world: {
-      chunksLoaded: [],
+      chunksLoaded: new Set(),
+      heightmaps: new Map(),
       chunksTotalNumber: 0,
       allChunksLoaded: true,
       mesherWork: false,
diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index 21e2d8ef..66621f22 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -148,6 +148,29 @@ const handleMessage = data => {
       global.postMessage({ type: 'customBlockModel', chunkKey, customBlockModel })
       break
     }
+    case 'getHeightmap': {
+      const heightmap = new Uint8Array(256)
+
+      const blockPos = new Vec3(0, 0, 0)
+      for (let z = 0; z < 16; z++) {
+        for (let x = 0; x < 16; x++) {
+          const blockX = x + data.x
+          const blockZ = z + data.z
+          blockPos.x = blockX; blockPos.z = blockZ
+          blockPos.y = 256
+          let block = world.getBlock(blockPos)
+          while (block?.name.includes('air')) {
+            blockPos.y -= 1
+            block = world.getBlock(blockPos)
+          }
+          const index = z * 16 + x
+          heightmap[index] = block ? blockPos.y : 0
+        }
+      }
+      postMessage({ type: 'heightmap', key: `${Math.floor(data.x / 16)},${Math.floor(data.z / 16)}`, heightmap })
+
+      break
+    }
   // No default
   }
 }
diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index 802ecaf0..3658d120 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -510,7 +510,7 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
     heads: {},
     signs: {},
     // isFull: true,
-    highestBlocks: {},
+    highestBlocks: new Map(),
     hadErrors: false,
     blocksCount: 0
   }
@@ -521,9 +521,9 @@ export function getSectionGeometry (sx, sy, sz, world: World) {
       for (cursor.x = sx; cursor.x < sx + 16; cursor.x++) {
         let block = world.getBlock(cursor, blockProvider, attr)!
         if (!INVISIBLE_BLOCKS.has(block.name)) {
-          const highest = attr.highestBlocks[`${cursor.x},${cursor.z}`]
+          const highest = attr.highestBlocks.get(`${cursor.x},${cursor.z}`)
           if (!highest || highest.y < cursor.y) {
-            attr.highestBlocks[`${cursor.x},${cursor.z}`] = { y: cursor.y, stateId: block.stateId, biomeId: block.biome.id }
+            attr.highestBlocks.set(`${cursor.x},${cursor.z}`, { y: cursor.y, stateId: block.stateId, biomeId: block.biome.id })
           }
         }
         if (INVISIBLE_BLOCKS.has(block.name)) continue
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index eb1346f4..16b89a71 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -40,12 +40,21 @@ export type MesherGeometryOutput = {
   heads: Record<string, any>,
   signs: Record<string, any>,
   // isFull: boolean
-  highestBlocks: Record<string, HighestBlockInfo>
+  highestBlocks: Map<string, HighestBlockInfo>
   hadErrors: boolean
   blocksCount: number
   customBlockModels?: CustomBlockModels
 }
 
+export interface MesherMainEvents {
+  geometry: { type: 'geometry'; key: string; geometry: MesherGeometryOutput; workerIndex: number };
+  sectionFinished: { type: 'sectionFinished'; key: string; workerIndex: number; processTime?: number };
+  blockStateModelInfo: { type: 'blockStateModelInfo'; info: Record<string, BlockStateModelInfo> };
+  heightmap: { type: 'heightmap'; key: string; heightmap: Uint8Array };
+}
+
+export type MesherMainEvent = MesherMainEvents[keyof MesherMainEvents]
+
 export type HighestBlockInfo = { y: number, stateId: number | undefined, biomeId: number | undefined }
 
 export type BlockStateModelInfo = {
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 516e4264..ef82f7af 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -14,7 +14,7 @@ import { ResourcesManager } from '../../../src/resourcesManager'
 import { DisplayWorldOptions, GraphicsInitOptions, RendererReactiveState } from '../../../src/appViewer'
 import { SoundSystem } from '../three/threeJsSound'
 import { buildCleanupDecorator } from './cleanupDecorator'
-import { HighestBlockInfo, MesherGeometryOutput, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig } from './mesher/shared'
+import { HighestBlockInfo, MesherGeometryOutput, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig, MesherMainEvent } from './mesher/shared'
 import { chunkPos } from './simpleUtils'
 import { addNewStat, removeAllStats, removeStat, updatePanesVisibility, updateStatText } from './ui/newStats'
 import { WorldDataEmitter } from './worldDataEmitter'
@@ -85,6 +85,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     dirty (pos: Vec3, value: boolean): void
     update (/* pos: Vec3, value: boolean */): void
     chunkFinished (key: string): void
+    heightmap (key: string, heightmap: Uint8Array): void
   }>
   customTexturesDataUrl = undefined as string | undefined
   workers: any[] = []
@@ -103,8 +104,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   ONMESSAGE_TIME_LIMIT = 30 // ms
 
   handleResize = () => { }
-  highestBlocksByChunks = {} as Record<string, { [chunkKey: string]: HighestBlockInfo }>
-  highestBlocksBySections = {} as Record<string, { [sectionKey: string]: HighestBlockInfo }>
+  highestBlocksByChunks = new Map<string, { [chunkKey: string]: HighestBlockInfo }>()
+  highestBlocksBySections = new Map<string, { [sectionKey: string]: HighestBlockInfo }>()
   blockEntities = {}
 
   workersProcessAverageTime = 0
@@ -247,7 +248,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   async getHighestBlocks (chunkKey: string) {
-    return this.highestBlocksByChunks[chunkKey]
+    return this.highestBlocksByChunks.get(chunkKey)
   }
 
   updateCustomBlock (chunkKey: string, blockPos: string, model: string) {
@@ -365,19 +366,20 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.isProcessingQueue = false
   }
 
-  handleMessage (data) {
+  handleMessage (rawData: any) {
+    const data = rawData as MesherMainEvent
     if (!this.active) return
     this.mesherLogReader?.workerMessageReceived(data.type, data)
     if (data.type !== 'geometry' || !this.debugStopGeometryUpdate) {
       const start = performance.now()
-      this.handleWorkerMessage(data)
+      this.handleWorkerMessage(data as WorkerReceive)
       this.workerCustomHandleTime += performance.now() - start
     }
     if (data.type === 'geometry') {
       this.logWorkerWork(() => `-> ${data.workerIndex} geometry ${data.key} ${JSON.stringify({ dataSize: JSON.stringify(data).length })}`)
       this.geometryReceiveCount[data.workerIndex] ??= 0
       this.geometryReceiveCount[data.workerIndex]++
-      const geometry = data.geometry as MesherGeometryOutput
+      const { geometry } = data
       this.highestBlocksBySections[data.key] = geometry.highestBlocks
       const chunkCoords = data.key.split(',').map(Number)
       this.lastChunkDistance = Math.max(...this.getDistance(new Vec3(chunkCoords[0], 0, chunkCoords[2])))
@@ -404,6 +406,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         if (loaded) {
           // CHUNK FINISHED
           this.finishedChunks[chunkKey] = true
+          this.reactiveState.world.chunksLoaded.add(`${Math.floor(chunkCoords[0] / 16)},${Math.floor(chunkCoords[2] / 16)}`)
           this.renderUpdateEmitter.emit(`chunkFinished`, `${chunkCoords[0]},${chunkCoords[2]}`)
           this.checkAllFinished()
           // merge highest blocks by sections into highest blocks by chunks
@@ -442,6 +445,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         this.blockStateModelInfo.set(cacheKey, info)
       }
     }
+
+    if (data.type === 'heightmap') {
+      appViewer.rendererState.world.heightmaps.set(data.key, new Uint8Array(data.heightmap))
+    }
   }
 
   downloadMesherLog () {
@@ -599,7 +606,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   updateChunksStats () {
     const loadedChunks = Object.keys(this.finishedChunks)
-    this.displayOptions.nonReactiveState.world.chunksLoaded = loadedChunks
+    this.displayOptions.nonReactiveState.world.chunksLoaded = new Set(loadedChunks)
     this.displayOptions.nonReactiveState.world.chunksTotalNumber = this.chunksLength
     this.reactiveState.world.allChunksLoaded = this.allChunksFinished
 
@@ -628,6 +635,11 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         customBlockModels: customBlockModels || undefined
       })
     }
+    this.workers[0].postMessage({
+      type: 'getHeightmap',
+      x,
+      z,
+    })
     this.logWorkerWork(() => `-> chunk ${JSON.stringify({ x, z, chunkLength: chunk.length, customBlockModelsLength: customBlockModels ? Object.keys(customBlockModels).length : 0 })}`)
     this.mesherLogReader?.chunkReceived(x, z, chunk.length)
     for (let y = this.worldMinYRender; y < this.worldSizeParams.worldHeight; y += 16) {
@@ -664,9 +676,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     for (let y = this.worldSizeParams.minY; y < this.worldSizeParams.worldHeight; y += 16) {
       this.setSectionDirty(new Vec3(x, y, z), false)
       delete this.finishedSections[`${x},${y},${z}`]
-      delete this.highestBlocksBySections[`${x},${y},${z}`]
+      this.highestBlocksBySections.delete(`${x},${y},${z}`)
     }
-    delete this.highestBlocksByChunks[`${x},${z}`]
+    this.highestBlocksByChunks.delete(`${x},${z}`)
 
     this.updateChunksStats()
 
@@ -992,7 +1004,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.active = false
 
     this.renderUpdateEmitter.removeAllListeners()
-    this.displayOptions.worldView.removeAllListeners() // todo
     this.abortController.abort()
     removeAllStats()
   }
diff --git a/src/appViewer.ts b/src/appViewer.ts
index ca62bd1b..90ca847f 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -17,7 +17,8 @@ import { watchOptionsAfterWorldViewInit } from './watchOptions'
 
 export interface RendererReactiveState {
   world: {
-    chunksLoaded: string[]
+    chunksLoaded: Set<string>
+    heightmaps: Map<string, Uint8Array>
     chunksTotalNumber: number
     allChunksLoaded: boolean
     mesherWork: boolean
@@ -28,7 +29,7 @@ export interface RendererReactiveState {
 }
 export interface NonReactiveState {
   world: {
-    chunksLoaded: string[]
+    chunksLoaded: Set<string>
     chunksTotalNumber: number
     allChunksLoaded: boolean
     mesherWork: boolean
diff --git a/src/index.ts b/src/index.ts
index afa349fa..bea10726 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -708,7 +708,7 @@ export async function connect (connectOptions: ConnectOptions) {
           resolve()
           unsub()
         } else {
-          const perc = Math.round(appViewer.rendererState.world.chunksLoaded.length / appViewer.rendererState.world.chunksTotalNumber * 100)
+          const perc = Math.round(appViewer.rendererState.world.chunksLoaded.size / appViewer.rendererState.world.chunksTotalNumber * 100)
           progress?.reportProgress('chunks', perc / 100)
         }
       })
diff --git a/src/react/Minimap.tsx b/src/react/Minimap.tsx
index 10c2b666..25ee59ed 100644
--- a/src/react/Minimap.tsx
+++ b/src/react/Minimap.tsx
@@ -85,6 +85,7 @@ export default (
           top: '0px',
           padding: '5px 5px 0px 0px',
           textAlign: 'center',
+          zIndex: 7,
         }}
         onClick={() => {
           toggleFullMap?.()
@@ -106,7 +107,7 @@ export default (
             textShadow: '0.1em 0 black, 0 0.1em black, -0.1em 0 black, 0 -0.1em black, -0.1em -0.1em black, -0.1em 0.1em black, 0.1em -0.1em black, 0.1em 0.1em black'
           }}
         >
-          {position.x.toFixed(2)} {position.y.toFixed(2)} {position.z.toFixed(2)}
+          {Math.round(position.x)} {Math.round(position.y)} {Math.round(position.z)}
         </div>
       </div> : null
 }
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
index 6e7e01ff..afb6a198 100644
--- a/src/react/MinimapProvider.tsx
+++ b/src/react/MinimapProvider.tsx
@@ -10,7 +10,7 @@ import { Chunk } from 'prismarine-world/types/world'
 import { Block } from 'prismarine-block'
 import { INVISIBLE_BLOCKS } from 'renderer/viewer/lib/mesher/worldConstants'
 import { getRenamedData } from 'flying-squid/dist/blockRenames'
-import { useSnapshot } from 'valtio'
+import { useSnapshot, subscribe } from 'valtio'
 import { subscribeKey } from 'valtio/utils'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import BlockData from '../../renderer/viewer/lib/moreBlockDataGenerated.json'
@@ -42,7 +42,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
   yaw: number
   world: string
   warps: WorldWarp[] = gameAdditionalState.warps
-  chunksStore = new Map<string, undefined | null | 'requested' | ChunkInfo >()
+  chunksStore = new Map<string, undefined | null | 'requested' | ChunkInfo>()
   loadingChunksQueue = new Set<string>()
   loadChunk: (key: string) => Promise<void> = this.loadChunkMinimap
   mapDrawer = new MinimapDrawer(this.loadChunk, this.warps, this.loadingChunksQueue, this.chunksStore)
@@ -119,9 +119,9 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
       this.blockData.set(renamedKey, BlockData.colors[blockKey])
     }
 
-    subscribeKey(appViewer.rendererState, 'world', () => {
+    subscribe(appViewer.rendererState.world, () => {
       for (const key of this.loadingChunksQueue) {
-        if (appViewer.rendererState.world.chunksLoaded.includes(key)) {
+        if (appViewer.rendererState.world.chunksLoaded.has(key)) {
           this.loadingChunksQueue.delete(key)
           void this.loadChunk(key)
         }
@@ -205,33 +205,31 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     const [chunkX, chunkZ] = key.split(',').map(Number)
     const chunkWorldX = chunkX * 16
     const chunkWorldZ = chunkZ * 16
-    if (appViewer.rendererState.world.chunksLoaded.includes(`${chunkWorldX},${chunkWorldZ}`)) {
-      const highestBlocks = await getThreeJsRendererMethods()?.getHighestBlocks(`${chunkWorldX},${chunkWorldZ}`)
-      if (!highestBlocks) return undefined
-      const heightmap = new Uint8Array(256)
+    if (appViewer.rendererState.world.chunksLoaded.has(key)) {
+      // console.log('[MinimapProvider] loading chunk for minimap', key)
+      const heightmap = appViewer.rendererState.world.heightmaps.get(key)
+      if (heightmap) {
+        // console.log('[MinimapProvider] did get highest blocks')
+      } else {
+        console.warn('[MinimapProvider] no highestBlocks from renderMethods')
+        return undefined
+      }
       const colors = Array.from({ length: 256 }).fill('') as string[]
       // avoid creating new object every time
       const blockPos = new Vec3(0, 0, 0)
-      // filling up colors and heightmap
+      // filling up colors
       for (let z = 0; z < 16; z += 1) {
         for (let x = 0; x < 16; x += 1) {
           const blockX = chunkWorldX + x
           const blockZ = chunkWorldZ + z
-          const hBlock = highestBlocks[`${blockX},${blockZ}`]
-          blockPos.x = blockX; blockPos.z = blockZ; blockPos.y = hBlock?.y ?? 0
-          let block = bot.world.getBlock(blockPos)
-          while (block?.name.includes('air')) {
-            blockPos.y -= 1
-            block = bot.world.getBlock(blockPos)
-          }
           const index = z * 16 + x
+          blockPos.x = blockX; blockPos.z = blockZ; blockPos.y = heightmap[index]
+          const block = bot.world.getBlock(blockPos)
           // blocks which are not set are shown as half transparent
-          if (!block || !hBlock) {
-            heightmap[index] = 0
+          if (!block) {
             colors[index] = 'rgba(0, 0, 0, 0.5)'
             continue
           }
-          heightmap[index] = block.position.y
           colors[index] = this.setColor(block)
         }
       }
@@ -242,6 +240,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     } else {
       this.loadingChunksQueue.add(`${chunkX},${chunkZ}`)
       this.chunksStore.set(key, 'requested')
+      // console.log('[MinimapProvider] requested new chunk', key)
     }
   }
 
@@ -339,7 +338,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
     const chunkWorldX = chunkX * 16
     const chunkWorldZ = chunkZ * 16
     const highestBlocks = await getThreeJsRendererMethods()?.getHighestBlocks(`${chunkWorldX},${chunkWorldZ}`)
-    if (appViewer.rendererState.world.chunksLoaded.includes(`${chunkWorldX},${chunkWorldZ}`)) {
+    if (appViewer.rendererState.world.chunksLoaded.has(`${chunkWorldX},${chunkWorldZ}`)) {
       const heightmap = new Uint8Array(256)
       const colors = Array.from({ length: 256 }).fill('') as string[]
       if (!highestBlocks) return null

From a5d16a75ef1727164568627e5632b9593d2c714e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 00:16:18 +0300
Subject: [PATCH 548/753] fix(regression): hotbar on mobile was broken

---
 src/react/HotbarRenderApp.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index 039f283f..6e91180d 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -80,6 +80,9 @@ const HotbarInner = () => {
     const controller = new AbortController()
 
     const inv = openItemsCanvas('HotbarWin', {
+      _client: {
+        write () {}
+      },
       clickWindow (slot, mouseButton, mode) {
         if (mouseButton === 1) {
           console.log('right click')

From 2dc811b2a14961b029872e5f56e56af0ca4442da Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 00:23:20 +0300
Subject: [PATCH 549/753] adjust settings visually

---
 README.MD                 |  1 +
 src/optionsGuiScheme.tsx  | 31 ++++++++++++++++---------------
 src/react/DeathScreen.tsx |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/README.MD b/README.MD
index aa36f7e8..4769192a 100644
--- a/README.MD
+++ b/README.MD
@@ -34,6 +34,7 @@ All components that are in [Storybook](https://mcraft.fun/storybook) are publish
 
 - Controls -> **Touch Controls Type** -> **Joystick**
 - Controls -> **Auto Full Screen** -> **On** - To avoid ctrl+w issue
+- Interface -> **Enable Minimap** -> **Always** - To enable useful minimap (why not?)
 - Controls -> **Raw Input** -> **On** - This will make the controls more precise (UPD: already enabled by default)
 - Interface -> **Chat Select** -> **On** - To select chat messages (UPD: already enabled by default)
 
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index d4be46f6..ede367f5 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -90,8 +90,7 @@ export const guiOptionsScheme: {
       },
       lowMemoryMode: {
         text: 'Low Memory Mode',
-        enableWarning: 'Enabling it will make chunks load ~4x slower',
-        disabledDuringGame: true
+        enableWarning: 'Enabling it will make chunks load ~4x slower. When in the game, app needs to be reloaded to apply this setting.',
       },
       starfieldRendering: {},
       renderEntities: {},
@@ -286,6 +285,20 @@ export const guiOptionsScheme: {
       chatSelect: {
       },
     },
+    {
+      custom () {
+        return <Category>Map</Category>
+      },
+      showMinimap: {
+        text: 'Enable Minimap',
+        enableWarning: 'App reload is required to apply this setting',
+        values: [
+          'always',
+          'singleplayer',
+          'never'
+        ],
+      },
+    },
     {
       custom () {
         return <Category>World</Category>
@@ -321,19 +334,6 @@ export const guiOptionsScheme: {
         ],
       },
     },
-    {
-      custom () {
-        return <Category>Map</Category>
-      },
-      showMinimap: {
-        text: 'Enable Minimap',
-        values: [
-          'always',
-          'singleplayer',
-          'never'
-        ],
-      },
-    },
     {
       custom () {
         return <Category>Experimental</Category>
@@ -555,6 +555,7 @@ export const guiOptionsScheme: {
     {
       preventBackgroundTimeoutKick: {},
       preventSleep: {
+        text: 'Prevent Device Sleep',
         disabledReason: navigator.wakeLock ? undefined : 'Your browser does not support wake lock API',
         enableWarning: 'When connected to a server, prevent PC from sleeping or screen dimming. Useful for purpusely staying AFK for long time. Some events might still prevent this like loosing tab focus or going low power mode.',
       },
diff --git a/src/react/DeathScreen.tsx b/src/react/DeathScreen.tsx
index 8f4c3f00..3501368f 100644
--- a/src/react/DeathScreen.tsx
+++ b/src/react/DeathScreen.tsx
@@ -24,7 +24,7 @@ export default ({ dieReasonMessage, respawnCallback, disconnectCallback }: Props
             }}
           />
           <Button
-            label="Disconnnect" onClick={() => {
+            label="Disconnect" onClick={() => {
               disconnectCallback()
             }}
           />

From e2a0df748e0c10382fd8f1e0be342653a424df41 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 00:32:44 +0300
Subject: [PATCH 550/753] rorce button height

---
 src/react/button.module.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/button.module.css b/src/react/button.module.css
index ae32ee5f..677a1b44 100644
--- a/src/react/button.module.css
+++ b/src/react/button.module.css
@@ -3,7 +3,7 @@
   --txrV: 66px;
   position: relative;
   width: 200px;
-  height: calc(20px * var(--scale));
+  min-height: calc(20px * var(--scale));
   font-family: minecraft, mojangles, monospace;
   font-size: 10px;
   color: white;

From 67d365b9c3a4b67b29575d1247247b2b22402065 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 01:57:48 +0300
Subject: [PATCH 551/753] fix: fix crafting on 1.16.5 and below

---
 pnpm-lock.yaml | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 150468f3..eccaae6c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,7 +136,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13))
       minecraft-data:
         specifier: 3.83.1
         version: 3.83.1
@@ -338,10 +338,10 @@ importers:
         version: 0.2.54
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
-        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4(@types/react@18.3.18)(react@18.3.1)
+        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.10
         version: 0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
@@ -4428,6 +4428,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.4.1:
+    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decamelize-keys@1.1.1:
     resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
     engines: {node: '>=0.10.0'}
@@ -6684,8 +6693,8 @@ packages:
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4:
-    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4}
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d:
+    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d}
     version: 1.0.1
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284:
@@ -6715,8 +6724,8 @@ packages:
     resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d}
     version: 4.27.0
     engines: {node: '>=22'}
 
@@ -14480,6 +14489,10 @@ snapshots:
     optionalDependencies:
       supports-color: 8.1.1
 
+  debug@4.4.1:
+    dependencies:
+      ms: 2.1.3
+
   decamelize-keys@1.1.1:
     dependencies:
       decamelize: 1.2.0
@@ -16128,7 +16141,7 @@ snapshots:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -17019,12 +17032,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17335,7 +17348,7 @@ snapshots:
 
   minecraft-folder-path@1.2.0: {}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/98bc5bb8ee6da8b4b771c05b404cee796318ccd4(@types/react@18.3.18)(react@18.3.1):
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d(@types/react@18.3.18)(react@18.3.1):
     dependencies:
       valtio: 1.13.2(@types/react@18.3.18)(react@18.3.1)
     transitivePeerDependencies:
@@ -17461,7 +17474,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/5602eca4174c0aff079e60234d7c68327eeb6fe6(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.8
       minecraft-data: 3.83.1
@@ -19180,7 +19193,7 @@ snapshots:
 
   send@1.2.0:
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -19535,7 +19548,7 @@ snapshots:
   socks-proxy-agent@7.0.0:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       socks: 2.8.4
     transitivePeerDependencies:
       - supports-color

From 080d75f9395a4746cf6e479b9c6427c9eb556bb0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 02:01:11 +0300
Subject: [PATCH 552/753] less annoying false block swap animations

---
 renderer/viewer/three/holdingBlock.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/renderer/viewer/three/holdingBlock.ts b/renderer/viewer/three/holdingBlock.ts
index 3f1327f1..6836d4f0 100644
--- a/renderer/viewer/three/holdingBlock.ts
+++ b/renderer/viewer/three/holdingBlock.ts
@@ -1,5 +1,6 @@
 import * as THREE from 'three'
 import * as tweenJs from '@tweenjs/tween.js'
+import PrismarineItem from 'prismarine-item'
 import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import { BlockModel } from 'mc-assets'
 import { getThreeBlockModelGroup, renderBlockThree, setBlockPosition } from '../lib/mesher/standaloneRenderer'
@@ -293,6 +294,7 @@ export default class HoldingBlock {
   }
 
   isDifferentItem (block: HandItemBlock | undefined) {
+    const Item = PrismarineItem(this.worldRenderer.version)
     if (!this.lastHeldItem) {
       return true
     }
@@ -300,7 +302,7 @@ export default class HoldingBlock {
       return true
     }
     // eslint-disable-next-line sonarjs/prefer-single-boolean-return
-    if (JSON.stringify(this.lastHeldItem.fullItem) !== JSON.stringify(block?.fullItem ?? '{}')) {
+    if (!Item.equal(this.lastHeldItem.fullItem, block?.fullItem ?? {}) || JSON.stringify(this.lastHeldItem.fullItem.components) !== JSON.stringify(block?.fullItem?.components)) {
       return true
     }
 

From 970ed614aecea8125d421c807c8a580c06f36e82 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 02:04:53 +0300
Subject: [PATCH 553/753] fix crash on error message

---
 src/mineflayer/items.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mineflayer/items.ts b/src/mineflayer/items.ts
index 45638cd4..8a4e1fcd 100644
--- a/src/mineflayer/items.ts
+++ b/src/mineflayer/items.ts
@@ -92,7 +92,8 @@ export const getItemMetadata = (item: GeneralInputItem, resourcesManager: Resour
 
 
 export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'> | null, resourcesManager: ResourcesManager) => {
-  const { customText } = getItemMetadata(item as any, resourcesManager)
+  if (!item) return ''
+  const { customText } = getItemMetadata(item as GeneralInputItem, resourcesManager)
   if (!customText) return
   try {
     if (typeof customText === 'object') {

From f5835f54facbb7b20721038f1bede72acb5df7ef Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 02:05:14 +0300
Subject: [PATCH 554/753] fix: was not possible to open blast furnace GUI

---
 src/inventoryWindows.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 21e3061f..585d3078 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -338,6 +338,7 @@ const implementedContainersGuiMap = {
   'minecraft:generic_3x3': 'DropDispenseWin',
   'minecraft:furnace': 'FurnaceWin',
   'minecraft:smoker': 'FurnaceWin',
+  'minecraft:blast_furnace': 'FurnaceWin',
   'minecraft:crafting': 'CraftingWin',
   'minecraft:crafting3x3': 'CraftingWin', // todo different result slot
   'minecraft:anvil': 'AnvilWin',

From 7f6fc00f02b47caececaea81756d65971a936370 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 02:21:23 +0300
Subject: [PATCH 555/753] fix: fix lever interaction shape

---
 src/interactionShapesGenerated.json | 74 ++++++++++++++---------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/interactionShapesGenerated.json b/src/interactionShapesGenerated.json
index afd3ce0f..804952e0 100644
--- a/src/interactionShapesGenerated.json
+++ b/src/interactionShapesGenerated.json
@@ -1318,55 +1318,47 @@
         13
     ],
     "lever": {
-        "face=ceiling,facing=east": [
-            4,
-            0,
-            5,
-            12,
-            6,
-            11
-        ],
-        "face=ceiling,facing=north": [
-            5,
-            0,
-            4,
-            11,
-            6,
-            12
-        ],
-        "face=ceiling,facing=south": [
-            5,
-            0,
-            4,
-            11,
-            6,
-            12
-        ],
-        "face=ceiling,facing=west": [
-            4,
-            0,
-            5,
-            12,
-            6,
-            11
-        ],
         "face=floor,facing=east": [
             4,
-            10,
+            0,
             5,
             12,
-            16,
+            6,
             11
         ],
         "face=floor,facing=north": [
             5,
-            10,
+            0,
             4,
             11,
-            16,
+            6,
             12
         ],
         "face=floor,facing=south": [
+            5,
+            0,
+            4,
+            11,
+            6,
+            12
+        ],
+        "face=floor,facing=west": [
+            4,
+            0,
+            5,
+            12,
+            6,
+            11
+        ],
+        "face=ceiling,facing=east": [
+            4,
+            10,
+            5,
+            12,
+            16,
+            11
+        ],
+        "face=ceiling,facing=north": [
             5,
             10,
             4,
@@ -1374,7 +1366,15 @@
             16,
             12
         ],
-        "face=floor,facing=west": [
+        "face=ceiling,facing=south": [
+            5,
+            10,
+            4,
+            11,
+            16,
+            12
+        ],
+        "face=ceiling,facing=west": [
             4,
             10,
             5,

From 517f5d35018f9f7fc54bc5d484ec5a83f885bae5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 03:02:23 +0300
Subject: [PATCH 556/753] feat(ui): display persistent capture mouse indicator
 instead of notification

---
 src/cameraRotationControls.ts    |  2 --
 src/react/GlobalOverlayHints.tsx | 52 ++++++++++++++++++++++++++++++++
 src/reactUi.tsx                  |  2 ++
 src/utils.ts                     |  8 +++--
 4 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 src/react/GlobalOverlayHints.tsx

diff --git a/src/cameraRotationControls.ts b/src/cameraRotationControls.ts
index 3368666f..849e5940 100644
--- a/src/cameraRotationControls.ts
+++ b/src/cameraRotationControls.ts
@@ -74,8 +74,6 @@ export const onControInit = () => {
 }
 
 function pointerLockChangeCallback () {
-  hideNotification('pointerlockchange')
-
   if (appViewer.rendererState.preventEscapeMenu) return
   if (!pointerLock.hasPointerLock && activeModalStack.length === 0 && miscUiState.gameLoaded) {
     showModal({ reactType: 'pause-screen' })
diff --git a/src/react/GlobalOverlayHints.tsx b/src/react/GlobalOverlayHints.tsx
new file mode 100644
index 00000000..aaf1bb20
--- /dev/null
+++ b/src/react/GlobalOverlayHints.tsx
@@ -0,0 +1,52 @@
+import { useEffect } from 'react'
+import { proxy, useSnapshot } from 'valtio'
+import { pointerLock } from '../utils'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+import { useUsingTouch } from './utilsApp'
+
+export const displayHintsState = proxy({
+  captureMouseHint: true
+})
+
+export default () => {
+  const { captureMouseHint } = useSnapshot(displayHintsState)
+  const usingTouch = useUsingTouch()
+
+  useEffect(() => {
+    const listener = () => {
+      if (pointerLock.hasPointerLock) {
+        displayHintsState.captureMouseHint = false
+      }
+    }
+    document.addEventListener('pointerlockchange', listener)
+
+    return () => {
+      document.removeEventListener('pointerlockchange', listener)
+    }
+  }, [])
+
+  if (usingTouch) return null
+  return <div style={{
+    // below crosshair that is in center of screen
+    position: 'absolute',
+    top: '50%',
+    left: '50%',
+    transform: 'translate(-50%, -50%)',
+    color: 'white',
+    fontSize: '10px',
+    whiteSpace: 'nowrap',
+    fontWeight: 'bold',
+    marginTop: '-16px',
+    pointerEvents: 'none',
+    textShadow: '0 0 1px black'
+  }}>
+    {captureMouseHint && <div style={{
+      display: 'flex',
+      alignItems: 'center',
+      gap: '10px',
+    }}>
+      <PixelartIcon iconName={pixelartIcons['sun-alt']} />
+      <div>Click to capture mouse</div>
+    </div>}
+  </div>
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 4409c10a..6405b27e 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -62,6 +62,7 @@ import ChunksDebug from './react/ChunksDebug'
 import ChunksDebugScreen from './react/ChunksDebugScreen'
 import DebugResponseTimeIndicator from './react/debugs/DebugResponseTimeIndicator'
 import CreditsAboutModal from './react/CreditsAboutModal'
+import GlobalOverlayHints from './react/GlobalOverlayHints'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -174,6 +175,7 @@ const InGameUi = () => {
         <MineflayerPluginHud />
         <MineflayerPluginConsole />
         {showUI && <TouchInteractionHint />}
+        <GlobalOverlayHints />
         <div style={{ display: showUI ? 'block' : 'none' }}>
           {!disabledUiParts.includes('xp-bar') && <XPBarProvider />}
           {!disabledUiParts.includes('hud-bars') && <HudBarsProvider />}
diff --git a/src/utils.ts b/src/utils.ts
index 93e2eb7b..8ea6d3aa 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,5 +1,6 @@
 import { gameAdditionalState, isGameActive, miscUiState } from './globalState'
 import { options } from './optionsStorage'
+import { displayHintsState } from './react/GlobalOverlayHints'
 import { notificationProxy, showNotification } from './react/NotificationProvider'
 import { packetsReplayState } from './react/state/packetsReplayState'
 
@@ -39,9 +40,10 @@ export const pointerLock = {
       void goFullscreen()
     }
     const displayBrowserProblem = () => {
-      if (notificationProxy.id === 'auto-login') return // prevent notification hide
-      showNotification('Browser Delay Limitation', navigator['keyboard'] ? 'Click on screen, enable Auto Fullscreen or F11' : 'Click on screen or use fullscreen in Chrome')
-      notificationProxy.id = 'pointerlockchange'
+      // if (notificationProxy.id === 'auto-login') return // prevent notification hide
+      // showNotification('Browser Delay Limitation', navigator['keyboard'] ? 'Click on screen, enable Auto Fullscreen or F11' : 'Click on screen or use fullscreen in Chrome')
+      // notificationProxy.id = 'pointerlockchange'
+      displayHintsState.captureMouseHint = true
     }
     if (!(document.fullscreenElement && navigator['keyboard']) && this.justHitEscape) {
       displayBrowserProblem()

From 67dbd56f14d89be19eb291afd63b3641b76f219f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 19 May 2025 03:07:01 +0300
Subject: [PATCH 557/753] dont display new hint when gamepad is used

---
 src/react/GlobalOverlayHints.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/react/GlobalOverlayHints.tsx b/src/react/GlobalOverlayHints.tsx
index aaf1bb20..063351de 100644
--- a/src/react/GlobalOverlayHints.tsx
+++ b/src/react/GlobalOverlayHints.tsx
@@ -1,6 +1,7 @@
 import { useEffect } from 'react'
 import { proxy, useSnapshot } from 'valtio'
 import { pointerLock } from '../utils'
+import { miscUiState } from '../globalState'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import { useUsingTouch } from './utilsApp'
 
@@ -10,6 +11,7 @@ export const displayHintsState = proxy({
 
 export default () => {
   const { captureMouseHint } = useSnapshot(displayHintsState)
+  const { usingGamepadInput } = useSnapshot(miscUiState)
   const usingTouch = useUsingTouch()
 
   useEffect(() => {
@@ -25,7 +27,6 @@ export default () => {
     }
   }, [])
 
-  if (usingTouch) return null
   return <div style={{
     // below crosshair that is in center of screen
     position: 'absolute',
@@ -40,7 +41,7 @@ export default () => {
     pointerEvents: 'none',
     textShadow: '0 0 1px black'
   }}>
-    {captureMouseHint && <div style={{
+    {captureMouseHint && !usingTouch && !usingGamepadInput && <div style={{
       display: 'flex',
       alignItems: 'center',
       gap: '10px',

From 90c283c5eee4302b70c83e36f7dd815d64eb4449 Mon Sep 17 00:00:00 2001
From: Maksim Grigorev <gmi1987@gmail.com>
Date: Mon, 19 May 2025 15:17:36 +0300
Subject: [PATCH 558/753] Update src/utils/splashText.ts

Co-authored-by: Vitaly <vital2580@icloud.com>
---
 src/utils/splashText.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
index 2332c22a..a3d08d1d 100644
--- a/src/utils/splashText.ts
+++ b/src/utils/splashText.ts
@@ -1,5 +1,5 @@
 const MAX_WORDS = 5
-const HTTPS_REGEX = /^https?:\/\/[-\w@:%.+~#=]{1,256}\.[a-zA-Z\d()]{1,6}\b([-\w()@:%+.~#?&/=]*)$/
+const HTTPS_REGEX = /^https?:\/\//
 const TIMEOUT_MS = 5000
 const SPLASH_CACHE_KEY = 'minecraft_splash_text_cache'
 const SPLASH_URL_KEY = 'minecraft_splash_url'

From b2a1bd10e45bdfe68aefe41331853782711f067c Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Mon, 19 May 2025 19:04:35 +0700
Subject: [PATCH 559/753] fix: improoved the code

---
 src/utils/splashText.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
index a3d08d1d..746455a2 100644
--- a/src/utils/splashText.ts
+++ b/src/utils/splashText.ts
@@ -13,6 +13,7 @@ const limitWords = (text: string): string => {
 }
 
 export const isRemoteSplashText = (text: string): boolean => {
+  if (!text) return false
   return HTTPS_REGEX.test(text)
 }
 
@@ -56,6 +57,10 @@ export const cacheSourceUrl = (url: string): void => {
 export const hasSourceUrlChanged = (newUrl?: string): boolean => {
   const cachedUrl = localStorage.getItem(SPLASH_URL_KEY)
 
+  if (!cachedUrl && !newUrl) {
+    return false
+  }
+
   if ((!cachedUrl && newUrl) || (cachedUrl && !newUrl)) {
     return true
   }

From 83366ec5fa9d55832a2494c1c794ca4564f8105b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 20 May 2025 02:02:43 +0300
Subject: [PATCH 560/753] improve Click to capture mouse by not displaying it
 in less cases

---
 src/globals.d.ts                 |  6 ++++++
 src/globals.js                   |  4 ++++
 src/react/GlobalOverlayHints.tsx | 11 +++++++----
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/globals.d.ts b/src/globals.d.ts
index b8741a12..7a2c6f1f 100644
--- a/src/globals.d.ts
+++ b/src/globals.d.ts
@@ -27,8 +27,14 @@ declare const customEvents: import('typed-emitter').default<{
   search (q: string): void
   activateItem (item: Item, slot: number, offhand: boolean): void
   hurtAnimation (yaw?: number): void
+  customChannelRegister (channel: string, parser: any): void
 }>
 declare const beforeRenderFrame: Array<() => void>
+declare const translate: <T extends string | undefined>(key: T) => T
+
+// API LAYER
+declare const toggleMicrophoneMuted: undefined | (() => void)
+declare const translateText: undefined | ((text: string) => string)
 
 declare interface Document {
   exitPointerLock?(): void
diff --git a/src/globals.js b/src/globals.js
index 1aa141c6..f9125c8c 100644
--- a/src/globals.js
+++ b/src/globals.js
@@ -9,3 +9,7 @@ window.viewer = undefined
 window.loadedData = undefined
 window.customEvents = new EventEmitter()
 window.customEvents.setMaxListeners(10_000)
+window.translate = (key) => {
+  if (typeof key !== 'string') return key
+  return window.translateText?.(key) ?? key
+}
diff --git a/src/react/GlobalOverlayHints.tsx b/src/react/GlobalOverlayHints.tsx
index 063351de..aa340953 100644
--- a/src/react/GlobalOverlayHints.tsx
+++ b/src/react/GlobalOverlayHints.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from 'react'
 import { proxy, useSnapshot } from 'valtio'
-import { pointerLock } from '../utils'
-import { miscUiState } from '../globalState'
+import { isInRealGameSession, pointerLock } from '../utils'
+import { activeModalStack, miscUiState } from '../globalState'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import { useUsingTouch } from './utilsApp'
 
@@ -13,6 +13,9 @@ export default () => {
   const { captureMouseHint } = useSnapshot(displayHintsState)
   const { usingGamepadInput } = useSnapshot(miscUiState)
   const usingTouch = useUsingTouch()
+  const acitveModals = useSnapshot(activeModalStack).length > 0
+
+  const inRealGameSession = isInRealGameSession()
 
   useEffect(() => {
     const listener = () => {
@@ -41,13 +44,13 @@ export default () => {
     pointerEvents: 'none',
     textShadow: '0 0 1px black'
   }}>
-    {captureMouseHint && !usingTouch && !usingGamepadInput && <div style={{
+    {captureMouseHint && !usingTouch && !usingGamepadInput && !acitveModals && inRealGameSession && <div style={{
       display: 'flex',
       alignItems: 'center',
       gap: '10px',
     }}>
       <PixelartIcon iconName={pixelartIcons['sun-alt']} />
-      <div>Click to capture mouse</div>
+      <div>{translate('Click to capture mouse')}</div>
     </div>}
   </div>
 }

From b4df2e18379c9ee4b73ed38696e4a002a5a79eea Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Tue, 20 May 2025 16:56:38 +0700
Subject: [PATCH 561/753] feat: improved splash text loading for better UI

---
 config.json             |  2 +-
 src/react/MainMenu.tsx  | 82 +++++++++++++++++++++++++----------------
 src/utils/splashText.ts | 35 ------------------
 3 files changed, 51 insertions(+), 68 deletions(-)

diff --git a/config.json b/config.json
index c1589ef9..26aa3249 100644
--- a/config.json
+++ b/config.json
@@ -26,8 +26,8 @@
     }
   ],
   "rightSideText": "A Minecraft client clone in the browser!",
+  "splashText": "GEN is cooking",
   "splashTextFallback": "Welcome!",
-  "splashText": "https://jsonplaceholder.typicode.com/posts/1",
   "pauseLinks": [
     [
       {
diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 9f5d5357..f2e2274d 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -7,9 +7,8 @@ import { miscUiState } from '../globalState'
 import {
   isRemoteSplashText,
   loadRemoteSplashText,
-  getDisplayText,
+  getCachedSplashText,
   cacheSplashText,
-  hasSourceUrlChanged,
   cacheSourceUrl,
   clearSplashCache
 } from '../utils/splashText'
@@ -56,46 +55,65 @@ export default ({
   singleplayerAvailable = true
 }: Props) => {
   const { appConfig } = useSnapshot(miscUiState)
+  const [splashText, setSplashText] = useState<string | undefined>(undefined)
 
   useEffect(() => {
-    if (hasSourceUrlChanged(appConfig?.splashText)) {
-      clearSplashCache()
-      if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
-        cacheSourceUrl(appConfig.splashText)
+    const determineAndSetSplashTextForSession = async () => {
+      const configSplashFromApp = appConfig?.splashText
+      const configFallbackFromApp = appConfig?.splashTextFallback
+
+      const isRemote = configSplashFromApp && isRemoteSplashText(configSplashFromApp)
+      let currentSourceKey: string
+      if (isRemote) {
+        currentSourceKey = configSplashFromApp!
+      } else {
+        currentSourceKey = configSplashFromApp || ''
       }
-    }
-  }, [appConfig?.splashText])
 
-  const initialSplashText = getDisplayText(appConfig?.splashText, appConfig?.splashTextFallback)
-  const [splashText, setSplashText] = useState(initialSplashText)
-  const [showSplash, setShowSplash] = useState(false)
+      const storedSourceKey = localStorage.getItem('minecraft_splash_url')
 
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      setShowSplash(true)
-    }, 100)
-    return () => clearTimeout(timer)
-  }, [])
+      if (storedSourceKey !== currentSourceKey) {
+        clearSplashCache()
+        cacheSourceUrl(currentSourceKey)
+      }
 
-  useEffect(() => {
-    const loadSplashText = async () => {
-      try {
-        if (appConfig?.splashText && isRemoteSplashText(appConfig.splashText)) {
-          const text = await loadRemoteSplashText(appConfig.splashText)
+      const cachedText = getCachedSplashText()
+      if (cachedText) {
+        setSplashText(cachedText)
+        return
+      }
 
-          if (text && text.trim() !== '') {
-            setSplashText(text)
-            cacheSplashText(text)
+      if (isRemote && configSplashFromApp) {
+        try {
+          const fetchedText = await loadRemoteSplashText(configSplashFromApp)
+          if (fetchedText && fetchedText.trim() !== '' && !fetchedText.includes('Failed to load')) {
+            cacheSplashText(fetchedText)
+            setSplashText(fetchedText)
+          } else {
+            const finalText = configFallbackFromApp || ''
+            setSplashText(finalText)
+            cacheSplashText(finalText)
           }
-        } else if (appConfig?.splashText && !isRemoteSplashText(appConfig.splashText)) {
-          setSplashText(appConfig.splashText)
+        } catch (error) {
+          console.error('Session splash load error:', error)
+          const finalText = configFallbackFromApp || ''
+          setSplashText(finalText)
+          cacheSplashText(finalText)
         }
-      } catch (error) {
-        console.error('Failed to load splash text:', error)
+      } else if (configSplashFromApp && typeof configSplashFromApp === 'string' && configSplashFromApp.trim() !== '') {
+        setSplashText(configSplashFromApp)
+        cacheSplashText(configSplashFromApp)
+      } else {
+        const finalText = configFallbackFromApp || ''
+        setSplashText(finalText)
+        cacheSplashText(finalText)
       }
     }
-    void loadSplashText()
-  }, [appConfig?.splashText, appConfig?.splashTextFallback])
+
+    if (appConfig) {
+      void determineAndSetSplashTextForSession()
+    }
+  }, [appConfig])
 
   if (!bottomRightLinks?.trim()) bottomRightLinks = undefined
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
@@ -142,7 +160,7 @@ export default ({
       <div className={styles['game-title']}>
         <div className={styles.minecraft}>
           <div className={styles.edition} />
-          {showSplash && <span className={styles.splash}>{splashText}</span>}
+          <span className={styles.splash}>{splashText === undefined ? '' : splashText}</span>
         </div>
       </div>
 
diff --git a/src/utils/splashText.ts b/src/utils/splashText.ts
index 746455a2..4052c4f4 100644
--- a/src/utils/splashText.ts
+++ b/src/utils/splashText.ts
@@ -54,20 +54,6 @@ export const cacheSourceUrl = (url: string): void => {
   localStorage.setItem(SPLASH_URL_KEY, url)
 }
 
-export const hasSourceUrlChanged = (newUrl?: string): boolean => {
-  const cachedUrl = localStorage.getItem(SPLASH_URL_KEY)
-
-  if (!cachedUrl && !newUrl) {
-    return false
-  }
-
-  if ((!cachedUrl && newUrl) || (cachedUrl && !newUrl)) {
-    return true
-  }
-
-  return cachedUrl !== newUrl
-}
-
 export const clearSplashCache = (): void => {
   localStorage.removeItem(SPLASH_CACHE_KEY)
 }
@@ -79,24 +65,3 @@ export const getCachedSplashText = (): string | null => {
 export const cacheSplashText = (text: string): void => {
   localStorage.setItem(SPLASH_CACHE_KEY, text)
 }
-
-export const getDisplayText = (splashText?: string, fallbackText?: string): string => {
-  const cachedText = getCachedSplashText()
-
-  if (cachedText) return cachedText
-
-  if (fallbackText) return fallbackText
-
-  if (splashText && isRemoteSplashText(splashText)) return ''
-
-  return splashText || ''
-}
-
-export const getDirectDisplayText = (splashText?: string, fallbackText?: string): string => {
-
-  if (splashText && !isRemoteSplashText(splashText)) return splashText
-
-  if (fallbackText) return fallbackText
-
-  return ''
-}

From 4d70128ac691589f58016d7d559ab2444fd772e5 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 20 May 2025 13:53:26 +0300
Subject: [PATCH 562/753] Update config.json

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index 26aa3249..09d75ced 100644
--- a/config.json
+++ b/config.json
@@ -26,7 +26,7 @@
     }
   ],
   "rightSideText": "A Minecraft client clone in the browser!",
-  "splashText": "GEN is cooking",
+  "splashText": "https://jsonplaceholder.typicode.com/posts/1",
   "splashTextFallback": "Welcome!",
   "pauseLinks": [
     [

From 5efe3508dfaf13c0bb72eda17fde208fe95980be Mon Sep 17 00:00:00 2001
From: Maxim Grigorev <gmi1987@gmail.com>
Date: Tue, 20 May 2025 21:55:47 +0700
Subject: [PATCH 563/753] fix: optimized splash text loading

---
 src/react/MainMenu.tsx | 89 ++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 55 deletions(-)

diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index f2e2274d..8c24a2de 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useMemo } from 'react'
 import { openURL } from 'renderer/viewer/lib/simpleUtils'
 import { useSnapshot } from 'valtio'
 import { haveDirectoryPicker } from '../utils'
@@ -55,65 +55,44 @@ export default ({
   singleplayerAvailable = true
 }: Props) => {
   const { appConfig } = useSnapshot(miscUiState)
-  const [splashText, setSplashText] = useState<string | undefined>(undefined)
+
+  const splashText = useMemo(() => {
+    const cachedText = getCachedSplashText()
+
+    const configSplashFromApp = appConfig?.splashText
+    const isRemote = configSplashFromApp && isRemoteSplashText(configSplashFromApp)
+    const sourceKey = isRemote ? configSplashFromApp : (configSplashFromApp || '')
+    const storedSourceKey = localStorage.getItem('minecraft_splash_url')
+
+    if (storedSourceKey !== sourceKey) {
+      clearSplashCache()
+      cacheSourceUrl(sourceKey)
+    } else if (cachedText) {
+      return cachedText
+    }
+
+    if (!isRemote && configSplashFromApp && configSplashFromApp.trim() !== '') {
+      cacheSplashText(configSplashFromApp)
+      return configSplashFromApp
+    }
+
+    return appConfig?.splashTextFallback || ''
+  }, [appConfig])
 
   useEffect(() => {
-    const determineAndSetSplashTextForSession = async () => {
-      const configSplashFromApp = appConfig?.splashText
-      const configFallbackFromApp = appConfig?.splashTextFallback
-
-      const isRemote = configSplashFromApp && isRemoteSplashText(configSplashFromApp)
-      let currentSourceKey: string
-      if (isRemote) {
-        currentSourceKey = configSplashFromApp!
-      } else {
-        currentSourceKey = configSplashFromApp || ''
-      }
-
-      const storedSourceKey = localStorage.getItem('minecraft_splash_url')
-
-      if (storedSourceKey !== currentSourceKey) {
-        clearSplashCache()
-        cacheSourceUrl(currentSourceKey)
-      }
-
-      const cachedText = getCachedSplashText()
-      if (cachedText) {
-        setSplashText(cachedText)
-        return
-      }
-
-      if (isRemote && configSplashFromApp) {
-        try {
-          const fetchedText = await loadRemoteSplashText(configSplashFromApp)
+    const configSplashFromApp = appConfig?.splashText
+    if (configSplashFromApp && isRemoteSplashText(configSplashFromApp)) {
+      loadRemoteSplashText(configSplashFromApp)
+        .then(fetchedText => {
           if (fetchedText && fetchedText.trim() !== '' && !fetchedText.includes('Failed to load')) {
             cacheSplashText(fetchedText)
-            setSplashText(fetchedText)
-          } else {
-            const finalText = configFallbackFromApp || ''
-            setSplashText(finalText)
-            cacheSplashText(finalText)
           }
-        } catch (error) {
-          console.error('Session splash load error:', error)
-          const finalText = configFallbackFromApp || ''
-          setSplashText(finalText)
-          cacheSplashText(finalText)
-        }
-      } else if (configSplashFromApp && typeof configSplashFromApp === 'string' && configSplashFromApp.trim() !== '') {
-        setSplashText(configSplashFromApp)
-        cacheSplashText(configSplashFromApp)
-      } else {
-        const finalText = configFallbackFromApp || ''
-        setSplashText(finalText)
-        cacheSplashText(finalText)
-      }
+        })
+        .catch(error => {
+          console.error('Failed to preload splash text for next session:', error)
+        })
     }
-
-    if (appConfig) {
-      void determineAndSetSplashTextForSession()
-    }
-  }, [appConfig])
+  }, [appConfig?.splashText])
 
   if (!bottomRightLinks?.trim()) bottomRightLinks = undefined
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
@@ -160,7 +139,7 @@ export default ({
       <div className={styles['game-title']}>
         <div className={styles.minecraft}>
           <div className={styles.edition} />
-          <span className={styles.splash}>{splashText === undefined ? '' : splashText}</span>
+          <span className={styles.splash}>{splashText}</span>
         </div>
       </div>
 

From 7799ccc370f16a805e2c9515f110a9707704a500 Mon Sep 17 00:00:00 2001
From: Maksim Grigorev <gmi1987@gmail.com>
Date: Tue, 20 May 2025 19:08:34 +0300
Subject: [PATCH 564/753] Update src/react/MainMenu.tsx

Co-authored-by: Vitaly <vital2580@icloud.com>
---
 src/react/MainMenu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/MainMenu.tsx b/src/react/MainMenu.tsx
index 8c24a2de..eff26bfd 100644
--- a/src/react/MainMenu.tsx
+++ b/src/react/MainMenu.tsx
@@ -77,7 +77,7 @@ export default ({
     }
 
     return appConfig?.splashTextFallback || ''
-  }, [appConfig])
+  }, [])
 
   useEffect(() => {
     const configSplashFromApp = appConfig?.splashText

From 4f78534ca4c6451dc96ce7be73d3eedd9e0d4c09 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 20 May 2025 19:49:36 +0300
Subject: [PATCH 565/753] Update config.json

---
 config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.json b/config.json
index 09d75ced..29f011c0 100644
--- a/config.json
+++ b/config.json
@@ -26,7 +26,7 @@
     }
   ],
   "rightSideText": "A Minecraft client clone in the browser!",
-  "splashText": "https://jsonplaceholder.typicode.com/posts/1",
+  "splashText": "The sunset is coming!",
   "splashTextFallback": "Welcome!",
   "pauseLinks": [
     [

From b2ef71fc19cc1dca9c3c42eace7d64f0e664c909 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 21 May 2025 05:37:33 +0300
Subject: [PATCH 566/753] up mc data, physics, autojump

---
 package.json    |   8 ++--
 pnpm-lock.yaml  | 100 ++++++++++++++++++++++++------------------------
 src/entities.ts |   2 +-
 3 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/package.json b/package.json
index 4d07ffe7..58b82cc7 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
   "dependencies": {
     "@dimaka/interface": "0.0.3-alpha.0",
     "@floating-ui/react": "^0.26.1",
-    "@nxg-org/mineflayer-auto-jump": "^0.7.17",
+    "@nxg-org/mineflayer-auto-jump": "^0.7.18",
     "@nxg-org/mineflayer-tracker": "1.2.1",
     "@react-oauth/google": "^0.12.1",
     "@stylistic/eslint-plugin": "^2.6.1",
@@ -83,7 +83,7 @@
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
     "mcraft-fun-mineflayer": "^0.1.23",
-    "minecraft-data": "3.83.1",
+    "minecraft-data": "3.89.0",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
@@ -194,14 +194,14 @@
   },
   "pnpm": {
     "overrides": {
-      "@nxg-org/mineflayer-physics-util": "1.8.8",
+      "@nxg-org/mineflayer-physics-util": "1.8.10",
       "buffer": "^6.0.3",
       "vec3": "0.1.10",
       "three": "0.154.0",
       "diamond-square": "github:zardoy/diamond-square",
       "prismarine-block": "github:zardoy/prismarine-block#next-era",
       "prismarine-world": "github:zardoy/prismarine-world#next-era",
-      "minecraft-data": "3.83.1",
+      "minecraft-data": "3.89.0",
       "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything",
       "prismarine-physics": "github:zardoy/prismarine-physics",
       "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index eccaae6c..be965dbe 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,14 +5,14 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
-  '@nxg-org/mineflayer-physics-util': 1.8.8
+  '@nxg-org/mineflayer-physics-util': 1.8.10
   buffer: ^6.0.3
   vec3: 0.1.10
   three: 0.154.0
   diamond-square: github:zardoy/diamond-square
   prismarine-block: github:zardoy/prismarine-block#next-era
   prismarine-world: github:zardoy/prismarine-world#next-era
-  minecraft-data: 3.83.1
+  minecraft-data: 3.89.0
   prismarine-provider-anvil: github:zardoy/prismarine-provider-anvil#everything
   prismarine-physics: github:zardoy/prismarine-physics
   minecraft-protocol: github:PrismarineJS/node-minecraft-protocol#master
@@ -42,8 +42,8 @@ importers:
         specifier: ^0.26.1
         version: 0.26.28(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@nxg-org/mineflayer-auto-jump':
-        specifier: ^0.7.17
-        version: 0.7.17
+        specifier: ^0.7.18
+        version: 0.7.18
       '@nxg-org/mineflayer-tracker':
         specifier: 1.2.1
         version: 1.2.1(encoding@0.1.13)
@@ -138,8 +138,8 @@ importers:
         specifier: ^0.1.23
         version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13))
       minecraft-data:
-        specifier: 3.83.1
-        version: 3.83.1
+        specifier: 3.89.0
+        version: 3.89.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
         version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
@@ -166,7 +166,7 @@ importers:
         version: 6.1.1
       prismarine-provider-anvil:
         specifier: github:zardoy/prismarine-provider-anvil#everything
-        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1)
+        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.89.0)
       prosemirror-example-setup:
         specifier: ^1.2.2
         version: 1.2.3
@@ -435,7 +435,7 @@ importers:
         version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
-        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
@@ -2019,11 +2019,11 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     deprecated: This functionality has been moved to @npmcli/fs
 
-  '@nxg-org/mineflayer-auto-jump@0.7.17':
-    resolution: {integrity: sha512-AgIiJcyh9y8bZjwNHZ2Wp/mbC6+XfE8cM/nOLcZaQYLdoUgncUeaNinFTYLvwi1RMQ42S5bxvwI9kKUwjRhlDA==}
+  '@nxg-org/mineflayer-auto-jump@0.7.18':
+    resolution: {integrity: sha512-O/nRCyWrRwFpcCXXSJhmt844c4a8KhkK4OJPAOKSc63tExIIQU/sipHgjgpy0B+gVDjSmLMPYXe71CN0W327Wg==}
 
-  '@nxg-org/mineflayer-physics-util@1.8.8':
-    resolution: {integrity: sha512-u7CiKCroGrxtqGpIVWKo40GsE7aLc2cH1lvCDBW+Y/V4h1SaCDXzYBOADUKMeOemFss90au/AOGtkahezaoF8A==}
+  '@nxg-org/mineflayer-physics-util@1.8.10':
+    resolution: {integrity: sha512-JGIJEPauVmqoBFQ0I8ZtbaYo3mKn2N00srnDrWkCEt1qozyZWie4sYR0khjjwYubFCljMoWtoEA0+DLsHZLNFg==}
 
   '@nxg-org/mineflayer-tracker@1.2.1':
     resolution: {integrity: sha512-SI1ffF8zvg3/ZNE021Ja2W0FZPN+WbQDZf8yFqOcXtPRXAtM9W6HvoACdzXep8BZid7WYgYLIgjKpB+9RqvCNQ==}
@@ -6687,8 +6687,8 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  minecraft-data@3.83.1:
-    resolution: {integrity: sha512-5K26za9k5WV1OnfkGexA77lBhfGZeFw3rT3NM7/rbFXRZC65prCx7Tk2BQvC9UfzgxxvmxHfxM5y8G1U+Oxgfg==}
+  minecraft-data@3.89.0:
+    resolution: {integrity: sha512-v6dUr1M7Pjc6N4ujanrBZu3IP4/HbSBpxSSXNbK6HVFVJqfaqKSMXN57G/JAlDcwqXYsVd9H4tbKFHCO+VmQpg==}
 
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
@@ -7424,7 +7424,7 @@ packages:
   prismarine-biome@1.3.0:
     resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==}
     peerDependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       prismarine-registry: ^1.1.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
@@ -11377,12 +11377,12 @@ snapshots:
       rimraf: 3.0.2
     optional: true
 
-  '@nxg-org/mineflayer-auto-jump@0.7.17':
+  '@nxg-org/mineflayer-auto-jump@0.7.18':
     dependencies:
-      '@nxg-org/mineflayer-physics-util': 1.8.8
+      '@nxg-org/mineflayer-physics-util': 1.8.10
       strict-event-emitter-types: 2.0.0
 
-  '@nxg-org/mineflayer-physics-util@1.8.8':
+  '@nxg-org/mineflayer-physics-util@1.8.10':
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
 
@@ -11397,7 +11397,7 @@ snapshots:
   '@nxg-org/mineflayer-trajectories@1.2.0(encoding@0.1.13)':
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       mineflayer: 4.27.0(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.16.0
@@ -13198,16 +13198,16 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.89.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.4.2
@@ -13234,16 +13234,16 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.89.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.4.2
@@ -14637,8 +14637,8 @@ snapshots:
 
   diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71:
     dependencies:
-      minecraft-data: 3.83.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+      minecraft-data: 3.89.0
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-registry: 1.11.0
       random-seed: 0.3.0
       vec3: 0.1.10
@@ -17344,7 +17344,7 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  minecraft-data@3.83.1: {}
+  minecraft-data@3.89.0: {}
 
   minecraft-folder-path@1.2.0: {}
 
@@ -17364,7 +17364,7 @@ snapshots:
       debug: 4.4.0(supports-color@8.1.1)
       endian-toggle: 0.0.0
       lodash.merge: 4.6.2
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       minecraft-folder-path: 1.2.0
       node-fetch: 2.7.0(encoding@0.1.13)
       node-rsa: 0.4.2
@@ -17443,7 +17443,7 @@ snapshots:
 
   mineflayer-pathfinder@2.4.5:
     dependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
@@ -17453,12 +17453,12 @@ snapshots:
 
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -17476,13 +17476,13 @@ snapshots:
 
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13):
     dependencies:
-      '@nxg-org/mineflayer-physics-util': 1.8.8
-      minecraft-data: 3.83.1
+      '@nxg-org/mineflayer-physics-util': 1.8.10
+      minecraft-data: 3.89.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -18268,15 +18268,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  prismarine-biome@1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0):
+  prismarine-biome@1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0):
     dependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       prismarine-registry: 1.11.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
     dependencies:
-      minecraft-data: 3.83.1
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
+      minecraft-data: 3.89.0
+      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -18288,9 +18288,9 @@ snapshots:
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1):
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0):
     dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.83.1)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
@@ -18319,14 +18319,14 @@ snapshots:
 
   prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     dependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       prismarine-nbt: 2.7.0
       vec3: 0.1.10
 
-  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.83.1):
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.89.0):
     dependencies:
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.83.1)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       uint4: 0.1.2
@@ -18348,13 +18348,13 @@ snapshots:
 
   prismarine-registry@1.11.0:
     dependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
 
   prismarine-schematic@1.2.3:
     dependencies:
-      minecraft-data: 3.83.1
+      minecraft-data: 3.89.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -20461,7 +20461,7 @@ snapshots:
   vite-node@3.0.8(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       es-module-lexer: 1.6.0
       pathe: 2.0.3
       vite: 6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
@@ -20547,7 +20547,7 @@ snapshots:
       '@vitest/spy': 3.0.8
       '@vitest/utils': 3.0.8
       chai: 5.2.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       expect-type: 1.2.0
       magic-string: 0.30.17
       pathe: 2.0.3
diff --git a/src/entities.ts b/src/entities.ts
index 919d6818..e6226d6a 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -13,7 +13,7 @@ const updateAutoJump = () => {
   if (!bot?.autoJumper) return
   const autoJump = options.autoParkour || (options.autoJump === 'auto' ? miscUiState.currentTouch && !miscUiState.usingGamepadInput : options.autoJump === 'always')
   bot.autoJumper.setOpts({
-    jumpIntoWater: options.autoParkour,
+    // jumpIntoWater: options.autoParkour,
     jumpOnAllEdges: options.autoParkour,
     // strictBlockCollision: true,
   })

From ecb53fab8882a7010e58e67b116f43696976fdbb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 21 May 2025 05:46:36 +0300
Subject: [PATCH 567/753] up tracker

---
 package.json    |  2 +-
 pnpm-lock.yaml  | 11 ++++++-----
 src/entities.ts |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 58b82cc7..7d3a5011 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "@dimaka/interface": "0.0.3-alpha.0",
     "@floating-ui/react": "^0.26.1",
     "@nxg-org/mineflayer-auto-jump": "^0.7.18",
-    "@nxg-org/mineflayer-tracker": "1.2.1",
+    "@nxg-org/mineflayer-tracker": "1.3.0",
     "@react-oauth/google": "^0.12.1",
     "@stylistic/eslint-plugin": "^2.6.1",
     "@types/gapi": "^0.0.47",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index be965dbe..c9be7ee5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,8 +45,8 @@ importers:
         specifier: ^0.7.18
         version: 0.7.18
       '@nxg-org/mineflayer-tracker':
-        specifier: 1.2.1
-        version: 1.2.1(encoding@0.1.13)
+        specifier: 1.3.0
+        version: 1.3.0(encoding@0.1.13)
       '@react-oauth/google':
         specifier: ^0.12.1
         version: 0.12.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -2025,8 +2025,8 @@ packages:
   '@nxg-org/mineflayer-physics-util@1.8.10':
     resolution: {integrity: sha512-JGIJEPauVmqoBFQ0I8ZtbaYo3mKn2N00srnDrWkCEt1qozyZWie4sYR0khjjwYubFCljMoWtoEA0+DLsHZLNFg==}
 
-  '@nxg-org/mineflayer-tracker@1.2.1':
-    resolution: {integrity: sha512-SI1ffF8zvg3/ZNE021Ja2W0FZPN+WbQDZf8yFqOcXtPRXAtM9W6HvoACdzXep8BZid7WYgYLIgjKpB+9RqvCNQ==}
+  '@nxg-org/mineflayer-tracker@1.3.0':
+    resolution: {integrity: sha512-HINrv51l2aZ/lDrcL77gSWDvf3Z3trd6kdiifXitCMDNdBT0FpWnXq9bi5Fr7yPpFGQ3fqGUIq5DQYYY84E9IA==}
 
   '@nxg-org/mineflayer-trajectories@1.2.0':
     resolution: {integrity: sha512-yTDHn96fyWLKwdHdOGIrnt8nss4SJmxXwJn101o7aNI4sgdnUmwaX4FoNbmrEa9eZn6IwxaXIxDf+fJmKj9RIw==}
@@ -11386,8 +11386,9 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
 
-  '@nxg-org/mineflayer-tracker@1.2.1(encoding@0.1.13)':
+  '@nxg-org/mineflayer-tracker@1.3.0(encoding@0.1.13)':
     dependencies:
+      '@nxg-org/mineflayer-physics-util': 1.8.10
       '@nxg-org/mineflayer-trajectories': 1.2.0(encoding@0.1.13)
       '@nxg-org/mineflayer-util-plugin': 1.8.4
     transitivePeerDependencies:
diff --git a/src/entities.ts b/src/entities.ts
index e6226d6a..8ee36431 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -61,7 +61,7 @@ customEvents.on('gameLoaded', () => {
       if (!tracking) continue
       const e = bot.entities[id]
       if (!e) continue
-      const speed = info.avgSpeed
+      const speed = info.avgVel
       const WALKING_SPEED = 0.03
       const SPRINTING_SPEED = 0.18
       const isCrouched = e['crouching']

From a4e70768ddca76189bf7af9e09519b029d6532e3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 21 May 2025 05:53:59 +0300
Subject: [PATCH 568/753] fix test

---
 renderer/viewer/lib/mesher/test/tests.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/renderer/viewer/lib/mesher/test/tests.test.ts b/renderer/viewer/lib/mesher/test/tests.test.ts
index 7959f573..9ebd6604 100644
--- a/renderer/viewer/lib/mesher/test/tests.test.ts
+++ b/renderer/viewer/lib/mesher/test/tests.test.ts
@@ -49,7 +49,6 @@ test('Known blocks are not rendered', () => {
   // TODO resolve creaking_heart issue (1.21.3)
   expect(missingBlocks).toMatchInlineSnapshot(`
     {
-      "creaking_heart": true,
       "end_gateway": true,
       "end_portal": true,
       "structure_void": true,

From b36d08528f70ee5e7896ea76650a7e6f733bf66d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 21 May 2025 06:36:39 +0300
Subject: [PATCH 569/753] fix: fix hanging forever server ping and weboscket
 connections

---
 src/mineflayer/minecraft-protocol-extra.ts | 30 +++++++++++++++-------
 src/mineflayer/websocket-core.ts           |  4 +++
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/mineflayer/minecraft-protocol-extra.ts b/src/mineflayer/minecraft-protocol-extra.ts
index e8216a00..f3cf11e3 100644
--- a/src/mineflayer/minecraft-protocol-extra.ts
+++ b/src/mineflayer/minecraft-protocol-extra.ts
@@ -3,13 +3,11 @@ import clientAutoVersion from 'minecraft-protocol/src/client/autoVersion'
 
 export const pingServerVersion = async (ip: string, port?: number, mergeOptions: Record<string, any> = {}) => {
   const fakeClient = new EventEmitter() as any
-  fakeClient.on('error', (err) => {
-    throw new Error(err.message ?? err)
-  })
   const options = {
     host: ip,
     port,
-    noPongTimeout: Infinity, // disable timeout
+    noPongTimeout: 10_000,
+    closeTimeout: 20_000,
     ...mergeOptions,
   }
   let latency = 0
@@ -19,12 +17,26 @@ export const pingServerVersion = async (ip: string, port?: number, mergeOptions:
     fullInfo = res
   }]
 
-  // TODO! use client.socket.destroy() instead of client.end() for faster cleanup
-  await clientAutoVersion(fakeClient, options)
+  // TODO use client.socket.destroy() instead of client.end() for faster cleanup
+  clientAutoVersion(fakeClient, options)
+  await Promise.race([
+    new Promise<void>((resolve, reject) => {
+      fakeClient.once('connect_allowed', () => {
+        resolve()
+      })
+    }),
+    new Promise<void>((resolve, reject) => {
+      fakeClient.on('error', (err) => {
+        reject(new Error(err.message ?? err))
+      })
+      if (mergeOptions.stream) {
+        mergeOptions.stream.on('end', (err) => {
+          reject(new Error('Connection closed'))
+        })
+      }
+    })
+  ])
 
-  await new Promise<void>((resolve, reject) => {
-    fakeClient.once('connect_allowed', resolve)
-  })
   return {
     version: fakeClient.version,
     latency,
diff --git a/src/mineflayer/websocket-core.ts b/src/mineflayer/websocket-core.ts
index 482f0def..d24bd6be 100644
--- a/src/mineflayer/websocket-core.ts
+++ b/src/mineflayer/websocket-core.ts
@@ -33,10 +33,14 @@ export const getWebsocketStream = async (host: string) => {
   ws.addEventListener('close', () => {
     console.log('ws closed')
     clientDuplex.end()
+    setTimeout(() => {
+      clientDuplex.emit('end', 'Connection lost')
+    }, 500)
   })
 
   ws.addEventListener('error', err => {
     console.log('ws error', err)
+    clientDuplex.emit('error', err)
   })
 
   await new Promise((resolve, reject) => {

From 5ea2ab9c1af1c30d16bd3fcbcd416760de307289 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 21 May 2025 13:55:52 +0300
Subject: [PATCH 570/753] fix: update tab header/footer in real time, use
 player display name in tab

---
 src/react/PlayerListOverlay.tsx         | 4 ++--
 src/react/PlayerListOverlayProvider.tsx | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/react/PlayerListOverlay.tsx b/src/react/PlayerListOverlay.tsx
index 90dfd685..0aa99136 100644
--- a/src/react/PlayerListOverlay.tsx
+++ b/src/react/PlayerListOverlay.tsx
@@ -2,7 +2,7 @@ import MessageFormattedString from './MessageFormattedString'
 import './PlayerListOverlay.css'
 
 
-type PlayersLists = Array<Array<Pick<import('mineflayer').Player, 'uuid' | 'username' | 'ping'>>>
+type PlayersLists = Array<Array<Pick<import('mineflayer').Player, 'uuid' | 'displayName' | 'username' | 'ping'>>>
 
 type PlayerListOverlayProps = {
   playersLists: PlayersLists,
@@ -25,7 +25,7 @@ export default ({ playersLists, clientId, tablistHeader, tablistFooter, serverIP
         <div key={index} className="player-list">
           {list.map(player => (
             <div key={player.uuid ?? player.username} className={`playerlist-entry${clientId === player.uuid ? ' active-player' : ''}`} id={`plist-player-${player.uuid}`}>
-              <MessageFormattedString message={player.username} />
+              <MessageFormattedString message={player.displayName ?? player.username} />
               <div className="playerlist-ping">
                 <p className="playerlist-ping-value">{player.ping}</p>
                 <p className="playerlist-ping-label">ms</p>
diff --git a/src/react/PlayerListOverlayProvider.tsx b/src/react/PlayerListOverlayProvider.tsx
index 4d971687..478fd1d2 100644
--- a/src/react/PlayerListOverlayProvider.tsx
+++ b/src/react/PlayerListOverlayProvider.tsx
@@ -14,6 +14,7 @@ export default () => {
   const [clientId, setClientId] = useState(bot._client.uuid)
   const [players, setPlayers] = useState<Players>({})
   const [isOpen, setIsOpen] = useState(false)
+  const [counter, setCounter] = useState(0)
 
   const handleKeyDown = (e) => {
     if (!isGameActive(true)) return
@@ -60,9 +61,13 @@ export default () => {
     document.addEventListener('keydown', handleKeyDown)
     document.addEventListener('keyup', handleKeyUp)
 
+    const playerlistHeader = () => setCounter(prev => prev + 1)
+    bot._client.on('playerlist_header', playerlistHeader)
+
     return () => {
       document.removeEventListener('keydown', handleKeyDown)
       document.removeEventListener('keyup', handleKeyUp)
+      bot?._client.removeListener('playerlist_header', playerlistHeader)
     }
   }, [serverIp])
 

From 7cea1b87555a1e3cd8538133d3c0b8b1b930ea88 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 21 May 2025 18:45:54 +0300
Subject: [PATCH 571/753] fix tsc

---
 src/react/PlayerListOverlay.stories.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/PlayerListOverlay.stories.tsx b/src/react/PlayerListOverlay.stories.tsx
index ec1958a7..2b82938d 100644
--- a/src/react/PlayerListOverlay.stories.tsx
+++ b/src/react/PlayerListOverlay.stories.tsx
@@ -16,7 +16,7 @@ export const Primary: Story = {
         { username: 'Player 1', ping: 10, uuid: '1' },
         { username: 'Player 2', ping: 20, uuid: '2' },
         { username: 'Player 3', ping: 30, uuid: '3' },
-      ]
+      ] as any
     ],
     clientId: '2',
     tablistHeader: 'Header',

From 5a663aac2f6c908826991420e71300cdc8cc1e9b Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 21 May 2025 16:53:20 +0100
Subject: [PATCH 572/753] fix: item textures in inventory break after loading
 resourcepack (#362)

---
 src/inventoryWindows.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 585d3078..187bb997 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -25,6 +25,7 @@ import { GeneralInputItem, getItemMetadata, getItemModelName, getItemNameRaw, Re
 const loadedImagesCache = new Map<string, HTMLImageElement>()
 const cleanLoadedImagesCache = () => {
   loadedImagesCache.delete('blocks')
+  loadedImagesCache.delete('items')
 }
 
 let lastWindow: ReturnType<typeof showInventory>
@@ -120,6 +121,7 @@ export const onGameLoad = () => {
   if (!appViewer.resourcesManager['_inventoryChangeTracked']) {
     appViewer.resourcesManager['_inventoryChangeTracked'] = true
     const texturesChanged = () => {
+      cleanLoadedImagesCache()
       if (!lastWindow) return
       upWindowItemsLocal()
       upJei(lastJeiSearch)

From 972625757792641490a01efa12f59edfaa314fb8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 22 May 2025 14:46:44 +0300
Subject: [PATCH 573/753] fix: do not display capture lock message when
 possilbe (avoid flickering - do strategy switch) feat: make tab (players
 list) keybindign configurable and add a way to assign to a gamepad button

---
 package.json                            |  2 +-
 pnpm-lock.yaml                          | 16 +++++++-------
 src/controls.ts                         |  5 +++++
 src/react/GlobalOverlayHints.tsx        |  2 +-
 src/react/PlayerListOverlayProvider.tsx | 29 ++++++-------------------
 src/utils.ts                            |  9 ++++----
 6 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index 7d3a5011..655cd394 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,7 @@
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "constants-browserify": "^1.0.0",
-    "contro-max": "^0.1.8",
+    "contro-max": "^0.1.9",
     "crypto-browserify": "^3.12.0",
     "cypress-esbuild-preprocessor": "^1.0.2",
     "eslint": "^8.50.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c9be7ee5..60086040 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -304,8 +304,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       contro-max:
-        specifier: ^0.1.8
-        version: 0.1.8(typescript@5.5.4)
+        specifier: ^0.1.9
+        version: 0.1.9(typescript@5.5.4)
       crypto-browserify:
         specifier: ^3.12.0
         version: 3.12.1
@@ -4237,8 +4237,8 @@ packages:
     resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
     engines: {node: '>= 0.6'}
 
-  contro-max@0.1.8:
-    resolution: {integrity: sha512-5SoeudO8Zzfj/gbFTDrMRFJny02+MY1lBtb2NyCNiBLtHAfvhWZxZs/Z3yJvKL2rY/qKUZs9gTQOIDygBcBrdw==}
+  contro-max@0.1.9:
+    resolution: {integrity: sha512-zH9FB60EzhHKublD92d11QuarYRTdYci5rvDgwDr5XXwUqae5mr6IgzXGcr78T2odnO/Aeqmrf32RDwJIl5GfQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   convert-source-map@1.9.0:
@@ -9751,7 +9751,7 @@ snapshots:
       '@babel/core': 7.26.9
       '@babel/helper-compilation-targets': 7.26.5
       '@babel/helper-plugin-utils': 7.26.5
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       lodash.debounce: 4.0.8
       resolve: 1.22.10
     transitivePeerDependencies:
@@ -13322,7 +13322,7 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -14225,7 +14225,7 @@ snapshots:
 
   content-type@1.0.5: {}
 
-  contro-max@0.1.8(typescript@5.5.4):
+  contro-max@0.1.9(typescript@5.5.4):
     dependencies:
       events: 3.3.0
       lodash-es: 4.17.21
@@ -17268,7 +17268,7 @@ snapshots:
   micromark@4.0.2:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       decode-named-character-reference: 1.1.0
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.3
diff --git a/src/controls.ts b/src/controls.ts
index f8160cfd..9b2c3cbf 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -27,6 +27,7 @@ import { onCameraMove, onControInit } from './cameraRotationControls'
 import { createNotificationProgressReporter } from './core/progressReporter'
 import { appStorage } from './react/appStorageProvider'
 import { switchGameMode } from './packetsReplay/replayPackets'
+import { tabListState } from './react/PlayerListOverlayProvider'
 
 
 export const customKeymaps = proxy(appStorage.keybindings)
@@ -65,6 +66,7 @@ export const contro = new ControMax({
       // client side
       zoom: ['KeyC'],
       viewerConsole: ['Backquote'],
+      playersList: ['Tab'],
     },
     ui: {
       toggleFullscreen: ['F11'],
@@ -405,6 +407,9 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
       case 'general.rotateCameraDown':
         cameraRotationControls.handleCommand(command, pressed)
         break
+      case 'general.playersList':
+        tabListState.isOpen = pressed
+        break
     }
   }
 }
diff --git a/src/react/GlobalOverlayHints.tsx b/src/react/GlobalOverlayHints.tsx
index aa340953..ddbb1116 100644
--- a/src/react/GlobalOverlayHints.tsx
+++ b/src/react/GlobalOverlayHints.tsx
@@ -6,7 +6,7 @@ import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import { useUsingTouch } from './utilsApp'
 
 export const displayHintsState = proxy({
-  captureMouseHint: true
+  captureMouseHint: false
 })
 
 export default () => {
diff --git a/src/react/PlayerListOverlayProvider.tsx b/src/react/PlayerListOverlayProvider.tsx
index 478fd1d2..3ff69c41 100644
--- a/src/react/PlayerListOverlayProvider.tsx
+++ b/src/react/PlayerListOverlayProvider.tsx
@@ -1,4 +1,4 @@
-import { useSnapshot } from 'valtio'
+import { proxy, useSnapshot } from 'valtio'
 import { useState, useEffect, useMemo } from 'react'
 import { isGameActive } from '../globalState'
 import PlayerListOverlay from './PlayerListOverlay'
@@ -9,28 +9,18 @@ const MAX_ROWS_PER_COL = 10
 
 type Players = typeof bot.players
 
+export const tabListState = proxy({
+  isOpen: false,
+})
+
 export default () => {
+  const { isOpen } = useSnapshot(tabListState)
+
   const serverIp = lastConnectOptions.value?.server
   const [clientId, setClientId] = useState(bot._client.uuid)
   const [players, setPlayers] = useState<Players>({})
-  const [isOpen, setIsOpen] = useState(false)
   const [counter, setCounter] = useState(0)
 
-  const handleKeyDown = (e) => {
-    if (!isGameActive(true)) return
-    if (e.key === 'Tab') {
-      setIsOpen(prev => true)
-      e.preventDefault()
-    }
-  }
-
-  const handleKeyUp = (e) => {
-    if (e.key === 'Tab') {
-      setIsOpen(prev => false)
-      e.preventDefault()
-    }
-  }
-
   useEffect(() => {
     function requestUpdate () {
       setPlayers(bot?.players ?? {})
@@ -58,15 +48,10 @@ export default () => {
       })
     }
 
-    document.addEventListener('keydown', handleKeyDown)
-    document.addEventListener('keyup', handleKeyUp)
-
     const playerlistHeader = () => setCounter(prev => prev + 1)
     bot._client.on('playerlist_header', playerlistHeader)
 
     return () => {
-      document.removeEventListener('keydown', handleKeyDown)
-      document.removeEventListener('keyup', handleKeyUp)
       bot?._client.removeListener('playerlist_header', playerlistHeader)
     }
   }, [serverIp])
diff --git a/src/utils.ts b/src/utils.ts
index 8ea6d3aa..d48fbbc3 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -39,14 +39,14 @@ export const pointerLock = {
     if (options.autoFullScreen) {
       void goFullscreen()
     }
-    const displayBrowserProblem = () => {
+    const displayMouseCaptureFailure = () => {
       // if (notificationProxy.id === 'auto-login') return // prevent notification hide
       // showNotification('Browser Delay Limitation', navigator['keyboard'] ? 'Click on screen, enable Auto Fullscreen or F11' : 'Click on screen or use fullscreen in Chrome')
       // notificationProxy.id = 'pointerlockchange'
       displayHintsState.captureMouseHint = true
     }
     if (!(document.fullscreenElement && navigator['keyboard']) && this.justHitEscape) {
-      displayBrowserProblem()
+      displayMouseCaptureFailure()
     } else {
       //@ts-expect-error
       const promise: any = document.documentElement.requestPointerLock({
@@ -58,9 +58,10 @@ export const pointerLock = {
           document.documentElement.requestPointerLock()
         } else if (error.name === 'SecurityError') {
           // cause: https://discourse.threejs.org/t/how-to-avoid-pointerlockcontrols-error/33017/4
-          displayBrowserProblem()
+          displayMouseCaptureFailure()
         } else {
-          console.error(error)
+          displayMouseCaptureFailure()
+          console.warn('Failed to request pointer lock:', error)
         }
       })
     }

From 3cd778538c52fe6327b0d031b026190681e5f1f9 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 22 May 2025 14:50:58 +0300
Subject: [PATCH 574/753] feat: Sync armor rotation for players (#363)

---
 renderer/viewer/three/entities.ts | 86 +++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 320daff9..1a5e7c3f 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -292,6 +292,9 @@ export class Entities {
         playerObject.animation.update(playerObject, dt)
       }
 
+      // Update armor positions
+      this.syncArmorPositions(entity)
+
       // Update visibility based on distance and chunk load status
       if (botPos && entity.position) {
         const dx = entity.position.x - botPos.x
@@ -312,6 +315,79 @@ export class Entities {
     }
   }
 
+  private syncArmorPositions (entity: SceneEntity) {
+    if (!entity.playerObject) return
+
+    // todo-low use property access for less loop iterations (small performance gain)
+    entity.traverse((armor) => {
+      if (!armor.name.startsWith('geometry_armor_')) return
+
+      const { skin } = entity.playerObject!
+
+      switch (armor.name) {
+        case 'geometry_armor_head':
+          // Head armor sync
+          if (armor.children[0]?.children[0]) {
+            armor.children[0].children[0].rotation.set(
+              -skin.head.rotation.x,
+              skin.head.rotation.y,
+              skin.head.rotation.z,
+              skin.head.rotation.order
+            )
+          }
+          break
+
+        case 'geometry_armor_legs':
+          // Legs armor sync
+          if (armor.children[0]) {
+            // Left leg
+            if (armor.children[0].children[2]) {
+              armor.children[0].children[2].rotation.set(
+                -skin.leftLeg.rotation.x,
+                skin.leftLeg.rotation.y,
+                skin.leftLeg.rotation.z,
+                skin.leftLeg.rotation.order
+              )
+            }
+            // Right leg
+            if (armor.children[0].children[1]) {
+              armor.children[0].children[1].rotation.set(
+                -skin.rightLeg.rotation.x,
+                skin.rightLeg.rotation.y,
+                skin.rightLeg.rotation.z,
+                skin.rightLeg.rotation.order
+              )
+            }
+          }
+          break
+
+        case 'geometry_armor_feet':
+          // Boots armor sync
+          if (armor.children[0]) {
+            // Right boot
+            if (armor.children[0].children[0]) {
+              armor.children[0].children[0].rotation.set(
+                -skin.rightLeg.rotation.x,
+                skin.rightLeg.rotation.y,
+                skin.rightLeg.rotation.z,
+                skin.rightLeg.rotation.order
+              )
+            }
+            // Left boot (reversed Z rotation)
+            if (armor.children[0].children[1]) {
+              armor.children[0].children[1].rotation.set(
+                -skin.leftLeg.rotation.x,
+                skin.leftLeg.rotation.y,
+                -skin.leftLeg.rotation.z,
+                skin.leftLeg.rotation.order
+              )
+            }
+          }
+          break
+      }
+    })
+  }
+
   getPlayerObject (entityId: string | number) {
     const playerObject = this.entities[entityId]?.playerObject
     return playerObject
@@ -1203,6 +1279,16 @@ function addArmorModel (worldRenderer: WorldRendererThree, entityMesh: THREE.Obj
     })
   } else {
     mesh = getMesh(worldRenderer, texturePath, armorModel[slotType])
+    // // enable debug mode to see the mesh
+    // mesh.traverse(c => {
+    //   if (c instanceof THREE.Mesh) {
+    //     c.material.wireframe = true
+    //   }
+    // })
+    if (slotType === 'head') {
+      // avoid z-fighting with the head
+      mesh.children[0].position.y += 0.01
+    }
     mesh.name = meshName
     material = mesh.material
     if (!isPlayerHead) {

From 04a85e9bd19db2a626d6ec6157f10d7056eb0b2c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 24 May 2025 18:26:47 +0300
Subject: [PATCH 575/753] minimap: don't do more 20 updates per seconds

---
 src/controls.ts       | 1 +
 src/react/Minimap.tsx | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/controls.ts b/src/controls.ts
index 9b2c3cbf..d1e9b1e4 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -499,6 +499,7 @@ contro.on('trigger', ({ command }) => {
       case 'general.rotateCameraRight':
       case 'general.rotateCameraUp':
       case 'general.rotateCameraDown':
+      case 'general.playersList':
         // no-op
         break
       case 'general.swapHands': {
diff --git a/src/react/Minimap.tsx b/src/react/Minimap.tsx
index 25ee59ed..9eb8a253 100644
--- a/src/react/Minimap.tsx
+++ b/src/react/Minimap.tsx
@@ -22,8 +22,14 @@ export default (
   const canvasTick = useRef(0)
   const canvasRef = useRef<HTMLCanvasElement>(null)
   const [position, setPosition] = useState({ x: 0, y: 0, z: 0 })
+  const lastUpdate = useRef(0)
+  const THROTTLE_MS = 50 // 20fps
 
   const updateMap = () => {
+    const now = Date.now()
+    if (now - lastUpdate.current < THROTTLE_MS) return
+    lastUpdate.current = now
+
     setPosition({ x: adapter.playerPosition.x, y: adapter.playerPosition.y, z: adapter.playerPosition.z })
     if (adapter.mapDrawer) {
       if (!full.current) {

From 0c68e63ba619fcd39a9dbb9eb8fe8cdf689c4282 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 25 May 2025 12:55:27 +0300
Subject: [PATCH 576/753] fix: restore VR support. Fix rotation / position
 camera bugs

---
 renderer/viewer/lib/worldrendererCommon.ts  |  1 +
 renderer/viewer/three/cameraShake.ts        | 24 ++++++++++------
 renderer/viewer/three/documentRenderer.ts   | 32 ++++++++++++---------
 renderer/viewer/three/graphicsBackend.ts    |  3 ++
 renderer/viewer/three/world/vr.ts           | 17 ++++++-----
 renderer/viewer/three/worldrendererThree.ts | 30 ++++++++++---------
 src/appViewer.ts                            |  2 +-
 src/optionsGuiScheme.tsx                    |  6 +++-
 src/optionsStorage.ts                       |  1 +
 src/watchOptions.ts                         |  5 ++++
 10 files changed, 76 insertions(+), 45 deletions(-)

diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index ef82f7af..26e3bf2e 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -43,6 +43,7 @@ export const defaultWorldRendererConfig = {
   starfield: true,
   addChunksBatchWaitTime: 200,
   vrSupport: true,
+  vrPageGameRendering: true,
   renderEntities: true,
   fov: 75,
   fetchPlayerSkins: true,
diff --git a/renderer/viewer/three/cameraShake.ts b/renderer/viewer/three/cameraShake.ts
index f6a61e2e..6fe483cc 100644
--- a/renderer/viewer/three/cameraShake.ts
+++ b/renderer/viewer/three/cameraShake.ts
@@ -1,4 +1,5 @@
 import * as THREE from 'three'
+import { WorldRendererThree } from './worldrendererThree'
 
 export class CameraShake {
   private rollAngle = 0
@@ -8,7 +9,7 @@ export class CameraShake {
   private basePitch = 0
   private baseYaw = 0
 
-  constructor (public camera: THREE.Camera, public onRenderCallbacks: Array<() => void>) {
+  constructor (public worldRenderer: WorldRendererThree, public onRenderCallbacks: Array<() => void>) {
     onRenderCallbacks.push(() => {
       this.update()
     })
@@ -62,14 +63,21 @@ export class CameraShake {
       }
     }
 
-    // Create rotation quaternions
-    const pitchQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), this.basePitch)
-    const yawQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), this.baseYaw)
-    const rollQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 0, 1), THREE.MathUtils.degToRad(this.rollAngle))
+    const camera = this.worldRenderer.cameraGroupVr || this.worldRenderer.camera
 
-    // Combine rotations in the correct order: pitch -> yaw -> roll
-    const finalQuat = yawQuat.multiply(pitchQuat).multiply(rollQuat)
-    this.camera.setRotationFromQuaternion(finalQuat)
+    if (this.worldRenderer.cameraGroupVr) {
+      // For VR camera, only apply yaw rotation
+      const yawQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), this.baseYaw)
+      camera.setRotationFromQuaternion(yawQuat)
+    } else {
+      // For regular camera, apply all rotations
+      const pitchQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), this.basePitch)
+      const yawQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), this.baseYaw)
+      const rollQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 0, 1), THREE.MathUtils.degToRad(this.rollAngle))
+      // Combine rotations in the correct order: pitch -> yaw -> roll
+      const finalQuat = yawQuat.multiply(pitchQuat).multiply(rollQuat)
+      camera.setRotationFromQuaternion(finalQuat)
+    }
   }
 
   private easeOut (t: number): number {
diff --git a/renderer/viewer/three/documentRenderer.ts b/renderer/viewer/three/documentRenderer.ts
index 46672b74..1d556c2a 100644
--- a/renderer/viewer/three/documentRenderer.ts
+++ b/renderer/viewer/three/documentRenderer.ts
@@ -3,6 +3,7 @@ import Stats from 'stats.js'
 import StatsGl from 'stats-gl'
 import * as tween from '@tweenjs/tween.js'
 import { GraphicsBackendConfig, GraphicsInitOptions } from '../../../src/appViewer'
+import { WorldRendererConfig } from '../lib/worldrendererCommon'
 
 export class DocumentRenderer {
   readonly canvas = document.createElement('canvas')
@@ -23,6 +24,7 @@ export class DocumentRenderer {
   droppedFpsPercentage: number
   config: GraphicsBackendConfig
   onRender = [] as Array<(sizeChanged: boolean) => void>
+  inWorldRenderingConfig: WorldRendererConfig | undefined
 
   constructor (initOptions: GraphicsInitOptions) {
     this.config = initOptions.config
@@ -94,7 +96,7 @@ export class DocumentRenderer {
       if (this.disconnected) return
       this.animationFrameId = requestAnimationFrame(animate)
 
-      if (this.paused) return
+      if (this.paused || (this.renderer.xr.isPresenting && !this.inWorldRenderingConfig?.vrPageGameRendering)) return
 
       // Handle FPS limiting
       if (this.config.fpsLimit) {
@@ -117,18 +119,7 @@ export class DocumentRenderer {
         sizeChanged = true
       }
 
-      this.preRender()
-      this.stats.markStart()
-      tween.update()
-      if (!window.freezeRender) {
-        this.render(sizeChanged)
-      }
-      for (const fn of this.onRender) {
-        fn(sizeChanged)
-      }
-      this.renderedFps++
-      this.stats.markEnd()
-      this.postRender()
+      this.frameRender(sizeChanged)
 
       // Update stats visibility each frame
       if (this.config.statsVisible !== undefined) {
@@ -139,6 +130,21 @@ export class DocumentRenderer {
     animate()
   }
 
+  frameRender (sizeChanged: boolean) {
+    this.preRender()
+    this.stats.markStart()
+    tween.update()
+    if (!window.freezeRender) {
+      this.render(sizeChanged)
+    }
+    for (const fn of this.onRender) {
+      fn(sizeChanged)
+    }
+    this.renderedFps++
+    this.stats.markEnd()
+    this.postRender()
+  }
+
   setPaused (paused: boolean) {
     this.paused = paused
   }
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index 6ac068d7..37acfde9 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -8,6 +8,7 @@ import supportedVersions from '../../../src/supportedVersions.mjs'
 import { WorldRendererThree } from './worldrendererThree'
 import { DocumentRenderer } from './documentRenderer'
 import { PanoramaRenderer } from './panorama'
+import { initVR } from './world/vr'
 
 // https://discourse.threejs.org/t/updates-to-color-management-in-three-js-r152/50791
 THREE.ColorManagement.enabled = false
@@ -87,10 +88,12 @@ const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitO
       panoramaRenderer = null
     }
     worldRenderer = new WorldRendererThree(documentRenderer.renderer, initOptions, displayOptions)
+    void initVR(worldRenderer, documentRenderer)
     await worldRenderer.worldReadyPromise
     documentRenderer.render = (sizeChanged: boolean) => {
       worldRenderer?.render(sizeChanged)
     }
+    documentRenderer.inWorldRenderingConfig = displayOptions.inWorldRenderingConfig
     window.world = worldRenderer
     callModsMethod('worldReady', worldRenderer)
   }
diff --git a/renderer/viewer/three/world/vr.ts b/renderer/viewer/three/world/vr.ts
index 925ba0bb..c2665585 100644
--- a/renderer/viewer/three/world/vr.ts
+++ b/renderer/viewer/three/world/vr.ts
@@ -4,8 +4,9 @@ import { XRControllerModelFactory } from 'three/examples/jsm/webxr/XRControllerM
 import { buttonMap as standardButtonsMap } from 'contro-max/build/gamepad'
 import * as THREE from 'three'
 import { WorldRendererThree } from '../worldrendererThree'
+import { DocumentRenderer } from '../documentRenderer'
 
-export async function initVR (worldRenderer: WorldRendererThree) {
+export async function initVR (worldRenderer: WorldRendererThree, documentRenderer: DocumentRenderer) {
   if (!('xr' in navigator) || !worldRenderer.worldRendererConfig.vrSupport) return
   const { renderer } = worldRenderer
 
@@ -26,12 +27,13 @@ export async function initVR (worldRenderer: WorldRendererThree) {
 
   function enableVr () {
     renderer.xr.enabled = true
+    // renderer.xr.setReferenceSpaceType('local-floor')
     worldRenderer.reactiveState.preventEscapeMenu = true
   }
 
   function disableVr () {
     renderer.xr.enabled = false
-    worldRenderer.cameraObjectOverride = undefined
+    worldRenderer.cameraGroupVr = undefined
     worldRenderer.reactiveState.preventEscapeMenu = false
     worldRenderer.scene.remove(user)
     vrButtonContainer.hidden = true
@@ -189,7 +191,7 @@ export async function initVR (worldRenderer: WorldRendererThree) {
     }
 
     // appViewer.backend?.updateCamera(null, yawOffset, 0)
-    worldRenderer.updateCamera(null, bot.entity.yaw, bot.entity.pitch)
+    // worldRenderer.updateCamera(null, bot.entity.yaw, bot.entity.pitch)
 
     // todo restore this logic (need to preserve ability to move camera)
     // const xrCamera = renderer.xr.getCamera()
@@ -197,16 +199,13 @@ export async function initVR (worldRenderer: WorldRendererThree) {
     // bot.entity.yaw = Math.atan2(-d.x, -d.z)
     // bot.entity.pitch = Math.asin(d.y)
 
-    // todo ?
-    // bot.physics.stepHeight = 1
-
-    worldRenderer.render()
+    documentRenderer.frameRender(false)
   })
   renderer.xr.addEventListener('sessionstart', () => {
-    worldRenderer.cameraObjectOverride = user
+    worldRenderer.cameraGroupVr = user
   })
   renderer.xr.addEventListener('sessionend', () => {
-    worldRenderer.cameraObjectOverride = undefined
+    worldRenderer.cameraGroupVr = undefined
   })
 
   worldRenderer.abortController.signal.addEventListener('abort', disableVr)
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 5c16aa9a..f8641ab8 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -20,7 +20,6 @@ import { armorModel } from './entity/armorModels'
 import { disposeObject } from './threeJsUtils'
 import { CursorBlock } from './world/cursorBlock'
 import { getItemUv } from './appShared'
-import { initVR } from './world/vr'
 import { Entities } from './entities'
 import { ThreeJsSound } from './threeJsSound'
 import { CameraShake } from './cameraShake'
@@ -42,7 +41,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   ambientLight = new THREE.AmbientLight(0xcc_cc_cc)
   directionalLight = new THREE.DirectionalLight(0xff_ff_ff, 0.5)
   entities = new Entities(this)
-  cameraObjectOverride?: THREE.Object3D // for xr
+  cameraGroupVr?: THREE.Object3D
   material = new THREE.MeshLambertMaterial({ vertexColors: true, transparent: true, alphaTest: 0.1 })
   itemsTexture: THREE.Texture
   cursorBlock = new CursorBlock(this)
@@ -91,10 +90,9 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.addDebugOverlay()
     this.resetScene()
     void this.init()
-    void initVR(this)
 
     this.soundSystem = new ThreeJsSound(this)
-    this.cameraShake = new CameraShake(this.camera, this.onRender)
+    this.cameraShake = new CameraShake(this, this.onRender)
     this.media = new ThreeJsMedia(this)
     // this.fountain = new Fountain(this.scene, this.scene, {
     //   position: new THREE.Vector3(0, 10, 0),
@@ -106,6 +104,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.worldSwitchActions()
   }
 
+  get cameraObject () {
+    return this.cameraGroupVr || this.camera
+  }
+
   worldSwitchActions () {
     this.onWorldSwitched.push(() => {
       // clear custom blocks
@@ -301,7 +303,7 @@ export class WorldRendererThree extends WorldRendererCommon {
 
   updateViewerPosition (pos: Vec3): void {
     this.viewerPosition = pos
-    const cameraPos = this.camera.position.toArray().map(x => Math.floor(x / 16)) as [number, number, number]
+    const cameraPos = this.cameraObject.position.toArray().map(x => Math.floor(x / 16)) as [number, number, number]
     this.cameraSectionPos = new Vec3(...cameraPos)
     // eslint-disable-next-line guard-for-in
     for (const key in this.sectionObjects) {
@@ -429,10 +431,8 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number) {
-    const cam = this.cameraObjectOverride || this.camera
     const yOffset = this.displayOptions.playerState.getEyeHeight()
 
-    this.camera = cam as THREE.PerspectiveCamera
     this.updateCamera(pos?.offset(0, yOffset, 0) ?? null, yaw, pitch)
     this.media.tryIntersectMedia()
   }
@@ -445,7 +445,11 @@ export class WorldRendererThree extends WorldRendererCommon {
     // }
 
     if (pos) {
-      new tweenJs.Tween(this.camera.position).to({ x: pos.x, y: pos.y, z: pos.z }, 50).start()
+      if (this.renderer.xr.isPresenting) {
+        pos.y -= this.camera.position.y // Fix Y position of camera in world
+      }
+
+      new tweenJs.Tween(this.cameraObject.position).to({ x: pos.x, y: pos.y, z: pos.z }, 50).start()
       // this.freeFlyState.position = pos
     }
     this.cameraShake.setBaseRotation(pitch, yaw)
@@ -467,13 +471,13 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.entities.render()
 
     // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
-    const cam = this.camera instanceof THREE.Group ? this.camera.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
+    const cam = this.cameraGroupVr instanceof THREE.Group ? this.cameraGroupVr.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
 
-    if (this.displayOptions.inWorldRenderingConfig.showHand && !this.playerState.shouldHideHand /*  && !this.freeFlyMode */) {
-      this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
-      this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
-    }
+    // if (this.displayOptions.inWorldRenderingConfig.showHand && !this.playerState.shouldHideHand /*  && !this.freeFlyMode */) {
+    //   this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
+    //   this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
+    // }
 
     for (const fountain of this.fountains) {
       if (this.sectionObjects[fountain.sectionId] && !this.sectionObjects[fountain.sectionId].foutain) {
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 90ca847f..f4a21481 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -199,7 +199,7 @@ export class AppViewer {
   resetBackend (cleanState = false) {
     this.disconnectBackend(cleanState)
     if (this.backendLoader) {
-      this.loadBackend(this.backendLoader)
+      void this.loadBackend(this.backendLoader)
     }
   }
 
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index ede367f5..7f4c34ab 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -488,7 +488,11 @@ export const guiOptionsScheme: {
           </>
         )
       },
-      vrSupport: {}
+      vrSupport: {},
+      vrPageGameRendering: {
+        text: 'Page Game Rendering',
+        tooltip: 'Wether to continue rendering page even when vr is active.',
+      }
     },
   ],
   advanced: [
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index ab164454..a0c995a0 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -104,6 +104,7 @@ const defaultOptions = {
   autoJump: 'auto' as 'auto' | 'always' | 'never',
   autoParkour: false,
   vrSupport: true, // doesn't directly affect the VR mode, should only disable the button which is annoying to android users
+  vrPageGameRendering: false,
   renderDebug: 'basic' as 'none' | 'advanced' | 'basic',
 
   // advanced bot options
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 9fe55289..903d7da8 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -80,6 +80,11 @@ export const watchOptionsAfterViewerInit = () => {
     updateFpsLimit(o)
   })
 
+  watchValue(options, o => {
+    appViewer.inWorldRenderingConfig.vrSupport = o.vrSupport
+    appViewer.inWorldRenderingConfig.vrPageGameRendering = o.vrPageGameRendering
+  })
+
   watchValue(options, (o, isChanged) => {
     appViewer.inWorldRenderingConfig.clipWorldBelowY = o.clipWorldBelowY
     appViewer.inWorldRenderingConfig.extraBlockRenderers = !o.disableSignsMapsSupport

From 99d05fc94b0608196e48738102de6114a02c6b54 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 25 May 2025 16:16:14 +0300
Subject: [PATCH 577/753] improve stability of minimap (though full refactor is
 still needed)

---
 renderer/viewer/lib/mesher/mesher.ts       | 8 +++++---
 renderer/viewer/lib/mesher/shared.ts       | 2 ++
 renderer/viewer/lib/worldrendererCommon.ts | 4 +++-
 src/react/MinimapProvider.tsx              | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index 66621f22..bcfbde89 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -2,6 +2,7 @@ import { Vec3 } from 'vec3'
 import { World } from './world'
 import { getSectionGeometry, setBlockStatesData as setMesherData } from './models'
 import { BlockStateModelInfo } from './shared'
+import { INVISIBLE_BLOCKS } from './worldConstants'
 
 globalThis.structuredClone ??= (value) => JSON.parse(JSON.stringify(value))
 
@@ -156,10 +157,11 @@ const handleMessage = data => {
         for (let x = 0; x < 16; x++) {
           const blockX = x + data.x
           const blockZ = z + data.z
-          blockPos.x = blockX; blockPos.z = blockZ
-          blockPos.y = 256
+          blockPos.x = blockX
+          blockPos.z = blockZ
+          blockPos.y = world.config.worldMaxY
           let block = world.getBlock(blockPos)
-          while (block?.name.includes('air')) {
+          while (block && INVISIBLE_BLOCKS.has(block.name)) {
             blockPos.y -= 1
             block = world.getBlock(blockPos)
           }
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index 16b89a71..82416fab 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -3,6 +3,8 @@ import { BlockType } from '../../../playground/shared'
 // only here for easier testing
 export const defaultMesherConfig = {
   version: '',
+  worldMaxY: 256,
+  worldMinY: 0,
   enableLighting: true,
   skyLight: 15,
   smoothLighting: true,
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 26e3bf2e..3f517beb 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -560,7 +560,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       textureSize: this.resourcesManager.currentResources!.blocksAtlasParser.atlas.latest.width,
       debugModelVariant: undefined,
       clipWorldBelowY: this.worldRendererConfig.clipWorldBelowY,
-      disableSignsMapsSupport: !this.worldRendererConfig.extraBlockRenderers
+      disableSignsMapsSupport: !this.worldRendererConfig.extraBlockRenderers,
+      worldMinY: this.worldMinYRender,
+      worldMaxY: this.worldMinYRender + this.worldSizeParams.worldHeight,
     }
   }
 
diff --git a/src/react/MinimapProvider.tsx b/src/react/MinimapProvider.tsx
index afb6a198..26a15134 100644
--- a/src/react/MinimapProvider.tsx
+++ b/src/react/MinimapProvider.tsx
@@ -45,7 +45,7 @@ export class DrawerAdapterImpl extends TypedEventEmitter<MapUpdates> implements
   chunksStore = new Map<string, undefined | null | 'requested' | ChunkInfo>()
   loadingChunksQueue = new Set<string>()
   loadChunk: (key: string) => Promise<void> = this.loadChunkMinimap
-  mapDrawer = new MinimapDrawer(this.loadChunk, this.warps, this.loadingChunksQueue, this.chunksStore)
+  mapDrawer = new MinimapDrawer(this.loadChunk.bind(this), this.warps, this.loadingChunksQueue, this.chunksStore)
   currChunk: PCChunk | undefined
   currChunkPos: { x: number, z: number } = { x: 0, z: 0 }
   isOldVersion: boolean

From 50907138f7803987bd148b3ba490e25d4fbf7b6a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 26 May 2025 01:09:43 +0300
Subject: [PATCH 578/753] fix edge case infinite loop in mesher

---
 renderer/viewer/lib/mesher/mesher.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index bcfbde89..f26d8022 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -161,7 +161,7 @@ const handleMessage = data => {
           blockPos.z = blockZ
           blockPos.y = world.config.worldMaxY
           let block = world.getBlock(blockPos)
-          while (block && INVISIBLE_BLOCKS.has(block.name)) {
+          while (block && INVISIBLE_BLOCKS.has(block.name) && blockPos.y > world.config.worldMinY) {
             blockPos.y -= 1
             block = world.getBlock(blockPos)
           }

From c500d08ed7e14e7ecbec76393a4a1c13e59d4dec Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 27 May 2025 11:30:21 +0300
Subject: [PATCH 579/753] hotfix: restore hand

---
 renderer/viewer/three/worldrendererThree.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index f8641ab8..d2d54998 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -474,10 +474,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     const cam = this.cameraGroupVr instanceof THREE.Group ? this.cameraGroupVr.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
 
-    // if (this.displayOptions.inWorldRenderingConfig.showHand && !this.playerState.shouldHideHand /*  && !this.freeFlyMode */) {
-    //   this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
-    //   this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
-    // }
+    if (this.displayOptions.inWorldRenderingConfig.showHand && !this.playerState.shouldHideHand /*  && !this.freeFlyMode */ && !this.renderer.xr.isPresenting) {
+      this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
+      this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
+    }
 
     for (const fountain of this.fountains) {
       if (this.sectionObjects[fountain.sectionId] && !this.sectionObjects[fountain.sectionId].foutain) {

From 087e167826d6bf488410d3d46581103f330811fd Mon Sep 17 00:00:00 2001
From: Maksim Grigorev <gmi1987@gmail.com>
Date: Fri, 30 May 2025 16:43:06 +0300
Subject: [PATCH 580/753] feat: configurable mobile top buttons! (#361)

---
 config.json                                |  30 ++-
 src/appConfig.ts                           |  22 +++
 src/controls.ts                            | 105 ++++++++++-
 src/globalState.ts                         |   1 +
 src/react/DebugOverlay.tsx                 |   8 +-
 src/react/MobileTopButtons.module.css      |  14 ++
 src/react/MobileTopButtons.module.css.d.ts |   2 +
 src/react/MobileTopButtons.tsx             | 209 ++++++++++++++-------
 8 files changed, 311 insertions(+), 80 deletions(-)

diff --git a/config.json b/config.json
index 29f011c0..3696af7a 100644
--- a/config.json
+++ b/config.json
@@ -37,5 +37,33 @@
         "type": "discord"
       }
     ]
+  ],
+  "mobileButtons": [
+    {
+      "action": "general.drop",
+      "actionHold": "",
+      "label": "Q"
+    },
+    {
+      "action": "general.debugOverlay",
+      "actionHold": "general.debugOverlayHelpMenu",
+      "label": "F3"
+    },
+     {
+      "action": "general.playersList",
+      "actionHold": "",
+      "icon": "pixelarticons:users",
+      "label": "TAB"
+    },
+    {
+      "action": "general.chat",
+      "actionHold": "",
+      "label": ""
+    },
+    {
+      "action": "ui.back",
+      "actionHold": "",
+      "label": ""
+    }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/appConfig.ts b/src/appConfig.ts
index 769ef14d..48b3665a 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -5,6 +5,27 @@ import { setLoadingScreenStatus } from './appStatus'
 import { setStorageDataOnAppConfigLoad } from './react/appStorageProvider'
 import { customKeymaps, updateBinds } from './controls'
 
+export type CustomAction = {
+  readonly type: string
+  readonly input: readonly any[]
+}
+
+export type ActionType = string | CustomAction
+
+export type ActionHoldConfig = {
+  readonly command: ActionType
+  readonly longPressAction?: ActionType
+  readonly duration?: number
+  readonly threshold?: number
+}
+
+export type MobileButtonConfig = {
+  readonly label?: string
+  readonly icon?: string
+  readonly action?: ActionType
+  readonly actionHold?: ActionType | ActionHoldConfig
+}
+
 export type AppConfig = {
   // defaultHost?: string
   // defaultHostSave?: string
@@ -26,6 +47,7 @@ export type AppConfig = {
   splashText?: string
   splashTextFallback?: string
   pauseLinks?: Array<Array<Record<string, any>>>
+  mobileButtons?: MobileButtonConfig[]
   keybindings?: Record<string, any>
   defaultLanguage?: string
   displayLanguageSelector?: boolean
diff --git a/src/controls.ts b/src/controls.ts
index d1e9b1e4..3a39798c 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -28,6 +28,7 @@ import { createNotificationProgressReporter } from './core/progressReporter'
 import { appStorage } from './react/appStorageProvider'
 import { switchGameMode } from './packetsReplay/replayPackets'
 import { tabListState } from './react/PlayerListOverlayProvider'
+import { type ActionType, type ActionHoldConfig, type CustomAction } from './appConfig'
 
 
 export const customKeymaps = proxy(appStorage.keybindings)
@@ -55,7 +56,7 @@ export const contro = new ControMax({
       attackDestroy: [null, 'Right Trigger'],
       interactPlace: [null, 'Left Trigger'],
       swapHands: ['KeyF'],
-      selectItem: ['KeyH'], // default will be removed
+      selectItem: ['KeyH'],
       rotateCameraLeft: [null],
       rotateCameraRight: [null],
       rotateCameraUp: [null],
@@ -63,10 +64,12 @@ export const contro = new ControMax({
       // ui?
       chat: [['KeyT', 'Enter']],
       command: ['Slash'],
+      playersList: ['Tab'],
+      debugOverlay: ['F3'],
+      debugOverlayHelpMenu: [null],
       // client side
       zoom: ['KeyC'],
       viewerConsole: ['Backquote'],
-      playersList: ['Tab'],
     },
     ui: {
       toggleFullscreen: ['F11'],
@@ -234,7 +237,7 @@ const inModalCommand = (command: Command, pressed: boolean) => {
   if (pressed && !gamepadUiCursorState.display) return
 
   if (pressed) {
-    if (command === 'ui.back') {
+    if (command === 'ui.back' || command === 'ui.pauseMenu') {
       hideCurrentModal()
     }
     if (command === 'ui.leftClick' || command === 'ui.rightClick') {
@@ -401,6 +404,27 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
       case 'general.zoom':
         gameAdditionalState.isZooming = pressed
         break
+      case 'general.debugOverlay':
+        if (pressed) {
+          hardcodedPressedKeys.add('F3')
+          const pressedKey = [...contro.pressedKeys].find(key => key !== 'F3')
+          if (pressedKey) {
+            const keybind = f3Keybinds.find((v) => v.key === pressedKey)
+            if (keybind && (keybind.enabled?.() ?? true)) {
+              void keybind.action()
+            }
+          } else {
+            miscUiState.showDebugHud = !miscUiState.showDebugHud
+          }
+        } else {
+          hardcodedPressedKeys.delete('F3')
+        }
+        break
+      case 'general.debugOverlayHelpMenu':
+        if (pressed) {
+          void onF3LongPress()
+        }
+        break
       case 'general.rotateCameraLeft':
       case 'general.rotateCameraRight':
       case 'general.rotateCameraUp':
@@ -411,6 +435,26 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
         tabListState.isOpen = pressed
         break
     }
+  } else if (stringStartsWith(command, 'ui')) {
+    switch (command) {
+      case 'ui.back':
+      case 'ui.pauseMenu':
+        if (pressed) {
+          if (activeModalStack.length) {
+            hideCurrentModal()
+          } else {
+            showModal({ reactType: 'pause-screen' })
+          }
+        }
+        break
+      case 'ui.toggleFullscreen':
+      case 'ui.toggleMap':
+      case 'ui.leftClick':
+      case 'ui.rightClick':
+      case 'ui.speedupCursor':
+        // These are handled elsewhere
+        break
+    }
   }
 }
 
@@ -499,6 +543,8 @@ contro.on('trigger', ({ command }) => {
       case 'general.rotateCameraRight':
       case 'general.rotateCameraUp':
       case 'general.rotateCameraDown':
+      case 'general.debugOverlay':
+      case 'general.debugOverlayHelpMenu':
       case 'general.playersList':
         // no-op
         break
@@ -567,10 +613,6 @@ contro.on('trigger', ({ command }) => {
     // toggleMicrophoneMuted()
   }
 
-  if (command === 'ui.pauseMenu') {
-    showModal({ reactType: 'pause-screen' })
-  }
-
   if (command === 'ui.toggleFullscreen') {
     void goFullscreen(true)
   }
@@ -893,3 +935,52 @@ export function updateBinds (commands: any) {
     }))
   }
 }
+
+export const onF3LongPress = async () => {
+  const select = await showOptionsModal('', f3Keybinds.filter(f3Keybind => {
+    return f3Keybind.mobileTitle && (f3Keybind.enabled?.() ?? true)
+  }).map(f3Keybind => {
+    return `${f3Keybind.mobileTitle}${f3Keybind.key ? ` (F3+${f3Keybind.key})` : ''}`
+  }))
+  if (!select) return
+  const f3Keybind = f3Keybinds.find(f3Keybind => f3Keybind.mobileTitle === select)
+  if (f3Keybind) void f3Keybind.action()
+}
+
+export const handleMobileButtonCustomAction = (action: CustomAction) => {
+  const handler = customCommandsConfig[action.type]?.handler
+  if (handler) {
+    handler([...action.input])
+  }
+}
+
+export const handleMobileButtonActionCommand = (command: ActionType | ActionHoldConfig, isDown: boolean) => {
+  const commandValue = typeof command === 'string' ? command : 'command' in command ? command.command : command
+
+  if (typeof commandValue === 'string' && !stringStartsWith(commandValue, 'custom')) {
+    const event: CommandEventArgument<typeof contro['_commandsRaw']> = {
+      command: commandValue as Command,
+      schema: {
+        keys: [],
+        gamepad: []
+      }
+    }
+    if (isDown) {
+      contro.emit('trigger', event)
+    } else {
+      contro.emit('release', event)
+    }
+  } else if (typeof commandValue === 'object') {
+    if (isDown) {
+      handleMobileButtonCustomAction(commandValue)
+    }
+  }
+}
+
+export const handleMobileButtonLongPress = (actionHold: ActionHoldConfig) => {
+  if (typeof actionHold.longPressAction === 'string' && actionHold.longPressAction === 'general.debugOverlayHelpMenu') {
+    void onF3LongPress()
+  } else if (actionHold.longPressAction) {
+    handleMobileButtonActionCommand(actionHold.longPressAction, true)
+  }
+}
diff --git a/src/globalState.ts b/src/globalState.ts
index bd845195..671d7907 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -121,6 +121,7 @@ export const miscUiState = proxy({
   /** wether game hud is shown (in playing state) */
   gameLoaded: false,
   showUI: true,
+  showDebugHud: false,
   loadedServerIndex: '',
   /** currently trying to load or loaded mc version, after all data is loaded */
   loadedDataVersion: null as string | null,
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index 25c102b7..7b22c96a 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -1,6 +1,8 @@
 import { useEffect, useRef, useState } from 'react'
+import { useSnapshot } from 'valtio'
 import type { Block } from 'prismarine-block'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
+import { miscUiState } from '../globalState'
 import { getFixedFilesize } from '../downloadAndOpenFile'
 import { options } from '../optionsStorage'
 import { BlockStateModelInfo } from '../../renderer/viewer/lib/mesher/shared'
@@ -28,7 +30,7 @@ export default () => {
   window.packetsCountByName = packetsCountByName
   const ignoredPackets = useRef(new Set([] as any[]))
   const [packetsString, setPacketsString] = useState('')
-  const [showDebug, setShowDebug] = useState(false)
+  const { showDebugHud } = useSnapshot(miscUiState)
   const [pos, setPos] = useState<{ x: number, y: number, z: number }>({ x: 0, y: 0, z: 0 })
   const [skyL, setSkyL] = useState(0)
   const [blockL, setBlockL] = useState(0)
@@ -55,7 +57,7 @@ export default () => {
 
   const handleF3 = (e) => {
     if (e.code === 'F3') {
-      setShowDebug(prev => !prev)
+      miscUiState.showDebugHud = !miscUiState.showDebugHud
       e.preventDefault()
     }
   }
@@ -174,7 +176,7 @@ export default () => {
     minecraftQuad.current = Math.floor(((minecraftYaw.current + 180) / 90 + 0.5) % 4)
   }, [bot.entity.yaw])
 
-  if (!showDebug) return null
+  if (!showDebugHud) return null
 
   return <>
     <div className={`debug-left-side ${styles['debug-left-side']}`}>
diff --git a/src/react/MobileTopButtons.module.css b/src/react/MobileTopButtons.module.css
index d1692f8b..55246492 100644
--- a/src/react/MobileTopButtons.module.css
+++ b/src/react/MobileTopButtons.module.css
@@ -35,3 +35,17 @@
   padding: 4px 6px;
   outline: 0.5px solid white;
 }
+
+.tab-btn {
+  color: #fff;
+  background: #9c8c86;
+  outline: .5px solid #fff;
+  padding: 4px 6px;
+  font-family: pixelarticons, mojangles, monospace;
+  font-size: 8px;
+}
+
+.tab-btn:has(> div) {
+  padding: 3px 5px;
+  font-size: 12px;
+}
diff --git a/src/react/MobileTopButtons.module.css.d.ts b/src/react/MobileTopButtons.module.css.d.ts
index 859cc929..6b38dde0 100644
--- a/src/react/MobileTopButtons.module.css.d.ts
+++ b/src/react/MobileTopButtons.module.css.d.ts
@@ -9,6 +9,8 @@ interface CssExports {
   mobileTopBtns: string;
   'pause-btn': string;
   pauseBtn: string;
+  'tab-btn': string;
+  tabBtn: string;
 }
 declare const cssExports: CssExports;
 export default cssExports;
diff --git a/src/react/MobileTopButtons.tsx b/src/react/MobileTopButtons.tsx
index a2f1a1da..e8a82f77 100644
--- a/src/react/MobileTopButtons.tsx
+++ b/src/react/MobileTopButtons.tsx
@@ -1,91 +1,162 @@
 import { useEffect, useRef } from 'react'
-import { f3Keybinds } from '../controls'
+import { useSnapshot } from 'valtio'
+import { handleMobileButtonActionCommand, handleMobileButtonLongPress } from '../controls'
 import { watchValue } from '../optionsStorage'
-import { showModal, miscUiState, activeModalStack, hideCurrentModal } from '../globalState'
-import { showOptionsModal } from './SelectOption'
-import useLongPress from './useLongPress'
+import { type MobileButtonConfig, type ActionHoldConfig, type ActionType, type CustomAction } from '../appConfig'
+import { miscUiState } from '../globalState'
+import PixelartIcon from './PixelartIcon'
 import styles from './MobileTopButtons.module.css'
 
-
 export default () => {
   const elRef = useRef<HTMLDivElement | null>(null)
+  const { appConfig } = useSnapshot(miscUiState)
+  const mobileButtonsConfig = appConfig?.mobileButtons
 
-  const showMobileControls = (bl) => {
-    if (elRef.current) elRef.current.style.display = bl ? 'flex' : 'none'
+  const longPressTimerIdRef = useRef<number | null>(null)
+  const actionToShortPressRef = useRef<ActionType | null>(null)
+
+  const showMobileControls = (visible: boolean) => {
+    if (elRef.current) {
+      elRef.current.style.display = visible ? 'flex' : 'none'
+    }
   }
 
   useEffect(() => {
     watchValue(miscUiState, o => {
-      showMobileControls(o.currentTouch)
+      showMobileControls(Boolean(o.currentTouch))
     })
   }, [])
 
-  const onLongPress = async () => {
-    const select = await showOptionsModal('', f3Keybinds.filter(f3Keybind => {
-      return f3Keybind.mobileTitle && (f3Keybind.enabled?.() ?? true)
-    }).map(f3Keybind => {
-      return `${f3Keybind.mobileTitle}${f3Keybind.key ? ` (F3+${f3Keybind.key})` : ''}`
-    }))
-    if (!select) return
-    const f3Keybind = f3Keybinds.find(f3Keybind => f3Keybind.mobileTitle === select)
-    if (f3Keybind) void f3Keybind.action()
-  }
+  const getButtonClassName = (button: MobileButtonConfig): string => {
+    const actionForStyle = button.action || (button.actionHold && typeof button.actionHold === 'object' && 'command' in button.actionHold ? button.actionHold.command : undefined)
 
-  const defaultOptions = {
-    shouldPreventDefault: true,
-    delay: 500,
-  }
-  const longPressEvent = useLongPress(onLongPress, () => {}, defaultOptions)
-
-
-  const onChatLongPress = () => {
-    document.dispatchEvent(new KeyboardEvent('keydown', { key: 'Tab' }))
-  }
-
-  const onChatClick = () => {
-    if (activeModalStack.at(-1)?.reactType === 'chat') {
-      hideCurrentModal()
-    } else {
-      showModal({ reactType: 'chat' })
+    if (typeof actionForStyle === 'string') {
+      switch (actionForStyle) {
+        case 'general.chat':
+          return styles['chat-btn']
+        case 'ui.back':
+          return styles['pause-btn']
+        case 'general.playersList':
+          return styles['tab-btn']
+        default:
+          return styles['debug-btn']
+      }
     }
+    return styles['debug-btn']
   }
 
-  const chatLongPressEvent = useLongPress(
-    onChatLongPress,
-    onChatClick,
-    {
-      shouldPreventDefault: true,
-      delay: 300,
-    }
-  )
+  const renderConfigButtons = () => {
+    return mobileButtonsConfig?.map((button, index) => {
+      const className = getButtonClassName(button)
+      let label: string | JSX.Element = button.icon || button.label || ''
+
+      if (typeof label === 'string' && label.startsWith('pixelarticons:')) {
+        const iconName = label.replace('pixelarticons:', '')
+        label = <PixelartIcon iconName={iconName} />
+      }
+
+      const onPointerDown = (e: React.PointerEvent) => {
+        const elem = e.currentTarget as HTMLElement
+        elem.setPointerCapture(e.pointerId)
+
+        if (longPressTimerIdRef.current) {
+          clearTimeout(longPressTimerIdRef.current)
+          longPressTimerIdRef.current = null
+        }
+        actionToShortPressRef.current = null
+
+        const { actionHold, action } = button
+
+        if (actionHold) {
+          if (typeof actionHold === 'object' && 'command' in actionHold) {
+            const config = actionHold
+            if (config.longPressAction) {
+              actionToShortPressRef.current = config.command
+              longPressTimerIdRef.current = window.setTimeout(() => {
+                handleMobileButtonLongPress(config)
+                actionToShortPressRef.current = null
+                longPressTimerIdRef.current = null
+              }, config.duration || 500)
+            } else {
+              handleMobileButtonActionCommand(config.command, true)
+            }
+          } else if (action) {
+            actionToShortPressRef.current = action
+            longPressTimerIdRef.current = window.setTimeout(() => {
+              handleMobileButtonActionCommand(actionHold, true)
+              actionToShortPressRef.current = null
+              longPressTimerIdRef.current = null
+            }, 500)
+          } else {
+            handleMobileButtonActionCommand(actionHold, true)
+          }
+        } else if (action) {
+          handleMobileButtonActionCommand(action, true)
+        }
+      }
+
+      const onPointerUp = (e: React.PointerEvent) => {
+        const elem = e.currentTarget as HTMLElement
+        elem.releasePointerCapture(e.pointerId)
+
+        const { actionHold, action } = button
+        let wasShortPressHandled = false
+
+        if (longPressTimerIdRef.current) {
+          clearTimeout(longPressTimerIdRef.current)
+          longPressTimerIdRef.current = null
+          if (actionToShortPressRef.current) {
+            handleMobileButtonActionCommand(actionToShortPressRef.current, true)
+            handleMobileButtonActionCommand(actionToShortPressRef.current, false)
+            wasShortPressHandled = true
+          }
+        }
+
+        if (!wasShortPressHandled) {
+          if (actionHold) {
+            if (typeof actionHold === 'object' && 'command' in actionHold) {
+              const config = actionHold
+              if (config.longPressAction) {
+                if (actionToShortPressRef.current === null) {
+                  if (typeof config.longPressAction === 'string') {
+                    handleMobileButtonActionCommand(config.longPressAction, false)
+                  }
+                }
+              } else {
+                handleMobileButtonActionCommand(config.command, false)
+              }
+            } else if (action) {
+              if (actionToShortPressRef.current === null) {
+                handleMobileButtonActionCommand(actionHold, false)
+              }
+            } else {
+              handleMobileButtonActionCommand(actionHold, false)
+            }
+          } else if (action) {
+            handleMobileButtonActionCommand(action, false)
+          }
+        }
+        actionToShortPressRef.current = null
+      }
+
+      return (
+        <div
+          key={index}
+          className={className}
+          onPointerDown={onPointerDown}
+          onPointerUp={onPointerUp}
+          onLostPointerCapture={onPointerUp}
+        >
+          {label}
+        </div>
+      )
+    })
+  }
 
   // ios note: just don't use <button>
-  return <div ref={elRef} className={styles['mobile-top-btns']} id="mobile-top">
-    <div
-      className={styles['debug-btn']} onPointerDown={(e) => {
-        window.dispatchEvent(new MouseEvent('mousedown', { button: 1 }))
-      }}
-    >S
+  return (
+    <div ref={elRef} className={styles['mobile-top-btns']} id="mobile-top">
+      {mobileButtonsConfig && mobileButtonsConfig.length > 0 ? renderConfigButtons() : null}
     </div>
-    <div
-      className={styles['debug-btn']} onPointerDown={(e) => {
-        document.dispatchEvent(new KeyboardEvent('keydown', { code: 'F3' }))
-        document.dispatchEvent(new KeyboardEvent('keyup', { code: 'F3' }))
-      }} {...longPressEvent}
-    >F3
-    </div>
-    <div
-      className={styles['chat-btn']}
-      {...chatLongPressEvent}
-      onPointerUp={(e) => {
-        document.dispatchEvent(new KeyboardEvent('keyup', { key: 'Tab' }))
-      }}
-    />
-    <div
-      className={styles['pause-btn']} onPointerDown={(e) => {
-        e.stopPropagation()
-        showModal({ reactType: 'pause-screen' })
-      }}
-    />
-  </div>
+  )
 }

From 76353754710ee43d400760d07b4d567cd5f5bdfa Mon Sep 17 00:00:00 2001
From: Maksim Grigorev <gmi1987@gmail.com>
Date: Tue, 3 Jun 2025 13:14:34 +0300
Subject: [PATCH 581/753] Resolve issue with non-functional F3 key (#365)

---
 src/controls.ts            | 1 -
 src/react/DebugOverlay.tsx | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/src/controls.ts b/src/controls.ts
index 3a39798c..32d33fc7 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -30,7 +30,6 @@ import { switchGameMode } from './packetsReplay/replayPackets'
 import { tabListState } from './react/PlayerListOverlayProvider'
 import { type ActionType, type ActionHoldConfig, type CustomAction } from './appConfig'
 
-
 export const customKeymaps = proxy(appStorage.keybindings)
 subscribe(customKeymaps, () => {
   appStorage.keybindings = customKeymaps
diff --git a/src/react/DebugOverlay.tsx b/src/react/DebugOverlay.tsx
index 7b22c96a..8e42fd38 100644
--- a/src/react/DebugOverlay.tsx
+++ b/src/react/DebugOverlay.tsx
@@ -55,13 +55,6 @@ export default () => {
 
   const viewDegToMinecraft = (yaw) => yaw % 360 - 180 * (yaw < 0 ? -1 : 1)
 
-  const handleF3 = (e) => {
-    if (e.code === 'F3') {
-      miscUiState.showDebugHud = !miscUiState.showDebugHud
-      e.preventDefault()
-    }
-  }
-
   const readPacket = (data, { name }, _buf, fullBuffer) => {
     if (fullBuffer) {
       const size = fullBuffer.byteLength
@@ -107,7 +100,6 @@ export default () => {
       }
     }
 
-    document.addEventListener('keydown', handleF3)
     let update = 0
     const packetsUpdateInterval = setInterval(() => {
       setPacketsString(`↓ ${received.current.count} (${(received.current.size / 1024).toFixed(2)} KB/s, ${getFixedFilesize(receivedTotal.current)}) ↑ ${sent.current.count}`)
@@ -163,7 +155,6 @@ export default () => {
     })
 
     return () => {
-      document.removeEventListener('keydown', handleF3)
       clearInterval(packetsUpdateInterval)
       clearInterval(freqUpdateInterval)
       clearInterval(notFrequentUpdateInterval)

From 8b2276a7ae04cb7d3ca89e6ec2a297558cd029dc Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 4 Jun 2025 15:07:00 +0100
Subject: [PATCH 582/753] Add server-side logging and timeout option (#366)

---
 server.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/server.js b/server.js
index 20e66051..49699cdb 100644
--- a/server.js
+++ b/server.js
@@ -16,9 +16,23 @@ try {
 const app = express()
 
 const isProd = process.argv.includes('--prod') || process.env.NODE_ENV === 'production'
+const timeoutIndex = process.argv.indexOf('--timeout')
+let timeout = timeoutIndex > -1 && timeoutIndex + 1 < process.argv.length
+    ? parseInt(process.argv[timeoutIndex + 1])
+    : process.env.TIMEOUT
+        ? parseInt(process.env.TIMEOUT)
+        : 10000
+if (isNaN(timeout) || timeout < 0) {
+  console.warn('Invalid timeout value provided, using default of 10000ms')
+  timeout = 10000
+}
 app.use(compression())
 app.use(cors())
-app.use(netApi({ allowOrigin: '*' }))
+app.use(netApi({
+  allowOrigin: '*',
+  log: process.argv.includes('--log') || process.env.LOG === 'true',
+  timeout
+}))
 if (!isProd) {
   app.use('/sounds', express.static(path.join(__dirname, './generated/sounds/')))
 }

From 829e588ac1ee0f6fe02bf455cdb4220d099225a9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 5 Jun 2025 03:32:09 +0300
Subject: [PATCH 583/753] fix F3 handling when other keys are pressed
 (restore), adjust mic button

---
 src/controls.ts | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/src/controls.ts b/src/controls.ts
index 32d33fc7..3aeae2b8 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -80,7 +80,7 @@ export const contro = new ControMax({
       pauseMenu: [null, 'Start']
     },
     communication: {
-      toggleMicrophone: ['KeyK'],
+      toggleMicrophone: ['KeyM'],
     },
     advanced: {
       lockUrl: ['KeyY'],
@@ -405,18 +405,7 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
         break
       case 'general.debugOverlay':
         if (pressed) {
-          hardcodedPressedKeys.add('F3')
-          const pressedKey = [...contro.pressedKeys].find(key => key !== 'F3')
-          if (pressedKey) {
-            const keybind = f3Keybinds.find((v) => v.key === pressedKey)
-            if (keybind && (keybind.enabled?.() ?? true)) {
-              void keybind.action()
-            }
-          } else {
-            miscUiState.showDebugHud = !miscUiState.showDebugHud
-          }
-        } else {
-          hardcodedPressedKeys.delete('F3')
+          miscUiState.showDebugHud = !miscUiState.showDebugHud
         }
         break
       case 'general.debugOverlayHelpMenu':
@@ -469,6 +458,9 @@ const alwaysPressedHandledCommand = (command: Command) => {
   if (command === 'advanced.lockUrl') {
     lockUrl()
   }
+  if (command === 'communication.toggleMicrophone') {
+    toggleMicrophoneMuted?.()
+  }
 }
 
 export function lockUrl () {
@@ -608,10 +600,6 @@ contro.on('trigger', ({ command }) => {
     }
   }
 
-  if (command === 'communication.toggleMicrophone') {
-    // toggleMicrophoneMuted()
-  }
-
   if (command === 'ui.toggleFullscreen') {
     void goFullscreen(true)
   }
@@ -755,30 +743,18 @@ export const f3Keybinds: Array<{
   }
 ]
 
-const hardcodedPressedKeys = new Set<string>()
 document.addEventListener('keydown', (e) => {
   if (!isGameActive(false)) return
-  if (hardcodedPressedKeys.has('F3')) {
+  if (contro.pressedKeys.has('F3')) {
     const keybind = f3Keybinds.find((v) => v.key === e.code)
     if (keybind && (keybind.enabled?.() ?? true)) {
       void keybind.action()
       e.stopPropagation()
     }
-    return
   }
-
-  hardcodedPressedKeys.add(e.code)
 }, {
   capture: true,
 })
-document.addEventListener('keyup', (e) => {
-  hardcodedPressedKeys.delete(e.code)
-})
-document.addEventListener('visibilitychange', (e) => {
-  if (document.visibilityState === 'hidden') {
-    hardcodedPressedKeys.clear()
-  }
-})
 
 const isFlying = () => (bot.entity as any).flying
 

From 314ddf7215b665c902a85ae8bde490692acc5a9a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 5 Jun 2025 03:37:17 +0300
Subject: [PATCH 584/753] mobile: add back select item button, drop stack on
 hold action (add command!)

---
 config.json     | 9 +++++++--
 src/controls.ts | 7 +++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/config.json b/config.json
index 3696af7a..755de450 100644
--- a/config.json
+++ b/config.json
@@ -41,15 +41,20 @@
   "mobileButtons": [
     {
       "action": "general.drop",
-      "actionHold": "",
+      "actionHold": "general.dropStack",
       "label": "Q"
     },
+    {
+      "action": "general.selectItem",
+      "actionHold": "",
+      "label": "S"
+    },
     {
       "action": "general.debugOverlay",
       "actionHold": "general.debugOverlayHelpMenu",
       "label": "F3"
     },
-     {
+    {
       "action": "general.playersList",
       "actionHold": "",
       "icon": "pixelarticons:users",
diff --git a/src/controls.ts b/src/controls.ts
index 3aeae2b8..bc620ad4 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -46,6 +46,7 @@ export const contro = new ControMax({
       jump: ['Space', 'A'],
       inventory: ['KeyE', 'X'],
       drop: ['KeyQ', 'B'],
+      dropStack: [null],
       sneak: ['ShiftLeft'],
       toggleSneakOrDown: [null, 'Right Stick'],
       sprint: ['ControlLeft', 'Left Stick'],
@@ -574,6 +575,12 @@ contro.on('trigger', ({ command }) => {
         }
         break
       }
+      case 'general.dropStack': {
+        if (bot.heldItem) {
+          void bot.tossStack(bot.heldItem)
+        }
+        break
+      }
       case 'general.chat':
         showModal({ reactType: 'chat' })
         break

From 38a1d83cf284bf49d9eda0ed91c5bb62f35eded7 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 5 Jun 2025 04:07:22 +0300
Subject: [PATCH 585/753] fix(regression): B on gamepad was opening pause menu
 instead of start (default actions map conflict). Now start if clicked again
 closes all modals

---
 config.json                    | 2 +-
 src/controls.ts                | 8 ++++++--
 src/react/MobileTopButtons.tsx | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config.json b/config.json
index 755de450..bdfd28b2 100644
--- a/config.json
+++ b/config.json
@@ -66,7 +66,7 @@
       "label": ""
     },
     {
-      "action": "ui.back",
+      "action": "ui.pauseMenu",
       "actionHold": "",
       "label": ""
     }
diff --git a/src/controls.ts b/src/controls.ts
index bc620ad4..e270750e 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -237,9 +237,13 @@ const inModalCommand = (command: Command, pressed: boolean) => {
   if (pressed && !gamepadUiCursorState.display) return
 
   if (pressed) {
-    if (command === 'ui.back' || command === 'ui.pauseMenu') {
+    if (command === 'ui.back') {
       hideCurrentModal()
     }
+    if (command === 'ui.pauseMenu') {
+      // hide all modals
+      hideAllModals()
+    }
     if (command === 'ui.leftClick' || command === 'ui.rightClick') {
       // in percent
       const { x, y } = gamepadUiCursorState
@@ -426,7 +430,6 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
     }
   } else if (stringStartsWith(command, 'ui')) {
     switch (command) {
-      case 'ui.back':
       case 'ui.pauseMenu':
         if (pressed) {
           if (activeModalStack.length) {
@@ -436,6 +439,7 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
           }
         }
         break
+      case 'ui.back':
       case 'ui.toggleFullscreen':
       case 'ui.toggleMap':
       case 'ui.leftClick':
diff --git a/src/react/MobileTopButtons.tsx b/src/react/MobileTopButtons.tsx
index e8a82f77..f048af56 100644
--- a/src/react/MobileTopButtons.tsx
+++ b/src/react/MobileTopButtons.tsx
@@ -34,7 +34,7 @@ export default () => {
       switch (actionForStyle) {
         case 'general.chat':
           return styles['chat-btn']
-        case 'ui.back':
+        case 'ui.pauseMenu':
           return styles['pause-btn']
         case 'general.playersList':
           return styles['tab-btn']

From a2e9404a70ea240f35ca82c5e0ffb6d193465006 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 5 Jun 2025 20:22:58 +0300
Subject: [PATCH 586/753] feat: Simple but effective renderer perf debug
 features (#347)

---
 renderer/viewer/lib/worldrendererCommon.ts  |  18 +++
 renderer/viewer/three/worldrendererThree.ts |  36 +++++-
 src/controls.ts                             |   6 +
 src/optionsGuiScheme.tsx                    |   3 +
 src/optionsStorage.ts                       |   1 +
 src/react/RendererDebugMenu.tsx             | 115 ++++++++++++++++++++
 src/react/button.module.css                 |   1 +
 src/react/rendererDebugMenu.module.css      |  34 ++++++
 src/react/rendererDebugMenu.module.css.d.ts |   9 ++
 src/reactUi.tsx                             |   2 +
 src/watchOptions.ts                         |   1 +
 11 files changed, 225 insertions(+), 1 deletion(-)
 create mode 100644 src/react/RendererDebugMenu.tsx
 create mode 100644 src/react/rendererDebugMenu.module.css
 create mode 100644 src/react/rendererDebugMenu.module.css.d.ts

diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 3f517beb..2b37742c 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -8,6 +8,7 @@ import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import { generateSpiralMatrix } from 'flying-squid/dist/utils'
 import { subscribeKey } from 'valtio/utils'
+import { proxy } from 'valtio'
 import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
 import { toMajorVersion } from '../../../src/utils'
 import { ResourcesManager } from '../../../src/resourcesManager'
@@ -49,6 +50,7 @@ export const defaultWorldRendererConfig = {
   fetchPlayerSkins: true,
   highlightBlockColor: 'blue',
   foreground: true,
+  enableDebugOverlay: false,
   _experimentalSmoothChunkLoading: true,
   _renderByChunks: false
 }
@@ -60,6 +62,17 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   worldReadyPromise = this.worldReadyResolvers.promise
   timeOfTheDay = 0
   worldSizeParams = { minY: 0, worldHeight: 256 }
+  reactiveDebugParams = proxy({
+    stopRendering: false,
+    chunksRenderAboveOverride: undefined as number | undefined,
+    chunksRenderAboveEnabled: false,
+    chunksRenderBelowOverride: undefined as number | undefined,
+    chunksRenderBelowEnabled: false,
+    chunksRenderDistanceOverride: undefined as number | undefined,
+    chunksRenderDistanceEnabled: false,
+    disableEntities: false,
+    // disableParticles: false
+  })
 
   active = false
 
@@ -315,6 +328,11 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     subscribeKey(this.worldRendererConfig, key, callback)
   }
 
+  onReactiveDebugUpdated<T extends keyof typeof this.reactiveDebugParams>(key: T, callback: (value: typeof this.reactiveDebugParams[T]) => void) {
+    callback(this.reactiveDebugParams[key])
+    subscribeKey(this.reactiveDebugParams, key, callback)
+  }
+
   watchReactivePlayerState () {
     this.onReactiveValueUpdated('backgroundColor', (value) => {
       this.changeBackgroundColor(value)
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index d2d54998..a8e08068 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -455,7 +455,39 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.cameraShake.setBaseRotation(pitch, yaw)
   }
 
+  debugChunksVisibilityOverride () {
+    const { chunksRenderAboveOverride, chunksRenderBelowOverride, chunksRenderDistanceOverride, chunksRenderAboveEnabled, chunksRenderBelowEnabled, chunksRenderDistanceEnabled } = this.reactiveDebugParams
+
+    const baseY = this.cameraSectionPos.y * 16
+
+    if (
+      this.displayOptions.inWorldRenderingConfig.enableDebugOverlay &&
+      chunksRenderAboveOverride !== undefined ||
+      chunksRenderBelowOverride !== undefined ||
+      chunksRenderDistanceOverride !== undefined
+    ) {
+      for (const [key, object] of Object.entries(this.sectionObjects)) {
+        const [x, y, z] = key.split(',').map(Number)
+        const isVisible =
+          // eslint-disable-next-line no-constant-binary-expression, sonarjs/no-redundant-boolean
+          (chunksRenderAboveEnabled && chunksRenderAboveOverride !== undefined) ? y <= (baseY + chunksRenderAboveOverride) : true &&
+          // eslint-disable-next-line @stylistic/indent-binary-ops, no-constant-binary-expression, sonarjs/no-redundant-boolean
+          (chunksRenderBelowEnabled && chunksRenderBelowOverride !== undefined) ? y >= (baseY - chunksRenderBelowOverride) : true &&
+          // eslint-disable-next-line @stylistic/indent-binary-ops
+          (chunksRenderDistanceEnabled && chunksRenderDistanceOverride !== undefined) ? Math.abs(y - baseY) <= chunksRenderDistanceOverride : true
+
+        object.visible = isVisible
+      }
+    } else {
+      for (const object of Object.values(this.sectionObjects)) {
+        object.visible = true
+      }
+    }
+  }
+
   render (sizeChanged = false) {
+    if (this.reactiveDebugParams.stopRendering) return
+    this.debugChunksVisibilityOverride()
     const start = performance.now()
     this.lastRendered = performance.now()
     this.cursorBlock.render()
@@ -468,7 +500,9 @@ export class WorldRendererThree extends WorldRendererCommon {
       this.camera.updateProjectionMatrix()
     }
 
-    this.entities.render()
+    if (!this.reactiveDebugParams.disableEntities) {
+      this.entities.render()
+    }
 
     // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
     const cam = this.cameraGroupVr instanceof THREE.Group ? this.cameraGroupVr.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
diff --git a/src/controls.ts b/src/controls.ts
index e270750e..f32cbda6 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -678,6 +678,12 @@ export const f3Keybinds: Array<{
     },
     mobileTitle: 'Show Chunks Debug',
   },
+  {
+    action () {
+      showModal({ reactType: 'renderer-debug' })
+    },
+    mobileTitle: 'Renderer Debug Menu',
+  },
   {
     key: 'KeyY',
     async action () {
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 7f4c34ab..c74a72d8 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -109,6 +109,9 @@ export const guiOptionsScheme: {
           'none'
         ],
       },
+      rendererPerfDebugOverlay: {
+        text: 'Performance Debug',
+      }
     },
     {
       custom () {
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index a0c995a0..88e86817 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -106,6 +106,7 @@ const defaultOptions = {
   vrSupport: true, // doesn't directly affect the VR mode, should only disable the button which is annoying to android users
   vrPageGameRendering: false,
   renderDebug: 'basic' as 'none' | 'advanced' | 'basic',
+  rendererPerfDebugOverlay: false,
 
   // advanced bot options
   autoRespawn: false,
diff --git a/src/react/RendererDebugMenu.tsx b/src/react/RendererDebugMenu.tsx
new file mode 100644
index 00000000..2e6030c1
--- /dev/null
+++ b/src/react/RendererDebugMenu.tsx
@@ -0,0 +1,115 @@
+import { WorldRendererCommon } from 'renderer/viewer/lib/worldrendererCommon'
+import { useState } from 'react'
+import { useSnapshot } from 'valtio'
+import { options } from '../optionsStorage'
+import Screen from './Screen'
+import Button from './Button'
+import Slider from './Slider'
+import styles from './rendererDebugMenu.module.css'
+
+export default () => {
+  const worldRenderer = window.world as WorldRendererCommon
+  const { reactiveDebugParams } = worldRenderer
+  const { chunksRenderAboveEnabled, chunksRenderBelowEnabled, chunksRenderDistanceEnabled, chunksRenderAboveOverride, chunksRenderBelowOverride, chunksRenderDistanceOverride, stopRendering, disableEntities } = useSnapshot(reactiveDebugParams)
+
+  const { rendererPerfDebugOverlay } = useSnapshot(options)
+
+  // Helper to round values to nearest step
+  const roundToStep = (value: number, step: number) => Math.round(value / step) * step
+
+  if (!rendererPerfDebugOverlay) return null
+
+  return <div className={styles.container}>
+    <div className={styles.column}>
+      <h3>Rendering Controls</h3>
+      <Button
+        label={stopRendering ? 'Start Rendering' : 'Stop Rendering'}
+        onClick={() => { reactiveDebugParams.stopRendering = !reactiveDebugParams.stopRendering }}
+        overlayColor={stopRendering ? 'red' : undefined}
+      />
+      <Button
+        label={disableEntities ? 'Enable Entities' : 'Disable Entities'}
+        onClick={() => { reactiveDebugParams.disableEntities = !reactiveDebugParams.disableEntities }}
+        overlayColor={disableEntities ? 'red' : undefined}
+      />
+    </div>
+
+    <div className={styles.column}>
+      <h3>Chunks Render Settings</h3>
+      <div className={styles.sliderGroup}>
+        <Button
+          label={chunksRenderAboveEnabled ? 'Disable Above Override' : 'Enable Above Override'}
+          onClick={() => {
+            const newState = !chunksRenderAboveEnabled
+            reactiveDebugParams.chunksRenderAboveEnabled = newState
+            if (newState) { reactiveDebugParams.chunksRenderAboveOverride = 0 } else { reactiveDebugParams.chunksRenderAboveOverride = undefined }
+          }}
+        />
+        <Slider
+          label="Chunks Above"
+          min={0}
+          max={256}
+          value={chunksRenderAboveOverride ?? 0}
+          style={{ width: '100%', }}
+          updateValue={(value) => {
+            const roundedValue = roundToStep(value, 16)
+            reactiveDebugParams.chunksRenderAboveOverride = roundedValue
+          }}
+          disabledReason={chunksRenderAboveEnabled ? undefined : 'Override not enabled'}
+          unit=""
+          valueDisplay={roundToStep(reactiveDebugParams.chunksRenderAboveOverride ?? 0, 16)}
+        />
+      </div>
+
+      <div className={styles.sliderGroup}>
+        <Button
+          label={chunksRenderBelowEnabled ? 'Disable Below Override' : 'Enable Below Override'}
+          onClick={() => {
+            const newState = !chunksRenderBelowEnabled
+            reactiveDebugParams.chunksRenderBelowEnabled = newState
+            if (newState) { reactiveDebugParams.chunksRenderBelowOverride = 0 } else { reactiveDebugParams.chunksRenderBelowOverride = undefined }
+          }}
+        />
+        <Slider
+          label="Chunks Below"
+          min={0}
+          max={256}
+          style={{ width: '100%', }}
+          value={chunksRenderBelowOverride ?? 0}
+          updateValue={(value) => {
+            const roundedValue = roundToStep(value, 16)
+            reactiveDebugParams.chunksRenderBelowOverride = roundedValue
+          }}
+          disabledReason={chunksRenderBelowEnabled ? undefined : 'Override not enabled'}
+          unit=""
+          valueDisplay={roundToStep(reactiveDebugParams.chunksRenderBelowOverride ?? 0, 16)}
+        />
+      </div>
+
+      {/* <div className={styles.sliderGroup}>
+        <Button
+          label={chunksRenderDistanceEnabled ? 'Disable Distance Override' : 'Enable Distance Override'}
+          onClick={() => {
+            const newState = !chunksRenderDistanceEnabled
+            reactiveDebugParams.chunksRenderDistanceEnabled = newState
+            if (newState) { reactiveDebugParams.chunksRenderDistanceOverride = 8 } else { reactiveDebugParams.chunksRenderDistanceOverride = undefined }
+          }}
+        />
+        <Slider
+          label="Render Distance"
+          min={1}
+          max={32}
+          style={{ width: '100%', }}
+          value={chunksRenderDistanceOverride ?? 8}
+          updateValue={(value) => {
+            const roundedValue = Math.round(value)
+            reactiveDebugParams.chunksRenderDistanceOverride = roundedValue
+          }}
+          disabledReason={chunksRenderDistanceEnabled ? undefined : 'Override not enabled'}
+          unit=""
+          valueDisplay={Math.round(reactiveDebugParams.chunksRenderDistanceOverride ?? 8)}
+        />
+      </div> */}
+    </div>
+  </div>
+}
diff --git a/src/react/button.module.css b/src/react/button.module.css
index 677a1b44..e940c224 100644
--- a/src/react/button.module.css
+++ b/src/react/button.module.css
@@ -4,6 +4,7 @@
   position: relative;
   width: 200px;
   min-height: calc(20px * var(--scale));
+  max-height: calc(20px * var(--scale));
   font-family: minecraft, mojangles, monospace;
   font-size: 10px;
   color: white;
diff --git a/src/react/rendererDebugMenu.module.css b/src/react/rendererDebugMenu.module.css
new file mode 100644
index 00000000..6c49e04c
--- /dev/null
+++ b/src/react/rendererDebugMenu.module.css
@@ -0,0 +1,34 @@
+.container {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  gap: 20px;
+  padding: 10px;
+  height: 100%;
+  padding-top: env(safe-area-inset-top, 10px);
+  padding-left: env(safe-area-inset-left, 10px);
+  padding-right: env(safe-area-inset-right, 10px);
+  padding-bottom: env(safe-area-inset-bottom, 10px);
+}
+
+.column {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  min-width: 200px;
+}
+
+.column h3 {
+  margin: 0;
+  padding: 0;
+  font-size: 16px;
+  color: white;
+  text-shadow: 2px 2px 0 rgba(0, 0, 0, 0.8);
+}
+
+.sliderGroup {
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+  margin-bottom: 10px;
+}
diff --git a/src/react/rendererDebugMenu.module.css.d.ts b/src/react/rendererDebugMenu.module.css.d.ts
new file mode 100644
index 00000000..0f8f2163
--- /dev/null
+++ b/src/react/rendererDebugMenu.module.css.d.ts
@@ -0,0 +1,9 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  column: string;
+  container: string;
+  sliderGroup: string;
+}
+declare const cssExports: CssExports;
+export default cssExports;
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 6405b27e..e67facea 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -61,6 +61,7 @@ import ControDebug from './react/ControDebug'
 import ChunksDebug from './react/ChunksDebug'
 import ChunksDebugScreen from './react/ChunksDebugScreen'
 import DebugResponseTimeIndicator from './react/debugs/DebugResponseTimeIndicator'
+import RendererDebugMenu from './react/RendererDebugMenu'
 import CreditsAboutModal from './react/CreditsAboutModal'
 import GlobalOverlayHints from './react/GlobalOverlayHints'
 
@@ -167,6 +168,7 @@ const InGameUi = () => {
           {!disabledUiParts.includes('bossbars') && displayBossBars && <BossBarOverlayProvider />}
           <VoiceMicrophone />
           <ChunksDebugScreen />
+          <RendererDebugMenu />
         </PerComponentErrorBoundary>
       </div>
 
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 903d7da8..478da4fb 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -83,6 +83,7 @@ export const watchOptionsAfterViewerInit = () => {
   watchValue(options, o => {
     appViewer.inWorldRenderingConfig.vrSupport = o.vrSupport
     appViewer.inWorldRenderingConfig.vrPageGameRendering = o.vrPageGameRendering
+    appViewer.inWorldRenderingConfig.enableDebugOverlay = o.rendererPerfDebugOverlay
   })
 
   watchValue(options, (o, isChanged) => {

From 1c93fd7f602c46ebe9554b5c33ed7d60ab5cca7b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 10 Jun 2025 05:22:52 +0300
Subject: [PATCH 587/753] fix wording

---
 src/optionsGuiScheme.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index c74a72d8..422e1768 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -362,7 +362,7 @@ export const guiOptionsScheme: {
     },
     {
       custom () {
-        return <UiToggleButton name='effects-indicators' />
+        return <UiToggleButton name='effects-indicators' label='Effects & Indicators' />
       },
     },
     {

From e982bf1493207575e2e077a4843188083c10b794 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 10 Jun 2025 05:24:28 +0300
Subject: [PATCH 588/753] fix(important): make chat word breaking match
 Minecraftt behavior

---
 src/react/Chat.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/Chat.css b/src/react/Chat.css
index e6a62ab2..f1e92338 100644
--- a/src/react/Chat.css
+++ b/src/react/Chat.css
@@ -188,7 +188,7 @@ input[type=text],
   padding-left: 4px;
   background-color: rgba(0, 0, 0, 0.5);
   list-style: none;
-  word-break: break-all;
+  overflow-wrap: break-word;
 }
 
 .chat-message-fadeout {

From 55759335590c580edc1189cd83a1ad10d5d454ce Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 10 Jun 2025 05:26:32 +0300
Subject: [PATCH 589/753] change title for mcraft.fun version

---
 .github/workflows/release.yml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 422b6e64..14c4b471 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,6 +40,20 @@ jobs:
           mkdir -p .vercel/output/static/playground
           pnpm build-playground
           cp -r renderer/dist/* .vercel/output/static/playground/
+
+      # publish to github
+      - run: cp vercel.json .vercel/output/static/vercel.json
+      - uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: .vercel/output/static
+          force_orphan: true
+          
+      - name: Change index.html title
+        run: |
+          # change <title>Minecraft Web Client</title> to <title>Minecraft Web Client — Free Online Browser Version</title>
+          sed -i 's/<title>Minecraft Web Client<\/title>/<title>Minecraft Web Client — Free Online Browser Version<\/title>/' .vercel/output/static/index.html
+          
       - name: Deploy Project to Vercel
         uses: mathiasvr/command-output@v2.0.0
         with:
@@ -53,13 +67,6 @@ jobs:
           for alias in $(echo ${{ steps.alias.outputs.alias }} | tr "," "\n"); do
             vercel alias set ${{ steps.deploy.outputs.stdout }} $alias --token=${{ secrets.VERCEL_TOKEN }} --scope=zaro
           done
-      # publish to github
-      - run: cp vercel.json .vercel/output/static/vercel.json
-      - uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: .vercel/output/static
-          force_orphan: true
 
       - name: Build single-file version - minecraft.html
         run: pnpm build-single-file && mv dist/single/index.html minecraft.html

From 6a583d2a363f04793265cc5afa1a766f2fd20724 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 10 Jun 2025 06:33:01 +0300
Subject: [PATCH 590/753] feat: Custom chat ping functionality!!! To ping on
 any server type @ and on other web client such ping will be highlighted. Can
 be disabled. todo: enable a way to display ping-only messages todo: reply
 (public/private) command todo: fix copmletion offset

---
 src/optionsGuiScheme.tsx   |  3 ++
 src/optionsStorage.ts      |  1 +
 src/react/Chat.tsx         | 83 ++++++++++++++++++++++++++++++++------
 src/react/ChatProvider.tsx |  7 +++-
 4 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 422e1768..e3b71778 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -286,7 +286,10 @@ export const guiOptionsScheme: {
       chatOpacityOpened: {
       },
       chatSelect: {
+        text: 'Text Select',
       },
+      chatPingExtension: {
+      }
     },
     {
       custom () {
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 88e86817..59f222bd 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -75,6 +75,7 @@ const defaultOptions = {
   debugChatScroll: false,
   chatVanillaRestrictions: true,
   debugResponseTimeIndicator: false,
+  chatPingExtension: true,
   // antiAliasing: false,
 
   clipWorldBelowY: undefined as undefined | number, // will be removed
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index c2e59b07..8b470910 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -15,7 +15,7 @@ export type Message = {
   faded?: boolean
 }
 
-const MessageLine = ({ message }: { message: Message }) => {
+const MessageLine = ({ message, currentPlayerName }: { message: Message, currentPlayerName?: string }) => {
   const classes = {
     'chat-message-fadeout': message.fading,
     'chat-message-fade': message.fading,
@@ -24,7 +24,27 @@ const MessageLine = ({ message }: { message: Message }) => {
   }
 
   return <li className={Object.entries(classes).filter(([, val]) => val).map(([name]) => name).join(' ')}>
-    {message.parts.map((msg, i) => <MessagePart key={i} part={msg} />)}
+    {message.parts.map((msg, i) => {
+      // Check if this is a text part that might contain a mention
+      if (msg.text && currentPlayerName) {
+        const parts = msg.text.split(new RegExp(`(@${currentPlayerName})`, 'i'))
+        if (parts.length > 1) {
+          return parts.map((txtPart, j) => {
+            const part = {
+              ...msg,
+              text: txtPart
+            }
+            if (txtPart.toLowerCase() === `@${currentPlayerName}`.toLowerCase()) {
+              part.color = '#ffa500'
+              part.bold = true
+              return <MessagePart key={j} part={part} />
+            }
+            return <MessagePart key={j} part={part} />
+          })
+        }
+      }
+      return <MessagePart key={i} part={msg} />
+    })}
   </li>
 }
 
@@ -42,6 +62,8 @@ type Props = {
   placeholder?: string
   chatVanillaRestrictions?: boolean
   debugChatScroll?: boolean
+  getPingComplete?: (value: string) => Promise<string[]>
+  currentPlayerName?: string
 }
 
 export const chatInputValueGlobal = proxy({
@@ -71,12 +93,19 @@ export default ({
   inputDisabled,
   placeholder,
   chatVanillaRestrictions,
-  debugChatScroll
+  debugChatScroll,
+  getPingComplete,
+  currentPlayerName
 }: Props) => {
+  const playerNameValidated = useMemo(() => {
+    if (!/^[\w\d_]+$/i.test(currentPlayerName ?? '')) return ''
+    return currentPlayerName
+  }, [currentPlayerName])
+  
   const sendHistoryRef = useRef(JSON.parse(window.sessionStorage.chatHistory || '[]'))
   const [isInputFocused, setIsInputFocused] = useState(false)
-  // const [spellCheckEnabled, setSpellCheckEnabled] = useState(false)
   const spellCheckEnabled = false
+  const pingHistoryRef = useRef(JSON.parse(window.localStorage.pingHistory || '[]'))
 
   const [completePadText, setCompletePadText] = useState('')
   const completeRequestValue = useRef('')
@@ -108,9 +137,13 @@ export default ({
   const acceptComplete = (item: string) => {
     const base = completeRequestValue.current === '/' ? '' : getCompleteValue()
     updateInputValue(base + item)
-    // todo would be cool but disabled because some comands don't need args (like ping)
-    // // trigger next tab complete
-    // this.chatInput.dispatchEvent(new KeyboardEvent('keydown', { code: 'Space' }))
+    // Record ping completion in history
+    if (item.startsWith('@')) {
+      const newHistory = [item, ...pingHistoryRef.current.filter((x: string) => x !== item)].slice(0, 10)
+      pingHistoryRef.current = newHistory
+      // todo use appStorage
+      window.localStorage.pingHistory = JSON.stringify(newHistory)
+    }
     chatInput.current.focus()
   }
 
@@ -200,6 +233,13 @@ export default ({
   }, [opened])
 
   const onMainInputChange = () => {
+    const lastWord = chatInput.current.value.slice(0, chatInput.current.selectionEnd ?? chatInput.current.value.length).split(' ').at(-1)!
+    if (lastWord.startsWith('@') && getPingComplete) {
+      setCompletePadText(lastWord)
+      void fetchPingCompletions(true, lastWord.slice(1))
+      return
+    }
+
     const completeValue = getCompleteValue()
     setCompletePadText(completeValue === '/' ? '' : completeValue)
     // not sure if enabling would be useful at all (maybe make as a setting in the future?)
@@ -215,9 +255,6 @@ export default ({
       resetCompletionItems()
     }
     completeRequestValue.current = completeValue
-    // if (completeValue === '/') {
-    //   void fetchCompletions(true)
-    // }
   }
 
   const fetchCompletions = async (implicit: boolean, inputValue = chatInput.current.value) => {
@@ -230,6 +267,24 @@ export default ({
     updateFilteredCompleteItems(newItems)
   }
 
+  const fetchPingCompletions = async (implicit: boolean, inputValue: string) => {
+    completeRequestValue.current = inputValue
+    resetCompletionItems()
+    const newItems = await getPingComplete?.(inputValue) ?? []
+    if (inputValue !== completeRequestValue.current) return
+    // Sort items by ping history
+    const sortedItems = [...newItems].sort((a, b) => {
+      const aIndex = pingHistoryRef.current.indexOf(a)
+      const bIndex = pingHistoryRef.current.indexOf(b)
+      if (aIndex === -1 && bIndex === -1) return 0
+      if (aIndex === -1) return 1
+      if (bIndex === -1) return -1
+      return aIndex - bIndex
+    })
+    setCompletionItemsSource(sortedItems)
+    updateFilteredCompleteItems(sortedItems)
+  }
+
   const updateFilteredCompleteItems = (sourceItems: string[] | Array<{ match: string, toolip: string }>) => {
     const newCompleteItems = sourceItems
       .map((item): string => (typeof item === 'string' ? item : item.match))
@@ -237,8 +292,11 @@ export default ({
         // this regex is imporatnt is it controls the word matching
         // const compareableParts = item.split(/[[\]{},_:]/)
         const lastWord = chatInput.current.value.slice(0, chatInput.current.selectionEnd ?? chatInput.current.value.length).split(' ').at(-1)!
-        // return [item, ...compareableParts].some(compareablePart => compareablePart.startsWith(lastWord))
+        if (lastWord.startsWith('@')) {
+          return item.toLowerCase().includes(lastWord.slice(1).toLowerCase())
+        }
         return item.includes(lastWord)
+        // return [item, ...compareableParts].some(compareablePart => compareablePart.startsWith(lastWord))
       })
     setCompletionItems(newCompleteItems)
   }
@@ -247,6 +305,7 @@ export default ({
     const raw = chatInput.current.value
     return raw.slice(0, chatInput.current.selectionEnd ?? raw.length)
   }
+
   const getCompleteValue = (value = getDefaultCompleteValue()) => {
     const valueParts = value.split(' ')
     const lastLength = valueParts.at(-1)!.length
@@ -313,7 +372,7 @@ export default ({
             </div>
           )}
           {messages.map((m) => (
-            <MessageLine key={reactKeyForMessage(m)} message={m} />
+            <MessageLine key={reactKeyForMessage(m)} message={m} currentPlayerName={playerNameValidated} />
           ))}
         </div> || undefined}
       </div>
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 5c499029..83691b83 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -17,7 +17,7 @@ export default () => {
   const isChatActive = useIsModalActive('chat')
   const lastMessageId = useRef(0)
   const usingTouch = useSnapshot(miscUiState).currentTouch
-  const { chatSelect, messagesLimit, chatOpacity, chatOpacityOpened, chatVanillaRestrictions, debugChatScroll } = useSnapshot(options)
+  const { chatSelect, messagesLimit, chatOpacity, chatOpacityOpened, chatVanillaRestrictions, debugChatScroll, chatPingExtension } = useSnapshot(options)
   const isUsingMicrosoftAuth = useMemo(() => !!lastConnectOptions.value?.authenticatedAccount, [])
   const { forwardChat } = useSnapshot(viewerVersionState)
   const { viewerConnection } = useSnapshot(gameAdditionalState)
@@ -55,6 +55,11 @@ export default () => {
     messages={messages}
     opened={isChatActive}
     placeholder={forwardChat || !viewerConnection ? undefined : 'Chat forwarding is not enabled in the plugin settings'}
+    currentPlayerName={chatPingExtension ? bot.username : undefined}
+    getPingComplete={async (value) => {
+      const players = Object.keys(bot.players)
+      return players.filter(name => (!value || name.toLowerCase().includes(value.toLowerCase())) && name !== bot.username).map(name => `@${name}`)
+    }}
     sendMessage={async (message) => {
       const builtinHandled = tryHandleBuiltinCommand(message)
       if (getServerIndex() !== undefined && (message.startsWith('/login') || message.startsWith('/register'))) {

From a562316cba91ad620484611836b6783d1d6bf4ac Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 10 Jun 2025 06:33:18 +0300
Subject: [PATCH 591/753] rm dead servers

---
 config.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/config.json b/config.json
index bdfd28b2..35c22a1a 100644
--- a/config.json
+++ b/config.json
@@ -9,16 +9,9 @@
     {
       "ip": "wss://play.mcraft.fun"
     },
-    {
-      "ip": "wss://ws.fuchsmc.net"
-    },
     {
       "ip": "wss://play2.mcraft.fun"
     },
-    {
-      "ip": "wss://mcraft.ryzyn.xyz",
-      "version": "1.19.4"
-    },
     {
       "ip": "kaboom.pw",
       "version": "1.20.3",

From 14effc7400067ccb7dde32581f74bbbf9f40b7fc Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 10 Jun 2025 07:26:50 +0300
Subject: [PATCH 592/753] Should fix lint

---
 src/react/Chat.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 8b470910..41a6cb6f 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -101,7 +101,7 @@ export default ({
     if (!/^[\w\d_]+$/i.test(currentPlayerName ?? '')) return ''
     return currentPlayerName
   }, [currentPlayerName])
-  
+
   const sendHistoryRef = useRef(JSON.parse(window.sessionStorage.chatHistory || '[]'))
   const [isInputFocused, setIsInputFocused] = useState(false)
   const spellCheckEnabled = false

From cfce8989184a60c2385b31f6a21c4d7e1562ce44 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 11 Jun 2025 03:19:14 +0300
Subject: [PATCH 593/753] make random username configurable

---
 config.json                     | 1 +
 src/appConfig.ts                | 3 ++-
 src/appStatus.ts                | 1 +
 src/react/appStorageProvider.ts | 9 +++++++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/config.json b/config.json
index 35c22a1a..8fd264fb 100644
--- a/config.json
+++ b/config.json
@@ -31,6 +31,7 @@
       }
     ]
   ],
+  "defaultUsername": "mcrafter{num}{num}{num}{num}",
   "mobileButtons": [
     {
       "action": "general.drop",
diff --git a/src/appConfig.ts b/src/appConfig.ts
index 48b3665a..261ec7d3 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -53,6 +53,7 @@ export type AppConfig = {
   displayLanguageSelector?: boolean
   supportedLanguages?: string[]
   showModsButton?: boolean
+  defaultUsername?: string
 }
 
 export const loadAppConfig = (appConfig: AppConfig) => {
@@ -81,7 +82,7 @@ export const loadAppConfig = (appConfig: AppConfig) => {
     updateBinds(customKeymaps)
   }
 
-  setStorageDataOnAppConfigLoad()
+  setStorageDataOnAppConfigLoad(appConfig)
 }
 
 export const isBundledConfigUsed = !!process.env.INLINED_APP_CONFIG
diff --git a/src/appStatus.ts b/src/appStatus.ts
index d3bfc461..054975f3 100644
--- a/src/appStatus.ts
+++ b/src/appStatus.ts
@@ -3,6 +3,7 @@ import { appStatusState, resetAppStatusState } from './react/AppStatusProvider'
 
 let ourLastStatus: string | undefined = ''
 export const setLoadingScreenStatus = function (status: string | undefined | null, isError = false, hideDots = false, fromFlyingSquid = false, minecraftJsonMessage?: Record<string, any>) {
+  if (typeof status === 'string') status = window.translateText?.(status) ?? status
   // null can come from flying squid, should restore our last status
   if (status === null) {
     status = ourLastStatus
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index 5cef34c1..32617426 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -1,6 +1,7 @@
 import { proxy, ref, subscribe } from 'valtio'
 import { UserOverridesConfig } from 'contro-max/build/types/store'
 import { subscribeKey } from 'valtio/utils'
+import { AppConfig } from '../appConfig'
 import { CustomCommand } from './KeybindingsCustom'
 import { AuthenticatedAccount } from './serversStorage'
 import type { BaseServerInfo } from './AddServerOrConnect'
@@ -86,8 +87,12 @@ const defaultStorageData: StorageData = {
   firstModsPageVisit: true,
 }
 
-export const setStorageDataOnAppConfigLoad = () => {
-  appStorage.username ??= `mcrafter${Math.floor(Math.random() * 1000)}`
+export const setStorageDataOnAppConfigLoad = (appConfig: AppConfig) => {
+  appStorage.username ??= getRandomUsername(appConfig)
+}
+
+export const getRandomUsername = (appConfig: AppConfig) => {
+  return appConfig.defaultUsername?.replaceAll('{num}', () => Math.floor(Math.random() * 10).toString()) ?? ''
 }
 
 export const appStorage = proxy({ ...defaultStorageData })

From ac7d28760f5d12cf7d8337c7132b9b84345cc2c8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 13 Jun 2025 04:51:48 +0300
Subject: [PATCH 594/753] feat: Implement always up-to-date recommended servers
 display! Fix other annoying issues in servers list

---
 src/react/Button.tsx              | 60 +++++++++++++++++++++++----
 src/react/ServersListProvider.tsx | 67 +++++++++++++++++++++----------
 src/react/Singleplayer.tsx        | 44 +++++++++++---------
 src/react/appStorageProvider.ts   |  1 +
 src/react/serversStorage.ts       | 20 ---------
 5 files changed, 123 insertions(+), 69 deletions(-)

diff --git a/src/react/Button.tsx b/src/react/Button.tsx
index 1ef9be33..bad726f0 100644
--- a/src/react/Button.tsx
+++ b/src/react/Button.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames'
-import { createContext, FC, Ref, useContext } from 'react'
+import { createContext, FC, Ref, useContext, useEffect, useRef } from 'react'
 import buttonCss from './button.module.css'
 import SharedHudVars from './SharedHudVars'
 import PixelartIcon from './PixelartIcon'
@@ -26,19 +26,48 @@ export const ButtonProvider: FC<{ children, onClick }> = ({ children, onClick })
 }
 
 export default (({ label, icon, children, inScreen, rootRef, type = 'button', postLabel, overlayColor, noTranslate, ...args }) => {
+  const style = {
+    ...args.style,
+  } as React.CSSProperties
+
+  const buttonRef = useRef<any>(null)
+
+  useEffect(() => {
+    // replace all text childs with translated text
+    // traverse dom
+    const traverse = (node: HTMLElement) => {
+      for (const child of node.childNodes) {
+        if (child.nodeType === Node.TEXT_NODE) {
+          if (child.textContent) {
+            child.textContent = translate(child.textContent)
+          }
+        } else {
+          traverse(child as HTMLElement)
+        }
+      }
+    }
+    traverse(buttonRef.current)
+  }, [label, children, postLabel])
+
+  args.title = translate(args.title)
+
   const ctx = useContext(ButtonContext)
 
   const onClick = (e) => {
     ctx.onClick()
     args.onClick?.(e)
   }
+  const labelText = `${translate(label) ?? ''} ${typeof children === 'string' ? translate(children) : ''}`
   if (inScreen) {
-    args.style ??= {}
-    args.style.width = 150
+    style.width = 150
+    args.className = `${args.className ?? ''} settings-text-container`
   }
+  if (typeof style.width === 'number' && ((style.width <= 150 && labelText.length > 17) || (style.width >= 90 && labelText.length >= 11))) {
+    args.className = `${args.className ?? ''} settings-text-container-long`
+  }
+
   if (icon) {
-    args.style ??= {}
-    args.style.width = 20
+    style.width = 20
   }
 
   const tryToTranslate = (maybeText: any) => {
@@ -53,11 +82,26 @@ export default (({ label, icon, children, inScreen, rootRef, type = 'button', po
   }
 
   return <SharedHudVars>
-    <button ref={rootRef} {...args} className={classNames(buttonCss.button, args.className)} onClick={onClick} type={type}>
+    <button
+      ref={(button) => {
+        buttonRef.current = button
+        if (typeof rootRef === 'function') {
+          rootRef(button)
+        } else if (rootRef) {
+        //@ts-expect-error
+          rootRef.current = button
+        }
+      }}
+      {...args}
+      style={style}
+      className={classNames(buttonCss.button, args.className)}
+      onClick={onClick}
+      type={type}
+    >
       {icon && <PixelartIcon className={buttonCss.icon} iconName={icon} />}
-      {tryToTranslate(label)}
+      {label}
       {postLabel}
-      {tryToTranslate(children)}
+      {children}
       {overlayColor && <div style={{
         position: 'absolute',
         inset: 0,
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 8692e0bd..d95d4e9e 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -14,7 +14,7 @@ import { useDidUpdateEffect } from './utils'
 import { useIsModalActive } from './utilsApp'
 import { showOptionsModal } from './SelectOption'
 import { useCopyKeybinding } from './simpleHooks'
-import { AuthenticatedAccount, getInitialServersList, getServerConnectionHistory, setNewServersList } from './serversStorage'
+import { AuthenticatedAccount, setNewServersList } from './serversStorage'
 import { appStorage, StoreServerItem } from './appStorageProvider'
 import Button from './Button'
 import { pixelartIcons } from './PixelartIcon'
@@ -45,10 +45,17 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
   const { authenticatedAccounts } = useSnapshot(appStorage)
   const [quickConnectIp, setQuickConnectIp] = useState('')
   const [selectedIndex, setSelectedIndex] = useState(0)
+  const [retriggerFocusCounter, setRetriggerFocusCounter] = useState(0)
 
-  const { serversList: savedServersList } = useSnapshot(appStorage)
+  useEffect(() => {
+    if (!hidden) {
+      setRetriggerFocusCounter(x => x + 1)
+    }
+  }, [hidden])
 
-  const serversListDisplay = useMemo(() => {
+  const _savedServersListWatchOnly = useSnapshot(appStorage).serversList
+
+  const serversListProvided = useMemo(() => {
     return (
       customServersList
         ? customServersList.map((row): StoreServerItem => {
@@ -60,9 +67,9 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
             name,
           }
         })
-        : [...getInitialServersList()]
+        : [...(appStorage.serversList?.filter(server => server) ?? [])]
     )
-  }, [customServersList, savedServersList])
+  }, [customServersList, _savedServersListWatchOnly])
 
   const [additionalServerData, setAdditionalServerData] = useState<Record<string, AdditionalDisplayData>>({})
 
@@ -78,14 +85,20 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
 
       const newIndex = e.key === 'ArrowUp'
         ? Math.max(0, selectedIndex - 1)
-        : Math.min(serversListDisplay.length - 1, selectedIndex + 1)
+        : Math.min(serversListProvided.length - 1, selectedIndex + 1)
 
       if (newIndex === selectedIndex) return
+      if (newIndex < 0 || newIndex >= serversListProvided.length) return
 
       // Move server in the list
-      const newList = [...serversListDisplay]
+      const newList = [...serversListProvided]
       const oldItem = newList[selectedIndex]
-      newList[selectedIndex] = newList[newIndex]
+      const newItem = newList[newIndex]
+      if (oldItem.isRecommended || newItem.isRecommended) {
+        return
+      }
+
+      newList[selectedIndex] = newItem
       newList[newIndex] = oldItem
 
       appStorage.serversList = newList
@@ -94,9 +107,17 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
 
     document.addEventListener('keydown', handleKeyDown)
     return () => document.removeEventListener('keydown', handleKeyDown)
-  }, [selectedIndex, serversListDisplay])
+  }, [selectedIndex, serversListProvided])
 
-  const serversListSorted = useMemo(() => serversListDisplay.map((server, index) => ({ ...server, index })), [serversListDisplay])
+  const serversListSorted: Array<StoreServerItem & { index: number }> = useMemo(() => [
+    ...serversListProvided,
+    ...(customServersList ? [] : (miscUiState.appConfig?.promoteServers ?? [])).map((server): StoreServerItem => ({
+      ip: server.ip,
+      versionOverride: server.version,
+      description: server.description,
+      isRecommended: true
+    }))
+  ].map((server, index) => ({ ...server, index })), [serversListProvided])
   // by lastJoined
   // const serversListSorted = useMemo(() => {
   //   return serversList.map((server, index) => ({ ...server, index })).sort((a, b) => (b.lastJoined ?? 0) - (a.lastJoined ?? 0))
@@ -186,7 +207,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
   }, [isEditScreenModal])
 
   useCopyKeybinding(() => {
-    const item = serversListDisplay[selectedIndex]
+    const item = serversListProvided[selectedIndex]
     if (!item) return
     let str = `${item.ip}`
     if (item.versionOverride) {
@@ -209,7 +230,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
       if (!serverEditScreen) return
       if (serverEditScreen === true) {
         const server: StoreServerItem = { ...info, lastJoined: Date.now() } // so it appears first
-        appStorage.serversList = [server, ...(appStorage.serversList ?? serversListDisplay)]
+        appStorage.serversList = [server, ...(appStorage.serversList ?? serversListProvided)]
       } else {
         const index = appStorage.serversList?.indexOf(serverEditScreen)
         if (index !== undefined) {
@@ -266,7 +287,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         overrides = server
       }
 
-      const lastJoinedUsername = serversListSorted.find(s => s.usernameOverride)?.usernameOverride
+      const lastJoinedUsername = serversListProvided.find(s => s.usernameOverride)?.usernameOverride
       let username = overrides.usernameOverride || getCurrentUsername() || ''
       if (!username) {
         const promptUsername = prompt('Enter username', lastJoinedUsername || '')
@@ -290,7 +311,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         authenticatedAccount,
         saveServerToHistory: shouldSave,
         onSuccessfulPlay () {
-          if (shouldSave && !serversListDisplay.some(s => s.ip === ip)) {
+          if (shouldSave !== false && !serversListProvided.some(s => s.ip === ip)) {
             const newServersList: StoreServerItem[] = [
               {
                 ip,
@@ -298,7 +319,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
                 versionOverride: overrides.versionOverride,
                 numConnects: 1
               },
-              ...serversListDisplay
+              ...serversListProvided
             ]
             setNewServersList(newServersList)
             miscUiState.loadedServerIndex = (newServersList.length - 1).toString()
@@ -306,10 +327,10 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
 
           if (shouldSave === undefined) { // loading saved
             // find and update
-            const server = serversListDisplay.find(s => s.ip === ip)
+            const server = serversListProvided.find(s => s.ip === ip)
             if (server) {
               // move to top
-              const newList = [...serversListDisplay]
+              const newList = [...serversListProvided]
               const index = newList.indexOf(server)
               const thisItem = newList[index]
               newList.splice(index, 1)
@@ -321,7 +342,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
             }
           }
         },
-        serverIndex: shouldSave ? serversListDisplay.length.toString() : indexOrIp // assume last
+        serverIndex: shouldSave ? serversListProvided.length.toString() : indexOrIp // assume last
       } satisfies ConnectOptions
       dispatchEvent(new CustomEvent('connect', { detail: options }))
       // qsOptions
@@ -334,7 +355,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
       appStorage.authenticatedAccounts = authenticatedAccounts.filter(a => a.username !== username)
     }}
     onWorldAction={(action, index) => {
-      const server = serversListDisplay[index]
+      const server = serversListProvided[index]
       if (!server) return
 
       if (action === 'edit') {
@@ -386,6 +407,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
         offline: additional?.offline,
         afterTitleUi: (
           <Button
+            tabIndex={-1}
             icon="external-link"
             style={{ marginRight: 8, width: 20, height: 20 }}
             onClick={(e) => {
@@ -394,14 +416,15 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
             }}
           />
         ),
-        group: customServersList ? 'Provided Servers' : 'Saved Servers'
+        group: customServersList ? 'Provided Servers' : (server.isRecommended ? '⭐️ Recommended Servers' : '💾 Saved Servers')
       }
     })}
     hidden={hidden}
-    onRowSelect={(_, i) => {
-      setSelectedIndex(i)
+    onRowSelect={(serverIndex) => {
+      setSelectedIndex(Number(serverIndex))
     }}
     selectedRow={selectedIndex}
+    retriggerFocusCounter={retriggerFocusCounter}
   />
   return <>
     {serversListJsx}
diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index 5e531076..872a21ce 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -139,6 +139,7 @@ interface Props {
   setListHovered?: (hovered: boolean) => void
   secondRowStyles?: React.CSSProperties
   lockedEditing?: boolean
+  retriggerFocusCounter?: number
 }
 
 export default ({
@@ -163,7 +164,8 @@ export default ({
   listStyle,
   setListHovered,
   secondRowStyles,
-  lockedEditing
+  lockedEditing,
+  retriggerFocusCounter
 }: Props) => {
   const containerRef = useRef<any>()
   const firstButton = useRef<HTMLButtonElement>(null)
@@ -173,7 +175,7 @@ export default ({
     if ((e.code === 'ArrowDown' || e.code === 'ArrowUp')) {
       e.preventDefault()
       const dir = e.code === 'ArrowDown' ? 1 : -1
-      const elements = focusable(containerRef.current)
+      const elements = focusable(containerRef.current).filter(e => e.getAttribute('tabindex') !== '-1')
       const focusedElemIndex = elements.indexOf(document.activeElement as HTMLElement)
       if (focusedElemIndex === -1) return
       const nextElem = elements[focusedElemIndex + dir]
@@ -196,7 +198,7 @@ export default ({
     if (worldName) {
       worldRefs.current[worldName]?.focus()
     }
-  }, [selectedRow, worldData?.[selectedRow as any]?.name])
+  }, [selectedRow, worldData?.[selectedRow as any]?.name, retriggerFocusCounter])
 
   const onRowSelectHandler = (name: string, index: number) => {
     onRowSelect?.(name, index)
@@ -263,22 +265,26 @@ export default ({
                       expanded={expandedGroups[groupName] ?? true}
                       onToggle={() => toggleGroup(groupName)}
                     />
-                    {(expandedGroups[groupName] ?? true) && worlds.map(({ name, size, detail, ...rest }, index) => (
-                      <World
-                        {...rest}
-                        size={size}
-                        name={name}
-                        elemRef={el => { worldRefs.current[name] = el }}
-                        onFocus={row => onRowSelectHandler(row, index)}
-                        isFocused={focusedWorld === name}
-                        key={name}
-                        onInteraction={(interaction) => {
-                          if (interaction === 'enter') onWorldAction('load', name)
-                          else if (interaction === 'space') firstButton.current?.focus()
-                        }}
-                        detail={detail}
-                      />
-                    ))}
+                    {(expandedGroups[groupName] ?? true) && worlds.map(({ name, size, detail, ...rest }, index) => {
+                      const key = name
+                      return (
+                        <World
+                          data-key={key}
+                          key={key}
+                          {...rest}
+                          size={size}
+                          name={name}
+                          elemRef={el => { worldRefs.current[name] = el }}
+                          onFocus={row => onRowSelectHandler(row, index)}
+                          isFocused={focusedWorld === name}
+                          onInteraction={(interaction) => {
+                            if (interaction === 'enter') onWorldAction('load', name)
+                            else if (interaction === 'space') firstButton.current?.focus()
+                          }}
+                          detail={detail}
+                        />
+                      )
+                    })}
                   </React.Fragment>
                 ))
               })()
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index 32617426..78852a8e 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -28,6 +28,7 @@ export interface StoreServerItem extends BaseServerInfo {
   optionsOverride?: Record<string, any>
   autoLogin?: Record<string, string>
   numConnects?: number // Track number of connections
+  isRecommended?: boolean
 }
 
 type StorageData = {
diff --git a/src/react/serversStorage.ts b/src/react/serversStorage.ts
index 9b095454..da7569cc 100644
--- a/src/react/serversStorage.ts
+++ b/src/react/serversStorage.ts
@@ -85,26 +85,6 @@ export const setNewServersList = (serversList: StoreServerItem[], force = false)
   appStorage.serversList = serversList
 }
 
-export const getInitialServersList = () => {
-  // If we already have servers in appStorage, use those
-  if (appStorage.serversList) return appStorage.serversList
-
-  const servers = [] as StoreServerItem[]
-
-  if (servers.length === 0) {
-    // server list is empty, let's suggest some
-    for (const server of miscUiState.appConfig?.promoteServers ?? []) {
-      servers.push({
-        ip: server.ip,
-        description: server.description,
-        versionOverride: server.version,
-      })
-    }
-  }
-
-  return servers
-}
-
 export const updateAuthenticatedAccountData = (callback: (data: AuthenticatedAccount[]) => AuthenticatedAccount[]) => {
   const accounts = appStorage.authenticatedAccounts
   const newAccounts = callback(accounts)

From 243db1dc456a52cc72b10fd3a4b76ba41a6fdbe1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 13 Jun 2025 04:56:40 +0300
Subject: [PATCH 595/753] use range generation instead

---
 config.json                     |  2 +-
 src/react/appStorageProvider.ts | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/config.json b/config.json
index 8fd264fb..fe26a9e5 100644
--- a/config.json
+++ b/config.json
@@ -31,7 +31,7 @@
       }
     ]
   ],
-  "defaultUsername": "mcrafter{num}{num}{num}{num}",
+  "defaultUsername": "mcrafter{0-9999}",
   "mobileButtons": [
     {
       "action": "general.drop",
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index 78852a8e..499ec71c 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -93,7 +93,17 @@ export const setStorageDataOnAppConfigLoad = (appConfig: AppConfig) => {
 }
 
 export const getRandomUsername = (appConfig: AppConfig) => {
-  return appConfig.defaultUsername?.replaceAll('{num}', () => Math.floor(Math.random() * 10).toString()) ?? ''
+  if (!appConfig.defaultUsername) return ''
+
+  const username = appConfig.defaultUsername
+    .replaceAll(/{(\d+)-(\d+)}/g, (_, start, end) => {
+      const min = Number(start)
+      const max = Number(end)
+      return Math.floor(Math.random() * (max - min + 1) + min).toString()
+    })
+    .replaceAll('{num}', () => Math.floor(Math.random() * 10).toString())
+
+  return username
 }
 
 export const appStorage = proxy({ ...defaultStorageData })

From 1e513f87dd6c9f8b78d124a2a0b1c446bcd302bb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 13 Jun 2025 05:23:58 +0300
Subject: [PATCH 596/753] feat: add End portal & gateway rendering

---
 package.json   |  2 +-
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 655cd394..3559169d 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.54",
+    "mc-assets": "^0.2.59",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
     "mineflayer-mouse": "^0.1.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 60086040..63ee982e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -334,8 +334,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.54
-        version: 0.2.54
+        specifier: ^0.2.59
+        version: 0.2.59
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d(@types/react@18.3.18)(react@18.3.1)
@@ -6475,8 +6475,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.54:
-    resolution: {integrity: sha512-ZEaa9IcqfOt4cFGLVJVkZMemKPfbjQskvIxuDepkXWkJb9T+xQ+Hj86zDMh1Ah8WZWNeGx2x26CuXt8QNr6pcw==}
+  mc-assets@0.2.59:
+    resolution: {integrity: sha512-HGdy6v09X5nks8+NuwrL3KQ763D+eWFeSpWLXx3+doWz6hSEeLjgBPOrB1stvQOjPDiQCzsIv5gaRB5sl6ng1A==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.23:
@@ -17028,7 +17028,7 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.54:
+  mc-assets@0.2.59:
     dependencies:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2

From b69813435c17b20964ff3ad8a98054a4e6ba4bbc Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 13 Jun 2025 08:06:09 +0300
Subject: [PATCH 597/753] up test

---
 renderer/viewer/lib/mesher/test/tests.test.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/renderer/viewer/lib/mesher/test/tests.test.ts b/renderer/viewer/lib/mesher/test/tests.test.ts
index 9ebd6604..2c3dc6a5 100644
--- a/renderer/viewer/lib/mesher/test/tests.test.ts
+++ b/renderer/viewer/lib/mesher/test/tests.test.ts
@@ -49,8 +49,6 @@ test('Known blocks are not rendered', () => {
   // TODO resolve creaking_heart issue (1.21.3)
   expect(missingBlocks).toMatchInlineSnapshot(`
     {
-      "end_gateway": true,
-      "end_portal": true,
       "structure_void": true,
     }
   `)

From a3dcfed4d0c3710a8e1273edb1ed85b4d4a033d4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 13 Jun 2025 13:11:06 +0300
Subject: [PATCH 598/753] feat: add time and battery status that is displayed
 in fullscreen by default

---
 src/optionsStorage.ts        |   1 +
 src/react/FullscreenTime.tsx | 112 +++++++++++++++++++++++++++++++++++
 src/reactUi.tsx              |   2 +
 3 files changed, 115 insertions(+)
 create mode 100644 src/react/FullscreenTime.tsx

diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 59f222bd..882610f8 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -77,6 +77,7 @@ const defaultOptions = {
   debugResponseTimeIndicator: false,
   chatPingExtension: true,
   // antiAliasing: false,
+  topRightTimeDisplay: 'only-fullscreen' as 'only-fullscreen' | 'always' | 'never',
 
   clipWorldBelowY: undefined as undefined | number, // will be removed
   disableSignsMapsSupport: false,
diff --git a/src/react/FullscreenTime.tsx b/src/react/FullscreenTime.tsx
new file mode 100644
index 00000000..25bd12e4
--- /dev/null
+++ b/src/react/FullscreenTime.tsx
@@ -0,0 +1,112 @@
+import { useEffect, useState } from 'react'
+import { useSnapshot } from 'valtio'
+import { options } from '../optionsStorage'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+
+interface BatteryManager extends EventTarget {
+  charging: boolean
+  chargingTime: number
+  dischargingTime: number
+  level: number
+  addEventListener(type: 'chargingchange' | 'levelchange', listener: EventListener): void
+  removeEventListener(type: 'chargingchange' | 'levelchange', listener: EventListener): void
+}
+
+declare global {
+  interface Navigator {
+    getBattery(): Promise<BatteryManager>
+  }
+}
+
+export default () => {
+  const [fullScreen, setFullScreen] = useState(false)
+  const { topRightTimeDisplay } = useSnapshot(options)
+  if (topRightTimeDisplay === 'never') return null
+  return <FullscreenTime />
+}
+
+const FullscreenTime = () => {
+  const { topRightTimeDisplay } = useSnapshot(options)
+  const [fullScreen, setFullScreen] = useState(false)
+  const [time, setTime] = useState('')
+  const [batteryInfo, setBatteryInfo] = useState<{ level: number, charging: boolean } | null>(null)
+
+  useEffect(() => {
+    document.documentElement.addEventListener('fullscreenchange', () => {
+      setFullScreen(!!document.fullscreenElement)
+    })
+
+    // Update time every second
+    const updateTime = () => {
+      const now = new Date()
+      const hours = now.getHours().toString().padStart(2, '0')
+      const minutes = now.getMinutes().toString().padStart(2, '0')
+      setTime(`${hours}:${minutes}`)
+    }
+    updateTime()
+    const timeInterval = setInterval(updateTime, 1000)
+
+    // Get battery info if available
+    if ('getBattery' in navigator) {
+      void navigator.getBattery().then(battery => {
+        const updateBatteryInfo = () => {
+          setBatteryInfo({
+            level: Math.round(battery.level * 100),
+            charging: battery.charging
+          })
+        }
+        updateBatteryInfo()
+        battery.addEventListener('levelchange', updateBatteryInfo)
+        battery.addEventListener('chargingchange', updateBatteryInfo)
+        return () => {
+          battery.removeEventListener('levelchange', updateBatteryInfo)
+          battery.removeEventListener('chargingchange', updateBatteryInfo)
+        }
+      })
+    }
+
+    return () => {
+      clearInterval(timeInterval)
+    }
+  }, [])
+
+  if (topRightTimeDisplay === 'only-fullscreen' && !fullScreen) return null
+
+  return (
+    <div style={{
+      position: 'fixed',
+      top: 'env(safe-area-inset-top, 5px)',
+      right: 'env(safe-area-inset-right, 5px)',
+      display: 'flex',
+      alignItems: 'center',
+      gap: '4px',
+      padding: '1px 3px',
+      background: 'rgba(0, 0, 0, 0.75)',
+      borderRadius: '2px',
+      fontSize: 8,
+      color: 'white',
+      fontFamily: 'minecraft, mojangles, monospace',
+      zIndex: 1,
+      pointerEvents: 'none'
+    }}>
+      <span>{time}</span>
+      {batteryInfo && (
+        <div style={{ display: 'flex', alignItems: 'center', gap: '2px' }}>
+          <PixelartIcon
+            iconName={getBatteryIcon(batteryInfo.level, batteryInfo.charging)}
+            styles={{ fontSize: 12 }}
+          />
+          <span>{batteryInfo.level}%</span>
+        </div>
+      )}
+    </div>
+  )
+}
+
+const getBatteryIcon = (level: number, charging: boolean) => {
+  if (charging) return pixelartIcons['battery-charging']
+  if (level > 60) return pixelartIcons['battery-full']
+  if (level > 20) return pixelartIcons['battery-2']
+  if (level > 5) return pixelartIcons['battery-1']
+  return pixelartIcons['battery']
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index e67facea..fa67d692 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -64,6 +64,7 @@ import DebugResponseTimeIndicator from './react/debugs/DebugResponseTimeIndicato
 import RendererDebugMenu from './react/RendererDebugMenu'
 import CreditsAboutModal from './react/CreditsAboutModal'
 import GlobalOverlayHints from './react/GlobalOverlayHints'
+import FullscreenTime from './react/FullscreenTime'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -174,6 +175,7 @@ const InGameUi = () => {
 
       <PerComponentErrorBoundary>
         <PauseScreen />
+        <FullscreenTime />
         <MineflayerPluginHud />
         <MineflayerPluginConsole />
         {showUI && <TouchInteractionHint />}

From 794cafb1f6d3fa6a43b4f84cb4633b64f4f42ab3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 13 Jun 2025 13:22:15 +0300
Subject: [PATCH 599/753] feat: add useful entities debug entry to F3

---
 renderer/viewer/three/entities.ts        | 10 +++++++
 renderer/viewer/three/graphicsBackend.ts |  3 ++
 src/react/FullscreenTime.tsx             | 37 +++++++++++++-----------
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 1a5e7c3f..8a270332 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -237,6 +237,16 @@ export class Entities {
     return Object.values(this.entities).filter(entity => entity.visible).length
   }
 
+  getDebugString (): string {
+    const totalEntities = Object.keys(this.entities).length
+    const visibleEntities = this.entitiesRenderingCount
+
+    const playerEntities = Object.values(this.entities).filter(entity => entity.playerObject)
+    const visiblePlayerEntities = playerEntities.filter(entity => entity.visible)
+
+    return `${visibleEntities}/${totalEntities} ${visiblePlayerEntities.length}/${playerEntities.length}`
+  }
+
   constructor (public worldRenderer: WorldRendererThree) {
     this.debugMode = 'none'
     this.onSkinUpdate = () => { }
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index 37acfde9..01bb7c56 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -124,6 +124,9 @@ const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitO
       if (worldRenderer) worldRenderer.renderingActive = rendering
     },
     getDebugOverlay: () => ({
+      get entitiesString () {
+        return worldRenderer?.entities.getDebugString()
+      },
     }),
     updateCamera (pos: Vec3 | null, yaw: number, pitch: number) {
       worldRenderer?.setFirstPersonCamera(pos, yaw, pitch)
diff --git a/src/react/FullscreenTime.tsx b/src/react/FullscreenTime.tsx
index 25bd12e4..00b56740 100644
--- a/src/react/FullscreenTime.tsx
+++ b/src/react/FullscreenTime.tsx
@@ -73,28 +73,31 @@ const FullscreenTime = () => {
   if (topRightTimeDisplay === 'only-fullscreen' && !fullScreen) return null
 
   return (
-    <div style={{
-      position: 'fixed',
-      top: 'env(safe-area-inset-top, 5px)',
-      right: 'env(safe-area-inset-right, 5px)',
-      display: 'flex',
-      alignItems: 'center',
-      gap: '4px',
-      padding: '1px 3px',
-      background: 'rgba(0, 0, 0, 0.75)',
-      borderRadius: '2px',
-      fontSize: 8,
-      color: 'white',
-      fontFamily: 'minecraft, mojangles, monospace',
-      zIndex: 1,
-      pointerEvents: 'none'
-    }}>
+    <div
+      className='top-right-time'
+      style={{
+        position: 'fixed',
+        top: 'env(safe-area-inset-top, 5px)',
+        right: 'env(safe-area-inset-right, 5px)',
+        display: 'flex',
+        alignItems: 'center',
+        gap: '4px',
+        padding: '1px 3px',
+        background: 'rgba(0, 0, 0, 0.75)',
+        borderRadius: '2px',
+        fontSize: 8,
+        color: 'white',
+        fontFamily: 'minecraft, mojangles, monospace',
+        zIndex: 1,
+        pointerEvents: 'none'
+      }}
+    >
       <span>{time}</span>
       {batteryInfo && (
         <div style={{ display: 'flex', alignItems: 'center', gap: '2px' }}>
           <PixelartIcon
             iconName={getBatteryIcon(batteryInfo.level, batteryInfo.charging)}
-            styles={{ fontSize: 12 }}
+            styles={{ fontSize: 10 }}
           />
           <span>{batteryInfo.level}%</span>
         </div>

From 9f3079b5f5d94ad3162c0f297fab745a79e33f1f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 13 Jun 2025 14:14:08 +0300
Subject: [PATCH 600/753] feat: rework effects display with new UI! fix a few
 related bugs

---
 src/optionsGuiScheme.tsx               |   9 +-
 src/react/IndicatorEffects.css         |  63 +++++++++++--
 src/react/IndicatorEffects.stories.tsx |  33 -------
 src/react/IndicatorEffects.tsx         | 118 ++++++++++++++-----------
 src/react/IndicatorEffectsProvider.tsx |  83 +++++++++--------
 src/reactUi.tsx                        |   2 +-
 6 files changed, 174 insertions(+), 134 deletions(-)
 delete mode 100644 src/react/IndicatorEffects.stories.tsx

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index e3b71778..3409dc76 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -365,7 +365,12 @@ export const guiOptionsScheme: {
     },
     {
       custom () {
-        return <UiToggleButton name='effects-indicators' label='Effects & Indicators' />
+        return <UiToggleButton name='effects' label='Effects' />
+      },
+    },
+    {
+      custom () {
+        return <UiToggleButton name='indicators' label='Game Indicators' />
       },
     },
     {
@@ -717,7 +722,7 @@ const Category = ({ children }) => <div style={{
   gridColumn: 'span 2'
 }}>{children}</div>
 
-const UiToggleButton = ({ name, addUiText = false, label = noCase(name) }) => {
+const UiToggleButton = ({ name, addUiText = false, label = noCase(name) }: { name: string, addUiText?: boolean, label?: string }) => {
   const { disabledUiParts } = useSnapshot(options)
 
   const currentlyDisabled = disabledUiParts.includes(name)
diff --git a/src/react/IndicatorEffects.css b/src/react/IndicatorEffects.css
index 6b178c58..797b37e8 100644
--- a/src/react/IndicatorEffects.css
+++ b/src/react/IndicatorEffects.css
@@ -1,9 +1,9 @@
-.effectsScreen-container {
+.indicators-container-outer {
   position: fixed;
   top: max(6%, 30px);
-  left: 0px;
+  left: calc(env(safe-area-inset-left) / 2);
   z-index: -2;
-  pointer-events: none;
+  /* pointer-events: none; */
 }
 
 .indicators-container {
@@ -17,19 +17,68 @@
 }
 
 .effect-box {
+  position: relative;
   display: flex;
   align-items: center;
+  background: rgba(40, 40, 40, 0.85);
+  border-top: 1px solid #9f9f9f;
+  border-left: 1px solid #9f9f9f;
+  border-right: 1px solid #373737;
+  border-bottom: 1px solid #373737;
+  padding: 3px 9px 3px 4px;
+  margin-bottom: 3px;
+  min-width: 60px;
+  min-height: 22px;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+
+.effect-box__progress-bg {
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  background: linear-gradient(90deg, #b2b2b2 0%, #6b6b6b 100%);
+  opacity: 0.18;
+  z-index: 0;
+  transition: width 0.3s linear;
 }
 
 .effect-box__image {
-  width: 23px;
-  margin-right: 3px;
+  width: 16px;
+  height: 16px;
+  margin-right: 4px;
+  z-index: 1;
+}
+
+.effect-box__content {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  z-index: 1;
+  flex: 1;
+}
+
+.effect-box__title {
+  color: #e0e0e0;
+  font-size: 0.45rem;
+  font-weight: 600;
+  margin-bottom: 1px;
+  text-shadow: 1px 1px 0 #222, 0 0 2px #000;
 }
 
 .effect-box__time {
-  font-size: 0.65rem;
+  color: #fff;
+  font-size: 0.5rem;
+  text-shadow: 1px 1px 0 #222, 0 0 2px #000;
 }
 
 .effect-box__level {
-  font-size: 0.45rem;
+  position: absolute;
+  right: 4px;
+  top: 4px;
+  color: #fff;
+  font-size: 0.48rem;
+  text-shadow: 1px 1px 0 #222, 0 0 2px #000;
+  z-index: 2;
 }
diff --git a/src/react/IndicatorEffects.stories.tsx b/src/react/IndicatorEffects.stories.tsx
deleted file mode 100644
index e0371550..00000000
--- a/src/react/IndicatorEffects.stories.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/react'
-
-import IndicatorEffects, { defaultIndicatorsState } from './IndicatorEffects'
-import { images } from './effectsImages'
-
-const meta: Meta<typeof IndicatorEffects> = {
-  component: IndicatorEffects
-}
-
-export default meta
-type Story = StoryObj<typeof IndicatorEffects>
-
-export const Primary: Story = {
-  args: {
-    indicators: defaultIndicatorsState,
-    effects: [
-      {
-        image: images.glowing,
-        time: 200,
-        level: 255,
-        removeEffect (image: string) { },
-        reduceTime (image: string) { }
-      },
-      {
-        image: images.absorption,
-        time: 30,
-        level: 99,
-        removeEffect (image: string) { },
-        reduceTime (image: string) { }
-      }
-    ],
-  }
-}
diff --git a/src/react/IndicatorEffects.tsx b/src/react/IndicatorEffects.tsx
index 5b05290f..50ece8d5 100644
--- a/src/react/IndicatorEffects.tsx
+++ b/src/react/IndicatorEffects.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useEffect, useRef } from 'react'
+import { useMemo, useEffect, useRef, useState } from 'react'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
 import './IndicatorEffects.css'
 
@@ -9,35 +9,55 @@ function formatTime (seconds: number): string {
   const minutes = Math.floor(seconds / 60)
   const remainingSeconds = Math.floor(seconds % 60)
   const formattedMinutes = String(minutes).padStart(2, '0')
-  const formattedSeconds = String(remainingSeconds)
+  const formattedSeconds = String(remainingSeconds).padStart(2, '0')
   return `${formattedMinutes}:${formattedSeconds}`
 }
 
 export type EffectType = {
+  id: number,
   image: string,
-  time: number,
   level: number,
-  removeEffect: (image: string) => void,
-  reduceTime: (image: string) => void
+  initialTime: number,
+  duration: number,
+  name: string,
 }
 
-const EffectBox = ({ image, time, level }: Pick<EffectType, 'image' | 'time' | 'level'>) => {
+const EffectBox = ({ image, level, name, initialTime, duration }: Pick<EffectType, 'image' | 'level' | 'initialTime' | 'name' | 'duration'>) => {
+  const [currentTime, setCurrentTime] = useState(Date.now())
 
-  const formattedTime = useMemo(() => formatTime(time), [time])
+  useEffect(() => {
+    const interval = setInterval(() => {
+      setCurrentTime(Date.now())
+    }, 100)
+    return () => clearInterval(interval)
+  }, [])
 
-  return <div className='effect-box'>
-    <img className='effect-box__image' src={image} alt='' />
-    <div>
-      {formattedTime ? (
-        // if time is negative then effect is shown without time.
-        // Component should be removed manually with time = 0
-        <div className='effect-box__time'>{formattedTime}</div>
-      ) : null}
-      {level > 0 && level < 256 ? (
-        <div className='effect-box__level'>{level + 1}</div>
-      ) : null}
+  const timeElapsed = (currentTime - initialTime) / 1000
+  const timeRemaining = Math.max(0, duration - timeElapsed)
+  const progress = duration > 0 ? Math.max(0, Math.min(1, timeRemaining / duration)) : 0
+  const formattedTime = useMemo(() => formatTime(timeRemaining), [timeRemaining])
+
+  // Convert level to Roman numerals
+  const toRomanNumeral = (num: number): string => {
+    if (num <= 0) return ''
+    const romanNumerals = ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X']
+    return romanNumerals[num - 1] || `${num}`
+  }
+
+  const levelText = level > 0 && level < 256 ? ` ${toRomanNumeral(level + 1)}` : ''
+
+  return (
+    <div className='effect-box'>
+      <div className='effect-box__progress-bg' style={{ width: `${progress * 100}%` }} />
+      <img className='effect-box__image' src={image} alt='' />
+      <div className='effect-box__content'>
+        <div className='effect-box__title'>{name}{levelText}</div>
+        {formattedTime && (
+          <div className='effect-box__time'>{formattedTime}</div>
+        )}
+      </div>
     </div>
-  </div>
+  )
 }
 
 export const defaultIndicatorsState = {
@@ -68,29 +88,17 @@ const colorOverrides = {
   }
 }
 
-export default ({ indicators, effects }: { indicators: typeof defaultIndicatorsState, effects: readonly EffectType[] }) => {
-  const effectsRef = useRef(effects)
-  useEffect(() => {
-    effectsRef.current = effects
-  }, [effects])
-
-  useEffect(() => {
-    // todo use more precise timer for each effect
-    const interval = setInterval(() => {
-      for (const [index, effect] of effectsRef.current.entries()) {
-        if (effect.time === 0) {
-          // effect.removeEffect(effect.image)
-          return
-        }
-        effect.reduceTime(effect.image)
-      }
-    }, 1000)
-
-    return () => {
-      clearInterval(interval)
-    }
-  }, [])
-
+export default ({
+  indicators,
+  effects,
+  displayIndicators,
+  displayEffects
+}: {
+  indicators: typeof defaultIndicatorsState,
+  effects: readonly EffectType[]
+  displayIndicators: boolean
+  displayEffects: boolean
+}) => {
   const indicatorsMapped = Object.entries(defaultIndicatorsState).map(([key]) => {
     const state = indicators[key]
     return {
@@ -100,10 +108,10 @@ export default ({ indicators, effects }: { indicators: typeof defaultIndicatorsS
       key
     }
   })
-  return <div className='effectsScreen-container'>
+  return <div className='indicators-container-outer'>
     <div className='indicators-container'>
       {
-        indicatorsMapped.map((indicator) => <div
+        displayIndicators && indicatorsMapped.map((indicator) => <div
           key={indicator.icon}
           style={{
             opacity: indicator.state ? 1 : 0,
@@ -115,15 +123,17 @@ export default ({ indicators, effects }: { indicators: typeof defaultIndicatorsS
         </div>)
       }
     </div>
-    <div className='effects-container'>
-      {
-        effects.map((effect) => <EffectBox
-          key={`effectBox-${effect.image}`}
-          image={effect.image}
-          time={effect.time}
-          level={effect.level}
-        />)
-      }
-    </div>
+    {displayEffects && <EffectsInner effects={effects} />}
+  </div>
+}
+
+const EffectsInner = ({ effects }: { effects: readonly EffectType[] }) => {
+  return <div className='effects-container'>
+    {effects.map((effect) => (
+      <EffectBox
+        key={`effectBox-${effect.id}`}
+        {...effect}
+      />
+    ))}
   </div>
 }
diff --git a/src/react/IndicatorEffectsProvider.tsx b/src/react/IndicatorEffectsProvider.tsx
index 097bb28d..c479d7e1 100644
--- a/src/react/IndicatorEffectsProvider.tsx
+++ b/src/react/IndicatorEffectsProvider.tsx
@@ -1,6 +1,7 @@
 import { proxy, subscribe, useSnapshot } from 'valtio'
 import { useEffect, useMemo, useState } from 'react'
 import { subscribeKey } from 'valtio/utils'
+import { Effect } from 'mineflayer'
 import { inGameError } from '../utils'
 import { fsState } from '../loadSave'
 import { gameAdditionalState, miscUiState } from '../globalState'
@@ -14,43 +15,52 @@ export const state = proxy({
   effects: [] as EffectType[]
 })
 
-export const addEffect = (newEffect: Omit<EffectType, 'reduceTime' | 'removeEffect'>) => {
-  const effectIndex = getEffectIndex(newEffect as EffectType)
+export const addEffect = (newEffect: Effect) => {
+  const effectData = loadedData.effectsArray.find(e => e.id === newEffect.id)
+  const name = effectData?.name ?? `unknown: ${newEffect.id}`
+  const nameKebab = name.replaceAll(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`).slice(1)
+  const image = images[nameKebab] ?? null
+  if (!image) {
+    inGameError(`received unknown effect id ${newEffect.id}`)
+    return
+  }
+
+  const effectIndex = getEffectIndex({ id: newEffect.id })
   if (typeof effectIndex === 'number') {
-    state.effects[effectIndex].time = newEffect.time
-    state.effects[effectIndex].level = newEffect.level
+    state.effects[effectIndex].initialTime = Date.now()
+    state.effects[effectIndex].level = newEffect.amplifier
+    state.effects[effectIndex].duration = newEffect.duration / 20 // convert ticks to seconds
   } else {
-    const effect = { ...newEffect, reduceTime, removeEffect }
+    const effect: EffectType = {
+      id: newEffect.id,
+      name,
+      image,
+      level: newEffect.amplifier,
+      initialTime: Date.now(),
+      duration: newEffect.duration / 20, // convert ticks to seconds
+    }
     state.effects.push(effect)
   }
 }
 
-const removeEffect = (image: string) => {
+const removeEffect = (id: number) => {
   for (const [index, effect] of (state.effects).entries()) {
-    if (effect.image === image) {
+    if (effect.id === id) {
       state.effects.splice(index, 1)
     }
   }
 }
 
-const reduceTime = (image: string) => {
+const getEffectIndex = (newEffect: Pick<EffectType, 'id'>) => {
   for (const [index, effect] of (state.effects).entries()) {
-    if (effect.image === image) {
-      effect.time -= 1
-    }
-  }
-}
-
-const getEffectIndex = (newEffect: EffectType) => {
-  for (const [index, effect] of (state.effects).entries()) {
-    if (effect.image === newEffect.image) {
+    if (effect.id === newEffect.id) {
       return index
     }
   }
   return null
 }
 
-export default () => {
+export default ({ displayEffects = true, displayIndicators = true }: { displayEffects?: boolean, displayIndicators?: boolean }) => {
   const [dummyState, setDummyState] = useState(false)
   const stateIndicators = useSnapshot(state.indicators)
   const chunksLoading = !useSnapshot(appViewer.rendererState).world.allChunksLoaded
@@ -87,33 +97,32 @@ export default () => {
       const nameKebab = effect.name.replaceAll(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`).slice(1)
       return [effect.id, images[nameKebab]]
     }))
-    bot.on('entityEffect', (entity, effect) => {
+    const gotEffect = (entity: import('prismarine-entity').Entity, effect: Effect) => {
       if (entity.id !== bot.entity.id) return
-      const image = effectsImages[effect.id] ?? null
-      if (!image) {
-        inGameError(`received unknown effect id ${effect.id}}`)
-        return
-      }
-      const newEffect = {
-        image,
-        time: effect.duration / 20, // duration received in ticks
-        level: effect.amplifier,
-      }
-      addEffect(newEffect)
-    })
+      addEffect(effect)
+    }
+    bot.on('entityEffect', gotEffect)
+
+    // gotEffect(bot.entity, {
+    //   id: 1,
+    //   amplifier: 1,
+    //   duration: 100,
+    // })
+
+    for (const effect of Object.values(bot.entity.effects ?? {})) {
+      gotEffect(bot.entity, effect)
+    }
+
     bot.on('entityEffectEnd', (entity, effect) => {
       if (entity.id !== bot.entity.id) return
-      const image = effectsImages[effect.id] ?? null
-      if (!image) {
-        inGameError(`received unknown effect id ${effect.id}}}`)
-        return
-      }
-      removeEffect(image)
+      removeEffect(effect.id)
     })
   }, [])
 
   return <IndicatorEffects
     indicators={allIndicators}
     effects={effects}
+    displayIndicators
+    displayEffects
   />
 }
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index fa67d692..138696b0 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -163,7 +163,7 @@ const InGameUi = () => {
           {showMinimap !== 'never' && <MinimapProvider adapter={adapter} displayMode='minimapOnly' />}
           {!disabledUiParts.includes('title') && <TitleProvider />}
           {!disabledUiParts.includes('scoreboard') && <ScoreboardProvider />}
-          {!disabledUiParts.includes('effects-indicators') && <IndicatorEffectsProvider />}
+          <IndicatorEffectsProvider displayEffects={!disabledUiParts.includes('effects')} displayIndicators={!disabledUiParts.includes('indicators')} />
           {!disabledUiParts.includes('crosshair') && <Crosshair />}
           {!disabledUiParts.includes('books') && <BookProvider />}
           {!disabledUiParts.includes('bossbars') && displayBossBars && <BossBarOverlayProvider />}

From 8c71f70db2f04402cead0732886fde3ec4cfdcdb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 13 Jun 2025 15:12:58 +0300
Subject: [PATCH 601/753] fix: fix shifting didn't work on some servers after
 check

---
 pnpm-lock.yaml | 147 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 129 insertions(+), 18 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 63ee982e..60c25f84 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,7 +136,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13))
       minecraft-data:
         specifier: 3.89.0
         version: 3.89.0
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.10
         version: 0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
@@ -3614,6 +3614,10 @@ packages:
     resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
     engines: {node: '>= 0.4'}
 
+  array-includes@3.1.9:
+    resolution: {integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==}
+    engines: {node: '>= 0.4'}
+
   array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
@@ -4773,6 +4777,10 @@ packages:
     resolution: {integrity: sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==}
     engines: {node: '>= 0.4'}
 
+  es-abstract@1.24.0:
+    resolution: {integrity: sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==}
+    engines: {node: '>= 0.4'}
+
   es-define-property@1.0.1:
     resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
     engines: {node: '>= 0.4'}
@@ -5949,6 +5957,10 @@ packages:
     resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
     engines: {node: '>= 0.4'}
 
+  is-negative-zero@2.0.3:
+    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+    engines: {node: '>= 0.4'}
+
   is-number-object@1.1.1:
     resolution: {integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==}
     engines: {node: '>= 0.4'}
@@ -6724,8 +6736,8 @@ packages:
     resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b}
     version: 4.27.0
     engines: {node: '>=22'}
 
@@ -8449,9 +8461,17 @@ packages:
     resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
     engines: {node: '>= 0.8'}
 
+  statuses@2.0.2:
+    resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
+    engines: {node: '>= 0.8'}
+
   std-env@3.8.1:
     resolution: {integrity: sha512-vj5lIj3Mwf9D79hBkltk5qmkFI+biIKWS2IBxEyEU3AX1tUf7AoL8nSazCOiiqQsGKIq01SClsKEzweu34uwvA==}
 
+  stop-iteration-iterator@1.1.0:
+    resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
+    engines: {node: '>= 0.4'}
+
   store2@2.14.4:
     resolution: {integrity: sha512-srTItn1GOvyvOycgxjAnPA63FZNwy0PTyUBFMHRM+hVFltAeoh0LmNBz9SZqUS9mMqGk8rfyWyXn3GH5ReJ8Zw==}
 
@@ -9404,6 +9424,10 @@ packages:
     resolution: {integrity: sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==}
     engines: {node: '>= 0.4'}
 
+  which-typed-array@1.1.19:
+    resolution: {integrity: sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==}
+    engines: {node: '>= 0.4'}
+
   which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
     hasBin: true
@@ -9751,7 +9775,7 @@ snapshots:
       '@babel/core': 7.26.9
       '@babel/helper-compilation-targets': 7.26.5
       '@babel/helper-plugin-utils': 7.26.5
-      debug: 4.4.1
+      debug: 4.4.0(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.10
     transitivePeerDependencies:
@@ -13322,7 +13346,7 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.4.1
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -13452,6 +13476,17 @@ snapshots:
       get-intrinsic: 1.3.0
       is-string: 1.1.1
 
+  array-includes@3.1.9:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-abstract: 1.24.0
+      es-object-atoms: 1.1.1
+      get-intrinsic: 1.3.0
+      is-string: 1.1.1
+      math-intrinsics: 1.1.0
+
   array-union@2.1.0: {}
 
   array-unique@0.3.2: {}
@@ -13460,7 +13495,7 @@ snapshots:
     dependencies:
       call-bind: 1.0.8
       define-properties: 1.2.1
-      es-abstract: 1.23.9
+      es-abstract: 1.24.0
       es-errors: 1.3.0
       es-object-atoms: 1.1.1
       es-shim-unscopables: 1.1.0
@@ -13483,7 +13518,7 @@ snapshots:
     dependencies:
       call-bind: 1.0.8
       define-properties: 1.2.1
-      es-abstract: 1.23.9
+      es-abstract: 1.24.0
       es-errors: 1.3.0
       es-shim-unscopables: 1.1.0
 
@@ -14939,6 +14974,63 @@ snapshots:
       unbox-primitive: 1.1.0
       which-typed-array: 1.1.18
 
+  es-abstract@1.24.0:
+    dependencies:
+      array-buffer-byte-length: 1.0.2
+      arraybuffer.prototype.slice: 1.0.4
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      data-view-buffer: 1.0.2
+      data-view-byte-length: 1.0.2
+      data-view-byte-offset: 1.0.1
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.1
+      es-set-tostringtag: 2.1.0
+      es-to-primitive: 1.3.0
+      function.prototype.name: 1.1.8
+      get-intrinsic: 1.3.0
+      get-proto: 1.0.1
+      get-symbol-description: 1.1.0
+      globalthis: 1.0.4
+      gopd: 1.2.0
+      has-property-descriptors: 1.0.2
+      has-proto: 1.2.0
+      has-symbols: 1.1.0
+      hasown: 2.0.2
+      internal-slot: 1.1.0
+      is-array-buffer: 3.0.5
+      is-callable: 1.2.7
+      is-data-view: 1.0.2
+      is-negative-zero: 2.0.3
+      is-regex: 1.2.1
+      is-set: 2.0.3
+      is-shared-array-buffer: 1.0.4
+      is-string: 1.1.1
+      is-typed-array: 1.1.15
+      is-weakref: 1.1.1
+      math-intrinsics: 1.1.0
+      object-inspect: 1.13.4
+      object-keys: 1.1.1
+      object.assign: 4.1.7
+      own-keys: 1.0.1
+      regexp.prototype.flags: 1.5.4
+      safe-array-concat: 1.1.3
+      safe-push-apply: 1.0.0
+      safe-regex-test: 1.1.0
+      set-proto: 1.0.0
+      stop-iteration-iterator: 1.1.0
+      string.prototype.trim: 1.2.10
+      string.prototype.trimend: 1.0.9
+      string.prototype.trimstart: 1.0.8
+      typed-array-buffer: 1.0.3
+      typed-array-byte-length: 1.0.3
+      typed-array-byte-offset: 1.0.4
+      typed-array-length: 1.0.7
+      unbox-primitive: 1.1.0
+      which-typed-array: 1.1.19
+
   es-define-property@1.0.1: {}
 
   es-errors@1.3.0: {}
@@ -14948,7 +15040,7 @@ snapshots:
       call-bind: 1.0.8
       call-bound: 1.0.4
       define-properties: 1.2.1
-      es-abstract: 1.23.9
+      es-abstract: 1.24.0
       es-errors: 1.3.0
       es-set-tostringtag: 2.1.0
       function-bind: 1.1.2
@@ -15219,7 +15311,7 @@ snapshots:
 
   eslint-plugin-react@7.37.4(eslint@8.57.1):
     dependencies:
-      array-includes: 3.1.8
+      array-includes: 3.1.9
       array.prototype.findlast: 1.2.5
       array.prototype.flatmap: 1.3.3
       array.prototype.tosorted: 1.1.4
@@ -16428,6 +16520,8 @@ snapshots:
       call-bind: 1.0.8
       define-properties: 1.2.1
 
+  is-negative-zero@2.0.3: {}
+
   is-number-object@1.1.1:
     dependencies:
       call-bound: 1.0.4
@@ -16738,7 +16832,7 @@ snapshots:
 
   jsx-ast-utils@3.3.5:
     dependencies:
-      array-includes: 3.1.8
+      array-includes: 3.1.9
       array.prototype.flat: 1.3.3
       object.assign: 4.1.7
       object.values: 1.2.1
@@ -17033,12 +17127,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17268,7 +17362,7 @@ snapshots:
   micromark@4.0.2:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.4.1
+      debug: 4.4.0(supports-color@8.1.1)
       decode-named-character-reference: 1.1.0
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.3
@@ -17475,7 +17569,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/e4818de9e1ba2783a930b4358499ac4033e6383d(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.89.0
@@ -17882,7 +17976,7 @@ snapshots:
     dependencies:
       call-bind: 1.0.8
       define-properties: 1.2.1
-      es-abstract: 1.23.9
+      es-abstract: 1.24.0
       es-object-atoms: 1.1.1
 
   object.pick@1.3.0:
@@ -19204,7 +19298,7 @@ snapshots:
       ms: 2.1.3
       on-finished: 2.4.1
       range-parser: 1.2.1
-      statuses: 2.0.1
+      statuses: 2.0.2
     transitivePeerDependencies:
       - supports-color
 
@@ -19669,8 +19763,15 @@ snapshots:
 
   statuses@2.0.1: {}
 
+  statuses@2.0.2: {}
+
   std-env@3.8.1: {}
 
+  stop-iteration-iterator@1.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      internal-slot: 1.1.0
+
   store2@2.14.4: {}
 
   storybook@7.6.20(encoding@0.1.13):
@@ -19740,7 +19841,7 @@ snapshots:
   string.prototype.repeat@1.0.0:
     dependencies:
       define-properties: 1.2.1
-      es-abstract: 1.23.9
+      es-abstract: 1.24.0
 
   string.prototype.trim@1.2.10:
     dependencies:
@@ -20684,6 +20785,16 @@ snapshots:
       gopd: 1.2.0
       has-tostringtag: 1.0.2
 
+  which-typed-array@1.1.19:
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      for-each: 0.3.5
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      has-tostringtag: 1.0.2
+
   which@1.3.1:
     dependencies:
       isexe: 2.0.0

From 679c3775f7a85962e6c0b5e8e78ce6caf9a7b0d7 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 15 Jun 2025 16:52:24 +0300
Subject: [PATCH 602/753] feat: convert formatted text color to display p3
 display so its more vibrant on macbooks with xdr display and other p3
 monitors

---
 src/chatUtils.ts                     |  4 +++
 src/react/MessageFormatted.css       |  2 +-
 src/react/MessageFormatted.tsx       | 45 ++++++++++++++--------------
 src/react/MessageFormattedString.tsx |  7 +++--
 src/react/Scoreboard.css             |  2 +-
 5 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/chatUtils.ts b/src/chatUtils.ts
index 384dbdae..88437bc3 100644
--- a/src/chatUtils.ts
+++ b/src/chatUtils.ts
@@ -4,6 +4,10 @@ import { fromFormattedString, TextComponent } from '@xmcl/text-component'
 import type { IndexedData } from 'minecraft-data'
 import { versionToNumber } from 'renderer/viewer/common/utils'
 
+export interface MessageFormatOptions {
+  doShadow?: boolean
+}
+
 export type MessageFormatPart = Pick<TextComponent, 'hoverEvent' | 'clickEvent'> & {
   text: string
   color?: string
diff --git a/src/react/MessageFormatted.css b/src/react/MessageFormatted.css
index 7e5be00a..f16a0644 100644
--- a/src/react/MessageFormatted.css
+++ b/src/react/MessageFormatted.css
@@ -1,5 +1,5 @@
 /* base global styles */
 
 .formatted-message {
-    text-shadow: 1px 1px 0px #3f3f3f;;
+    /* text-shadow: 1px 1px 0px #3f3f3f; */
 }
diff --git a/src/react/MessageFormatted.tsx b/src/react/MessageFormatted.tsx
index 554d5a9b..a70ca3b1 100644
--- a/src/react/MessageFormatted.tsx
+++ b/src/react/MessageFormatted.tsx
@@ -3,7 +3,7 @@ import { render } from '@xmcl/text-component'
 import { noCase } from 'change-case'
 import mojangson from 'mojangson'
 import { openURL } from 'renderer/viewer/lib/simpleUtils'
-import { MessageFormatPart } from '../chatUtils'
+import { MessageFormatOptions, MessageFormatPart } from '../chatUtils'
 import { chatInputValueGlobal } from './Chat'
 import './MessageFormatted.css'
 import { showOptionsModal } from './SelectOption'
@@ -67,9 +67,10 @@ const clickEventToProps = (clickEvent: MessageFormatPart['clickEvent']) => {
   }
 }
 
-export const MessagePart = ({ part, ...props }: { part: MessageFormatPart } & ComponentProps<'span'>) => {
+export const MessagePart = ({ part, formatOptions, ...props }: { part: MessageFormatPart, formatOptions?: MessageFormatOptions } & ComponentProps<'span'>) => {
 
-  const { color, italic, bold, underlined, strikethrough, text, clickEvent, hoverEvent, obfuscated } = part
+  const { color: _color, italic, bold, underlined, strikethrough, text, clickEvent, hoverEvent, obfuscated } = part
+  const color = _color ?? 'white'
 
   const clickProps = clickEventToProps(clickEvent)
   const hoverMessageRaw = hoverItemToText(hoverEvent)
@@ -77,7 +78,7 @@ export const MessagePart = ({ part, ...props }: { part: MessageFormatPart } & Co
 
   const applyStyles = [
     clickProps && messageFormatStylesMap.clickEvent,
-    color ? colorF(color.toLowerCase()) + `; text-shadow: 1px 1px 0px ${getColorShadow(colorF(color.toLowerCase()).replace('color:', ''))}` : messageFormatStylesMap.white,
+    colorF(color.toLowerCase()) + ((formatOptions?.doShadow ?? true) ? `; text-shadow: 1px 1px 0px ${getColorShadow(colorF(color.toLowerCase()).replace('color:', ''))}` : ''),
     italic && messageFormatStylesMap.italic,
     bold && messageFormatStylesMap.bold,
     italic && messageFormatStylesMap.italic,
@@ -89,10 +90,10 @@ export const MessagePart = ({ part, ...props }: { part: MessageFormatPart } & Co
   return <span title={hoverItemText} style={parseInlineStyle(applyStyles.join(';'))} {...clickProps} {...props}>{text}</span>
 }
 
-export default ({ parts, className }: { parts: readonly MessageFormatPart[], className?: string }) => {
+export default ({ parts, className, formatOptions }: { parts: readonly MessageFormatPart[], className?: string, formatOptions?: MessageFormatOptions }) => {
   return (
     <span className={`formatted-message ${className ?? ''}`}>
-      {parts.map((part, i) => <MessagePart key={i} part={part} />)}
+      {parts.map((part, i) => <MessagePart key={i} part={part} formatOptions={formatOptions} />)}
     </span>
   )
 }
@@ -123,22 +124,22 @@ export function parseInlineStyle (style: string): Record<string, any> {
 }
 
 export const messageFormatStylesMap = {
-  black: 'color:#000000',
-  dark_blue: 'color:#0000AA',
-  dark_green: 'color:#00AA00',
-  dark_aqua: 'color:#00AAAA',
-  dark_red: 'color:#AA0000',
-  dark_purple: 'color:#AA00AA',
-  gold: 'color:#FFAA00',
-  gray: 'color:#AAAAAA',
-  dark_gray: 'color:#555555',
-  blue: 'color:#5555FF',
-  green: 'color:#55FF55',
-  aqua: 'color:#55FFFF',
-  red: 'color:#FF5555',
-  light_purple: 'color:#FF55FF',
-  yellow: 'color:#FFFF55',
-  white: 'color:#FFFFFF',
+  black: 'color:color(display-p3 0 0 0)',
+  dark_blue: 'color:color(display-p3 0 0 0.6667)',
+  dark_green: 'color:color(display-p3 0 0.6667 0)',
+  dark_aqua: 'color:color(display-p3 0 0.6667 0.6667)',
+  dark_red: 'color:color(display-p3 0.6667 0 0)',
+  dark_purple: 'color:color(display-p3 0.6667 0 0.6667)',
+  gold: 'color:color(display-p3 1 0.6667 0)',
+  gray: 'color:color(display-p3 0.6667 0.6667 0.6667)',
+  dark_gray: 'color:color(display-p3 0.3333 0.3333 0.3333)',
+  blue: 'color:color(display-p3 0.3333 0.3333 1)',
+  green: 'color:color(display-p3 0.3333 1 0.3333)',
+  aqua: 'color:color(display-p3 0.3333 1 1)',
+  red: 'color:color(display-p3 1 0.3333 0.3333)',
+  light_purple: 'color:color(display-p3 1 0.3333 1)',
+  yellow: 'color:color(display-p3 1 1 0.3333)',
+  white: 'color:color(display-p3 1 1 1)',
   bold: 'font-weight:900',
   strikethrough: 'text-decoration:line-through',
   underlined: 'text-decoration:underline',
diff --git a/src/react/MessageFormattedString.tsx b/src/react/MessageFormattedString.tsx
index f667cdd8..1fe8166a 100644
--- a/src/react/MessageFormattedString.tsx
+++ b/src/react/MessageFormattedString.tsx
@@ -1,14 +1,15 @@
 import { useMemo } from 'react'
 import { fromFormattedString } from '@xmcl/text-component'
 import { ErrorBoundary } from '@zardoy/react-util'
-import { formatMessage } from '../chatUtils'
+import { formatMessage, MessageFormatOptions } from '../chatUtils'
 import MessageFormatted from './MessageFormatted'
 
 /** like MessageFormatted, but receives raw string or json instead, uses window.loadedData */
-export default ({ message, fallbackColor, className }: {
+export default ({ message, fallbackColor, className, formatOptions }: {
   message: string | Record<string, any> | null,
   fallbackColor?: string,
   className?: string
+  formatOptions?: MessageFormatOptions
 }) => {
   const messageJson = useMemo(() => {
     if (!message) return null
@@ -30,6 +31,6 @@ export default ({ message, fallbackColor, className }: {
     console.error(error)
     return <div>[text component crashed]</div>
   }}>
-    <MessageFormatted parts={messageJson} className={className} />
+    <MessageFormatted parts={messageJson} className={className} formatOptions={formatOptions} />
   </ErrorBoundary> : null
 }
diff --git a/src/react/Scoreboard.css b/src/react/Scoreboard.css
index b2bb8521..38ec426f 100644
--- a/src/react/Scoreboard.css
+++ b/src/react/Scoreboard.css
@@ -1,6 +1,6 @@
 .scoreboard-container {
   z-index: -2;
-  pointer-events: none;
+  /* pointer-events: none; */
   white-space: nowrap;
   position: fixed;
   right: 0px;

From f3ff4bef0374bd0bdae44e3e5621cbf5996d1bd2 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 18 Jun 2025 08:19:04 +0300
Subject: [PATCH 603/753] big renderer codebase cleanup: clean player state
 (#371)

---
 .cursor/rules/vars-usage.mdc                |  16 ++
 .gitignore                                  |   1 +
 renderer/buildMesherWorker.mjs              |   4 +
 renderer/viewer/baseGraphicsBackend.ts      |  32 ++--
 renderer/viewer/lib/basePlayerState.ts      | 162 +++++++-------------
 renderer/viewer/lib/guiRenderer.ts          |  26 ++--
 renderer/viewer/lib/mesher/mesher.ts        |   2 +
 renderer/viewer/lib/mesher/shared.ts        |   2 +-
 renderer/viewer/lib/utils.ts                |   5 +-
 renderer/viewer/lib/utils/skins.ts          |  49 ++++--
 renderer/viewer/lib/workerProxy.ts          |  41 ++++-
 renderer/viewer/lib/worldDataEmitter.ts     |  44 ++----
 renderer/viewer/lib/worldrendererCommon.ts  | 119 ++++++++------
 renderer/viewer/three/appShared.ts          |  18 +--
 renderer/viewer/three/documentRenderer.ts   | 155 ++++++++++++++-----
 renderer/viewer/three/entities.ts           |  84 ++++++----
 renderer/viewer/three/entity/EntityMesh.ts  |   5 +-
 renderer/viewer/three/graphicsBackend.ts    |  23 ++-
 renderer/viewer/three/holdingBlock.ts       |  36 +++--
 renderer/viewer/three/panorama.ts           |  79 ++++++----
 renderer/viewer/three/renderSlot.ts         |  78 ++++++++++
 renderer/viewer/three/world/cursorBlock.ts  |  11 +-
 renderer/viewer/three/worldrendererThree.ts |  58 ++++---
 src/appViewer.ts                            |  78 ++++++----
 src/browserfs.ts                            |   6 +-
 src/controls.ts                             |   3 +
 src/index.ts                                |  44 ++++--
 src/inventoryWindows.ts                     |  86 +----------
 src/mineflayer/items.ts                     |  13 +-
 src/mineflayer/playerState.ts               | 155 ++++++++-----------
 src/react/HotbarRenderApp.tsx               |   2 +-
 src/react/Notification.tsx                  |  73 +++++++--
 src/react/RendererDebugMenu.tsx             |   6 +-
 src/react/Singleplayer.tsx                  |   2 +-
 src/rendererUtils.ts                        |  14 +-
 src/resourcePack.ts                         |  46 +++---
 src/resourcesManager.ts                     | 105 +++++++------
 37 files changed, 975 insertions(+), 708 deletions(-)
 create mode 100644 .cursor/rules/vars-usage.mdc
 create mode 100644 renderer/viewer/three/renderSlot.ts

diff --git a/.cursor/rules/vars-usage.mdc b/.cursor/rules/vars-usage.mdc
new file mode 100644
index 00000000..7120e7ae
--- /dev/null
+++ b/.cursor/rules/vars-usage.mdc
@@ -0,0 +1,16 @@
+---
+description: Restricts usage of the global Mineflayer `bot` variable to only src/ files; prohibits usage in renderer/. Specifies correct usage of player state and appViewer globals.
+globs: src/**/*.ts,renderer/**/*.ts
+alwaysApply: false
+---
+Ask AI
+
+- The global variable `bot` refers to the Mineflayer bot instance.
+- You may use `bot` directly in any file under the `src/` directory (e.g., `src/mineflayer/playerState.ts`).
+- Do **not** use `bot` directly in any file under the `renderer/` directory or its subfolders (e.g., `renderer/viewer/three/worldrendererThree.ts`).
+- In renderer code, all bot/player state and events must be accessed via explicit interfaces, state managers, or passed-in objects, never by referencing `bot` directly.
+- In renderer code (such as in `WorldRendererThree`), use the `playerState` property (e.g., `worldRenderer.playerState.gameMode`) to access player state. The implementation for `playerState` lives in `src/mineflayer/playerState.ts`.
+- In `src/` code, you may use the global variable `appViewer` from `src/appViewer.ts` directly. Do **not** import `appViewer` or use `window.appViewer`; use the global `appViewer` variable as-is.
+- Some other global variables that can be used without window prefixes are listed in src/globals.d.ts
+
+Rationale: This ensures a clean separation between the Mineflayer logic (server-side/game logic) and the renderer (client-side/view logic), making the renderer portable and testable, and maintains proper usage of global state.
diff --git a/.gitignore b/.gitignore
index bd774315..33734572 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,5 +19,6 @@ generated
 storybook-static
 server-jar
 config.local.json
+logs/
 
 src/react/npmReactComponents.ts
diff --git a/renderer/buildMesherWorker.mjs b/renderer/buildMesherWorker.mjs
index 47ea5771..d88297a5 100644
--- a/renderer/buildMesherWorker.mjs
+++ b/renderer/buildMesherWorker.mjs
@@ -35,6 +35,10 @@ const buildOptions = {
   define: {
     'process.env.BROWSER': '"true"',
   },
+  loader: {
+    '.png': 'dataurl',
+    '.obj': 'text'
+  },
   plugins: [
     ...mesherSharedPlugins,
     {
diff --git a/renderer/viewer/baseGraphicsBackend.ts b/renderer/viewer/baseGraphicsBackend.ts
index 4724076a..3cd227de 100644
--- a/renderer/viewer/baseGraphicsBackend.ts
+++ b/renderer/viewer/baseGraphicsBackend.ts
@@ -1,16 +1,26 @@
-import { RendererReactiveState } from '../../src/appViewer'
+import { NonReactiveState, RendererReactiveState } from '../../src/appViewer'
 
-export const getDefaultRendererState = (): RendererReactiveState => {
+export const getDefaultRendererState = (): {
+  reactive: RendererReactiveState
+  nonReactive: NonReactiveState
+} => {
   return {
-    world: {
-      chunksLoaded: new Set(),
-      heightmaps: new Map(),
-      chunksTotalNumber: 0,
-      allChunksLoaded: true,
-      mesherWork: false,
-      intersectMedia: null
+    reactive: {
+      world: {
+        chunksLoaded: new Set(),
+        heightmaps: new Map(),
+        allChunksLoaded: true,
+        mesherWork: false,
+        intersectMedia: null
+      },
+      renderer: '',
+      preventEscapeMenu: false
     },
-    renderer: '',
-    preventEscapeMenu: false
+    nonReactive: {
+      world: {
+        chunksLoaded: new Set(),
+        chunksTotalNumber: 0,
+      }
+    }
   }
 }
diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index 856772b1..fe6e39c4 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -1,125 +1,69 @@
-import { EventEmitter } from 'events'
-import { Vec3 } from 'vec3'
-import TypedEmitter from 'typed-emitter'
 import { ItemSelector } from 'mc-assets/dist/itemDefinitions'
-import { proxy, ref } from 'valtio'
 import { GameMode } from 'mineflayer'
-import { HandItemBlock } from '../three/holdingBlock'
+import { proxy } from 'valtio'
+import type { HandItemBlock } from '../three/holdingBlock'
 
 export type MovementState = 'NOT_MOVING' | 'WALKING' | 'SPRINTING' | 'SNEAKING'
 export type ItemSpecificContextProperties = Partial<Pick<ItemSelector['properties'], 'minecraft:using_item' | 'minecraft:use_duration' | 'minecraft:use_cycle' | 'minecraft:display_context'>>
 
 
-export type PlayerStateEvents = {
-  heldItemChanged: (item: HandItemBlock | undefined, isLeftHand: boolean) => void
-}
-
 export type BlockShape = { position: any; width: any; height: any; depth: any; }
 export type BlocksShapes = BlockShape[]
 
-export interface IPlayerState {
-  getEyeHeight(): number
-  getMovementState(): MovementState
-  getVelocity(): Vec3
-  isOnGround(): boolean
-  isSneaking(): boolean
-  isFlying(): boolean
-  isSprinting (): boolean
-  getItemUsageTicks?(): number
-  getPosition(): Vec3
-  // isUsingItem?(): boolean
-  getHeldItem?(isLeftHand: boolean): HandItemBlock | undefined
-  username?: string
-  onlineMode?: boolean
-  lightingDisabled?: boolean
-  shouldHideHand?: boolean
+// edit src/mineflayer/playerState.ts for implementation of player state from mineflayer
+export const getInitialPlayerState = () => proxy({
+  playerSkin: undefined as string | undefined,
+  inWater: false,
+  waterBreathing: false,
+  backgroundColor: [0, 0, 0] as [number, number, number],
+  ambientLight: 0,
+  directionalLight: 0,
+  eyeHeight: 0,
+  gameMode: undefined as GameMode | undefined,
+  lookingAtBlock: undefined as {
+    x: number
+    y: number
+    z: number
+    face?: number
+    shapes: BlocksShapes
+  } | undefined,
+  diggingBlock: undefined as {
+    x: number
+    y: number
+    z: number
+    stage: number
+    face?: number
+    mergedShape: BlockShape | undefined
+  } | undefined,
+  movementState: 'NOT_MOVING' as MovementState,
+  onGround: true,
+  sneaking: false,
+  flying: false,
+  sprinting: false,
+  itemUsageTicks: 0,
+  username: '',
+  onlineMode: false,
+  lightingDisabled: false,
+  shouldHideHand: false,
+  heldItemMain: undefined as HandItemBlock | undefined,
+  heldItemOff: undefined as HandItemBlock | undefined,
+})
 
-  events: TypedEmitter<PlayerStateEvents>
+export const getInitialPlayerStateRenderer = () => ({
+  reactive: getInitialPlayerState()
+})
 
-  reactive: {
-    playerSkin: string | undefined
-    inWater: boolean
-    waterBreathing: boolean
-    backgroundColor: [number, number, number]
-    ambientLight: number
-    directionalLight: number
-    gameMode?: GameMode
-    lookingAtBlock?: {
-      x: number
-      y: number
-      z: number
-      face?: number
-      shapes: BlocksShapes
-    }
-    diggingBlock?: {
-      x: number
-      y: number
-      z: number
-      stage: number
-      face?: number
-      mergedShape?: BlockShape
-    }
-  }
+export type PlayerStateReactive = ReturnType<typeof getInitialPlayerState>
+
+export interface PlayerStateRenderer {
+  reactive: PlayerStateReactive
 }
 
-export class BasePlayerState implements IPlayerState {
-  reactive = proxy({
-    playerSkin: undefined as string | undefined,
-    inWater: false,
-    waterBreathing: false,
-    backgroundColor: ref([0, 0, 0]) as [number, number, number],
-    ambientLight: 0,
-    directionalLight: 0,
-  })
-  protected movementState: MovementState = 'NOT_MOVING'
-  protected velocity = new Vec3(0, 0, 0)
-  protected onGround = true
-  protected sneaking = false
-  protected flying = false
-  protected sprinting = false
-  readonly events = new EventEmitter() as TypedEmitter<PlayerStateEvents>
-
-  getEyeHeight (): number {
-    return 1.62
-  }
-
-  getMovementState (): MovementState {
-    return this.movementState
-  }
-
-  getVelocity (): Vec3 {
-    return this.velocity
-  }
-
-  isOnGround (): boolean {
-    return this.onGround
-  }
-
-  isSneaking (): boolean {
-    return this.sneaking
-  }
-
-  isFlying (): boolean {
-    return this.flying
-  }
-
-  isSprinting (): boolean {
-    return this.sprinting
-  }
-
-  getPosition (): Vec3 {
-    return new Vec3(0, 0, 0)
-  }
-
-  // For testing purposes
-  setState (state: Partial<{
-    movementState: MovementState
-    velocity: Vec3
-    onGround: boolean
-    sneaking: boolean
-    flying: boolean
-    sprinting: boolean
-  }>) {
-    Object.assign(this, state)
+export const getItemSelector = (playerState: PlayerStateRenderer, specificProperties: ItemSpecificContextProperties, item?: import('prismarine-item').Item) => {
+  return {
+    ...specificProperties,
+    'minecraft:date': new Date(),
+    // "minecraft:context_dimension": bot.entityp,
+    // 'minecraft:time': bot.time.timeOfDay / 24_000,
   }
 }
diff --git a/renderer/viewer/lib/guiRenderer.ts b/renderer/viewer/lib/guiRenderer.ts
index 2689126e..709941dc 100644
--- a/renderer/viewer/lib/guiRenderer.ts
+++ b/renderer/viewer/lib/guiRenderer.ts
@@ -9,11 +9,6 @@ import { makeTextureAtlas } from 'mc-assets/dist/atlasCreator'
 import { proxy, ref } from 'valtio'
 import { getItemDefinition } from 'mc-assets/dist/itemDefinitions'
 
-export const activeGuiAtlas = proxy({
-  atlas: null as null | { json, image },
-  version: 0
-})
-
 export const getNonFullBlocksModels = () => {
   let version = appViewer.resourcesManager.currentResources!.version ?? 'latest'
   if (versionToNumber(version) < versionToNumber('1.13')) version = '1.13'
@@ -122,18 +117,18 @@ const RENDER_SIZE = 64
 
 const generateItemsGui = async (models: Record<string, BlockModelMcAssets>, isItems = false) => {
   const { currentResources } = appViewer.resourcesManager
-  const img = await getLoadedImage(isItems ? currentResources!.itemsAtlasParser.latestImage : currentResources!.blocksAtlasParser.latestImage)
+  const imgBitmap = isItems ? currentResources!.itemsAtlasImage : currentResources!.blocksAtlasImage
   const canvasTemp = document.createElement('canvas')
-  canvasTemp.width = img.width
-  canvasTemp.height = img.height
+  canvasTemp.width = imgBitmap.width
+  canvasTemp.height = imgBitmap.height
   canvasTemp.style.imageRendering = 'pixelated'
   const ctx = canvasTemp.getContext('2d')!
   ctx.imageSmoothingEnabled = false
-  ctx.drawImage(img, 0, 0)
+  ctx.drawImage(imgBitmap, 0, 0)
 
-  const atlasParser = isItems ? currentResources!.itemsAtlasParser : currentResources!.blocksAtlasParser
+  const atlasParser = isItems ? appViewer.resourcesManager.itemsAtlasParser : appViewer.resourcesManager.blocksAtlasParser
   const textureAtlas = new TextureAtlas(
-    ctx.getImageData(0, 0, img.width, img.height),
+    ctx.getImageData(0, 0, imgBitmap.width, imgBitmap.height),
     Object.fromEntries(Object.entries(atlasParser.atlas.latest.textures).map(([key, value]) => {
       return [key, [
         value.u,
@@ -243,6 +238,9 @@ const generateItemsGui = async (models: Record<string, BlockModelMcAssets>, isIt
   return images
 }
 
+/**
+ * @mainThread
+ */
 const generateAtlas = async (images: Record<string, HTMLImageElement>) => {
   const atlas = makeTextureAtlas({
     input: Object.keys(images),
@@ -260,9 +258,9 @@ const generateAtlas = async (images: Record<string, HTMLImageElement>) => {
   // a.download = 'blocks_atlas.png'
   // a.click()
 
-  activeGuiAtlas.atlas = {
+  appViewer.resourcesManager.currentResources!.guiAtlas = {
     json: atlas.json,
-    image: ref(await getLoadedImage(atlas.canvas.toDataURL())),
+    image: await createImageBitmap(atlas.canvas),
   }
 
   return atlas
@@ -279,6 +277,6 @@ export const generateGuiAtlas = async () => {
   const itemImages = await generateItemsGui(itemsModelsResolved, true)
   console.timeEnd('generate items gui atlas')
   await generateAtlas({ ...blockImages, ...itemImages })
-  activeGuiAtlas.version++
+  appViewer.resourcesManager.currentResources!.guiAtlasVersion++
   // await generateAtlas(blockImages)
 }
diff --git a/renderer/viewer/lib/mesher/mesher.ts b/renderer/viewer/lib/mesher/mesher.ts
index f26d8022..a063d77f 100644
--- a/renderer/viewer/lib/mesher/mesher.ts
+++ b/renderer/viewer/lib/mesher/mesher.ts
@@ -77,6 +77,7 @@ const handleMessage = data => {
 
   if (data.type === 'mcData') {
     globalVar.mcData = data.mcData
+    globalVar.loadedData = data.mcData
   }
 
   if (data.config) {
@@ -138,6 +139,7 @@ const handleMessage = data => {
       dirtySections = new Map()
       // todo also remove cached
       globalVar.mcData = null
+      globalVar.loadedData = null
       allDataReady = false
 
       break
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index 82416fab..53e0c534 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -9,7 +9,7 @@ export const defaultMesherConfig = {
   skyLight: 15,
   smoothLighting: true,
   outputFormat: 'threeJs' as 'threeJs' | 'webgpu',
-  textureSize: 1024, // for testing
+  // textureSize: 1024, // for testing
   debugModelVariant: undefined as undefined | number[],
   clipWorldBelowY: undefined as undefined | number,
   disableSignsMapsSupport: false
diff --git a/renderer/viewer/lib/utils.ts b/renderer/viewer/lib/utils.ts
index a1574b5c..5c9c00f1 100644
--- a/renderer/viewer/lib/utils.ts
+++ b/renderer/viewer/lib/utils.ts
@@ -1,4 +1,5 @@
 import * as THREE from 'three'
+import { loadThreeJsTextureFromUrl, loadThreeJsTextureFromUrlSync } from './utils/skins'
 
 let textureCache: Record<string, THREE.Texture> = {}
 let imagesPromises: Record<string, Promise<THREE.Texture>> = {}
@@ -7,7 +8,9 @@ export async function loadTexture (texture: string, cb: (texture: THREE.Texture)
   const cached = textureCache[texture]
   if (!cached) {
     const { promise, resolve } = Promise.withResolvers<THREE.Texture>()
-    textureCache[texture] = new THREE.TextureLoader().load(texture, resolve)
+    const t = loadThreeJsTextureFromUrlSync(texture)
+    textureCache[texture] = t.texture
+    void t.promise.then(resolve)
     imagesPromises[texture] = promise
   }
 
diff --git a/renderer/viewer/lib/utils/skins.ts b/renderer/viewer/lib/utils/skins.ts
index 98792820..e0c8c32e 100644
--- a/renderer/viewer/lib/utils/skins.ts
+++ b/renderer/viewer/lib/utils/skins.ts
@@ -1,18 +1,43 @@
 import { loadSkinToCanvas } from 'skinview-utils'
 import * as THREE from 'three'
 import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
+import { getLoadedImage } from 'mc-assets/dist/utils'
 
-// eslint-disable-next-line unicorn/prefer-export-from
-export const stevePngUrl = stevePng
-export const steveTexture = new THREE.TextureLoader().loadAsync(stevePng)
-
-export async function loadImageFromUrl (imageUrl: string): Promise<HTMLImageElement> {
-  const img = new Image()
-  img.src = imageUrl
-  await new Promise<void>(resolve => {
-    img.onload = () => resolve()
+export const loadThreeJsTextureFromUrlSync = (imageUrl: string) => {
+  const texture = new THREE.Texture()
+  const promise = getLoadedImage(imageUrl).then(image => {
+    texture.image = image
+    texture.needsUpdate = true
+    return texture
   })
-  return img
+  return {
+    texture,
+    promise
+  }
+}
+
+export const loadThreeJsTextureFromUrl = async (imageUrl: string) => {
+  const loaded = new THREE.TextureLoader().loadAsync(imageUrl)
+  return loaded
+}
+export const loadThreeJsTextureFromBitmap = (image: ImageBitmap) => {
+  const canvas = new OffscreenCanvas(image.width, image.height)
+  const ctx = canvas.getContext('2d')!
+  ctx.drawImage(image, 0, 0)
+  const texture = new THREE.Texture(canvas)
+  texture.magFilter = THREE.NearestFilter
+  texture.minFilter = THREE.NearestFilter
+  return texture
+}
+
+export const stevePngUrl = stevePng
+export const steveTexture = loadThreeJsTextureFromUrl(stevePngUrl)
+
+
+export async function loadImageFromUrl (imageUrl: string): Promise<ImageBitmap> {
+  const response = await fetch(imageUrl)
+  const blob = await response.blob()
+  return createImageBitmap(blob)
 }
 
 const config = {
@@ -52,13 +77,13 @@ export const parseSkinTexturesValue = (value: string) => {
   return decodedData.textures?.SKIN?.url
 }
 
-export async function loadSkinImage (skinUrl: string): Promise<{ canvas: HTMLCanvasElement, image: HTMLImageElement }> {
+export async function loadSkinImage (skinUrl: string): Promise<{ canvas: OffscreenCanvas, image: ImageBitmap }> {
   if (!skinUrl.startsWith('data:')) {
     skinUrl = await fetchAndConvertBase64Skin(skinUrl.replace('http://', 'https://'))
   }
 
   const image = await loadImageFromUrl(skinUrl)
-  const skinCanvas = document.createElement('canvas')
+  const skinCanvas = new OffscreenCanvas(64, 64)
   loadSkinToCanvas(skinCanvas, image)
   return { canvas: skinCanvas, image }
 }
diff --git a/renderer/viewer/lib/workerProxy.ts b/renderer/viewer/lib/workerProxy.ts
index 9d8e7fcc..2b38dca9 100644
--- a/renderer/viewer/lib/workerProxy.ts
+++ b/renderer/viewer/lib/workerProxy.ts
@@ -1,9 +1,20 @@
-export function createWorkerProxy<T extends Record<string, (...args: any[]) => void>> (handlers: T, channel?: MessagePort): { __workerProxy: T } {
+import { proxy, getVersion, subscribe } from 'valtio'
+
+export function createWorkerProxy<T extends Record<string, (...args: any[]) => void | Promise<any>>> (handlers: T, channel?: MessagePort): { __workerProxy: T } {
   const target = channel ?? globalThis
   target.addEventListener('message', (event: any) => {
-    const { type, args } = event.data
+    const { type, args, msgId } = event.data
     if (handlers[type]) {
-      handlers[type](...args)
+      const result = handlers[type](...args)
+      if (result instanceof Promise) {
+        void result.then((result) => {
+          target.postMessage({
+            type: 'result',
+            msgId,
+            args: [result]
+          })
+        })
+      }
     }
   })
   return null as any
@@ -23,6 +34,7 @@ export function createWorkerProxy<T extends Record<string, (...args: any[]) => v
 export const useWorkerProxy = <T extends { __workerProxy: Record<string, (...args: any[]) => void> }> (worker: Worker | MessagePort, autoTransfer = true): T['__workerProxy'] & {
   transfer: (...args: Transferable[]) => T['__workerProxy']
 } => {
+  let messageId = 0
   // in main thread
   return new Proxy({} as any, {
     get (target, prop) {
@@ -41,11 +53,30 @@ export const useWorkerProxy = <T extends { __workerProxy: Record<string, (...arg
         }
       }
       return (...args: any[]) => {
-        const transfer = autoTransfer ? args.filter(arg => arg instanceof ArrayBuffer || arg instanceof MessagePort || arg instanceof ImageBitmap || arg instanceof OffscreenCanvas || arg instanceof ImageData) : []
+        const msgId = messageId++
+        const transfer = autoTransfer ? args.filter(arg => {
+          return arg instanceof ArrayBuffer || arg instanceof MessagePort
+            || (typeof ImageBitmap !== 'undefined' && arg instanceof ImageBitmap)
+            || (typeof OffscreenCanvas !== 'undefined' && arg instanceof OffscreenCanvas)
+            || (typeof ImageData !== 'undefined' && arg instanceof ImageData)
+        }) : []
         worker.postMessage({
           type: prop,
+          msgId,
           args,
-        }, transfer as any[])
+        }, transfer)
+        return {
+          // eslint-disable-next-line unicorn/no-thenable
+          then (onfulfilled: (value: any) => void) {
+            const handler = ({ data }: MessageEvent): void => {
+              if (data.type === 'result' && data.msgId === msgId) {
+                onfulfilled(data.args[0])
+                worker.removeEventListener('message', handler as EventListener)
+              }
+            }
+            worker.addEventListener('message', handler as EventListener)
+          }
+        }
       }
     }
   })
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 9e483ee2..86f372d1 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -7,9 +7,7 @@ import { Vec3 } from 'vec3'
 import { BotEvents } from 'mineflayer'
 import { proxy } from 'valtio'
 import TypedEmitter from 'typed-emitter'
-import { getItemFromBlock } from '../../../src/chatUtils'
 import { delayedIterator } from '../../playground/shared'
-import { playerState } from '../../../src/mineflayer/playerState'
 import { chunkPos } from './simpleUtils'
 
 export type ChunkPosKey = string // like '16,16'
@@ -23,7 +21,6 @@ export type WorldDataEmitterEvents = {
   time: (data: number) => void
   renderDistance: (viewDistance: number) => void
   blockEntities: (data: Record<string, any> | { blockEntities: Record<string, any> }) => void
-  listening: () => void
   markAsLoaded: (data: { x: number, z: number }) => void
   unloadChunk: (data: { x: number, z: number }) => void
   loadChunk: (data: { x: number, z: number, chunk: string, blockEntities: any, worldConfig: any, isLightUpdate: boolean }) => void
@@ -32,10 +29,10 @@ export type WorldDataEmitterEvents = {
   end: () => void
 }
 
-/**
- * Usually connects to mineflayer bot and emits world data (chunks, entities)
- * It's up to the consumer to serialize the data if needed
- */
+export class WorldDataEmitterWorker extends (EventEmitter as new () => TypedEmitter<WorldDataEmitterEvents>) {
+  static readonly restorerName = 'WorldDataEmitterWorker'
+}
+
 export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<WorldDataEmitterEvents>) {
   loadedChunks: Record<ChunkPosKey, boolean>
   readonly lastPos: Vec3
@@ -57,11 +54,6 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
   /* config */ isPlayground = false
   /* config */ allowPositionUpdate = true
 
-  public reactive = proxy({
-    cursorBlock: null as Vec3 | null,
-    cursorBlockBreakingStage: null as number | null,
-  })
-
   constructor (public world: typeof __type_bot['world'], public viewDistance: number, position: Vec3 = new Vec3(0, 0, 0)) {
     // eslint-disable-next-line constructor-super
     super()
@@ -171,22 +163,6 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
       }
     })
 
-    this.emitter.on('listening', () => {
-      this.emitter.emit('blockEntities', new Proxy({}, {
-        get (_target, posKey, receiver) {
-          if (typeof posKey !== 'string') return
-          const [x, y, z] = posKey.split(',').map(Number)
-          return bot.world.getBlock(new Vec3(x, y, z))?.entity
-        },
-      }))
-      this.emitter.emit('renderDistance', this.viewDistance)
-      this.emitter.emit('time', bot.time.timeOfDay)
-    })
-    // node.js stream data event pattern
-    if (this.emitter.listenerCount('blockEntities')) {
-      this.emitter.emit('listening')
-    }
-
     for (const [evt, listener] of Object.entries(this.eventListeners)) {
       bot.on(evt as any, listener)
     }
@@ -200,8 +176,16 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
         console.error('error processing entity', err)
       }
     }
+  }
 
-    void this.init(bot.entity.position)
+  emitterGotConnected () {
+    this.emitter.emit('blockEntities', new Proxy({}, {
+      get (_target, posKey, receiver) {
+        if (typeof posKey !== 'string') return
+        const [x, y, z] = posKey.split(',').map(Number)
+        return bot.world.getBlock(new Vec3(x, y, z))?.entity
+      },
+    }))
   }
 
   removeListenersFromBot (bot: import('mineflayer').Bot) {
@@ -213,6 +197,8 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
   async init (pos: Vec3) {
     this.updateViewDistance(this.viewDistance)
     this.emitter.emit('chunkPosUpdate', { pos })
+    this.emitter.emit('time', bot.time.timeOfDay)
+    this.emitterGotConnected()
     const [botX, botZ] = chunkPos(pos)
 
     const positions = generateSpiralMatrix(this.viewDistance).map(([x, z]) => new Vec3((botX + x) * 16, 0, (botZ + z) * 16))
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 2b37742c..1f0df0bd 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -1,25 +1,22 @@
 /* eslint-disable guard-for-in */
 import { EventEmitter } from 'events'
 import { Vec3 } from 'vec3'
-import * as THREE from 'three'
 import mcDataRaw from 'minecraft-data/data.js' // note: using alias
 import TypedEmitter from 'typed-emitter'
-import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import { generateSpiralMatrix } from 'flying-squid/dist/utils'
 import { subscribeKey } from 'valtio/utils'
 import { proxy } from 'valtio'
 import { dynamicMcDataFiles } from '../../buildMesherConfig.mjs'
-import { toMajorVersion } from '../../../src/utils'
-import { ResourcesManager } from '../../../src/resourcesManager'
+import type { ResourcesManagerTransferred } from '../../../src/resourcesManager'
 import { DisplayWorldOptions, GraphicsInitOptions, RendererReactiveState } from '../../../src/appViewer'
 import { SoundSystem } from '../three/threeJsSound'
 import { buildCleanupDecorator } from './cleanupDecorator'
-import { HighestBlockInfo, MesherGeometryOutput, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig, MesherMainEvent } from './mesher/shared'
+import { HighestBlockInfo, CustomBlockModels, BlockStateModelInfo, getBlockAssetsCacheKey, MesherConfig, MesherMainEvent } from './mesher/shared'
 import { chunkPos } from './simpleUtils'
-import { addNewStat, removeAllStats, removeStat, updatePanesVisibility, updateStatText } from './ui/newStats'
-import { WorldDataEmitter } from './worldDataEmitter'
-import { IPlayerState } from './basePlayerState'
+import { addNewStat, removeAllStats, updatePanesVisibility, updateStatText } from './ui/newStats'
+import { WorldDataEmitterWorker } from './worldDataEmitter'
+import { PlayerStateRenderer } from './basePlayerState'
 import { MesherLogReader } from './mesherlogReader'
 import { setSkinsConfig } from './utils/skins'
 
@@ -27,6 +24,11 @@ function mod (x, n) {
   return ((x % n) + n) % n
 }
 
+const toMajorVersion = version => {
+  const [a, b] = (String(version)).split('.')
+  return `${a}.${b}`
+}
+
 export const worldCleanup = buildCleanupDecorator('resetWorld')
 
 export const defaultWorldRendererConfig = {
@@ -52,7 +54,8 @@ export const defaultWorldRendererConfig = {
   foreground: true,
   enableDebugOverlay: false,
   _experimentalSmoothChunkLoading: true,
-  _renderByChunks: false
+  _renderByChunks: false,
+  volume: 1
 }
 
 export type WorldRendererConfig = typeof defaultWorldRendererConfig
@@ -153,7 +156,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   abstract changeBackgroundColor (color: [number, number, number]): void
 
   worldRendererConfig: WorldRendererConfig
-  playerState: IPlayerState
+  playerState: PlayerStateRenderer
   reactiveState: RendererReactiveState
   mesherLogReader: MesherLogReader | undefined
   forceCallFromMesherReplayer = false
@@ -169,6 +172,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
   currentRenderedFrames = 0
   fpsAverage = 0
+  lastFps = 0
   fpsWorst = undefined as number | undefined
   fpsSamples = 0
   mainThreadRendering = true
@@ -184,7 +188,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     return (this.initOptions.config.statsVisible ?? 0) > 1
   }
 
-  constructor (public readonly resourcesManager: ResourcesManager, public displayOptions: DisplayWorldOptions, public initOptions: GraphicsInitOptions) {
+  constructor (public readonly resourcesManager: ResourcesManagerTransferred, public displayOptions: DisplayWorldOptions, public initOptions: GraphicsInitOptions) {
     this.snapshotInitialValues()
     this.worldRendererConfig = displayOptions.inWorldRenderingConfig
     this.playerState = displayOptions.playerState
@@ -221,6 +225,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     } else {
       this.fpsWorst = Math.min(this.fpsWorst, this.currentRenderedFrames)
     }
+    this.lastFps = this.currentRenderedFrames
     this.currentRenderedFrames = 0
   }
 
@@ -231,15 +236,11 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   async init () {
     if (this.active) throw new Error('WorldRendererCommon is already initialized')
-    await this.resourcesManager.loadMcData(this.version)
-    if (!this.resourcesManager.currentResources) {
-      await this.resourcesManager.updateAssetsData({ })
-    }
 
     await Promise.all([
       this.resetWorkers(),
       (async () => {
-        if (this.resourcesManager.currentResources) {
+        if (this.resourcesManager.currentResources?.allReady) {
           await this.updateAssetsData()
         }
       })()
@@ -291,35 +292,22 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   initWorkers (numWorkers = this.worldRendererConfig.mesherWorkers) {
     // init workers
     for (let i = 0; i < numWorkers + 1; i++) {
-      // Node environment needs an absolute path, but browser needs the url of the file
-      const workerName = 'mesher.js'
-      // eslint-disable-next-line node/no-path-concat
-      const src = typeof window === 'undefined' ? `${__dirname}/${workerName}` : workerName
-
-      let worker: any
-      if (process.env.SINGLE_FILE_BUILD) {
-        const workerCode = document.getElementById('mesher-worker-code')!.textContent!
-        const blob = new Blob([workerCode], { type: 'text/javascript' })
-        worker = new Worker(window.URL.createObjectURL(blob))
-      } else {
-        worker = new Worker(src)
-      }
-
-      worker.onmessage = ({ data }) => {
+      const worker = initMesherWorker((data) => {
         if (Array.isArray(data)) {
           this.messageQueue.push(...data)
         } else {
           this.messageQueue.push(data)
         }
         void this.processMessageQueue('worker')
-      }
-      if (worker.on) worker.on('message', (data) => { worker.onmessage({ data }) })
+      })
       this.workers.push(worker)
     }
   }
 
-  onReactiveValueUpdated<T extends keyof typeof this.displayOptions.playerState.reactive>(key: T, callback: (value: typeof this.displayOptions.playerState.reactive[T]) => void) {
-    callback(this.displayOptions.playerState.reactive[key])
+  onReactivePlayerStateUpdated<T extends keyof typeof this.displayOptions.playerState.reactive>(key: T, callback: (value: typeof this.displayOptions.playerState.reactive[T]) => void, initial = true) {
+    if (initial) {
+      callback(this.displayOptions.playerState.reactive[key])
+    }
     subscribeKey(this.displayOptions.playerState.reactive, key, callback)
   }
 
@@ -334,7 +322,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   watchReactivePlayerState () {
-    this.onReactiveValueUpdated('backgroundColor', (value) => {
+    this.onReactivePlayerStateUpdated('backgroundColor', (value) => {
       this.changeBackgroundColor(value)
     })
   }
@@ -466,7 +454,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
 
     if (data.type === 'heightmap') {
-      appViewer.rendererState.world.heightmaps.set(data.key, new Uint8Array(data.heightmap))
+      this.reactiveState.world.heightmaps.set(data.key, new Uint8Array(data.heightmap))
     }
   }
 
@@ -543,7 +531,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     this.resetWorld()
 
     // for workers in single file build
-    if (document?.readyState === 'loading') {
+    if (typeof document !== 'undefined' && document?.readyState === 'loading') {
       await new Promise(resolve => {
         document.addEventListener('DOMContentLoaded', resolve)
       })
@@ -575,7 +563,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       skyLight,
       smoothLighting: this.worldRendererConfig.smoothLighting,
       outputFormat: this.outputFormat,
-      textureSize: this.resourcesManager.currentResources!.blocksAtlasParser.atlas.latest.width,
+      // textureSize: this.resourcesManager.currentResources!.blocksAtlasParser.atlas.latest.width,
       debugModelVariant: undefined,
       clipWorldBelowY: this.worldRendererConfig.clipWorldBelowY,
       disableSignsMapsSupport: !this.worldRendererConfig.extraBlockRenderers,
@@ -600,7 +588,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   async updateAssetsData () {
-    const resources = this.resourcesManager.currentResources!
+    const resources = this.resourcesManager.currentResources
 
     if (this.workers.length === 0) throw new Error('workers not initialized yet')
     for (const [i, worker] of this.workers.entries()) {
@@ -610,7 +598,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
         type: 'mesherData',
         workerIndex: i,
         blocksAtlas: {
-          latest: resources.blocksAtlasParser.atlas.latest
+          latest: resources.blocksAtlasJson
         },
         blockstatesModels,
         config: this.getMesherConfig(),
@@ -733,7 +721,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   lightUpdate (chunkX: number, chunkZ: number) { }
 
-  connect (worldView: WorldDataEmitter) {
+  connect (worldView: WorldDataEmitterWorker) {
     const worldEmitter = worldView
 
     worldEmitter.on('entity', (e) => {
@@ -812,7 +800,16 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     })
 
     worldEmitter.on('onWorldSwitch', () => {
-      for (const fn of this.onWorldSwitched) fn()
+      for (const fn of this.onWorldSwitched) {
+        try {
+          fn()
+        } catch (e) {
+          setTimeout(() => {
+            console.log('[Renderer Backend] Error in onWorldSwitched:')
+            throw e
+          }, 0)
+        }
+      }
     })
 
     worldEmitter.on('time', (timeOfDay) => {
@@ -830,8 +827,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       //   (this).rerenderAllChunks?.()
       // }
     })
-
-    worldEmitter.emit('listening')
   }
 
   setBlockStateIdInner (pos: Vec3, stateId: number | undefined, needAoRecalculation = true) {
@@ -1029,3 +1024,37 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     removeAllStats()
   }
 }
+
+export const initMesherWorker = (onGotMessage: (data: any) => void) => {
+  // Node environment needs an absolute path, but browser needs the url of the file
+  const workerName = 'mesher.js'
+
+  let worker: any
+  if (process.env.SINGLE_FILE_BUILD) {
+    const workerCode = document.getElementById('mesher-worker-code')!.textContent!
+    const blob = new Blob([workerCode], { type: 'text/javascript' })
+    worker = new Worker(window.URL.createObjectURL(blob))
+  } else {
+    worker = new Worker(workerName)
+  }
+
+  worker.onmessage = ({ data }) => {
+    onGotMessage(data)
+  }
+  if (worker.on) worker.on('message', (data) => { worker.onmessage({ data }) })
+  return worker
+}
+
+export const meshersSendMcData = (workers: Worker[], version: string, addData = {} as Record<string, any>) => {
+  const allMcData = mcDataRaw.pc[version] ?? mcDataRaw.pc[toMajorVersion(version)]
+  const mcData = {
+    version: JSON.parse(JSON.stringify(allMcData.version))
+  }
+  for (const key of dynamicMcDataFiles) {
+    mcData[key] = allMcData[key]
+  }
+
+  for (const worker of workers) {
+    worker.postMessage({ type: 'mcData', mcData, ...addData })
+  }
+}
diff --git a/renderer/viewer/three/appShared.ts b/renderer/viewer/three/appShared.ts
index 1dfb343c..5be9e10b 100644
--- a/renderer/viewer/three/appShared.ts
+++ b/renderer/viewer/three/appShared.ts
@@ -1,16 +1,16 @@
 import { BlockModel } from 'mc-assets/dist/types'
-import { ItemSpecificContextProperties } from 'renderer/viewer/lib/basePlayerState'
-import { renderSlot } from '../../../src/inventoryWindows'
+import { ItemSpecificContextProperties, PlayerStateRenderer } from 'renderer/viewer/lib/basePlayerState'
 import { GeneralInputItem, getItemModelName } from '../../../src/mineflayer/items'
-import { ResourcesManager } from '../../../src/resourcesManager'
+import { ResourcesManager, ResourcesManagerTransferred } from '../../../src/resourcesManager'
+import { renderSlot } from './renderSlot'
 
-export const getItemUv = (item: Record<string, any>, specificProps: ItemSpecificContextProperties, resourcesManager: ResourcesManager): {
+export const getItemUv = (item: Record<string, any>, specificProps: ItemSpecificContextProperties, resourcesManager: ResourcesManagerTransferred, playerState: PlayerStateRenderer): {
   u: number
   v: number
   su: number
   sv: number
   renderInfo?: ReturnType<typeof renderSlot>
-  texture: HTMLImageElement
+  // texture: ImageBitmap
   modelName: string
 } | {
   resolvedModel: BlockModel
@@ -30,11 +30,11 @@ export const getItemUv = (item: Record<string, any>, specificProps: ItemSpecific
     const model = getItemModelName({
       ...item,
       name,
-    } as GeneralInputItem, specificProps, resourcesManager)
+    } as GeneralInputItem, specificProps, resourcesManager, playerState)
 
     const renderInfo = renderSlot({
       modelName: model,
-    }, false, true)
+    }, resourcesManager, false, true)
 
     if (!renderInfo) throw new Error(`Failed to get render info for item ${name}`)
 
@@ -53,7 +53,7 @@ export const getItemUv = (item: Record<string, any>, specificProps: ItemSpecific
       return {
         u, v, su, sv,
         renderInfo,
-        texture: img,
+        // texture: img,
         modelName: renderInfo.modelName!
       }
     }
@@ -67,7 +67,7 @@ export const getItemUv = (item: Record<string, any>, specificProps: ItemSpecific
       v: 0,
       su: 16 / resources.blocksAtlasImage.width,
       sv: 16 / resources.blocksAtlasImage.width,
-      texture: resources.blocksAtlasImage,
+      // texture: resources.blocksAtlasImage,
       modelName: 'missing'
     }
   }
diff --git a/renderer/viewer/three/documentRenderer.ts b/renderer/viewer/three/documentRenderer.ts
index 1d556c2a..8ff31e69 100644
--- a/renderer/viewer/three/documentRenderer.ts
+++ b/renderer/viewer/three/documentRenderer.ts
@@ -6,15 +6,20 @@ import { GraphicsBackendConfig, GraphicsInitOptions } from '../../../src/appView
 import { WorldRendererConfig } from '../lib/worldrendererCommon'
 
 export class DocumentRenderer {
-  readonly canvas = document.createElement('canvas')
+  canvas: HTMLCanvasElement | OffscreenCanvas
   readonly renderer: THREE.WebGLRenderer
   private animationFrameId?: number
+  private timeoutId?: number
   private lastRenderTime = 0
-  private previousWindowWidth = window.innerWidth
-  private previousWindowHeight = window.innerHeight
+
+  private previousCanvasWidth = 0
+  private previousCanvasHeight = 0
+  private currentWidth = 0
+  private currentHeight = 0
+
   private renderedFps = 0
   private fpsInterval: any
-  private readonly stats: TopRightStats
+  private readonly stats: TopRightStats | undefined
   private paused = false
   disconnected = false
   preRender = () => { }
@@ -26,9 +31,16 @@ export class DocumentRenderer {
   onRender = [] as Array<(sizeChanged: boolean) => void>
   inWorldRenderingConfig: WorldRendererConfig | undefined
 
-  constructor (initOptions: GraphicsInitOptions) {
+  constructor (initOptions: GraphicsInitOptions, public externalCanvas?: OffscreenCanvas) {
     this.config = initOptions.config
 
+    // Handle canvas creation/transfer based on context
+    if (externalCanvas) {
+      this.canvas = externalCanvas
+    } else {
+      this.addToPage()
+    }
+
     try {
       this.renderer = new THREE.WebGLRenderer({
         canvas: this.canvas,
@@ -37,17 +49,24 @@ export class DocumentRenderer {
         powerPreference: this.config.powerPreference
       })
     } catch (err) {
-      initOptions.displayCriticalError(new Error(`Failed to create WebGL context, not possible to render (restart browser): ${err.message}`))
+      initOptions.callbacks.displayCriticalError(new Error(`Failed to create WebGL context, not possible to render (restart browser): ${err.message}`))
       throw err
     }
     this.renderer.outputColorSpace = THREE.LinearSRGBColorSpace
-    this.updatePixelRatio()
-    this.updateSize()
-    this.addToPage()
+    if (!externalCanvas) {
+      this.updatePixelRatio()
+    }
+    this.sizeUpdated()
+    // Initialize previous dimensions
+    this.previousCanvasWidth = this.canvas.width
+    this.previousCanvasHeight = this.canvas.height
 
-    this.stats = new TopRightStats(this.canvas, this.config.statsVisible)
+    // Only initialize stats and DOM-related features in main thread
+    if (!externalCanvas) {
+      this.stats = new TopRightStats(this.canvas as HTMLCanvasElement, this.config.statsVisible)
+      this.setupFpsTracking()
+    }
 
-    this.setupFpsTracking()
     this.startRenderLoop()
   }
 
@@ -59,15 +78,33 @@ export class DocumentRenderer {
     this.renderer.setPixelRatio(pixelRatio)
   }
 
-  updateSize () {
-    this.renderer.setSize(window.innerWidth, window.innerHeight)
+  sizeUpdated () {
+    this.renderer.setSize(this.currentWidth, this.currentHeight, false)
   }
 
   private addToPage () {
-    this.canvas.id = 'viewer-canvas'
-    this.canvas.style.width = '100%'
-    this.canvas.style.height = '100%'
-    document.body.appendChild(this.canvas)
+    this.canvas = addCanvasToPage()
+    this.updateCanvasSize()
+  }
+
+  updateSizeExternal (newWidth: number, newHeight: number, pixelRatio: number) {
+    this.currentWidth = newWidth
+    this.currentHeight = newHeight
+    this.renderer.setPixelRatio(pixelRatio)
+    this.sizeUpdated()
+  }
+
+  private updateCanvasSize () {
+    if (!this.externalCanvas) {
+      const innnerWidth = window.innerWidth
+      const innnerHeight = window.innerHeight
+      if (this.currentWidth !== innnerWidth) {
+        this.currentWidth = innnerWidth
+      }
+      if (this.currentHeight !== innnerHeight) {
+        this.currentHeight = innnerHeight
+      }
+    }
   }
 
   private setupFpsTracking () {
@@ -81,20 +118,15 @@ export class DocumentRenderer {
     }, 1000)
   }
 
-  // private handleResize () {
-  //   const width = window.innerWidth
-  //   const height = window.innerHeight
-
-  //   viewer.camera.aspect = width / height
-  //   viewer.camera.updateProjectionMatrix()
-  //   this.renderer.setSize(width, height)
-  //   viewer.world.handleResize()
-  // }
-
   private startRenderLoop () {
     const animate = () => {
       if (this.disconnected) return
-      this.animationFrameId = requestAnimationFrame(animate)
+
+      if (this.config.timeoutRendering) {
+        this.timeoutId = setTimeout(animate, this.config.fpsLimit ? 1000 / this.config.fpsLimit : 0) as unknown as number
+      } else {
+        this.animationFrameId = requestAnimationFrame(animate)
+      }
 
       if (this.paused || (this.renderer.xr.isPresenting && !this.inWorldRenderingConfig?.vrPageGameRendering)) return
 
@@ -112,18 +144,19 @@ export class DocumentRenderer {
       }
 
       let sizeChanged = false
-      if (this.previousWindowWidth !== window.innerWidth || this.previousWindowHeight !== window.innerHeight) {
-        this.previousWindowWidth = window.innerWidth
-        this.previousWindowHeight = window.innerHeight
-        this.updateSize()
+      this.updateCanvasSize()
+      if (this.previousCanvasWidth !== this.currentWidth || this.previousCanvasHeight !== this.currentHeight) {
+        this.previousCanvasWidth = this.currentWidth
+        this.previousCanvasHeight = this.currentHeight
+        this.sizeUpdated()
         sizeChanged = true
       }
 
       this.frameRender(sizeChanged)
 
-      // Update stats visibility each frame
+      // Update stats visibility each frame (main thread only)
       if (this.config.statsVisible !== undefined) {
-        this.stats.setVisibility(this.config.statsVisible)
+        this.stats?.setVisibility(this.config.statsVisible)
       }
     }
 
@@ -132,16 +165,16 @@ export class DocumentRenderer {
 
   frameRender (sizeChanged: boolean) {
     this.preRender()
-    this.stats.markStart()
+    this.stats?.markStart()
     tween.update()
-    if (!window.freezeRender) {
+    if (!globalThis.freezeRender) {
       this.render(sizeChanged)
     }
     for (const fn of this.onRender) {
       fn(sizeChanged)
     }
     this.renderedFps++
-    this.stats.markEnd()
+    this.stats?.markEnd()
     this.postRender()
   }
 
@@ -154,10 +187,15 @@ export class DocumentRenderer {
     if (this.animationFrameId) {
       cancelAnimationFrame(this.animationFrameId)
     }
-    this.canvas.remove()
-    this.renderer.dispose()
+    if (this.timeoutId) {
+      clearTimeout(this.timeoutId)
+    }
+    if (this.canvas instanceof HTMLCanvasElement) {
+      this.canvas.remove()
+    }
     clearInterval(this.fpsInterval)
-    this.stats.dispose()
+    this.stats?.dispose()
+    this.renderer.dispose()
   }
 }
 
@@ -250,3 +288,40 @@ class TopRightStats {
     this.statsGl.container.remove()
   }
 }
+
+const addCanvasToPage = () => {
+  const canvas = document.createElement('canvas')
+  canvas.id = 'viewer-canvas'
+  document.body.appendChild(canvas)
+  return canvas
+}
+
+export const addCanvasForWorker = () => {
+  const canvas = addCanvasToPage()
+  const transferred = canvas.transferControlToOffscreen()
+  let removed = false
+  let onSizeChanged = (w, h) => { }
+  let oldSize = { width: 0, height: 0 }
+  const checkSize = () => {
+    if (removed) return
+    if (oldSize.width !== window.innerWidth || oldSize.height !== window.innerHeight) {
+      onSizeChanged(window.innerWidth, window.innerHeight)
+      oldSize = { width: window.innerWidth, height: window.innerHeight }
+    }
+    requestAnimationFrame(checkSize)
+  }
+  requestAnimationFrame(checkSize)
+  return {
+    canvas: transferred,
+    destroy () {
+      removed = true
+      canvas.remove()
+    },
+    onSizeChanged (cb: (width: number, height: number) => void) {
+      onSizeChanged = cb
+    },
+    get size () {
+      return { width: window.innerWidth, height: window.innerHeight }
+    }
+  }
+}
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 8a270332..0e8e6384 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -96,7 +96,7 @@ function getUsernameTexture ({
   nameTagBackgroundColor = 'rgba(0, 0, 0, 0.3)',
   nameTagTextOpacity = 255
 }: any, { fontFamily = 'sans-serif' }: any) {
-  const canvas = document.createElement('canvas')
+  const canvas = new OffscreenCanvas(64, 64)
   const ctx = canvas.getContext('2d')
   if (!ctx) throw new Error('Could not get 2d context')
 
@@ -173,7 +173,7 @@ const nametags = {}
 
 const isFirstUpperCase = (str) => str.charAt(0) === str.charAt(0).toUpperCase()
 
-function getEntityMesh (entity: import('prismarine-entity').Entity & { delete?: any; pos: any; name: any }, world: WorldRendererThree | undefined, options: { fontFamily: string }, overrides) {
+function getEntityMesh (entity: import('prismarine-entity').Entity & { delete?: any; pos?: any; name?: any }, world: WorldRendererThree | undefined, options: { fontFamily: string }, overrides) {
   if (entity.name) {
     try {
       // https://github.com/PrismarineJS/prismarine-viewer/pull/410
@@ -209,6 +209,7 @@ export type SceneEntity = THREE.Object3D & {
   username?: string
   uuid?: string
   additionalCleanup?: () => void
+  originalEntity: import('prismarine-entity').Entity & { delete?; pos?, name }
 }
 
 export class Entities {
@@ -250,6 +251,7 @@ export class Entities {
   constructor (public worldRenderer: WorldRendererThree) {
     this.debugMode = 'none'
     this.onSkinUpdate = () => { }
+    this.watchResourcesUpdates()
   }
 
   clear () {
@@ -260,6 +262,20 @@ export class Entities {
     this.entities = {}
   }
 
+  reloadEntities () {
+    for (const entity of Object.values(this.entities)) {
+      // update all entities textures like held items, armour, etc
+      // todo update entity textures itself
+      this.update({ ...entity.originalEntity, delete: true, } as SceneEntity['originalEntity'], {})
+      this.update(entity.originalEntity, {})
+    }
+  }
+
+  watchResourcesUpdates () {
+    this.worldRenderer.resourcesManager.on('assetsTexturesUpdated', () => this.reloadEntities())
+    this.worldRenderer.resourcesManager.on('assetsInventoryReady', () => this.reloadEntities())
+  }
+
   setDebugMode (mode: string, entity: THREE.Object3D | null = null) {
     this.debugMode = mode
     for (const mesh of entity ? [entity] : Object.values(this.entities)) {
@@ -291,7 +307,7 @@ export class Entities {
 
     const dt = this.clock.getDelta()
     const botPos = this.worldRenderer.viewerPosition
-    const VISIBLE_DISTANCE = 8 * 8
+    const VISIBLE_DISTANCE = 10 * 10
 
     for (const entityId of Object.keys(this.entities)) {
       const entity = this.entities[entityId]
@@ -312,13 +328,8 @@ export class Entities {
         const dz = entity.position.z - botPos.z
         const distanceSquared = dx * dx + dy * dy + dz * dz
 
-        // Get chunk coordinates
-        const chunkX = Math.floor(entity.position.x / 16) * 16
-        const chunkZ = Math.floor(entity.position.z / 16) * 16
-        const chunkKey = `${chunkX},${chunkZ}`
-
-        // Entity is visible if within 16 blocks OR in a finished chunk
-        entity.visible = !!(distanceSquared < VISIBLE_DISTANCE || this.worldRenderer.finishedChunks[chunkKey])
+        // Entity is visible if within 20 blocks OR in a finished chunk
+        entity.visible = !!(distanceSquared < VISIBLE_DISTANCE || this.worldRenderer.shouldObjectVisible(entity))
 
         this.maybeRenderPlayerSkin(entityId)
       }
@@ -467,16 +478,16 @@ export class Entities {
     if (!playerObject) return
 
     try {
-      let playerCustomSkinImage: HTMLImageElement | undefined
+      let playerCustomSkinImage: ImageBitmap | undefined
 
       playerObject = this.getPlayerObject(entityId)
       if (!playerObject) return
 
       let skinTexture: THREE.Texture
-      let skinCanvas: HTMLCanvasElement
+      let skinCanvas: OffscreenCanvas
       if (skinUrl === stevePngUrl) {
         skinTexture = await steveTexture
-        const canvas = document.createElement('canvas')
+        const canvas = new OffscreenCanvas(64, 64)
         const ctx = canvas.getContext('2d')
         if (!ctx) throw new Error('Failed to get context')
         ctx.drawImage(skinTexture.image, 0, 0)
@@ -550,6 +561,12 @@ export class Entities {
     }
   }
 
+  debugSwingArm () {
+    const playerObject = Object.values(this.entities).find(entity => entity.playerObject?.animation instanceof WalkingGeneralSwing)
+    if (!playerObject) return
+    (playerObject.playerObject!.animation as WalkingGeneralSwing).swingArm()
+  }
+
   playAnimation (entityPlayerId, animation: 'walking' | 'running' | 'oneSwing' | 'idle' | 'crouch' | 'crouchWalking') {
     const playerObject = this.getPlayerObject(entityPlayerId)
     if (!playerObject) return
@@ -594,7 +611,7 @@ export class Entities {
     if (previousModel && previousModel === textureUv?.modelName) return undefined
 
     if (textureUv && 'resolvedModel' in textureUv) {
-      const mesh = getBlockMeshFromModel(this.worldRenderer.material, textureUv.resolvedModel, textureUv.modelName, this.worldRenderer.resourcesManager.currentResources!.worldBlockProvider)
+      const mesh = getBlockMeshFromModel(this.worldRenderer.material, textureUv.resolvedModel, textureUv.modelName, this.worldRenderer.resourcesManager.currentResources.worldBlockProvider!)
       let SCALE = 1
       if (specificProps['minecraft:display_context'] === 'ground') {
         SCALE = 0.5
@@ -675,7 +692,7 @@ export class Entities {
     }
   }
 
-  update (entity: import('prismarine-entity').Entity & { delete?; pos, name }, overrides) {
+  update (entity: SceneEntity['originalEntity'], overrides) {
     const justAdded = !this.entities[entity.id]
 
     const isPlayerModel = entity.name === 'player'
@@ -703,9 +720,10 @@ export class Entities {
       return
     }
 
-    let mesh
+    let mesh: THREE.Object3D | undefined
     if (e === undefined) {
-      const group = new THREE.Group()
+      const group = new THREE.Group() as unknown as SceneEntity
+      group.originalEntity = entity
       if (entity.name === 'item' || entity.name === 'tnt' || entity.name === 'falling_block') {
         const item = entity.name === 'tnt'
           ? { name: 'tnt' }
@@ -732,7 +750,7 @@ export class Entities {
             if (entity.name === 'item') {
               mesh.onBeforeRender = () => {
                 const delta = clock.getDelta()
-                mesh.rotation.y += delta
+                mesh!.rotation.y += delta
               }
             }
 
@@ -756,7 +774,6 @@ export class Entities {
             //   }
             // }
 
-            //@ts-expect-error
             group.additionalCleanup = () => {
               // important: avoid texture memory leak and gpu slowdown
               object.itemsTexture?.dispose()
@@ -795,7 +812,6 @@ export class Entities {
           wrapper.add(nameTag)
         }
 
-        //@ts-expect-error
         group.playerObject = playerObject
         wrapper.rotation.set(0, Math.PI, 0)
         mesh = wrapper
@@ -808,7 +824,8 @@ export class Entities {
       if (!mesh) return
       mesh.name = 'mesh'
       // set initial position so there are no weird jumps update after
-      group.position.set(entity.pos.x, entity.pos.y, entity.pos.z)
+      const pos = entity.pos ?? entity.position
+      group.position.set(pos.x, pos.y, pos.z)
 
       // todo use width and height instead
       const boxHelper = new THREE.BoxHelper(
@@ -856,7 +873,7 @@ export class Entities {
     //@ts-expect-error
     // set visibility
     const isInvisible = entity.metadata?.[0] & 0x20
-    for (const child of mesh.children ?? []) {
+    for (const child of mesh!.children ?? []) {
       if (child.name !== 'nametag') {
         child.visible = !isInvisible
       }
@@ -895,8 +912,8 @@ export class Entities {
       const hasArms = (parseInt(armorStandMeta.client_flags, 10) & 0x04) !== 0
       const hasBasePlate = (parseInt(armorStandMeta.client_flags, 10) & 0x08) === 0
       const isMarker = (parseInt(armorStandMeta.client_flags, 10) & 0x10) !== 0
-      mesh.castShadow = !isMarker
-      mesh.receiveShadow = !isMarker
+      mesh!.castShadow = !isMarker
+      mesh!.receiveShadow = !isMarker
       if (isSmall) {
         e.scale.set(0.5, 0.5, 0.5)
       } else {
@@ -965,7 +982,9 @@ export class Entities {
       // TODO: fix type
       // todo! fix errors in mc-data (no entities data prior 1.18.2)
       const item = (itemFrameMeta?.item ?? entity.metadata?.[8]) as any as { itemId, blockId, components, nbtData: { value: { map: { value: number } } } }
-      mesh.scale.set(1, 1, 1)
+      mesh!.scale.set(1, 1, 1)
+      mesh!.position.set(0, 0, -0.5)
+
       e.rotation.x = -entity.pitch
       e.children.find(c => {
         if (c.name.startsWith('map_')) {
@@ -982,25 +1001,33 @@ export class Entities {
         }
         return false
       })?.removeFromParent()
+
       if (item && (item.itemId ?? item.blockId ?? 0) !== 0) {
+        // Get rotation from metadata, default to 0 if not present
+        // Rotation is stored in 45° increments (0-7) for items, 90° increments (0-3) for maps
         const rotation = (itemFrameMeta.rotation as any as number) ?? 0
         const mapNumber = item.nbtData?.value?.map?.value ?? item.components?.find(x => x.type === 'map_id')?.data
         if (mapNumber) {
           // TODO: Use proper larger item frame model when a map exists
-          mesh.scale.set(16 / 12, 16 / 12, 1)
+          mesh!.scale.set(16 / 12, 16 / 12, 1)
+          // Handle map rotation (4 possibilities, 90° increments)
           this.addMapModel(e, mapNumber, rotation)
         } else {
+          // Handle regular item rotation (8 possibilities, 45° increments)
           const itemMesh = this.getItemMesh(item, {
             'minecraft:display_context': 'fixed',
           })
           if (itemMesh) {
-            itemMesh.mesh.position.set(0, 0, 0.43)
+            itemMesh.mesh.position.set(0, 0, -0.05)
+            // itemMesh.mesh.position.set(0, 0, 0.43)
             if (itemMesh.isBlock) {
               itemMesh.mesh.scale.set(0.25, 0.25, 0.25)
             } else {
               itemMesh.mesh.scale.set(0.5, 0.5, 0.5)
             }
+            // Rotate 180° around Y axis first
             itemMesh.mesh.rotateY(Math.PI)
+            // Then apply the 45° increment rotation
             itemMesh.mesh.rotateZ(-rotation * Math.PI / 4)
             itemMesh.mesh.name = 'item'
             e.add(itemMesh.mesh)
@@ -1115,6 +1142,7 @@ export class Entities {
     } else {
       mapMesh.position.set(0, 0, 0.437)
     }
+    // Apply 90° increment rotation for maps (0-3)
     mapMesh.rotateZ(Math.PI * 2 - rotation * Math.PI / 2)
     mapMesh.name = `map_${mapNumber}`
 
@@ -1267,7 +1295,7 @@ function addArmorModel (worldRenderer: WorldRendererThree, entityMesh: THREE.Obj
   if (!texturePath) {
     // TODO: Support mirroring on certain parts of the model
     const armorTextureName = `${armorMaterial}_layer_${layer}${overlay ? '_overlay' : ''}`
-    texturePath = worldRenderer.resourcesManager.currentResources!.customTextures.armor?.textures[armorTextureName]?.src ?? armorTextures[armorTextureName]
+    texturePath = worldRenderer.resourcesManager.currentResources.customTextures.armor?.textures[armorTextureName]?.src ?? armorTextures[armorTextureName]
   }
   if (!texturePath || !armorModel[slotType]) {
     removeArmorModel(entityMesh, slotType)
diff --git a/renderer/viewer/three/entity/EntityMesh.ts b/renderer/viewer/three/entity/EntityMesh.ts
index 2db09dd5..454bf35c 100644
--- a/renderer/viewer/three/entity/EntityMesh.ts
+++ b/renderer/viewer/three/entity/EntityMesh.ts
@@ -238,10 +238,11 @@ export function getMesh (
   if (useBlockTexture) {
     if (!worldRenderer) throw new Error('worldRenderer is required for block textures')
     const blockName = texture.slice(6)
-    const textureInfo = worldRenderer.resourcesManager.currentResources!.blocksAtlasParser.getTextureInfo(blockName)
+    const textureInfo = worldRenderer.resourcesManager.currentResources.blocksAtlasJson.textures[blockName]
     if (textureInfo) {
       textureWidth = blocksTexture?.image.width ?? textureWidth
       textureHeight = blocksTexture?.image.height ?? textureHeight
+      // todo support su/sv
       textureOffset = [textureInfo.u, textureInfo.v]
     } else {
       console.error(`Unknown block ${blockName}`)
@@ -546,4 +547,4 @@ export class EntityMesh {
     }
   }
 }
-window.EntityMesh = EntityMesh
+globalThis.EntityMesh = EntityMesh
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index 01bb7c56..5ea89b34 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -5,6 +5,7 @@ import { ProgressReporter } from '../../../src/core/progressReporter'
 import { showNotification } from '../../../src/react/NotificationProvider'
 import { displayEntitiesDebugList } from '../../playground/allEntitiesDebug'
 import supportedVersions from '../../../src/supportedVersions.mjs'
+import { ResourcesManager } from '../../../src/resourcesManager'
 import { WorldRendererThree } from './worldrendererThree'
 import { DocumentRenderer } from './documentRenderer'
 import { PanoramaRenderer } from './panorama'
@@ -12,7 +13,7 @@ import { initVR } from './world/vr'
 
 // https://discourse.threejs.org/t/updates-to-color-management-in-three-js-r152/50791
 THREE.ColorManagement.enabled = false
-window.THREE = THREE
+globalThis.THREE = THREE
 
 const getBackendMethods = (worldRenderer: WorldRendererThree) => {
   return {
@@ -24,7 +25,7 @@ const getBackendMethods = (worldRenderer: WorldRendererThree) => {
     updatePlayerSkin: worldRenderer.entities.updatePlayerSkin.bind(worldRenderer.entities),
     changeHandSwingingState: worldRenderer.changeHandSwingingState.bind(worldRenderer),
     getHighestBlocks: worldRenderer.getHighestBlocks.bind(worldRenderer),
-    rerenderAllChunks: worldRenderer.rerenderAllChunks.bind(worldRenderer),
+    reloadWorld: worldRenderer.reloadWorld.bind(worldRenderer),
 
     addMedia: worldRenderer.media.addMedia.bind(worldRenderer.media),
     destroyMedia: worldRenderer.media.destroyMedia.bind(worldRenderer.media),
@@ -57,31 +58,27 @@ const createGraphicsBackend: GraphicsBackendLoader = (initOptions: GraphicsInitO
   let worldRenderer: WorldRendererThree | null = null
 
   const startPanorama = async () => {
+    if (!documentRenderer) throw new Error('Document renderer not initialized')
     if (worldRenderer) return
-    const qs = new URLSearchParams(window.location.search)
+    const qs = new URLSearchParams(location.search)
     if (qs.get('debugEntities')) {
-      initOptions.resourcesManager.currentConfig = { version: qs.get('version') || supportedVersions.at(-1)!, noInventoryGui: true }
-      await initOptions.resourcesManager.updateAssetsData({ })
+      const fullResourceManager = initOptions.resourcesManager as ResourcesManager
+      fullResourceManager.currentConfig = { version: qs.get('version') || supportedVersions.at(-1)!, noInventoryGui: true }
+      await fullResourceManager.updateAssetsData({ })
 
-      displayEntitiesDebugList(initOptions.resourcesManager.currentConfig.version)
+      displayEntitiesDebugList(fullResourceManager.currentConfig.version)
       return
     }
 
     if (!panoramaRenderer) {
       panoramaRenderer = new PanoramaRenderer(documentRenderer, initOptions, !!process.env.SINGLE_FILE_BUILD_MODE)
-      window.panoramaRenderer = panoramaRenderer
+      globalThis.panoramaRenderer = panoramaRenderer
       callModsMethod('panoramaCreated', panoramaRenderer)
       await panoramaRenderer.start()
       callModsMethod('panoramaReady', panoramaRenderer)
     }
   }
 
-  let version = ''
-  const prepareResources = async (ver: string, progressReporter: ProgressReporter): Promise<void> => {
-    version = ver
-    await initOptions.resourcesManager.updateAssetsData({ })
-  }
-
   const startWorld = async (displayOptions: DisplayWorldOptions) => {
     if (panoramaRenderer) {
       panoramaRenderer.dispose()
diff --git a/renderer/viewer/three/holdingBlock.ts b/renderer/viewer/three/holdingBlock.ts
index 6836d4f0..422076f0 100644
--- a/renderer/viewer/three/holdingBlock.ts
+++ b/renderer/viewer/three/holdingBlock.ts
@@ -5,7 +5,7 @@ import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBloc
 import { BlockModel } from 'mc-assets'
 import { getThreeBlockModelGroup, renderBlockThree, setBlockPosition } from '../lib/mesher/standaloneRenderer'
 import { getMyHand } from '../lib/hand'
-import { IPlayerState, MovementState } from '../lib/basePlayerState'
+import { MovementState, PlayerStateRenderer } from '../lib/basePlayerState'
 import { DebugGui } from '../lib/DebugGui'
 import { SmoothSwitcher } from '../lib/smoothSwitcher'
 import { watchProperty } from '../lib/utils/proxy'
@@ -116,16 +116,22 @@ export default class HoldingBlock {
   offHandModeLegacy = false
 
   swingAnimator: HandSwingAnimator | undefined
-  playerState: IPlayerState
+  playerState: PlayerStateRenderer
   config: WorldRendererConfig
 
   constructor (public worldRenderer: WorldRendererThree, public offHand = false) {
     this.initCameraGroup()
     this.playerState = worldRenderer.displayOptions.playerState
-    this.playerState.events.on('heldItemChanged', (_, isOffHand) => {
-      if (this.offHand !== isOffHand) return
-      this.updateItem()
-    })
+    this.worldRenderer.onReactivePlayerStateUpdated('heldItemMain', () => {
+      if (!this.offHand) {
+        this.updateItem()
+      }
+    }, false)
+    this.worldRenderer.onReactivePlayerStateUpdated('heldItemOff', () => {
+      if (this.offHand) {
+        this.updateItem()
+      }
+    }, false)
     this.config = worldRenderer.displayOptions.inWorldRenderingConfig
 
     this.offHandDisplay = this.offHand
@@ -134,17 +140,21 @@ export default class HoldingBlock {
       // load default hand
       void getMyHand().then((hand) => {
         this.playerHand = hand
+        // trigger update
+        this.updateItem()
       }).then(() => {
         // now watch over the player skin
         watchProperty(
           async () => {
-            return getMyHand(this.playerState.reactive.playerSkin, this.playerState.onlineMode ? this.playerState.username : undefined)
+            return getMyHand(this.playerState.reactive.playerSkin, this.playerState.reactive.onlineMode ? this.playerState.reactive.username : undefined)
           },
           this.playerState.reactive,
           'playerSkin',
           (newHand) => {
             if (newHand) {
               this.playerHand = newHand
+              // trigger update
+              this.updateItem()
             }
           },
           (oldHand) => {
@@ -156,8 +166,8 @@ export default class HoldingBlock {
   }
 
   updateItem () {
-    if (!this.ready || !this.playerState.getHeldItem) return
-    const item = this.playerState.getHeldItem(this.offHand)
+    if (!this.ready) return
+    const item = this.offHand ? this.playerState.reactive.heldItemOff : this.playerState.reactive.heldItemMain
     if (item) {
       void this.setNewItem(item)
     } else if (this.offHand) {
@@ -347,8 +357,8 @@ export default class HoldingBlock {
         itemId: handItem.id,
       }, {
         'minecraft:display_context': 'firstperson',
-        'minecraft:use_duration': this.playerState.getItemUsageTicks?.(),
-        'minecraft:using_item': !!this.playerState.getItemUsageTicks?.(),
+        'minecraft:use_duration': this.playerState.reactive.itemUsageTicks,
+        'minecraft:using_item': !!this.playerState.reactive.itemUsageTicks,
       }, this.lastItemModelName)
       if (result) {
         const { mesh: itemMesh, isBlock, modelName } = result
@@ -546,7 +556,7 @@ class HandIdleAnimator {
 
   private readonly debugGui: DebugGui
 
-  constructor (public handMesh: THREE.Object3D, public playerState: IPlayerState) {
+  constructor (public handMesh: THREE.Object3D, public playerState: PlayerStateRenderer) {
     this.handMesh = handMesh
     this.globalTime = 0
     this.currentState = 'NOT_MOVING'
@@ -700,7 +710,7 @@ class HandIdleAnimator {
 
     // Check for state changes from player state
     if (this.playerState) {
-      const newState = this.playerState.getMovementState()
+      const newState = this.playerState.reactive.movementState
       if (newState !== this.targetState) {
         this.setState(newState)
       }
diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
index ba1c4ac2..58a0fffa 100644
--- a/renderer/viewer/three/panorama.ts
+++ b/renderer/viewer/three/panorama.ts
@@ -6,8 +6,10 @@ import * as tweenJs from '@tweenjs/tween.js'
 import type { GraphicsInitOptions } from '../../../src/appViewer'
 import { WorldDataEmitter } from '../lib/worldDataEmitter'
 import { defaultWorldRendererConfig, WorldRendererCommon } from '../lib/worldrendererCommon'
-import { BasePlayerState } from '../lib/basePlayerState'
 import { getDefaultRendererState } from '../baseGraphicsBackend'
+import { loadThreeJsTextureFromUrl, loadThreeJsTextureFromUrlSync } from '../lib/utils/skins'
+import { ResourcesManager } from '../../../src/resourcesManager'
+import { getInitialPlayerStateRenderer } from '../lib/basePlayerState'
 import { WorldRendererThree } from './worldrendererThree'
 import { EntityMesh } from './entity/EntityMesh'
 import { DocumentRenderer } from './documentRenderer'
@@ -48,7 +50,7 @@ export class PanoramaRenderer {
     this.directionalLight.castShadow = true
     this.scene.add(this.directionalLight)
 
-    this.camera = new THREE.PerspectiveCamera(85, window.innerWidth / window.innerHeight, 0.05, 1000)
+    this.camera = new THREE.PerspectiveCamera(85, this.documentRenderer.canvas.width / this.documentRenderer.canvas.height, 0.05, 1000)
     this.camera.position.set(0, 0, 0)
     this.camera.rotation.set(0, 0, 0)
   }
@@ -63,47 +65,57 @@ export class PanoramaRenderer {
 
     this.documentRenderer.render = (sizeChanged = false) => {
       if (sizeChanged) {
-        this.camera.aspect = window.innerWidth / window.innerHeight
+        this.camera.aspect = this.documentRenderer.canvas.width / this.documentRenderer.canvas.height
         this.camera.updateProjectionMatrix()
       }
       this.documentRenderer.renderer.render(this.scene, this.camera)
     }
   }
 
+  async debugImageInFrontOfCamera () {
+    const image = await loadThreeJsTextureFromUrl(join('background', 'panorama_0.png'))
+    const mesh = new THREE.Mesh(new THREE.PlaneGeometry(1000, 1000), new THREE.MeshBasicMaterial({ map: image }))
+    mesh.position.set(0, 0, -500)
+    mesh.rotation.set(0, 0, 0)
+    this.scene.add(mesh)
+  }
+
   addClassicPanorama () {
     const panorGeo = new THREE.BoxGeometry(1000, 1000, 1000)
-    const loader = new THREE.TextureLoader()
     const panorMaterials = [] as THREE.MeshBasicMaterial[]
     const fadeInDuration = 200
 
-    for (const file of panoramaFiles) {
-      // eslint-disable-next-line prefer-const
-      let material: THREE.MeshBasicMaterial
+    // void this.debugImageInFrontOfCamera()
+
+    for (const file of panoramaFiles) {
+      const load = async () => {
+        const { texture } = loadThreeJsTextureFromUrlSync(join('background', file))
+
+        // Instead of using repeat/offset to flip, we'll use the texture matrix
+        texture.matrixAutoUpdate = false
+        texture.matrix.set(
+          -1, 0, 1, 0, 1, 0, 0, 0, 1
+        )
+
+        texture.wrapS = THREE.ClampToEdgeWrapping
+        texture.wrapT = THREE.ClampToEdgeWrapping
+        texture.minFilter = THREE.LinearFilter
+        texture.magFilter = THREE.LinearFilter
+
+        const material = new THREE.MeshBasicMaterial({
+          map: texture,
+          transparent: true,
+          side: THREE.DoubleSide,
+          depthWrite: false,
+          opacity: 0 // Start with 0 opacity
+        })
 
-      const texture = loader.load(join('background', file), () => {
         // Start fade-in when texture is loaded
         this.startTimes.set(material, Date.now())
-      })
+        panorMaterials.push(material)
+      }
 
-      // Instead of using repeat/offset to flip, we'll use the texture matrix
-      texture.matrixAutoUpdate = false
-      texture.matrix.set(
-        -1, 0, 1, 0, 1, 0, 0, 0, 1
-      )
-
-      texture.wrapS = THREE.ClampToEdgeWrapping
-      texture.wrapT = THREE.ClampToEdgeWrapping
-      texture.minFilter = THREE.LinearFilter
-      texture.magFilter = THREE.LinearFilter
-
-      material = new THREE.MeshBasicMaterial({
-        map: texture,
-        transparent: true,
-        side: THREE.DoubleSide,
-        depthWrite: false,
-        opacity: 0 // Start with 0 opacity
-      })
-      panorMaterials.push(material)
+      void load()
     }
 
     const panoramaBox = new THREE.Mesh(panorGeo, panorMaterials)
@@ -145,8 +157,9 @@ export class PanoramaRenderer {
 
   async worldBlocksPanorama () {
     const version = '1.21.4'
-    this.options.resourcesManager.currentConfig = { version, noInventoryGui: true, }
-    await this.options.resourcesManager.updateAssetsData({ })
+    const fullResourceManager = this.options.resourcesManager as ResourcesManager
+    fullResourceManager.currentConfig = { version, noInventoryGui: true, }
+    await fullResourceManager.updateAssetsData({ })
     if (this.abortController.signal.aborted) return
     console.time('load panorama scene')
     const world = getSyncWorld(version)
@@ -184,9 +197,9 @@ export class PanoramaRenderer {
         version,
         worldView,
         inWorldRenderingConfig: defaultWorldRendererConfig,
-        playerState: new BasePlayerState(),
-        rendererState: getDefaultRendererState(),
-        nonReactiveState: getDefaultRendererState()
+        playerState: getInitialPlayerStateRenderer(),
+        rendererState: getDefaultRendererState().reactive,
+        nonReactiveState: getDefaultRendererState().nonReactive
       }
     )
     if (this.worldRenderer instanceof WorldRendererThree) {
diff --git a/renderer/viewer/three/renderSlot.ts b/renderer/viewer/three/renderSlot.ts
new file mode 100644
index 00000000..fd1eae91
--- /dev/null
+++ b/renderer/viewer/three/renderSlot.ts
@@ -0,0 +1,78 @@
+import { getRenamedData } from 'flying-squid/dist/blockRenames'
+import { BlockModel } from 'mc-assets'
+import { versionToNumber } from 'mc-assets/dist/utils'
+import type { ResourcesManagerCommon } from '../../../src/resourcesManager'
+
+export type ResolvedItemModelRender = {
+  modelName: string,
+  originalItemName?: string
+}
+
+export const renderSlot = (model: ResolvedItemModelRender, resourcesManager: ResourcesManagerCommon, debugIsQuickbar = false, fullBlockModelSupport = false): {
+  texture: string,
+  blockData?: Record<string, { slice, path }> & { resolvedModel: BlockModel },
+  scale?: number,
+  slice?: number[],
+  modelName?: string,
+  image?: ImageBitmap
+} | undefined => {
+  let itemModelName = model.modelName
+  const isItem = loadedData.itemsByName[itemModelName]
+
+  // #region normalize item name
+  if (versionToNumber(bot.version) < versionToNumber('1.13')) itemModelName = getRenamedData(isItem ? 'items' : 'blocks', itemModelName, bot.version, '1.13.1') as string
+  // #endregion
+
+
+  let itemTexture
+
+  if (!fullBlockModelSupport) {
+    const atlas = resourcesManager.currentResources?.guiAtlas?.json
+    // todo atlas holds all rendered blocks, not all possibly rendered item/block models, need to request this on demand instead (this is how vanilla works)
+    const tryGetAtlasTexture = (name?: string) => name && atlas?.textures[name.replace('minecraft:', '').replace('block/', '').replace('blocks/', '').replace('item/', '').replace('items/', '').replace('_inventory', '')]
+    const item = tryGetAtlasTexture(itemModelName) ?? tryGetAtlasTexture(model.originalItemName)
+    if (item) {
+      const x = item.u * atlas.width
+      const y = item.v * atlas.height
+      return {
+        texture: 'gui',
+        image: resourcesManager.currentResources!.guiAtlas!.image,
+        slice: [x, y, atlas.tileSize, atlas.tileSize],
+        scale: 0.25,
+      }
+    }
+  }
+
+  const blockToTopTexture = (r) => r.top ?? r
+
+  try {
+    if (!appViewer.resourcesManager.currentResources?.itemsRenderer) throw new Error('Items renderer is not available')
+    itemTexture =
+        appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture(itemModelName, {}, false, fullBlockModelSupport)
+        ?? (model.originalItemName ? appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture(model.originalItemName, {}, false, fullBlockModelSupport) : undefined)
+        ?? appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture('item/missing_texture')!
+  } catch (err) {
+    // get resourcepack from resource manager
+    reportError?.(`Failed to render item ${itemModelName} (original: ${model.originalItemName}) on ${bot.version} (resourcepack: TODO!): ${err.stack}`)
+    itemTexture = blockToTopTexture(appViewer.resourcesManager.currentResources!.itemsRenderer.getItemTexture('errored')!)
+  }
+
+  itemTexture ??= blockToTopTexture(appViewer.resourcesManager.currentResources!.itemsRenderer.getItemTexture('unknown')!)
+
+
+  if ('type' in itemTexture) {
+    // is item
+    return {
+      texture: itemTexture.type,
+      slice: itemTexture.slice,
+      modelName: itemModelName
+    }
+  } else {
+    // is block
+    return {
+      texture: 'blocks',
+      blockData: itemTexture,
+      modelName: itemModelName
+    }
+  }
+}
diff --git a/renderer/viewer/three/world/cursorBlock.ts b/renderer/viewer/three/world/cursorBlock.ts
index fe95c2c9..495a2d55 100644
--- a/renderer/viewer/three/world/cursorBlock.ts
+++ b/renderer/viewer/three/world/cursorBlock.ts
@@ -15,6 +15,7 @@ import destroyStage6 from '../../../../assets/destroy_stage_6.png'
 import destroyStage7 from '../../../../assets/destroy_stage_7.png'
 import destroyStage8 from '../../../../assets/destroy_stage_8.png'
 import destroyStage9 from '../../../../assets/destroy_stage_9.png'
+import { loadThreeJsTextureFromUrl } from '../../lib/utils/skins'
 
 export class CursorBlock {
   _cursorLinesHidden = false
@@ -36,17 +37,17 @@ export class CursorBlock {
 
   constructor (public readonly worldRenderer: WorldRendererThree) {
     // Initialize break mesh and textures
-    const loader = new THREE.TextureLoader()
     const destroyStagesImages = [
       destroyStage0, destroyStage1, destroyStage2, destroyStage3, destroyStage4,
       destroyStage5, destroyStage6, destroyStage7, destroyStage8, destroyStage9
     ]
 
     for (let i = 0; i < 10; i++) {
-      const texture = loader.load(destroyStagesImages[i])
-      texture.magFilter = THREE.NearestFilter
-      texture.minFilter = THREE.NearestFilter
-      this.breakTextures.push(texture)
+      void loadThreeJsTextureFromUrl(destroyStagesImages[i]).then((texture) => {
+        texture.magFilter = THREE.NearestFilter
+        texture.minFilter = THREE.NearestFilter
+        this.breakTextures.push(texture)
+      })
     }
 
     const breakMaterial = new THREE.MeshBasicMaterial({
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index a8e08068..78381a29 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -3,17 +3,16 @@ import { Vec3 } from 'vec3'
 import nbt from 'prismarine-nbt'
 import PrismarineChatLoader from 'prismarine-chat'
 import * as tweenJs from '@tweenjs/tween.js'
-import { subscribeKey } from 'valtio/utils'
 import { renderSign } from '../sign-renderer'
-import { DisplayWorldOptions, GraphicsInitOptions, RendererReactiveState } from '../../../src/appViewer'
+import { DisplayWorldOptions, GraphicsInitOptions } from '../../../src/appViewer'
 import { chunkPos, sectionPos } from '../lib/simpleUtils'
 import { WorldRendererCommon } from '../lib/worldrendererCommon'
-import { addNewStat, removeAllStats } from '../lib/ui/newStats'
+import { addNewStat } from '../lib/ui/newStats'
 import { MesherGeometryOutput } from '../lib/mesher/shared'
 import { ItemSpecificContextProperties } from '../lib/basePlayerState'
 import { getMyHand } from '../lib/hand'
 import { setBlockPosition } from '../lib/mesher/standaloneRenderer'
-import { sendVideoPlay, sendVideoStop } from '../../../src/customChannels'
+import { loadThreeJsTextureFromBitmap } from '../lib/utils/skins'
 import HoldingBlock from './holdingBlock'
 import { getMesh } from './entity/EntityMesh'
 import { armorModel } from './entity/armorModels'
@@ -44,7 +43,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   cameraGroupVr?: THREE.Object3D
   material = new THREE.MeshLambertMaterial({ vertexColors: true, transparent: true, alphaTest: 0.1 })
   itemsTexture: THREE.Texture
-  cursorBlock = new CursorBlock(this)
+  cursorBlock: CursorBlock
   onRender: Array<() => void> = []
   cameraShake: CameraShake
   media: ThreeJsMedia
@@ -82,8 +81,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     if (!initOptions.resourcesManager) throw new Error('resourcesManager is required')
     super(initOptions.resourcesManager, displayOptions, initOptions)
 
+    this.renderer = renderer
     displayOptions.rendererState.renderer = WorldRendererThree.getRendererInfo(renderer) ?? '...'
     this.starField = new StarField(this.scene)
+    this.cursorBlock = new CursorBlock(this)
     this.holdingBlock = new HoldingBlock(this)
     this.holdingBlockLeft = new HoldingBlock(this, true)
 
@@ -148,21 +149,21 @@ export class WorldRendererThree extends WorldRendererCommon {
 
   override watchReactivePlayerState () {
     super.watchReactivePlayerState()
-    this.onReactiveValueUpdated('inWater', (value) => {
+    this.onReactivePlayerStateUpdated('inWater', (value) => {
       this.scene.fog = value ? new THREE.Fog(0x00_00_ff, 0.1, this.displayOptions.playerState.reactive.waterBreathing ? 100 : 20) : null
     })
-    this.onReactiveValueUpdated('ambientLight', (value) => {
+    this.onReactivePlayerStateUpdated('ambientLight', (value) => {
       if (!value) return
       this.ambientLight.intensity = value
     })
-    this.onReactiveValueUpdated('directionalLight', (value) => {
+    this.onReactivePlayerStateUpdated('directionalLight', (value) => {
       if (!value) return
       this.directionalLight.intensity = value
     })
-    this.onReactiveValueUpdated('lookingAtBlock', (value) => {
+    this.onReactivePlayerStateUpdated('lookingAtBlock', (value) => {
       this.cursorBlock.setHighlightCursorBlock(value ? new Vec3(value.x, value.y, value.z) : null, value?.shapes)
     })
-    this.onReactiveValueUpdated('diggingBlock', (value) => {
+    this.onReactivePlayerStateUpdated('diggingBlock', (value) => {
       this.cursorBlock.updateBreakAnimation(value ? { x: value.x, y: value.y, z: value.z } : undefined, value?.stage ?? null, value?.mergedShape)
     })
   }
@@ -184,20 +185,18 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   async updateAssetsData (): Promise<void> {
-    const resources = this.resourcesManager.currentResources!
+    const resources = this.resourcesManager.currentResources
 
     const oldTexture = this.material.map
     const oldItemsTexture = this.itemsTexture
 
-    const texture = await new THREE.TextureLoader().loadAsync(resources.blocksAtlasParser.latestImage)
-    texture.magFilter = THREE.NearestFilter
-    texture.minFilter = THREE.NearestFilter
+    const texture = loadThreeJsTextureFromBitmap(resources.blocksAtlasImage)
+    texture.needsUpdate = true
     texture.flipY = false
     this.material.map = texture
 
-    const itemsTexture = await new THREE.TextureLoader().loadAsync(resources.itemsAtlasParser.latestImage)
-    itemsTexture.magFilter = THREE.NearestFilter
-    itemsTexture.minFilter = THREE.NearestFilter
+    const itemsTexture = loadThreeJsTextureFromBitmap(resources.itemsAtlasImage)
+    itemsTexture.needsUpdate = true
     itemsTexture.flipY = false
     this.itemsTexture = itemsTexture
 
@@ -239,7 +238,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   getItemRenderData (item: Record<string, any>, specificProps: ItemSpecificContextProperties) {
-    return getItemUv(item, specificProps, this.resourcesManager)
+    return getItemUv(item, specificProps, this.resourcesManager, this.playerState)
   }
 
   async demoModel () {
@@ -431,7 +430,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number) {
-    const yOffset = this.displayOptions.playerState.getEyeHeight()
+    const yOffset = this.displayOptions.playerState.reactive.eyeHeight
 
     this.updateCamera(pos?.offset(0, yOffset, 0) ?? null, yaw, pitch)
     this.media.tryIntersectMedia()
@@ -495,7 +494,8 @@ export class WorldRendererThree extends WorldRendererCommon {
 
     const sizeOrFovChanged = sizeChanged || this.displayOptions.inWorldRenderingConfig.fov !== this.camera.fov
     if (sizeOrFovChanged) {
-      this.camera.aspect = window.innerWidth / window.innerHeight
+      const size = this.renderer.getSize(new THREE.Vector2())
+      this.camera.aspect = size.width / size.height
       this.camera.fov = this.displayOptions.inWorldRenderingConfig.fov
       this.camera.updateProjectionMatrix()
     }
@@ -508,7 +508,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     const cam = this.cameraGroupVr instanceof THREE.Group ? this.cameraGroupVr.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
 
-    if (this.displayOptions.inWorldRenderingConfig.showHand && !this.playerState.shouldHideHand /*  && !this.freeFlyMode */ && !this.renderer.xr.isPresenting) {
+    if (this.displayOptions.inWorldRenderingConfig.showHand && this.playerState.reactive.gameMode !== 'spectator' /*  && !this.freeFlyMode */ && !this.renderer.xr.isPresenting) {
       this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
       this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
     }
@@ -710,6 +710,18 @@ export class WorldRendererThree extends WorldRendererCommon {
     super.destroy()
   }
 
+  shouldObjectVisible (object: THREE.Object3D) {
+    // Get chunk coordinates
+    const chunkX = Math.floor(object.position.x / 16) * 16
+    const chunkZ = Math.floor(object.position.z / 16) * 16
+    const sectionY = Math.floor(object.position.y / 16) * 16
+
+    const chunkKey = `${chunkX},${chunkZ}`
+    const sectionKey = `${chunkX},${sectionY},${chunkZ}`
+
+    return !!this.finishedChunks[chunkKey] || !!this.sectionObjects[sectionKey]
+  }
+
   updateSectionOffsets () {
     const currentTime = performance.now()
     for (const [key, anim] of Object.entries(this.sectionsOffsetsAnimations)) {
@@ -756,6 +768,10 @@ export class WorldRendererThree extends WorldRendererCommon {
       }
     }
   }
+
+  reloadWorld () {
+    this.entities.reloadEntities()
+  }
 }
 
 class StarField {
diff --git a/src/appViewer.ts b/src/appViewer.ts
index f4a21481..5ac0beaf 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -1,25 +1,26 @@
-import { WorldDataEmitter } from 'renderer/viewer/lib/worldDataEmitter'
-import { BasePlayerState, IPlayerState } from 'renderer/viewer/lib/basePlayerState'
+import { WorldDataEmitter, WorldDataEmitterWorker } from 'renderer/viewer/lib/worldDataEmitter'
+import { PlayerStateRenderer } from 'renderer/viewer/lib/basePlayerState'
 import { subscribeKey } from 'valtio/utils'
 import { defaultWorldRendererConfig, WorldRendererConfig } from 'renderer/viewer/lib/worldrendererCommon'
 import { Vec3 } from 'vec3'
 import { SoundSystem } from 'renderer/viewer/three/threeJsSound'
-import { proxy } from 'valtio'
+import { proxy, subscribe } from 'valtio'
 import { getDefaultRendererState } from 'renderer/viewer/baseGraphicsBackend'
 import { getSyncWorld } from 'renderer/playground/shared'
+import { MaybePromise } from 'contro-max/build/types/store'
 import { playerState } from './mineflayer/playerState'
 import { createNotificationProgressReporter, ProgressReporter } from './core/progressReporter'
 import { setLoadingScreenStatus } from './appStatus'
 import { activeModalStack, miscUiState } from './globalState'
 import { options } from './optionsStorage'
-import { ResourcesManager } from './resourcesManager'
+import { ResourcesManager, ResourcesManagerTransferred } from './resourcesManager'
 import { watchOptionsAfterWorldViewInit } from './watchOptions'
 
 export interface RendererReactiveState {
   world: {
     chunksLoaded: Set<string>
+    // chunksTotalNumber: number
     heightmaps: Map<string, Uint8Array>
-    chunksTotalNumber: number
     allChunksLoaded: boolean
     mesherWork: boolean
     intersectMedia: { id: string, x: number, y: number } | null
@@ -31,9 +32,6 @@ export interface NonReactiveState {
   world: {
     chunksLoaded: Set<string>
     chunksTotalNumber: number
-    allChunksLoaded: boolean
-    mesherWork: boolean
-    intersectMedia: { id: string, x: number, y: number } | null
   }
 }
 
@@ -42,33 +40,39 @@ export interface GraphicsBackendConfig {
   powerPreference?: 'high-performance' | 'low-power'
   statsVisible?: number
   sceneBackground: string
+  timeoutRendering?: boolean
 }
 
 const defaultGraphicsBackendConfig: GraphicsBackendConfig = {
   fpsLimit: undefined,
   powerPreference: undefined,
-  sceneBackground: 'lightblue'
+  sceneBackground: 'lightblue',
+  timeoutRendering: false
 }
 
 export interface GraphicsInitOptions<S = any> {
-  resourcesManager: ResourcesManager
+  resourcesManager: ResourcesManagerTransferred
   config: GraphicsBackendConfig
   rendererSpecificSettings: S
 
-  displayCriticalError: (error: Error) => void
-  setRendererSpecificSettings: (key: string, value: any) => void
+  callbacks: {
+    displayCriticalError: (error: Error) => void
+    setRendererSpecificSettings: (key: string, value: any) => void
+
+    fireCustomEvent: (eventName: string, ...args: any[]) => void
+  }
 }
 
 export interface DisplayWorldOptions {
   version: string
-  worldView: WorldDataEmitter
+  worldView: WorldDataEmitterWorker
   inWorldRenderingConfig: WorldRendererConfig
-  playerState: IPlayerState
+  playerState: PlayerStateRenderer
   rendererState: RendererReactiveState
   nonReactiveState: NonReactiveState
 }
 
-export type GraphicsBackendLoader = ((options: GraphicsInitOptions) => GraphicsBackend) & {
+export type GraphicsBackendLoader = ((options: GraphicsInitOptions) => MaybePromise<GraphicsBackend>) & {
   id: string
 }
 
@@ -108,8 +112,8 @@ export class AppViewer {
   inWorldRenderingConfig: WorldRendererConfig = proxy(defaultWorldRendererConfig)
   lastCamUpdate = 0
   playerState = playerState
-  rendererState = proxy(getDefaultRendererState())
-  nonReactiveState: NonReactiveState = getDefaultRendererState()
+  rendererState = proxy(getDefaultRendererState().reactive)
+  nonReactiveState: NonReactiveState = getDefaultRendererState().nonReactive
   worldReady: Promise<void>
   private resolveWorldReady: () => void
 
@@ -133,19 +137,24 @@ export class AppViewer {
         rendererSpecificSettings[key.slice(rendererSettingsKey.length + 1)] = options[key]
       }
     }
-    const loaderOptions: GraphicsInitOptions = {
-      resourcesManager: this.resourcesManager,
+    const loaderOptions: GraphicsInitOptions = { // todo!
+      resourcesManager: this.resourcesManager as ResourcesManagerTransferred,
       config: this.config,
-      displayCriticalError (error) {
-        console.error(error)
-        setLoadingScreenStatus(error.message, true)
+      callbacks: {
+        displayCriticalError (error) {
+          console.error(error)
+          setLoadingScreenStatus(error.message, true)
+        },
+        setRendererSpecificSettings (key: string, value: any) {
+          options[`${rendererSettingsKey}.${key}`] = value
+        },
+        fireCustomEvent (eventName, ...args) {
+          // this.callbacks.fireCustomEvent(eventName, ...args)
+        }
       },
       rendererSpecificSettings,
-      setRendererSpecificSettings (key: string, value: any) {
-        options[`${rendererSettingsKey}.${key}`] = value
-      }
     }
-    this.backend = loader(loaderOptions)
+    this.backend = await loader(loaderOptions)
 
     // if (this.resourcesManager.currentResources) {
     //   void this.prepareResources(this.resourcesManager.currentResources.version, createNotificationProgressReporter())
@@ -156,9 +165,13 @@ export class AppViewer {
       const { method, args } = this.currentState
       this.backend[method](...args)
       if (method === 'startWorld') {
+        void this.worldView!.init(bot.entity.position)
         // void this.worldView!.init(args[0].playerState.getPosition())
       }
     }
+
+    // todo
+    modalStackUpdateChecks()
   }
 
   async startWithBot () {
@@ -167,10 +180,10 @@ export class AppViewer {
     this.worldView!.listenToBot(bot)
   }
 
-  async startWorld (world, renderDistance: number, playerStateSend: IPlayerState = this.playerState) {
+  async startWorld (world, renderDistance: number, playerStateSend: PlayerStateRenderer = this.playerState) {
     if (this.currentDisplay === 'world') throw new Error('World already started')
     this.currentDisplay = 'world'
-    const startPosition = playerStateSend.getPosition()
+    const startPosition = bot.entity?.position ?? new Vec3(0, 64, 0)
     this.worldView = new WorldDataEmitter(world, renderDistance, startPosition)
     window.worldView = this.worldView
     watchOptionsAfterWorldViewInit(this.worldView)
@@ -238,7 +251,8 @@ export class AppViewer {
     const { promise, resolve } = Promise.withResolvers<void>()
     this.worldReady = promise
     this.resolveWorldReady = resolve
-    this.rendererState = proxy(getDefaultRendererState())
+    this.rendererState = proxy(getDefaultRendererState().reactive)
+    this.nonReactiveState = getDefaultRendererState().nonReactive
     // this.queuedDisplay = undefined
   }
 
@@ -259,6 +273,7 @@ export class AppViewer {
   }
 }
 
+// do not import this. Use global appViewer instead (without window prefix).
 export const appViewer = new AppViewer()
 window.appViewer = appViewer
 
@@ -284,7 +299,7 @@ window.initialMenuStart = initialMenuStart
 
 const modalStackUpdateChecks = () => {
   // maybe start panorama
-  if (activeModalStack.length === 0 && !miscUiState.gameLoaded) {
+  if (!miscUiState.gameLoaded) {
     void initialMenuStart()
   }
 
@@ -295,5 +310,4 @@ const modalStackUpdateChecks = () => {
 
   appViewer.inWorldRenderingConfig.foreground = activeModalStack.length === 0
 }
-subscribeKey(activeModalStack, 'length', modalStackUpdateChecks)
-modalStackUpdateChecks()
+subscribe(activeModalStack, modalStackUpdateChecks)
diff --git a/src/browserfs.ts b/src/browserfs.ts
index a4ae96cc..006b6db8 100644
--- a/src/browserfs.ts
+++ b/src/browserfs.ts
@@ -263,7 +263,7 @@ export const mountGoogleDriveFolder = async (readonly: boolean, rootId: string)
   return true
 }
 
-export async function removeFileRecursiveAsync (path) {
+export async function removeFileRecursiveAsync (path, removeDirectoryItself = true) {
   const errors = [] as Array<[string, Error]>
   try {
     const files = await fs.promises.readdir(path)
@@ -282,7 +282,9 @@ export async function removeFileRecursiveAsync (path) {
     }))
 
     // After removing all files/directories, remove the current directory
-    await fs.promises.rmdir(path)
+    if (removeDirectoryItself) {
+      await fs.promises.rmdir(path)
+    }
   } catch (error) {
     errors.push([path, error])
   }
diff --git a/src/controls.ts b/src/controls.ts
index f32cbda6..94364f2d 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -661,6 +661,9 @@ export const f3Keybinds: Array<{
         localServer.players[0].world.columns = {}
       }
       void reloadChunks()
+      if (appViewer.backend?.backendMethods && typeof appViewer.backend.backendMethods.reloadWorld === 'function') {
+        appViewer.backend.backendMethods.reloadWorld()
+      }
     },
     mobileTitle: 'Reload chunks',
   },
diff --git a/src/index.ts b/src/index.ts
index bea10726..483abd74 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -74,7 +74,7 @@ import { showNotification } from './react/NotificationProvider'
 import { saveToBrowserMemory } from './react/PauseScreen'
 import './devReload'
 import './water'
-import { ConnectOptions, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData } from './connect'
+import { ConnectOptions, getVersionAutoSelect, downloadOtherGameData, downloadAllMinecraftData, loadMinecraftData } from './connect'
 import { ref, subscribe } from 'valtio'
 import { signInMessageState } from './react/SignInMessageProvider'
 import { findServerPassword, updateAuthenticatedAccountData, updateLoadedServerData, updateServerConnectionHistory } from './react/serversStorage'
@@ -331,6 +331,7 @@ export async function connect (connectOptions: ConnectOptions) {
       await progress.executeWithMessage(
         'Processing downloaded Minecraft data',
         async () => {
+          await loadMinecraftData(version)
           await appViewer.resourcesManager.loadSourceData(version)
         }
       )
@@ -448,17 +449,20 @@ export async function connect (connectOptions: ConnectOptions) {
 
     let newTokensCacheResult = null as any
     const cachedTokens = typeof connectOptions.authenticatedAccount === 'object' ? connectOptions.authenticatedAccount.cachedTokens : {}
-    const authData = connectOptions.authenticatedAccount ? await microsoftAuthflow({
-      tokenCaches: cachedTokens,
-      proxyBaseUrl: connectOptions.proxy,
-      setProgressText (text) {
-        progress.setMessage(text)
-      },
-      setCacheResult (result) {
-        newTokensCacheResult = result
-      },
-      connectingServer: server.host
-    }) : undefined
+    let authData: Awaited<ReturnType<typeof microsoftAuthflow>> | undefined
+    if (connectOptions.authenticatedAccount) {
+      authData = await microsoftAuthflow({
+        tokenCaches: cachedTokens,
+        proxyBaseUrl: connectOptions.proxy,
+        setProgressText (text) {
+          progress.setMessage(text)
+        },
+        setCacheResult (result) {
+          newTokensCacheResult = result
+        },
+        connectingServer: server.host
+      })
+    }
 
     if (p2pMultiplayer) {
       clientDataStream = await connectToPeer(connectOptions.peerId!, connectOptions.peerOptions)
@@ -569,6 +573,7 @@ export async function connect (connectOptions: ConnectOptions) {
       // "mapDownloader-saveInternal": false, // do not save into memory, todo must be implemeneted as we do really care of ram
     }) as unknown as typeof __type_bot
     window.bot = bot
+
     if (connectOptions.viewerWsConnect) {
       void onBotCreatedViewerHandler()
     }
@@ -691,6 +696,7 @@ export async function connect (connectOptions: ConnectOptions) {
   onBotCreate()
 
   bot.once('login', () => {
+    errorAbortController.abort()
     loadingTimerState.networkOnlyStart = 0
     progress.setMessage('Loading world')
   })
@@ -708,7 +714,7 @@ export async function connect (connectOptions: ConnectOptions) {
           resolve()
           unsub()
         } else {
-          const perc = Math.round(appViewer.rendererState.world.chunksLoaded.size / appViewer.rendererState.world.chunksTotalNumber * 100)
+          const perc = Math.round(appViewer.rendererState.world.chunksLoaded.size / appViewer.nonReactiveState.world.chunksTotalNumber * 100)
           progress?.reportProgress('chunks', perc / 100)
         }
       })
@@ -727,9 +733,12 @@ export async function connect (connectOptions: ConnectOptions) {
       })
       await appViewer.resourcesManager.promiseAssetsReady
     }
-    errorAbortController.abort()
     if (appStatusState.isError) return
 
+    if (!appViewer.resourcesManager.currentResources?.itemsRenderer) {
+      await appViewer.resourcesManager.updateAssetsData({})
+    }
+
     const loadWorldStart = Date.now()
     console.log('try to focus window')
     window.focus?.()
@@ -741,7 +750,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
     try {
       if (p2pConnectTimeout) clearTimeout(p2pConnectTimeout)
-      playerState.onlineMode = !!connectOptions.authenticatedAccount
+      playerState.reactive.onlineMode = !!connectOptions.authenticatedAccount
 
       progress.setMessage('Placing blocks (starting viewer)')
       if (!connectOptions.worldStateFileContents || connectOptions.worldStateFileContents.length < 3 * 1024 * 1024) {
@@ -765,6 +774,9 @@ export async function connect (connectOptions: ConnectOptions) {
       console.log('bot spawned - starting viewer')
       await appViewer.startWorld(bot.world, renderDistance)
       appViewer.worldView!.listenToBot(bot)
+      if (appViewer.backend) {
+        void appViewer.worldView!.init(bot.entity.position)
+      }
 
       initMotionTracking()
       dayCycle()
@@ -975,7 +987,7 @@ if (!reconnectOptions) {
       }
     })
 
-    if (appQueryParams.serversList) {
+    if (appQueryParams.serversList && !appQueryParams.ip) {
       showModal({ reactType: 'serversList' })
     }
 
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 187bb997..d03b9fa4 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -10,7 +10,7 @@ import { versionToNumber } from 'renderer/viewer/common/utils'
 import { getRenamedData } from 'flying-squid/dist/blockRenames'
 import PrismarineChatLoader from 'prismarine-chat'
 import { BlockModel } from 'mc-assets'
-import { activeGuiAtlas } from 'renderer/viewer/lib/guiRenderer'
+import { renderSlot } from 'renderer/viewer/three/renderSlot'
 import Generic95 from '../assets/generic_95.png'
 import { appReplacableResources } from './generated/resources'
 import { activeModalStack, hideCurrentModal, hideModal, miscUiState, showModal } from './globalState'
@@ -21,6 +21,7 @@ import { currentScaling } from './scaleInterface'
 import { getItemDescription } from './itemsDescriptions'
 import { MessageFormatPart } from './chatUtils'
 import { GeneralInputItem, getItemMetadata, getItemModelName, getItemNameRaw, RenderItem } from './mineflayer/items'
+import { playerState } from './mineflayer/playerState'
 
 const loadedImagesCache = new Map<string, HTMLImageElement>()
 const cleanLoadedImagesCache = () => {
@@ -134,8 +135,8 @@ export const onGameLoad = () => {
 const getImageSrc = (path): string | HTMLImageElement => {
   switch (path) {
     case 'gui/container/inventory': return appReplacableResources.latest_gui_container_inventory.content
-    case 'blocks': return appViewer.resourcesManager.currentResources!.blocksAtlasParser.latestImage
-    case 'items': return appViewer.resourcesManager.currentResources!.itemsAtlasParser.latestImage
+    case 'blocks': return appViewer.resourcesManager.blocksAtlasParser.latestImage
+    case 'items': return appViewer.resourcesManager.itemsAtlasParser.latestImage
     case 'gui/container/dispenser': return appReplacableResources.latest_gui_container_dispenser.content
     case 'gui/container/furnace': return appReplacableResources.latest_gui_container_furnace.content
     case 'gui/container/crafting_table': return appReplacableResources.latest_gui_container_crafting_table.content
@@ -177,79 +178,6 @@ const getImage = ({ path = undefined as string | undefined, texture = undefined
   return loadedImagesCache.get(loadPath)
 }
 
-export type ResolvedItemModelRender = {
-  modelName: string,
-  originalItemName?: string
-}
-
-export const renderSlot = (model: ResolvedItemModelRender, debugIsQuickbar = false, fullBlockModelSupport = false): {
-  texture: string,
-  blockData?: Record<string, { slice, path }> & { resolvedModel: BlockModel },
-  scale?: number,
-  slice?: number[],
-  modelName?: string,
-  image?: HTMLImageElement
-} | undefined => {
-  let itemModelName = model.modelName
-  const isItem = loadedData.itemsByName[itemModelName]
-
-  // #region normalize item name
-  if (versionToNumber(bot.version) < versionToNumber('1.13')) itemModelName = getRenamedData(isItem ? 'items' : 'blocks', itemModelName, bot.version, '1.13.1') as string
-  // #endregion
-
-
-  let itemTexture
-
-  if (!fullBlockModelSupport) {
-    const atlas = activeGuiAtlas.atlas?.json
-    // todo atlas holds all rendered blocks, not all possibly rendered item/block models, need to request this on demand instead (this is how vanilla works)
-    const tryGetAtlasTexture = (name?: string) => name && atlas?.textures[name.replace('minecraft:', '').replace('block/', '').replace('blocks/', '').replace('item/', '').replace('items/', '').replace('_inventory', '')]
-    const item = tryGetAtlasTexture(itemModelName) ?? tryGetAtlasTexture(model.originalItemName)
-    if (item) {
-      const x = item.u * atlas.width
-      const y = item.v * atlas.height
-      return {
-        texture: 'gui',
-        image: activeGuiAtlas.atlas!.image,
-        slice: [x, y, atlas.tileSize, atlas.tileSize],
-        scale: 0.25,
-      }
-    }
-  }
-
-  const blockToTopTexture = (r) => r.top ?? r
-
-  try {
-    assertDefined(appViewer.resourcesManager.currentResources?.itemsRenderer)
-    itemTexture =
-      appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture(itemModelName, {}, false, fullBlockModelSupport)
-      ?? (model.originalItemName ? appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture(model.originalItemName, {}, false, fullBlockModelSupport) : undefined)
-      ?? appViewer.resourcesManager.currentResources.itemsRenderer.getItemTexture('item/missing_texture')!
-  } catch (err) {
-    inGameError(`Failed to render item ${itemModelName} (original: ${model.originalItemName}) on ${bot.version} (resourcepack: ${options.enabledResourcepack}): ${err.stack}`)
-    itemTexture = blockToTopTexture(appViewer.resourcesManager.currentResources!.itemsRenderer.getItemTexture('errored')!)
-  }
-
-  itemTexture ??= blockToTopTexture(appViewer.resourcesManager.currentResources!.itemsRenderer.getItemTexture('unknown')!)
-
-
-  if ('type' in itemTexture) {
-    // is item
-    return {
-      texture: itemTexture.type,
-      slice: itemTexture.slice,
-      modelName: itemModelName
-    }
-  } else {
-    // is block
-    return {
-      texture: 'blocks',
-      blockData: itemTexture,
-      modelName: itemModelName
-    }
-  }
-}
-
 const getItemName = (slot: Item | RenderItem | null) => {
   const parsed = getItemNameRaw(slot, appViewer.resourcesManager)
   if (!parsed) return
@@ -269,7 +197,7 @@ const itemToVisualKey = (slot: RenderItem | Item | null) => {
     slot['metadata'],
     slot.nbt ? JSON.stringify(slot.nbt) : '',
     slot['components'] ? JSON.stringify(slot['components']) : '',
-    activeGuiAtlas.version,
+    appViewer.resourcesManager.currentResources!.guiAtlasVersion,
   ].join('|')
   return keys
 }
@@ -289,8 +217,8 @@ const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
     try {
       if (slot.durabilityUsed && slot.maxDurability) slot.durabilityUsed = Math.min(slot.durabilityUsed, slot.maxDurability)
       const debugIsQuickbar = !isJei && i === bot.inventory.hotbarStart + bot.quickBarSlot
-      const modelName = getItemModelName(slot, { 'minecraft:display_context': 'gui', }, appViewer.resourcesManager)
-      const slotCustomProps = renderSlot({ modelName, originalItemName: slot.name }, debugIsQuickbar)
+      const modelName = getItemModelName(slot, { 'minecraft:display_context': 'gui', }, appViewer.resourcesManager, playerState)
+      const slotCustomProps = renderSlot({ modelName, originalItemName: slot.name }, appViewer.resourcesManager, debugIsQuickbar)
       const itemCustomName = getItemName(slot)
       Object.assign(slot, { ...slotCustomProps, displayName: itemCustomName ?? slot.displayName })
       //@ts-expect-error
diff --git a/src/mineflayer/items.ts b/src/mineflayer/items.ts
index 8a4e1fcd..495c4f39 100644
--- a/src/mineflayer/items.ts
+++ b/src/mineflayer/items.ts
@@ -1,11 +1,10 @@
 import mojangson from 'mojangson'
 import nbt from 'prismarine-nbt'
 import { fromFormattedString } from '@xmcl/text-component'
-import { ItemSpecificContextProperties } from 'renderer/viewer/lib/basePlayerState'
+import { getItemSelector, ItemSpecificContextProperties, PlayerStateRenderer } from 'renderer/viewer/lib/basePlayerState'
 import { getItemDefinition } from 'mc-assets/dist/itemDefinitions'
 import { MessageFormatPart } from '../chatUtils'
-import { ResourcesManager } from '../resourcesManager'
-import { playerState } from './playerState'
+import { ResourcesManager, ResourcesManagerCommon, ResourcesManagerTransferred } from '../resourcesManager'
 
 type RenderSlotComponent = {
   type: string,
@@ -33,7 +32,7 @@ type PossibleItemProps = {
   display?: { Name?: JsonString } // {"text":"Knife","color":"white","italic":"true"}
 }
 
-export const getItemMetadata = (item: GeneralInputItem, resourcesManager: ResourcesManager) => {
+export const getItemMetadata = (item: GeneralInputItem, resourcesManager: ResourcesManagerCommon) => {
   let customText = undefined as string | any | undefined
   let customModel = undefined as string | undefined
 
@@ -91,7 +90,7 @@ export const getItemMetadata = (item: GeneralInputItem, resourcesManager: Resour
 }
 
 
-export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'> | null, resourcesManager: ResourcesManager) => {
+export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'> | null, resourcesManager: ResourcesManagerCommon) => {
   if (!item) return ''
   const { customText } = getItemMetadata(item as GeneralInputItem, resourcesManager)
   if (!customText) return
@@ -112,14 +111,14 @@ export const getItemNameRaw = (item: Pick<import('prismarine-item').Item, 'nbt'>
   }
 }
 
-export const getItemModelName = (item: GeneralInputItem, specificProps: ItemSpecificContextProperties, resourcesManager: ResourcesManager) => {
+export const getItemModelName = (item: GeneralInputItem, specificProps: ItemSpecificContextProperties, resourcesManager: ResourcesManagerCommon, playerState: PlayerStateRenderer) => {
   let itemModelName = item.name
   const { customModel } = getItemMetadata(item, resourcesManager)
   if (customModel) {
     itemModelName = customModel
   }
 
-  const itemSelector = playerState.getItemSelector({
+  const itemSelector = getItemSelector(playerState, {
     ...specificProps
   })
   const modelFromDef = getItemDefinition(appViewer.resourcesManager.itemsDefinitionsStore, {
diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
index 16739c86..f80a6971 100644
--- a/src/mineflayer/playerState.ts
+++ b/src/mineflayer/playerState.ts
@@ -1,46 +1,26 @@
-import { EventEmitter } from 'events'
-import { Vec3 } from 'vec3'
-import { BasePlayerState, IPlayerState, ItemSpecificContextProperties, MovementState, PlayerStateEvents } from 'renderer/viewer/lib/basePlayerState'
 import { HandItemBlock } from 'renderer/viewer/three/holdingBlock'
-import TypedEmitter from 'typed-emitter'
-import { ItemSelector } from 'mc-assets/dist/itemDefinitions'
-import { proxy } from 'valtio'
+import { getInitialPlayerState, PlayerStateRenderer } from 'renderer/viewer/lib/basePlayerState'
+import { subscribe } from 'valtio'
+import { subscribeKey } from 'valtio/utils'
 import { gameAdditionalState } from '../globalState'
 
-export class PlayerStateManager implements IPlayerState {
+/**
+ * can be used only in main thread. Mainly for more convenient reactive state updates.
+ * In renderer/ directory, use PlayerStateControllerRenderer type or worldRenderer.playerState.
+ */
+export class PlayerStateControllerMain implements PlayerStateRenderer {
   disableStateUpdates = false
-  private static instance: PlayerStateManager
-  readonly events = new EventEmitter() as TypedEmitter<PlayerStateEvents>
 
-  // Movement and physics state
-  private lastVelocity = new Vec3(0, 0, 0)
-  private movementState: MovementState = 'NOT_MOVING'
   private timeOffGround = 0
   private lastUpdateTime = performance.now()
 
   // Held item state
-  private heldItem?: HandItemBlock
-  private offHandItem?: HandItemBlock
-  private itemUsageTicks = 0
   private isUsingItem = false
-  private ready = false
-  public lightingDisabled = false
-  onlineMode = false
-  get username () {
-    return bot.username ?? ''
-  }
+  ready = false
 
-  reactive: IPlayerState['reactive'] = new BasePlayerState().reactive
-
-  static getInstance (): PlayerStateManager {
-    if (!this.instance) {
-      this.instance = new PlayerStateManager()
-    }
-    return this.instance
-  }
+  reactive: PlayerStateRenderer['reactive']
 
   constructor () {
-    this.updateState = this.updateState.bind(this)
     customEvents.on('mineflayerBotCreated', () => {
       this.ready = false
       bot.on('inject_allowed', () => {
@@ -48,16 +28,27 @@ export class PlayerStateManager implements IPlayerState {
         this.ready = true
         this.botCreated()
       })
+      bot.on('end', () => {
+        this.ready = false
+      })
     })
   }
 
+  private onBotCreatedOrGameJoined () {
+    this.reactive.username = bot.username ?? ''
+  }
+
   private botCreated () {
+    console.log('bot created & plugins injected')
+    this.reactive = getInitialPlayerState()
+    this.onBotCreatedOrGameJoined()
+
     const handleDimensionData = (data) => {
       let hasSkyLight = 1
       try {
         hasSkyLight = data.dimension.value.has_skylight.value
       } catch {}
-      this.lightingDisabled = bot.game.dimension === 'the_nether' || bot.game.dimension === 'the_end' || !hasSkyLight
+      this.reactive.lightingDisabled = bot.game.dimension === 'the_nether' || bot.game.dimension === 'the_end' || !hasSkyLight
     }
 
     bot._client.on('login', (packet) => {
@@ -68,7 +59,9 @@ export class PlayerStateManager implements IPlayerState {
     })
 
     // Movement tracking
-    bot.on('move', this.updateState)
+    bot.on('move', () => {
+      this.updateMovementState()
+    })
 
     // Item tracking
     bot.on('heldItemChanged', () => {
@@ -77,8 +70,22 @@ export class PlayerStateManager implements IPlayerState {
     bot.inventory.on('updateSlot', (index) => {
       if (index === 45) this.updateHeldItem(true)
     })
+    const updateSneakingOrFlying = () => {
+      this.updateMovementState()
+      this.reactive.sneaking = bot.controlState.sneak
+      this.reactive.flying = gameAdditionalState.isFlying
+      this.reactive.eyeHeight = bot.controlState.sneak && !gameAdditionalState.isFlying ? 1.27 : 1.62
+    }
     bot.on('physicsTick', () => {
-      if (this.isUsingItem) this.itemUsageTicks++
+      if (this.isUsingItem) this.reactive.itemUsageTicks++
+      updateSneakingOrFlying()
+    })
+    // todo move from gameAdditionalState to reactive directly
+    subscribeKey(gameAdditionalState, 'isSneaking', () => {
+      updateSneakingOrFlying()
+    })
+    subscribeKey(gameAdditionalState, 'isFlying', () => {
+      updateSneakingOrFlying()
     })
 
     // Initial held items setup
@@ -89,14 +96,12 @@ export class PlayerStateManager implements IPlayerState {
       this.reactive.gameMode = bot.game.gameMode
     })
     this.reactive.gameMode = bot.game?.gameMode
-  }
 
-  get shouldHideHand () {
-    return this.reactive.gameMode === 'spectator'
+    this.watchReactive()
   }
 
   // #region Movement and Physics State
-  private updateState () {
+  private updateMovementState () {
     if (!bot?.entity || this.disableStateUpdates) return
 
     const { velocity } = bot.entity
@@ -109,7 +114,7 @@ export class PlayerStateManager implements IPlayerState {
     const deltaTime = now - this.lastUpdateTime
     this.lastUpdateTime = now
 
-    this.lastVelocity = velocity
+    // this.lastVelocity = velocity
 
     // Update time off ground
     if (isOnGround) {
@@ -118,60 +123,26 @@ export class PlayerStateManager implements IPlayerState {
       this.timeOffGround += deltaTime
     }
 
-    if (this.isSneaking() || this.isFlying() || (this.timeOffGround > OFF_GROUND_THRESHOLD)) {
-      this.movementState = 'SNEAKING'
+    if (gameAdditionalState.isSneaking || gameAdditionalState.isFlying || (this.timeOffGround > OFF_GROUND_THRESHOLD)) {
+      this.reactive.movementState = 'SNEAKING'
     } else if (Math.abs(velocity.x) > VELOCITY_THRESHOLD || Math.abs(velocity.z) > VELOCITY_THRESHOLD) {
-      this.movementState = Math.abs(velocity.x) > SPRINTING_VELOCITY || Math.abs(velocity.z) > SPRINTING_VELOCITY
+      this.reactive.movementState = Math.abs(velocity.x) > SPRINTING_VELOCITY || Math.abs(velocity.z) > SPRINTING_VELOCITY
         ? 'SPRINTING'
         : 'WALKING'
     } else {
-      this.movementState = 'NOT_MOVING'
+      this.reactive.movementState = 'NOT_MOVING'
     }
   }
 
-  getMovementState (): MovementState {
-    return this.movementState
-  }
-
-  getVelocity (): Vec3 {
-    return this.lastVelocity
-  }
-
-  getEyeHeight (): number {
-    return bot.controlState.sneak && !this.isFlying() ? 1.27 : 1.62
-  }
-
-  isOnGround (): boolean {
-    return bot?.entity?.onGround ?? true
-  }
-
-  isSneaking (): boolean {
-    return gameAdditionalState.isSneaking
-  }
-
-  isFlying (): boolean {
-    return gameAdditionalState.isFlying
-  }
-
-  isSprinting (): boolean {
-    return gameAdditionalState.isSprinting
-  }
-
-  getPosition (): Vec3 {
-    return bot.entity?.position ?? new Vec3(0, 0, 0)
-  }
-  // #endregion
-
   // #region Held Item State
   private updateHeldItem (isLeftHand: boolean) {
     const newItem = isLeftHand ? bot.inventory.slots[45] : bot.heldItem
     if (!newItem) {
       if (isLeftHand) {
-        this.offHandItem = undefined
+        this.reactive.heldItemOff = undefined
       } else {
-        this.heldItem = undefined
+        this.reactive.heldItemMain = undefined
       }
-      this.events.emit('heldItemChanged', undefined, isLeftHand)
       return
     }
 
@@ -186,42 +157,36 @@ export class PlayerStateManager implements IPlayerState {
     }
 
     if (isLeftHand) {
-      this.offHandItem = item
+      this.reactive.heldItemOff = item
     } else {
-      this.heldItem = item
+      this.reactive.heldItemMain = item
     }
-    this.events.emit('heldItemChanged', item, isLeftHand)
+    // this.events.emit('heldItemChanged', item, isLeftHand)
   }
 
   startUsingItem () {
     if (this.isUsingItem) return
     this.isUsingItem = true
-    this.itemUsageTicks = 0
+    this.reactive.itemUsageTicks = 0
   }
 
   stopUsingItem () {
     this.isUsingItem = false
-    this.itemUsageTicks = 0
+    this.reactive.itemUsageTicks = 0
   }
 
   getItemUsageTicks (): number {
-    return this.itemUsageTicks
+    return this.reactive.itemUsageTicks
   }
 
-  getHeldItem (isLeftHand = false): HandItemBlock | undefined {
-    return isLeftHand ? this.offHandItem : this.heldItem
+  watchReactive () {
+    subscribeKey(this.reactive, 'eyeHeight', () => {
+      appViewer.backend?.updateCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch)
+    })
   }
 
-  getItemSelector (specificProperties: ItemSpecificContextProperties, item?: import('prismarine-item').Item): ItemSelector['properties'] {
-    return {
-      ...specificProperties,
-      'minecraft:date': new Date(),
-      // "minecraft:context_dimension": bot.entityp,
-      'minecraft:time': bot.time.timeOfDay / 24_000,
-    }
-  }
   // #endregion
 }
 
-export const playerState = PlayerStateManager.getInstance()
+export const playerState = new PlayerStateControllerMain()
 window.playerState = playerState
diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index 6e91180d..80f0a789 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -112,7 +112,7 @@ const HotbarInner = () => {
     inv.canvas.style.pointerEvents = 'auto'
     container.current.appendChild(inv.canvas)
     const upHotbarItems = () => {
-      if (!appViewer.resourcesManager.currentResources?.itemsAtlasParser) return
+      if (!appViewer.resourcesManager?.itemsAtlasParser) return
       upInventoryItems(true, inv)
     }
 
diff --git a/src/react/Notification.tsx b/src/react/Notification.tsx
index 7463c9a7..80354e83 100644
--- a/src/react/Notification.tsx
+++ b/src/react/Notification.tsx
@@ -1,14 +1,44 @@
 import { motion, AnimatePresence } from 'framer-motion'
-import PixelartIcon from './PixelartIcon'
+import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+import { useUsingTouch } from './utilsApp'
 
 const duration = 0.2
 
 // save pass: login
 
-export default ({ type = 'message', message, subMessage = '', open, icon = '', action = undefined as (() => void) | undefined }) => {
+const toastHeight = 32
+
+interface NotificationProps {
+  open: boolean
+  message: string
+  type?: 'message' | 'error' | 'progress'
+  subMessage?: string
+  icon?: string
+  action?: () => void
+  topPosition?: number
+
+  currentProgress?: number
+  totalProgress?: number
+}
+
+export default ({
+  type = 'message',
+  message,
+  subMessage = '',
+  open,
+  icon = '',
+  action = undefined as (() => void) | undefined,
+  topPosition = 0,
+  currentProgress,
+  totalProgress,
+}: NotificationProps) => {
+  const isUsingTouch = useUsingTouch()
   const isError = type === 'error'
   icon ||= isError ? 'alert' : 'message'
 
+  const isLoader = type === 'progress'
+
+  const top = (topPosition * toastHeight) + (isUsingTouch ? 18 : 0) // add space for mobile top buttons
   return <AnimatePresence>
     {open && (
       <motion.div
@@ -20,7 +50,7 @@ export default ({ type = 'message', message, subMessage = '', open, icon = '', a
         onClick={action}
         style={{
           position: 'fixed',
-          top: 0,
+          top,
           right: 0,
           width: '180px',
           whiteSpace: 'nowrap',
@@ -28,31 +58,54 @@ export default ({ type = 'message', message, subMessage = '', open, icon = '', a
           display: 'flex',
           gap: 4,
           alignItems: 'center',
-          padding: '3px 5px',
+          padding: '4px 5px',
           background: isError ? 'rgba(255, 0, 0, 0.7)' : 'rgba(0, 0, 0, 0.7)',
-          borderRadius: '0 0 0 5px',
+          borderRadius: top === 0 ? '0 0 0 5px' : '5px',
           pointerEvents: action ? 'auto' : 'none',
-          zIndex: 1200,
+          zIndex: isLoader ? 10 : 1200,
         }}
       >
-        <PixelartIcon iconName={icon} styles={{ fontSize: 12 }} />
+        <PixelartIcon
+          iconName={icon}
+          styles={{
+            fontSize: isLoader ? 15 : 12,
+            animation: isLoader ? 'rotation 6s linear infinite' : 'none',
+          }}
+        />
         <div style={{
           display: 'flex',
           flexDirection: 'column',
-          gap: 2,
+          width: '100%',
         }}>
           <div style={{
             whiteSpace: 'normal',
           }}>
-            {message}
+            {translate(message)}
           </div>
           <div style={{
             fontSize: '7px',
             whiteSpace: 'nowrap',
             color: 'lightgray',
+            marginTop: 3,
           }}>
-            {subMessage}
+            {translate(subMessage)}
           </div>
+          {currentProgress !== undefined && totalProgress !== undefined && (
+            <div style={{
+              width: '100%',
+              height: '2px',
+              background: 'rgba(128, 128, 128, 0.5)',
+              marginTop: '2px',
+              overflow: 'hidden',
+            }}>
+              <div style={{
+                width: `${Math.min(100, (totalProgress ? currentProgress / totalProgress : 0) * 100)}%`,
+                height: '100%',
+                background: 'white',
+                transition: 'width 0.2s ease-out',
+              }} />
+            </div>
+          )}
         </div>
       </motion.div>
     )}
diff --git a/src/react/RendererDebugMenu.tsx b/src/react/RendererDebugMenu.tsx
index 2e6030c1..f4bf7876 100644
--- a/src/react/RendererDebugMenu.tsx
+++ b/src/react/RendererDebugMenu.tsx
@@ -8,7 +8,11 @@ import Slider from './Slider'
 import styles from './rendererDebugMenu.module.css'
 
 export default () => {
-  const worldRenderer = window.world as WorldRendererCommon
+  const worldRenderer = window.world as WorldRendererCommon | undefined
+  return worldRenderer ? <RendererDebugMenu worldRenderer={worldRenderer} /> : null
+}
+
+const RendererDebugMenu = ({ worldRenderer }: { worldRenderer: WorldRendererCommon }) => {
   const { reactiveDebugParams } = worldRenderer
   const { chunksRenderAboveEnabled, chunksRenderBelowEnabled, chunksRenderDistanceEnabled, chunksRenderAboveOverride, chunksRenderBelowOverride, chunksRenderDistanceOverride, stopRendering, disableEntities } = useSnapshot(reactiveDebugParams)
 
diff --git a/src/react/Singleplayer.tsx b/src/react/Singleplayer.tsx
index 872a21ce..26d6427c 100644
--- a/src/react/Singleplayer.tsx
+++ b/src/react/Singleplayer.tsx
@@ -80,7 +80,7 @@ const World = ({ name, isFocused, title, lastPlayed, size, detail = '', onFocus,
     }}
     onDoubleClick={() => onInteraction?.('enter')}
   >
-    <img className={`${styles.world_image} ${iconSrc ? '' : styles.image_missing}`} src={iconSrc ?? missingWorldPreview} alt='world preview' />
+    <img className={`${styles.world_image} ${iconSrc ? '' : styles.image_missing}`} src={iconSrc ?? missingWorldPreview} alt='' />
     <div className={styles.world_info}>
       <div className={styles.world_title}>
         <div>{title}</div>
diff --git a/src/rendererUtils.ts b/src/rendererUtils.ts
index 49a77801..0a49fc78 100644
--- a/src/rendererUtils.ts
+++ b/src/rendererUtils.ts
@@ -13,7 +13,7 @@ const BASE_MOVEMENT_SPEED = 0.1 // Default walking speed in Minecraft
 const FOV_EFFECT_SCALE = 1 // Equivalent to Minecraft's FOV Effects slider
 
 const updateFovAnimation = () => {
-  if (!bot) return
+  if (!playerState.ready) return
 
   // Calculate base FOV modifier
   let fovModifier = 1
@@ -39,10 +39,10 @@ const updateFovAnimation = () => {
   }
 
   // Item usage modifier
-  if (playerState.getHeldItem()) {
-    const heldItem = playerState.getHeldItem()
-    if (heldItem?.name === 'bow' && playerState.getItemUsageTicks() > 0) {
-      const ticksUsingItem = playerState.getItemUsageTicks()
+  if (playerState.reactive.heldItemMain) {
+    const heldItem = playerState.reactive.heldItemMain
+    if (heldItem?.name === 'bow' && playerState.reactive.itemUsageTicks > 0) {
+      const ticksUsingItem = playerState.reactive.itemUsageTicks
       let usageProgress = ticksUsingItem / 20
       if (usageProgress > 1) {
         usageProgress = 1
@@ -88,8 +88,4 @@ export const watchFov = () => {
   customEvents.on('gameLoaded', () => {
     updateFovAnimation()
   })
-
-  subscribeKey(gameAdditionalState, 'isSneaking', () => {
-    appViewer.backend?.updateCamera(bot.entity.position, bot.entity.yaw, bot.entity.pitch)
-  })
 }
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index 7c348cb2..e0f0fca4 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -32,7 +32,7 @@ const getLoadedImage = async (url: string) => {
 const resourcepackPackBasePath = '/data/resourcePacks/'
 export const uninstallResourcePack = async (name = 'default') => {
   if (await existsAsync('/resourcepack/pack.mcmeta')) {
-    await removeFileRecursiveAsync('/resourcepack')
+    await removeFileRecursiveAsync('/resourcepack', false)
     gameAdditionalState.usingServerResourcePack = false
   }
   const basePath = resourcepackPackBasePath + name
@@ -212,7 +212,6 @@ export const getResourcepackTiles = async (type: 'blocks' | 'items' | 'armor', e
   if (!basePath) return
   let firstTextureSize: number | undefined
   const namespaces = await fs.promises.readdir(join(basePath, 'assets'))
-  progressReporter.beginStage(`generate-atlas-texture-${type}`, `Generating atlas texture for ${type}`)
 
   const textures = {} as Record<string, HTMLImageElement>
   let path
@@ -420,6 +419,7 @@ const prepareBlockstatesAndModels = async (progressReporter: ProgressReporter) =
     }
   } catch (err) {
     console.error('Failed to read some of resource pack blockstates and models', err)
+    currentErrors.push('Failed to read blockstates/models')
     resources.customBlockStates = undefined
     resources.customModels = undefined
     resources.customItemModelNames = {}
@@ -439,8 +439,10 @@ const downloadAndUseResourcePack = async (url: string, progressReporter: Progres
     console.log('Downloading server resource pack', url)
     console.time('downloadServerResourcePack')
     const response = await fetch(url).catch((err) => {
-      console.log(`Ensure server on ${url} support CORS which is not required for regular client, but is required for the web client`)
       console.error(err)
+      if (err.message === 'Failed to fetch') {
+        err.message = `Check internet connection and ensure server on ${url} support CORS which is not required for the vanilla client, but is required for the web client.`
+      }
       progressReporter.error('Failed to download resource pack: ' + err.message)
     })
     console.timeEnd('downloadServerResourcePack')
@@ -475,6 +477,7 @@ const downloadAndUseResourcePack = async (url: string, progressReporter: Progres
       showNotification('Failed to install resource pack: ' + err.message)
     })
   } catch (err) {
+    console.error('Could not install resource pack', err)
     progressReporter.error('Could not install resource pack: ' + err.message)
   } finally {
     progressReporter.endStage('download-resource-pack')
@@ -513,21 +516,19 @@ export const onAppLoad = () => {
             cancel: !forced,
             minecraftJsonMessage: promptMessagePacket,
           })
-      if (Date.now() - start < 700) { // wait for state protocol switch
-        await new Promise(resolve => {
+      if (Date.now() - start < 700) {
+        void new Promise(resolve => {
+          // wait for state protocol switch
           setTimeout(resolve, 700)
+        }).then(() => {
+          if (choice === false || choice === 'Pretend Installed (not recommended)' || choice === 'Download & Install (recommended)' || choice) {
+            console.log('accepting resource pack')
+            bot.acceptResourcePack()
+          } else {
+            bot.denyResourcePack()
+          }
         })
       }
-      if (choice === false) {
-        bot.acceptResourcePack()
-        return
-      }
-      if (!choice) {
-        bot.denyResourcePack()
-        return
-      }
-      console.log('accepting resource pack')
-      bot.acceptResourcePack()
       if (choice === true || choice === 'Download & Install (recommended)') {
         await downloadAndUseResourcePack(packet.url, createFullScreenProgressReporter()).catch((err) => {
           console.error(err)
@@ -590,10 +591,17 @@ const updateTextures = async (progressReporter = createConsoleLogProgressReporte
   const origItemsFiles = Object.keys(appViewer.resourcesManager.sourceItemsAtlases.latest.textures)
   const origArmorFiles = Object.keys(armorTextures)
   const { usedBlockTextures, usedItemTextures } = await prepareBlockstatesAndModels(progressReporter) ?? {}
-  const blocksData = await getResourcepackTiles('blocks', [...origBlocksFiles, ...usedBlockTextures ?? []], progressReporter)
-  const itemsData = await getResourcepackTiles('items', [...origItemsFiles, ...usedItemTextures ?? []], progressReporter)
-  const armorData = await getResourcepackTiles('armor', origArmorFiles, progressReporter)
-  await updateAllReplacableTextures()
+  progressReporter.beginStage(`generate-atlas-texture-blocks`, `Generating atlas textures`)
+  const [
+    blocksData,
+    itemsData,
+    armorData
+  ] = await Promise.all([
+    getResourcepackTiles('blocks', [...origBlocksFiles, ...usedBlockTextures ?? []], progressReporter),
+    getResourcepackTiles('items', [...origItemsFiles, ...usedItemTextures ?? []], progressReporter),
+    getResourcepackTiles('armor', origArmorFiles, progressReporter),
+    updateAllReplacableTextures()
+  ])
   resources.customTextures = {}
 
   if (blocksData) {
diff --git a/src/resourcesManager.ts b/src/resourcesManager.ts
index 4ee91ab4..ef3dd7ce 100644
--- a/src/resourcesManager.ts
+++ b/src/resourcesManager.ts
@@ -8,26 +8,25 @@ import blocksAtlasLegacy from 'mc-assets/dist/blocksAtlasLegacy.png'
 import itemsAtlasLatest from 'mc-assets/dist/itemsAtlasLatest.png'
 import itemsAtlasLegacy from 'mc-assets/dist/itemsAtlasLegacy.png'
 import christmasPack from 'mc-assets/dist/textureReplacements/christmas'
-import { AtlasParser } from 'mc-assets/dist/atlasParser'
+import { AtlasParser, ItemsAtlasesOutputJson } from 'mc-assets/dist/atlasParser'
 import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import { ItemsRenderer } from 'mc-assets/dist/itemsRenderer'
 import { getLoadedItemDefinitionsStore } from 'mc-assets'
-import { getLoadedImage } from 'mc-assets/dist/utils'
 import { generateGuiAtlas } from 'renderer/viewer/lib/guiRenderer'
 import { importLargeData } from '../generated/large-data-aliases'
-import { loadMinecraftData } from './connect'
 
 type ResourceManagerEvents = {
   assetsTexturesUpdated: () => void
+  assetsInventoryStarted: () => void
   assetsInventoryReady: () => void
 }
 
-export class LoadedResources {
+export class LoadedResourcesTransferrable {
+  allReady = false
   // Atlas parsers
-  itemsAtlasParser: AtlasParser
-  blocksAtlasParser: AtlasParser
-  itemsAtlasImage: HTMLImageElement
-  blocksAtlasImage: HTMLImageElement
+  itemsAtlasImage: ImageBitmap
+  blocksAtlasImage: ImageBitmap
+  blocksAtlasJson: ItemsAtlasesOutputJson
   // User data (specific to current resourcepack/version)
   customBlockStates?: Record<string, any>
   customModels?: Record<string, any>
@@ -38,9 +37,11 @@ export class LoadedResources {
     blocks?: { tileSize: number | undefined, textures: Record<string, HTMLImageElement> }
     armor?: { tileSize: number | undefined, textures: Record<string, HTMLImageElement> }
   } = {}
+  guiAtlas: { json: any, image: ImageBitmap } | null = null
+  guiAtlasVersion = 0
 
   itemsRenderer: ItemsRenderer
-  worldBlockProvider: WorldBlockProvider
+  worldBlockProvider?: WorldBlockProvider
   blockstatesModels: any = null
 
   version: string
@@ -59,8 +60,17 @@ export interface UpdateAssetsRequest {
   _?: false
 }
 
+export interface ResourcesManagerTransferred extends TypedEmitter<ResourceManagerEvents> {
+  currentResources: LoadedResourcesTransferrable
+}
+export interface ResourcesManagerCommon extends TypedEmitter<ResourceManagerEvents> {
+  currentResources: LoadedResourcesTransferrable | undefined
+}
+
 const STABLE_MODELS_VERSION = '1.21.4'
 export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<ResourceManagerEvents>) {
+  static restorerName = 'ResourcesManager'
+
   // Source data (imported, not changing)
   sourceBlockStatesModels: any = null
   readonly sourceBlocksAtlases: any = blocksAtlases
@@ -68,7 +78,9 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
   readonly sourceItemDefinitionsJson: any = itemDefinitionsJson
   readonly itemsDefinitionsStore = getLoadedItemDefinitionsStore(this.sourceItemDefinitionsJson)
 
-  currentResources: LoadedResources | undefined
+  currentResources: LoadedResourcesTransferrable | undefined
+  itemsAtlasParser: AtlasParser
+  blocksAtlasParser: AtlasParser
   currentConfig: ResourcesCurrentConfig | undefined
   abortController = new AbortController()
   _promiseAssetsReadyResolvers = Promise.withResolvers<void>()
@@ -76,17 +88,12 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
     return this._promiseAssetsReadyResolvers.promise
   }
 
-  async loadMcData (version: string) {
-    await loadMinecraftData(version)
-  }
-
   async loadSourceData (version: string) {
-    await this.loadMcData(version)
     this.sourceBlockStatesModels ??= await importLargeData('blockStatesModels')
   }
 
   resetResources () {
-    this.currentResources = new LoadedResources()
+    this.currentResources = new LoadedResourcesTransferrable()
   }
 
   async updateAssetsData (request: UpdateAssetsRequest, unstableSkipEvent = false) {
@@ -96,7 +103,7 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
     await this.loadSourceData(this.currentConfig.version)
     if (abortController.signal.aborted) return
 
-    const resources = this.currentResources ?? new LoadedResources()
+    const resources = this.currentResources ?? new LoadedResourcesTransferrable()
     resources.version = this.currentConfig.version
     resources.texturesVersion = this.currentConfig.texturesVersion ?? resources.version
 
@@ -115,41 +122,28 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
       ...resources.customModels
     }
 
-    await this.recreateBlockAtlas(resources)
+    console.time('recreateAtlases')
+    await Promise.all([
+      this.recreateBlockAtlas(resources),
+      this.recreateItemsAtlas(resources)
+    ])
+    console.timeEnd('recreateAtlases')
 
     if (abortController.signal.aborted) return
 
-    const itemsAssetsParser = new AtlasParser(this.sourceItemsAtlases, itemsAtlasLatest, itemsAtlasLegacy)
-    const customItemTextures = Object.keys(resources.customTextures.items?.textures ?? {})
-    console.time('createItemsAtlas')
-    const { atlas: itemsAtlas, canvas: itemsCanvas } = await itemsAssetsParser.makeNewAtlas(
-      resources.texturesVersion,
-      (textureName) => {
-        const texture = resources.customTextures.items?.textures[textureName]
-        if (!texture) return
-        return texture
-      },
-      resources.customTextures.items?.tileSize,
-      undefined,
-      customItemTextures
-    )
-    console.timeEnd('createItemsAtlas')
-
-    resources.itemsAtlasParser = new AtlasParser({ latest: itemsAtlas }, itemsCanvas.toDataURL())
-    resources.itemsAtlasImage = await getLoadedImage(itemsCanvas.toDataURL())
-
-    if (resources.version && resources.blockstatesModels && resources.itemsAtlasParser && resources.blocksAtlasParser) {
+    if (resources.version && resources.blockstatesModels && this.itemsAtlasParser && this.blocksAtlasParser) {
       resources.itemsRenderer = new ItemsRenderer(
         resources.version,
         resources.blockstatesModels,
-        resources.itemsAtlasParser,
-        resources.blocksAtlasParser
+        this.itemsAtlasParser,
+        this.blocksAtlasParser
       )
     }
 
     if (abortController.signal.aborted) return
 
     this.currentResources = resources
+    resources.allReady = true
     if (!unstableSkipEvent) { // todo rework resourcepack optimization
       this.emit('assetsTexturesUpdated')
     }
@@ -157,6 +151,7 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
     if (this.currentConfig.noInventoryGui) {
       this._promiseAssetsReadyResolvers.resolve()
     } else {
+      this.emit('assetsInventoryStarted')
       void this.generateGuiTextures().then(() => {
         if (abortController.signal.aborted) return
         if (!unstableSkipEvent) {
@@ -167,7 +162,7 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
     }
   }
 
-  async recreateBlockAtlas (resources: LoadedResources = this.currentResources!) {
+  async recreateBlockAtlas (resources: LoadedResourcesTransferrable = this.currentResources!) {
     const blockTexturesChanges = {} as Record<string, string>
     const date = new Date()
     if ((date.getMonth() === 11 && date.getDate() >= 24) || (date.getMonth() === 0 && date.getDate() <= 6)) {
@@ -194,16 +189,36 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
     )
     console.timeEnd('createBlocksAtlas')
 
-    resources.blocksAtlasParser = new AtlasParser({ latest: blocksAtlas }, blocksCanvas.toDataURL())
-    resources.blocksAtlasImage = await getLoadedImage(blocksCanvas.toDataURL())
+    this.blocksAtlasParser = new AtlasParser({ latest: blocksAtlas }, blocksCanvas.toDataURL())
+    resources.blocksAtlasImage = await createImageBitmap(blocksCanvas)
+    resources.blocksAtlasJson = this.blocksAtlasParser.atlas.latest
 
     resources.worldBlockProvider = worldBlockProvider(
       resources.blockstatesModels,
-      resources.blocksAtlasParser.atlas,
+      this.blocksAtlasParser.atlas,
       STABLE_MODELS_VERSION
     )
   }
 
+  async recreateItemsAtlas (resources: LoadedResourcesTransferrable = this.currentResources!) {
+    const itemsAssetsParser = new AtlasParser(this.sourceItemsAtlases, itemsAtlasLatest, itemsAtlasLegacy)
+    const customItemTextures = Object.keys(resources.customTextures.items?.textures ?? {})
+    const { atlas: itemsAtlas, canvas: itemsCanvas } = await itemsAssetsParser.makeNewAtlas(
+      resources.texturesVersion,
+      (textureName) => {
+        const texture = resources.customTextures.items?.textures[textureName]
+        if (!texture) return
+        return texture
+      },
+      resources.customTextures.items?.tileSize,
+      undefined,
+      customItemTextures
+    )
+
+    this.itemsAtlasParser = new AtlasParser({ latest: itemsAtlas }, itemsCanvas.toDataURL())
+    resources.itemsAtlasImage = await createImageBitmap(itemsCanvas)
+  }
+
   async generateGuiTextures () {
     await generateGuiAtlas()
   }
@@ -211,7 +226,7 @@ export class ResourcesManager extends (EventEmitter as new () => TypedEmitter<Re
   async downloadDebugAtlas (isItems = false) {
     const resources = this.currentResources
     if (!resources) throw new Error('No resources loaded')
-    const atlasParser = (isItems ? resources.itemsAtlasParser : resources.blocksAtlasParser)!
+    const atlasParser = (isItems ? this.itemsAtlasParser : this.blocksAtlasParser)!
     const dataUrl = await atlasParser.createDebugImage(true)
     const a = document.createElement('a')
     a.href = dataUrl

From 1b20845ed5a42bc8ebe98a096348e100ad4aa2ec Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 18 Jun 2025 08:37:13 +0300
Subject: [PATCH 604/753] fix initial component mount sometimes displays not
 found modal the reason why it happens is known

---
 src/react/NoModalFoundProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/NoModalFoundProvider.tsx b/src/react/NoModalFoundProvider.tsx
index 4ca57830..f21045ba 100644
--- a/src/react/NoModalFoundProvider.tsx
+++ b/src/react/NoModalFoundProvider.tsx
@@ -32,7 +32,7 @@ export default () => {
   const { enabled } = useSnapshot(componentActive)
   const lastModal = useSnapshot(activeModalStack).at(-1)?.reactType
 
-  if (!enabled) return null
+  if (!enabled || watchedModalsFromHooks.value.includes(lastModal!)) return null
   return <Screen
     title={`Error: Modal (route) ${lastModal} is is unavailable or doesn't exist`}
     style={{

From f126f56844421ea5d1b704fce2f987709793e8fa Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 18 Jun 2025 16:57:03 +0300
Subject: [PATCH 605/753] fix: fix visual gaps between blocks of water!

---
 renderer/viewer/lib/mesher/models.ts    | 19 ++++++-------
 renderer/viewer/lib/worldDataEmitter.ts |  4 ++-
 src/appViewer.ts                        | 36 ++++++++++++++++---------
 src/reactUi.tsx                         | 12 ++++++---
 4 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index 3658d120..c2075764 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -132,7 +132,7 @@ const getVec = (v: Vec3, dir: Vec3) => {
   return v.plus(dir)
 }
 
-function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, type: number, biome: string, water: boolean, attr: Record<string, any>, isRealWater: boolean) {
+function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, type: number, biome: string, water: boolean, attr: MesherGeometryOutput, isRealWater: boolean) {
   const heights: number[] = []
   for (let z = -1; z <= 1; z++) {
     for (let x = -1; x <= 1; x++) {
@@ -192,13 +192,14 @@ function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, typ
 
     for (const pos of corners) {
       const height = cornerHeights[pos[2] * 2 + pos[0]]
-      attr.t_positions.push(
-        (pos[0] ? 0.999 : 0.001) + (cursor.x & 15) - 8,
-        (pos[1] ? height - 0.001 : 0.001) + (cursor.y & 15) - 8,
-        (pos[2] ? 0.999 : 0.001) + (cursor.z & 15) - 8
+      const OFFSET = 0.0001
+      attr.t_positions!.push(
+        (pos[0] ? 1 - OFFSET : OFFSET) + (cursor.x & 15) - 8,
+        (pos[1] ? height - OFFSET : OFFSET) + (cursor.y & 15) - 8,
+        (pos[2] ? 1 - OFFSET : OFFSET) + (cursor.z & 15) - 8
       )
-      attr.t_normals.push(...dir)
-      attr.t_uvs.push(pos[3] * su + u, pos[4] * sv * (pos[1] ? 1 : height) + v)
+      attr.t_normals!.push(...dir)
+      attr.t_uvs!.push(pos[3] * su + u, pos[4] * sv * (pos[1] ? 1 : height) + v)
 
       let cornerLightResult = baseLight
       if (world.config.smoothLighting) {
@@ -223,7 +224,7 @@ function renderLiquid (world: World, cursor: Vec3, texture: any | undefined, typ
       }
 
       // Apply light value to tint
-      attr.t_colors.push(tint[0] * cornerLightResult, tint[1] * cornerLightResult, tint[2] * cornerLightResult)
+      attr.t_colors!.push(tint[0] * cornerLightResult, tint[1] * cornerLightResult, tint[2] * cornerLightResult)
     }
   }
 }
@@ -487,7 +488,7 @@ const isBlockWaterlogged = (block: Block) => {
 }
 
 let unknownBlockModel: BlockModelPartsResolved
-export function getSectionGeometry (sx, sy, sz, world: World) {
+export function getSectionGeometry (sx: number, sy: number, sz: number, world: World) {
   let delayedRender = [] as Array<() => void>
 
   const attr: MesherGeometryOutput = {
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 86f372d1..435d9183 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -197,7 +197,9 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
   async init (pos: Vec3) {
     this.updateViewDistance(this.viewDistance)
     this.emitter.emit('chunkPosUpdate', { pos })
-    this.emitter.emit('time', bot.time.timeOfDay)
+    if (bot?.time?.timeOfDay) {
+      this.emitter.emit('time', bot.time.timeOfDay)
+    }
     this.emitterGotConnected()
     const [botX, botZ] = chunkPos(pos)
 
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 5ac0beaf..d8149912 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -1,5 +1,5 @@
 import { WorldDataEmitter, WorldDataEmitterWorker } from 'renderer/viewer/lib/worldDataEmitter'
-import { PlayerStateRenderer } from 'renderer/viewer/lib/basePlayerState'
+import { getInitialPlayerState, PlayerStateRenderer } from 'renderer/viewer/lib/basePlayerState'
 import { subscribeKey } from 'valtio/utils'
 import { defaultWorldRendererConfig, WorldRendererConfig } from 'renderer/viewer/lib/worldrendererCommon'
 import { Vec3 } from 'vec3'
@@ -281,19 +281,31 @@ const initialMenuStart = async () => {
   if (appViewer.currentDisplay === 'world') {
     appViewer.resetBackend(true)
   }
-  appViewer.startPanorama()
+  const demo = new URLSearchParams(window.location.search).get('demo')
+  if (!demo) {
+    appViewer.startPanorama()
+    return
+  }
 
   // const version = '1.18.2'
-  // const version = '1.21.4'
-  // await appViewer.resourcesManager.loadMcData(version)
-  // const world = getSyncWorld(version)
-  // world.setBlockStateId(new Vec3(0, 64, 0), loadedData.blocksByName.water.defaultState)
-  // appViewer.resourcesManager.currentConfig = { version }
-  // await appViewer.resourcesManager.updateAssetsData({})
-  // appViewer.playerState = new BasePlayerState() as any
-  // await appViewer.startWorld(world, 3)
-  // appViewer.backend?.updateCamera(new Vec3(0, 64, 2), 0, 0)
-  // void appViewer.worldView!.init(new Vec3(0, 64, 0))
+  const version = '1.21.4'
+  const { loadMinecraftData } = await import('./connect')
+  const { getSyncWorld } = await import('../renderer/playground/shared')
+  await loadMinecraftData(version)
+  const world = getSyncWorld(version)
+  world.setBlockStateId(new Vec3(0, 64, 0), loadedData.blocksByName.water.defaultState)
+  world.setBlockStateId(new Vec3(1, 64, 0), loadedData.blocksByName.water.defaultState)
+  world.setBlockStateId(new Vec3(1, 64, 1), loadedData.blocksByName.water.defaultState)
+  world.setBlockStateId(new Vec3(0, 64, 1), loadedData.blocksByName.water.defaultState)
+  world.setBlockStateId(new Vec3(-1, 64, -1), loadedData.blocksByName.water.defaultState)
+  world.setBlockStateId(new Vec3(-1, 64, 0), loadedData.blocksByName.water.defaultState)
+  world.setBlockStateId(new Vec3(0, 64, -1), loadedData.blocksByName.water.defaultState)
+  appViewer.resourcesManager.currentConfig = { version }
+  appViewer.playerState.reactive = getInitialPlayerState()
+  await appViewer.resourcesManager.updateAssetsData({})
+  await appViewer.startWorld(world, 3)
+  appViewer.backend!.updateCamera(new Vec3(0, 65.7, 0), 0, -Math.PI / 2) // Y+1 and pitch = PI/2 to look down
+  void appViewer.worldView!.init(new Vec3(0, 64, 0))
 }
 window.initialMenuStart = initialMenuStart
 
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 138696b0..8e94b35d 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -276,13 +276,17 @@ const PerComponentErrorBoundary = ({ children }) => {
   </ErrorBoundary>)
 }
 
-renderToDom(<App />, {
-  strictMode: false,
-  selector: '#react-root',
-})
+if (!new URLSearchParams(window.location.search).get('no-ui')) {
+  renderToDom(<App />, {
+    strictMode: false,
+    selector: '#react-root',
+  })
+}
 
 disableReactProfiling()
 function disableReactProfiling () {
+  if (window.reactPerfPatchApplied) return
+  window.reactPerfPatchApplied = true
   //@ts-expect-error
   window.performance.markOrig = window.performance.mark
   //@ts-expect-error

From 5269ad21b5797133fcdd31a14674ad3449afba63 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 18 Jun 2025 14:07:00 +0000
Subject: [PATCH 606/753] feat: Add spectator mode entity spectating (#369)

---
 renderer/viewer/lib/basePlayerState.ts      | 16 +++++--
 renderer/viewer/lib/worldrendererCommon.ts  | 14 +++---
 renderer/viewer/three/cameraShake.ts        |  9 ++++
 renderer/viewer/three/entities.ts           |  4 +-
 renderer/viewer/three/holdingBlock.ts       | 16 +++----
 renderer/viewer/three/panorama.ts           |  2 +-
 renderer/viewer/three/world/cursorBlock.ts  |  6 +--
 renderer/viewer/three/worldrendererThree.ts | 33 ++++++++++---
 src/appViewer.ts                            |  8 ++--
 src/cameraRotationControls.ts               |  2 +-
 src/controls.ts                             | 32 +++++++++++--
 src/entities.ts                             | 51 ++++++++++++++++++---
 src/inventoryWindows.ts                     |  2 +-
 src/mineflayer/playerState.ts               |  8 ++--
 14 files changed, 150 insertions(+), 53 deletions(-)

diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index fe6e39c4..26598cad 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -47,6 +47,17 @@ export const getInitialPlayerState = () => proxy({
   shouldHideHand: false,
   heldItemMain: undefined as HandItemBlock | undefined,
   heldItemOff: undefined as HandItemBlock | undefined,
+
+  cameraSpectatingEntity: undefined as number | undefined,
+})
+
+export const getPlayerStateUtils = (reactive: PlayerStateReactive) => ({
+  isSpectator () {
+    return reactive.gameMode === 'spectator'
+  },
+  isSpectatingEntity () {
+    return reactive.cameraSpectatingEntity !== undefined && reactive.gameMode === 'spectator'
+  }
 })
 
 export const getInitialPlayerStateRenderer = () => ({
@@ -54,10 +65,9 @@ export const getInitialPlayerStateRenderer = () => ({
 })
 
 export type PlayerStateReactive = ReturnType<typeof getInitialPlayerState>
+export type PlayerStateUtils = ReturnType<typeof getPlayerStateUtils>
 
-export interface PlayerStateRenderer {
-  reactive: PlayerStateReactive
-}
+export type PlayerStateRenderer = PlayerStateReactive
 
 export const getItemSelector = (playerState: PlayerStateRenderer, specificProperties: ItemSpecificContextProperties, item?: import('prismarine-item').Item) => {
   return {
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 1f0df0bd..78b69925 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -16,7 +16,7 @@ import { HighestBlockInfo, CustomBlockModels, BlockStateModelInfo, getBlockAsset
 import { chunkPos } from './simpleUtils'
 import { addNewStat, removeAllStats, updatePanesVisibility, updateStatText } from './ui/newStats'
 import { WorldDataEmitterWorker } from './worldDataEmitter'
-import { PlayerStateRenderer } from './basePlayerState'
+import { getPlayerStateUtils, PlayerStateReactive, PlayerStateRenderer, PlayerStateUtils } from './basePlayerState'
 import { MesherLogReader } from './mesherlogReader'
 import { setSkinsConfig } from './utils/skins'
 
@@ -156,7 +156,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   abstract changeBackgroundColor (color: [number, number, number]): void
 
   worldRendererConfig: WorldRendererConfig
-  playerState: PlayerStateRenderer
+  playerStateReactive: PlayerStateReactive
+  playerStateUtils: PlayerStateUtils
   reactiveState: RendererReactiveState
   mesherLogReader: MesherLogReader | undefined
   forceCallFromMesherReplayer = false
@@ -191,7 +192,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   constructor (public readonly resourcesManager: ResourcesManagerTransferred, public displayOptions: DisplayWorldOptions, public initOptions: GraphicsInitOptions) {
     this.snapshotInitialValues()
     this.worldRendererConfig = displayOptions.inWorldRenderingConfig
-    this.playerState = displayOptions.playerState
+    this.playerStateReactive = displayOptions.playerStateReactive
+    this.playerStateUtils = getPlayerStateUtils(this.playerStateReactive)
     this.reactiveState = displayOptions.rendererState
     // this.mesherLogReader = new MesherLogReader(this)
     this.renderUpdateEmitter.on('update', () => {
@@ -304,11 +306,11 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     }
   }
 
-  onReactivePlayerStateUpdated<T extends keyof typeof this.displayOptions.playerState.reactive>(key: T, callback: (value: typeof this.displayOptions.playerState.reactive[T]) => void, initial = true) {
+  onReactivePlayerStateUpdated<T extends keyof PlayerStateReactive>(key: T, callback: (value: PlayerStateReactive[T]) => void, initial = true) {
     if (initial) {
-      callback(this.displayOptions.playerState.reactive[key])
+      callback(this.playerStateReactive[key])
     }
-    subscribeKey(this.displayOptions.playerState.reactive, key, callback)
+    subscribeKey(this.playerStateReactive, key, callback)
   }
 
   onReactiveConfigUpdated<T extends keyof typeof this.worldRendererConfig>(key: T, callback: (value: typeof this.worldRendererConfig[T]) => void) {
diff --git a/renderer/viewer/three/cameraShake.ts b/renderer/viewer/three/cameraShake.ts
index 6fe483cc..20f7143a 100644
--- a/renderer/viewer/three/cameraShake.ts
+++ b/renderer/viewer/three/cameraShake.ts
@@ -21,6 +21,10 @@ export class CameraShake {
     this.update()
   }
 
+  getBaseRotation () {
+    return { pitch: this.basePitch, yaw: this.baseYaw }
+  }
+
   shakeFromDamage (yaw?: number) {
     // Add roll animation
     const startRoll = this.rollAngle
@@ -35,6 +39,11 @@ export class CameraShake {
   }
 
   update () {
+    if (this.worldRenderer.playerStateUtils.isSpectatingEntity()) {
+      // Remove any shaking when spectating
+      this.rollAngle = 0
+      this.rollAnimation = undefined
+    }
     // Update roll animation
     if (this.rollAnimation) {
       const now = performance.now()
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 0e8e6384..6ddacc0b 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -870,9 +870,7 @@ export class Entities {
 
     const meta = getGeneralEntitiesMetadata(entity)
 
-    //@ts-expect-error
-    // set visibility
-    const isInvisible = entity.metadata?.[0] & 0x20
+    const isInvisible = ((entity.metadata?.[0] ?? 0) as unknown as number) & 0x20 || (this.worldRenderer.playerStateReactive.cameraSpectatingEntity === entity.id && this.worldRenderer.playerStateUtils.isSpectator())
     for (const child of mesh!.children ?? []) {
       if (child.name !== 'nametag') {
         child.visible = !isInvisible
diff --git a/renderer/viewer/three/holdingBlock.ts b/renderer/viewer/three/holdingBlock.ts
index 422076f0..af355f2e 100644
--- a/renderer/viewer/three/holdingBlock.ts
+++ b/renderer/viewer/three/holdingBlock.ts
@@ -116,12 +116,10 @@ export default class HoldingBlock {
   offHandModeLegacy = false
 
   swingAnimator: HandSwingAnimator | undefined
-  playerState: PlayerStateRenderer
   config: WorldRendererConfig
 
   constructor (public worldRenderer: WorldRendererThree, public offHand = false) {
     this.initCameraGroup()
-    this.playerState = worldRenderer.displayOptions.playerState
     this.worldRenderer.onReactivePlayerStateUpdated('heldItemMain', () => {
       if (!this.offHand) {
         this.updateItem()
@@ -146,9 +144,9 @@ export default class HoldingBlock {
         // now watch over the player skin
         watchProperty(
           async () => {
-            return getMyHand(this.playerState.reactive.playerSkin, this.playerState.reactive.onlineMode ? this.playerState.reactive.username : undefined)
+            return getMyHand(this.worldRenderer.playerStateReactive.playerSkin, this.worldRenderer.playerStateReactive.onlineMode ? this.worldRenderer.playerStateReactive.username : undefined)
           },
-          this.playerState.reactive,
+          this.worldRenderer.playerStateReactive,
           'playerSkin',
           (newHand) => {
             if (newHand) {
@@ -167,7 +165,7 @@ export default class HoldingBlock {
 
   updateItem () {
     if (!this.ready) return
-    const item = this.offHand ? this.playerState.reactive.heldItemOff : this.playerState.reactive.heldItemMain
+    const item = this.offHand ? this.worldRenderer.playerStateReactive.heldItemOff : this.worldRenderer.playerStateReactive.heldItemMain
     if (item) {
       void this.setNewItem(item)
     } else if (this.offHand) {
@@ -357,8 +355,8 @@ export default class HoldingBlock {
         itemId: handItem.id,
       }, {
         'minecraft:display_context': 'firstperson',
-        'minecraft:use_duration': this.playerState.reactive.itemUsageTicks,
-        'minecraft:using_item': !!this.playerState.reactive.itemUsageTicks,
+        'minecraft:use_duration': this.worldRenderer.playerStateReactive.itemUsageTicks,
+        'minecraft:using_item': !!this.worldRenderer.playerStateReactive.itemUsageTicks,
       }, this.lastItemModelName)
       if (result) {
         const { mesh: itemMesh, isBlock, modelName } = result
@@ -475,7 +473,7 @@ export default class HoldingBlock {
     this.swingAnimator = new HandSwingAnimator(this.holdingBlockInnerGroup)
     this.swingAnimator.type = result.type
     if (this.config.viewBobbing) {
-      this.idleAnimator = new HandIdleAnimator(this.holdingBlockInnerGroup, this.playerState)
+      this.idleAnimator = new HandIdleAnimator(this.holdingBlockInnerGroup, this.worldRenderer.playerStateReactive)
     }
   }
 
@@ -710,7 +708,7 @@ class HandIdleAnimator {
 
     // Check for state changes from player state
     if (this.playerState) {
-      const newState = this.playerState.reactive.movementState
+      const newState = this.playerState.movementState
       if (newState !== this.targetState) {
         this.setState(newState)
       }
diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
index 58a0fffa..7e975d4b 100644
--- a/renderer/viewer/three/panorama.ts
+++ b/renderer/viewer/three/panorama.ts
@@ -197,7 +197,7 @@ export class PanoramaRenderer {
         version,
         worldView,
         inWorldRenderingConfig: defaultWorldRendererConfig,
-        playerState: getInitialPlayerStateRenderer(),
+        playerStateReactive: getInitialPlayerStateRenderer().reactive,
         rendererState: getDefaultRendererState().reactive,
         nonReactiveState: getDefaultRendererState().nonReactive
       }
diff --git a/renderer/viewer/three/world/cursorBlock.ts b/renderer/viewer/three/world/cursorBlock.ts
index 495a2d55..b3be2ca2 100644
--- a/renderer/viewer/three/world/cursorBlock.ts
+++ b/renderer/viewer/three/world/cursorBlock.ts
@@ -61,16 +61,14 @@ export class CursorBlock {
     this.blockBreakMesh.name = 'blockBreakMesh'
     this.worldRenderer.scene.add(this.blockBreakMesh)
 
-    subscribeKey(this.worldRenderer.playerState.reactive, 'gameMode', () => {
+    this.worldRenderer.onReactivePlayerStateUpdated('gameMode', () => {
       this.updateLineMaterial()
     })
-
-    this.updateLineMaterial()
   }
 
   // Update functions
   updateLineMaterial () {
-    const inCreative = this.worldRenderer.displayOptions.playerState.reactive.gameMode === 'creative'
+    const inCreative = this.worldRenderer.playerStateReactive.gameMode === 'creative'
     const pixelRatio = this.worldRenderer.renderer.getPixelRatio()
 
     this.cursorLineMaterial = new LineMaterial({
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 78381a29..77100c5c 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -69,6 +69,9 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
   fountains: Fountain[] = []
 
+  private currentPosTween?: tweenJs.Tween<THREE.Vector3>
+  private currentRotTween?: tweenJs.Tween<{ pitch: number, yaw: number }>
+
   get tilesRendered () {
     return Object.values(this.sectionObjects).reduce((acc, obj) => acc + (obj as any).tilesCount, 0)
   }
@@ -150,7 +153,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   override watchReactivePlayerState () {
     super.watchReactivePlayerState()
     this.onReactivePlayerStateUpdated('inWater', (value) => {
-      this.scene.fog = value ? new THREE.Fog(0x00_00_ff, 0.1, this.displayOptions.playerState.reactive.waterBreathing ? 100 : 20) : null
+      this.scene.fog = value ? new THREE.Fog(0x00_00_ff, 0.1, this.playerStateReactive.waterBreathing ? 100 : 20) : null
     })
     this.onReactivePlayerStateUpdated('ambientLight', (value) => {
       if (!value) return
@@ -238,7 +241,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   getItemRenderData (item: Record<string, any>, specificProps: ItemSpecificContextProperties) {
-    return getItemUv(item, specificProps, this.resourcesManager, this.playerState)
+    return getItemUv(item, specificProps, this.resourcesManager, this.playerStateReactive)
   }
 
   async demoModel () {
@@ -430,7 +433,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number) {
-    const yOffset = this.displayOptions.playerState.reactive.eyeHeight
+    const yOffset = this.playerStateReactive.eyeHeight
 
     this.updateCamera(pos?.offset(0, yOffset, 0) ?? null, yaw, pitch)
     this.media.tryIntersectMedia()
@@ -448,10 +451,28 @@ export class WorldRendererThree extends WorldRendererCommon {
         pos.y -= this.camera.position.y // Fix Y position of camera in world
       }
 
-      new tweenJs.Tween(this.cameraObject.position).to({ x: pos.x, y: pos.y, z: pos.z }, 50).start()
+      this.currentPosTween?.stop()
+      this.currentPosTween = new tweenJs.Tween(this.cameraObject.position).to({ x: pos.x, y: pos.y, z: pos.z }, this.playerStateUtils.isSpectatingEntity() ? 150 : 50).start()
       // this.freeFlyState.position = pos
     }
-    this.cameraShake.setBaseRotation(pitch, yaw)
+
+    if (this.playerStateUtils.isSpectatingEntity()) {
+      const rotation = this.cameraShake.getBaseRotation()
+      // wrap in the correct direction
+      let yawOffset = 0
+      const halfPi = Math.PI / 2
+      if (rotation.yaw < halfPi && yaw > Math.PI + halfPi) {
+        yawOffset = -Math.PI * 2
+      } else if (yaw < halfPi && rotation.yaw > Math.PI + halfPi) {
+        yawOffset = Math.PI * 2
+      }
+      this.currentRotTween?.stop()
+      this.currentRotTween = new tweenJs.Tween(rotation).to({ pitch, yaw: yaw + yawOffset }, 100)
+        .onUpdate(params => this.cameraShake.setBaseRotation(params.pitch, params.yaw - yawOffset)).start()
+    } else {
+      this.currentRotTween?.stop()
+      this.cameraShake.setBaseRotation(pitch, yaw)
+    }
   }
 
   debugChunksVisibilityOverride () {
@@ -508,7 +529,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     const cam = this.cameraGroupVr instanceof THREE.Group ? this.cameraGroupVr.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
 
-    if (this.displayOptions.inWorldRenderingConfig.showHand && this.playerState.reactive.gameMode !== 'spectator' /*  && !this.freeFlyMode */ && !this.renderer.xr.isPresenting) {
+    if (this.displayOptions.inWorldRenderingConfig.showHand && this.playerStateReactive.gameMode !== 'spectator' /*  && !this.freeFlyMode */ && !this.renderer.xr.isPresenting) {
       this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
       this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
     }
diff --git a/src/appViewer.ts b/src/appViewer.ts
index d8149912..0be6c2e8 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -1,5 +1,5 @@
 import { WorldDataEmitter, WorldDataEmitterWorker } from 'renderer/viewer/lib/worldDataEmitter'
-import { getInitialPlayerState, PlayerStateRenderer } from 'renderer/viewer/lib/basePlayerState'
+import { getInitialPlayerState, PlayerStateRenderer, PlayerStateReactive } from 'renderer/viewer/lib/basePlayerState'
 import { subscribeKey } from 'valtio/utils'
 import { defaultWorldRendererConfig, WorldRendererConfig } from 'renderer/viewer/lib/worldrendererCommon'
 import { Vec3 } from 'vec3'
@@ -67,7 +67,7 @@ export interface DisplayWorldOptions {
   version: string
   worldView: WorldDataEmitterWorker
   inWorldRenderingConfig: WorldRendererConfig
-  playerState: PlayerStateRenderer
+  playerStateReactive: PlayerStateReactive
   rendererState: RendererReactiveState
   nonReactiveState: NonReactiveState
 }
@@ -180,7 +180,7 @@ export class AppViewer {
     this.worldView!.listenToBot(bot)
   }
 
-  async startWorld (world, renderDistance: number, playerStateSend: PlayerStateRenderer = this.playerState) {
+  async startWorld (world, renderDistance: number, playerStateSend: PlayerStateRenderer = this.playerState.reactive) {
     if (this.currentDisplay === 'world') throw new Error('World already started')
     this.currentDisplay = 'world'
     const startPosition = bot.entity?.position ?? new Vec3(0, 64, 0)
@@ -192,7 +192,7 @@ export class AppViewer {
       version: this.resourcesManager.currentConfig!.version,
       worldView: this.worldView,
       inWorldRenderingConfig: this.inWorldRenderingConfig,
-      playerState: playerStateSend,
+      playerStateReactive: playerStateSend,
       rendererState: this.rendererState,
       nonReactiveState: this.nonReactiveState
     }
diff --git a/src/cameraRotationControls.ts b/src/cameraRotationControls.ts
index 849e5940..679a3a44 100644
--- a/src/cameraRotationControls.ts
+++ b/src/cameraRotationControls.ts
@@ -18,6 +18,7 @@ export function onCameraMove (e: MouseEvent | CameraMoveEvent) {
   if (!isGameActive(true)) return
   if (e.type === 'mousemove' && !document.pointerLockElement) return
   e.stopPropagation?.()
+  if (appViewer.playerState.utils.isSpectatingEntity()) return
   const now = performance.now()
   // todo: limit camera movement for now to avoid unexpected jumps
   if (now - lastMouseMove < 4 && !options.preciseMouseInput) return
@@ -32,7 +33,6 @@ export function onCameraMove (e: MouseEvent | CameraMoveEvent) {
   updateMotion()
 }
 
-
 export const moveCameraRawHandler = ({ x, y }: { x: number; y: number }) => {
   const maxPitch = 0.5 * Math.PI
   const minPitch = -0.5 * Math.PI
diff --git a/src/controls.ts b/src/controls.ts
index 94364f2d..d7ae758c 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -131,7 +131,14 @@ const setSprinting = (state: boolean) => {
   gameAdditionalState.isSprinting = state
 }
 
+const isSpectatingEntity = () => {
+  return appViewer.playerState.utils.isSpectatingEntity()
+}
+
 contro.on('movementUpdate', ({ vector, soleVector, gamepadIndex }) => {
+  // Don't allow movement while spectating an entity
+  if (isSpectatingEntity()) return
+
   if (gamepadIndex !== undefined && gamepadUiCursorState.display) {
     const deadzone = 0.1 // TODO make deadzone configurable
     if (Math.abs(soleVector.x) < deadzone && Math.abs(soleVector.z) < deadzone) {
@@ -340,6 +347,9 @@ const cameraRotationControls = {
     cameraRotationControls.updateMovement()
   },
   handleCommand (command: string, pressed: boolean) {
+    // Don't allow movement while spectating an entity
+    if (isSpectatingEntity()) return
+
     const directionMap = {
       'general.rotateCameraLeft': 'left',
       'general.rotateCameraRight': 'right',
@@ -361,6 +371,7 @@ window.cameraRotationControls = cameraRotationControls
 const setSneaking = (state: boolean) => {
   gameAdditionalState.isSneaking = state
   bot.setControlState('sneak', state)
+
 }
 
 const onTriggerOrReleased = (command: Command, pressed: boolean) => {
@@ -371,6 +382,7 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
     // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
     switch (command) {
       case 'general.jump':
+        if (isSpectatingEntity()) break
         // if (viewer.world.freeFlyMode) {
         //   const moveSpeed = 0.5
         //   viewer.world.freeFlyState.position.add(new Vec3(0, pressed ? moveSpeed : 0, 0))
@@ -545,10 +557,15 @@ contro.on('trigger', ({ command }) => {
         // no-op
         break
       case 'general.swapHands': {
-        bot._client.write('entity_action', {
-          entityId: bot.entity.id,
-          actionId: 6,
-          jumpBoost: 0
+        if (isSpectatingEntity()) break
+        bot._client.write('block_dig', {
+          'status': 6,
+          'location': {
+            'x': 0,
+            'z': 0,
+            'y': 0
+          },
+          'face': 0,
         })
         break
       }
@@ -556,11 +573,13 @@ contro.on('trigger', ({ command }) => {
         // handled in onTriggerOrReleased
         break
       case 'general.inventory':
+        if (isSpectatingEntity()) break
         document.exitPointerLock?.()
         openPlayerInventory()
         break
       case 'general.drop': {
-        // if (bot.heldItem/* && ctrl */) bot.tossStack(bot.heldItem)
+        if (isSpectatingEntity()) break
+        // protocol 1.9+
         bot._client.write('block_dig', {
           'status': 4,
           'location': {
@@ -593,12 +612,15 @@ contro.on('trigger', ({ command }) => {
         showModal({ reactType: 'chat' })
         break
       case 'general.selectItem':
+        if (isSpectatingEntity()) break
         void selectItem()
         break
       case 'general.nextHotbarSlot':
+        if (isSpectatingEntity()) break
         cycleHotbarSlot(1)
         break
       case 'general.prevHotbarSlot':
+        if (isSpectatingEntity()) break
         cycleHotbarSlot(-1)
         break
       case 'general.zoom':
diff --git a/src/entities.ts b/src/entities.ts
index 8ee36431..3ba4632a 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -43,7 +43,7 @@ customEvents.on('gameLoaded', () => {
   updateAutoJump()
 
   const playerPerAnimation = {} as Record<string, string>
-  const entityData = (e: Entity) => {
+  const checkEntityData = (e: Entity) => {
     if (!e.username) return
     window.debugEntityMetadata ??= {}
     window.debugEntityMetadata[e.username] = e
@@ -96,28 +96,65 @@ customEvents.on('gameLoaded', () => {
     }
   })
 
+  const updateCamera = (entity: Entity) => {
+    if (bot.game.gameMode !== 'spectator') return
+    bot.entity.position = entity.position.clone()
+    void bot.look(entity.yaw, entity.pitch, true)
+    bot.entity.yaw = entity.yaw
+    bot.entity.pitch = entity.pitch
+  }
+
   bot.on('entityGone', (entity) => {
     bot.tracker.stopTrackingEntity(entity, true)
   })
 
   bot.on('entityMoved', (e) => {
-    entityData(e)
+    checkEntityData(e)
+    if (appViewer.playerState.reactive.cameraSpectatingEntity === e.id) {
+      updateCamera(e)
+    }
   })
   bot._client.on('entity_velocity', (packet) => {
     const e = bot.entities[packet.entityId]
     if (!e) return
-    entityData(e)
+    checkEntityData(e)
   })
 
   for (const entity of Object.values(bot.entities)) {
     if (entity !== bot.entity) {
-      entityData(entity)
+      checkEntityData(entity)
     }
   }
 
-  bot.on('entitySpawn', entityData)
-  bot.on('entityUpdate', entityData)
-  bot.on('entityEquip', entityData)
+  bot.on('entitySpawn', (e) => {
+    checkEntityData(e)
+    if (appViewer.playerState.reactive.cameraSpectatingEntity === e.id) {
+      updateCamera(e)
+    }
+  })
+  bot.on('entityUpdate', checkEntityData)
+  bot.on('entityEquip', checkEntityData)
+
+  bot._client.on('camera', (packet) => {
+    if (bot.player.entity.id === packet.cameraId) {
+      if (appViewer.playerState.utils.isSpectatingEntity() && appViewer.playerState.reactive.cameraSpectatingEntity) {
+        const entity = bot.entities[appViewer.playerState.reactive.cameraSpectatingEntity]
+        appViewer.playerState.reactive.cameraSpectatingEntity = undefined
+        if (entity) {
+          // do a force entity update
+          bot.emit('entityUpdate', entity)
+        }
+      }
+    } else if (appViewer.playerState.reactive.gameMode === 'spectator') {
+      const entity = bot.entities[packet.cameraId]
+      appViewer.playerState.reactive.cameraSpectatingEntity = packet.cameraId
+      if (entity) {
+        updateCamera(entity)
+        // do a force entity update
+        bot.emit('entityUpdate', entity)
+      }
+    }
+  })
 
   // Texture override from packet properties
   bot._client.on('player_info', (packet) => {
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index d03b9fa4..05426d15 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -217,7 +217,7 @@ const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
     try {
       if (slot.durabilityUsed && slot.maxDurability) slot.durabilityUsed = Math.min(slot.durabilityUsed, slot.maxDurability)
       const debugIsQuickbar = !isJei && i === bot.inventory.hotbarStart + bot.quickBarSlot
-      const modelName = getItemModelName(slot, { 'minecraft:display_context': 'gui', }, appViewer.resourcesManager, playerState)
+      const modelName = getItemModelName(slot, { 'minecraft:display_context': 'gui', }, appViewer.resourcesManager, appViewer.playerState.reactive)
       const slotCustomProps = renderSlot({ modelName, originalItemName: slot.name }, appViewer.resourcesManager, debugIsQuickbar)
       const itemCustomName = getItemName(slot)
       Object.assign(slot, { ...slotCustomProps, displayName: itemCustomName ?? slot.displayName })
diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
index f80a6971..b7b4d2bd 100644
--- a/src/mineflayer/playerState.ts
+++ b/src/mineflayer/playerState.ts
@@ -1,5 +1,5 @@
 import { HandItemBlock } from 'renderer/viewer/three/holdingBlock'
-import { getInitialPlayerState, PlayerStateRenderer } from 'renderer/viewer/lib/basePlayerState'
+import { getInitialPlayerState, getPlayerStateUtils, PlayerStateReactive, PlayerStateRenderer, PlayerStateUtils } from 'renderer/viewer/lib/basePlayerState'
 import { subscribe } from 'valtio'
 import { subscribeKey } from 'valtio/utils'
 import { gameAdditionalState } from '../globalState'
@@ -8,7 +8,7 @@ import { gameAdditionalState } from '../globalState'
  * can be used only in main thread. Mainly for more convenient reactive state updates.
  * In renderer/ directory, use PlayerStateControllerRenderer type or worldRenderer.playerState.
  */
-export class PlayerStateControllerMain implements PlayerStateRenderer {
+export class PlayerStateControllerMain {
   disableStateUpdates = false
 
   private timeOffGround = 0
@@ -18,7 +18,8 @@ export class PlayerStateControllerMain implements PlayerStateRenderer {
   private isUsingItem = false
   ready = false
 
-  reactive: PlayerStateRenderer['reactive']
+  reactive: PlayerStateReactive
+  utils: PlayerStateUtils
 
   constructor () {
     customEvents.on('mineflayerBotCreated', () => {
@@ -41,6 +42,7 @@ export class PlayerStateControllerMain implements PlayerStateRenderer {
   private botCreated () {
     console.log('bot created & plugins injected')
     this.reactive = getInitialPlayerState()
+    this.utils = getPlayerStateUtils(this.reactive)
     this.onBotCreatedOrGameJoined()
 
     const handleDimensionData = (data) => {

From fdeb78d96b7b3ec3a5849169128395a5bfbe4f1a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 20 Jun 2025 13:56:25 +0300
Subject: [PATCH 607/753] add /ping and /connect GET endpoints for server
 info/ping data

---
 pnpm-lock.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 60c25f84..09cbe69b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -151,7 +151,7 @@ importers:
         version: 2.0.4
       net-browserify:
         specifier: github:zardoy/prismarinejs-net-browserify
-        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/64e351867c5711de8a183464284a8eb7d77d5f39
+        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/17fb901e8ea480a52c8fd46373695be172be8aa5
       node-gzip:
         specifier: ^1.1.2
         version: 1.1.2
@@ -6900,8 +6900,8 @@ packages:
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/64e351867c5711de8a183464284a8eb7d77d5f39:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/64e351867c5711de8a183464284a8eb7d77d5f39}
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/17fb901e8ea480a52c8fd46373695be172be8aa5:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/17fb901e8ea480a52c8fd46373695be172be8aa5}
     version: 0.2.4
 
   nice-try@1.0.5:
@@ -17773,7 +17773,7 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/64e351867c5711de8a183464284a8eb7d77d5f39:
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/17fb901e8ea480a52c8fd46373695be172be8aa5:
     dependencies:
       body-parser: 1.20.3
       express: 4.21.2

From 7c8ccba2c1023fd6e7183ab6464cf32ba342ee4d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 21 Jun 2025 03:34:04 +0300
Subject: [PATCH 608/753] add testIosCrash for debugging these scenarios

---
 src/appParams.ts |  1 +
 src/index.ts     | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/appParams.ts b/src/appParams.ts
index aec6fd0b..59a24788 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -45,6 +45,7 @@ export type AppQsParams = {
   onlyConnect?: string
   connectText?: string
   freezeSettings?: string
+  testIosCrash?: string
 
   // Replay params
   replayFilter?: string
diff --git a/src/index.ts b/src/index.ts
index 483abd74..9d104dbb 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -831,6 +831,26 @@ export async function connect (connectOptions: ConnectOptions) {
       miscUiState.gameLoaded = true
       miscUiState.loadedServerIndex = connectOptions.serverIndex ?? ''
       customEvents.emit('gameLoaded')
+
+      // Test iOS Safari crash by creating memory pressure
+      if (appQueryParams.testIosCrash) {
+        setTimeout(() => {
+          console.log('Starting iOS crash test with memory pressure...')
+          // eslint-disable-next-line sonarjs/no-unused-collection
+          const arrays: number[][] = []
+          try {
+            // Create large arrays until we run out of memory
+            // eslint-disable-next-line no-constant-condition
+            while (true) {
+              const arr = Array.from({ length: 1024 * 1024 }).fill(0).map((_, i) => i)
+              arrays.push(arr)
+            }
+          } catch (e) {
+            console.error('Memory allocation failed:', e)
+          }
+        }, 1000)
+      }
+
       progress.end()
       setLoadingScreenStatus(undefined)
     } catch (err) {

From 5221104980feaf50260f7a4b70465f68be6d5302 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 22 Jun 2025 01:14:15 +0300
Subject: [PATCH 609/753] feat: F5: 3rd person view camera!

---
 renderer/viewer/lib/basePlayerState.ts      |   7 +-
 renderer/viewer/lib/worldDataEmitter.ts     |  14 +-
 renderer/viewer/lib/worldrendererCommon.ts  |   5 +
 renderer/viewer/three/cameraShake.ts        |   2 +-
 renderer/viewer/three/entities.ts           | 238 +++++++++++++++-----
 renderer/viewer/three/world/vr.ts           |   4 +-
 renderer/viewer/three/worldrendererThree.ts | 183 ++++++++++++++-
 src/controls.ts                             |  25 ++
 src/entities.ts                             |  47 +++-
 9 files changed, 457 insertions(+), 68 deletions(-)

diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index 26598cad..f9e4b2c9 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -5,7 +5,7 @@ import type { HandItemBlock } from '../three/holdingBlock'
 
 export type MovementState = 'NOT_MOVING' | 'WALKING' | 'SPRINTING' | 'SNEAKING'
 export type ItemSpecificContextProperties = Partial<Pick<ItemSelector['properties'], 'minecraft:using_item' | 'minecraft:use_duration' | 'minecraft:use_cycle' | 'minecraft:display_context'>>
-
+export type CameraPerspective = 'first_person' | 'third_person_back' | 'third_person_front'
 
 export type BlockShape = { position: any; width: any; height: any; depth: any; }
 export type BlocksShapes = BlockShape[]
@@ -47,6 +47,7 @@ export const getInitialPlayerState = () => proxy({
   shouldHideHand: false,
   heldItemMain: undefined as HandItemBlock | undefined,
   heldItemOff: undefined as HandItemBlock | undefined,
+  perspective: 'first_person' as CameraPerspective,
 
   cameraSpectatingEntity: undefined as number | undefined,
 })
@@ -57,6 +58,10 @@ export const getPlayerStateUtils = (reactive: PlayerStateReactive) => ({
   },
   isSpectatingEntity () {
     return reactive.cameraSpectatingEntity !== undefined && reactive.gameMode === 'spectator'
+  },
+  isThirdPerson () {
+    if ((this as PlayerStateUtils).isSpectatingEntity()) return false
+    return reactive.perspective === 'third_person_back' || reactive.perspective === 'third_person_front'
   }
 })
 
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 435d9183..78da96d9 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -18,6 +18,7 @@ export type WorldDataEmitterEvents = {
   blockUpdate: (data: { pos: Vec3, stateId: number }) => void
   entity: (data: any) => void
   entityMoved: (data: any) => void
+  playerEntity: (data: any) => void
   time: (data: number) => void
   renderDistance: (viewDistance: number) => void
   blockEntities: (data: Record<string, any> | { blockEntities: Record<string, any> }) => void
@@ -90,7 +91,13 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
     })
 
     const emitEntity = (e, name = 'entity') => {
-      if (!e || e === bot.entity) return
+      if (!e) return
+      if (e === bot.entity) {
+        if (name === 'entity') {
+          this.emitter.emit('playerEntity', e)
+        }
+        return
+      }
       if (!e.name) return // mineflayer received update for not spawned entity
       e.objectData = entitiesObjectData.get(e.id)
       this.emitter.emit(name as any, {
@@ -148,9 +155,11 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
       // when dimension might change
       login: () => {
         void this.updatePosition(bot.entity.position, true)
+        this.emitter.emit('playerEntity', bot.entity)
       },
       respawn: () => {
         void this.updatePosition(bot.entity.position, true)
+        this.emitter.emit('playerEntity', bot.entity)
         this.emitter.emit('onWorldSwitch')
       },
     } satisfies Partial<BotEvents>
@@ -200,6 +209,9 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
     if (bot?.time?.timeOfDay) {
       this.emitter.emit('time', bot.time.timeOfDay)
     }
+    if (bot.entity) {
+      this.emitter.emit('playerEntity', bot.entity)
+    }
     this.emitterGotConnected()
     const [botX, botZ] = chunkPos(pos)
 
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 78b69925..dfa4f43b 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -721,6 +721,8 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   updateEntity (e: any, isUpdate = false) { }
 
+  abstract updatePlayerEntity? (e: any): void
+
   lightUpdate (chunkX: number, chunkZ: number) { }
 
   connect (worldView: WorldDataEmitterWorker) {
@@ -732,6 +734,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     worldEmitter.on('entityMoved', (e) => {
       this.updateEntity(e, true)
     })
+    worldEmitter.on('playerEntity', (e) => {
+      this.updatePlayerEntity?.(e)
+    })
 
     let currentLoadChunkBatch = null as {
       timeout
diff --git a/renderer/viewer/three/cameraShake.ts b/renderer/viewer/three/cameraShake.ts
index 20f7143a..593b4628 100644
--- a/renderer/viewer/three/cameraShake.ts
+++ b/renderer/viewer/three/cameraShake.ts
@@ -72,7 +72,7 @@ export class CameraShake {
       }
     }
 
-    const camera = this.worldRenderer.cameraGroupVr || this.worldRenderer.camera
+    const camera = this.worldRenderer.cameraObject
 
     if (this.worldRenderer.cameraGroupVr) {
       // For VR camera, only apply yaw rotation
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 6ddacc0b..b593fa7e 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -214,6 +214,7 @@ export type SceneEntity = THREE.Object3D & {
 
 export class Entities {
   entities = {} as Record<string, SceneEntity>
+  playerEntity: SceneEntity | null = null // Special entity for the player in third person
   entitiesOptions = {
     fontFamily: 'mojangles'
   }
@@ -254,12 +255,49 @@ export class Entities {
     this.watchResourcesUpdates()
   }
 
+  handlePlayerEntity (playerData: SceneEntity['originalEntity']) {
+    // Create player entity if it doesn't exist
+    if (!this.playerEntity) {
+      // Create the player entity similar to how normal entities are created
+      const group = new THREE.Group() as unknown as SceneEntity
+      group.originalEntity = { ...playerData, name: 'player' } as SceneEntity['originalEntity']
+
+      const wrapper = new THREE.Group()
+      const playerObject = this.setupPlayerObject(playerData, wrapper, {})
+      group.playerObject = playerObject
+      group.add(wrapper)
+
+      group.name = 'player_entity'
+      this.playerEntity = group
+      this.worldRenderer.scene.add(group)
+
+      void this.updatePlayerSkin(playerData.id, playerData.username, playerData.uuid ?? undefined, stevePngUrl)
+    }
+
+    // Update position and rotation
+    if (playerData.position) {
+      this.playerEntity.position.set(playerData.position.x, playerData.position.y, playerData.position.z)
+    }
+    if (playerData.yaw !== undefined) {
+      this.playerEntity.rotation.y = playerData.yaw
+    }
+
+    this.updateEntityEquipment(this.playerEntity, playerData)
+  }
+
   clear () {
     for (const mesh of Object.values(this.entities)) {
       this.worldRenderer.scene.remove(mesh)
       disposeObject(mesh)
     }
     this.entities = {}
+
+    // Clean up player entity
+    if (this.playerEntity) {
+      this.worldRenderer.scene.remove(this.playerEntity)
+      disposeObject(this.playerEntity)
+      this.playerEntity = null
+    }
   }
 
   reloadEntities () {
@@ -309,8 +347,9 @@ export class Entities {
     const botPos = this.worldRenderer.viewerPosition
     const VISIBLE_DISTANCE = 10 * 10
 
-    for (const entityId of Object.keys(this.entities)) {
-      const entity = this.entities[entityId]
+    // Update regular entities
+    for (const [entityId, entity] of [...Object.entries(this.entities), ['player_entity', this.playerEntity] as [string, SceneEntity | null]]) {
+      if (!entity) continue
       const { playerObject } = entity
 
       // Update animations
@@ -318,9 +357,6 @@ export class Entities {
         playerObject.animation.update(playerObject, dt)
       }
 
-      // Update armor positions
-      this.syncArmorPositions(entity)
-
       // Update visibility based on distance and chunk load status
       if (botPos && entity.position) {
         const dx = entity.position.x - botPos.x
@@ -333,6 +369,32 @@ export class Entities {
 
         this.maybeRenderPlayerSkin(entityId)
       }
+
+      if (entity.visible) {
+        // Update armor positions
+        this.syncArmorPositions(entity)
+      }
+
+      if (entityId === 'player_entity') {
+        entity.visible = this.worldRenderer.playerStateUtils.isThirdPerson()
+
+        if (entity.visible) {
+          // sync
+          const yOffset = this.worldRenderer.playerStateReactive.eyeHeight
+          const pos = this.worldRenderer.cameraObject.position.clone().add(new THREE.Vector3(0, -yOffset, 0))
+          entity.position.set(pos.x, pos.y, pos.z)
+
+          const rotation = this.worldRenderer.cameraShake.getBaseRotation()
+          entity.rotation.set(0, rotation.yaw, 0)
+
+          // Sync head rotation
+          entity.traverse((c) => {
+            if (c.name === 'head') {
+              c.rotation.set(-rotation.pitch, 0, 0)
+            }
+          })
+        }
+      }
     }
   }
 
@@ -410,6 +472,7 @@ export class Entities {
   }
 
   getPlayerObject (entityId: string | number) {
+    if (this.playerEntity?.originalEntity.id === entityId) return this.playerEntity?.playerObject
     const playerObject = this.entities[entityId]?.playerObject
     return playerObject
   }
@@ -568,21 +631,63 @@ export class Entities {
   }
 
   playAnimation (entityPlayerId, animation: 'walking' | 'running' | 'oneSwing' | 'idle' | 'crouch' | 'crouchWalking') {
-    const playerObject = this.getPlayerObject(entityPlayerId)
-    if (!playerObject) return
+    // TODO CLEANUP!
+    // Handle special player entity ID for bot entity in third person
+    if (entityPlayerId === 'player_entity' && this.playerEntity?.playerObject) {
+      const { playerObject } = this.playerEntity
+      if (animation === 'oneSwing') {
+        if (!(playerObject.animation instanceof WalkingGeneralSwing)) throw new Error('Expected WalkingGeneralSwing')
+        playerObject.animation.swingArm()
+        return
+      }
 
-    if (animation === 'oneSwing') {
-      if (!(playerObject.animation instanceof WalkingGeneralSwing)) throw new Error('Expected WalkingGeneralSwing')
-      playerObject.animation.swingArm()
+      if (playerObject.animation instanceof WalkingGeneralSwing) {
+        playerObject.animation.switchAnimationCallback = () => {
+          if (!(playerObject.animation instanceof WalkingGeneralSwing)) throw new Error('Expected WalkingGeneralSwing')
+          playerObject.animation.isMoving = animation === 'walking' || animation === 'running' || animation === 'crouchWalking'
+          playerObject.animation.isRunning = animation === 'running'
+          playerObject.animation.isCrouched = animation === 'crouch' || animation === 'crouchWalking'
+        }
+      }
       return
     }
 
-    if (playerObject.animation instanceof WalkingGeneralSwing) {
-      playerObject.animation.switchAnimationCallback = () => {
+    // Handle regular entities
+    const playerObject = this.getPlayerObject(entityPlayerId)
+    if (playerObject) {
+      if (animation === 'oneSwing') {
         if (!(playerObject.animation instanceof WalkingGeneralSwing)) throw new Error('Expected WalkingGeneralSwing')
-        playerObject.animation.isMoving = animation === 'walking' || animation === 'running' || animation === 'crouchWalking'
-        playerObject.animation.isRunning = animation === 'running'
-        playerObject.animation.isCrouched = animation === 'crouch' || animation === 'crouchWalking'
+        playerObject.animation.swingArm()
+        return
+      }
+
+      if (playerObject.animation instanceof WalkingGeneralSwing) {
+        playerObject.animation.switchAnimationCallback = () => {
+          if (!(playerObject.animation instanceof WalkingGeneralSwing)) throw new Error('Expected WalkingGeneralSwing')
+          playerObject.animation.isMoving = animation === 'walking' || animation === 'running' || animation === 'crouchWalking'
+          playerObject.animation.isRunning = animation === 'running'
+          playerObject.animation.isCrouched = animation === 'crouch' || animation === 'crouchWalking'
+        }
+      }
+      return
+    }
+
+    // Handle player entity (for third person view) - fallback for backwards compatibility
+    if (this.playerEntity?.playerObject) {
+      const { playerObject: playerEntityObject } = this.playerEntity
+      if (animation === 'oneSwing') {
+        if (!(playerEntityObject.animation instanceof WalkingGeneralSwing)) throw new Error('Expected WalkingGeneralSwing')
+        playerEntityObject.animation.swingArm()
+        return
+      }
+
+      if (playerEntityObject.animation instanceof WalkingGeneralSwing) {
+        playerEntityObject.animation.switchAnimationCallback = () => {
+          if (!(playerEntityObject.animation instanceof WalkingGeneralSwing)) throw new Error('Expected WalkingGeneralSwing')
+          playerEntityObject.animation.isMoving = animation === 'walking' || animation === 'running' || animation === 'crouchWalking'
+          playerEntityObject.animation.isRunning = animation === 'running'
+          playerEntityObject.animation.isCrouched = animation === 'crouch' || animation === 'crouchWalking'
+        }
       }
     }
   }
@@ -782,23 +887,10 @@ export class Entities {
           }
         }
       } else if (isPlayerModel) {
-        // CREATE NEW PLAYER ENTITY
         const wrapper = new THREE.Group()
-        const playerObject = new PlayerObject() as PlayerObjectType
-        playerObject.realPlayerUuid = entity.uuid ?? ''
-        playerObject.realUsername = entity.username ?? ''
-        playerObject.position.set(0, 16, 0)
-
-        // fix issues with starfield
-        playerObject.traverse((obj) => {
-          if (obj instanceof THREE.Mesh && obj.material instanceof THREE.MeshStandardMaterial) {
-            obj.material.transparent = true
-          }
-        })
-        //@ts-expect-error
-        wrapper.add(playerObject)
-        const scale = 1 / 16
-        wrapper.scale.set(scale, scale, scale)
+        const playerObject = this.setupPlayerObject(entity, wrapper, overrides)
+        group.playerObject = playerObject
+        mesh = wrapper
 
         if (entity.username) {
           // todo proper colors
@@ -811,13 +903,6 @@ export class Entities {
           //@ts-expect-error
           wrapper.add(nameTag)
         }
-
-        group.playerObject = playerObject
-        wrapper.rotation.set(0, Math.PI, 0)
-        mesh = wrapper
-        playerObject.animation = new WalkingGeneralSwing()
-        //@ts-expect-error
-        playerObject.animation.isMoving = false
       } else {
         mesh = getEntityMesh(entity, this.worldRenderer, this.entitiesOptions, overrides)
       }
@@ -857,16 +942,8 @@ export class Entities {
       mesh = e.children.find(c => c.name === 'mesh')
     }
 
-    // check if entity has armor
-    if (entity.equipment) {
-      const isPlayer = entity.type === 'player'
-      this.addItemModel(e, isPlayer ? 'right' : 'left', entity.equipment[0], isPlayer)
-      this.addItemModel(e, isPlayer ? 'left' : 'right', entity.equipment[1], isPlayer)
-      addArmorModel(this.worldRenderer, e, 'feet', entity.equipment[2])
-      addArmorModel(this.worldRenderer, e, 'legs', entity.equipment[3], 2)
-      addArmorModel(this.worldRenderer, e, 'chest', entity.equipment[4])
-      addArmorModel(this.worldRenderer, e, 'head', entity.equipment[5])
-    }
+    // Update equipment
+    this.updateEntityEquipment(e, entity)
 
     const meta = getGeneralEntitiesMetadata(entity)
 
@@ -1038,14 +1115,6 @@ export class Entities {
       e.username = entity.username
     }
 
-    if (entity.type === 'player' && entity.equipment && e.playerObject) {
-      const { playerObject } = e
-      playerObject.backEquipment = entity.equipment.some((item) => item?.name === 'elytra') ? 'elytra' : 'cape'
-      if (playerObject.cape.map === null) {
-        playerObject.cape.visible = false
-      }
-    }
-
     this.updateEntityPosition(entity, justAdded, overrides)
   }
 
@@ -1075,13 +1144,17 @@ export class Entities {
 
   loadedSkinEntityIds = new Set<string>()
   maybeRenderPlayerSkin (entityId: string) {
-    const mesh = this.entities[entityId]
+    let mesh = this.entities[entityId]
+    if (entityId === 'player_entity') {
+      mesh = this.playerEntity!
+      entityId = this.playerEntity?.originalEntity.id as any
+    }
     if (!mesh) return
     if (!mesh.playerObject) return
     if (!mesh.visible) return
 
     const MAX_DISTANCE_SKIN_LOAD = 128
-    const cameraPos = this.worldRenderer.camera.position
+    const cameraPos = this.worldRenderer.cameraObject.position
     const distance = mesh.position.distanceTo(cameraPos)
     if (distance < MAX_DISTANCE_SKIN_LOAD && distance < (this.worldRenderer.viewDistance * 16)) {
       if (this.loadedSkinEntityIds.has(entityId)) return
@@ -1234,13 +1307,60 @@ export class Entities {
     }
   }
 
-  raycastScene () {
+  raycastSceneDebug () {
     // return any object from scene. raycast from camera
     const raycaster = new THREE.Raycaster()
     raycaster.setFromCamera(new THREE.Vector2(0, 0), this.worldRenderer.camera)
     const intersects = raycaster.intersectObjects(this.worldRenderer.scene.children)
     return intersects[0]?.object
   }
+
+  private setupPlayerObject (entity: SceneEntity['originalEntity'], wrapper: THREE.Group, overrides: { texture?: string }): PlayerObjectType {
+    const playerObject = new PlayerObject() as PlayerObjectType
+    playerObject.realPlayerUuid = entity.uuid ?? ''
+    playerObject.realUsername = entity.username ?? ''
+    playerObject.position.set(0, 16, 0)
+
+    // fix issues with starfield
+    playerObject.traverse((obj) => {
+      if (obj instanceof THREE.Mesh && obj.material instanceof THREE.MeshStandardMaterial) {
+        obj.material.transparent = true
+      }
+    })
+
+    wrapper.add(playerObject as any)
+    const scale = 1 / 16
+    wrapper.scale.set(scale, scale, scale)
+    wrapper.rotation.set(0, Math.PI, 0)
+
+    // Set up animation
+    playerObject.animation = new WalkingGeneralSwing()
+    //@ts-expect-error
+    playerObject.animation.isMoving = false
+
+    return playerObject
+  }
+
+  private updateEntityEquipment (entityMesh: SceneEntity, entity: SceneEntity['originalEntity']) {
+    if (!entityMesh || !entity.equipment) return
+
+    const isPlayer = entity.type === 'player'
+    this.addItemModel(entityMesh, isPlayer ? 'right' : 'left', entity.equipment[0], isPlayer)
+    this.addItemModel(entityMesh, isPlayer ? 'left' : 'right', entity.equipment[1], isPlayer)
+    addArmorModel(this.worldRenderer, entityMesh, 'feet', entity.equipment[2])
+    addArmorModel(this.worldRenderer, entityMesh, 'legs', entity.equipment[3], 2)
+    addArmorModel(this.worldRenderer, entityMesh, 'chest', entity.equipment[4])
+    addArmorModel(this.worldRenderer, entityMesh, 'head', entity.equipment[5])
+
+    // Update player-specific equipment
+    if (isPlayer && entityMesh.playerObject) {
+      const { playerObject } = entityMesh
+      playerObject.backEquipment = entity.equipment.some((item) => item?.name === 'elytra') ? 'elytra' : 'cape'
+      if (playerObject.cape.map === null) {
+        playerObject.cape.visible = false
+      }
+    }
+  }
 }
 
 function getGeneralEntitiesMetadata (entity: { name; metadata }): Partial<UnionToIntersection<EntityMetadataVersions[keyof EntityMetadataVersions]>> {
diff --git a/renderer/viewer/three/world/vr.ts b/renderer/viewer/three/world/vr.ts
index c2665585..ecf1b299 100644
--- a/renderer/viewer/three/world/vr.ts
+++ b/renderer/viewer/three/world/vr.ts
@@ -102,7 +102,7 @@ export async function initVR (worldRenderer: WorldRendererThree, documentRendere
 
   // hack for vr camera
   const user = new THREE.Group()
-  user.add(worldRenderer.camera)
+  user.name = 'vr-camera-container'
   worldRenderer.scene.add(user)
   const controllerModelFactory = new XRControllerModelFactory(new GLTFLoader())
   const controller1 = renderer.xr.getControllerGrip(0)
@@ -202,10 +202,12 @@ export async function initVR (worldRenderer: WorldRendererThree, documentRendere
     documentRenderer.frameRender(false)
   })
   renderer.xr.addEventListener('sessionstart', () => {
+    user.add(worldRenderer.camera)
     worldRenderer.cameraGroupVr = user
   })
   renderer.xr.addEventListener('sessionend', () => {
     worldRenderer.cameraGroupVr = undefined
+    user.remove(worldRenderer.camera)
   })
 
   worldRenderer.abortController.signal.addEventListener('abort', disableVr)
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 77100c5c..75cf473a 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -46,6 +46,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   cursorBlock: CursorBlock
   onRender: Array<() => void> = []
   cameraShake: CameraShake
+  cameraContainer: THREE.Object3D
   media: ThreeJsMedia
   waitingChunksToDisplay = {} as { [chunkKey: string]: SectionKey[] }
   camera: THREE.PerspectiveCamera
@@ -68,6 +69,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     }
   }
   fountains: Fountain[] = []
+  DEBUG_RAYCAST = false
 
   private currentPosTween?: tweenJs.Tween<THREE.Vector3>
   private currentRotTween?: tweenJs.Tween<{ pitch: number, yaw: number }>
@@ -109,7 +111,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   get cameraObject () {
-    return this.cameraGroupVr || this.camera
+    return this.cameraContainer
   }
 
   worldSwitchActions () {
@@ -138,6 +140,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     }
   }
 
+  updatePlayerEntity (e: any) {
+    this.entities.handlePlayerEntity(e)
+  }
+
   resetScene () {
     this.scene.matrixAutoUpdate = false // for perf
     this.scene.background = new THREE.Color(this.initOptions.config.sceneBackground)
@@ -148,6 +154,9 @@ export class WorldRendererThree extends WorldRendererCommon {
 
     const size = this.renderer.getSize(new THREE.Vector2())
     this.camera = new THREE.PerspectiveCamera(75, size.x / size.y, 0.1, 1000)
+    this.cameraContainer = new THREE.Object3D()
+    this.cameraContainer.add(this.camera)
+    this.scene.add(this.cameraContainer)
   }
 
   override watchReactivePlayerState () {
@@ -169,6 +178,12 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.onReactivePlayerStateUpdated('diggingBlock', (value) => {
       this.cursorBlock.updateBreakAnimation(value ? { x: value.x, y: value.y, z: value.z } : undefined, value?.stage ?? null, value?.mergedShape)
     })
+    this.onReactivePlayerStateUpdated('perspective', (value) => {
+      // Update camera perspective when it changes
+      const vecPos = new Vec3(this.cameraObject.position.x, this.cameraObject.position.y, this.cameraObject.position.z)
+      this.updateCamera(vecPos, this.cameraShake.getBaseRotation().yaw, this.cameraShake.getBaseRotation().pitch)
+      // todo also update camera when block within camera was changed
+    })
   }
 
   override watchReactiveConfig () {
@@ -439,6 +454,118 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.media.tryIntersectMedia()
   }
 
+  getThirdPersonCamera (pos: THREE.Vector3 | null, yaw: number, pitch: number) {
+    pos ??= this.cameraObject.position
+
+    // Calculate camera offset based on perspective
+    const isBack = this.playerStateReactive.perspective === 'third_person_back'
+    const distance = 4 // Default third person distance
+
+    // Calculate direction vector using proper world orientation
+    // We need to get the camera's current look direction and use that for positioning
+
+    // Create a direction vector that represents where the camera is looking
+    // This matches the Three.js camera coordinate system
+    const direction = new THREE.Vector3(0, 0, -1) // Forward direction in camera space
+
+    // Apply the same rotation that's applied to the camera container
+    const pitchQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), pitch)
+    const yawQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), yaw)
+    const finalQuat = new THREE.Quaternion().multiplyQuaternions(yawQuat, pitchQuat)
+
+    // Transform the direction vector by the camera's rotation
+    direction.applyQuaternion(finalQuat)
+
+    // For back view, we want the camera behind the player (opposite to view direction)
+    // For front view, we want the camera in front of the player (same as view direction)
+    if (isBack) {
+      direction.multiplyScalar(-1)
+    }
+
+    // Create debug visualization if advanced stats are enabled
+    if (this.DEBUG_RAYCAST) {
+      this.debugRaycast(pos, direction, distance)
+    }
+
+    // Perform raycast to avoid camera going through blocks
+    const raycaster = new THREE.Raycaster()
+    raycaster.set(pos, direction)
+    raycaster.far = distance // Limit raycast distance
+
+    // Filter to only nearby chunks for performance
+    const nearbyChunks = Object.values(this.sectionObjects)
+      .filter(obj => obj.name === 'chunk' && obj.visible)
+      .filter(obj => {
+        // Get the mesh child which has the actual geometry
+        const mesh = obj.children.find(child => child.name === 'mesh')
+        if (!mesh) return false
+
+        // Check distance from player position to chunk
+        const chunkWorldPos = new THREE.Vector3()
+        mesh.getWorldPosition(chunkWorldPos)
+        const distance = pos.distanceTo(chunkWorldPos)
+        return distance < 80 // Only check chunks within 80 blocks
+      })
+
+    // Get all mesh children for raycasting
+    const meshes: THREE.Object3D[] = []
+    for (const chunk of nearbyChunks) {
+      const mesh = chunk.children.find(child => child.name === 'mesh')
+      if (mesh) meshes.push(mesh)
+    }
+
+    const intersects = raycaster.intersectObjects(meshes, false)
+
+    let finalDistance = distance
+    if (intersects.length > 0) {
+      // Use intersection distance minus a small offset to prevent clipping
+      finalDistance = Math.max(0.5, intersects[0].distance - 0.2)
+    }
+
+    const finalPos = new Vec3(
+      pos.x + direction.x * finalDistance,
+      pos.y + direction.y * finalDistance,
+      pos.z + direction.z * finalDistance
+    )
+
+    return finalPos
+  }
+
+  private debugRaycastHelper?: THREE.ArrowHelper
+  private debugHitPoint?: THREE.Mesh
+
+  private debugRaycast (pos: THREE.Vector3, direction: THREE.Vector3, distance: number) {
+    // Remove existing debug objects
+    if (this.debugRaycastHelper) {
+      this.scene.remove(this.debugRaycastHelper)
+      this.debugRaycastHelper = undefined
+    }
+    if (this.debugHitPoint) {
+      this.scene.remove(this.debugHitPoint)
+      this.debugHitPoint = undefined
+    }
+
+    // Create raycast arrow
+    this.debugRaycastHelper = new THREE.ArrowHelper(
+      direction.clone().normalize(),
+      pos,
+      distance,
+      0xff_00_00, // Red color
+      distance * 0.1,
+      distance * 0.05
+    )
+    this.scene.add(this.debugRaycastHelper)
+
+    // Create hit point indicator
+    const hitGeometry = new THREE.SphereGeometry(0.2, 8, 8)
+    const hitMaterial = new THREE.MeshBasicMaterial({ color: 0x00_ff_00 })
+    this.debugHitPoint = new THREE.Mesh(hitGeometry, hitMaterial)
+    this.debugHitPoint.position.copy(pos).add(direction.clone().multiplyScalar(distance))
+    this.scene.add(this.debugHitPoint)
+  }
+
+  prevFramePerspective = null as string | null
+
   updateCamera (pos: Vec3 | null, yaw: number, pitch: number): void {
     // if (this.freeFlyMode) {
     //   pos = this.freeFlyState.position
@@ -472,6 +599,42 @@ export class WorldRendererThree extends WorldRendererCommon {
     } else {
       this.currentRotTween?.stop()
       this.cameraShake.setBaseRotation(pitch, yaw)
+
+      const { perspective } = this.playerStateReactive
+      if (perspective === 'third_person_back' || perspective === 'third_person_front') {
+        // Use getThirdPersonCamera for proper raycasting with max distance of 4
+        const currentCameraPos = this.cameraObject.position
+        const thirdPersonPos = this.getThirdPersonCamera(
+          new THREE.Vector3(currentCameraPos.x, currentCameraPos.y, currentCameraPos.z),
+          yaw,
+          pitch
+        )
+
+        const distance = currentCameraPos.distanceTo(new THREE.Vector3(thirdPersonPos.x, thirdPersonPos.y, thirdPersonPos.z))
+        // Apply Z offset based on perspective and calculated distance
+        const zOffset = perspective === 'third_person_back' ? distance : -distance
+        this.camera.position.set(0, 0, zOffset)
+
+        if (perspective === 'third_person_front') {
+          // Flip camera view 180 degrees around Y axis for front view
+          this.camera.rotation.set(0, Math.PI, 0)
+        } else {
+          this.camera.rotation.set(0, 0, 0)
+        }
+      } else {
+        this.camera.position.set(0, 0, 0)
+        this.camera.rotation.set(0, 0, 0)
+
+        // remove any debug raycasting
+        if (this.debugRaycastHelper) {
+          this.scene.remove(this.debugRaycastHelper)
+          this.debugRaycastHelper = undefined
+        }
+        if (this.debugHitPoint) {
+          this.scene.remove(this.debugHitPoint)
+          this.debugHitPoint = undefined
+        }
+      }
     }
   }
 
@@ -529,7 +692,13 @@ export class WorldRendererThree extends WorldRendererCommon {
     const cam = this.cameraGroupVr instanceof THREE.Group ? this.cameraGroupVr.children.find(child => child instanceof THREE.PerspectiveCamera) as THREE.PerspectiveCamera : this.camera
     this.renderer.render(this.scene, cam)
 
-    if (this.displayOptions.inWorldRenderingConfig.showHand && this.playerStateReactive.gameMode !== 'spectator' /*  && !this.freeFlyMode */ && !this.renderer.xr.isPresenting) {
+    if (
+      this.displayOptions.inWorldRenderingConfig.showHand &&
+      this.playerStateReactive.gameMode !== 'spectator' &&
+      this.playerStateReactive.perspective === 'first_person' &&
+      // !this.freeFlyMode &&
+      !this.renderer.xr.isPresenting
+    ) {
       this.holdingBlock.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
       this.holdingBlockLeft.render(this.camera, this.renderer, this.ambientLight, this.directionalLight)
     }
@@ -654,6 +823,16 @@ export class WorldRendererThree extends WorldRendererCommon {
     for (const mesh of Object.values(this.sectionObjects)) {
       this.scene.remove(mesh)
     }
+
+    // Clean up debug objects
+    if (this.debugRaycastHelper) {
+      this.scene.remove(this.debugRaycastHelper)
+      this.debugRaycastHelper = undefined
+    }
+    if (this.debugHitPoint) {
+      this.scene.remove(this.debugHitPoint)
+      this.debugHitPoint = undefined
+    }
   }
 
   getLoadedChunksRelative (pos: Vec3, includeY = false) {
diff --git a/src/controls.ts b/src/controls.ts
index d7ae758c..44de8f11 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -29,6 +29,7 @@ import { appStorage } from './react/appStorageProvider'
 import { switchGameMode } from './packetsReplay/replayPackets'
 import { tabListState } from './react/PlayerListOverlayProvider'
 import { type ActionType, type ActionHoldConfig, type CustomAction } from './appConfig'
+import { playerState } from './mineflayer/playerState'
 
 export const customKeymaps = proxy(appStorage.keybindings)
 subscribe(customKeymaps, () => {
@@ -70,6 +71,7 @@ export const contro = new ControMax({
       // client side
       zoom: ['KeyC'],
       viewerConsole: ['Backquote'],
+      togglePerspective: ['F5'],
     },
     ui: {
       toggleFullscreen: ['F11'],
@@ -439,6 +441,28 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
       case 'general.playersList':
         tabListState.isOpen = pressed
         break
+      case 'general.viewerConsole':
+        if (lastConnectOptions.value?.viewerWsConnect) {
+          showModal({ reactType: 'console' })
+        }
+        break
+      case 'general.togglePerspective':
+        if (pressed) {
+          const currentPerspective = playerState.reactive.perspective
+          // eslint-disable-next-line sonarjs/no-nested-switch
+          switch (currentPerspective) {
+            case 'first_person':
+              playerState.reactive.perspective = 'third_person_back'
+              break
+            case 'third_person_back':
+              playerState.reactive.perspective = 'third_person_front'
+              break
+            case 'third_person_front':
+              playerState.reactive.perspective = 'first_person'
+              break
+          }
+        }
+        break
     }
   } else if (stringStartsWith(command, 'ui')) {
     switch (command) {
@@ -554,6 +578,7 @@ contro.on('trigger', ({ command }) => {
       case 'general.debugOverlay':
       case 'general.debugOverlayHelpMenu':
       case 'general.playersList':
+      case 'general.togglePerspective':
         // no-op
         break
       case 'general.swapHands': {
diff --git a/src/entities.ts b/src/entities.ts
index 3ba4632a..b9f7998e 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -5,7 +5,7 @@ import { loader as autoJumpPlugin } from '@nxg-org/mineflayer-auto-jump'
 import { subscribeKey } from 'valtio/utils'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import { options, watchValue } from './optionsStorage'
-import { miscUiState } from './globalState'
+import { gameAdditionalState, miscUiState } from './globalState'
 import { EntityStatus } from './mineflayer/entityStatus'
 
 
@@ -52,6 +52,13 @@ customEvents.on('gameLoaded', () => {
     }
   }
 
+  const trackBotEntity = () => {
+    // Always track the bot entity for animations
+    if (bot.entity) {
+      bot.tracker.trackEntity(bot.entity)
+    }
+  }
+
   let lastCall = 0
   bot.on('physicsTick', () => {
     // throttle, tps: 6
@@ -64,7 +71,7 @@ customEvents.on('gameLoaded', () => {
       const speed = info.avgVel
       const WALKING_SPEED = 0.03
       const SPRINTING_SPEED = 0.18
-      const isCrouched = e['crouching']
+      const isCrouched = e === bot.entity ? gameAdditionalState.isSneaking : e['crouching']
       const isWalking = Math.abs(speed.x) > WALKING_SPEED || Math.abs(speed.z) > WALKING_SPEED
       const isSprinting = Math.abs(speed.x) > SPRINTING_SPEED || Math.abs(speed.z) > SPRINTING_SPEED
 
@@ -73,7 +80,12 @@ customEvents.on('gameLoaded', () => {
           : isWalking ? (isSprinting ? 'running' : 'walking')
             : 'idle'
       if (newAnimation !== playerPerAnimation[id]) {
-        getThreeJsRendererMethods()?.playEntityAnimation(e.id, newAnimation)
+        // Handle bot entity animation specially (for player entity in third person)
+        if (e === bot.entity) {
+          getThreeJsRendererMethods()?.playEntityAnimation('player_entity', newAnimation)
+        } else {
+          getThreeJsRendererMethods()?.playEntityAnimation(e.id, newAnimation)
+        }
         playerPerAnimation[id] = newAnimation
       }
     }
@@ -83,6 +95,25 @@ customEvents.on('gameLoaded', () => {
     getThreeJsRendererMethods()?.playEntityAnimation(e.id, 'oneSwing')
   })
 
+  bot.on('botArmSwingStart', (hand) => {
+    if (hand === 'right') {
+      getThreeJsRendererMethods()?.playEntityAnimation('player_entity', 'oneSwing')
+    }
+  })
+
+  bot.inventory.on('updateSlot', (slot) => {
+    if (slot === 5 || slot === 6 || slot === 7 || slot === 8) {
+      const item = bot.inventory.slots[slot]!
+      bot.entity.equipment[slot - 3] = item
+      appViewer.worldView?.emit('playerEntity', bot.entity)
+    }
+  })
+  bot.on('heldItemChanged', () => {
+    const item = bot.inventory.slots[bot.quickBarSlot + 36]!
+    bot.entity.equipment[0] = item
+    appViewer.worldView?.emit('playerEntity', bot.entity)
+  })
+
   bot._client.on('damage_event', (data) => {
     const { entityId, sourceTypeId: damage } = data
     getThreeJsRendererMethods()?.damageEntity(entityId, damage)
@@ -126,6 +157,9 @@ customEvents.on('gameLoaded', () => {
     }
   }
 
+  // Track bot entity initially
+  trackBotEntity()
+
   bot.on('entitySpawn', (e) => {
     checkEntityData(e)
     if (appViewer.playerState.reactive.cameraSpectatingEntity === e.id) {
@@ -135,6 +169,13 @@ customEvents.on('gameLoaded', () => {
   bot.on('entityUpdate', checkEntityData)
   bot.on('entityEquip', checkEntityData)
 
+  // Re-track bot entity after login
+  bot.on('login', () => {
+    setTimeout(() => {
+      trackBotEntity()
+    }) // Small delay to ensure bot.entity is properly set
+  })
+
   bot._client.on('camera', (packet) => {
     if (bot.player.entity.id === packet.cameraId) {
       if (appViewer.playerState.utils.isSpectatingEntity() && appViewer.playerState.reactive.cameraSpectatingEntity) {

From 32b19ab7af19e4f11821736874d0abbc87c62532 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 22 Jun 2025 01:20:34 +0300
Subject: [PATCH 610/753] fix: fix elytra skin

---
 renderer/viewer/three/entities.ts           | 5 ++++-
 renderer/viewer/three/entity/armorModels.ts | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index b593fa7e..fea7f710 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -25,7 +25,7 @@ import * as Entity from './entity/EntityMesh'
 import { getMesh } from './entity/EntityMesh'
 import { WalkingGeneralSwing } from './entity/animations'
 import { disposeObject } from './threeJsUtils'
-import { armorModel, armorTextures } from './entity/armorModels'
+import { armorModel, elytraTexture, armorTextures } from './entity/armorModels'
 import { WorldRendererThree } from './worldrendererThree'
 
 export const TWEEN_DURATION = 120
@@ -1356,6 +1356,9 @@ export class Entities {
     if (isPlayer && entityMesh.playerObject) {
       const { playerObject } = entityMesh
       playerObject.backEquipment = entity.equipment.some((item) => item?.name === 'elytra') ? 'elytra' : 'cape'
+      if (playerObject.backEquipment === 'elytra') {
+        void this.loadAndApplyCape(entity.id, elytraTexture)
+      }
       if (playerObject.cape.map === null) {
         playerObject.cape.visible = false
       }
diff --git a/renderer/viewer/three/entity/armorModels.ts b/renderer/viewer/three/entity/armorModels.ts
index 3a87f8db..3681344c 100644
--- a/renderer/viewer/three/entity/armorModels.ts
+++ b/renderer/viewer/three/entity/armorModels.ts
@@ -14,6 +14,7 @@ import { default as netheriteLayer1 } from 'mc-assets/dist/other-textures/latest
 import { default as netheriteLayer2 } from 'mc-assets/dist/other-textures/latest/models/armor/netherite_layer_2.png'
 import { default as turtleLayer1 } from 'mc-assets/dist/other-textures/latest/models/armor/turtle_layer_1.png'
 
+export { default as elytraTexture } from 'mc-assets/dist/other-textures/latest/entity/elytra.png'
 export { default as armorModel } from './armorModels.json'
 
 export const armorTextures = {

From 332bd4e0f354fb4e3472708b82b050671f3325d4 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sun, 22 Jun 2025 15:18:51 +0300
Subject: [PATCH 611/753] Display auth button

---
 src/react/AppStatusProvider.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index 8bfed645..51c7991c 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -127,6 +127,7 @@ export default () => {
   }, [])
 
   const displayAuthButton = status.includes('This server appears to be an online server and you are providing no authentication.')
+    || JSON.stringify(minecraftJsonMessage ?? {}).toLowerCase().includes("authenticate")
   const hasVpnText = (text: string) => text.includes('VPN') || text.includes('Proxy')
   const displayVpnButton = hasVpnText(status) || (minecraftJsonMessage && hasVpnText(JSON.stringify(minecraftJsonMessage)))
   const authReconnectAction = async () => {

From e9e144621f1419fa3dbd06204a7318054907a534 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 24 Jun 2025 02:13:06 +0300
Subject: [PATCH 612/753] improve auth features in edge cases

---
 src/index.ts             | 3 ++-
 src/microsoftAuthflow.ts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 9d104dbb..185caab6 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -209,10 +209,10 @@ export async function connect (connectOptions: ConnectOptions) {
 
   let ended = false
   let bot!: typeof __type_bot
+  let hadConnected = false
   const destroyAll = (wasKicked = false) => {
     if (ended) return
     loadingTimerState.loading = false
-    const hadConnected = !!bot
     if (!wasKicked && miscUiState.appConfig?.allowAutoConnect && appQueryParams.autoConnect && hadConnected) {
       location.reload()
     }
@@ -856,6 +856,7 @@ export async function connect (connectOptions: ConnectOptions) {
     } catch (err) {
       handleError(err)
     }
+    hadConnected = true
   }
   // don't use spawn event, player can be dead
   bot.once(spawnEarlier ? 'forcedMove' : 'health', displayWorld)
diff --git a/src/microsoftAuthflow.ts b/src/microsoftAuthflow.ts
index 00f4e675..d759a7dc 100644
--- a/src/microsoftAuthflow.ts
+++ b/src/microsoftAuthflow.ts
@@ -71,7 +71,7 @@ export default async ({ tokenCaches, proxyBaseUrl, setProgressText = (text) => {
                 onMsaCodeCallback(json)
                 // this.codeCallback(json)
               }
-              if (json.error) throw new Error(json.error)
+              if (json.error) throw new Error(`Auth server error: ${json.error}`)
               if (json.token) result = json
               if (json.newCache) setCacheResult(json.newCache)
             }

From 383e6c4d80dff331550be8d2893b5d0fdd3a729a Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 24 Jun 2025 10:03:23 +0000
Subject: [PATCH 613/753] fix lint

---
 src/react/AppStatusProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index 51c7991c..e7e36cb7 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -127,7 +127,7 @@ export default () => {
   }, [])
 
   const displayAuthButton = status.includes('This server appears to be an online server and you are providing no authentication.')
-    || JSON.stringify(minecraftJsonMessage ?? {}).toLowerCase().includes("authenticate")
+    || JSON.stringify(minecraftJsonMessage ?? {}).toLowerCase().includes('authenticate')
   const hasVpnText = (text: string) => text.includes('VPN') || text.includes('Proxy')
   const displayVpnButton = hasVpnText(status) || (minecraftJsonMessage && hasVpnText(JSON.stringify(minecraftJsonMessage)))
   const authReconnectAction = async () => {

From 1148378ce6d464b16bb9d1391e5a0aee770caa9f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 25 Jun 2025 15:11:18 +0300
Subject: [PATCH 614/753] fix vr again

---
 renderer/viewer/three/worldrendererThree.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 75cf473a..b4ae4961 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -111,7 +111,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   get cameraObject () {
-    return this.cameraContainer
+    return this.cameraGroupVr ?? this.cameraContainer
   }
 
   worldSwitchActions () {

From 2055579b729128ccba94b3decd54fa67d436dbe9 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 25 Jun 2025 15:22:07 +0300
Subject: [PATCH 615/753] feat: finally add block RESCALE support! Cobwebs and
 ascending rails are now rendered correctly

---
 renderer/viewer/lib/mesher/models.ts | 33 +++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index c2075764..a69d3e9a 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -336,7 +336,7 @@ function renderElement (world: World, cursor: Vec3, element: BlockElement, doAO:
     let localShift = null as any
 
     if (element.rotation && !needTiles) {
-      // todo do we support rescale?
+      // Rescale support for block model rotations
       localMatrix = buildRotationMatrix(
         element.rotation.axis,
         element.rotation.angle
@@ -349,6 +349,37 @@ function renderElement (world: World, cursor: Vec3, element: BlockElement, doAO:
           element.rotation.origin
         )
       )
+
+      // Apply rescale if specified
+      if (element.rotation.rescale) {
+        const FIT_TO_BLOCK_SCALE_MULTIPLIER = 2 - Math.sqrt(2)
+        const angleRad = element.rotation.angle * Math.PI / 180
+        const scale = Math.abs(Math.sin(angleRad)) * FIT_TO_BLOCK_SCALE_MULTIPLIER
+
+        // Get axis vector components (1 for the rotation axis, 0 for others)
+        const axisX = element.rotation.axis === 'x' ? 1 : 0
+        const axisY = element.rotation.axis === 'y' ? 1 : 0
+        const axisZ = element.rotation.axis === 'z' ? 1 : 0
+
+        // Create scale matrix: scale = (1 - axisComponent) * scaleFactor + 1
+        const scaleMatrix = [
+          [(1 - axisX) * scale + 1, 0, 0],
+          [0, (1 - axisY) * scale + 1, 0],
+          [0, 0, (1 - axisZ) * scale + 1]
+        ]
+
+        // Apply scaling to the transformation matrix
+        localMatrix = matmulmat3(localMatrix, scaleMatrix)
+
+        // Recalculate shift with the new matrix
+        localShift = vecsub3(
+          element.rotation.origin,
+          matmul3(
+            localMatrix,
+            element.rotation.origin
+          )
+        )
+      }
     }
 
     const aos: number[] = []

From 3a7f267b5bed997b55d6a9268d984e7b72c262f0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 26 Jun 2025 04:34:08 +0300
Subject: [PATCH 616/753] dont ignore patch failures

---
 package.json                     | 4 +++-
 src/mineflayer/websocket-core.ts | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3559169d..25cce1a5 100644
--- a/package.json
+++ b/package.json
@@ -227,7 +227,9 @@
       "cypress",
       "esbuild",
       "fsevents"
-    ]
+    ],
+    "ignorePatchFailures": false,
+    "allowUnusedPatches": false
   },
   "packageManager": "pnpm@10.8.0+sha512.0e82714d1b5b43c74610193cb20734897c1d00de89d0e18420aebc5977fa13d780a9cb05734624e81ebd81cc876cd464794850641c48b9544326b5622ca29971"
 }
diff --git a/src/mineflayer/websocket-core.ts b/src/mineflayer/websocket-core.ts
index d24bd6be..0edd2497 100644
--- a/src/mineflayer/websocket-core.ts
+++ b/src/mineflayer/websocket-core.ts
@@ -22,6 +22,8 @@ export const getWebsocketStream = async (host: string) => {
     ws.send(data)
   })
 
+  clientDuplex.on('error', () => {})
+
   ws.addEventListener('message', async message => {
     let { data } = message
     if (data instanceof Blob) {

From b839bb8b9baa4111400471cc74c96cc929aa21cc Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 26 Jun 2025 06:01:13 +0300
Subject: [PATCH 617/753] rm readme patching

---
 patches/minecraft-protocol.patch |  3 ---
 pnpm-lock.yaml                   | 16 ++++++++--------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch
index efc79176..a3a4a6a3 100644
--- a/patches/minecraft-protocol.patch
+++ b/patches/minecraft-protocol.patch
@@ -1,6 +1,3 @@
-diff --git a/README.md b/README.md
-deleted file mode 100644
-index fbcaa43667323a58b8110a4495938c2c6d2d6f83..0000000000000000000000000000000000000000
 diff --git a/src/client/chat.js b/src/client/chat.js
 index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aae0d1d337 100644
 --- a/src/client/chat.js
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 09cbe69b..fbdf89ac 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,7 +22,7 @@ overrides:
 
 patchedDependencies:
   minecraft-protocol:
-    hash: 1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37
+    hash: 09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762
     path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
@@ -142,7 +142,7 @@ importers:
         version: 3.89.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
@@ -13224,7 +13224,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.89.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13260,7 +13260,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.89.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -17131,7 +17131,7 @@ snapshots:
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
@@ -17450,7 +17450,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17549,7 +17549,7 @@ snapshots:
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.89.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
@@ -17573,7 +17573,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.89.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=1546deaf50efae3d6564fcc9f08da99d3ae8096ac98f420b87b48b8c9501fd37)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From 0b1bc76327b7834ab015d0b605e752def00d6cfa Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 26 Jun 2025 06:22:38 +0300
Subject: [PATCH 618/753] fix ws

---
 src/mineflayer/minecraft-protocol-extra.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mineflayer/minecraft-protocol-extra.ts b/src/mineflayer/minecraft-protocol-extra.ts
index f3cf11e3..65260979 100644
--- a/src/mineflayer/minecraft-protocol-extra.ts
+++ b/src/mineflayer/minecraft-protocol-extra.ts
@@ -31,7 +31,9 @@ export const pingServerVersion = async (ip: string, port?: number, mergeOptions:
       })
       if (mergeOptions.stream) {
         mergeOptions.stream.on('end', (err) => {
-          reject(new Error('Connection closed'))
+          setTimeout(() => {
+            reject(new Error('Connection closed. Please report if you see this but the server is actually fine.'))
+          })
         })
       }
     })

From eedd9f1b8f11ee21797d23f87aebbf591e95f29d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 27 Jun 2025 16:28:15 +0300
Subject: [PATCH 619/753] feat: Now settings and servers list synced via
 top-domain cookies! Eg different subdomains like s.mcraft.fun and mcraft.fun
 will now share the same settings! Can be disabled. feat: Now its possible to
 import data!

---
 rsbuild.config.ts                  |   1 +
 src/core/importExport.ts           | 219 +++++++++++++++++++++
 src/defaultOptions.ts              | 152 +++++++++++++++
 src/globalState.ts                 |   2 +
 src/optionsGuiScheme.tsx           |  76 +++-----
 src/optionsStorage.ts              | 165 +---------------
 src/react/StorageConflictModal.tsx |  94 +++++++++
 src/react/appStorageProvider.ts    | 294 +++++++++++++++++++++++++++--
 src/reactUi.tsx                    |   2 +
 9 files changed, 780 insertions(+), 225 deletions(-)
 create mode 100644 src/core/importExport.ts
 create mode 100644 src/defaultOptions.ts
 create mode 100644 src/react/StorageConflictModal.tsx

diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 5e76646e..548be4e2 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -140,6 +140,7 @@ const appConfig = defineConfig({
             'process.env.RELEASE_CHANGELOG': JSON.stringify(releaseChangelog),
             'process.env.DISABLE_SERVICE_WORKER': JSON.stringify(disableServiceWorker),
             'process.env.INLINED_APP_CONFIG': JSON.stringify(configSource === 'BUNDLED' ? configJson : null),
+            'process.env.ENABLE_COOKIE_STORAGE': JSON.stringify(process.env.ENABLE_COOKIE_STORAGE || true),
         },
     },
     server: {
diff --git a/src/core/importExport.ts b/src/core/importExport.ts
new file mode 100644
index 00000000..b3e26347
--- /dev/null
+++ b/src/core/importExport.ts
@@ -0,0 +1,219 @@
+import { appStorage } from '../react/appStorageProvider'
+import { getChangedSettings, options } from '../optionsStorage'
+import { customKeymaps } from '../controls'
+import { showInputsModal } from '../react/SelectOption'
+
+interface ExportedFile {
+  _about: string
+  options?: Record<string, any>
+  keybindings?: Record<string, any>
+  servers?: any[]
+  username?: string
+  proxy?: string
+  proxies?: string[]
+  accountTokens?: any[]
+}
+
+export const importData = async () => {
+  try {
+    const input = document.createElement('input')
+    input.type = 'file'
+    input.accept = '.json'
+    input.click()
+
+    const file = await new Promise<File>((resolve) => {
+      input.onchange = () => {
+        if (!input.files?.[0]) return
+        resolve(input.files[0])
+      }
+    })
+
+    const text = await file.text()
+    const data = JSON.parse(text)
+
+    if (!data._about?.includes('Minecraft Web Client')) {
+      const doContinue = confirm('This file does not appear to be a Minecraft Web Client profile. Continue anyway?')
+      if (!doContinue) return
+    }
+
+    // Build available data types for selection
+    const availableData: Record<keyof Omit<ExportedFile, '_about'>, { present: boolean, description: string }> = {
+      options: { present: !!data.options, description: 'Game settings and preferences' },
+      keybindings: { present: !!data.keybindings, description: 'Custom key mappings' },
+      servers: { present: !!data.servers, description: 'Saved server list' },
+      username: { present: !!data.username, description: 'Username' },
+      proxy: { present: !!data.proxy, description: 'Selected proxy server' },
+      proxies: { present: !!data.proxies, description: 'Global proxies list' },
+      accountTokens: { present: !!data.accountTokens, description: 'Account authentication tokens' },
+    }
+
+    // Filter to only present data types
+    const presentTypes = Object.fromEntries(Object.entries(availableData)
+      .filter(([_, info]) => info.present)
+      .map<any>(([key, info]) => [key, info]))
+
+    if (Object.keys(presentTypes).length === 0) {
+      alert('No compatible data found in the imported file.')
+      return
+    }
+
+    const importChoices = await showInputsModal('Select Data to Import', {
+      mergeData: {
+        type: 'checkbox',
+        label: 'Merge with existing data (uncheck to remove old data)',
+        defaultValue: true,
+      },
+      ...Object.fromEntries(Object.entries(presentTypes).map(([key, info]) => [key, {
+        type: 'checkbox',
+        label: info.description,
+        defaultValue: true,
+      }]))
+    }) as { mergeData: boolean } & Record<keyof ExportedFile, boolean>
+
+    if (!importChoices) return
+
+    const importedTypes: string[] = []
+    const shouldMerge = importChoices.mergeData
+
+    if (importChoices.options && data.options) {
+      if (shouldMerge) {
+        Object.assign(options, data.options)
+      } else {
+        for (const key of Object.keys(options)) {
+          if (key in data.options) {
+            options[key as any] = data.options[key]
+          }
+        }
+      }
+      importedTypes.push('settings')
+    }
+
+    if (importChoices.keybindings && data.keybindings) {
+      if (shouldMerge) {
+        Object.assign(customKeymaps, data.keybindings)
+      } else {
+        for (const key of Object.keys(customKeymaps)) delete customKeymaps[key]
+        Object.assign(customKeymaps, data.keybindings)
+      }
+      importedTypes.push('keybindings')
+    }
+
+    if (importChoices.servers && data.servers) {
+      if (shouldMerge && appStorage.serversList) {
+        // Merge by IP, update existing entries and add new ones
+        const existingIps = new Set(appStorage.serversList.map(s => s.ip))
+        const newServers = data.servers.filter(s => !existingIps.has(s.ip))
+        appStorage.serversList = [...appStorage.serversList, ...newServers]
+      } else {
+        appStorage.serversList = data.servers
+      }
+      importedTypes.push('servers')
+    }
+
+    if (importChoices.username && data.username) {
+      appStorage.username = data.username
+      importedTypes.push('username')
+    }
+
+    if ((importChoices.proxy && data.proxy) || (importChoices.proxies && data.proxies)) {
+      if (!appStorage.proxiesData) {
+        appStorage.proxiesData = { proxies: [], selected: '' }
+      }
+
+      if (importChoices.proxies && data.proxies) {
+        if (shouldMerge) {
+          // Merge unique proxies
+          const uniqueProxies = new Set([...appStorage.proxiesData.proxies, ...data.proxies])
+          appStorage.proxiesData.proxies = [...uniqueProxies]
+        } else {
+          appStorage.proxiesData.proxies = data.proxies
+        }
+        importedTypes.push('proxies list')
+      }
+
+      if (importChoices.proxy && data.proxy) {
+        appStorage.proxiesData.selected = data.proxy
+        importedTypes.push('selected proxy')
+      }
+    }
+
+    if (importChoices.accountTokens && data.accountTokens) {
+      if (shouldMerge && appStorage.authenticatedAccounts) {
+        // Merge by unique identifier (assuming accounts have some unique ID or username)
+        const existingAccounts = new Set(appStorage.authenticatedAccounts.map(a => a.username))
+        const newAccounts = data.accountTokens.filter(a => !existingAccounts.has(a.username))
+        appStorage.authenticatedAccounts = [...appStorage.authenticatedAccounts, ...newAccounts]
+      } else {
+        appStorage.authenticatedAccounts = data.accountTokens
+      }
+      importedTypes.push('account tokens')
+    }
+
+    alert(`Profile imported successfully! Imported data: ${importedTypes.join(', ')}.\nYou may need to reload the page for some changes to take effect.`)
+  } catch (err) {
+    console.error('Failed to import profile:', err)
+    alert('Failed to import profile: ' + (err.message || err))
+  }
+}
+
+export const exportData = async () => {
+  const data = await showInputsModal('Export Profile', {
+    profileName: {
+      type: 'text',
+    },
+    exportSettings: {
+      type: 'checkbox',
+      defaultValue: true,
+    },
+    exportKeybindings: {
+      type: 'checkbox',
+      defaultValue: true,
+    },
+    exportServers: {
+      type: 'checkbox',
+      defaultValue: true,
+    },
+    saveUsernameAndProxy: {
+      type: 'checkbox',
+      defaultValue: true,
+    },
+    exportGlobalProxiesList: {
+      type: 'checkbox',
+      defaultValue: false,
+    },
+    exportAccountTokens: {
+      type: 'checkbox',
+      defaultValue: false,
+    },
+  })
+  const fileName = `${data.profileName ? `${data.profileName}-` : ''}web-client-profile.json`
+  const json: ExportedFile = {
+    _about: 'Minecraft Web Client (mcraft.fun) Profile',
+    ...data.exportSettings ? {
+      options: getChangedSettings(),
+    } : {},
+    ...data.exportKeybindings ? {
+      keybindings: customKeymaps,
+    } : {},
+    ...data.exportServers ? {
+      servers: appStorage.serversList,
+    } : {},
+    ...data.saveUsernameAndProxy ? {
+      username: appStorage.username,
+      proxy: appStorage.proxiesData?.selected,
+    } : {},
+    ...data.exportGlobalProxiesList ? {
+      proxies: appStorage.proxiesData?.proxies,
+    } : {},
+    ...data.exportAccountTokens ? {
+      accountTokens: appStorage.authenticatedAccounts,
+    } : {},
+  }
+  const blob = new Blob([JSON.stringify(json, null, 2)], { type: 'application/json' })
+  const url = URL.createObjectURL(blob)
+  const a = document.createElement('a')
+  a.href = url
+  a.download = fileName
+  a.click()
+  URL.revokeObjectURL(url)
+}
diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
new file mode 100644
index 00000000..d2d510ec
--- /dev/null
+++ b/src/defaultOptions.ts
@@ -0,0 +1,152 @@
+export const defaultOptions = {
+  renderDistance: 3,
+  keepChunksDistance: 1,
+  multiplayerRenderDistance: 3,
+  closeConfirmation: true,
+  autoFullScreen: false,
+  mouseRawInput: true,
+  autoExitFullscreen: false,
+  localUsername: 'wanderer',
+  mouseSensX: 50,
+  mouseSensY: -1,
+  chatWidth: 320,
+  chatHeight: 180,
+  chatScale: 100,
+  chatOpacity: 100,
+  chatOpacityOpened: 100,
+  messagesLimit: 200,
+  volume: 50,
+  enableMusic: false,
+  // fov: 70,
+  fov: 75,
+  guiScale: 3,
+  autoRequestCompletions: true,
+  touchButtonsSize: 40,
+  touchButtonsOpacity: 80,
+  touchButtonsPosition: 12,
+  touchControlsPositions: getDefaultTouchControlsPositions(),
+  touchControlsSize: getTouchControlsSize(),
+  touchMovementType: 'modern' as 'modern' | 'classic',
+  touchInteractionType: 'classic' as 'classic' | 'buttons',
+  gpuPreference: 'default' as 'default' | 'high-performance' | 'low-power',
+  backgroundRendering: '20fps' as 'full' | '20fps' | '5fps',
+  /** @unstable */
+  disableAssets: false,
+  /** @unstable */
+  debugLogNotFrequentPackets: false,
+  unimplementedContainers: false,
+  dayCycleAndLighting: true,
+  loadPlayerSkins: true,
+  renderEars: true,
+  lowMemoryMode: false,
+  starfieldRendering: true,
+  enabledResourcepack: null as string | null,
+  useVersionsTextures: 'latest',
+  serverResourcePacks: 'prompt' as 'prompt' | 'always' | 'never',
+  showHand: true,
+  viewBobbing: true,
+  displayRecordButton: true,
+  packetsLoggerPreset: 'all' as 'all' | 'no-buffers',
+  serversAutoVersionSelect: 'auto' as 'auto' | 'latest' | '1.20.4' | string,
+  customChannels: false,
+  remoteContentNotSameOrigin: false as boolean | string[],
+  packetsRecordingAutoStart: false,
+  language: 'auto',
+  preciseMouseInput: false,
+  // todo ui setting, maybe enable by default?
+  waitForChunksRender: false as 'sp-only' | boolean,
+  jeiEnabled: true as boolean | Array<'creative' | 'survival' | 'adventure' | 'spectator'>,
+  modsSupport: false,
+  modsAutoUpdate: 'check' as 'check' | 'never' | 'always',
+  modsUpdatePeriodCheck: 24, // hours
+  preventBackgroundTimeoutKick: false,
+  preventSleep: false,
+  debugContro: false,
+  debugChatScroll: false,
+  chatVanillaRestrictions: true,
+  debugResponseTimeIndicator: false,
+  chatPingExtension: true,
+  // antiAliasing: false,
+  topRightTimeDisplay: 'only-fullscreen' as 'only-fullscreen' | 'always' | 'never',
+
+  clipWorldBelowY: undefined as undefined | number, // will be removed
+  disableSignsMapsSupport: false,
+  singleplayerAutoSave: false,
+  showChunkBorders: false, // todo rename option
+  frameLimit: false as number | false,
+  alwaysBackupWorldBeforeLoading: undefined as boolean | undefined | null,
+  alwaysShowMobileControls: false,
+  excludeCommunicationDebugEvents: [],
+  preventDevReloadWhilePlaying: false,
+  numWorkers: 4,
+  localServerOptions: {
+    gameMode: 1
+  } as any,
+  preferLoadReadonly: false,
+  disableLoadPrompts: false,
+  guestUsername: 'guest',
+  askGuestName: true,
+  errorReporting: true,
+  /** Actually might be useful */
+  showCursorBlockInSpectator: false,
+  renderEntities: true,
+  smoothLighting: true,
+  newVersionsLighting: false,
+  chatSelect: true,
+  autoJump: 'auto' as 'auto' | 'always' | 'never',
+  autoParkour: false,
+  vrSupport: true, // doesn't directly affect the VR mode, should only disable the button which is annoying to android users
+  vrPageGameRendering: false,
+  renderDebug: 'basic' as 'none' | 'advanced' | 'basic',
+  rendererPerfDebugOverlay: false,
+
+  // advanced bot options
+  autoRespawn: false,
+  mutedSounds: [] as string[],
+  plugins: [] as Array<{ enabled: boolean, name: string, description: string, script: string }>,
+  /** Wether to popup sign editor on server action */
+  autoSignEditor: true,
+  wysiwygSignEditor: 'auto' as 'auto' | 'always' | 'never',
+  showMinimap: 'never' as 'always' | 'singleplayer' | 'never',
+  minimapOptimizations: true,
+  displayBossBars: true,
+  disabledUiParts: [] as string[],
+  neighborChunkUpdates: true,
+  highlightBlockColor: 'auto' as 'auto' | 'blue' | 'classic',
+  activeRenderer: 'threejs',
+  rendererSharedOptions: {
+    _experimentalSmoothChunkLoading: true,
+    _renderByChunks: false
+  }
+}
+
+function getDefaultTouchControlsPositions () {
+  return {
+    action: [
+      70,
+      76
+    ],
+    sneak: [
+      84,
+      76
+    ],
+    break: [
+      70,
+      57
+    ],
+    jump: [
+      84,
+      57
+    ],
+  } as Record<string, [number, number]>
+}
+
+function getTouchControlsSize () {
+  return {
+    joystick: 55,
+    action: 36,
+    break: 36,
+    jump: 36,
+    sneak: 36,
+  }
+}
diff --git a/src/globalState.ts b/src/globalState.ts
index 671d7907..b8982de7 100644
--- a/src/globalState.ts
+++ b/src/globalState.ts
@@ -46,6 +46,8 @@ export const showModal = (elem: /* (HTMLElement & Record<string, any>) |  */{ re
   activeModalStack.push(resolved)
 }
 
+window.showModal = showModal
+
 /**
  *
  * @returns true if previous modal was restored
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index 3409dc76..ba52e333 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -20,6 +20,7 @@ import { getVersionAutoSelect } from './connect'
 import { createNotificationProgressReporter } from './core/progressReporter'
 import { customKeymaps } from './controls'
 import { appStorage } from './react/appStorageProvider'
+import { exportData, importData } from './core/importExport'
 
 export const guiOptionsScheme: {
   [t in OptionsGroupType]: Array<{ [K in keyof AppOptions]?: Partial<OptionMeta<AppOptions[K]>> } & { custom? }>
@@ -532,6 +533,30 @@ export const guiOptionsScheme: {
         return <Button label='Export/Import...' onClick={() => openOptionsMenu('export-import')} inScreen />
       }
     },
+    {
+      custom () {
+        const { cookieStorage } = useSnapshot(appStorage)
+        return <Button
+          label={`Storage: ${cookieStorage ? 'Synced Cookies' : 'Local Storage'}`} onClick={() => {
+            appStorage.cookieStorage = !cookieStorage
+            alert('Reload the page to apply this change')
+          }}
+          inScreen
+        />
+      }
+    },
+    {
+      custom () {
+        const { cookieStorage } = useSnapshot(appStorage)
+        return <Button
+          label={`Storage: ${cookieStorage ? 'Synced Cookies' : 'Local Storage'}`} onClick={() => {
+            appStorage.cookieStorage = !cookieStorage
+            alert('Reload the page to apply this change')
+          }}
+          inScreen
+        />
+      }
+    },
     {
       custom () {
         return <Category>Server Connection</Category>
@@ -637,8 +662,7 @@ export const guiOptionsScheme: {
       custom () {
         return <Button
           inScreen
-          disabled={true}
-          onClick={() => {}}
+          onClick={importData}
         >Import Data</Button>
       }
     },
@@ -646,53 +670,7 @@ export const guiOptionsScheme: {
       custom () {
         return <Button
           inScreen
-          onClick={async () => {
-            const data = await showInputsModal('Export Profile', {
-              profileName: {
-                type: 'text',
-              },
-              exportSettings: {
-                type: 'checkbox',
-                defaultValue: true,
-              },
-              exportKeybindings: {
-                type: 'checkbox',
-                defaultValue: true,
-              },
-              exportServers: {
-                type: 'checkbox',
-                defaultValue: true,
-              },
-              saveUsernameAndProxy: {
-                type: 'checkbox',
-                defaultValue: true,
-              },
-            })
-            const fileName = `${data.profileName ? `${data.profileName}-` : ''}web-client-profile.json`
-            const json = {
-              _about: 'Minecraft Web Client (mcraft.fun) Profile',
-              ...data.exportSettings ? {
-                options: getChangedSettings(),
-              } : {},
-              ...data.exportKeybindings ? {
-                keybindings: customKeymaps,
-              } : {},
-              ...data.exportServers ? {
-                servers: appStorage.serversList,
-              } : {},
-              ...data.saveUsernameAndProxy ? {
-                username: appStorage.username,
-                proxy: appStorage.proxiesData?.selected,
-              } : {},
-            }
-            const blob = new Blob([JSON.stringify(json, null, 2)], { type: 'application/json' })
-            const url = URL.createObjectURL(blob)
-            const a = document.createElement('a')
-            a.href = url
-            a.download = fileName
-            a.click()
-            URL.revokeObjectURL(url)
-          }}
+          onClick={exportData}
         >Export Data</Button>
       }
     },
diff --git a/src/optionsStorage.ts b/src/optionsStorage.ts
index 882610f8..22d5ef26 100644
--- a/src/optionsStorage.ts
+++ b/src/optionsStorage.ts
@@ -5,161 +5,10 @@ import { appQueryParams, appQueryParamsArray } from './appParams'
 import type { AppConfig } from './appConfig'
 import { appStorage } from './react/appStorageProvider'
 import { miscUiState } from './globalState'
+import { defaultOptions } from './defaultOptions'
 
 const isDev = process.env.NODE_ENV === 'development'
 const initialAppConfig = process.env?.INLINED_APP_CONFIG as AppConfig ?? {}
-const defaultOptions = {
-  renderDistance: 3,
-  keepChunksDistance: 1,
-  multiplayerRenderDistance: 3,
-  closeConfirmation: true,
-  autoFullScreen: false,
-  mouseRawInput: true,
-  autoExitFullscreen: false,
-  localUsername: 'wanderer',
-  mouseSensX: 50,
-  mouseSensY: -1,
-  chatWidth: 320,
-  chatHeight: 180,
-  chatScale: 100,
-  chatOpacity: 100,
-  chatOpacityOpened: 100,
-  messagesLimit: 200,
-  volume: 50,
-  enableMusic: false,
-  // fov: 70,
-  fov: 75,
-  guiScale: 3,
-  autoRequestCompletions: true,
-  touchButtonsSize: 40,
-  touchButtonsOpacity: 80,
-  touchButtonsPosition: 12,
-  touchControlsPositions: getDefaultTouchControlsPositions(),
-  touchControlsSize: getTouchControlsSize(),
-  touchMovementType: 'modern' as 'modern' | 'classic',
-  touchInteractionType: 'classic' as 'classic' | 'buttons',
-  gpuPreference: 'default' as 'default' | 'high-performance' | 'low-power',
-  backgroundRendering: '20fps' as 'full' | '20fps' | '5fps',
-  /** @unstable */
-  disableAssets: false,
-  /** @unstable */
-  debugLogNotFrequentPackets: false,
-  unimplementedContainers: false,
-  dayCycleAndLighting: true,
-  loadPlayerSkins: true,
-  renderEars: true,
-  lowMemoryMode: false,
-  starfieldRendering: true,
-  enabledResourcepack: null as string | null,
-  useVersionsTextures: 'latest',
-  serverResourcePacks: 'prompt' as 'prompt' | 'always' | 'never',
-  showHand: true,
-  viewBobbing: true,
-  displayRecordButton: true,
-  packetsLoggerPreset: 'all' as 'all' | 'no-buffers',
-  serversAutoVersionSelect: 'auto' as 'auto' | 'latest' | '1.20.4' | string,
-  customChannels: false,
-  remoteContentNotSameOrigin: false as boolean | string[],
-  packetsRecordingAutoStart: false,
-  language: 'auto',
-  preciseMouseInput: false,
-  // todo ui setting, maybe enable by default?
-  waitForChunksRender: false as 'sp-only' | boolean,
-  jeiEnabled: true as boolean | Array<'creative' | 'survival' | 'adventure' | 'spectator'>,
-  modsSupport: false,
-  modsAutoUpdate: 'check' as 'check' | 'never' | 'always',
-  modsUpdatePeriodCheck: 24, // hours
-  preventBackgroundTimeoutKick: false,
-  preventSleep: false,
-  debugContro: false,
-  debugChatScroll: false,
-  chatVanillaRestrictions: true,
-  debugResponseTimeIndicator: false,
-  chatPingExtension: true,
-  // antiAliasing: false,
-  topRightTimeDisplay: 'only-fullscreen' as 'only-fullscreen' | 'always' | 'never',
-
-  clipWorldBelowY: undefined as undefined | number, // will be removed
-  disableSignsMapsSupport: false,
-  singleplayerAutoSave: false,
-  showChunkBorders: false, // todo rename option
-  frameLimit: false as number | false,
-  alwaysBackupWorldBeforeLoading: undefined as boolean | undefined | null,
-  alwaysShowMobileControls: false,
-  excludeCommunicationDebugEvents: [],
-  preventDevReloadWhilePlaying: false,
-  numWorkers: 4,
-  localServerOptions: {
-    gameMode: 1
-  } as any,
-  preferLoadReadonly: false,
-  disableLoadPrompts: false,
-  guestUsername: 'guest',
-  askGuestName: true,
-  errorReporting: true,
-  /** Actually might be useful */
-  showCursorBlockInSpectator: false,
-  renderEntities: true,
-  smoothLighting: true,
-  newVersionsLighting: false,
-  chatSelect: true,
-  autoJump: 'auto' as 'auto' | 'always' | 'never',
-  autoParkour: false,
-  vrSupport: true, // doesn't directly affect the VR mode, should only disable the button which is annoying to android users
-  vrPageGameRendering: false,
-  renderDebug: 'basic' as 'none' | 'advanced' | 'basic',
-  rendererPerfDebugOverlay: false,
-
-  // advanced bot options
-  autoRespawn: false,
-  mutedSounds: [] as string[],
-  plugins: [] as Array<{ enabled: boolean, name: string, description: string, script: string }>,
-  /** Wether to popup sign editor on server action */
-  autoSignEditor: true,
-  wysiwygSignEditor: 'auto' as 'auto' | 'always' | 'never',
-  showMinimap: 'never' as 'always' | 'singleplayer' | 'never',
-  minimapOptimizations: true,
-  displayBossBars: true,
-  disabledUiParts: [] as string[],
-  neighborChunkUpdates: true,
-  highlightBlockColor: 'auto' as 'auto' | 'blue' | 'classic',
-  activeRenderer: 'threejs',
-  rendererSharedOptions: {
-    _experimentalSmoothChunkLoading: true,
-    _renderByChunks: false
-  }
-}
-
-function getDefaultTouchControlsPositions () {
-  return {
-    action: [
-      70,
-      76
-    ],
-    sneak: [
-      84,
-      76
-    ],
-    break: [
-      70,
-      57
-    ],
-    jump: [
-      84,
-      57
-    ],
-  } as Record<string, [number, number]>
-}
-
-function getTouchControlsSize () {
-  return {
-    joystick: 55,
-    action: 36,
-    break: 36,
-    jump: 36,
-    sneak: 36,
-  }
-}
 
 // const qsOptionsRaw = new URLSearchParams(location.search).getAll('setting')
 const qsOptionsRaw = appQueryParamsArray.setting ?? []
@@ -191,15 +40,15 @@ const migrateOptions = (options: Partial<AppOptions & Record<string, any>>) => {
   return options
 }
 const migrateOptionsLocalStorage = () => {
-  if (Object.keys(appStorage.options).length) {
-    for (const key of Object.keys(appStorage.options)) {
+  if (Object.keys(appStorage['options'] ?? {}).length) {
+    for (const key of Object.keys(appStorage['options'])) {
       if (!(key in defaultOptions)) continue // drop unknown options
       const defaultValue = defaultOptions[key]
-      if (JSON.stringify(defaultValue) !== JSON.stringify(appStorage.options[key])) {
-        appStorage.changedSettings[key] = appStorage.options[key]
+      if (JSON.stringify(defaultValue) !== JSON.stringify(appStorage['options'][key])) {
+        appStorage.changedSettings[key] = appStorage['options'][key]
       }
     }
-    appStorage.options = {}
+    delete appStorage['options']
   }
 }
 
@@ -311,3 +160,5 @@ export const getAppLanguage = () => {
   }
   return options.language
 }
+
+export { defaultOptions } from './defaultOptions'
diff --git a/src/react/StorageConflictModal.tsx b/src/react/StorageConflictModal.tsx
new file mode 100644
index 00000000..9e20ca2d
--- /dev/null
+++ b/src/react/StorageConflictModal.tsx
@@ -0,0 +1,94 @@
+import { useSnapshot } from 'valtio'
+import { activeModalStack, hideCurrentModal } from '../globalState'
+import { resolveStorageConflicts, getStorageConflicts } from './appStorageProvider'
+import { useIsModalActive } from './utilsApp'
+import Screen from './Screen'
+import Button from './Button'
+
+const formatTimestamp = (timestamp?: number) => {
+  if (!timestamp) return 'Unknown time'
+  return new Date(timestamp).toLocaleString()
+}
+
+export default () => {
+  const isModalActive = useIsModalActive('storage-conflict')
+  const conflicts = getStorageConflicts()
+
+  if (!isModalActive/*  || conflicts.length === 0 */) return null
+
+  const conflictText = conflicts.map(conflict => {
+    const localTime = formatTimestamp(conflict.localStorageTimestamp)
+    const cookieTime = formatTimestamp(conflict.cookieTimestamp)
+    return `${conflict.key}: LocalStorage (${localTime}) vs Cookie (${cookieTime})`
+  }).join('\n')
+
+  return (
+    <div
+    >
+      <div style={{
+        background: '#dcb58f',
+        border: '2px solid #654321',
+        padding: '20px',
+        margin: '10px',
+        color: '#FFFFFF',
+        fontFamily: 'minecraft, monospace',
+        textAlign: 'center'
+      }}>
+        <div style={{
+          fontSize: '16px',
+          fontWeight: 'bold',
+          color: '#000000',
+          marginBottom: '15px'
+        }}>
+          Data Conflict Found
+        </div>
+
+        <div style={{
+          fontSize: '12px',
+          marginBottom: '20px',
+          whiteSpace: 'pre-line',
+          // backgroundColor: 'rgba(0, 0, 0, 0.5)',
+          color: '#642323',
+          padding: '10px',
+          // border: '1px solid #654321'
+        }}>
+          You have conflicting data between localStorage (old) and cookies (new, domain-synced) for the following settings:
+          {'\n\n'}
+          {conflictText}
+          {'\n\n'}
+          Please choose which version to keep:
+        </div>
+
+        <div style={{ display: 'flex', gap: '10px', justifyContent: 'center', fontSize: '8px', color: 'black' }}>
+          <div
+            onClick={() => {
+              resolveStorageConflicts(true) // Use localStorage
+              hideCurrentModal()
+            }}
+            style={{
+              border: '1px solid #654321',
+              padding: '8px 16px',
+              cursor: 'pointer'
+            }}
+          >
+            Use Local Storage & Disable Cookie Sync
+          </div>
+
+          <div
+            onClick={() => {
+              resolveStorageConflicts(false) // Use cookies
+              hideCurrentModal()
+            }}
+            style={{
+              border: '1px solid #654321',
+              padding: '8px 16px',
+              cursor: 'pointer'
+            }}
+          >
+            Use Cookie Data & Remove Local Data
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index 499ec71c..bee8e408 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -8,7 +8,9 @@ import type { BaseServerInfo } from './AddServerOrConnect'
 
 // when opening html file locally in browser, localStorage is shared between all ever opened html files, so we try to avoid conflicts
 const localStoragePrefix = process.env?.SINGLE_FILE_BUILD ? 'minecraft-web-client:' : ''
+const cookiePrefix = ''
 const { localStorage } = window
+const migrateRemoveLocalStorage = false
 
 export interface SavedProxiesData {
   proxies: string[]
@@ -31,12 +33,19 @@ export interface StoreServerItem extends BaseServerInfo {
   isRecommended?: boolean
 }
 
+interface StorageConflict {
+  key: string
+  localStorageValue: any
+  localStorageTimestamp?: number
+  cookieValue: any
+  cookieTimestamp?: number
+}
+
 type StorageData = {
+  cookieStorage: boolean | { ignoreKeys: Array<keyof StorageData> }
   customCommands: Record<string, CustomCommand> | undefined
   username: string | undefined
   keybindings: UserOverridesConfig | undefined
-  /** @deprecated */
-  options: any
   changedSettings: any
   proxiesData: SavedProxiesData | undefined
   serversHistory: ServerHistoryEntry[]
@@ -46,10 +55,115 @@ type StorageData = {
   firstModsPageVisit: boolean
 }
 
+const cookieStoreKeys: Array<keyof StorageData> = [
+  'customCommands',
+  'username',
+  'keybindings',
+  'changedSettings',
+  'serversList',
+]
+
 const oldKeysAliases: Partial<Record<keyof StorageData, string>> = {
   serversHistory: 'serverConnectionHistory',
 }
 
+// Cookie storage functions
+const getCookieValue = (key: string): string | null => {
+  const cookie = document.cookie.split(';').find(c => c.trimStart().startsWith(`${cookiePrefix}${key}=`))
+  if (cookie) {
+    return decodeURIComponent(cookie.split('=')[1])
+  }
+  return null
+}
+
+const topLevelDomain = window.location.hostname.split('.').slice(-2).join('.')
+const cookieBase = `; Domain=.${topLevelDomain}; Path=/; SameSite=Strict; Secure`
+
+const setCookieValue = (key: string, value: string): boolean => {
+  try {
+    const cookieKey = `${cookiePrefix}${key}`
+    let cookie = `${cookieKey}=${encodeURIComponent(value)}`
+    cookie += `${cookieBase}; Max-Age=2147483647`
+
+    // Test if cookie exceeds size limit
+    if (cookie.length > 4096) {
+      throw new Error(`Cookie size limit exceeded for key '${key}'. Cookie size: ${cookie.length} bytes, limit: 4096 bytes.`)
+    }
+
+    document.cookie = cookie
+    return true
+  } catch (error) {
+    console.error(`Failed to set cookie for key '${key}':`, error)
+    window.showNotification(`Failed to save data to cookies: ${error.message}`, 'Consider switching to localStorage in advanced settings.', true)
+    return false
+  }
+}
+
+const deleteCookie = (key: string) => {
+  const cookieKey = `${cookiePrefix}${key}`
+  document.cookie = `${cookieKey}=; ${cookieBase}; expires=Thu, 01 Jan 1970 00:00:00 UTC;`
+}
+
+// Storage conflict detection and resolution
+let storageConflicts: StorageConflict[] = []
+
+const detectStorageConflicts = (): StorageConflict[] => {
+  const conflicts: StorageConflict[] = []
+
+  for (const key of cookieStoreKeys) {
+    const localStorageKey = `${localStoragePrefix}${key}`
+    const localStorageValue = localStorage.getItem(localStorageKey)
+    const cookieValue = getCookieValue(key)
+
+    if (localStorageValue && cookieValue) {
+      try {
+        const localParsed = JSON.parse(localStorageValue)
+        const cookieParsed = JSON.parse(cookieValue)
+
+        if (localParsed?.migrated) {
+          continue
+        }
+
+        // Extract timestamps if they exist
+        const localTimestamp = localParsed?.timestamp
+        const cookieTimestamp = cookieParsed?.timestamp
+
+        // Compare the actual data (excluding timestamp)
+        const localData = localTimestamp ? { ...localParsed } : localParsed
+        const cookieData = cookieTimestamp ? { ...cookieParsed } : cookieParsed
+        delete localData.timestamp
+        delete cookieData.timestamp
+
+        if (JSON.stringify(localData) !== JSON.stringify(cookieData)) {
+          conflicts.push({
+            key,
+            localStorageValue: localData,
+            localStorageTimestamp: localTimestamp,
+            cookieValue: cookieData,
+            cookieTimestamp
+          })
+        }
+      } catch (e) {
+        console.error(`Failed to parse storage values for conflict detection on key '${key}':`, e, localStorageValue, cookieValue)
+      }
+    }
+  }
+
+  return conflicts
+}
+
+const showStorageConflictModal = () => {
+  // Import showModal dynamically to avoid circular dependency
+  const showModal = (window as any).showModal || ((modal: any) => {
+    console.error('Modal system not available:', modal)
+    console.warn('Storage conflicts detected but modal system not available:', storageConflicts)
+  })
+
+  setTimeout(() => {
+    showModal({ reactType: 'storage-conflict', conflicts: storageConflicts })
+  }, 100)
+}
+
 const migrateLegacyData = () => {
   const proxies = localStorage.getItem('proxies')
   const selectedProxy = localStorage.getItem('selectedProxy')
@@ -75,10 +189,10 @@ const migrateLegacyData = () => {
 }
 
 const defaultStorageData: StorageData = {
+  cookieStorage: !!process.env.ENABLE_COOKIE_STORAGE && !process.env?.SINGLE_FILE_BUILD,
   customCommands: undefined,
   username: undefined,
   keybindings: undefined,
-  options: {},
   changedSettings: {},
   proxiesData: undefined,
   serversHistory: [],
@@ -108,29 +222,140 @@ export const getRandomUsername = (appConfig: AppConfig) => {
 
 export const appStorage = proxy({ ...defaultStorageData })
 
-// Restore data from localStorage
-for (const key of Object.keys(defaultStorageData)) {
-  const prefixedKey = `${localStoragePrefix}${key}`
-  const aliasedKey = oldKeysAliases[key]
-  const storedValue = localStorage.getItem(prefixedKey) ?? (aliasedKey ? localStorage.getItem(aliasedKey) : undefined)
-  if (storedValue) {
+// Check if cookie storage should be used (will be set by options)
+const shouldUseCookieStorage = () => {
+  const isSecureCookiesAvailable = () => {
+    // either https or localhost
+    return window.location.protocol === 'https:' || window.location.hostname === 'localhost'
+  }
+  if (!isSecureCookiesAvailable()) {
+    return false
+  }
+
+  const localStorageValue = localStorage.getItem(`${localStoragePrefix}cookieStorage`)
+  if (localStorageValue === null) {
+    return appStorage.cookieStorage === true
+  }
+  return localStorageValue === 'true'
+}
+
+// Restore data from storage with conflict detection
+const restoreStorageData = () => {
+  const useCookieStorage = shouldUseCookieStorage()
+
+  if (useCookieStorage) {
+    // Detect conflicts first
+    storageConflicts = detectStorageConflicts()
+
+    if (storageConflicts.length > 0) {
+      // Show conflict resolution modal
+      showStorageConflictModal()
+      return // Don't restore data until conflict is resolved
+    }
+  }
+
+  for (const key of Object.keys(defaultStorageData)) {
+    const typedKey = key
+    const prefixedKey = `${localStoragePrefix}${key}`
+    const aliasedKey = oldKeysAliases[typedKey]
+
+    let storedValue: string | null = null
+    let cookieValueCanBeUsed = false
+    let usingLocalStorageValue = false
+
+    // Try cookie storage first if enabled and key is in cookieStoreKeys
+    if (useCookieStorage && cookieStoreKeys.includes(typedKey)) {
+      storedValue = getCookieValue(key)
+      cookieValueCanBeUsed = true
+    }
+
+    // Fallback to localStorage if no cookie value found
+    if (storedValue === null) {
+      storedValue = localStorage.getItem(prefixedKey) ?? (aliasedKey ? localStorage.getItem(aliasedKey) : null)
+      usingLocalStorageValue = true
+    }
+
+    if (storedValue) {
+      try {
+        let parsed = JSON.parse(storedValue)
+
+        // Handle timestamped data
+        if (parsed && typeof parsed === 'object' && parsed.timestamp) {
+          delete parsed.timestamp
+          // If it was a wrapped primitive, unwrap it
+          if ('data' in parsed && Object.keys(parsed).length === 1) {
+            parsed = parsed.data
+          }
+        }
+
+        appStorage[typedKey] = parsed
+
+        if (usingLocalStorageValue && cookieValueCanBeUsed) {
+          // migrate localStorage to cookie
+          saveKey(key)
+          markLocalStorageAsMigrated(key)
+        }
+      } catch (e) {
+        console.error(`Failed to parse stored value for ${key}:`, e)
+      }
+    }
+  }
+}
+
+const markLocalStorageAsMigrated = (key: keyof StorageData) => {
+  const localStorageKey = `${localStoragePrefix}${key}`
+  if (migrateRemoveLocalStorage) {
+    localStorage.removeItem(localStorageKey)
+    return
+  }
+
+  const data = localStorage.getItem(localStorageKey)
+  if (data) {
     try {
-      const parsed = JSON.parse(storedValue)
-      // appStorage[key] = parsed && typeof parsed === 'object' ? ref(parsed) : parsed
-      appStorage[key] = parsed
-    } catch (e) {
-      console.error(`Failed to parse stored value for ${key}:`, e)
+      localStorage.setItem(localStorageKey, JSON.stringify({ ...JSON.parse(data), migrated: Date.now() }))
+    } catch (err) {
     }
   }
 }
 
 const saveKey = (key: keyof StorageData) => {
+  const useCookieStorage = shouldUseCookieStorage()
   const prefixedKey = `${localStoragePrefix}${key}`
   const value = appStorage[key]
-  if (value === undefined) {
-    localStorage.removeItem(prefixedKey)
-  } else {
-    localStorage.setItem(prefixedKey, JSON.stringify(value))
+
+  const dataToSave = value === undefined ? undefined : (
+    value && typeof value === 'object' && !Array.isArray(value)
+      ? { ...value, timestamp: Date.now() }
+      : { data: value, timestamp: Date.now() }
+  )
+
+  const serialized = dataToSave === undefined ? undefined : JSON.stringify(dataToSave)
+
+  let useLocalStorage = true
+  // Save to cookie if enabled and key is in cookieStoreKeys
+  if (useCookieStorage && cookieStoreKeys.includes(key)) {
+    useLocalStorage = false
+    if (serialized === undefined) {
+      deleteCookie(key)
+    } else {
+      const success = setCookieValue(key, serialized)
+      if (success) {
+        // Remove from localStorage if cookie save was successful
+        markLocalStorageAsMigrated(key)
+      } else {
+        // Disabling for now so no confusing conflicts modal after page reload
+        // useLocalStorage = true
+      }
+    }
+  }
+
+  if (useLocalStorage) {
+    // Save to localStorage
+    if (value === undefined) {
+      localStorage.removeItem(prefixedKey)
+    } else {
+      localStorage.setItem(prefixedKey, JSON.stringify(value))
+    }
   }
 }
 
@@ -141,7 +366,6 @@ subscribe(appStorage, (ops) => {
     saveKey(key as keyof StorageData)
   }
 })
-// Subscribe to changes and save to localStorage
 
 export const resetAppStorage = () => {
   for (const key of Object.keys(appStorage)) {
@@ -153,6 +377,38 @@ export const resetAppStorage = () => {
       localStorage.removeItem(key)
     }
   }
+
+  if (!shouldUseCookieStorage()) return
+  const shouldContinue = window.confirm(`Removing all synced cookies will remove all data from all ${topLevelDomain} subdomains websites. Continue?`)
+  if (!shouldContinue) return
+
+  // Clear cookies
+  for (const key of cookieStoreKeys) {
+    deleteCookie(key)
+  }
 }
 
+// Export functions for conflict resolution
+export const resolveStorageConflicts = (useLocalStorage: boolean) => {
+  if (useLocalStorage) {
+    // Disable cookie storage and use localStorage data
+    appStorage.cookieStorage = false
+  } else {
+    // Remove localStorage data and continue using cookie storage
+    for (const conflict of storageConflicts) {
+      const prefixedKey = `${localStoragePrefix}${conflict.key}`
+      localStorage.removeItem(prefixedKey)
+    }
+  }
+
+  // Clear conflicts and restore data
+  storageConflicts = []
+  restoreStorageData()
+}
+
+export const getStorageConflicts = () => storageConflicts
+
 migrateLegacyData()
+
+// Restore data after checking for conflicts
+restoreStorageData()
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 8e94b35d..59ed9124 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -65,6 +65,7 @@ import RendererDebugMenu from './react/RendererDebugMenu'
 import CreditsAboutModal from './react/CreditsAboutModal'
 import GlobalOverlayHints from './react/GlobalOverlayHints'
 import FullscreenTime from './react/FullscreenTime'
+import StorageConflictModal from './react/StorageConflictModal'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -247,6 +248,7 @@ const App = () => {
 
             <SelectOption />
             <CreditsAboutModal />
+            <StorageConflictModal />
             <NoModalFoundProvider />
           </RobustPortal>
           <RobustPortal to={document.body}>

From af5a0b2835312945ea251014ba231977070bb70a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 27 Jun 2025 16:50:44 +0300
Subject: [PATCH 620/753] fix: fix camera desync updates in 3rd view and
 starfield

---
 renderer/viewer/lib/worldrendererCommon.ts  |  6 +--
 renderer/viewer/three/entities.ts           |  2 +-
 renderer/viewer/three/worldrendererThree.ts | 47 +++++++++++++++++----
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index dfa4f43b..4441201c 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -106,7 +106,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }>
   customTexturesDataUrl = undefined as string | undefined
   workers: any[] = []
-  viewerPosition?: Vec3
+  viewerChunkPosition?: Vec3
   lastCamUpdate = 0
   droppedFpsPercentage = 0
   initialChunkLoadWasStartedIn: number | undefined
@@ -499,7 +499,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   timeUpdated? (newTime: number): void
 
   updateViewerPosition (pos: Vec3) {
-    this.viewerPosition = pos
+    this.viewerChunkPosition = pos
     for (const [key, value] of Object.entries(this.loadedChunks)) {
       if (!value) continue
       this.updatePosDataChunk?.(key)
@@ -513,7 +513,7 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
   }
 
   getDistance (posAbsolute: Vec3) {
-    const [botX, botZ] = chunkPos(this.viewerPosition!)
+    const [botX, botZ] = chunkPos(this.viewerChunkPosition!)
     const dx = Math.abs(botX - Math.floor(posAbsolute.x / 16))
     const dz = Math.abs(botZ - Math.floor(posAbsolute.z / 16))
     return [dx, dz] as [number, number]
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index fea7f710..b4de4f1b 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -344,7 +344,7 @@ export class Entities {
     }
 
     const dt = this.clock.getDelta()
-    const botPos = this.worldRenderer.viewerPosition
+    const botPos = this.worldRenderer.viewerChunkPosition
     const VISIBLE_DISTANCE = 10 * 10
 
     // Update regular entities
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index b4ae4961..c4482052 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -88,7 +88,7 @@ export class WorldRendererThree extends WorldRendererCommon {
 
     this.renderer = renderer
     displayOptions.rendererState.renderer = WorldRendererThree.getRendererInfo(renderer) ?? '...'
-    this.starField = new StarField(this.scene)
+    this.starField = new StarField(this)
     this.cursorBlock = new CursorBlock(this)
     this.holdingBlock = new HoldingBlock(this)
     this.holdingBlockLeft = new HoldingBlock(this, true)
@@ -318,10 +318,11 @@ export class WorldRendererThree extends WorldRendererCommon {
     section.renderOrder = 500 - chunkDistance
   }
 
-  updateViewerPosition (pos: Vec3): void {
-    this.viewerPosition = pos
-    const cameraPos = this.cameraObject.position.toArray().map(x => Math.floor(x / 16)) as [number, number, number]
-    this.cameraSectionPos = new Vec3(...cameraPos)
+  override updateViewerPosition (pos: Vec3): void {
+    this.viewerChunkPosition = pos
+  }
+
+  cameraSectionPositionUpdate () {
     // eslint-disable-next-line guard-for-in
     for (const key in this.sectionObjects) {
       const value = this.sectionObjects[key]
@@ -447,11 +448,35 @@ export class WorldRendererThree extends WorldRendererCommon {
     return tex
   }
 
+  getCameraPosition () {
+    const worldPos = new THREE.Vector3()
+    this.camera.getWorldPosition(worldPos)
+    return worldPos
+  }
+
+  getWorldCameraPosition () {
+    const pos = this.getCameraPosition()
+    return new Vec3(
+      Math.floor(pos.x / 16),
+      Math.floor(pos.y / 16),
+      Math.floor(pos.z / 16)
+    )
+  }
+
+  updateCameraSectionPos () {
+    const newSectionPos = this.getWorldCameraPosition()
+    if (!this.cameraSectionPos.equals(newSectionPos)) {
+      this.cameraSectionPos = newSectionPos
+      this.cameraSectionPositionUpdate()
+    }
+  }
+
   setFirstPersonCamera (pos: Vec3 | null, yaw: number, pitch: number) {
     const yOffset = this.playerStateReactive.eyeHeight
 
     this.updateCamera(pos?.offset(0, yOffset, 0) ?? null, yaw, pitch)
     this.media.tryIntersectMedia()
+    this.updateCameraSectionPos()
   }
 
   getThirdPersonCamera (pos: THREE.Vector3 | null, yaw: number, pitch: number) {
@@ -636,6 +661,8 @@ export class WorldRendererThree extends WorldRendererCommon {
         }
       }
     }
+
+    this.updateCameraSectionPos()
   }
 
   debugChunksVisibilityOverride () {
@@ -988,7 +1015,9 @@ class StarField {
     }
   }
 
-  constructor (private readonly scene: THREE.Scene) {
+  constructor (
+    private readonly worldRenderer: WorldRendererThree
+  ) {
   }
 
   addToScene () {
@@ -1030,11 +1059,11 @@ class StarField {
 
     // Create points and add them to the scene
     this.points = new THREE.Points(geometry, material)
-    this.scene.add(this.points)
+    this.worldRenderer.scene.add(this.points)
 
     const clock = new THREE.Clock()
     this.points.onBeforeRender = (renderer, scene, camera) => {
-      this.points?.position.copy?.(camera.position)
+      this.points?.position.copy?.(this.worldRenderer.getCameraPosition())
       material.uniforms.time.value = clock.getElapsedTime() * speed
     }
     this.points.renderOrder = -1
@@ -1044,7 +1073,7 @@ class StarField {
     if (this.points) {
       this.points.geometry.dispose();
       (this.points.material as THREE.Material).dispose()
-      this.scene.remove(this.points)
+      this.worldRenderer.scene.remove(this.points)
 
       this.points = undefined
     }

From 83d783226fb2c726aac107b0c3c6b0b59727bdfc Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 27 Jun 2025 18:08:03 +0300
Subject: [PATCH 621/753] fix migration marking

---
 src/react/appStorageProvider.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index bee8e408..a9bac660 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -312,7 +312,12 @@ const markLocalStorageAsMigrated = (key: keyof StorageData) => {
   const data = localStorage.getItem(localStorageKey)
   if (data) {
     try {
-      localStorage.setItem(localStorageKey, JSON.stringify({ ...JSON.parse(data), migrated: Date.now() }))
+      const parsed = JSON.parse(data)
+      localStorage.setItem(
+        localStorageKey, JSON.stringify(typeof parsed === 'object' ? {
+          ...parsed, migrated: Date.now()
+        } : { data: parsed, migrated: Date.now() })
+      )
     } catch (err) {
     }
   }

From 3336680a0ee5d8b3f5bc030388de19f57c17373c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 27 Jun 2025 18:08:33 +0300
Subject: [PATCH 622/753] fix z index of modal

---
 src/react/StorageConflictModal.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/react/StorageConflictModal.tsx b/src/react/StorageConflictModal.tsx
index 9e20ca2d..0b4224f3 100644
--- a/src/react/StorageConflictModal.tsx
+++ b/src/react/StorageConflictModal.tsx
@@ -32,7 +32,8 @@ export default () => {
         margin: '10px',
         color: '#FFFFFF',
         fontFamily: 'minecraft, monospace',
-        textAlign: 'center'
+        textAlign: 'center',
+        zIndex: 1000,
       }}>
         <div style={{
           fontSize: '16px',

From 0e4435ef911a6160037dcdb970bcd3ee48a3fccb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 27 Jun 2025 22:06:10 +0300
Subject: [PATCH 623/753] feat: add support for /ping command, fix chat fading!

---
 src/react/Chat.css                 | 11 ++++---
 src/react/Chat.tsx                 | 47 +++++++++++++++++-------------
 src/react/ChatProvider.tsx         | 23 +++++++++++----
 src/react/StorageConflictModal.tsx |  3 ++
 src/react/appStorageProvider.ts    | 15 ++--------
 src/reactUi.tsx                    |  2 +-
 6 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/src/react/Chat.css b/src/react/Chat.css
index f1e92338..47394948 100644
--- a/src/react/Chat.css
+++ b/src/react/Chat.css
@@ -189,23 +189,22 @@ input[type=text],
   background-color: rgba(0, 0, 0, 0.5);
   list-style: none;
   overflow-wrap: break-word;
-}
-
-.chat-message-fadeout {
   opacity: 1;
-  transition: all 3s;
 }
 
-.chat-message-fade {
+.chat-message-fading {
   opacity: 0;
+  transition: opacity 3s ease-in-out;
 }
 
 .chat-message-faded {
-  transition: none !important;
+  display: none;
 }
 
+/* Ensure messages are always visible when chat is open */
 .chat.opened .chat-message {
   opacity: 1 !important;
+  display: block !important;
   transition: none !important;
 }
 
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 41a6cb6f..7c1c8633 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -11,19 +11,37 @@ import { useScrollBehavior } from './hooks/useScrollBehavior'
 export type Message = {
   parts: MessageFormatPart[],
   id: number
-  fading?: boolean
-  faded?: boolean
+  timestamp?: number
 }
 
-const MessageLine = ({ message, currentPlayerName }: { message: Message, currentPlayerName?: string }) => {
+const MessageLine = ({ message, currentPlayerName, chatOpened }: { message: Message, currentPlayerName?: string, chatOpened?: boolean }) => {
+  const [fadeState, setFadeState] = useState<'visible' | 'fading' | 'faded'>('visible')
+
+  useEffect(() => {
+    // Start fading after 5 seconds
+    const fadeTimeout = setTimeout(() => {
+      setFadeState('fading')
+    }, 5000)
+
+    // Remove after fade animation (3s) completes
+    const removeTimeout = setTimeout(() => {
+      setFadeState('faded')
+    }, 8000)
+
+    // Cleanup timeouts if component unmounts
+    return () => {
+      clearTimeout(fadeTimeout)
+      clearTimeout(removeTimeout)
+    }
+  }, []) // Empty deps array since we only want this to run once when message is added
+
   const classes = {
-    'chat-message-fadeout': message.fading,
-    'chat-message-fade': message.fading,
-    'chat-message-faded': message.faded,
-    'chat-message': true
+    'chat-message': true,
+    'chat-message-fading': !chatOpened && fadeState === 'fading',
+    'chat-message-faded': !chatOpened && fadeState === 'faded'
   }
 
-  return <li className={Object.entries(classes).filter(([, val]) => val).map(([name]) => name).join(' ')}>
+  return <li className={Object.entries(classes).filter(([, val]) => val).map(([name]) => name).join(' ')} data-time={message.timestamp ? new Date(message.timestamp).toLocaleString('en-US', { hour12: false }) : undefined}>
     {message.parts.map((msg, i) => {
       // Check if this is a text part that might contain a mention
       if (msg.text && currentPlayerName) {
@@ -70,17 +88,6 @@ export const chatInputValueGlobal = proxy({
   value: ''
 })
 
-export const fadeMessage = (message: Message, initialTimeout: boolean, requestUpdate: () => void) => {
-  setTimeout(() => {
-    message.fading = true
-    requestUpdate()
-    setTimeout(() => {
-      message.faded = true
-      requestUpdate()
-    }, 3000)
-  }, initialTimeout ? 5000 : 0)
-}
-
 export default ({
   messages,
   opacity = 1,
@@ -372,7 +379,7 @@ export default ({
             </div>
           )}
           {messages.map((m) => (
-            <MessageLine key={reactKeyForMessage(m)} message={m} currentPlayerName={playerNameValidated} />
+            <MessageLine key={reactKeyForMessage(m)} message={m} currentPlayerName={playerNameValidated} chatOpened={opened} />
           ))}
         </div> || undefined}
       </div>
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 83691b83..0bb13285 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -5,7 +5,7 @@ import { getBuiltinCommandsList, tryHandleBuiltinCommand } from '../builtinComma
 import { gameAdditionalState, hideCurrentModal, miscUiState } from '../globalState'
 import { options } from '../optionsStorage'
 import { viewerVersionState } from '../viewerConnector'
-import Chat, { Message, fadeMessage } from './Chat'
+import Chat, { Message } from './Chat'
 import { useIsModalActive } from './utilsApp'
 import { hideNotification, notificationProxy, showNotification } from './NotificationProvider'
 import { getServerIndex, updateLoadedServerData } from './serversStorage'
@@ -16,6 +16,7 @@ export default () => {
   const [messages, setMessages] = useState([] as Message[])
   const isChatActive = useIsModalActive('chat')
   const lastMessageId = useRef(0)
+  const lastPingTime = useRef(0)
   const usingTouch = useSnapshot(miscUiState).currentTouch
   const { chatSelect, messagesLimit, chatOpacity, chatOpacityOpened, chatVanillaRestrictions, debugChatScroll, chatPingExtension } = useSnapshot(options)
   const isUsingMicrosoftAuth = useMemo(() => !!lastConnectOptions.value?.authenticatedAccount, [])
@@ -29,18 +30,23 @@ export default () => {
         jsonMsg = jsonMsg['unsigned']
       }
       const parts = formatMessage(jsonMsg)
+      const messageText = parts.map(part => part.text).join('')
+
+      // Handle ping response
+      if (messageText === 'Pong!' && lastPingTime.current > 0) {
+        const latency = Date.now() - lastPingTime.current
+        parts.push({ text: ` Latency: ${latency}ms`, color: '#00ff00' })
+        lastPingTime.current = 0
+      }
 
       setMessages(m => {
         lastMessageId.current++
         const newMessage: Message = {
           parts,
           id: lastMessageId.current,
-          faded: false,
+          timestamp: Date.now()
         }
-        fadeMessage(newMessage, true, () => {
-          // eslint-disable-next-line max-nested-callbacks
-          setMessages(m => [...m])
-        })
+
         return [...m, newMessage].slice(-messagesLimit)
       })
     })
@@ -61,6 +67,11 @@ export default () => {
       return players.filter(name => (!value || name.toLowerCase().includes(value.toLowerCase())) && name !== bot.username).map(name => `@${name}`)
     }}
     sendMessage={async (message) => {
+      // Record ping command time
+      if (message === '/ping') {
+        lastPingTime.current = Date.now()
+      }
+
       const builtinHandled = tryHandleBuiltinCommand(message)
       if (getServerIndex() !== undefined && (message.startsWith('/login') || message.startsWith('/register'))) {
         showNotification('Click here to save your password in browser for auto-login', undefined, false, undefined, () => {
diff --git a/src/react/StorageConflictModal.tsx b/src/react/StorageConflictModal.tsx
index 0b4224f3..ac78d90a 100644
--- a/src/react/StorageConflictModal.tsx
+++ b/src/react/StorageConflictModal.tsx
@@ -34,6 +34,9 @@ export default () => {
         fontFamily: 'minecraft, monospace',
         textAlign: 'center',
         zIndex: 1000,
+        position: 'fixed',
+        left: 0,
+        right: 0
       }}>
         <div style={{
           fontSize: '16px',
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index a9bac660..c65cc701 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -120,7 +120,7 @@ const detectStorageConflicts = (): StorageConflict[] => {
         const localParsed = JSON.parse(localStorageValue)
         const cookieParsed = JSON.parse(cookieValue)
 
-        if (localParsed?.migrated) {
+        if (localStorage.getItem(`${localStorageKey}:migrated`)) {
           continue
         }
 
@@ -309,18 +309,7 @@ const markLocalStorageAsMigrated = (key: keyof StorageData) => {
     return
   }
 
-  const data = localStorage.getItem(localStorageKey)
-  if (data) {
-    try {
-      const parsed = JSON.parse(data)
-      localStorage.setItem(
-        localStorageKey, JSON.stringify(typeof parsed === 'object' ? {
-          ...parsed, migrated: Date.now()
-        } : { data: parsed, migrated: Date.now() })
-      )
-    } catch (err) {
-    }
-  }
+  localStorage.setItem(`${localStorageKey}:migrated`, 'true')
 }
 
 const saveKey = (key: keyof StorageData) => {
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 59ed9124..b15cb79d 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -229,6 +229,7 @@ const App = () => {
             <div />
           </RobustPortal>
           <EnterFullscreenButton />
+          <StorageConflictModal />
           <InGameUi />
           <RobustPortal to={document.querySelector('#ui-root')}>
             <AllWidgets />
@@ -248,7 +249,6 @@ const App = () => {
 
             <SelectOption />
             <CreditsAboutModal />
-            <StorageConflictModal />
             <NoModalFoundProvider />
           </RobustPortal>
           <RobustPortal to={document.body}>

From e161426caf15a29439b4bc77987c3630b1733c6f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 27 Jun 2025 22:11:49 +0300
Subject: [PATCH 624/753] always dipslay close buttons from settings

---
 src/react/OptionsItems.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/react/OptionsItems.tsx b/src/react/OptionsItems.tsx
index 4759b3d7..32f99b9e 100644
--- a/src/react/OptionsItems.tsx
+++ b/src/react/OptionsItems.tsx
@@ -189,18 +189,16 @@ interface Props {
 }
 
 export default ({ items, title, backButtonAction }: Props) => {
-  const { currentTouch } = useSnapshot(miscUiState)
 
   return <Screen
     title={title}
   >
     <div className='screen-items'>
-      {currentTouch && (
-        <div style={{ position: 'fixed', marginLeft: '-30px', display: 'flex', flexDirection: 'column', gap: 1, }}>
-          <Button icon={pixelartIcons['close']} onClick={hideAllModals} style={{ color: '#ff5d5d', }} />
-          <Button icon={pixelartIcons['chevron-left']} onClick={backButtonAction} style={{ color: 'yellow', }} />
-        </div>
-      )}
+      <div style={{ position: 'fixed', marginLeft: '-30px', display: 'flex', flexDirection: 'column', gap: 1, }}>
+        <Button icon={pixelartIcons['close']} onClick={hideAllModals} style={{ color: '#ff5d5d', }} />
+        <Button icon={pixelartIcons['chevron-left']} onClick={backButtonAction} style={{ color: 'yellow', }} />
+      </div>
+
       {items.map((element, i) => {
         // make sure its unique!
         return <RenderOption key={element.id ?? `${title}-${i}`} item={element} />

From 369166e0942cf234d34f31b587c4a08424129b09 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 28 Jun 2025 00:45:54 +0300
Subject: [PATCH 625/753] fix tsc, up readme

---
 README.MD                  |  6 ++++--
 src/react/Chat.stories.tsx | 11 +----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/README.MD b/README.MD
index 4769192a..5f7a83f6 100644
--- a/README.MD
+++ b/README.MD
@@ -6,9 +6,11 @@ Minecraft **clone** rewritten in TypeScript using the best modern web technologi
 
 You can try this out at [mcraft.fun](https://mcraft.fun/), [pcm.gg](https://pcm.gg) (short link), [mcon.vercel.app](https://mcon.vercel.app/) or the GitHub pages deploy. Every commit from the default (`develop`) branch is deployed to [s.mcraft.fun](https://s.mcraft.fun/) and [s.pcm.gg](https://s.pcm.gg/) - so it's usually newer, but might be less stable.
 
-Don't confuse with [Eaglercraft](https://git.eaglercraft.rip/eaglercraft/eaglercraft-1.8) which is a REAL vanilla Minecraft Java edition port to the web (but with its own limitations). Eaglercraft is a fully playable solution, but this project is more in position of a "technical demo" to show how it's possible to build games for web at scale entirely with the JS ecosystem. Have fun!
+> For Turkey/Russia use [ru.mcraft.fun](https://ru.mcraft.fun/) (since Cloudflare is blocked)
 
-For building the project yourself / contributing, see [Development, Debugging & Contributing](#development-debugging--contributing). For reference at what and how web technologies / frameworks are used, see [TECH.md](./TECH.md).
+Don't confuse with [Eaglercraft](https://git.eaglercraft.rip/eaglercraft/eaglercraft-1.8) which is a REAL vanilla Minecraft Java edition port to the web (but with its own limitations). Eaglercraft is a fully playable solution, meanwhile this project is aimed for *device-compatiiblity* and better performance so it feels portable, flexible and lightweight. It's also a very strong example on how to build true HTML games for the web at scale entirely with the JS ecosystem. Have fun!
+
+For building the project yourself / contributing, see [Development, Debugging & Contributing](#development-debugging--contributing). For reference at what and how web technologies / frameworks are used, see [TECH.md](./TECH.md) (also for comparison with Eaglercraft).
 
 ### Big Features
 
diff --git a/src/react/Chat.stories.tsx b/src/react/Chat.stories.tsx
index 192d5cb4..e1aaf761 100644
--- a/src/react/Chat.stories.tsx
+++ b/src/react/Chat.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react'
 
 import { useEffect, useState } from 'react'
 import { formatMessage } from '../chatUtils'
-import Chat, { fadeMessage, chatInputValueGlobal } from './Chat'
+import Chat, { chatInputValueGlobal } from './Chat'
 import Button from './Button'
 
 window.spamMessage = window.spamMessage ?? ''
@@ -63,14 +63,6 @@ const meta: Meta<typeof Chat> = {
       return () => clearInterval(interval)
     }, [autoSpam])
 
-    const fadeMessages = () => {
-      for (const m of messages) {
-        fadeMessage(m, false, () => {
-          setMessages([...messages])
-        })
-      }
-    }
-
     return <div style={{
       marginTop: args.usingTouch ? 100 : 0
     }}
@@ -88,7 +80,6 @@ const meta: Meta<typeof Chat> = {
         }}
       />
       <Button onClick={() => setOpen(s => !s)}>Open: {open ? 'on' : 'off'}</Button>
-      <Button onClick={() => fadeMessages()}>Fade</Button>
       <Button onClick={() => setAutoSpam(s => !s)}>Auto Spam: {autoSpam ? 'on' : 'off'}</Button>
       <Button onClick={() => setMessages(args.messages)}>Reset</Button>
     </div>

From fec887c28da80e2f50e28412ae81b89b2c6a76bf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 29 Jun 2025 00:56:37 +0300
Subject: [PATCH 626/753] deeply stringify gui items to avoid futher
 modifications

---
 pnpm-lock.yaml          | 26 +++++++++++++-------------
 src/inventoryWindows.ts | 13 +++++++++++--
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fbdf89ac..a034c919 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,7 +136,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13))
       minecraft-data:
         specifier: 3.89.0
         version: 3.89.0
@@ -338,10 +338,10 @@ importers:
         version: 0.2.59
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
-        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d(@types/react@18.3.18)(react@18.3.1)
+        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.10
         version: 0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
@@ -6705,8 +6705,8 @@ packages:
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d:
-    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d}
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379:
+    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379}
     version: 1.0.1
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284:
@@ -6736,8 +6736,8 @@ packages:
     resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d}
     version: 4.27.0
     engines: {node: '>=22'}
 
@@ -13346,7 +13346,7 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -16285,7 +16285,7 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -17127,12 +17127,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17443,7 +17443,7 @@ snapshots:
 
   minecraft-folder-path@1.2.0: {}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/f425e6a2db796d42cd2c09cf715dad841dec643d(@types/react@18.3.18)(react@18.3.1):
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@types/react@18.3.18)(react@18.3.1):
     dependencies:
       valtio: 1.13.2(@types/react@18.3.18)(react@18.3.1)
     transitivePeerDependencies:
@@ -17569,7 +17569,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/45f29f9fd1ad6d43d76bbd0b196f2ed4e675772b(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.89.0
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 05426d15..01d1691d 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -159,7 +159,9 @@ const getImage = ({ path = undefined as string | undefined, texture = undefined
   if (image) {
     return image
   }
-  if (!path && !texture) throw new Error('Either pass path or texture')
+  if (!path && !texture) {
+    throw new Error('Either pass path or texture')
+  }
   const loadPath = (blockData ? 'blocks' : path ?? texture)!
   if (loadedImagesCache.has(loadPath)) {
     onLoad()
@@ -201,6 +203,11 @@ const itemToVisualKey = (slot: RenderItem | Item | null) => {
   ].join('|')
   return keys
 }
+const validateSlot = (slot: any, index: number) => {
+  if (!slot.texture) {
+    throw new Error(`Slot has no texture: ${index} ${slot.name}`)
+  }
+}
 const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
   const newSlots = slots.map((slot, i) => {
     if (!slot) return null
@@ -210,6 +217,7 @@ const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
       const newKey = itemToVisualKey(slot)
       slot['cacheKey'] = i + '|' + newKey
       if (oldKey && oldKey === newKey) {
+        validateSlot(lastMappedSlots[i], i)
         return lastMappedSlots[i]
       }
     }
@@ -228,12 +236,13 @@ const mapSlots = (slots: Array<RenderItem | Item | null>, isJei = false) => {
         const { icon, ...rest } = slot
         return rest
       }
+      validateSlot(slot, i)
     } catch (err) {
       inGameError(err)
     }
     return slot
   })
-  lastMappedSlots = newSlots
+  lastMappedSlots = JSON.parse(JSON.stringify(newSlots))
   return newSlots
 }
 

From 34eecc166f9a39cc5438b649e9c972e51c0490ee Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 29 Jun 2025 02:38:19 +0300
Subject: [PATCH 627/753] feat: rework singleplayer generators types. now any
 generator can be used internally. add a few

---
 package.json                      |  2 +-
 pnpm-lock.yaml                    | 10 +++++-----
 src/loadSave.ts                   | 21 ---------------------
 src/react/CreateWorld.tsx         |  2 +-
 src/react/CreateWorldProvider.tsx | 22 +++-------------------
 src/sounds/botSoundSystem.ts      |  1 +
 6 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/package.json b/package.json
index 25cce1a5..516d57f3 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "express": "^4.18.2",
     "filesize": "^10.0.12",
-    "flying-squid": "npm:@zardoy/flying-squid@^0.0.59",
+    "flying-squid": "npm:@zardoy/flying-squid@^0.0.62",
     "framer-motion": "^12.9.2",
     "fs-extra": "^11.1.1",
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a034c919..f954791a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -117,8 +117,8 @@ importers:
         specifier: ^10.0.12
         version: 10.1.6
       flying-squid:
-        specifier: npm:@zardoy/flying-squid@^0.0.59
-        version: '@zardoy/flying-squid@0.0.59(encoding@0.1.13)'
+        specifier: npm:@zardoy/flying-squid@^0.0.62
+        version: '@zardoy/flying-squid@0.0.62(encoding@0.1.13)'
       framer-motion:
         specifier: ^12.9.2
         version: 12.9.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -3410,8 +3410,8 @@ packages:
     engines: {node: '>=8'}
     hasBin: true
 
-  '@zardoy/flying-squid@0.0.59':
-    resolution: {integrity: sha512-Ztrmv127csGovqJEWEtT19y1wGEB5tIVfneQ3+p/TirP/bTGYpLlW+Ns4sSAc4KrewUP9PW/6L0AtB69CWhQFQ==}
+  '@zardoy/flying-squid@0.0.62':
+    resolution: {integrity: sha512-M6icydO/yrmwevBhmgKcqEPC63AhWfU/Es9N/uadVrmKaxGm2FQMMLcybbutRYm1xZ6qsdxDUOUZnN56PsVwfQ==}
     engines: {node: '>=8'}
     hasBin: true
 
@@ -13249,7 +13249,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@zardoy/flying-squid@0.0.59(encoding@0.1.13)':
+  '@zardoy/flying-squid@0.0.62(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
       chalk: 5.4.1
diff --git a/src/loadSave.ts b/src/loadSave.ts
index 7c9f7277..f1676cff 100644
--- a/src/loadSave.ts
+++ b/src/loadSave.ts
@@ -85,7 +85,6 @@ export const loadSave = async (root = '/world', connectOptions?: Partial<Connect
   }
 
   let version: string | undefined | null
-  let isFlat = false
   if (levelDat) {
     version = appQueryParams.mapVersion ?? levelDat.Version?.Name
     if (!version) {
@@ -103,21 +102,6 @@ export const loadSave = async (root = '/world', connectOptions?: Partial<Connect
       version = prompt(`Version ${version} is not supported, supported versions are ${supportedVersions.join(', ')}, what try to use instead?`, lowerBound ? firstSupportedVersion : lastSupportedVersion)
       if (!version) return
     }
-    if (levelDat.WorldGenSettings) {
-      for (const [key, value] of Object.entries(levelDat.WorldGenSettings.dimensions)) {
-        if (key.slice(10) === 'overworld') {
-          if (value.generator.type === 'flat') isFlat = true
-          break
-        }
-      }
-    }
-
-    if (levelDat.generatorName) {
-      isFlat = levelDat.generatorName === 'flat'
-    }
-    if (!isFlat && levelDat.generatorName !== 'default' && levelDat.generatorName !== 'customized') {
-      // warnings.push(`Generator ${levelDat.generatorName} may not be supported yet, be careful of new chunks writes`)
-    }
 
     const playerUuid = nameToMcOfflineUUID(options.localUsername)
     const playerDatPath = `${root}/playerdata/${playerUuid}.dat`
@@ -188,11 +172,6 @@ export const loadSave = async (root = '/world', connectOptions?: Partial<Connect
     // todo check gamemode level.dat data etc
     detail: {
       version,
-      ...isFlat ? {
-        generation: {
-          name: 'superflat'
-        }
-      } : {},
       ...root === '/world' ? {} : {
         'worldFolder': root
       },
diff --git a/src/react/CreateWorld.tsx b/src/react/CreateWorld.tsx
index 32e67ddb..4cdf186d 100644
--- a/src/react/CreateWorld.tsx
+++ b/src/react/CreateWorld.tsx
@@ -11,7 +11,7 @@ import styles from './createWorld.module.css'
 import { InputOption, showInputsModal, showOptionsModal } from './SelectOption'
 
 // const worldTypes = ['default', 'flat', 'largeBiomes', 'amplified', 'customized', 'buffet', 'debug_all_block_states']
-const worldTypes = ['default', 'flat'/* , 'void' */]
+const worldTypes = ['default', 'flat', 'empty', 'nether', 'all_the_blocks']
 const gameModes = ['survival', 'creative'/* , 'adventure', 'spectator' */]
 
 export const creatingWorldState = proxy({
diff --git a/src/react/CreateWorldProvider.tsx b/src/react/CreateWorldProvider.tsx
index 6872474d..619a31f5 100644
--- a/src/react/CreateWorldProvider.tsx
+++ b/src/react/CreateWorldProvider.tsx
@@ -32,30 +32,14 @@ export default () => {
         const savePath = await uniqueFileNameFromWorldName(title, getWorldsPath())
         await mkdirRecursive(savePath)
         await loadPluginsIntoWorld(savePath, plugins)
-        let generation
-        if (type === 'flat') {
-          generation = {
-            name: 'superflat',
-          }
-        }
-        if (type === 'void') {
-          generation = {
-            name: 'superflat',
-            layers: [],
-            noDefaults: true
-          }
-        }
-        if (type === 'nether') {
-          generation = {
-            name: 'nether'
-          }
-        }
         hideCurrentModal()
         window.dispatchEvent(new CustomEvent('singleplayer', {
           detail: {
             levelName: title,
             version,
-            generation,
+            generation: {
+              name: type
+            },
             'worldFolder': savePath,
             gameMode: gameMode === 'survival' ? 0 : 1,
           },
diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 225aa345..0e23a98a 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -136,6 +136,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
   let lastStepSound = 0
   const movementHappening = async () => {
     if (!bot.entity || !soundMap) return // no info yet
+    if (appViewer.playerState.reactive.gameMode === 'spectator') return // Don't play step sounds in spectator mode
     const VELOCITY_THRESHOLD = 0.1
     const RUN_THRESHOLD = 0.15
     const { x, z, y } = bot.entity.velocity

From 6eae7136ecc9251ea41510a5b101d46372bad0a2 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 29 Jun 2025 15:34:25 +0300
Subject: [PATCH 628/753] fix storage conflict modal

---
 src/react/StorageConflictModal.tsx | 6 +++++-
 src/react/appStorageProvider.ts    | 9 ++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/react/StorageConflictModal.tsx b/src/react/StorageConflictModal.tsx
index ac78d90a..85affa7a 100644
--- a/src/react/StorageConflictModal.tsx
+++ b/src/react/StorageConflictModal.tsx
@@ -16,10 +16,14 @@ export default () => {
 
   if (!isModalActive/*  || conflicts.length === 0 */) return null
 
+  const clampText = (text: string) => {
+    return text.length > 30 ? text.slice(0, 30) + '...' : text
+  }
+
   const conflictText = conflicts.map(conflict => {
     const localTime = formatTimestamp(conflict.localStorageTimestamp)
     const cookieTime = formatTimestamp(conflict.cookieTimestamp)
-    return `${conflict.key}: LocalStorage (${localTime}) vs Cookie (${cookieTime})`
+    return `${conflict.key}: LocalStorage (${localTime}, ${clampText(conflict.localStorageValue)}) vs Cookie (${cookieTime}, ${clampText(conflict.cookieValue)})`
   }).join('\n')
 
   return (
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index c65cc701..e36d43cf 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -134,7 +134,14 @@ const detectStorageConflicts = (): StorageConflict[] => {
         delete localData.timestamp
         delete cookieData.timestamp
 
-        if (JSON.stringify(localData) !== JSON.stringify(cookieData)) {
+        const isDataEmpty = (data: any) => {
+          if (typeof data === 'object' && data !== null) {
+            return Object.keys(data).length === 0
+          }
+          return !data && data !== 0 && data !== false
+        }
+
+        if (JSON.stringify(localData) !== JSON.stringify(cookieData) && !isDataEmpty(localData) && !isDataEmpty(cookieData)) {
           conflicts.push({
             key,
             localStorageValue: localData,

From f2a11d0a73ab42de75509e76edc004483adb0a34 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sun, 29 Jun 2025 20:44:58 +0300
Subject: [PATCH 629/753] Steingify if needed

---
 src/react/StorageConflictModal.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/react/StorageConflictModal.tsx b/src/react/StorageConflictModal.tsx
index 85affa7a..966292d5 100644
--- a/src/react/StorageConflictModal.tsx
+++ b/src/react/StorageConflictModal.tsx
@@ -17,6 +17,7 @@ export default () => {
   if (!isModalActive/*  || conflicts.length === 0 */) return null
 
   const clampText = (text: string) => {
+    if (typeof text !== "string") text = JSON.stringify(text)
     return text.length > 30 ? text.slice(0, 30) + '...' : text
   }
 

From 31b91e5a335383ffe95838a038fb194d4f47288a Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Mon, 30 Jun 2025 02:06:45 +0300
Subject: [PATCH 630/753] add logging to sw unregistration on error

---
 index.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 5a6318ec..371e22b1 100644
--- a/index.html
+++ b/index.html
@@ -49,9 +49,13 @@
               if (window.navigator.maxTouchPoints > 1) window.location.hash = '#dev' // show eruda
               // unregister all sw
               if (window.navigator.serviceWorker) {
+                console.log('got worker')
                 window.navigator.serviceWorker.getRegistrations().then(registrations => {
                   registrations.forEach(registration => {
-                    registration.unregister()
+                    console.log('got registration')
+                    registration.unregister().then(() => {
+                      console.log('worker unregistered')
+                    })
                   })
                 })
               }

From dc2c5a2d88c3ba006645331b4603e8585e811866 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 30 Jun 2025 19:11:59 +0300
Subject: [PATCH 631/753] fix: make it run on ios 15!

---
 index.html                         | 15 ++++++++++++
 patches/pixelarticons@1.8.1.patch  |  7 +++---
 pnpm-lock.yaml                     | 38 +++++++++++++++---------------
 renderer/viewer/lib/utils/skins.ts | 14 +++++++++--
 renderer/viewer/three/entities.ts  |  6 ++---
 rsbuild.config.ts                  | 16 +++++++++++++
 src/react/StorageConflictModal.tsx |  2 +-
 7 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/index.html b/index.html
index 371e22b1..6471c495 100644
--- a/index.html
+++ b/index.html
@@ -27,6 +27,7 @@
         <div style="font-size: var(--font-size);color: rgb(176, 176, 176);margin-top: 3px;text-align: center" class="subtitle">A true Minecraft client in your browser!</div>
         <!-- small text pre -->
         <div style="font-size: calc(var(--font-size) * 0.6);color: rgb(150, 150, 150);margin-top: 3px;text-align: center;white-space: pre-line;" class="advanced-info"></div>
+        <div style="font-size: calc(var(--font-size) * 0.6);color: rgb(255, 100, 100);margin-top: 10px;text-align: center;display: none;" class="ios-warning">Only iOS 15+ is supported due to performance optimizations</div>
     </div>
 </div>
 `
@@ -36,6 +37,13 @@
           if (!window.pageLoaded) {
             document.documentElement.appendChild(loadingDivElem)
           }
+
+          // iOS version detection
+          const getIOSVersion = () => {
+            const match = navigator.userAgent.match(/OS (\d+)_(\d+)_?(\d+)?/);
+            return match ? parseInt(match[1], 10) : null;
+          }
+
           // load error handling
           const onError = (errorOrMessage, log = false) => {
             let message = errorOrMessage instanceof Error ? (errorOrMessage.stack ?? errorOrMessage.message) : errorOrMessage
@@ -46,6 +54,13 @@
               const [errorMessage, ...errorStack] = message.split('\n')
               document.querySelector('.initial-loader').querySelector('.subtitle').textContent = errorMessage
               document.querySelector('.initial-loader').querySelector('.advanced-info').textContent = errorStack.join('\n')
+
+              // Show iOS warning if applicable
+              const iosVersion = getIOSVersion();
+              if (iosVersion !== null && iosVersion < 15) {
+                document.querySelector('.initial-loader').querySelector('.ios-warning').style.display = 'block';
+              }
+
               if (window.navigator.maxTouchPoints > 1) window.location.hash = '#dev' // show eruda
               // unregister all sw
               if (window.navigator.serviceWorker) {
diff --git a/patches/pixelarticons@1.8.1.patch b/patches/pixelarticons@1.8.1.patch
index 10044536..b65b6f2b 100644
--- a/patches/pixelarticons@1.8.1.patch
+++ b/patches/pixelarticons@1.8.1.patch
@@ -1,5 +1,5 @@
 diff --git a/fonts/pixelart-icons-font.css b/fonts/pixelart-icons-font.css
-index 3b2ebe839370d96bf93ef5ca94a827f07e49378d..103ab4d6b9f3b5c9f41d1407e3cbf4ac392fbf41 100644
+index 3b2ebe839370d96bf93ef5ca94a827f07e49378d..4f8d76be2ca6e4ddc43c68d0a6f0f69979165ab4 100644
 --- a/fonts/pixelart-icons-font.css
 +++ b/fonts/pixelart-icons-font.css
 @@ -1,16 +1,13 @@
@@ -10,10 +10,11 @@ index 3b2ebe839370d96bf93ef5ca94a827f07e49378d..103ab4d6b9f3b5c9f41d1407e3cbf4ac
 +  src:
    url("pixelart-icons-font.woff2?t=1711815892278") format("woff2"),
    url("pixelart-icons-font.woff?t=1711815892278") format("woff"),
-   url('pixelart-icons-font.ttf?t=1711815892278') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+-  url('pixelart-icons-font.ttf?t=1711815892278') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
 -  url('pixelart-icons-font.svg?t=1711815892278#pixelart-icons-font') format('svg'); /* iOS 4.1- */
++  url('pixelart-icons-font.ttf?t=1711815892278') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
  }
- 
+
  [class^="pixelart-icons-font-"], [class*=" pixelart-icons-font-"] {
    font-family: 'pixelart-icons-font' !important;
 -  font-size:24px;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f954791a..2a46908a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -28,7 +28,7 @@ patchedDependencies:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
     path: patches/mineflayer-item-map-downloader@1.2.0.patch
   pixelarticons@1.8.1:
-    hash: d6a3d784047beba873565d1198bed425d9eb2de942e3fc8edac55f25473e4325
+    hash: 533230072bc402f425c86abd3d0356fe087b14cab2a254d93f419b083f2d8dfa
     path: patches/pixelarticons@1.8.1.patch
 
 importers:
@@ -136,13 +136,13 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13))
       minecraft-data:
         specifier: 3.89.0
         version: 3.89.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
@@ -160,7 +160,7 @@ importers:
         version: 1.5.4
       pixelarticons:
         specifier: ^1.8.1
-        version: 1.8.1(patch_hash=d6a3d784047beba873565d1198bed425d9eb2de942e3fc8edac55f25473e4325)
+        version: 1.8.1(patch_hash=533230072bc402f425c86abd3d0356fe087b14cab2a254d93f419b083f2d8dfa)
       pretty-bytes:
         specifier: ^6.1.1
         version: 6.1.1
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.10
         version: 0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
@@ -6709,8 +6709,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284}
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085}
     version: 1.57.0
     engines: {node: '>=22'}
 
@@ -6736,8 +6736,8 @@ packages:
     resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470}
     version: 4.27.0
     engines: {node: '>=22'}
 
@@ -13224,7 +13224,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.89.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13260,7 +13260,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.89.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -17127,12 +17127,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17450,7 +17450,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17549,7 +17549,7 @@ snapshots:
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.89.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
@@ -17569,11 +17569,11 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/0380bed150fe03db4ac37f0194e0cee98356647d(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.89.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/9e116c3dd4682b17c4e2c80249a2447a093d9284(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
@@ -18263,7 +18263,7 @@ snapshots:
 
   pirates@4.0.6: {}
 
-  pixelarticons@1.8.1(patch_hash=d6a3d784047beba873565d1198bed425d9eb2de942e3fc8edac55f25473e4325): {}
+  pixelarticons@1.8.1(patch_hash=533230072bc402f425c86abd3d0356fe087b14cab2a254d93f419b083f2d8dfa): {}
 
   pixelmatch@4.0.2:
     dependencies:
diff --git a/renderer/viewer/lib/utils/skins.ts b/renderer/viewer/lib/utils/skins.ts
index e0c8c32e..de5a3675 100644
--- a/renderer/viewer/lib/utils/skins.ts
+++ b/renderer/viewer/lib/utils/skins.ts
@@ -16,12 +16,22 @@ export const loadThreeJsTextureFromUrlSync = (imageUrl: string) => {
   }
 }
 
+export const createCanvas = (width: number, height: number): OffscreenCanvas => {
+  if (typeof OffscreenCanvas !== 'undefined') {
+    return new OffscreenCanvas(width, height)
+  }
+  const canvas = document.createElement('canvas')
+  canvas.width = width
+  canvas.height = height
+  return canvas as unknown as OffscreenCanvas // todo-low
+}
+
 export const loadThreeJsTextureFromUrl = async (imageUrl: string) => {
   const loaded = new THREE.TextureLoader().loadAsync(imageUrl)
   return loaded
 }
 export const loadThreeJsTextureFromBitmap = (image: ImageBitmap) => {
-  const canvas = new OffscreenCanvas(image.width, image.height)
+  const canvas = createCanvas(image.width, image.height)
   const ctx = canvas.getContext('2d')!
   ctx.drawImage(image, 0, 0)
   const texture = new THREE.Texture(canvas)
@@ -83,7 +93,7 @@ export async function loadSkinImage (skinUrl: string): Promise<{ canvas: Offscre
   }
 
   const image = await loadImageFromUrl(skinUrl)
-  const skinCanvas = new OffscreenCanvas(64, 64)
+  const skinCanvas = createCanvas(64, 64)
   loadSkinToCanvas(skinCanvas, image)
   return { canvas: skinCanvas, image }
 }
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index b4de4f1b..3e37102c 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -18,7 +18,7 @@ import { isEntityAttackable } from 'mineflayer-mouse/dist/attackableEntity'
 import { Vec3 } from 'vec3'
 import { EntityMetadataVersions } from '../../../src/mcDataTypes'
 import { ItemSpecificContextProperties } from '../lib/basePlayerState'
-import { loadSkinImage, loadSkinFromUsername, stevePngUrl, steveTexture } from '../lib/utils/skins'
+import { loadSkinImage, loadSkinFromUsername, stevePngUrl, steveTexture, createCanvas } from '../lib/utils/skins'
 import { loadTexture } from '../lib/utils'
 import { getBlockMeshFromModel } from './holdingBlock'
 import * as Entity from './entity/EntityMesh'
@@ -96,7 +96,7 @@ function getUsernameTexture ({
   nameTagBackgroundColor = 'rgba(0, 0, 0, 0.3)',
   nameTagTextOpacity = 255
 }: any, { fontFamily = 'sans-serif' }: any) {
-  const canvas = new OffscreenCanvas(64, 64)
+  const canvas = createCanvas(64, 64)
   const ctx = canvas.getContext('2d')
   if (!ctx) throw new Error('Could not get 2d context')
 
@@ -550,7 +550,7 @@ export class Entities {
       let skinCanvas: OffscreenCanvas
       if (skinUrl === stevePngUrl) {
         skinTexture = await steveTexture
-        const canvas = new OffscreenCanvas(64, 64)
+        const canvas = createCanvas(64, 64)
         const ctx = canvas.getContext('2d')
         if (!ctx) throw new Error('Failed to get context')
         ctx.drawImage(skinTexture.image, 0, 0)
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 548be4e2..f7cbfaac 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -111,6 +111,22 @@ const appConfig = defineConfig({
             js: 'source-map',
             css: true,
         },
+        minify: {
+            // js: false,
+            jsOptions: {
+                minimizerOptions: {
+                    mangle: {
+                        safari10: true,
+                        keep_classnames: true,
+                        keep_fnames: true,
+                        keep_private_props: true,
+                    },
+                    compress: {
+                        unused: true,
+                    },
+                },
+            },
+        },
         distPath: SINGLE_FILE_BUILD ? {
             html: './single',
         } : undefined,
diff --git a/src/react/StorageConflictModal.tsx b/src/react/StorageConflictModal.tsx
index 966292d5..e1d3299d 100644
--- a/src/react/StorageConflictModal.tsx
+++ b/src/react/StorageConflictModal.tsx
@@ -17,7 +17,7 @@ export default () => {
   if (!isModalActive/*  || conflicts.length === 0 */) return null
 
   const clampText = (text: string) => {
-    if (typeof text !== "string") text = JSON.stringify(text)
+    if (typeof text !== 'string') text = JSON.stringify(text)
     return text.length > 30 ? text.slice(0, 30) + '...' : text
   }
 

From 1310109c016c5911330abae186008237ae1bf025 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 30 Jun 2025 19:48:43 +0300
Subject: [PATCH 632/753] fix: username was not saved after properly after
 resolving the storage conflict

---
 rsbuild.config.ts               |  1 +
 src/react/appStorageProvider.ts | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index f7cbfaac..8bcbd75d 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -157,6 +157,7 @@ const appConfig = defineConfig({
             'process.env.DISABLE_SERVICE_WORKER': JSON.stringify(disableServiceWorker),
             'process.env.INLINED_APP_CONFIG': JSON.stringify(configSource === 'BUNDLED' ? configJson : null),
             'process.env.ENABLE_COOKIE_STORAGE': JSON.stringify(process.env.ENABLE_COOKIE_STORAGE || true),
+            'process.env.COOKIE_STORAGE_PREFIX': JSON.stringify(process.env.COOKIE_STORAGE_PREFIX || ''),
         },
     },
     server: {
diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index e36d43cf..bce6feca 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -8,7 +8,7 @@ import type { BaseServerInfo } from './AddServerOrConnect'
 
 // when opening html file locally in browser, localStorage is shared between all ever opened html files, so we try to avoid conflicts
 const localStoragePrefix = process.env?.SINGLE_FILE_BUILD ? 'minecraft-web-client:' : ''
-const cookiePrefix = ''
+const cookiePrefix = process.env.COOKIE_STORAGE_PREFIX || ''
 const { localStorage } = window
 const migrateRemoveLocalStorage = false
 
@@ -146,7 +146,7 @@ const detectStorageConflicts = (): StorageConflict[] => {
             key,
             localStorageValue: localData,
             localStorageTimestamp: localTimestamp,
-            cookieValue: cookieData,
+            cookieValue: (typeof cookieData === 'object' && cookieData !== null && 'data' in cookieData) ? cookieData.data : cookieData,
             cookieTimestamp
           })
         }
@@ -231,9 +231,10 @@ export const appStorage = proxy({ ...defaultStorageData })
 
 // Check if cookie storage should be used (will be set by options)
 const shouldUseCookieStorage = () => {
+  const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent)
   const isSecureCookiesAvailable = () => {
     // either https or localhost
-    return window.location.protocol === 'https:' || window.location.hostname === 'localhost'
+    return window.location.protocol === 'https:' || (window.location.hostname === 'localhost' && !isSafari)
   }
   if (!isSecureCookiesAvailable()) {
     return false
@@ -402,6 +403,12 @@ export const resolveStorageConflicts = (useLocalStorage: boolean) => {
     }
   }
 
+  // forcefully set data again
+  for (const conflict of storageConflicts) {
+    appStorage[conflict.key] = useLocalStorage ? conflict.localStorageValue : conflict.cookieValue
+    saveKey(conflict.key as keyof StorageData)
+  }
+
   // Clear conflicts and restore data
   storageConflicts = []
   restoreStorageData()

From d4ff7de64ede876703bce76b254124c9f929bccf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 30 Jun 2025 19:53:09 +0300
Subject: [PATCH 633/753] stop building storybook...

---
 .github/workflows/ci.yml      | 2 +-
 .github/workflows/preview.yml | 1 -
 .github/workflows/release.yml | 5 ++---
 README.MD                     | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cc344aad..8fc56ea9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
           cd package
           zip -r ../self-host.zip .
       - run: pnpm build-playground
-      - run: pnpm build-storybook
+      # - run: pnpm build-storybook
       - run: pnpm test-unit
       - run: pnpm lint
 
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index f35e6a00..f243a395 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -78,7 +78,6 @@ jobs:
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
         env:
           CONFIG_JSON_SOURCE: BUNDLED
-      - run: pnpm build-storybook
       - name: Copy playground files
         run: |
           mkdir -p .vercel/output/static/playground
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 14c4b471..76322cb5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,7 +34,6 @@ jobs:
       - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod
         env:
           CONFIG_JSON_SOURCE: BUNDLED
-      - run: pnpm build-storybook
       - name: Copy playground files
         run: |
           mkdir -p .vercel/output/static/playground
@@ -48,12 +47,12 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: .vercel/output/static
           force_orphan: true
-          
+
       - name: Change index.html title
         run: |
           # change <title>Minecraft Web Client</title> to <title>Minecraft Web Client — Free Online Browser Version</title>
           sed -i 's/<title>Minecraft Web Client<\/title>/<title>Minecraft Web Client — Free Online Browser Version<\/title>/' .vercel/output/static/index.html
-          
+
       - name: Deploy Project to Vercel
         uses: mathiasvr/command-output@v2.0.0
         with:
diff --git a/README.MD b/README.MD
index 5f7a83f6..281d2539 100644
--- a/README.MD
+++ b/README.MD
@@ -30,7 +30,7 @@ For building the project yourself / contributing, see [Development, Debugging &
 - Support for custom rendering 3D engines. Modular architecture.
 - even even more!
 
-All components that are in [Storybook](https://mcraft.fun/storybook) are published as npm module and can be used in other projects: [`minecraft-react`](https://npmjs.com/minecraft-react)
+All components that are in [Storybook](https://minimap.mcraft.fun/storybook/) are published as npm module and can be used in other projects: [`minecraft-react`](https://npmjs.com/minecraft-react)
 
 ### Recommended Settings
 

From 13e145cc3ad4ef2b2501ad79624e0fcac9e6f120 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 1 Jul 2025 00:05:43 +0300
Subject: [PATCH 634/753] docs: add one liner script!

---
 README.MD | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.MD b/README.MD
index 281d2539..ea5a1453 100644
--- a/README.MD
+++ b/README.MD
@@ -12,6 +12,9 @@ Don't confuse with [Eaglercraft](https://git.eaglercraft.rip/eaglercraft/eaglerc
 
 For building the project yourself / contributing, see [Development, Debugging & Contributing](#development-debugging--contributing). For reference at what and how web technologies / frameworks are used, see [TECH.md](./TECH.md) (also for comparison with Eaglercraft).
 
+> **Note**: You can deploy it on your own server in less than a minute using a one-liner script from [Minecraft Everywhere repo](https://github.com/zardoy/minecraft-everywhere)
+
+
 ### Big Features
 
 - Official Mineflayer [plugin integration](https://github.com/zardoy/mcraft-fun-mineflayer-plugin)! View / Control your bot remotely.

From 6f5239e1d81709a5284c395dbeac18aa3570604f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 1 Jul 2025 02:29:37 +0300
Subject: [PATCH 635/753] fix: fix inventory crash on picking item with
 gui-generated texture, fix shulker box

---
 renderer/viewer/three/renderSlot.ts |  2 --
 src/inventoryWindows.ts             | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/renderer/viewer/three/renderSlot.ts b/renderer/viewer/three/renderSlot.ts
index fd1eae91..d82e58e3 100644
--- a/renderer/viewer/three/renderSlot.ts
+++ b/renderer/viewer/three/renderSlot.ts
@@ -14,7 +14,6 @@ export const renderSlot = (model: ResolvedItemModelRender, resourcesManager: Res
   scale?: number,
   slice?: number[],
   modelName?: string,
-  image?: ImageBitmap
 } | undefined => {
   let itemModelName = model.modelName
   const isItem = loadedData.itemsByName[itemModelName]
@@ -36,7 +35,6 @@ export const renderSlot = (model: ResolvedItemModelRender, resourcesManager: Res
       const y = item.v * atlas.height
       return {
         texture: 'gui',
-        image: resourcesManager.currentResources!.guiAtlas!.image,
         slice: [x, y, atlas.tileSize, atlas.tileSize],
         scale: 0.25,
       }
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 01d1691d..c9f60d59 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -23,7 +23,7 @@ import { MessageFormatPart } from './chatUtils'
 import { GeneralInputItem, getItemMetadata, getItemModelName, getItemNameRaw, RenderItem } from './mineflayer/items'
 import { playerState } from './mineflayer/playerState'
 
-const loadedImagesCache = new Map<string, HTMLImageElement>()
+const loadedImagesCache = new Map<string, HTMLImageElement | ImageBitmap>()
 const cleanLoadedImagesCache = () => {
   loadedImagesCache.delete('blocks')
   loadedImagesCache.delete('items')
@@ -132,11 +132,12 @@ export const onGameLoad = () => {
   }
 }
 
-const getImageSrc = (path): string | HTMLImageElement => {
+const getImageSrc = (path): string | HTMLImageElement | ImageBitmap => {
   switch (path) {
     case 'gui/container/inventory': return appReplacableResources.latest_gui_container_inventory.content
     case 'blocks': return appViewer.resourcesManager.blocksAtlasParser.latestImage
     case 'items': return appViewer.resourcesManager.itemsAtlasParser.latestImage
+    case 'gui': return appViewer.resourcesManager.currentResources!.guiAtlas!.image
     case 'gui/container/dispenser': return appReplacableResources.latest_gui_container_dispenser.content
     case 'gui/container/furnace': return appReplacableResources.latest_gui_container_furnace.content
     case 'gui/container/crafting_table': return appReplacableResources.latest_gui_container_crafting_table.content
@@ -167,6 +168,12 @@ const getImage = ({ path = undefined as string | undefined, texture = undefined
     onLoad()
   } else {
     const imageSrc = getImageSrc(loadPath)
+    if (imageSrc instanceof ImageBitmap) {
+      onLoad()
+      loadedImagesCache.set(loadPath, imageSrc)
+      return imageSrc
+    }
+
     let image: HTMLImageElement
     if (imageSrc instanceof Image) {
       image = imageSrc
@@ -277,6 +284,7 @@ const implementedContainersGuiMap = {
   'minecraft:generic_3x3': 'DropDispenseWin',
   'minecraft:furnace': 'FurnaceWin',
   'minecraft:smoker': 'FurnaceWin',
+  'minecraft:shulker_box': 'ChestWin',
   'minecraft:blast_furnace': 'FurnaceWin',
   'minecraft:crafting': 'CraftingWin',
   'minecraft:crafting3x3': 'CraftingWin', // todo different result slot
@@ -367,7 +375,7 @@ const openWindow = (type: string | undefined) => {
     lastWindow.destroy()
     lastWindow = null as any
     lastWindowType = null
-    window.lastWindow = lastWindow
+    window.inventory = null
     miscUiState.displaySearchInput = false
     destroyFn()
     skipClosePacketSending = false
@@ -375,6 +383,7 @@ const openWindow = (type: string | undefined) => {
   cleanLoadedImagesCache()
   const inv = openItemsCanvas(type)
   inv.canvasManager.children[0].mobileHelpers = miscUiState.currentTouch
+  window.inventory = inv
   const title = bot.currentWindow?.title
   const PrismarineChat = PrismarineChatLoader(bot.version)
   try {

From f79e54f11dfb1608c7c8ce2426bf3ab31c526342 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 05:45:14 +0300
Subject: [PATCH 636/753] limit columns in player tab

---
 src/react/PlayerListOverlayProvider.tsx | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/react/PlayerListOverlayProvider.tsx b/src/react/PlayerListOverlayProvider.tsx
index 3ff69c41..4d8a8ed7 100644
--- a/src/react/PlayerListOverlayProvider.tsx
+++ b/src/react/PlayerListOverlayProvider.tsx
@@ -5,6 +5,7 @@ import PlayerListOverlay from './PlayerListOverlay'
 import './PlayerListOverlay.css'
 import { lastConnectOptions } from './AppStatusProvider'
 
+const MAX_COLUMNS = 4
 const MAX_ROWS_PER_COL = 10
 
 type Players = typeof bot.players
@@ -56,21 +57,24 @@ export default () => {
     }
   }, [serverIp])
 
-
   const playersArray = Object.values(players).sort((a, b) => {
     if (a.username > b.username) return 1
     if (a.username < b.username) return -1
     return 0
   })
+
+  // Calculate optimal column distribution
+  const totalPlayers = playersArray.length
+  const numColumns = Math.min(MAX_COLUMNS, Math.ceil(totalPlayers / MAX_ROWS_PER_COL))
+  const playersPerColumn = Math.ceil(totalPlayers / numColumns)
+
   const lists = [] as Array<typeof playersArray>
 
-  let tempList = [] as typeof playersArray
-  for (let i = 0; i < playersArray.length; i++) {
-    tempList.push(playersArray[i])
-
-    if ((i + 1) % MAX_ROWS_PER_COL === 0 || i + 1 === playersArray.length) {
-      lists.push([...tempList])
-      tempList = []
+  for (let i = 0; i < numColumns; i++) {
+    const startIdx = i * playersPerColumn
+    const endIdx = Math.min(startIdx + playersPerColumn, totalPlayers)
+    if (startIdx < totalPlayers) {
+      lists.push(playersArray.slice(startIdx, endIdx))
     }
   }
 

From a2711dbe6c58f6f59ef8c881193b1e2d69f3d8cb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 05:45:18 +0300
Subject: [PATCH 637/753] up mc-assets

---
 package.json   |  2 +-
 pnpm-lock.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 516d57f3..8d40c477 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.59",
+    "mc-assets": "^0.2.62",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
     "mineflayer-mouse": "^0.1.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2a46908a..4d49692d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -334,8 +334,8 @@ importers:
         specifier: ^1.0.0
         version: 1.0.0
       mc-assets:
-        specifier: ^0.2.59
-        version: 0.2.59
+        specifier: ^0.2.62
+        version: 0.2.62
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@types/react@18.3.18)(react@18.3.1)
@@ -6487,8 +6487,8 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
-  mc-assets@0.2.59:
-    resolution: {integrity: sha512-HGdy6v09X5nks8+NuwrL3KQ763D+eWFeSpWLXx3+doWz6hSEeLjgBPOrB1stvQOjPDiQCzsIv5gaRB5sl6ng1A==}
+  mc-assets@0.2.62:
+    resolution: {integrity: sha512-RYZeD1+joNlPuUpi+tIWkbP0ieVJr+R6IFkI6/8juhSxx9zE4osoSmteybrfspGm8A6u+YbbY1epqRKEMwVR6Q==}
     engines: {node: '>=18.0.0'}
 
   mcraft-fun-mineflayer@0.1.23:
@@ -17122,7 +17122,7 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
-  mc-assets@0.2.59:
+  mc-assets@0.2.62:
     dependencies:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2

From c55827db962c60d8ab2f21189ee372c98113a188 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 05:46:53 +0300
Subject: [PATCH 638/753] up mc-data

---
 package.json   |  4 +--
 pnpm-lock.yaml | 74 +++++++++++++++++++++++++-------------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index 8d40c477..eb53a8bf 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
     "mcraft-fun-mineflayer": "^0.1.23",
-    "minecraft-data": "3.89.0",
+    "minecraft-data": "3.92.0",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
@@ -201,7 +201,7 @@
       "diamond-square": "github:zardoy/diamond-square",
       "prismarine-block": "github:zardoy/prismarine-block#next-era",
       "prismarine-world": "github:zardoy/prismarine-world#next-era",
-      "minecraft-data": "3.89.0",
+      "minecraft-data": "3.92.0",
       "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything",
       "prismarine-physics": "github:zardoy/prismarine-physics",
       "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d49692d..c904c3f3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,7 +12,7 @@ overrides:
   diamond-square: github:zardoy/diamond-square
   prismarine-block: github:zardoy/prismarine-block#next-era
   prismarine-world: github:zardoy/prismarine-world#next-era
-  minecraft-data: 3.89.0
+  minecraft-data: 3.92.0
   prismarine-provider-anvil: github:zardoy/prismarine-provider-anvil#everything
   prismarine-physics: github:zardoy/prismarine-physics
   minecraft-protocol: github:PrismarineJS/node-minecraft-protocol#master
@@ -138,8 +138,8 @@ importers:
         specifier: ^0.1.23
         version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13))
       minecraft-data:
-        specifier: 3.89.0
-        version: 3.89.0
+        specifier: 3.92.0
+        version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
         version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
@@ -166,7 +166,7 @@ importers:
         version: 6.1.1
       prismarine-provider-anvil:
         specifier: github:zardoy/prismarine-provider-anvil#everything
-        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.89.0)
+        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
       prosemirror-example-setup:
         specifier: ^1.2.2
         version: 1.2.3
@@ -435,7 +435,7 @@ importers:
         version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
-        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
+        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
@@ -6699,8 +6699,8 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  minecraft-data@3.89.0:
-    resolution: {integrity: sha512-v6dUr1M7Pjc6N4ujanrBZu3IP4/HbSBpxSSXNbK6HVFVJqfaqKSMXN57G/JAlDcwqXYsVd9H4tbKFHCO+VmQpg==}
+  minecraft-data@3.92.0:
+    resolution: {integrity: sha512-CGfO50svzm+pSRa4Mbq4owsmRKbPCNkSZ3MCOyH+epC7yNjh+PUhPQFHWq72O51qsY7pAB5qM/bJn1ncwG1J5g==}
 
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
@@ -7436,7 +7436,7 @@ packages:
   prismarine-biome@1.3.0:
     resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==}
     peerDependencies:
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       prismarine-registry: ^1.1.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
@@ -11422,7 +11422,7 @@ snapshots:
   '@nxg-org/mineflayer-trajectories@1.2.0(encoding@0.1.13)':
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       mineflayer: 4.27.0(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.16.0
@@ -13223,16 +13223,16 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.89.0)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.4.2
@@ -13259,16 +13259,16 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.89.0)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.4.2
@@ -14673,8 +14673,8 @@ snapshots:
 
   diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71:
     dependencies:
-      minecraft-data: 3.89.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
+      minecraft-data: 3.92.0
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-registry: 1.11.0
       random-seed: 0.3.0
       vec3: 0.1.10
@@ -17439,7 +17439,7 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  minecraft-data@3.89.0: {}
+  minecraft-data@3.92.0: {}
 
   minecraft-folder-path@1.2.0: {}
 
@@ -17459,7 +17459,7 @@ snapshots:
       debug: 4.4.0(supports-color@8.1.1)
       endian-toggle: 0.0.0
       lodash.merge: 4.6.2
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       minecraft-folder-path: 1.2.0
       node-fetch: 2.7.0(encoding@0.1.13)
       node-rsa: 0.4.2
@@ -17538,7 +17538,7 @@ snapshots:
 
   mineflayer-pathfinder@2.4.5:
     dependencies:
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
@@ -17548,12 +17548,12 @@ snapshots:
 
   mineflayer@4.27.0(encoding@0.1.13):
     dependencies:
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -17572,12 +17572,12 @@ snapshots:
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -18363,15 +18363,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  prismarine-biome@1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0):
+  prismarine-biome@1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0):
     dependencies:
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       prismarine-registry: 1.11.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
     dependencies:
-      minecraft-data: 3.89.0
-      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
+      minecraft-data: 3.92.0
+      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
       prismarine-item: 1.16.0
       prismarine-nbt: 2.7.0
@@ -18383,9 +18383,9 @@ snapshots:
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0):
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0):
     dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.89.0)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
@@ -18414,14 +18414,14 @@ snapshots:
 
   prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     dependencies:
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       prismarine-nbt: 2.7.0
       vec3: 0.1.10
 
-  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.89.0):
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0):
     dependencies:
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.89.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       uint4: 0.1.2
@@ -18443,13 +18443,13 @@ snapshots:
 
   prismarine-registry@1.11.0:
     dependencies:
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
 
   prismarine-schematic@1.2.3:
     dependencies:
-      minecraft-data: 3.89.0
+      minecraft-data: 3.92.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c

From 661892af7c5c57479a230b77a86226e6fa843120 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 05:47:49 +0300
Subject: [PATCH 639/753] up mineflayer

---
 pnpm-lock.yaml | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c904c3f3..bf718ae0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,13 +136,13 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.10
         version: 0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
@@ -6709,9 +6709,9 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085}
-    version: 1.57.0
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176}
+    version: 1.58.0
     engines: {node: '>=22'}
 
   minecraft-wrap@1.6.0:
@@ -6732,13 +6732,13 @@ packages:
   mineflayer-pathfinder@2.4.5:
     resolution: {integrity: sha512-Jh3JnUgRLwhMh2Dugo4SPza68C41y+NPP5sdsgxRu35ydndo70i1JJGxauVWbXrpNwIxYNztUw78aFyb7icw8g==}
 
-  mineflayer@4.27.0:
-    resolution: {integrity: sha512-3bxph4jfbkBh5HpeouorxzrfSLNV+i+1gugNJ2jf52HW+rt+tW7eiiFPxrJEsOVkPT/3O/dEIW7j93LRlojMkQ==}
+  mineflayer@4.30.0:
+    resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470}
-    version: 4.27.0
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033}
+    version: 4.30.0
     engines: {node: '>=22'}
 
   minimalistic-assert@1.0.1:
@@ -11423,7 +11423,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: 4.27.0(encoding@0.1.13)
+      mineflayer: 4.30.0(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.16.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@@ -13224,7 +13224,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13260,7 +13260,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -17127,12 +17127,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17450,7 +17450,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17502,7 +17502,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: 4.27.0(encoding@0.1.13)
+      mineflayer: 4.30.0(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17546,10 +17546,10 @@ snapshots:
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
 
-  mineflayer@4.27.0(encoding@0.1.13):
+  mineflayer@4.30.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
@@ -17569,11 +17569,11 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/67db1808c38fab66d77ccf7822ff7c4f59308470(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/1e38d8fc1e1bbe7aa834055cfd38ed0fa22c2085(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From b1298cbe1f4c1c8fddf6a6d9df38edb8354915bb Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Wed, 2 Jul 2025 02:50:15 +0000
Subject: [PATCH 640/753] feat: Config option to proxy skin textures (#382)

---
 config.json                                 |  1 +
 renderer/viewer/lib/worldrendererCommon.ts  |  1 +
 renderer/viewer/three/entities.ts           |  5 +++++
 renderer/viewer/three/worldrendererThree.ts |  7 ++++++-
 src/appConfig.ts                            |  3 +++
 src/entities.ts                             | 13 +++++++++++--
 6 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/config.json b/config.json
index fe26a9e5..eed32396 100644
--- a/config.json
+++ b/config.json
@@ -3,6 +3,7 @@
   "defaultHost": "<from-proxy>",
   "defaultProxy": "https://proxy.mcraft.fun",
   "mapsProvider": "https://maps.mcraft.fun/",
+  "skinTexturesProxy": "",
   "peerJsServer": "",
   "peerJsServerFallback": "https://p2p.mcraft.fun",
   "promoteServers": [
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 4441201c..7501b279 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -36,6 +36,7 @@ export const defaultWorldRendererConfig = {
   mesherWorkers: 4,
   isPlayground: false,
   renderEars: true,
+  skinTexturesProxy: undefined as string | undefined,
   // game renderer setting actually
   showHand: false,
   viewBobbing: false,
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 3e37102c..fd67ea80 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -1404,6 +1404,11 @@ function addArmorModel (worldRenderer: WorldRendererThree, entityMesh: THREE.Obj
         if (textureData) {
           const decodedData = JSON.parse(Buffer.from(textureData, 'base64').toString())
           texturePath = decodedData.textures?.SKIN?.url
+          const { skinTexturesProxy } = this.worldRenderer.worldRendererConfig
+          if (skinTexturesProxy) {
+            texturePath = texturePath?.replace('http://textures.minecraft.net/', skinTexturesProxy)
+              .replace('https://textures.minecraft.net/', skinTexturesProxy)
+          }
         }
       } catch (err) {
         console.error('Error decoding player head texture:', err)
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index c4482052..e5b93f88 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -755,7 +755,12 @@ export class WorldRendererThree extends WorldRendererCommon {
 
     try {
       const textureData = JSON.parse(Buffer.from(textures.Value, 'base64').toString())
-      const skinUrl = textureData.textures?.SKIN?.url
+      let skinUrl = textureData.textures?.SKIN?.url
+      const { skinTexturesProxy } = this.worldRendererConfig
+      if (skinTexturesProxy) {
+        skinUrl = skinUrl?.replace('http://textures.minecraft.net/', skinTexturesProxy)
+          .replace('https://textures.minecraft.net/', skinTexturesProxy)
+      }
 
       const mesh = getMesh(this, skinUrl, armorModel.head)
       const group = new THREE.Group()
diff --git a/src/appConfig.ts b/src/appConfig.ts
index 261ec7d3..ca1d513c 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -54,6 +54,7 @@ export type AppConfig = {
   supportedLanguages?: string[]
   showModsButton?: boolean
   defaultUsername?: string
+  skinTexturesProxy?: string
 }
 
 export const loadAppConfig = (appConfig: AppConfig) => {
@@ -82,6 +83,8 @@ export const loadAppConfig = (appConfig: AppConfig) => {
     updateBinds(customKeymaps)
   }
 
+  appViewer.inWorldRenderingConfig.skinTexturesProxy = appConfig.skinTexturesProxy
+
   setStorageDataOnAppConfigLoad(appConfig)
 }
 
diff --git a/src/entities.ts b/src/entities.ts
index b9f7998e..2ff51a48 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -199,6 +199,15 @@ customEvents.on('gameLoaded', () => {
 
   // Texture override from packet properties
   bot._client.on('player_info', (packet) => {
+    const applySkinTexturesProxy = (url: string) => {
+      const { appConfig } = miscUiState
+      if (appConfig?.skinTexturesProxy) {
+        return url?.replace('http://textures.minecraft.net/', appConfig.skinTexturesProxy)
+          .replace('https://textures.minecraft.net/', appConfig.skinTexturesProxy)
+      }
+      return url
+    }
+
     for (const playerEntry of packet.data) {
       if (!playerEntry.player && !playerEntry.properties) continue
       let textureProperty = playerEntry.properties?.find(prop => prop?.name === 'textures')
@@ -208,8 +217,8 @@ customEvents.on('gameLoaded', () => {
       if (textureProperty) {
         try {
           const textureData = JSON.parse(Buffer.from(textureProperty.value, 'base64').toString())
-          const skinUrl = textureData.textures?.SKIN?.url
-          const capeUrl = textureData.textures?.CAPE?.url
+          const skinUrl = applySkinTexturesProxy(textureData.textures?.SKIN?.url)
+          const capeUrl = applySkinTexturesProxy(textureData.textures?.CAPE?.url)
 
           // Find entity with matching UUID and update skin
           let entityId = ''

From 3bcf0f533a062ade905a4d5e247a24a4d37d59d0 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:06:21 +0300
Subject: [PATCH 641/753] up protocol patch

---
 patches/minecraft-protocol.patch | 50 ++++++++++++++++----------------
 pnpm-lock.yaml                   | 17 +++++------
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch
index a3a4a6a3..6a82d5cf 100644
--- a/patches/minecraft-protocol.patch
+++ b/patches/minecraft-protocol.patch
@@ -1,26 +1,26 @@
 diff --git a/src/client/chat.js b/src/client/chat.js
-index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aae0d1d337 100644
+index 8d0869b150681574ad19292a026cce9f67a137ee..2efa2e6600f017b566155974cb9fb1856fa582f9 100644
 --- a/src/client/chat.js
 +++ b/src/client/chat.js
-@@ -111,7 +111,7 @@ module.exports = function (client, options) {
-         for (const player of packet.data) {
-           if (!player.chatSession) continue
-           client._players[player.UUID] = {
--            publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
-+            // publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
-             publicKeyDER: player.chatSession.publicKey.keyBytes,
-             sessionUuid: player.chatSession.uuid
-           }
-@@ -127,7 +127,7 @@ module.exports = function (client, options) {
-       for (const player of packet.data) {
-         if (player.crypto) {
-           client._players[player.UUID] = {
--            publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
-+            // publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
-             publicKeyDER: player.crypto.publicKey,
-             signature: player.crypto.signature,
-             displayName: player.displayName || player.name
-@@ -198,7 +198,7 @@ module.exports = function (client, options) {
+@@ -109,7 +109,7 @@ module.exports = function (client, options) {
+     for (const player of packet.data) {
+       if (player.chatSession) {
+         client._players[player.uuid] = {
+-          publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
++          // publicKey: crypto.createPublicKey({ key: player.chatSession.publicKey.keyBytes, format: 'der', type: 'spki' }),
+           publicKeyDER: player.chatSession.publicKey.keyBytes,
+           sessionUuid: player.chatSession.uuid
+         }
+@@ -119,7 +119,7 @@ module.exports = function (client, options) {
+ 
+       if (player.crypto) {
+         client._players[player.uuid] = {
+-          publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
++          // publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
+           publicKeyDER: player.crypto.publicKey,
+           signature: player.crypto.signature,
+           displayName: player.displayName || player.name
+@@ -189,7 +189,7 @@ module.exports = function (client, options) {
      if (mcData.supportFeature('useChatSessions')) {
        const tsDelta = BigInt(Date.now()) - packet.timestamp
        const expired = !packet.timestamp || tsDelta > messageExpireTime || tsDelta < 0
@@ -29,7 +29,7 @@ index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aa
        if (verified) client._signatureCache.push(packet.signature)
        client.emit('playerChat', {
          plainMessage: packet.plainMessage,
-@@ -363,7 +363,7 @@ module.exports = function (client, options) {
+@@ -354,7 +354,7 @@ module.exports = function (client, options) {
      }
    }
  
@@ -38,7 +38,7 @@ index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aa
      options.timestamp = options.timestamp || BigInt(Date.now())
      options.salt = options.salt || 1n
  
-@@ -405,7 +405,7 @@ module.exports = function (client, options) {
+@@ -396,7 +396,7 @@ module.exports = function (client, options) {
          message,
          timestamp: options.timestamp,
          salt: options.salt,
@@ -47,7 +47,7 @@ index f14269bea055d4329cd729271e7406ec4b344de7..00f5482eb6e3c911381ca9a728b1b4aa
          offset: client._lastSeenMessages.pending,
          acknowledged
        })
-@@ -419,7 +419,7 @@ module.exports = function (client, options) {
+@@ -410,7 +410,7 @@ module.exports = function (client, options) {
          message,
          timestamp: options.timestamp,
          salt: options.salt,
@@ -74,7 +74,7 @@ index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108
  
        function onJoinServerResponse (err) {
 diff --git a/src/client/play.js b/src/client/play.js
-index 6e06dc15291b38e1eeeec8d7102187b2a23d70a3..f67454942db9276cbb9eab99c281cfe182cb8a1f 100644
+index 559607f34e9a5b2b7809423f8ca4cd6746b60225..4dc1c3139438cc2729b05c57e57bd00252728f8a 100644
 --- a/src/client/play.js
 +++ b/src/client/play.js
 @@ -53,7 +53,7 @@ module.exports = function (client, options) {
@@ -87,7 +87,7 @@ index 6e06dc15291b38e1eeeec8d7102187b2a23d70a3..f67454942db9276cbb9eab99c281cfe1
        })
        // Server should send finish_configuration on its own right after sending the client a dimension codec
 diff --git a/src/client.js b/src/client.js
-index 74749698f8cee05b5dc749c271544f78d06645b0..e77e0a3f41c1ee780c3abbd54b0801d248c2a07c 100644
+index 5c7a62b013daa69be91ec9e763b1f48ffe96ffa6..174d42a77740a937afcb106e1f39a9ee824a24b9 100644
 --- a/src/client.js
 +++ b/src/client.js
 @@ -89,10 +89,12 @@ class Client extends EventEmitter {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bf718ae0..2ad22c38 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,9 +21,6 @@ overrides:
   prismarine-item: latest
 
 patchedDependencies:
-  minecraft-protocol:
-    hash: 09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762
-    path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
     path: patches/mineflayer-item-map-downloader@1.2.0.patch
@@ -142,7 +139,7 @@ importers:
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
@@ -13224,7 +13221,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13260,7 +13257,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -17131,7 +17128,7 @@ snapshots:
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
@@ -17450,7 +17447,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17549,7 +17546,7 @@ snapshots:
   mineflayer@4.30.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
@@ -17573,7 +17570,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=09def7a73311f10b6aa8ff9f9b76129589578fa154a8b846b06909ca748c4762)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From 7aea07f83a2f8fbbe0379e74611e0c09565c2bc4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:13:40 +0300
Subject: [PATCH 642/753] up patch again

---
 pnpm-lock.yaml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2ad22c38..90f9b15f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,6 +21,9 @@ overrides:
   prismarine-item: latest
 
 patchedDependencies:
+  minecraft-protocol:
+    hash: a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0
+    path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
     path: patches/mineflayer-item-map-downloader@1.2.0.patch
@@ -139,7 +142,7 @@ importers:
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
@@ -13221,7 +13224,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13257,7 +13260,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -17128,7 +17131,7 @@ snapshots:
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
@@ -17447,7 +17450,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17546,7 +17549,7 @@ snapshots:
   mineflayer@4.30.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
@@ -17570,7 +17573,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From 71257bdf137dc918f7cc762dad1fc600788a1113 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:16:06 +0300
Subject: [PATCH 643/753] add fuchsmc.net server partner back!

---
 config.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config.json b/config.json
index eed32396..57b1c207 100644
--- a/config.json
+++ b/config.json
@@ -10,6 +10,9 @@
     {
       "ip": "wss://play.mcraft.fun"
     },
+    {
+      "ip": "wss://ws.fuchsmc.net"
+    },
     {
       "ip": "wss://play2.mcraft.fun"
     },

From 8a504123951876a9b1c5281d86ff815fa82e2cba Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:19:31 +0300
Subject: [PATCH 644/753] fix app crash

---
 src/appConfig.ts | 2 +-
 src/appViewer.ts | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/appConfig.ts b/src/appConfig.ts
index ca1d513c..0805c448 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -83,7 +83,7 @@ export const loadAppConfig = (appConfig: AppConfig) => {
     updateBinds(customKeymaps)
   }
 
-  appViewer.inWorldRenderingConfig.skinTexturesProxy = appConfig.skinTexturesProxy
+  appViewer?.appConfigUdpate()
 
   setStorageDataOnAppConfigLoad(appConfig)
 }
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 0be6c2e8..05b1cf41 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -180,6 +180,12 @@ export class AppViewer {
     this.worldView!.listenToBot(bot)
   }
 
+  appConfigUdpate () {
+    if (miscUiState.appConfig) {
+      this.inWorldRenderingConfig.skinTexturesProxy = miscUiState.appConfig.skinTexturesProxy
+    }
+  }
+
   async startWorld (world, renderDistance: number, playerStateSend: PlayerStateRenderer = this.playerState.reactive) {
     if (this.currentDisplay === 'world') throw new Error('World already started')
     this.currentDisplay = 'world'
@@ -187,6 +193,7 @@ export class AppViewer {
     this.worldView = new WorldDataEmitter(world, renderDistance, startPosition)
     window.worldView = this.worldView
     watchOptionsAfterWorldViewInit(this.worldView)
+    this.appConfigUdpate()
 
     const displayWorldOptions: DisplayWorldOptions = {
       version: this.resourcesManager.currentConfig!.version,

From 9086435aee77b4c42c9b45254b2bb993b1c92e7e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:21:15 +0300
Subject: [PATCH 645/753] rm building storybook

---
 .github/workflows/next-deploy.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml
index 943727eb..99172bf7 100644
--- a/.github/workflows/next-deploy.yml
+++ b/.github/workflows/next-deploy.yml
@@ -36,7 +36,6 @@ jobs:
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
         env:
           CONFIG_JSON_SOURCE: BUNDLED
-      - run: pnpm build-storybook
       - name: Copy playground files
         run: |
           mkdir -p .vercel/output/static/playground

From ed7c33ff9f1a16442f1e89aac92b12214e56f7cc Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:22:17 +0300
Subject: [PATCH 646/753] up mouse

---
 package.json   |   2 +-
 pnpm-lock.yaml | 270 ++-----------------------------------------------
 2 files changed, 7 insertions(+), 265 deletions(-)

diff --git a/package.json b/package.json
index eb53a8bf..268afaab 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "mc-assets": "^0.2.62",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
-    "mineflayer-mouse": "^0.1.10",
+    "mineflayer-mouse": "^0.1.11",
     "mineflayer-pathfinder": "^2.4.4",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 90f9b15f..5bb171b4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -343,8 +343,8 @@ importers:
         specifier: github:zardoy/mineflayer#gen-the-master
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.10
-        version: 0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
+        specifier: ^0.1.11
+        version: 0.1.11
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.5
@@ -3308,47 +3308,18 @@ packages:
   '@vitest/expect@0.34.6':
     resolution: {integrity: sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==}
 
-  '@vitest/expect@3.0.8':
-    resolution: {integrity: sha512-Xu6TTIavTvSSS6LZaA3EebWFr6tsoXPetOWNMOlc7LO88QVVBwq2oQWBoDiLCN6YTvNYsGSjqOO8CAdjom5DCQ==}
-
-  '@vitest/mocker@3.0.8':
-    resolution: {integrity: sha512-n3LjS7fcW1BCoF+zWZxG7/5XvuYH+lsFg+BDwwAz0arIwHQJFUEsKBQ0BLU49fCxuM/2HSeBPHQD8WjgrxMfow==}
-    peerDependencies:
-      msw: ^2.4.9
-      vite: ^5.0.0 || ^6.0.0
-    peerDependenciesMeta:
-      msw:
-        optional: true
-      vite:
-        optional: true
-
-  '@vitest/pretty-format@3.0.8':
-    resolution: {integrity: sha512-BNqwbEyitFhzYMYHUVbIvepOyeQOSFA/NeJMIP9enMntkkxLgOcgABH6fjyXG85ipTgvero6noreavGIqfJcIg==}
-
   '@vitest/runner@0.34.6':
     resolution: {integrity: sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==}
 
-  '@vitest/runner@3.0.8':
-    resolution: {integrity: sha512-c7UUw6gEcOzI8fih+uaAXS5DwjlBaCJUo7KJ4VvJcjL95+DSR1kova2hFuRt3w41KZEFcOEiq098KkyrjXeM5w==}
-
   '@vitest/snapshot@0.34.6':
     resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==}
 
-  '@vitest/snapshot@3.0.8':
-    resolution: {integrity: sha512-x8IlMGSEMugakInj44nUrLSILh/zy1f2/BgH0UeHpNyOocG18M9CWVIFBaXPt8TrqVZWmcPjwfG/ht5tnpba8A==}
-
   '@vitest/spy@0.34.6':
     resolution: {integrity: sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==}
 
-  '@vitest/spy@3.0.8':
-    resolution: {integrity: sha512-MR+PzJa+22vFKYb934CejhR4BeRpMSoxkvNoDit68GQxRLSf11aT6CTj3XaqUU9rxgWJFnqicN/wxw6yBRkI1Q==}
-
   '@vitest/utils@0.34.6':
     resolution: {integrity: sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==}
 
-  '@vitest/utils@3.0.8':
-    resolution: {integrity: sha512-nkBC3aEhfX2PdtQI/QwAWp8qZWwzASsU4Npbcd5RdMPBSSLCpkZp52P3xku3s3uA0HIEhGvEcF8rNkBsz9dQ4Q==}
-
   '@xboxreplay/errors@0.1.0':
     resolution: {integrity: sha512-Tgz1d/OIPDWPeyOvuL5+aai5VCcqObhPnlI3skQuf80GVF3k1I0lPCnGC+8Cm5PV9aLBT5m8qPcJoIUQ2U4y9g==}
 
@@ -3672,10 +3643,6 @@ packages:
   assertion-error@1.1.0:
     resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
 
-  assertion-error@2.0.1:
-    resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
-    engines: {node: '>=12'}
-
   assign-symbols@1.0.0:
     resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
     engines: {node: '>=0.10.0'}
@@ -4012,10 +3979,6 @@ packages:
     resolution: {integrity: sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==}
     engines: {node: '>=4'}
 
-  chai@5.2.0:
-    resolution: {integrity: sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==}
-    engines: {node: '>=12'}
-
   chalk@2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
     engines: {node: '>=4'}
@@ -4043,10 +4006,6 @@ packages:
   check-error@1.0.3:
     resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}
 
-  check-error@2.1.1:
-    resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==}
-    engines: {node: '>= 16'}
-
   check-more-types@2.24.0:
     resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==}
     engines: {node: '>= 0.8.0'}
@@ -4472,10 +4431,6 @@ packages:
     resolution: {integrity: sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==}
     engines: {node: '>=6'}
 
-  deep-eql@5.0.2:
-    resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==}
-    engines: {node: '>=6'}
-
   deep-extend@0.6.0:
     resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
     engines: {node: '>=4.0.0'}
@@ -4796,9 +4751,6 @@ packages:
   es-module-lexer@0.9.3:
     resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
 
-  es-module-lexer@1.6.0:
-    resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==}
-
   es-object-atoms@1.1.1:
     resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
     engines: {node: '>= 0.4'}
@@ -5045,9 +4997,6 @@ packages:
   estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
 
-  estree-walker@3.0.3:
-    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
-
   esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
@@ -5103,10 +5052,6 @@ packages:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
     engines: {node: '>=6'}
 
-  expect-type@1.2.0:
-    resolution: {integrity: sha512-80F22aiJ3GLyVnS/B3HzgR6RelZVumzj9jkL0Rhz4h0xYbNW9PjlQz5h3J/SShErbXBc295vseR4/MIbVmUbeA==}
-    engines: {node: '>=12.0.0'}
-
   exponential-backoff@3.1.2:
     resolution: {integrity: sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==}
 
@@ -6403,9 +6348,6 @@ packages:
   loupe@2.3.7:
     resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
 
-  loupe@3.1.3:
-    resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==}
-
   lower-case@2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
 
@@ -6725,8 +6667,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.10:
-    resolution: {integrity: sha512-bxrBzOVQX2Ok5KOiJMaoOLYaHMDecMkJpLn5oGIdyLRqiTF3WAnZc9oYQq+/f3YNA88W1vBIjai3v3vZe6wyaQ==}
+  mineflayer-mouse@0.1.11:
+    resolution: {integrity: sha512-BL47pXZ1+92BA/7ym6KaJctEHKnL0up+tpuagVwSKJvAgibeqWQJJwDlNUWkOLvpnruRKDxMR5OB1hUXFoDNSg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.5:
@@ -7271,10 +7213,6 @@ packages:
   pathval@1.1.1:
     resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
 
-  pathval@2.0.0:
-    resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==}
-    engines: {node: '>= 14.16'}
-
   pause-stream@0.0.11:
     resolution: {integrity: sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==}
 
@@ -8716,22 +8654,10 @@ packages:
     resolution: {integrity: sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==}
     engines: {node: '>=14.0.0'}
 
-  tinypool@1.0.2:
-    resolution: {integrity: sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-
-  tinyrainbow@2.0.0:
-    resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
-    engines: {node: '>=14.0.0'}
-
   tinyspy@2.2.1:
     resolution: {integrity: sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==}
     engines: {node: '>=14.0.0'}
 
-  tinyspy@3.0.2:
-    resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
-    engines: {node: '>=14.0.0'}
-
   title-case@3.0.3:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
 
@@ -9218,11 +9144,6 @@ packages:
     engines: {node: '>=v14.18.0'}
     hasBin: true
 
-  vite-node@3.0.8:
-    resolution: {integrity: sha512-6PhR4H9VGlcwXZ+KWCdMqbtG649xCPZqfI9j2PsK1FcXgEzro5bGHcVKFCTqPLaNKZES8Evqv4LwvZARsq5qlg==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
-    hasBin: true
-
   vite@4.5.9:
     resolution: {integrity: sha512-qK9W4xjgD3gXbC0NmdNFFnVFLMWSNiR3swj957yutwzzN16xF/E7nmtAyp1rT9hviDroQANjE4HK3H4WqWdFtw==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -9322,34 +9243,6 @@ packages:
       webdriverio:
         optional: true
 
-  vitest@3.0.8:
-    resolution: {integrity: sha512-dfqAsNqRGUc8hB9OVR2P0w8PZPEckti2+5rdZip0WIz9WW0MnImJ8XiR61QhqLa92EQzKP2uPkzenKOAHyEIbA==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
-    hasBin: true
-    peerDependencies:
-      '@edge-runtime/vm': '*'
-      '@types/debug': ^4.1.12
-      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
-      '@vitest/browser': 3.0.8
-      '@vitest/ui': 3.0.8
-      happy-dom: '*'
-      jsdom: '*'
-    peerDependenciesMeta:
-      '@edge-runtime/vm':
-        optional: true
-      '@types/debug':
-        optional: true
-      '@types/node':
-        optional: true
-      '@vitest/browser':
-        optional: true
-      '@vitest/ui':
-        optional: true
-      happy-dom:
-        optional: true
-      jsdom:
-        optional: true
-
   vm-browserify@1.1.2:
     resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==}
 
@@ -13086,68 +12979,28 @@ snapshots:
       '@vitest/utils': 0.34.6
       chai: 4.5.0
 
-  '@vitest/expect@3.0.8':
-    dependencies:
-      '@vitest/spy': 3.0.8
-      '@vitest/utils': 3.0.8
-      chai: 5.2.0
-      tinyrainbow: 2.0.0
-
-  '@vitest/mocker@3.0.8(vite@6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0))':
-    dependencies:
-      '@vitest/spy': 3.0.8
-      estree-walker: 3.0.3
-      magic-string: 0.30.17
-    optionalDependencies:
-      vite: 6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
-
-  '@vitest/pretty-format@3.0.8':
-    dependencies:
-      tinyrainbow: 2.0.0
-
   '@vitest/runner@0.34.6':
     dependencies:
       '@vitest/utils': 0.34.6
       p-limit: 4.0.0
       pathe: 1.1.2
 
-  '@vitest/runner@3.0.8':
-    dependencies:
-      '@vitest/utils': 3.0.8
-      pathe: 2.0.3
-
   '@vitest/snapshot@0.34.6':
     dependencies:
       magic-string: 0.30.17
       pathe: 1.1.2
       pretty-format: 29.7.0
 
-  '@vitest/snapshot@3.0.8':
-    dependencies:
-      '@vitest/pretty-format': 3.0.8
-      magic-string: 0.30.17
-      pathe: 2.0.3
-
   '@vitest/spy@0.34.6':
     dependencies:
       tinyspy: 2.2.1
 
-  '@vitest/spy@3.0.8':
-    dependencies:
-      tinyspy: 3.0.2
-
   '@vitest/utils@0.34.6':
     dependencies:
       diff-sequences: 29.6.3
       loupe: 2.3.7
       pretty-format: 29.7.0
 
-  '@vitest/utils@3.0.8':
-    dependencies:
-      '@vitest/pretty-format': 3.0.8
-      loupe: 3.1.3
-      tinyrainbow: 2.0.0
-
   '@xboxreplay/errors@0.1.0': {}
 
   '@xboxreplay/xboxlive-auth@3.3.3(debug@4.4.0)':
@@ -13562,8 +13415,6 @@ snapshots:
 
   assertion-error@1.1.0: {}
 
-  assertion-error@2.0.1: {}
-
   assign-symbols@1.0.0: {}
 
   ast-types@0.16.1:
@@ -13995,14 +13846,6 @@ snapshots:
       pathval: 1.1.1
       type-detect: 4.1.0
 
-  chai@5.2.0:
-    dependencies:
-      assertion-error: 2.0.1
-      check-error: 2.1.1
-      deep-eql: 5.0.2
-      loupe: 3.1.3
-      pathval: 2.0.0
-
   chalk@2.4.2:
     dependencies:
       ansi-styles: 3.2.1
@@ -14041,8 +13884,6 @@ snapshots:
     dependencies:
       get-func-name: 2.0.2
 
-  check-error@2.1.1: {}
-
   check-more-types@2.24.0:
     optional: true
 
@@ -14557,8 +14398,6 @@ snapshots:
     dependencies:
       type-detect: 4.1.0
 
-  deep-eql@5.0.2: {}
-
   deep-extend@0.6.0: {}
 
   deep-is@0.1.4: {}
@@ -15056,8 +14895,6 @@ snapshots:
 
   es-module-lexer@0.9.3: {}
 
-  es-module-lexer@1.6.0: {}
-
   es-object-atoms@1.1.1:
     dependencies:
       es-errors: 1.3.0
@@ -15440,10 +15277,6 @@ snapshots:
 
   estree-walker@2.0.2: {}
 
-  estree-walker@3.0.3:
-    dependencies:
-      '@types/estree': 1.0.6
-
   esutils@2.0.3: {}
 
   etag@1.8.1: {}
@@ -15521,8 +15354,6 @@ snapshots:
 
   expand-template@2.0.3: {}
 
-  expect-type@1.2.0: {}
-
   exponential-backoff@3.1.2:
     optional: true
 
@@ -17024,8 +16855,6 @@ snapshots:
     dependencies:
       get-func-name: 2.0.2
 
-  loupe@3.1.3: {}
-
   lower-case@2.0.2:
     dependencies:
       tslib: 2.8.1
@@ -17508,33 +17337,14 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.10(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0):
+  mineflayer-mouse@0.1.11:
     dependencies:
       change-case: 5.4.4
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       prismarine-item: 1.16.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
-      vitest: 3.0.8(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
     transitivePeerDependencies:
-      - '@edge-runtime/vm'
-      - '@types/debug'
-      - '@types/node'
-      - '@vitest/browser'
-      - '@vitest/ui'
-      - happy-dom
-      - jiti
-      - jsdom
-      - less
-      - lightningcss
-      - msw
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
       - supports-color
-      - terser
-      - tsx
-      - yaml
 
   mineflayer-pathfinder@2.4.5:
     dependencies:
@@ -18202,8 +18012,6 @@ snapshots:
 
   pathval@1.1.1: {}
 
-  pathval@2.0.0: {}
-
   pause-stream@0.0.11:
     dependencies:
       through: 2.3.8
@@ -20064,14 +19872,8 @@ snapshots:
 
   tinypool@0.7.0: {}
 
-  tinypool@1.0.2: {}
-
-  tinyrainbow@2.0.0: {}
-
   tinyspy@2.2.1: {}
 
-  tinyspy@3.0.2: {}
-
   title-case@3.0.3:
     dependencies:
       tslib: 2.8.1
@@ -20560,27 +20362,6 @@ snapshots:
       - supports-color
       - terser
 
-  vite-node@3.0.8(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0):
-    dependencies:
-      cac: 6.7.14
-      debug: 4.4.1
-      es-module-lexer: 1.6.0
-      pathe: 2.0.3
-      vite: 6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
-    transitivePeerDependencies:
-      - '@types/node'
-      - jiti
-      - less
-      - lightningcss
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-      - tsx
-      - yaml
-
   vite@4.5.9(@types/node@22.13.9)(terser@5.39.0):
     dependencies:
       esbuild: 0.18.20
@@ -20639,45 +20420,6 @@ snapshots:
       - supports-color
       - terser
 
-  vitest@3.0.8(@types/debug@4.1.12)(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0):
-    dependencies:
-      '@vitest/expect': 3.0.8
-      '@vitest/mocker': 3.0.8(vite@6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0))
-      '@vitest/pretty-format': 3.0.8
-      '@vitest/runner': 3.0.8
-      '@vitest/snapshot': 3.0.8
-      '@vitest/spy': 3.0.8
-      '@vitest/utils': 3.0.8
-      chai: 5.2.0
-      debug: 4.4.1
-      expect-type: 1.2.0
-      magic-string: 0.30.17
-      pathe: 2.0.3
-      std-env: 3.8.1
-      tinybench: 2.9.0
-      tinyexec: 0.3.2
-      tinypool: 1.0.2
-      tinyrainbow: 2.0.0
-      vite: 6.2.1(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
-      vite-node: 3.0.8(@types/node@22.13.9)(jiti@2.4.2)(terser@5.39.0)(tsx@4.19.3)(yaml@2.7.0)
-      why-is-node-running: 2.3.0
-    optionalDependencies:
-      '@types/debug': 4.1.12
-      '@types/node': 22.13.9
-    transitivePeerDependencies:
-      - jiti
-      - less
-      - lightningcss
-      - msw
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-      - tsx
-      - yaml
-
   vm-browserify@1.1.2: {}
 
   w3c-keyname@2.2.8: {}

From 3320f65b9c1a075e07138d762b8114e85136128a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 06:24:02 +0300
Subject: [PATCH 647/753] now app crash should be fixed

---
 README.MD      | 4 ++--
 src/globals.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.MD b/README.MD
index ea5a1453..36066fef 100644
--- a/README.MD
+++ b/README.MD
@@ -127,7 +127,7 @@ Instead I recommend setting `options.debugLogNotFrequentPackets`. Also you can u
 
 - `bot` - Mineflayer bot instance. See Mineflayer documentation for more.
 - `viewer` - Three.js viewer instance, basically does all the rendering.
-- `viewer.world.sectionObjects` - Object with all active chunk sections (geometries) in the world. Each chunk section is a Three.js mesh or group.
+- `world.sectionObjects` - Object with all active chunk sections (geometries) in the world. Each chunk section is a Three.js mesh or group.
 - `debugSceneChunks` - The same as above, but relative to current bot position (e.g. 0,0 is the current chunk).
 - `debugChangedOptions` - See what options are changed. Don't change options here.
 - `localServer`/`server` - Only for singleplayer mode/host. Flying Squid server instance, see it's documentation for more.
@@ -136,7 +136,7 @@ Instead I recommend setting `options.debugLogNotFrequentPackets`. Also you can u
 
 - `nbt.simplify(someNbt)` - Simplifies nbt data, so it's easier to read.
 
-The most useful thing in devtools is the watch expression. You can add any expression there and it will be re-evaluated in real time. For example, you can add `viewer.camera.position` to see the camera position and so on.
+The most useful thing in devtools is the watch expression. You can add any expression there and it will be re-evaluated in real time. For example, you can add `camera.position` to see the camera position and so on.
 
 <img src="./docs-assets/watch-expr.png" alt="Watch expression" width="480"/>
 
diff --git a/src/globals.js b/src/globals.js
index f9125c8c..11351555 100644
--- a/src/globals.js
+++ b/src/globals.js
@@ -5,7 +5,8 @@ window.bot = undefined
 window.THREE = undefined
 window.localServer = undefined
 window.worldView = undefined
-window.viewer = undefined
+window.viewer = undefined // legacy
+window.appViewer = undefined
 window.loadedData = undefined
 window.customEvents = new EventEmitter()
 window.customEvents.setMaxListeners(10_000)

From c913d63c46a8f7c05987cb442d60fc0dc48f4eb4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 16:25:36 +0300
Subject: [PATCH 648/753] fix(regression): fix ios 16 world rendering support!

---
 experiments/three.ts               | 134 ++++++++++-------------------
 renderer/viewer/lib/utils/skins.ts |  16 +++-
 2 files changed, 62 insertions(+), 88 deletions(-)

diff --git a/experiments/three.ts b/experiments/three.ts
index 7a629a13..9b158dec 100644
--- a/experiments/three.ts
+++ b/experiments/three.ts
@@ -1,101 +1,61 @@
 import * as THREE from 'three'
-import * as tweenJs  from '@tweenjs/tween.js'
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js'
-import * as THREE from 'three';
-import Jimp from 'jimp';
+import { loadThreeJsTextureFromBitmap } from '../renderer/viewer/lib/utils/skins'
 
+// Create scene, camera and renderer
 const scene = new THREE.Scene()
 const camera = new THREE.PerspectiveCamera(75, window.innerWidth / window.innerHeight, 0.1, 1000)
-camera.position.set(0, 0, 5)
 const renderer = new THREE.WebGLRenderer()
 renderer.setSize(window.innerWidth, window.innerHeight)
 document.body.appendChild(renderer.domElement)
 
-const controls = new OrbitControls(camera, renderer.domElement)
+// Position camera
+camera.position.z = 5
 
-const geometry = new THREE.BoxGeometry(1, 1, 1)
-const material = new THREE.MeshBasicMaterial({ color: 0x00ff00 })
-const cube = new THREE.Mesh(geometry, material)
-cube.position.set(0.5, 0.5, 0.5);
-const group = new THREE.Group()
-group.add(cube)
-group.position.set(-0.5, -0.5, -0.5);
-const outerGroup = new THREE.Group()
-outerGroup.add(group)
-outerGroup.scale.set(0.2, 0.2, 0.2)
-outerGroup.position.set(1, 1, 0)
-scene.add(outerGroup)
+// Create a canvas with some content
+const canvas = document.createElement('canvas')
+canvas.width = 256
+canvas.height = 256
+const ctx = canvas.getContext('2d')
 
-// const mesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 1), new THREE.MeshBasicMaterial({ color: 0x00_00_ff, transparent: true, opacity: 0.5 }))
-//     mesh.position.set(0.5, 1, 0.5)
-//     const group = new THREE.Group()
-//     group.add(mesh)
-//     group.position.set(-0.5, -1, -0.5)
-//     const outerGroup = new THREE.Group()
-//     outerGroup.add(group)
-//     // outerGroup.position.set(this.camera.position.x, this.camera.position.y, this.camera.position.z)
-//     scene.add(outerGroup)
+scene.background = new THREE.Color(0x444444)
 
-    new tweenJs.Tween(group.rotation).to({ z: THREE.MathUtils.degToRad(90) }, 1000).yoyo(true).repeat(Infinity).start()
+// Draw something on the canvas
+ctx.fillStyle = '#444444'
+// ctx.fillRect(0, 0, 256, 256)
+ctx.fillStyle = 'red'
+ctx.font = '48px Arial'
+ctx.textAlign = 'center'
+ctx.textBaseline = 'middle'
+ctx.fillText('Hello!', 128, 128)
 
-const tweenGroup = new tweenJs.Group()
-function animate () {
-    tweenGroup.update()
-  requestAnimationFrame(animate)
-//   cube.rotation.x += 0.01
-//   cube.rotation.y += 0.01
-  renderer.render(scene, camera)
+// Create bitmap and texture
+async function createTexturedBox() {
+    const canvas2 = new OffscreenCanvas(256, 256)
+    const ctx2 = canvas2.getContext('2d')!
+    ctx2.drawImage(canvas, 0, 0)
+    const texture = new THREE.Texture(canvas2)
+    texture.magFilter = THREE.NearestFilter
+    texture.minFilter = THREE.NearestFilter
+    texture.needsUpdate = true
+    texture.flipY = false
+
+    // Create box with texture
+    const geometry = new THREE.BoxGeometry(2, 2, 2)
+    const material = new THREE.MeshBasicMaterial({
+        map: texture,
+        side: THREE.DoubleSide,
+        premultipliedAlpha: false,
+    })
+    const cube = new THREE.Mesh(geometry, material)
+    scene.add(cube)
+}
+
+// Create the textured box
+createTexturedBox()
+
+// Animation loop
+function animate() {
+    requestAnimationFrame(animate)
+    renderer.render(scene, camera)
 }
 animate()
-
-// let animation
-
-window.animate = () => {
-    // new Tween.Tween(group.position).to({ y: group.position.y - 1}, 1000 * 0.35/2).yoyo(true).repeat(1).start()
-    new tweenJs.Tween(group.rotation, tweenGroup).to({ z: THREE.MathUtils.degToRad(90) }, 1000 * 0.35 / 2).yoyo(true).repeat(Infinity).start().onRepeat(() => {
-        console.log('done')
-    })
-}
-
-window.stop = () => {
-    tweenGroup.removeAll()
-}
-
-
-function createGeometryFromImage() {
-    return new Promise<THREE.ShapeGeometry>((resolve, reject) => {
-        const img = new Image();
-        img.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAABEElEQVQ4jWNkIAPw2Zv9J0cfXPOSvx/+L/n74T+HqsJ/JlI1T9u3i6H91B7ybdY+vgZuO1majV+fppFmPnuz/+ihy2dv9t/49Wm8mlECkV1FHh5FfPZm/1XXTGX4cechA4eKPMNVq1CGH7cfMBJ0rlxX+X8OVYX/xq9P/5frKifoZ0Z0AwS8HRkYGBgYvt+8xyDXUUbQZgwJPnuz/+wq8gw/7zxk+PXsFUFno0h6mon+l5fgZFhwnYmBTUqMgYGBgaAhLMiaHQyFGOZvf8Lw49FXRgYGhv8MDAwwg/7jMoQFFury/C8Y5m9/wnADohnZVryJhoWBARJ9Cw69gtmMAgiFAcuvZ68Yfj17hU8NXgAATdKfkzbQhBEAAAAASUVORK5CYII='
-        console.log('img.complete', img.complete)
-        img.onload = () => {
-            const canvas = document.createElement('canvas');
-            canvas.width = img.width;
-            canvas.height = img.height;
-            const context = canvas.getContext('2d');
-            context.drawImage(img, 0, 0, img.width, img.height);
-            const imgData = context.getImageData(0, 0, img.width, img.height);
-
-            const shape = new THREE.Shape();
-            for (let y = 0; y < img.height; y++) {
-                for (let x = 0; x < img.width; x++) {
-                    const index = (y * img.width + x) * 4;
-                    const alpha = imgData.data[index + 3];
-                    if (alpha !== 0) {
-                        shape.lineTo(x, y);
-                    }
-                }
-            }
-
-            const geometry = new THREE.ShapeGeometry(shape);
-            resolve(geometry);
-        };
-        img.onerror = reject;
-    });
-}
-
-// Usage:
-const shapeGeomtry = createGeometryFromImage().then(geometry => {
-    const material = new THREE.MeshBasicMaterial({ color: 0xffffff });
-    const mesh = new THREE.Mesh(geometry, material);
-    scene.add(mesh);
-})
diff --git a/renderer/viewer/lib/utils/skins.ts b/renderer/viewer/lib/utils/skins.ts
index de5a3675..9aa97340 100644
--- a/renderer/viewer/lib/utils/skins.ts
+++ b/renderer/viewer/lib/utils/skins.ts
@@ -3,6 +3,20 @@ import * as THREE from 'three'
 import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
 import { getLoadedImage } from 'mc-assets/dist/utils'
 
+const detectFullOffscreenCanvasSupport = () => {
+  if (typeof OffscreenCanvas === 'undefined') return false
+  try {
+    const canvas = new OffscreenCanvas(1, 1)
+    // Try to get a WebGL context - this will fail on iOS where only 2D is supported (iOS 16)
+    const gl = canvas.getContext('webgl2') || canvas.getContext('webgl')
+    return gl !== null
+  } catch (e) {
+    return false
+  }
+}
+
+const hasFullOffscreenCanvasSupport = detectFullOffscreenCanvasSupport()
+
 export const loadThreeJsTextureFromUrlSync = (imageUrl: string) => {
   const texture = new THREE.Texture()
   const promise = getLoadedImage(imageUrl).then(image => {
@@ -17,7 +31,7 @@ export const loadThreeJsTextureFromUrlSync = (imageUrl: string) => {
 }
 
 export const createCanvas = (width: number, height: number): OffscreenCanvas => {
-  if (typeof OffscreenCanvas !== 'undefined') {
+  if (hasFullOffscreenCanvasSupport) {
     return new OffscreenCanvas(width, height)
   }
   const canvas = document.createElement('canvas')

From 3cc862b05d4f008cd79502a1063c687882cf7dd4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 16:53:30 +0300
Subject: [PATCH 649/753] up mineflayer

---
 pnpm-lock.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5bb171b4..02e27584 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,7 +136,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.11
         version: 0.1.11
@@ -6678,8 +6678,8 @@ packages:
     resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc}
     version: 4.30.0
     engines: {node: '>=22'}
 
@@ -16956,12 +16956,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17379,7 +17379,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/63e351460276245c15ff706fde34e228025dd033(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0

From 3bf34a8781a9e5c6665b1ec70215526489e46c02 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 16:55:32 +0300
Subject: [PATCH 650/753] add browserstack partner

---
 README.MD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.MD b/README.MD
index 36066fef..3205dfb4 100644
--- a/README.MD
+++ b/README.MD
@@ -45,9 +45,12 @@ All components that are in [Storybook](https://minimap.mcraft.fun/storybook/) ar
 
 ### Browser Notes
 
-These browsers have issues with capturing pointer:
+This project is tested with BrowserStack ! [BrowserStack](https://www.browserstack.com/)
+
+Howerver, these browsers have issues:
 
 **Opera Mini**: Disable *mouse gestures* in browsre settings to avoid opening new tab on right click hold
+
 **Vivaldi**: Disable Controls -> *Raw Input* in game settings if experiencing issues
 
 ### Versions Support

From 08fbc67c31fec68bc56a18ba5c26ef2e82f4c6a6 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 17:22:44 +0300
Subject: [PATCH 651/753] add update git deps script, fix inventory crashes

---
 .cursor/rules/vars-usage.mdc |   2 +
 CONTRIBUTING.md              |   7 +-
 package.json                 |   8 +-
 pnpm-lock.yaml               |   8 +-
 scripts/updateGitDeps.ts     | 160 +++++++++++++++++++++++++++++++++++
 5 files changed, 178 insertions(+), 7 deletions(-)
 create mode 100644 scripts/updateGitDeps.ts

diff --git a/.cursor/rules/vars-usage.mdc b/.cursor/rules/vars-usage.mdc
index 7120e7ae..233e0aba 100644
--- a/.cursor/rules/vars-usage.mdc
+++ b/.cursor/rules/vars-usage.mdc
@@ -14,3 +14,5 @@ Ask AI
 - Some other global variables that can be used without window prefixes are listed in src/globals.d.ts
 
 Rationale: This ensures a clean separation between the Mineflayer logic (server-side/game logic) and the renderer (client-side/view logic), making the renderer portable and testable, and maintains proper usage of global state.
+
+For more general project contributing guides see CONTRIBUTING.md on like how to setup the project. Use pnpm tsc if needed to validate result with typechecking the whole project.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 06df61fa..a5a3482d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -177,8 +177,13 @@ New React components, improve UI (including mobile support).
 
 ## Updating Dependencies
 
-1. Ensure mineflayer fork is up to date with the latest version of mineflayer original repo
+1. Use `pnpm update-git-deps` to check and update git dependencies (like mineflayer fork, prismarine packages etc). The script will:
+   - Show which git dependencies have updates available
+   - Ask if you want to update them
+   - Skip dependencies listed in `pnpm.updateConfig.ignoreDependencies`
+
 2. Update PrismarineJS dependencies to the latest version: `minecraft-data` (be sure to replace the version twice in the package.json), `mineflayer`, `minecraft-protocol`, `prismarine-block`, `prismarine-chunk`, `prismarine-item`, ...
+
 3. If `minecraft-protocol` patch fails, do this:
      1. Remove the patch from `patchedDependencies` in `package.json`
      2. Run `pnpm patch minecraft-protocol`, open patch directory
diff --git a/package.json b/package.json
index 268afaab..a09b92a3 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,8 @@
     "run-playground": "run-p watch-mesher watch-other-workers watch-playground",
     "run-all": "run-p start run-playground",
     "build-playground": "rsbuild build --config renderer/rsbuild.config.ts",
-    "watch-playground": "rsbuild dev --config renderer/rsbuild.config.ts"
+    "watch-playground": "rsbuild dev --config renderer/rsbuild.config.ts",
+    "update-git-deps": "tsx scripts/updateGitDeps.ts"
   },
   "keywords": [
     "prismarine",
@@ -210,7 +211,10 @@
       "prismarine-item": "latest"
     },
     "updateConfig": {
-      "ignoreDependencies": []
+      "ignoreDependencies": [
+        "browserfs",
+        "google-drive-browserfs"
+      ]
     },
     "patchedDependencies": {
       "pixelarticons@1.8.1": "patches/pixelarticons@1.8.1.patch",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 02e27584..b146bd80 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -338,7 +338,7 @@ importers:
         version: 0.2.62
       minecraft-inventory-gui:
         specifier: github:zardoy/minecraft-inventory-gui#next
-        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@types/react@18.3.18)(react@18.3.1)
+        version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13)
@@ -6647,8 +6647,8 @@ packages:
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379:
-    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379}
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41:
+    resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41}
     version: 1.0.1
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176:
@@ -17272,7 +17272,7 @@ snapshots:
 
   minecraft-folder-path@1.2.0: {}
 
-  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/5494f356b1e59eddc876c3ae05ff395f12a46379(@types/react@18.3.18)(react@18.3.1):
+  minecraft-inventory-gui@https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@types/react@18.3.18)(react@18.3.1):
     dependencies:
       valtio: 1.13.2(@types/react@18.3.18)(react@18.3.1)
     transitivePeerDependencies:
diff --git a/scripts/updateGitDeps.ts b/scripts/updateGitDeps.ts
new file mode 100644
index 00000000..f3f253ec
--- /dev/null
+++ b/scripts/updateGitDeps.ts
@@ -0,0 +1,160 @@
+import fs from 'fs'
+import path from 'path'
+import yaml from 'yaml'
+import { execSync } from 'child_process'
+import { createInterface } from 'readline'
+
+interface LockfilePackage {
+  specifier: string
+  version: string
+}
+
+interface Lockfile {
+  importers: {
+    '.': {
+      dependencies?: Record<string, LockfilePackage>
+      devDependencies?: Record<string, LockfilePackage>
+    }
+  }
+}
+
+interface PackageJson {
+  pnpm?: {
+    updateConfig?: {
+      ignoreDependencies?: string[]
+    }
+  }
+}
+
+async function prompt(question: string): Promise<string> {
+  const rl = createInterface({
+    input: process.stdin,
+    output: process.stdout
+  })
+
+  return new Promise(resolve => {
+    rl.question(question, answer => {
+      rl.close()
+      resolve(answer.toLowerCase().trim())
+    })
+  })
+}
+
+async function getLatestCommit(owner: string, repo: string): Promise<string> {
+  const response = await fetch(`https://api.github.com/repos/${owner}/${repo}/commits/HEAD`)
+  if (!response.ok) {
+    throw new Error(`Failed to fetch latest commit: ${response.statusText}`)
+  }
+  const data = await response.json()
+  return data.sha
+}
+
+function extractGitInfo(specifier: string): { owner: string; repo: string; branch: string } | null {
+  const match = specifier.match(/github:([^/]+)\/([^#]+)(?:#(.+))?/)
+  if (!match) return null
+  return {
+    owner: match[1],
+    repo: match[2],
+    branch: match[3] || 'master'
+  }
+}
+
+function extractCommitHash(version: string): string | null {
+  const match = version.match(/https:\/\/codeload\.github\.com\/[^/]+\/[^/]+\/tar\.gz\/([a-f0-9]+)/)
+  return match ? match[1] : null
+}
+
+function getIgnoredDependencies(): string[] {
+  try {
+    const packageJsonPath = path.join(process.cwd(), 'package.json')
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')) as PackageJson
+    return packageJson.pnpm?.updateConfig?.ignoreDependencies || []
+  } catch (error) {
+    console.warn('Failed to read package.json for ignored dependencies:', error)
+    return []
+  }
+}
+
+async function main() {
+  const lockfilePath = path.join(process.cwd(), 'pnpm-lock.yaml')
+  const lockfileContent = fs.readFileSync(lockfilePath, 'utf8')
+  const lockfile = yaml.parse(lockfileContent) as Lockfile
+
+  const ignoredDependencies = new Set(getIgnoredDependencies())
+  console.log('Ignoring dependencies:', Array.from(ignoredDependencies).join(', ') || 'none')
+
+  const dependencies = {
+    ...lockfile.importers['.'].dependencies,
+    ...lockfile.importers['.'].devDependencies
+  }
+
+  const updates: Array<{
+    name: string
+    currentHash: string
+    latestHash: string
+    gitInfo: ReturnType<typeof extractGitInfo>
+  }> = []
+
+  console.log('\nChecking git dependencies...')
+  for (const [name, pkg] of Object.entries(dependencies)) {
+    if (ignoredDependencies.has(name)) {
+      console.log(`Skipping ignored dependency: ${name}`)
+      continue
+    }
+
+    if (!pkg.specifier.startsWith('github:')) continue
+
+    const gitInfo = extractGitInfo(pkg.specifier)
+    if (!gitInfo) continue
+
+    const currentHash = extractCommitHash(pkg.version)
+    if (!currentHash) continue
+
+    try {
+      process.stdout.write(`Checking ${name}... `)
+      const latestHash = await getLatestCommit(gitInfo.owner, gitInfo.repo)
+      if (currentHash !== latestHash) {
+        console.log('update available')
+        updates.push({ name, currentHash, latestHash, gitInfo })
+      } else {
+        console.log('up to date')
+      }
+    } catch (error) {
+      console.log('failed')
+      console.error(`Error checking ${name}:`, error)
+    }
+  }
+
+  if (updates.length === 0) {
+    console.log('\nAll git dependencies are up to date!')
+    return
+  }
+
+  console.log('\nThe following git dependencies can be updated:')
+  for (const update of updates) {
+    console.log(`\n${update.name}:`)
+    console.log(`  Current: ${update.currentHash}`)
+    console.log(`  Latest:  ${update.latestHash}`)
+    console.log(`  Repo:    ${update.gitInfo!.owner}/${update.gitInfo!.repo}`)
+  }
+
+  const answer = await prompt('\nWould you like to update these dependencies? (y/N): ')
+  if (answer === 'y' || answer === 'yes') {
+    let newLockfileContent = lockfileContent
+    for (const update of updates) {
+      newLockfileContent = newLockfileContent.replace(
+        new RegExp(update.currentHash, 'g'),
+        update.latestHash
+      )
+    }
+    fs.writeFileSync(lockfilePath, newLockfileContent)
+    console.log('\nUpdated pnpm-lock.yaml with new commit hashes')
+    console.log('Running pnpm install to apply changes...')
+    execSync('pnpm install', { stdio: 'inherit' })
+    console.log('Done!')
+  } else {
+    console.log('\nNo changes were made.')
+  }
+}
+
+main().catch(console.error)

From 043e28ed975825298e97093d46d398636df490bf Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 18:16:44 +0300
Subject: [PATCH 652/753] add more visible integration trigger

---
 README.MD | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.MD b/README.MD
index 3205dfb4..8ca36a3b 100644
--- a/README.MD
+++ b/README.MD
@@ -1,3 +1,5 @@
+This project is tested with BrowserStack
+
 # Minecraft Web Client
 
 ![banner](./docs-assets/banner.jpg)

From d112b0117793a5ba121001395b1d8f9acf0006fa Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 18:55:33 +0300
Subject: [PATCH 653/753] fix gameLoaded

---
 index.html       | 2 +-
 src/appStatus.ts | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 6471c495..b2fa3dbd 100644
--- a/index.html
+++ b/index.html
@@ -63,7 +63,7 @@
 
               if (window.navigator.maxTouchPoints > 1) window.location.hash = '#dev' // show eruda
               // unregister all sw
-              if (window.navigator.serviceWorker) {
+              if (window.navigator.serviceWorker && document.querySelector('.initial-loader').style.opacity !== 0) {
                 console.log('got worker')
                 window.navigator.serviceWorker.getRegistrations().then(registrations => {
                   registrations.forEach(registration => {
diff --git a/src/appStatus.ts b/src/appStatus.ts
index 054975f3..101714f5 100644
--- a/src/appStatus.ts
+++ b/src/appStatus.ts
@@ -1,3 +1,4 @@
+import { resetStateAfterDisconnect } from './browserfs'
 import { hideModal, activeModalStack, showModal, miscUiState } from './globalState'
 import { appStatusState, resetAppStatusState } from './react/AppStatusProvider'
 
@@ -25,7 +26,6 @@ export const setLoadingScreenStatus = function (status: string | undefined | nul
   }
   showModal({ reactType: 'app-status' })
   if (appStatusState.isError) {
-    miscUiState.gameLoaded = false
     return
   }
   appStatusState.hideDots = hideDots
@@ -33,5 +33,9 @@ export const setLoadingScreenStatus = function (status: string | undefined | nul
   appStatusState.lastStatus = isError ? appStatusState.status : ''
   appStatusState.status = status
   appStatusState.minecraftJsonMessage = minecraftJsonMessage ?? null
+
+  if (isError && miscUiState.gameLoaded) {
+    resetStateAfterDisconnect()
+  }
 }
 globalThis.setLoadingScreenStatus = setLoadingScreenStatus

From fcf987efe4bc5e58c5329c2ffb6ad3e49ab5bc06 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 19:21:18 +0300
Subject: [PATCH 654/753] always display reconnect button on mcraft.fun

---
 .github/workflows/build-single-file.yml |  2 ++
 .github/workflows/build-zip.yml         |  2 ++
 .github/workflows/next-deploy.yml       |  1 +
 .github/workflows/preview.yml           |  1 +
 .github/workflows/release.yml           |  1 +
 config.mcraft-only.json                 |  3 +++
 renderer/viewer/three/threeJsSound.ts   |  8 +++++--
 rsbuild.config.ts                       |  5 +++--
 src/appConfig.ts                        |  1 +
 src/env.d.ts                            | 30 +++++++++++++++++++++++++
 src/react/PauseScreen.tsx               |  3 ++-
 11 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 config.mcraft-only.json
 create mode 100644 src/env.d.ts

diff --git a/.github/workflows/build-single-file.yml b/.github/workflows/build-single-file.yml
index 93b1b77f..5f9800db 100644
--- a/.github/workflows/build-single-file.yml
+++ b/.github/workflows/build-single-file.yml
@@ -23,6 +23,8 @@ jobs:
 
       - name: Build single-file version - minecraft.html
         run: pnpm build-single-file && mv dist/single/index.html minecraft.html
+        env:
+          LOCAL_CONFIG_FILE: config.mcraft-only.json
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/build-zip.yml b/.github/workflows/build-zip.yml
index cc472476..76ca65ca 100644
--- a/.github/workflows/build-zip.yml
+++ b/.github/workflows/build-zip.yml
@@ -23,6 +23,8 @@ jobs:
 
       - name: Build project
         run: pnpm build
+        env:
+          LOCAL_CONFIG_FILE: config.mcraft-only.json
 
       - name: Bundle server.js
         run: |
diff --git a/.github/workflows/next-deploy.yml b/.github/workflows/next-deploy.yml
index 99172bf7..75b39f6c 100644
--- a/.github/workflows/next-deploy.yml
+++ b/.github/workflows/next-deploy.yml
@@ -36,6 +36,7 @@ jobs:
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
         env:
           CONFIG_JSON_SOURCE: BUNDLED
+          LOCAL_CONFIG_FILE: config.mcraft-only.json
       - name: Copy playground files
         run: |
           mkdir -p .vercel/output/static/playground
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index f243a395..89fd6698 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -78,6 +78,7 @@ jobs:
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
         env:
           CONFIG_JSON_SOURCE: BUNDLED
+          LOCAL_CONFIG_FILE: config.mcraft-only.json
       - name: Copy playground files
         run: |
           mkdir -p .vercel/output/static/playground
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 76322cb5..cbf52251 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,6 +34,7 @@ jobs:
       - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod
         env:
           CONFIG_JSON_SOURCE: BUNDLED
+          LOCAL_CONFIG_FILE: config.mcraft-only.json
       - name: Copy playground files
         run: |
           mkdir -p .vercel/output/static/playground
diff --git a/config.mcraft-only.json b/config.mcraft-only.json
new file mode 100644
index 00000000..51b6eee6
--- /dev/null
+++ b/config.mcraft-only.json
@@ -0,0 +1,3 @@
+{
+  "alwaysReconnectButton": true
+}
diff --git a/renderer/viewer/three/threeJsSound.ts b/renderer/viewer/three/threeJsSound.ts
index 627cabf8..46aefda9 100644
--- a/renderer/viewer/three/threeJsSound.ts
+++ b/renderer/viewer/three/threeJsSound.ts
@@ -39,7 +39,9 @@ export class ThreeJsSound implements SoundSystem {
       sound.position.set(position.x, position.y, position.z)
       sound.onEnded = () => {
         this.worldRenderer.scene.remove(sound)
-        sound.disconnect()
+        if (sound.source) {
+          sound.disconnect()
+        }
         this.activeSounds.delete(sound)
         audioLoader.manager.itemEnd(path)
       }
@@ -51,7 +53,9 @@ export class ThreeJsSound implements SoundSystem {
     // Stop and clean up all active sounds
     for (const sound of this.activeSounds) {
       sound.stop()
-      sound.disconnect()
+      if (sound.source) {
+        sound.disconnect()
+      }
     }
 
     // Remove and cleanup audio listener
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 8bcbd75d..5014bdf9 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -1,3 +1,4 @@
+/// <reference types="./src/env" />
 import { defineConfig, mergeRsbuildConfig, RsbuildPluginAPI } from '@rsbuild/core'
 import { pluginReact } from '@rsbuild/plugin-react'
 import { pluginTypedCSSModules } from '@rsbuild/plugin-typed-css-modules'
@@ -48,7 +49,7 @@ if (fs.existsSync('./assets/release.json')) {
 
 const configJson = JSON.parse(fs.readFileSync('./config.json', 'utf8'))
 try {
-    Object.assign(configJson, JSON.parse(fs.readFileSync('./config.local.json', 'utf8')))
+    Object.assign(configJson, JSON.parse(fs.readFileSync(process.env.LOCAL_CONFIG_FILE || './config.local.json', 'utf8')))
 } catch (err) {}
 if (dev) {
     configJson.defaultProxy = ':8080'
@@ -198,7 +199,7 @@ const appConfig = defineConfig({
                     }
 
                     if (configSource === 'REMOTE') {
-                        fs.writeFileSync('./dist/config.json', JSON.stringify(configJson), 'utf8')
+                        fs.writeFileSync('./dist/config.json', JSON.stringify(configJson, undefined, 2), 'utf8')
                     }
                     if (fs.existsSync('./generated/sounds.js')) {
                         fs.copyFileSync('./generated/sounds.js', './dist/sounds.js')
diff --git a/src/appConfig.ts b/src/appConfig.ts
index 0805c448..b8c1e219 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -55,6 +55,7 @@ export type AppConfig = {
   showModsButton?: boolean
   defaultUsername?: string
   skinTexturesProxy?: string
+  alwaysReconnectButton?: boolean
 }
 
 export const loadAppConfig = (appConfig: AppConfig) => {
diff --git a/src/env.d.ts b/src/env.d.ts
new file mode 100644
index 00000000..4cb5bafd
--- /dev/null
+++ b/src/env.d.ts
@@ -0,0 +1,30 @@
+declare namespace NodeJS {
+  interface ProcessEnv {
+    // Build configuration
+    NODE_ENV: 'development' | 'production'
+    SINGLE_FILE_BUILD?: string
+    DISABLE_SERVICE_WORKER?: string
+    CONFIG_JSON_SOURCE?: 'BUNDLED' | 'REMOTE'
+    LOCAL_CONFIG_FILE?: string
+    BUILD_VERSION?: string
+
+    // GitHub and Vercel related
+    GITHUB_REPOSITORY?: string
+    VERCEL_GIT_REPO_OWNER?: string
+    VERCEL_GIT_REPO_SLUG?: string
+
+    // UI and Features
+    MAIN_MENU_LINKS?: string
+    ENABLE_COOKIE_STORAGE?: string
+    COOKIE_STORAGE_PREFIX?: string
+
+    // Release information
+    RELEASE_TAG?: string
+    RELEASE_LINK?: string
+    RELEASE_CHANGELOG?: string
+
+    // Other configurations
+    DEPS_VERSIONS?: string
+    INLINED_APP_CONFIG?: string
+  }
+}
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 22e00ded..4bdd2974 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -163,6 +163,7 @@ export default () => {
   const { noConnection } = useSnapshot(gameAdditionalState)
   const { active: packetsReplaceActive, hasRecordedPackets: packetsReplaceHasRecordedPackets } = useSnapshot(packetsRecordingState)
   const { displayRecordButton: displayPacketsButtons } = useSnapshot(options)
+  const { appConfig } = useSnapshot(miscUiState)
 
   const handlePointerLockChange = () => {
     if (!pointerLock.hasPointerLock && activeModalStack.length === 0) {
@@ -293,7 +294,7 @@ export default () => {
           {fsState.inMemorySave && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
         </Button>
       </>}
-      {noConnection && (
+      {(noConnection || appConfig?.alwaysReconnectButton) && (
         <Button className="button" style={{ width: '204px' }} onClick={reconnectReload}>
           Reconnect
         </Button>

From 7162d2f549c400f9cee9282c9ce7e19baf3dbd6c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 2 Jul 2025 19:22:47 +0300
Subject: [PATCH 655/753] fix music crash

---
 src/sounds/botSoundSystem.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 0e23a98a..72aa3da8 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -71,7 +71,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
   }
 
   const musicStartCheck = async (force = false) => {
-    if (!soundMap) return
+    if (!soundMap || !bot) return
     // 20% chance to start music
     if (Math.random() > 0.2 && !force && !options.enableMusic) return
 

From 9f3d3f93fb29c86793bc26f7eba8c6cd144da52a Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 3 Jul 2025 18:01:38 +0300
Subject: [PATCH 656/753] docs: update README to clarify BrowserStack testing
 (#384)

---
 README.MD | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.MD b/README.MD
index 8ca36a3b..61a5b733 100644
--- a/README.MD
+++ b/README.MD
@@ -1,5 +1,3 @@
-This project is tested with BrowserStack
-
 # Minecraft Web Client
 
 ![banner](./docs-assets/banner.jpg)
@@ -47,9 +45,9 @@ All components that are in [Storybook](https://minimap.mcraft.fun/storybook/) ar
 
 ### Browser Notes
 
-This project is tested with BrowserStack ! [BrowserStack](https://www.browserstack.com/)
+This project is tested with BrowserStack. Special thanks to [BrowserStack](https://www.browserstack.com/) for providing testing infrastructure!
 
-Howerver, these browsers have issues:
+Howerver, it's known that these browsers have issues:
 
 **Opera Mini**: Disable *mouse gestures* in browsre settings to avoid opening new tab on right click hold
 

From 4277c3a26299849848d6044e6f5429889f6519c9 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Thu, 3 Jul 2025 15:15:24 +0000
Subject: [PATCH 657/753] feat: Support nameTagVisibility option of teams
 (#373)

---
 renderer/viewer/lib/basePlayerState.ts  |  4 +-
 renderer/viewer/lib/worldDataEmitter.ts |  1 +
 renderer/viewer/three/entities.ts       | 23 ++++++++-
 src/entities.ts                         | 64 +++++++++++++++++++++++++
 src/mineflayer/playerState.ts           |  4 ++
 5 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index f9e4b2c9..af5d9d06 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -1,5 +1,5 @@
 import { ItemSelector } from 'mc-assets/dist/itemDefinitions'
-import { GameMode } from 'mineflayer'
+import { GameMode, Team } from 'mineflayer'
 import { proxy } from 'valtio'
 import type { HandItemBlock } from '../three/holdingBlock'
 
@@ -50,6 +50,8 @@ export const getInitialPlayerState = () => proxy({
   perspective: 'first_person' as CameraPerspective,
 
   cameraSpectatingEntity: undefined as number | undefined,
+
+  team: undefined as Team | undefined,
 })
 
 export const getPlayerStateUtils = (reactive: PlayerStateReactive) => ({
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 78da96d9..e1ac2f24 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -104,6 +104,7 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
         ...e,
         pos: e.position,
         username: e.username,
+        team: bot.teamMap[e.username] || bot.teamMap[e.uuid],
         // set debugTree (obj) {
         //   e.debugTree = obj
         // }
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index fd67ea80..414b0279 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -16,6 +16,7 @@ import { Item } from 'prismarine-item'
 import { BlockModel } from 'mc-assets'
 import { isEntityAttackable } from 'mineflayer-mouse/dist/attackableEntity'
 import { Vec3 } from 'vec3'
+import { Team } from 'mineflayer'
 import { EntityMetadataVersions } from '../../../src/mcDataTypes'
 import { ItemSpecificContextProperties } from '../lib/basePlayerState'
 import { loadSkinImage, loadSkinFromUsername, stevePngUrl, steveTexture, createCanvas } from '../lib/utils/skins'
@@ -209,7 +210,7 @@ export type SceneEntity = THREE.Object3D & {
   username?: string
   uuid?: string
   additionalCleanup?: () => void
-  originalEntity: import('prismarine-entity').Entity & { delete?; pos?, name }
+  originalEntity: import('prismarine-entity').Entity & { delete?; pos?, name, team?: Team }
 }
 
 export class Entities {
@@ -900,6 +901,8 @@ export class Entities {
           nameTag.position.y = playerObject.position.y + playerObject.scale.y * 16 + 3
           nameTag.renderOrder = 1000
 
+          nameTag.name = 'nametag'
+
           //@ts-expect-error
           wrapper.add(nameTag)
         }
@@ -1111,10 +1114,12 @@ export class Entities {
       }
     }
 
-    if (entity.username) {
+    if (entity.username !== undefined) {
       e.username = entity.username
     }
 
+    this.updateNameTagVisibility(e)
+
     this.updateEntityPosition(entity, justAdded, overrides)
   }
 
@@ -1183,6 +1188,20 @@ export class Entities {
     }
   }
 
+  updateNameTagVisibility (entity: SceneEntity) {
+    const playerTeam = this.worldRenderer.playerStateReactive.team
+    const entityTeam = entity.originalEntity.team
+    const nameTagVisibility = entityTeam?.nameTagVisibility || 'always'
+    const showNameTag = nameTagVisibility === 'always' ||
+      (nameTagVisibility === 'hideForOwnTeam' && entityTeam?.team !== playerTeam?.team) ||
+      (nameTagVisibility === 'hideForOtherTeams' && (entityTeam?.team === playerTeam?.team || playerTeam === undefined))
+    entity.traverse(c => {
+      if (c.name === 'nametag') {
+        c.visible = showNameTag
+      }
+    })
+  }
+
   addMapModel (entityMesh: THREE.Object3D, mapNumber: number, rotation: number) {
     const imageData = this.cachedMapsImages?.[mapNumber]
     let texture: THREE.Texture | null = null
diff --git a/src/entities.ts b/src/entities.ts
index 2ff51a48..3dac51ce 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -4,6 +4,7 @@ import tracker from '@nxg-org/mineflayer-tracker'
 import { loader as autoJumpPlugin } from '@nxg-org/mineflayer-auto-jump'
 import { subscribeKey } from 'valtio/utils'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
+import { Team } from 'mineflayer'
 import { options, watchValue } from './optionsStorage'
 import { gameAdditionalState, miscUiState } from './globalState'
 import { EntityStatus } from './mineflayer/entityStatus'
@@ -237,4 +238,67 @@ customEvents.on('gameLoaded', () => {
     }
 
   })
+
+  bot.on('teamUpdated', (team: Team) => {
+    for (const entity of Object.values(bot.entities)) {
+      if (entity.type === 'player' && entity.username && team.members.includes(entity.username) || entity.uuid && team.members.includes(entity.uuid)) {
+        bot.emit('entityUpdate', entity)
+      }
+    }
+  })
+
+  const updateEntityNameTags = (team: Team) => {
+    for (const entity of Object.values(bot.entities)) {
+      const entityTeam = entity.type === 'player' && entity.username ? bot.teamMap[entity.username] : entity.uuid ? bot.teamMap[entity.uuid] : undefined
+      if ((entityTeam?.nameTagVisibility === 'hideForOwnTeam' && entityTeam.name === team.name)
+        || (entityTeam?.nameTagVisibility === 'hideForOtherTeams' && entityTeam.name !== team.name)) {
+        bot.emit('entityUpdate', entity)
+      }
+    }
+  }
+
+  const doEntitiesNeedUpdating = (team: Team) => {
+    return team.nameTagVisibility === 'never'
+      || (team.nameTagVisibility === 'hideForOtherTeams' && appViewer.playerState.reactive.team?.team !== team.team)
+      || (team.nameTagVisibility === 'hideForOwnTeam' && appViewer.playerState.reactive.team?.team === team.team)
+  }
+
+  bot.on('teamMemberAdded', (team: Team, members: string[]) => {
+    if (members.includes(bot.username) && appViewer.playerState.reactive.team?.team !== team.team) {
+      appViewer.playerState.reactive.team = team
+      // Player was added to a team, need to check if any entities need updating
+      updateEntityNameTags(team)
+    } else if (doEntitiesNeedUpdating(team)) {
+      // Need to update all entities that were added
+      for (const entity of Object.values(bot.entities)) {
+        if (entity.type === 'player' && entity.username && members.includes(entity.username) || entity.uuid && members.includes(entity.uuid)) {
+          bot.emit('entityUpdate', entity)
+        }
+      }
+    }
+  })
+
+  bot.on('teamMemberRemoved', (team: Team, members: string[]) => {
+    if (members.includes(bot.username) && appViewer.playerState.reactive.team?.team === team.team) {
+      appViewer.playerState.reactive.team = undefined
+      // Player was removed from a team, need to check if any entities need updating
+      updateEntityNameTags(team)
+    } else if (doEntitiesNeedUpdating(team)) {
+      // Need to update all entities that were removed
+      for (const entity of Object.values(bot.entities)) {
+        if (entity.type === 'player' && entity.username && members.includes(entity.username) || entity.uuid && members.includes(entity.uuid)) {
+          bot.emit('entityUpdate', entity)
+        }
+      }
+    }
+  })
+
+  bot.on('teamRemoved', (team: Team) => {
+    if (appViewer.playerState.reactive.team?.team === team.team) {
+      appViewer.playerState.reactive.team = undefined
+      // Player's team was removed, need to update all entities that are in a team
+      updateEntityNameTags(team)
+    }
+  })
+
 })
diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
index b7b4d2bd..b8919a14 100644
--- a/src/mineflayer/playerState.ts
+++ b/src/mineflayer/playerState.ts
@@ -99,6 +99,10 @@ export class PlayerStateControllerMain {
     })
     this.reactive.gameMode = bot.game?.gameMode
 
+    customEvents.on('gameLoaded', () => {
+      this.reactive.team = bot.teamMap[bot.username]
+    })
+
     this.watchReactive()
   }
 

From cdd23bc6a6a370eca0d9da79bee762af81b78ff1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 3 Jul 2025 18:16:21 +0300
Subject: [PATCH 658/753] fix(critical): fix support for all versions above
 1.20.2 in mineflayer dependency

---
 pnpm-lock.yaml           | 14 +++++++-------
 scripts/updateGitDeps.ts |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b146bd80..291cec39 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,7 +136,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.11
         version: 0.1.11
@@ -6678,8 +6678,8 @@ packages:
     resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8}
     version: 4.30.0
     engines: {node: '>=22'}
 
@@ -16956,12 +16956,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17379,7 +17379,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/1616261f727398d0b14359262726828d24797fcc(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
diff --git a/scripts/updateGitDeps.ts b/scripts/updateGitDeps.ts
index f3f253ec..797aea8f 100644
--- a/scripts/updateGitDeps.ts
+++ b/scripts/updateGitDeps.ts
@@ -149,8 +149,8 @@ async function main() {
     }
     fs.writeFileSync(lockfilePath, newLockfileContent)
     console.log('\nUpdated pnpm-lock.yaml with new commit hashes')
-    console.log('Running pnpm install to apply changes...')
-    execSync('pnpm install', { stdio: 'inherit' })
+    // console.log('Running pnpm install to apply changes...')
+    // execSync('pnpm install', { stdio: 'inherit' })
     console.log('Done!')
   } else {
     console.log('\nNo changes were made.')

From 5cfd301d10890d37ff9cc804774fa9b485c7967d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 3 Jul 2025 19:35:19 +0300
Subject: [PATCH 659/753] fix: fix controls debug was not visible

---
 src/optionsGuiScheme.tsx  | 12 ------------
 src/react/ControDebug.tsx | 32 ++++++++++++++++++--------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index ba52e333..b03db37d 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -545,18 +545,6 @@ export const guiOptionsScheme: {
         />
       }
     },
-    {
-      custom () {
-        const { cookieStorage } = useSnapshot(appStorage)
-        return <Button
-          label={`Storage: ${cookieStorage ? 'Synced Cookies' : 'Local Storage'}`} onClick={() => {
-            appStorage.cookieStorage = !cookieStorage
-            alert('Reload the page to apply this change')
-          }}
-          inScreen
-        />
-      }
-    },
     {
       custom () {
         return <Category>Server Connection</Category>
diff --git a/src/react/ControDebug.tsx b/src/react/ControDebug.tsx
index 9c5f272c..ca096707 100644
--- a/src/react/ControDebug.tsx
+++ b/src/react/ControDebug.tsx
@@ -50,20 +50,24 @@ export default () => {
   if (!options.debugContro) return null
 
   return (
-    <div style={{
-      position: 'fixed',
-      right: 0,
-      top: '50%',
-      transform: 'translateY(-50%)',
-      backgroundColor: 'rgba(0, 0, 0, 0.5)',
-      padding: '8px',
-      fontFamily: 'monospace',
-      fontSize: '8px',
-      color: 'white',
-      display: 'flex',
-      flexDirection: 'column',
-      gap: '4px'
-    }}>
+    <div
+      className='debug-contro'
+      style={{
+        position: 'fixed',
+        right: 0,
+        top: '50%',
+        transform: 'translateY(-50%)',
+        backgroundColor: 'rgba(0, 0, 0, 0.5)',
+        padding: '8px',
+        fontFamily: 'monospace',
+        fontSize: '8px',
+        color: 'white',
+        display: 'flex',
+        flexDirection: 'column',
+        gap: '4px',
+        zIndex: 2,
+      }}
+    >
       <div>Keys: {[...pressedKeys].join(', ')}</div>
       <div style={{ color: 'limegreen' }}>Actions: {actions.join(', ')}</div>
     </div>

From e8b0a34c0ba3ec43485bcaeb34692dd6177bde4d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 3 Jul 2025 19:52:49 +0300
Subject: [PATCH 660/753] fix: fix chat visual text alignment issues on chat
 opening

---
 src/react/Chat.css | 9 ++++++++-
 src/react/Chat.tsx | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/react/Chat.css b/src/react/Chat.css
index 47394948..1f29a59c 100644
--- a/src/react/Chat.css
+++ b/src/react/Chat.css
@@ -4,6 +4,8 @@ div.chat-wrapper {
   /* z-index: 10; */
   padding-left: calc(env(safe-area-inset-left) / 2);
   padding-right: calc(env(safe-area-inset-right, 4px) / 2);
+  box-sizing: content-box;
+  overflow: hidden;
 }
 
 .chat-messages-wrapper {
@@ -11,12 +13,17 @@ div.chat-wrapper {
   padding: 4px;
   padding-left: 0;
   max-height: var(--chatHeight);
-  width: var(--chatWidth);
+  width: calc(var(--chatWidth) - 5px); /* Custom scrollbar width */
   transform-origin: bottom left;
   transform: scale(var(--chatScale));
   pointer-events: none;
 }
 
+/* Restore full width when chat is opened */
+.chat-messages-wrapper.chat-opened {
+  width: var(--chatWidth);
+}
+
 .chat-input-wrapper {
   bottom: 1px;
   width: calc(100% - 3px);
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 7c1c8633..2bfe94db 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -18,6 +18,7 @@ const MessageLine = ({ message, currentPlayerName, chatOpened }: { message: Mess
   const [fadeState, setFadeState] = useState<'visible' | 'fading' | 'faded'>('visible')
 
   useEffect(() => {
+    if (window.debugStopChatFade) return
     // Start fading after 5 seconds
     const fadeTimeout = setTimeout(() => {
       setFadeState('fading')
@@ -324,7 +325,7 @@ export default ({
   return (
     <>
       <div
-        className={`chat-wrapper chat-messages-wrapper ${usingTouch ? 'display-mobile' : ''}`} style={{
+        className={`chat-wrapper chat-messages-wrapper ${usingTouch ? 'display-mobile' : ''} ${opened ? 'chat-opened' : ''}`} style={{
           userSelect: opened && allowSelection ? 'text' : undefined,
         }}
       >

From 01567ea589c8501956c362200ad2ca74744bf8fd Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 4 Jul 2025 01:44:26 +0300
Subject: [PATCH 661/753] add "mcraft.fun/debug-inputs.html"

---
 assets/debug-inputs.html | 237 +++++++++++++++++++++++++++++++++++++++
 rsbuild.config.ts        |   1 +
 2 files changed, 238 insertions(+)
 create mode 100644 assets/debug-inputs.html

diff --git a/assets/debug-inputs.html b/assets/debug-inputs.html
new file mode 100644
index 00000000..584fe4d7
--- /dev/null
+++ b/assets/debug-inputs.html
@@ -0,0 +1,237 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Web Input Debugger</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            padding: 20px;
+            background: #f0f0f0;
+        }
+        .key-container {
+            display: grid;
+            grid-template-columns: repeat(3, 60px);
+            gap: 5px;
+            margin: 20px 0;
+        }
+        .key {
+            width: 60px;
+            height: 60px;
+            border: 2px solid #333;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-weight: bold;
+            background: white;
+            position: relative;
+            user-select: none;
+        }
+        .key.pressed {
+            background: #90EE90;
+        }
+        .key .duration {
+            position: absolute;
+            bottom: 2px;
+            font-size: 10px;
+        }
+        .key .count {
+            position: absolute;
+            top: 2px;
+            right: 2px;
+            font-size: 10px;
+        }
+        .controls {
+            margin: 20px 0;
+            padding: 10px;
+            background: white;
+            border-radius: 5px;
+        }
+        .wasd-container {
+            position: relative;
+            width: 190px;
+            height: 130px;
+        }
+        #KeyW {
+            position: absolute;
+            left: 65px;
+            top: 0;
+        }
+        #KeyA {
+            position: absolute;
+            left: 0;
+            top: 65px;
+        }
+        #KeyS {
+            position: absolute;
+            left: 65px;
+            top: 65px;
+        }
+        #KeyD {
+            position: absolute;
+            left: 130px;
+            top: 65px;
+        }
+        .space-container {
+            margin-top: 20px;
+        }
+        #Space {
+            width: 190px;
+        }
+    </style>
+</head>
+<body>
+    <div class="controls">
+        <label>
+            <input type="checkbox" id="repeatMode"> Use keydown repeat mode (auto key-up after 150ms of no repeat)
+        </label>
+    </div>
+
+    <div class="wasd-container">
+        <div id="KeyW" class="key" data-code="KeyW">W</div>
+        <div id="KeyA" class="key" data-code="KeyA">A</div>
+        <div id="KeyS" class="key" data-code="KeyS">S</div>
+        <div id="KeyD" class="key" data-code="KeyD">D</div>
+    </div>
+
+    <div class="key-container">
+        <div id="ControlLeft" class="key" data-code="ControlLeft">Ctrl</div>
+    </div>
+
+    <div class="space-container">
+        <div id="Space" class="key" data-code="Space">Space</div>
+    </div>
+
+    <script>
+        const keys = {};
+        const keyStats = {};
+        const pressStartTimes = {};
+        const keyTimeouts = {};
+
+        function initKeyStats(code) {
+            if (!keyStats[code]) {
+                keyStats[code] = {
+                    pressCount: 0,
+                    duration: 0,
+                    startTime: 0
+                };
+            }
+        }
+
+        function updateKeyVisuals(code) {
+            const element = document.getElementById(code);
+            if (!element) return;
+
+            const stats = keyStats[code];
+            if (keys[code]) {
+                element.classList.add('pressed');
+                const currentDuration = ((Date.now() - stats.startTime) / 1000).toFixed(1);
+                element.innerHTML = `${element.getAttribute('data-code').replace('Key', '').replace('Left', '')}<span class="duration">${currentDuration}s</span><span class="count">${stats.pressCount}</span>`;
+            } else {
+                element.classList.remove('pressed');
+                element.innerHTML = `${element.getAttribute('data-code').replace('Key', '').replace('Left', '')}<span class="count">${stats.pressCount}</span>`;
+            }
+        }
+
+        function releaseKey(code) {
+            keys[code] = false;
+            if (pressStartTimes[code]) {
+                keyStats[code].duration += (Date.now() - pressStartTimes[code]) / 1000;
+                delete pressStartTimes[code];
+            }
+            updateKeyVisuals(code);
+        }
+
+        function handleKeyDown(event) {
+            const code = event.code;
+            const isRepeatMode = document.getElementById('repeatMode').checked;
+
+            initKeyStats(code);
+
+            // Clear any existing timeout for this key
+            if (keyTimeouts[code]) {
+                clearTimeout(keyTimeouts[code]);
+                delete keyTimeouts[code];
+            }
+
+            if (isRepeatMode) {
+                // In repeat mode, always handle the keydown
+                if (!keys[code] || event.repeat) {
+                    keys[code] = true;
+                    if (!event.repeat) {
+                        // Only increment count on initial press, not repeats
+                        keyStats[code].pressCount++;
+                        keyStats[code].startTime = Date.now();
+                        pressStartTimes[code] = Date.now();
+                    }
+                }
+
+                // Set timeout to release key if no repeat events come
+                keyTimeouts[code] = setTimeout(() => {
+                    releaseKey(code);
+                }, 150);
+            } else {
+                // In normal mode, only handle keydown if key is not already pressed
+                if (!keys[code]) {
+                    keys[code] = true;
+                    keyStats[code].pressCount++;
+                    keyStats[code].startTime = Date.now();
+                    pressStartTimes[code] = Date.now();
+                }
+            }
+
+            updateKeyVisuals(code);
+            event.preventDefault();
+        }
+
+        function handleKeyUp(event) {
+            const code = event.code;
+            const isRepeatMode = document.getElementById('repeatMode').checked;
+
+            if (!isRepeatMode) {
+                releaseKey(code);
+            }
+
+            event.preventDefault();
+        }
+
+        // Initialize all monitored keys
+        const monitoredKeys = ['KeyW', 'KeyA', 'KeyS', 'KeyD', 'ControlLeft', 'Space'];
+        monitoredKeys.forEach(code => {
+            initKeyStats(code);
+            const element = document.getElementById(code);
+            if (element) {
+                element.innerHTML = `${element.getAttribute('data-code').replace('Key', '').replace('Left', '')}<span class="count">0</span>`;
+            }
+        });
+
+        // Start visual updates
+        setInterval(() => {
+            monitoredKeys.forEach(code => {
+                if (keys[code]) {
+                    updateKeyVisuals(code);
+                }
+            });
+        }, 100);
+
+        // Event listeners
+        document.addEventListener('keydown', handleKeyDown);
+        document.addEventListener('keyup', handleKeyUp);
+
+        // Handle mode changes
+        document.getElementById('repeatMode').addEventListener('change', () => {
+            // Release all keys when switching modes
+            monitoredKeys.forEach(code => {
+                if (keys[code]) {
+                    releaseKey(code);
+                }
+                if (keyTimeouts[code]) {
+                    clearTimeout(keyTimeouts[code]);
+                    delete keyTimeouts[code];
+                }
+            });
+        });
+    </script>
+</body>
+</html>
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 5014bdf9..219fe57e 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -193,6 +193,7 @@ const appConfig = defineConfig({
                     fs.copyFileSync('./assets/playground.html', './dist/playground.html')
                     fs.copyFileSync('./assets/manifest.json', './dist/manifest.json')
                     fs.copyFileSync('./assets/config.html', './dist/config.html')
+                    fs.copyFileSync('./assets/debug-inputs.html', './dist/debug-inputs.html')
                     fs.copyFileSync('./assets/loading-bg.jpg', './dist/loading-bg.jpg')
                     if (fs.existsSync('./assets/release.json')) {
                         fs.copyFileSync('./assets/release.json', './dist/release.json')

From 45bc76d825ea656a9154d11bfd54a1323a02891a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 4 Jul 2025 17:29:55 +0300
Subject: [PATCH 662/753] hotfix(chat): fix all annoying issues on mobile. fix
 chat was not visible on mobile at all!

---
 src/react/Chat.css | 11 +++++-
 src/react/Chat.tsx | 87 ++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 91 insertions(+), 7 deletions(-)

diff --git a/src/react/Chat.css b/src/react/Chat.css
index 1f29a59c..246f17b3 100644
--- a/src/react/Chat.css
+++ b/src/react/Chat.css
@@ -5,6 +5,10 @@ div.chat-wrapper {
   padding-left: calc(env(safe-area-inset-left) / 2);
   padding-right: calc(env(safe-area-inset-right, 4px) / 2);
   box-sizing: content-box;
+}
+
+/* Only apply overflow hidden when not in mobile mode */
+div.chat-wrapper:not(.display-mobile):not(.input-mobile) {
   overflow: hidden;
 }
 
@@ -69,7 +73,7 @@ div.chat-wrapper {
   top: 100%;
   padding-left: calc(env(safe-area-inset-left) / 2);
   margin-top: 14px;
-  margin-left: 20px;
+  margin-left: 40px;
   /* input height */
 }
 
@@ -116,6 +120,11 @@ div.chat-wrapper {
   justify-content: flex-start;
 }
 
+.input-mobile .chat-completions-items > div {
+  padding: 4px 0;
+  font-size: 10px;
+}
+
 .input-mobile {
   top: 15px;
   position: absolute;
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 2bfe94db..a45d7a69 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -112,7 +112,9 @@ export default ({
 
   const sendHistoryRef = useRef(JSON.parse(window.sessionStorage.chatHistory || '[]'))
   const [isInputFocused, setIsInputFocused] = useState(false)
-  const spellCheckEnabled = false
+  const [spellCheckEnabled, setSpellCheckEnabled] = useState(false)
+  const [preservedInputValue, setPreservedInputValue] = useState('')
+  const [inputKey, setInputKey] = useState(0)
   const pingHistoryRef = useRef(JSON.parse(window.localStorage.pingHistory || '[]'))
 
   const [completePadText, setCompletePadText] = useState('')
@@ -237,12 +239,16 @@ export default ({
     if (opened) {
       completeRequestValue.current = ''
       resetCompletionItems()
+    } else {
+      setPreservedInputValue('')
     }
   }, [opened])
 
   const onMainInputChange = () => {
     const lastWord = chatInput.current.value.slice(0, chatInput.current.selectionEnd ?? chatInput.current.value.length).split(' ').at(-1)!
-    if (lastWord.startsWith('@') && getPingComplete) {
+    const isCommand = chatInput.current.value.startsWith('/')
+
+    if (lastWord.startsWith('@') && getPingComplete && !isCommand) {
       setCompletePadText(lastWord)
       void fetchPingCompletions(true, lastWord.slice(1))
       return
@@ -322,6 +328,29 @@ export default ({
     return completeValue
   }
 
+  const handleSlashCommand = () => {
+    remountInput('/')
+  }
+
+  const handleAcceptFirstCompletion = () => {
+    if (completionItems.length > 0) {
+      acceptComplete(completionItems[0])
+    }
+  }
+
+  const remountInput = (newValue?: string) => {
+    if (newValue !== undefined) {
+      setPreservedInputValue(newValue)
+    }
+    setInputKey(k => k + 1)
+  }
+
+  useEffect(() => {
+    if (preservedInputValue && chatInput.current) {
+      chatInput.current.focus()
+    }
+  }, [inputKey]) // Changed from spellCheckEnabled to inputKey
+
   return (
     <>
       <div
@@ -386,8 +415,53 @@ export default ({
       </div>
 
       <div className={`chat-wrapper chat-input-wrapper ${usingTouch ? 'input-mobile' : ''}`} hidden={!opened}>
-        {/* close button */}
-        {usingTouch && <Button icon={pixelartIcons.close} onClick={() => onClose?.()} />}
+        {usingTouch && (
+          <>
+            <Button
+              icon={pixelartIcons.close}
+              onClick={() => onClose?.()}
+              style={{
+                width: 20,
+                flexShrink: 0,
+              }}
+            />
+
+            {(chatInput.current?.value && !chatInput.current.value.startsWith('/')) ? (
+              // TOGGLE SPELL CHECK
+              <Button
+                style={{
+                  width: 20,
+                  flexShrink: 0,
+                }}
+                overlayColor={spellCheckEnabled ? '#00ff00' : '#ff0000'}
+                icon={pixelartIcons['text-wrap']}
+                onClick={() => {
+                  setPreservedInputValue(chatInput.current?.value || '')
+                  setSpellCheckEnabled(!spellCheckEnabled)
+                  remountInput()
+                }}
+              />
+            ) : (
+              // SLASH COMMAND
+              <Button
+                style={{
+                  width: 20,
+                  flexShrink: 0,
+                }}
+                label={chatInput.current?.value ? undefined : '/'}
+                icon={chatInput.current?.value ? pixelartIcons['arrow-right'] : undefined}
+                onClick={() => {
+                  const inputValue = chatInput.current.value
+                  if (!inputValue) {
+                    handleSlashCommand()
+                  } else if (completionItems.length > 0) {
+                    handleAcceptFirstCompletion()
+                  }
+                }}
+              />
+            )}
+          </>
+        )}
         <div className="chat-input">
           {isInputFocused && completionItems?.length ? (
             <div className="chat-completions">
@@ -431,9 +505,10 @@ export default ({
             />}
             <input
               maxLength={chatVanillaRestrictions ? 256 : undefined}
-              defaultValue=''
+              defaultValue={preservedInputValue}
               // ios doesn't support toggling autoCorrect on the fly so we need to re-create the input
-              key={spellCheckEnabled ? 'true' : 'false'}
+              key={`${inputKey}`}
+              autoCapitalize={preservedInputValue ? 'off' : 'on'}
               ref={chatInput}
               type="text"
               className="chat-input"

From f489c5f4776993187138c487e4dad039fb6ae9f4 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Fri, 4 Jul 2025 14:33:36 +0000
Subject: [PATCH 663/753] fix: skin from textures property would not show
 (#385)

---
 pnpm-lock.yaml                    | 14 ++++----
 renderer/viewer/three/entities.ts |  1 +
 src/entities.ts                   | 60 ++++++++++++++-----------------
 3 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 291cec39..c37e0510 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,7 +136,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.11
         version: 0.1.11
@@ -6678,8 +6678,8 @@ packages:
     resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980}
     version: 4.30.0
     engines: {node: '>=22'}
 
@@ -16956,12 +16956,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17379,7 +17379,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/2cd1e3da257a0c0415e9dc5524fb14bd5844f0d8(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 414b0279..c05aac99 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -486,6 +486,7 @@ export class Entities {
       .some(channel => channel !== 0)
   }
 
+  // todo true/undefined doesnt reset the skin to the default one
   // eslint-disable-next-line max-params
   async updatePlayerSkin (entityId: string | number, username: string | undefined, uuidCache: string | undefined, skinUrl: string | true, capeUrl: string | true | undefined = undefined) {
     if (uuidCache) {
diff --git a/src/entities.ts b/src/entities.ts
index 3dac51ce..79602aa5 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -198,46 +198,40 @@ customEvents.on('gameLoaded', () => {
     }
   })
 
-  // Texture override from packet properties
-  bot._client.on('player_info', (packet) => {
-    const applySkinTexturesProxy = (url: string) => {
-      const { appConfig } = miscUiState
-      if (appConfig?.skinTexturesProxy) {
-        return url?.replace('http://textures.minecraft.net/', appConfig.skinTexturesProxy)
-          .replace('https://textures.minecraft.net/', appConfig.skinTexturesProxy)
-      }
-      return url
+  const applySkinTexturesProxy = (url: string | undefined) => {
+    const { appConfig } = miscUiState
+    if (appConfig?.skinTexturesProxy) {
+      return url?.replace('http://textures.minecraft.net/', appConfig.skinTexturesProxy)
+        .replace('https://textures.minecraft.net/', appConfig.skinTexturesProxy)
     }
+    return url
+  }
 
-    for (const playerEntry of packet.data) {
-      if (!playerEntry.player && !playerEntry.properties) continue
-      let textureProperty = playerEntry.properties?.find(prop => prop?.name === 'textures')
-      if (!textureProperty) {
-        textureProperty = playerEntry.player?.properties?.find(prop => prop?.key === 'textures')
-      }
-      if (textureProperty) {
-        try {
-          const textureData = JSON.parse(Buffer.from(textureProperty.value, 'base64').toString())
-          const skinUrl = applySkinTexturesProxy(textureData.textures?.SKIN?.url)
-          const capeUrl = applySkinTexturesProxy(textureData.textures?.CAPE?.url)
+  // Texture override from packet properties
+  const updateSkin = (player: import('mineflayer').Player) => {
+    if (!player.uuid || !player.username || !player.skinData) return
 
-          // Find entity with matching UUID and update skin
-          let entityId = ''
-          for (const [entId, entity] of Object.entries(bot.entities)) {
-            if (entity.uuid === playerEntry.uuid) {
-              entityId = entId
-              break
-            }
-          }
-          // even if not found, still record to cache
-          void getThreeJsRendererMethods()?.updatePlayerSkin(entityId, playerEntry.player?.name, playerEntry.uuid, skinUrl, capeUrl)
-        } catch (err) {
-          console.error('Error decoding player texture:', err)
+    try {
+      const skinUrl = applySkinTexturesProxy(player.skinData.url)
+      const capeUrl = applySkinTexturesProxy((player.skinData as any).capeUrl)
+
+      // Find entity with matching UUID and update skin
+      let entityId = ''
+      for (const [entId, entity] of Object.entries(bot.entities)) {
+        if (entity.uuid === player.uuid) {
+          entityId = entId
+          break
         }
       }
+      // even if not found, still record to cache
+      void getThreeJsRendererMethods()?.updatePlayerSkin(entityId, player.username, player.uuid, skinUrl ?? true, capeUrl)
+    } catch (err) {
+      console.error('Error decoding player texture:', err)
     }
+  }
 
-  })
+  bot.on('playerJoined', updateSkin)
+  bot.on('playerUpdated', updateSkin)
 
   bot.on('teamUpdated', (team: Team) => {
     for (const entity of Object.values(bot.entities)) {

From fa56d479b1f06c3f2c699d60e7b6f08ba5df34b1 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 4 Jul 2025 18:04:24 +0300
Subject: [PATCH 664/753] feat: add report bug button

---
 config.mcraft-only.json   |  3 ++-
 src/appConfig.ts          |  1 +
 src/react/PauseScreen.tsx | 56 ++++++++++++++++++++++++++++++++++-----
 src/utils.ts              |  2 +-
 4 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/config.mcraft-only.json b/config.mcraft-only.json
index 51b6eee6..7d9a7b59 100644
--- a/config.mcraft-only.json
+++ b/config.mcraft-only.json
@@ -1,3 +1,4 @@
 {
-  "alwaysReconnectButton": true
+  "alwaysReconnectButton": true,
+  "reportBugButtonWithReconnect": true
 }
diff --git a/src/appConfig.ts b/src/appConfig.ts
index b8c1e219..ae9851b6 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -56,6 +56,7 @@ export type AppConfig = {
   defaultUsername?: string
   skinTexturesProxy?: string
   alwaysReconnectButton?: boolean
+  reportBugButtonWithReconnect?: boolean
 }
 
 export const loadAppConfig = (appConfig: AppConfig) => {
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 4bdd2974..12748b54 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -32,7 +32,7 @@ import Screen from './Screen'
 import styles from './PauseScreen.module.css'
 import { DiscordButton } from './DiscordButton'
 import { showNotification } from './NotificationProvider'
-import { appStatusState, reconnectReload } from './AppStatusProvider'
+import { appStatusState, lastConnectOptions, reconnectReload } from './AppStatusProvider'
 import NetworkStatus from './NetworkStatus'
 import PauseLinkButtons from './PauseLinkButtons'
 import { pixelartIcons } from './PixelartIcon'
@@ -265,7 +265,7 @@ export default () => {
     <div className={styles.pause_container}>
       <Button className="button" style={{ width: '204px' }} onClick={onReturnPress}>Back to Game</Button>
       <PauseLinkButtons />
-      <Button className="button" style={{ width: '204px' }} onClick={() => openOptionsMenu('main')}>Options</Button>
+      <Button className="button" style={{ width: '204px' }} onClick={() => openOptionsMenu('main')}>Options...</Button>
       {singleplayer ? (
         <div className={styles.row}>
           <Button className="button" style={{ width: '170px' }} onClick={async () => clickJoinLinkButton()}>
@@ -294,10 +294,54 @@ export default () => {
           {fsState.inMemorySave && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
         </Button>
       </>}
-      {(noConnection || appConfig?.alwaysReconnectButton) && (
-        <Button className="button" style={{ width: '204px' }} onClick={reconnectReload}>
-          Reconnect
-        </Button>
+      {(true) && (
+        <div className={styles.row}>
+          <Button className="button" style={{ width: '98px' }} onClick={reconnectReload}>
+            Reconnect
+          </Button>
+          {true && (
+            <Button
+              label="Report Problem"
+              className="button"
+              style={{ width: '98px' }}
+              onClick={async () => {
+                const platform = (navigator as any).userAgentData?.platform ?? navigator.platform
+                const body = `Version: ${window.location.hostname}\nServer: ${lastConnectOptions.value?.server ?? '<not a server>'}\nPlatform: ${platform}\nWebsite: ${window.location.href}`
+                const currentHost = window.location.hostname
+                const options = [
+                  'GitHub (please use it if you can)',
+                  'Email',
+                  ...((currentHost === 'mcraft.fun' || currentHost === 'ru.mcraft.fun') ? ['Try Beta Version'] : []),
+                  // 'Use previous versions of client'
+                ]
+                const action = await showOptionsModal('Report client issue', options)
+                if (!action) return
+
+                switch (action) {
+                  case 'GitHub (please use it if you can)':
+                    openGithub(`/issues/new?body=${encodeURIComponent(body)}&title=${encodeURIComponent('[Bug Report] <describe your issue here>')}&labels=bug`)
+                    break
+                  case 'Email': {
+                    window.location.href = `mailto:support@mcraft.fun?body=${encodeURIComponent(body)}`
+                    break
+                  }
+                  case 'Try Beta Version': {
+                    if (currentHost === 'mcraft.fun') {
+                      window.location.href = 'https://s.mcraft.fun'
+                    } else if (currentHost === 'ru.mcraft.fun') {
+                      window.location.href = 'https://s.pcm.gg'
+                    }
+                    break
+                  }
+                  case 'Use previous versions of client':
+                    // TODO: Implement versions screen
+                    void showOptionsModal('Previous versions', [])
+                    break
+                }
+              }}
+            />
+          )}
+        </div>
       )}
     </div>
     <LoadingTimer />
diff --git a/src/utils.ts b/src/utils.ts
index d48fbbc3..3ccc7fc4 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -163,7 +163,7 @@ export const reloadChunks = async () => {
 }
 
 export const openGithub = (addUrl = '') => {
-  window.open(`${process.env.GITHUB_URL}${addUrl}`, '_blank')
+  window.open(`${process.env.GITHUB_URL?.replace(/\/$/, '')}${addUrl}`, '_blank')
 }
 
 export const resolveTimeout = async (promise, timeout = 10_000) => {

From 2f93c08b1e66a8410f3f4ad327921d717381b814 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 4 Jul 2025 18:05:26 +0300
Subject: [PATCH 665/753] fix lint

---
 src/react/PauseScreen.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 12748b54..3036aa4b 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -294,12 +294,12 @@ export default () => {
           {fsState.inMemorySave && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
         </Button>
       </>}
-      {(true) && (
+      {(noConnection || appConfig?.alwaysReconnectButton) && (
         <div className={styles.row}>
-          <Button className="button" style={{ width: '98px' }} onClick={reconnectReload}>
+          <Button className="button" style={{ width: appConfig?.reportBugButtonWithReconnect ? '98px' : '204px' }} onClick={reconnectReload}>
             Reconnect
           </Button>
-          {true && (
+          {appConfig?.reportBugButtonWithReconnect && (
             <Button
               label="Report Problem"
               className="button"

From 089f2224e25a6f193dba187d11d354afee645292 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 8 Jul 2025 15:12:23 +0300
Subject: [PATCH 666/753] fix(mobile): drop stack on hotbar hold feat(config):
 add powerful way to disable some actions in the client entirely (eg opening
 inventory or dropping items)

---
 src/appConfig.ts              |  3 +++
 src/controls.ts               | 15 +++++++++++++++
 src/react/HotbarRenderApp.tsx | 26 ++++++++++----------------
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/appConfig.ts b/src/appConfig.ts
index ae9851b6..52fba96d 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -24,6 +24,7 @@ export type MobileButtonConfig = {
   readonly icon?: string
   readonly action?: ActionType
   readonly actionHold?: ActionType | ActionHoldConfig
+  readonly iconStyle?: React.CSSProperties
 }
 
 export type AppConfig = {
@@ -57,9 +58,11 @@ export type AppConfig = {
   skinTexturesProxy?: string
   alwaysReconnectButton?: boolean
   reportBugButtonWithReconnect?: boolean
+  disabledCommands?: string[] // Array of command IDs to disable (e.g. ['general.jump', 'general.chat'])
 }
 
 export const loadAppConfig = (appConfig: AppConfig) => {
+
   if (miscUiState.appConfig) {
     Object.assign(miscUiState.appConfig, appConfig)
   } else {
diff --git a/src/controls.ts b/src/controls.ts
index 44de8f11..9430f9c1 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -116,6 +116,10 @@ export const contro = new ControMax({
 window.controMax = contro
 export type Command = CommandEventArgument<typeof contro['_commandsRaw']>['command']
 
+export const isCommandDisabled = (command: Command) => {
+  return miscUiState.appConfig?.disabledCommands?.includes(command)
+}
+
 onControInit()
 
 updateBinds(customKeymaps)
@@ -544,6 +548,8 @@ const customCommandsHandler = ({ command }) => {
 contro.on('trigger', customCommandsHandler)
 
 contro.on('trigger', ({ command }) => {
+  if (isCommandDisabled(command)) return
+
   const willContinue = !isGameActive(true)
   alwaysPressedHandledCommand(command)
   if (willContinue) return
@@ -677,6 +683,8 @@ contro.on('trigger', ({ command }) => {
 })
 
 contro.on('release', ({ command }) => {
+  if (isCommandDisabled(command)) return
+
   inModalCommand(command, false)
   onTriggerOrReleased(command, false)
 })
@@ -996,9 +1004,16 @@ export const handleMobileButtonCustomAction = (action: CustomAction) => {
   }
 }
 
+export const triggerCommand = (command: Command, isDown: boolean) => {
+  handleMobileButtonActionCommand(command, isDown)
+}
+
 export const handleMobileButtonActionCommand = (command: ActionType | ActionHoldConfig, isDown: boolean) => {
   const commandValue = typeof command === 'string' ? command : 'command' in command ? command.command : command
 
+  // Check if command is disabled before proceeding
+  if (typeof commandValue === 'string' && isCommandDisabled(commandValue as Command)) return
+
   if (typeof commandValue === 'string' && !stringStartsWith(commandValue, 'custom')) {
     const event: CommandEventArgument<typeof contro['_commandsRaw']> = {
       command: commandValue as Command,
diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index 80f0a789..ed1f42e6 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -2,15 +2,15 @@ import { useEffect, useRef, useState } from 'react'
 import { motion, AnimatePresence } from 'framer-motion'
 import { createPortal } from 'react-dom'
 import { subscribe, useSnapshot } from 'valtio'
-import { openItemsCanvas, openPlayerInventory, upInventoryItems } from '../inventoryWindows'
+import { openItemsCanvas, upInventoryItems } from '../inventoryWindows'
 import { activeModalStack, isGameActive, miscUiState } from '../globalState'
 import { currentScaling } from '../scaleInterface'
 import { watchUnloadForCleanup } from '../gameUnload'
 import { getItemNameRaw } from '../mineflayer/items'
 import { isInRealGameSession } from '../utils'
+import { triggerCommand } from '../controls'
 import MessageFormattedString from './MessageFormattedString'
 import SharedHudVars from './SharedHudVars'
-import { packetsReplayState } from './state/packetsReplayState'
 
 
 const ItemName = ({ itemKey }: { itemKey: string }) => {
@@ -75,6 +75,8 @@ const HotbarInner = () => {
   const container = useRef<HTMLDivElement>(null!)
   const [itemKey, setItemKey] = useState('')
   const hasModals = useSnapshot(activeModalStack).length
+  const { currentTouch, appConfig } = useSnapshot(miscUiState)
+  const mobileOpenInventory = currentTouch && !appConfig?.disabledCommands?.includes('general.inventory')
 
   useEffect(() => {
     const controller = new AbortController()
@@ -105,7 +107,7 @@ const HotbarInner = () => {
       canvasManager.setScale(currentScaling.scale)
 
       canvasManager.windowHeight = 25 * canvasManager.scale
-      canvasManager.windowWidth = (210 - (inv.inventory.supportsOffhand ? 0 : 25) + (miscUiState.currentTouch ? 28 : 0)) * canvasManager.scale
+      canvasManager.windowWidth = (210 - (inv.inventory.supportsOffhand ? 0 : 25) + (mobileOpenInventory ? 28 : 0)) * canvasManager.scale
     }
     setSize()
     watchUnloadForCleanup(subscribe(currentScaling, setSize))
@@ -119,8 +121,9 @@ const HotbarInner = () => {
     canvasManager.canvas.onclick = (e) => {
       if (!isGameActive(true)) return
       const pos = inv.canvasManager.getMousePos(inv.canvas, e)
-      if (canvasManager.canvas.width - pos.x < 35 * inv.canvasManager.scale) {
-        openPlayerInventory()
+      if (canvasManager.canvas.width - pos.x < 35 * inv.canvasManager.scale && mobileOpenInventory) {
+        triggerCommand('general.inventory', true)
+        triggerCommand('general.inventory', false)
       }
     }
 
@@ -180,17 +183,8 @@ const HotbarInner = () => {
     })
     document.addEventListener('touchend', (e) => {
       if (touchStart && (e.target as HTMLElement).closest('.hotbar') && Date.now() - touchStart > 700) {
-        // drop item
-        bot._client.write('block_dig', {
-          'status': 4,
-          'location': {
-            'x': 0,
-            'z': 0,
-            'y': 0
-          },
-          'face': 0,
-          sequence: 0
-        })
+        triggerCommand('general.dropStack', true)
+        triggerCommand('general.dropStack', false)
       }
       touchStart = 0
     })

From c844b99cf2fc2ae62299817b7d3408da6fd58f00 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 8 Jul 2025 15:15:54 +0300
Subject: [PATCH 667/753] fix(regression): fix chat completions were not
 visible on pc

---
 src/react/Chat.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/Chat.css b/src/react/Chat.css
index 246f17b3..ff9f60b1 100644
--- a/src/react/Chat.css
+++ b/src/react/Chat.css
@@ -9,7 +9,7 @@ div.chat-wrapper {
 
 /* Only apply overflow hidden when not in mobile mode */
 div.chat-wrapper:not(.display-mobile):not(.input-mobile) {
-  overflow: hidden;
+  /* overflow: hidden; */
 }
 
 .chat-messages-wrapper {

From 09b0e2e493f841077e090a57bc4d125a70353566 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 8 Jul 2025 15:42:06 +0300
Subject: [PATCH 668/753] add a way to disable some parts of bars ui via config
 and select them via devtool elem select

---
 src/react/ArmorBar.css        |  1 -
 src/react/BreathBar.css       |  1 -
 src/react/FoodBar.css         |  1 -
 src/react/HealthBar.css       |  1 -
 src/react/HudBarsProvider.tsx | 20 ++++++++++++--------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/react/ArmorBar.css b/src/react/ArmorBar.css
index ca579a72..9718e553 100644
--- a/src/react/ArmorBar.css
+++ b/src/react/ArmorBar.css
@@ -8,7 +8,6 @@
   --offset: calc(-1 * 25px);
   --bg-x: calc(-1 * 16px);
   --bg-y: calc(-1 * 9px);
-  pointer-events: none;
   image-rendering: pixelated;
 }
 
diff --git a/src/react/BreathBar.css b/src/react/BreathBar.css
index e98cf7c2..bcf93303 100644
--- a/src/react/BreathBar.css
+++ b/src/react/BreathBar.css
@@ -9,7 +9,6 @@
   --offset: calc(-1 * 16px);
   --bg-x: calc(-1 * 16px);
   --bg-y: calc(-1 * 18px);
-  pointer-events: none;
   image-rendering: pixelated;
 }
 
diff --git a/src/react/FoodBar.css b/src/react/FoodBar.css
index ca3629cd..83da3c25 100644
--- a/src/react/FoodBar.css
+++ b/src/react/FoodBar.css
@@ -11,7 +11,6 @@
   --offset: calc(-1 * (52px + (9px * (4 * var(--kind) + var(--lightened) * 2))));
   --bg-x: calc(-1 * (16px + 9px * var(--lightened)));
   --bg-y: calc(-1 * 27px);
-  pointer-events: none;
   image-rendering: pixelated;
 }
 
diff --git a/src/react/HealthBar.css b/src/react/HealthBar.css
index a6fefe09..72f5a1fe 100644
--- a/src/react/HealthBar.css
+++ b/src/react/HealthBar.css
@@ -11,7 +11,6 @@
   --offset: calc(-1 * (52px + (9px * (4 * var(--kind) + var(--lightened) * 2)) ));
   --bg-x: calc(-1 * (16px + 9px * var(--lightened)));
   --bg-y: calc(-1 * var(--hardcore) * 45px);
-  pointer-events: none;
   image-rendering: pixelated;
 }
 
diff --git a/src/react/HudBarsProvider.tsx b/src/react/HudBarsProvider.tsx
index db061500..42fa8378 100644
--- a/src/react/HudBarsProvider.tsx
+++ b/src/react/HudBarsProvider.tsx
@@ -1,5 +1,7 @@
 import { useRef, useState, useMemo } from 'react'
 import { GameMode } from 'mineflayer'
+import { useSnapshot } from 'valtio'
+import { options } from '../optionsStorage'
 import { armor } from './armorValues'
 import HealthBar from './HealthBar'
 import FoodBar from './FoodBar'
@@ -8,6 +10,8 @@ import BreathBar from './BreathBar'
 import './HealthBar.css'
 
 export default () => {
+  const { disabledUiParts } = useSnapshot(options)
+
   const [damaged, setDamaged] = useState(false)
   const [healthValue, setHealthValue] = useState(bot.health)
   const [food, setFood] = useState(bot.food)
@@ -91,7 +95,7 @@ export default () => {
   }, [])
 
   return <div className='hud-bars-container'>
-    <HealthBar
+    {!disabledUiParts.includes('health-bar') && <HealthBar
       gameMode={gameMode}
       isHardcore={isHardcore}
       damaged={damaged}
@@ -102,12 +106,12 @@ export default () => {
         setEffectToAdd(null)
         setEffectToRemove(null)
       }}
-    />
-    <ArmorBar
+    />}
+    {!disabledUiParts.includes('armor-bar') && <ArmorBar
       armorValue={armorValue}
       style={gameMode !== 'survival' && gameMode !== 'adventure' ? { display: 'none' } : { display: 'flex' }}
-    />
-    <FoodBar
+    />}
+    {!disabledUiParts.includes('food-bar') && <FoodBar
       gameMode={gameMode}
       food={food}
       effectToAdd={effectToAdd}
@@ -116,9 +120,9 @@ export default () => {
         setEffectToAdd(null)
         setEffectToRemove(null)
       }}
-    />
-    <BreathBar
+    />}
+    {!disabledUiParts.includes('breath-bar') && <BreathBar
       oxygen={gameMode !== 'survival' && gameMode !== 'adventure' ? 0 : oxygen}
-    />
+    />}
   </div>
 }

From 16609aa010fd92cdce7aac3fab54f126feae28de Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 8 Jul 2025 16:35:05 +0300
Subject: [PATCH 669/753] fix falsey settings apply

---
 src/appConfig.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/appConfig.ts b/src/appConfig.ts
index 52fba96d..92fde21a 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -74,7 +74,7 @@ export const loadAppConfig = (appConfig: AppConfig) => {
       if (value) {
         disabledSettings.value.add(key)
         // since the setting is forced, we need to set it to that value
-        if (appConfig.defaultSettings?.[key] && !qsOptions[key]) {
+        if (appConfig.defaultSettings && key in appConfig.defaultSettings && !qsOptions[key]) {
           options[key] = appConfig.defaultSettings[key]
         }
       } else {
@@ -82,6 +82,7 @@ export const loadAppConfig = (appConfig: AppConfig) => {
       }
     }
   }
+  // todo apply defaultSettings to defaults even if not forced in case of remote config
 
   if (appConfig.keybindings) {
     Object.assign(customKeymaps, defaultsDeep(appConfig.keybindings, customKeymaps))

From 826b24d9e266b0e59948ac4778bd9750e8e51973 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 9 Jul 2025 16:10:50 +0300
Subject: [PATCH 670/753] Metrics server (#390)

---
 package.json           |   4 +-
 rsbuild.config.ts      |  10 ++++
 scripts/requestData.ts |  42 +++++++++++++++++
 scripts/wsServer.ts    |  45 ++++++++++++++++++
 src/devtools.ts        | 103 +++++++++++++++++++++++++++++++++++++++++
 src/env.d.ts           |   1 +
 6 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 scripts/requestData.ts
 create mode 100644 scripts/wsServer.ts

diff --git a/package.json b/package.json
index a09b92a3..fe4adb16 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "dev-proxy": "node server.js",
     "start": "run-p dev-proxy dev-rsbuild watch-mesher",
     "start2": "run-p dev-rsbuild watch-mesher",
+    "start-metrics": "ENABLE_METRICS=true rsbuild dev",
     "build": "pnpm build-other-workers && rsbuild build",
     "build-analyze": "BUNDLE_ANALYZE=true rsbuild build && pnpm build-other-workers",
     "build-single-file": "SINGLE_FILE_BUILD=true rsbuild build",
@@ -32,7 +33,8 @@
     "run-all": "run-p start run-playground",
     "build-playground": "rsbuild build --config renderer/rsbuild.config.ts",
     "watch-playground": "rsbuild dev --config renderer/rsbuild.config.ts",
-    "update-git-deps": "tsx scripts/updateGitDeps.ts"
+    "update-git-deps": "tsx scripts/updateGitDeps.ts",
+    "request-data": "tsx scripts/requestData.ts"
   },
   "keywords": [
     "prismarine",
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 219fe57e..e264f6b7 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -15,6 +15,7 @@ import { appAndRendererSharedConfig } from './renderer/rsbuildSharedConfig'
 import { genLargeDataAliases } from './scripts/genLargeDataAliases'
 import sharp from 'sharp'
 import supportedVersions from './src/supportedVersions.mjs'
+import { startWsServer } from './scripts/wsServer'
 
 const SINGLE_FILE_BUILD = process.env.SINGLE_FILE_BUILD === 'true'
 
@@ -59,6 +60,8 @@ const configSource = (SINGLE_FILE_BUILD ? 'BUNDLED' : (process.env.CONFIG_JSON_S
 
 const faviconPath = 'favicon.png'
 
+const enableMetrics = process.env.ENABLE_METRICS === 'true'
+
 // base options are in ./renderer/rsbuildSharedConfig.ts
 const appConfig = defineConfig({
     html: {
@@ -159,6 +162,7 @@ const appConfig = defineConfig({
             'process.env.INLINED_APP_CONFIG': JSON.stringify(configSource === 'BUNDLED' ? configJson : null),
             'process.env.ENABLE_COOKIE_STORAGE': JSON.stringify(process.env.ENABLE_COOKIE_STORAGE || true),
             'process.env.COOKIE_STORAGE_PREFIX': JSON.stringify(process.env.COOKIE_STORAGE_PREFIX || ''),
+            'process.env.WS_PORT': JSON.stringify(enableMetrics ? 8081 : false),
         },
     },
     server: {
@@ -216,6 +220,12 @@ const appConfig = defineConfig({
                         await execAsync('pnpm run build-mesher')
                     }
                     fs.writeFileSync('./dist/version.txt', buildingVersion, 'utf-8')
+
+                    // Start WebSocket server in development
+                    if (dev && enableMetrics) {
+                        await startWsServer(8081, false)
+                    }
+
                     console.timeEnd('total-prep')
                 }
                 if (!dev) {
diff --git a/scripts/requestData.ts b/scripts/requestData.ts
new file mode 100644
index 00000000..dc866a1b
--- /dev/null
+++ b/scripts/requestData.ts
@@ -0,0 +1,42 @@
+import WebSocket from 'ws'
+
+function formatBytes(bytes: number) {
+  return `${(bytes).toFixed(2)} MB`
+}
+
+function formatTime(ms: number) {
+  return `${(ms / 1000).toFixed(2)}s`
+}
+
+const ws = new WebSocket('ws://localhost:8081')
+
+ws.on('open', () => {
+  console.log('Connected to metrics server, waiting for metrics...')
+})
+
+ws.on('message', (data) => {
+  try {
+    const metrics = JSON.parse(data.toString())
+    console.log('\nPerformance Metrics:')
+    console.log('------------------')
+    console.log(`Load Time: ${formatTime(metrics.loadTime)}`)
+    console.log(`Memory Usage: ${formatBytes(metrics.memoryUsage)}`)
+    console.log(`Timestamp: ${new Date(metrics.timestamp).toLocaleString()}`)
+    if (!process.argv.includes('-f')) { // follow mode
+      process.exit(0)
+    }
+  } catch (error) {
+    console.error('Error parsing metrics:', error)
+  }
+})
+
+ws.on('error', (error) => {
+  console.error('WebSocket error:', error)
+  process.exit(1)
+})
+
+// Exit if no metrics received after 5 seconds
+setTimeout(() => {
+  console.error('Timeout waiting for metrics')
+  process.exit(1)
+}, 5000)
diff --git a/scripts/wsServer.ts b/scripts/wsServer.ts
new file mode 100644
index 00000000..43035f52
--- /dev/null
+++ b/scripts/wsServer.ts
@@ -0,0 +1,45 @@
+import {WebSocketServer} from 'ws'
+
+export function startWsServer(port: number = 8081, tryOtherPort: boolean = true): Promise<number> {
+  return new Promise((resolve, reject) => {
+    const tryPort = (currentPort: number) => {
+      const wss = new WebSocketServer({ port: currentPort })
+        .on('listening', () => {
+          console.log(`WebSocket server started on port ${currentPort}`)
+          resolve(currentPort)
+        })
+        .on('error', (err: any) => {
+          if (err.code === 'EADDRINUSE' && tryOtherPort) {
+            console.log(`Port ${currentPort} in use, trying ${currentPort + 1}`)
+            wss.close()
+            tryPort(currentPort + 1)
+          } else {
+            reject(err)
+          }
+        })
+
+      wss.on('connection', (ws) => {
+        console.log('Client connected')
+
+        ws.on('message', (message) => {
+          try {
+            // Simply relay the message to all connected clients except sender
+            wss.clients.forEach(client => {
+              if (client !== ws && client.readyState === WebSocket.OPEN) {
+                client.send(message.toString())
+              }
+            })
+          } catch (error) {
+            console.error('Error processing message:', error)
+          }
+        })
+
+        ws.on('close', () => {
+          console.log('Client disconnected')
+        })
+      })
+    }
+
+    tryPort(port)
+  })
+}
diff --git a/src/devtools.ts b/src/devtools.ts
index b9267127..547d0571 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -209,3 +209,106 @@ setInterval(() => {
 }, 1000)
 
 // ---
+
+// Add type declaration for performance.memory
+declare global {
+  interface Performance {
+    memory?: {
+      usedJSHeapSize: number
+      totalJSHeapSize: number
+      jsHeapSizeLimit: number
+    }
+  }
+}
+
+// Performance metrics WebSocket client
+let ws: WebSocket | null = null
+let wsReconnectTimeout: NodeJS.Timeout | null = null
+let metricsInterval: NodeJS.Timeout | null = null
+
+// Start collecting metrics immediately
+const startTime = performance.now()
+
+function collectAndSendMetrics () {
+  if (!ws || ws.readyState !== WebSocket.OPEN) return
+
+  const metrics = {
+    loadTime: performance.now() - startTime,
+    memoryUsage: (performance.memory?.usedJSHeapSize ?? 0) / 1024 / 1024,
+    timestamp: Date.now()
+  }
+
+  ws.send(JSON.stringify(metrics))
+}
+
+function getWebSocketUrl () {
+  const wsPort = process.env.WS_SERVER
+  if (!wsPort) return null
+
+  const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'
+  const { hostname } = window.location
+  return `${protocol}//${hostname}:${wsPort}`
+}
+
+function connectWebSocket () {
+  if (ws) return
+
+  const wsUrl = getWebSocketUrl()
+  if (!wsUrl) {
+    console.log('WebSocket server not configured')
+    return
+  }
+
+  ws = new WebSocket(wsUrl)
+
+  ws.onopen = () => {
+    console.log('Connected to metrics server')
+    if (wsReconnectTimeout) {
+      clearTimeout(wsReconnectTimeout)
+      wsReconnectTimeout = null
+    }
+
+    // Start sending metrics immediately after connection
+    collectAndSendMetrics()
+
+    // Clear existing interval if any
+    if (metricsInterval) {
+      clearInterval(metricsInterval)
+    }
+
+    // Set new interval
+    metricsInterval = setInterval(collectAndSendMetrics, 500)
+  }
+
+  ws.onclose = () => {
+    console.log('Disconnected from metrics server')
+    ws = null
+
+    // Clear metrics interval
+    if (metricsInterval) {
+      clearInterval(metricsInterval)
+      metricsInterval = null
+    }
+
+    // Try to reconnect after 3 seconds
+    wsReconnectTimeout = setTimeout(connectWebSocket, 3000)
+  }
+
+  ws.onerror = (error) => {
+    console.error('WebSocket error:', error)
+  }
+}
+
+// Connect immediately
+connectWebSocket()
+
+// Add command to request current metrics
+window.requestMetrics = () => {
+  const metrics = {
+    loadTime: performance.now() - startTime,
+    memoryUsage: (performance.memory?.usedJSHeapSize ?? 0) / 1024 / 1024,
+    timestamp: Date.now()
+  }
+  console.log('Current metrics:', metrics)
+  return metrics
+}
diff --git a/src/env.d.ts b/src/env.d.ts
index 4cb5bafd..c743d6b4 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -3,6 +3,7 @@ declare namespace NodeJS {
     // Build configuration
     NODE_ENV: 'development' | 'production'
     SINGLE_FILE_BUILD?: string
+    WS_SERVER?: string
     DISABLE_SERVICE_WORKER?: string
     CONFIG_JSON_SOURCE?: 'BUNDLED' | 'REMOTE'
     LOCAL_CONFIG_FILE?: string

From 95cc0e6c7408f5f28b012f3d0067ebb8e0af2e80 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 9 Jul 2025 16:33:50 +0300
Subject: [PATCH 671/753] reduce ram usage by 15%

---
 renderer/viewer/lib/mesher/models.ts       | 7 -------
 renderer/viewer/lib/mesher/shared.ts       | 1 -
 renderer/viewer/lib/worldrendererCommon.ts | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/renderer/viewer/lib/mesher/models.ts b/renderer/viewer/lib/mesher/models.ts
index a69d3e9a..aca47e15 100644
--- a/renderer/viewer/lib/mesher/models.ts
+++ b/renderer/viewer/lib/mesher/models.ts
@@ -542,7 +542,6 @@ export function getSectionGeometry (sx: number, sy: number, sz: number, world: W
     heads: {},
     signs: {},
     // isFull: true,
-    highestBlocks: new Map(),
     hadErrors: false,
     blocksCount: 0
   }
@@ -552,12 +551,6 @@ export function getSectionGeometry (sx: number, sy: number, sz: number, world: W
     for (cursor.z = sz; cursor.z < sz + 16; cursor.z++) {
       for (cursor.x = sx; cursor.x < sx + 16; cursor.x++) {
         let block = world.getBlock(cursor, blockProvider, attr)!
-        if (!INVISIBLE_BLOCKS.has(block.name)) {
-          const highest = attr.highestBlocks.get(`${cursor.x},${cursor.z}`)
-          if (!highest || highest.y < cursor.y) {
-            attr.highestBlocks.set(`${cursor.x},${cursor.z}`, { y: cursor.y, stateId: block.stateId, biomeId: block.biome.id })
-          }
-        }
         if (INVISIBLE_BLOCKS.has(block.name)) continue
         if ((block.name.includes('_sign') || block.name === 'sign') && !world.config.disableSignsMapsSupport) {
           const key = `${cursor.x},${cursor.y},${cursor.z}`
diff --git a/renderer/viewer/lib/mesher/shared.ts b/renderer/viewer/lib/mesher/shared.ts
index 53e0c534..230db6b9 100644
--- a/renderer/viewer/lib/mesher/shared.ts
+++ b/renderer/viewer/lib/mesher/shared.ts
@@ -42,7 +42,6 @@ export type MesherGeometryOutput = {
   heads: Record<string, any>,
   signs: Record<string, any>,
   // isFull: boolean
-  highestBlocks: Map<string, HighestBlockInfo>
   hadErrors: boolean
   blocksCount: number
   customBlockModels?: CustomBlockModels
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 7501b279..5c4fd6b5 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -123,7 +123,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   handleResize = () => { }
   highestBlocksByChunks = new Map<string, { [chunkKey: string]: HighestBlockInfo }>()
-  highestBlocksBySections = new Map<string, { [sectionKey: string]: HighestBlockInfo }>()
   blockEntities = {}
 
   workersProcessAverageTime = 0
@@ -389,8 +388,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       this.logWorkerWork(() => `-> ${data.workerIndex} geometry ${data.key} ${JSON.stringify({ dataSize: JSON.stringify(data).length })}`)
       this.geometryReceiveCount[data.workerIndex] ??= 0
       this.geometryReceiveCount[data.workerIndex]++
-      const { geometry } = data
-      this.highestBlocksBySections[data.key] = geometry.highestBlocks
       const chunkCoords = data.key.split(',').map(Number)
       this.lastChunkDistance = Math.max(...this.getDistance(new Vec3(chunkCoords[0], 0, chunkCoords[2])))
     }
@@ -688,7 +685,6 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     for (let y = this.worldSizeParams.minY; y < this.worldSizeParams.worldHeight; y += 16) {
       this.setSectionDirty(new Vec3(x, y, z), false)
       delete this.finishedSections[`${x},${y},${z}`]
-      this.highestBlocksBySections.delete(`${x},${y},${z}`)
     }
     this.highestBlocksByChunks.delete(`${x},${z}`)
 

From e9320c68d242f1015a701b566693128211bc7f29 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 9 Jul 2025 17:13:36 +0300
Subject: [PATCH 672/753] fix metrics port

---
 src/devtools.ts | 2 +-
 src/env.d.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/devtools.ts b/src/devtools.ts
index 547d0571..8890fdea 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -242,7 +242,7 @@ function collectAndSendMetrics () {
 }
 
 function getWebSocketUrl () {
-  const wsPort = process.env.WS_SERVER
+  const wsPort = process.env.WS_PORT
   if (!wsPort) return null
 
   const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'
diff --git a/src/env.d.ts b/src/env.d.ts
index c743d6b4..9b3e9774 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -3,7 +3,7 @@ declare namespace NodeJS {
     // Build configuration
     NODE_ENV: 'development' | 'production'
     SINGLE_FILE_BUILD?: string
-    WS_SERVER?: string
+    WS_PORT?: string
     DISABLE_SERVICE_WORKER?: string
     CONFIG_JSON_SOURCE?: 'BUNDLED' | 'REMOTE'
     LOCAL_CONFIG_FILE?: string

From 39aca1735ee268735946c235e0e1238a49676482 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Fri, 11 Jul 2025 14:13:24 +0000
Subject: [PATCH 673/753] fix: custom item model data on 1.21.4+ (#392)

---
 src/mineflayer/items.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/mineflayer/items.ts b/src/mineflayer/items.ts
index 495c4f39..48d0dfe0 100644
--- a/src/mineflayer/items.ts
+++ b/src/mineflayer/items.ts
@@ -58,9 +58,17 @@ export const getItemMetadata = (item: GeneralInputItem, resourcesManager: Resour
     }
     if (customModelDataDefinitions) {
       const customModelDataComponent: any = componentMap.get('custom_model_data')
-      if (customModelDataComponent?.data && typeof customModelDataComponent.data === 'number') {
-        const customModelData = customModelDataComponent.data
-        if (customModelDataDefinitions[customModelData]) {
+      if (customModelDataComponent?.data) {
+        let customModelData: number | undefined
+        if (typeof customModelDataComponent.data === 'number') {
+          customModelData = customModelDataComponent.data
+        } else if (typeof customModelDataComponent.data === 'object'
+          && 'floats' in customModelDataComponent.data
+          && Array.isArray(customModelDataComponent.data.floats)
+          && customModelDataComponent.data.floats.length > 0) {
+          customModelData = customModelDataComponent.data.floats[0]
+        }
+        if (customModelData && customModelDataDefinitions[customModelData]) {
           customModel = customModelDataDefinitions[customModelData]
         }
       }

From a09cd7d3ed095e57433d4b9e896ff3380362c74d Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Fri, 11 Jul 2025 14:56:37 +0000
Subject: [PATCH 674/753] fix: Nametag & sign text fixes (#391)

---
 experiments/three.ts                        |   1 -
 renderer/viewer/lib/renderUtils.js          |  11 -
 renderer/viewer/lib/utils.ts                |  57 ++---
 renderer/viewer/lib/utils/skins.ts          |  65 +----
 renderer/viewer/sign-renderer/index.ts      | 251 +++++++++++++-------
 renderer/viewer/sign-renderer/playground.ts |   9 +-
 renderer/viewer/sign-renderer/tests.test.ts |   6 +-
 renderer/viewer/three/entities.ts           |  70 +++---
 renderer/viewer/three/entity/EntityMesh.ts  |   2 +-
 renderer/viewer/{lib => three}/hand.ts      |   5 +-
 renderer/viewer/three/holdingBlock.ts       |   2 +-
 renderer/viewer/three/panorama.ts           |   2 +-
 renderer/viewer/three/threeJsUtils.ts       |  55 +++++
 renderer/viewer/three/world/cursorBlock.ts  |   4 +-
 renderer/viewer/three/worldrendererThree.ts |  11 +-
 15 files changed, 309 insertions(+), 242 deletions(-)
 delete mode 100644 renderer/viewer/lib/renderUtils.js
 rename renderer/viewer/{lib => three}/hand.ts (95%)

diff --git a/experiments/three.ts b/experiments/three.ts
index 9b158dec..21142b5f 100644
--- a/experiments/three.ts
+++ b/experiments/three.ts
@@ -1,5 +1,4 @@
 import * as THREE from 'three'
-import { loadThreeJsTextureFromBitmap } from '../renderer/viewer/lib/utils/skins'
 
 // Create scene, camera and renderer
 const scene = new THREE.Scene()
diff --git a/renderer/viewer/lib/renderUtils.js b/renderer/viewer/lib/renderUtils.js
deleted file mode 100644
index 14176561..00000000
--- a/renderer/viewer/lib/renderUtils.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { fromFormattedString } from '@xmcl/text-component'
-
-export const formattedStringToSimpleString = (str) => {
-  const result = fromFormattedString(str)
-  str = result.text
-  // todo recursive
-  for (const extra of result.extra) {
-    str += extra.text
-  }
-  return str
-}
diff --git a/renderer/viewer/lib/utils.ts b/renderer/viewer/lib/utils.ts
index 5c9c00f1..f471aa9d 100644
--- a/renderer/viewer/lib/utils.ts
+++ b/renderer/viewer/lib/utils.ts
@@ -1,30 +1,3 @@
-import * as THREE from 'three'
-import { loadThreeJsTextureFromUrl, loadThreeJsTextureFromUrlSync } from './utils/skins'
-
-let textureCache: Record<string, THREE.Texture> = {}
-let imagesPromises: Record<string, Promise<THREE.Texture>> = {}
-
-export async function loadTexture (texture: string, cb: (texture: THREE.Texture) => void, onLoad?: () => void): Promise<void> {
-  const cached = textureCache[texture]
-  if (!cached) {
-    const { promise, resolve } = Promise.withResolvers<THREE.Texture>()
-    const t = loadThreeJsTextureFromUrlSync(texture)
-    textureCache[texture] = t.texture
-    void t.promise.then(resolve)
-    imagesPromises[texture] = promise
-  }
-
-  cb(textureCache[texture])
-  void imagesPromises[texture].then(() => {
-    onLoad?.()
-  })
-}
-
-export const clearTextureCache = () => {
-  textureCache = {}
-  imagesPromises = {}
-}
-
 export const loadScript = async function (scriptSrc: string, highPriority = true): Promise<HTMLScriptElement> {
   const existingScript = document.querySelector<HTMLScriptElement>(`script[src="${scriptSrc}"]`)
   if (existingScript) {
@@ -52,3 +25,33 @@ export const loadScript = async function (scriptSrc: string, highPriority = true
     document.head.appendChild(scriptElement)
   })
 }
+
+const detectFullOffscreenCanvasSupport = () => {
+  if (typeof OffscreenCanvas === 'undefined') return false
+  try {
+    const canvas = new OffscreenCanvas(1, 1)
+    // Try to get a WebGL context - this will fail on iOS where only 2D is supported (iOS 16)
+    const gl = canvas.getContext('webgl2') || canvas.getContext('webgl')
+    return gl !== null
+  } catch (e) {
+    return false
+  }
+}
+
+const hasFullOffscreenCanvasSupport = detectFullOffscreenCanvasSupport()
+
+export const createCanvas = (width: number, height: number): OffscreenCanvas => {
+  if (hasFullOffscreenCanvasSupport) {
+    return new OffscreenCanvas(width, height)
+  }
+  const canvas = document.createElement('canvas')
+  canvas.width = width
+  canvas.height = height
+  return canvas as unknown as OffscreenCanvas // todo-low
+}
+
+export async function loadImageFromUrl (imageUrl: string): Promise<ImageBitmap> {
+  const response = await fetch(imageUrl)
+  const blob = await response.blob()
+  return createImageBitmap(blob)
+}
diff --git a/renderer/viewer/lib/utils/skins.ts b/renderer/viewer/lib/utils/skins.ts
index 9aa97340..3163702c 100644
--- a/renderer/viewer/lib/utils/skins.ts
+++ b/renderer/viewer/lib/utils/skins.ts
@@ -1,68 +1,7 @@
 import { loadSkinToCanvas } from 'skinview-utils'
-import * as THREE from 'three'
-import stevePng from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
-import { getLoadedImage } from 'mc-assets/dist/utils'
+import { createCanvas, loadImageFromUrl } from '../utils'
 
-const detectFullOffscreenCanvasSupport = () => {
-  if (typeof OffscreenCanvas === 'undefined') return false
-  try {
-    const canvas = new OffscreenCanvas(1, 1)
-    // Try to get a WebGL context - this will fail on iOS where only 2D is supported (iOS 16)
-    const gl = canvas.getContext('webgl2') || canvas.getContext('webgl')
-    return gl !== null
-  } catch (e) {
-    return false
-  }
-}
-
-const hasFullOffscreenCanvasSupport = detectFullOffscreenCanvasSupport()
-
-export const loadThreeJsTextureFromUrlSync = (imageUrl: string) => {
-  const texture = new THREE.Texture()
-  const promise = getLoadedImage(imageUrl).then(image => {
-    texture.image = image
-    texture.needsUpdate = true
-    return texture
-  })
-  return {
-    texture,
-    promise
-  }
-}
-
-export const createCanvas = (width: number, height: number): OffscreenCanvas => {
-  if (hasFullOffscreenCanvasSupport) {
-    return new OffscreenCanvas(width, height)
-  }
-  const canvas = document.createElement('canvas')
-  canvas.width = width
-  canvas.height = height
-  return canvas as unknown as OffscreenCanvas // todo-low
-}
-
-export const loadThreeJsTextureFromUrl = async (imageUrl: string) => {
-  const loaded = new THREE.TextureLoader().loadAsync(imageUrl)
-  return loaded
-}
-export const loadThreeJsTextureFromBitmap = (image: ImageBitmap) => {
-  const canvas = createCanvas(image.width, image.height)
-  const ctx = canvas.getContext('2d')!
-  ctx.drawImage(image, 0, 0)
-  const texture = new THREE.Texture(canvas)
-  texture.magFilter = THREE.NearestFilter
-  texture.minFilter = THREE.NearestFilter
-  return texture
-}
-
-export const stevePngUrl = stevePng
-export const steveTexture = loadThreeJsTextureFromUrl(stevePngUrl)
-
-
-export async function loadImageFromUrl (imageUrl: string): Promise<ImageBitmap> {
-  const response = await fetch(imageUrl)
-  const blob = await response.blob()
-  return createImageBitmap(blob)
-}
+export { default as stevePngUrl } from 'mc-assets/dist/other-textures/latest/entity/player/wide/steve.png'
 
 const config = {
   apiEnabled: true,
diff --git a/renderer/viewer/sign-renderer/index.ts b/renderer/viewer/sign-renderer/index.ts
index a1e4331f..f14b9b4c 100644
--- a/renderer/viewer/sign-renderer/index.ts
+++ b/renderer/viewer/sign-renderer/index.ts
@@ -1,5 +1,5 @@
-import { fromFormattedString, render, RenderNode, TextComponent } from '@xmcl/text-component'
 import type { ChatMessage } from 'prismarine-chat'
+import { createCanvas } from '../lib/utils'
 
 type SignBlockEntity = {
   Color?: string
@@ -32,29 +32,40 @@ const parseSafe = (text: string, task: string) => {
   }
 }
 
-export const renderSign = (blockEntity: SignBlockEntity, PrismarineChat: typeof ChatMessage, ctxHook = (ctx) => { }) => {
+const LEGACY_COLORS = {
+  black: '#000000',
+  dark_blue: '#0000AA',
+  dark_green: '#00AA00',
+  dark_aqua: '#00AAAA',
+  dark_red: '#AA0000',
+  dark_purple: '#AA00AA',
+  gold: '#FFAA00',
+  gray: '#AAAAAA',
+  dark_gray: '#555555',
+  blue: '#5555FF',
+  green: '#55FF55',
+  aqua: '#55FFFF',
+  red: '#FF5555',
+  light_purple: '#FF55FF',
+  yellow: '#FFFF55',
+  white: '#FFFFFF',
+}
+
+export const renderSign = (
+  blockEntity: SignBlockEntity,
+  isHanging: boolean,
+  PrismarineChat: typeof ChatMessage,
+  ctxHook = (ctx) => { },
+  canvasCreator = (width, height): OffscreenCanvas => { return createCanvas(width, height) }
+) => {
   // todo don't use texture rendering, investigate the font rendering when possible
   // or increase factor when needed
   const factor = 40
+  const fontSize = 1.6 * factor
   const signboardY = [16, 9]
   const heightOffset = signboardY[0] - signboardY[1]
   const heightScalar = heightOffset / 16
-
-  let canvas: HTMLCanvasElement | undefined
-  let _ctx: CanvasRenderingContext2D | null = null
-  const getCtx = () => {
-    if (_ctx) return _ctx
-    canvas = document.createElement('canvas')
-
-    canvas.width = 16 * factor
-    canvas.height = heightOffset * factor
-
-    _ctx = canvas.getContext('2d')!
-    _ctx.imageSmoothingEnabled = false
-
-    ctxHook(_ctx)
-    return _ctx
-  }
+  // todo the text should be clipped based on it's render width (needs investigate)
 
   const texts = 'front_text' in blockEntity ? /* > 1.20 */ blockEntity.front_text.messages : [
     blockEntity.Text1,
@@ -62,78 +73,144 @@ export const renderSign = (blockEntity: SignBlockEntity, PrismarineChat: typeof
     blockEntity.Text3,
     blockEntity.Text4
   ]
+
+  if (!texts.some((text) => text !== 'null')) {
+    return undefined
+  }
+
+  const canvas = canvasCreator(16 * factor, heightOffset * factor)
+
+  const _ctx = canvas.getContext('2d')!
+
+  ctxHook(_ctx)
   const defaultColor = ('front_text' in blockEntity ? blockEntity.front_text.color : blockEntity.Color) || 'black'
   for (const [lineNum, text] of texts.slice(0, 4).entries()) {
-    // todo: in pre flatenning it seems the format was not json
     if (text === 'null') continue
-    const parsed = text?.startsWith('{') || text?.startsWith('"') ? parseSafe(text ?? '""', 'sign text') : text
-    if (!parsed || (typeof parsed !== 'object' && typeof parsed !== 'string')) continue
-    // todo fix type
-    const message = typeof parsed === 'string' ? fromFormattedString(parsed) : new PrismarineChat(parsed) as never
-    const patchExtra = ({ extra }: TextComponent) => {
-      if (!extra) return
-      for (const child of extra) {
-        if (child.color) {
-          child.color = child.color === 'dark_green' ? child.color.toUpperCase() : child.color.toLowerCase()
-        }
-        patchExtra(child)
-      }
-    }
-    patchExtra(message)
-    const rendered = render(message)
-
-    const toRenderCanvas: Array<{
-      fontStyle: string
-      fillStyle: string
-      underlineStyle: boolean
-      strikeStyle: boolean
-      text: string
-    }> = []
-    let plainText = ''
-    // todo the text should be clipped based on it's render width (needs investigate)
-    const MAX_LENGTH = 50 // avoid abusing the signboard
-    const renderText = (node: RenderNode) => {
-      const { component } = node
-      let { text } = component
-      if (plainText.length + text.length > MAX_LENGTH) {
-        text = text.slice(0, MAX_LENGTH - plainText.length)
-        if (!text) return false
-      }
-      plainText += text
-      toRenderCanvas.push({
-        fontStyle: `${component.bold ? 'bold' : ''} ${component.italic ? 'italic' : ''}`,
-        fillStyle: node.style['color'] || defaultColor,
-        underlineStyle: component.underlined ?? false,
-        strikeStyle: component.strikethrough ?? false,
-        text
-      })
-      for (const child of node.children) {
-        const stop = renderText(child) === false
-        if (stop) return false
-      }
-    }
-
-    renderText(rendered)
-
-    // skip rendering empty lines (and possible signs)
-    if (!plainText.trim()) continue
-
-    const ctx = getCtx()
-    const fontSize = 1.6 * factor
-    ctx.font = `${fontSize}px mojangles`
-    const textWidth = ctx.measureText(plainText).width
-
-    let renderedWidth = 0
-    for (const { fillStyle, fontStyle, strikeStyle, text, underlineStyle } of toRenderCanvas) {
-      // todo strikeStyle, underlineStyle
-      ctx.fillStyle = fillStyle
-      ctx.font = `${fontStyle} ${fontSize}px mojangles`
-      ctx.fillText(text, (canvas!.width - textWidth) / 2 + renderedWidth, fontSize * (lineNum + 1))
-      renderedWidth += ctx.measureText(text).width // todo isn't the font is monospace?
-    }
+    renderComponent(text, PrismarineChat, canvas, fontSize, defaultColor, fontSize * (lineNum + 1) + (isHanging ? 0 : -8))
   }
-  // ctx.fillStyle = 'red'
-  // ctx.fillRect(0, 0, canvas.width, canvas.height)
-
   return canvas
 }
+
+export const renderComponent = (
+  text: JsonEncodedType | string | undefined,
+  PrismarineChat: typeof ChatMessage,
+  canvas: OffscreenCanvas,
+  fontSize: number,
+  defaultColor: string,
+  offset = 0
+) => {
+  // todo: in pre flatenning it seems the format was not json
+  const parsed = typeof text === 'string' && (text?.startsWith('{') || text?.startsWith('"')) ? parseSafe(text ?? '""', 'sign text') : text
+  if (!parsed || (typeof parsed !== 'object' && typeof parsed !== 'string')) return
+  // todo fix type
+
+  const ctx = canvas.getContext('2d')!
+  if (!ctx) throw new Error('Could not get 2d context')
+  ctx.imageSmoothingEnabled = false
+  ctx.font = `${fontSize}px mojangles`
+
+  type Formatting = {
+    color: string | undefined
+    underlined: boolean | undefined
+    strikethrough: boolean | undefined
+    bold: boolean | undefined
+    italic: boolean | undefined
+  }
+
+  type Message = ChatMessage & Formatting & { text: string }
+
+  const message = new PrismarineChat(parsed) as Message
+
+  const toRenderCanvas: Array<{
+    fontStyle: string
+    fillStyle: string
+    underlineStyle: boolean
+    strikeStyle: boolean
+    offset: number
+    text: string
+  }> = []
+  let visibleFormatting = false
+  let plainText = ''
+  let textOffset = offset
+  const textWidths: number[] = []
+
+  const renderText = (component: Message, parentFormatting?: Formatting | undefined) => {
+    const { text } = component
+    const formatting = {
+      color: component.color ?? parentFormatting?.color,
+      underlined: component.underlined ?? parentFormatting?.underlined,
+      strikethrough: component.strikethrough ?? parentFormatting?.strikethrough,
+      bold: component.bold ?? parentFormatting?.bold,
+      italic: component.italic ?? parentFormatting?.italic
+    }
+    visibleFormatting = visibleFormatting || formatting.underlined || formatting.strikethrough || false
+    if (text?.includes('\n')) {
+      for (const line of text.split('\n')) {
+        addTextPart(line, formatting)
+        textOffset += fontSize
+        plainText = ''
+      }
+    } else if (text) {
+      addTextPart(text, formatting)
+    }
+    if (component.extra) {
+      for (const child of component.extra) {
+        renderText(child as Message, formatting)
+      }
+    }
+  }
+
+  const addTextPart = (text: string, formatting: Formatting) => {
+    plainText += text
+    textWidths[textOffset] = ctx.measureText(plainText).width
+    let color = formatting.color ?? defaultColor
+    if (!color.startsWith('#')) {
+      color = LEGACY_COLORS[color.toLowerCase()] || color
+    }
+    toRenderCanvas.push({
+      fontStyle: `${formatting.bold ? 'bold' : ''} ${formatting.italic ? 'italic' : ''}`,
+      fillStyle: color,
+      underlineStyle: formatting.underlined ?? false,
+      strikeStyle: formatting.strikethrough ?? false,
+      offset: textOffset,
+      text
+    })
+  }
+
+  renderText(message)
+
+  // skip rendering empty lines
+  if (!visibleFormatting && !message.toString().trim()) return
+
+  let renderedWidth = 0
+  let previousOffsetY = 0
+  for (const { fillStyle, fontStyle, underlineStyle, strikeStyle, offset: offsetY, text } of toRenderCanvas) {
+    if (previousOffsetY !== offsetY) {
+      renderedWidth = 0
+    }
+    previousOffsetY = offsetY
+    ctx.fillStyle = fillStyle
+    ctx.textRendering = 'optimizeLegibility'
+    ctx.font = `${fontStyle} ${fontSize}px mojangles`
+    const textWidth = textWidths[offsetY] ?? ctx.measureText(text).width
+    const offsetX = (canvas.width - textWidth) / 2 + renderedWidth
+    ctx.fillText(text, offsetX, offsetY)
+    if (strikeStyle) {
+      ctx.lineWidth = fontSize / 8
+      ctx.strokeStyle = fillStyle
+      ctx.beginPath()
+      ctx.moveTo(offsetX, offsetY - ctx.lineWidth * 2.5)
+      ctx.lineTo(offsetX + ctx.measureText(text).width, offsetY - ctx.lineWidth * 2.5)
+      ctx.stroke()
+    }
+    if (underlineStyle) {
+      ctx.lineWidth = fontSize / 8
+      ctx.strokeStyle = fillStyle
+      ctx.beginPath()
+      ctx.moveTo(offsetX, offsetY + ctx.lineWidth)
+      ctx.lineTo(offsetX + ctx.measureText(text).width, offsetY + ctx.lineWidth)
+      ctx.stroke()
+    }
+    renderedWidth += ctx.measureText(text).width
+  }
+}
diff --git a/renderer/viewer/sign-renderer/playground.ts b/renderer/viewer/sign-renderer/playground.ts
index 92ff5d03..a7438092 100644
--- a/renderer/viewer/sign-renderer/playground.ts
+++ b/renderer/viewer/sign-renderer/playground.ts
@@ -21,9 +21,14 @@ const blockEntity = {
 
 await document.fonts.load('1em mojangles')
 
-const canvas = renderSign(blockEntity, PrismarineChat, (ctx) => {
+const canvas = renderSign(blockEntity, false, PrismarineChat, (ctx) => {
   ctx.drawImage(img, 0, 0, ctx.canvas.width, ctx.canvas.height)
-})
+}, (width, height) => {
+  const canvas = document.createElement('canvas')
+  canvas.width = width
+  canvas.height = height
+  return canvas as unknown as OffscreenCanvas
+}) as unknown as HTMLCanvasElement
 
 if (canvas) {
   canvas.style.imageRendering = 'pixelated'
diff --git a/renderer/viewer/sign-renderer/tests.test.ts b/renderer/viewer/sign-renderer/tests.test.ts
index b8fc94fc..ab268849 100644
--- a/renderer/viewer/sign-renderer/tests.test.ts
+++ b/renderer/viewer/sign-renderer/tests.test.ts
@@ -22,7 +22,7 @@ global.document = {
 
 const render = (entity) => {
   ctxTexts = []
-  renderSign(entity, PrismarineChat)
+  renderSign(entity, true, PrismarineChat)
   return ctxTexts.map(({ text, y }) => [y / 64, text])
 }
 
@@ -37,10 +37,6 @@ test('sign renderer', () => {
   } as any
   expect(render(blockEntity)).toMatchInlineSnapshot(`
     [
-      [
-        1,
-        "",
-      ],
       [
         1,
         "Minecraft ",
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index c05aac99..51292d2f 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -1,11 +1,10 @@
 //@ts-check
-import EventEmitter from 'events'
 import { UnionToIntersection } from 'type-fest'
 import nbt from 'prismarine-nbt'
 import * as TWEEN from '@tweenjs/tween.js'
 import * as THREE from 'three'
-import { PlayerObject, PlayerAnimation } from 'skinview3d'
-import { loadSkinToCanvas, loadEarsToCanvasFromSkin, inferModelType, loadCapeToCanvas, loadImage } from 'skinview-utils'
+import { PlayerAnimation, PlayerObject } from 'skinview3d'
+import { inferModelType, loadCapeToCanvas, loadEarsToCanvasFromSkin } from 'skinview-utils'
 // todo replace with url
 import { degreesToRadians } from '@nxg-org/mineflayer-tracker/lib/mathUtils'
 import { NameTagObject } from 'skinview3d/libs/nametag'
@@ -13,22 +12,24 @@ import { flat, fromFormattedString } from '@xmcl/text-component'
 import mojangson from 'mojangson'
 import { snakeCase } from 'change-case'
 import { Item } from 'prismarine-item'
-import { BlockModel } from 'mc-assets'
 import { isEntityAttackable } from 'mineflayer-mouse/dist/attackableEntity'
-import { Vec3 } from 'vec3'
 import { Team } from 'mineflayer'
+import PrismarineChatLoader from 'prismarine-chat'
 import { EntityMetadataVersions } from '../../../src/mcDataTypes'
 import { ItemSpecificContextProperties } from '../lib/basePlayerState'
-import { loadSkinImage, loadSkinFromUsername, stevePngUrl, steveTexture, createCanvas } from '../lib/utils/skins'
-import { loadTexture } from '../lib/utils'
+import { loadSkinFromUsername, loadSkinImage, stevePngUrl } from '../lib/utils/skins'
+import { renderComponent } from '../sign-renderer'
+import { createCanvas } from '../lib/utils'
 import { getBlockMeshFromModel } from './holdingBlock'
 import * as Entity from './entity/EntityMesh'
 import { getMesh } from './entity/EntityMesh'
 import { WalkingGeneralSwing } from './entity/animations'
-import { disposeObject } from './threeJsUtils'
-import { armorModel, elytraTexture, armorTextures } from './entity/armorModels'
+import { disposeObject, loadTexture, loadThreeJsTextureFromUrl } from './threeJsUtils'
+import { armorModel, armorTextures, elytraTexture } from './entity/armorModels'
 import { WorldRendererThree } from './worldrendererThree'
 
+export const steveTexture = loadThreeJsTextureFromUrl(stevePngUrl)
+
 export const TWEEN_DURATION = 120
 
 type PlayerObjectType = PlayerObject & {
@@ -96,8 +97,11 @@ function getUsernameTexture ({
   username,
   nameTagBackgroundColor = 'rgba(0, 0, 0, 0.3)',
   nameTagTextOpacity = 255
-}: any, { fontFamily = 'sans-serif' }: any) {
+}: any, { fontFamily = 'mojangles' }: any, version: string) {
   const canvas = createCanvas(64, 64)
+
+  const PrismarineChat = PrismarineChatLoader(version)
+
   const ctx = canvas.getContext('2d')
   if (!ctx) throw new Error('Could not get 2d context')
 
@@ -105,35 +109,36 @@ function getUsernameTexture ({
   const padding = 5
   ctx.font = `${fontSize}px ${fontFamily}`
 
-  const lines = String(username).split('\n')
-
+  const plainLines = String(typeof username === 'string' ? username : new PrismarineChat(username).toString()).split('\n')
   let textWidth = 0
-  for (const line of lines) {
+  for (const line of plainLines) {
     const width = ctx.measureText(line).width + padding * 2
     if (width > textWidth) textWidth = width
   }
 
   canvas.width = textWidth
-  canvas.height = (fontSize + padding) * lines.length
+  canvas.height = (fontSize + padding) * plainLines.length
 
   ctx.fillStyle = nameTagBackgroundColor
   ctx.fillRect(0, 0, canvas.width, canvas.height)
 
-  ctx.font = `${fontSize}px ${fontFamily}`
-  ctx.fillStyle = `rgba(255, 255, 255, ${nameTagTextOpacity / 255})`
-  let i = 0
-  for (const line of lines) {
-    i++
-    ctx.fillText(line, (textWidth - ctx.measureText(line).width) / 2, -padding + fontSize * i)
-  }
+  ctx.globalAlpha = nameTagTextOpacity / 255
+
+  renderComponent(username, PrismarineChat, canvas, fontSize, 'white', -padding + fontSize)
+
+  ctx.globalAlpha = 1
 
   return canvas
 }
 
-const addNametag = (entity, options, mesh) => {
+const addNametag = (entity, options: { fontFamily: string }, mesh, version: string) => {
+  for (const c of mesh.children) {
+    if (c.name === 'nametag') {
+      c.removeFromParent()
+    }
+  }
   if (entity.username !== undefined) {
-    if (mesh.children.some(c => c.name === 'nametag')) return // todo update
-    const canvas = getUsernameTexture(entity, options)
+    const canvas = getUsernameTexture(entity, options, version)
     const tex = new THREE.Texture(canvas)
     tex.needsUpdate = true
     let nameTag
@@ -174,7 +179,7 @@ const nametags = {}
 
 const isFirstUpperCase = (str) => str.charAt(0) === str.charAt(0).toUpperCase()
 
-function getEntityMesh (entity: import('prismarine-entity').Entity & { delete?: any; pos?: any; name?: any }, world: WorldRendererThree | undefined, options: { fontFamily: string }, overrides) {
+function getEntityMesh (entity: import('prismarine-entity').Entity & { delete?: any; pos?: any; name?: any }, world: WorldRendererThree, options: { fontFamily: string }, overrides) {
   if (entity.name) {
     try {
       // https://github.com/PrismarineJS/prismarine-viewer/pull/410
@@ -182,7 +187,7 @@ function getEntityMesh (entity: import('prismarine-entity').Entity & { delete?:
       const e = new Entity.EntityMesh('1.16.4', entityName, world, overrides)
 
       if (e.mesh) {
-        addNametag(entity, options, e.mesh)
+        addNametag(entity, options, e.mesh, world.version)
         return e.mesh
       }
     } catch (err) {
@@ -200,7 +205,7 @@ function getEntityMesh (entity: import('prismarine-entity').Entity & { delete?:
     addNametag({
       username: entity.name,
       height: entity.height,
-    }, options, cube)
+    }, options, cube, world.version)
   }
   return cube
 }
@@ -967,21 +972,22 @@ export class Entities {
     // entity specific meta
     const textDisplayMeta = getSpecificEntityMetadata('text_display', entity)
     const displayTextRaw = textDisplayMeta?.text || meta.custom_name_visible && meta.custom_name
-    const displayText = this.parseEntityLabel(displayTextRaw)
-    if (entity.name !== 'player' && displayText) {
+    if (entity.name !== 'player' && displayTextRaw) {
       const nameTagFixed = textDisplayMeta && (textDisplayMeta.billboard_render_constraints === 'fixed' || !textDisplayMeta.billboard_render_constraints)
-      const nameTagBackgroundColor = textDisplayMeta && toRgba(textDisplayMeta.background_color)
+      const nameTagBackgroundColor = (textDisplayMeta && (parseInt(textDisplayMeta.style_flags, 10) & 0x04) === 0) ? toRgba(textDisplayMeta.background_color) : undefined
       let nameTagTextOpacity: any
       if (textDisplayMeta?.text_opacity) {
         const rawOpacity = parseInt(textDisplayMeta?.text_opacity, 10)
         nameTagTextOpacity = rawOpacity > 0 ? rawOpacity : 256 - rawOpacity
       }
       addNametag(
-        { ...entity, username: displayText, nameTagBackgroundColor, nameTagTextOpacity, nameTagFixed,
+        { ...entity, username: typeof displayTextRaw === 'string' ? mojangson.simplify(mojangson.parse(displayTextRaw)) : nbt.simplify(displayTextRaw),
+          nameTagBackgroundColor, nameTagTextOpacity, nameTagFixed,
           nameTagScale: textDisplayMeta?.scale, nameTagTranslation: textDisplayMeta && (textDisplayMeta.translation || new THREE.Vector3(0, 0, 0)),
           nameTagRotationLeft: toQuaternion(textDisplayMeta?.left_rotation), nameTagRotationRight: toQuaternion(textDisplayMeta?.right_rotation) },
         this.entitiesOptions,
-        mesh
+        mesh,
+        this.worldRenderer.version
       )
     }
 
diff --git a/renderer/viewer/three/entity/EntityMesh.ts b/renderer/viewer/three/entity/EntityMesh.ts
index 454bf35c..229da6d5 100644
--- a/renderer/viewer/three/entity/EntityMesh.ts
+++ b/renderer/viewer/three/entity/EntityMesh.ts
@@ -6,7 +6,7 @@ import ocelotPng from '../../../../node_modules/mc-assets/dist/other-textures/la
 import arrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/arrow.png'
 import spectralArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/spectral_arrow.png'
 import tippedArrowTexture from '../../../../node_modules/mc-assets/dist/other-textures/1.21.2/entity/projectiles/tipped_arrow.png'
-import { loadTexture } from '../../lib/utils'
+import { loadTexture } from '../threeJsUtils'
 import { WorldRendererThree } from '../worldrendererThree'
 import entities from './entities.json'
 import { externalModels } from './objModels'
diff --git a/renderer/viewer/lib/hand.ts b/renderer/viewer/three/hand.ts
similarity index 95%
rename from renderer/viewer/lib/hand.ts
rename to renderer/viewer/three/hand.ts
index 8bfa051b..2bd3832b 100644
--- a/renderer/viewer/lib/hand.ts
+++ b/renderer/viewer/three/hand.ts
@@ -1,6 +1,7 @@
 import * as THREE from 'three'
-import { loadSkinToCanvas } from 'skinview-utils'
-import { loadSkinFromUsername, loadSkinImage, steveTexture } from './utils/skins'
+import { loadSkinFromUsername, loadSkinImage } from '../lib/utils/skins'
+import { steveTexture } from './entities'
+
 
 export const getMyHand = async (image?: string, userName?: string) => {
   let newMap: THREE.Texture
diff --git a/renderer/viewer/three/holdingBlock.ts b/renderer/viewer/three/holdingBlock.ts
index af355f2e..c8a56386 100644
--- a/renderer/viewer/three/holdingBlock.ts
+++ b/renderer/viewer/three/holdingBlock.ts
@@ -4,12 +4,12 @@ import PrismarineItem from 'prismarine-item'
 import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import { BlockModel } from 'mc-assets'
 import { getThreeBlockModelGroup, renderBlockThree, setBlockPosition } from '../lib/mesher/standaloneRenderer'
-import { getMyHand } from '../lib/hand'
 import { MovementState, PlayerStateRenderer } from '../lib/basePlayerState'
 import { DebugGui } from '../lib/DebugGui'
 import { SmoothSwitcher } from '../lib/smoothSwitcher'
 import { watchProperty } from '../lib/utils/proxy'
 import { WorldRendererConfig } from '../lib/worldrendererCommon'
+import { getMyHand } from './hand'
 import { WorldRendererThree } from './worldrendererThree'
 import { disposeObject } from './threeJsUtils'
 
diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
index 7e975d4b..76aa285b 100644
--- a/renderer/viewer/three/panorama.ts
+++ b/renderer/viewer/three/panorama.ts
@@ -7,9 +7,9 @@ import type { GraphicsInitOptions } from '../../../src/appViewer'
 import { WorldDataEmitter } from '../lib/worldDataEmitter'
 import { defaultWorldRendererConfig, WorldRendererCommon } from '../lib/worldrendererCommon'
 import { getDefaultRendererState } from '../baseGraphicsBackend'
-import { loadThreeJsTextureFromUrl, loadThreeJsTextureFromUrlSync } from '../lib/utils/skins'
 import { ResourcesManager } from '../../../src/resourcesManager'
 import { getInitialPlayerStateRenderer } from '../lib/basePlayerState'
+import { loadThreeJsTextureFromUrl, loadThreeJsTextureFromUrlSync } from './threeJsUtils'
 import { WorldRendererThree } from './worldrendererThree'
 import { EntityMesh } from './entity/EntityMesh'
 import { DocumentRenderer } from './documentRenderer'
diff --git a/renderer/viewer/three/threeJsUtils.ts b/renderer/viewer/three/threeJsUtils.ts
index 5ae3b24f..cbef9065 100644
--- a/renderer/viewer/three/threeJsUtils.ts
+++ b/renderer/viewer/three/threeJsUtils.ts
@@ -1,4 +1,6 @@
 import * as THREE from 'three'
+import { getLoadedImage } from 'mc-assets/dist/utils'
+import { createCanvas } from '../lib/utils'
 
 export const disposeObject = (obj: THREE.Object3D, cleanTextures = false) => {
   // not cleaning texture there as it might be used by other objects, but would be good to also do that
@@ -16,3 +18,56 @@ export const disposeObject = (obj: THREE.Object3D, cleanTextures = false) => {
     }
   }
 }
+
+let textureCache: Record<string, THREE.Texture> = {}
+let imagesPromises: Record<string, Promise<THREE.Texture>> = {}
+
+export const loadThreeJsTextureFromUrlSync = (imageUrl: string) => {
+  const texture = new THREE.Texture()
+  const promise = getLoadedImage(imageUrl).then(image => {
+    texture.image = image
+    texture.needsUpdate = true
+    return texture
+  })
+  return {
+    texture,
+    promise
+  }
+}
+
+export const loadThreeJsTextureFromUrl = async (imageUrl: string) => {
+  const loaded = new THREE.TextureLoader().loadAsync(imageUrl)
+  return loaded
+}
+
+export const loadThreeJsTextureFromBitmap = (image: ImageBitmap) => {
+  const canvas = createCanvas(image.width, image.height)
+  const ctx = canvas.getContext('2d')!
+  ctx.drawImage(image, 0, 0)
+  const texture = new THREE.Texture(canvas)
+  texture.magFilter = THREE.NearestFilter
+  texture.minFilter = THREE.NearestFilter
+  return texture
+}
+
+export async function loadTexture (texture: string, cb: (texture: THREE.Texture) => void, onLoad?: () => void): Promise<void> {
+  const cached = textureCache[texture]
+  if (!cached) {
+    const { promise, resolve } = Promise.withResolvers<THREE.Texture>()
+    const t = loadThreeJsTextureFromUrlSync(texture)
+    textureCache[texture] = t.texture
+    void t.promise.then(resolve)
+    imagesPromises[texture] = promise
+  }
+
+  cb(textureCache[texture])
+  void imagesPromises[texture].then(() => {
+    onLoad?.()
+  })
+}
+
+export const clearTextureCache = () => {
+  textureCache = {}
+  imagesPromises = {}
+}
+
diff --git a/renderer/viewer/three/world/cursorBlock.ts b/renderer/viewer/three/world/cursorBlock.ts
index b3be2ca2..b71c1b8d 100644
--- a/renderer/viewer/three/world/cursorBlock.ts
+++ b/renderer/viewer/three/world/cursorBlock.ts
@@ -1,10 +1,9 @@
 import * as THREE from 'three'
 import { LineMaterial, LineSegmentsGeometry, Wireframe } from 'three-stdlib'
 import { Vec3 } from 'vec3'
-import { subscribeKey } from 'valtio/utils'
-import { Block } from 'prismarine-block'
 import { BlockShape, BlocksShapes } from 'renderer/viewer/lib/basePlayerState'
 import { WorldRendererThree } from '../worldrendererThree'
+import { loadThreeJsTextureFromUrl } from '../threeJsUtils'
 import destroyStage0 from '../../../../assets/destroy_stage_0.png'
 import destroyStage1 from '../../../../assets/destroy_stage_1.png'
 import destroyStage2 from '../../../../assets/destroy_stage_2.png'
@@ -15,7 +14,6 @@ import destroyStage6 from '../../../../assets/destroy_stage_6.png'
 import destroyStage7 from '../../../../assets/destroy_stage_7.png'
 import destroyStage8 from '../../../../assets/destroy_stage_8.png'
 import destroyStage9 from '../../../../assets/destroy_stage_9.png'
-import { loadThreeJsTextureFromUrl } from '../../lib/utils/skins'
 
 export class CursorBlock {
   _cursorLinesHidden = false
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index e5b93f88..bc95f06b 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -10,13 +10,12 @@ import { WorldRendererCommon } from '../lib/worldrendererCommon'
 import { addNewStat } from '../lib/ui/newStats'
 import { MesherGeometryOutput } from '../lib/mesher/shared'
 import { ItemSpecificContextProperties } from '../lib/basePlayerState'
-import { getMyHand } from '../lib/hand'
 import { setBlockPosition } from '../lib/mesher/standaloneRenderer'
-import { loadThreeJsTextureFromBitmap } from '../lib/utils/skins'
+import { getMyHand } from './hand'
 import HoldingBlock from './holdingBlock'
 import { getMesh } from './entity/EntityMesh'
 import { armorModel } from './entity/armorModels'
-import { disposeObject } from './threeJsUtils'
+import { disposeObject, loadThreeJsTextureFromBitmap } from './threeJsUtils'
 import { CursorBlock } from './world/cursorBlock'
 import { getItemUv } from './appShared'
 import { Entities } from './entities'
@@ -426,7 +425,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.scene.add(object)
   }
 
-  getSignTexture (position: Vec3, blockEntity, backSide = false) {
+  getSignTexture (position: Vec3, blockEntity, isHanging, backSide = false) {
     const chunk = chunkPos(position)
     let textures = this.chunkTextures.get(`${chunk[0]},${chunk[1]}`)
     if (!textures) {
@@ -438,7 +437,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     if (textures[texturekey]) return textures[texturekey]
 
     const PrismarineChat = PrismarineChatLoader(this.version)
-    const canvas = renderSign(blockEntity, PrismarineChat)
+    const canvas = renderSign(blockEntity, isHanging, PrismarineChat)
     if (!canvas) return
     const tex = new THREE.Texture(canvas)
     tex.magFilter = THREE.NearestFilter
@@ -784,7 +783,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   renderSign (position: Vec3, rotation: number, isWall: boolean, isHanging: boolean, blockEntity) {
-    const tex = this.getSignTexture(position, blockEntity)
+    const tex = this.getSignTexture(position, blockEntity, isHanging)
 
     if (!tex) return
 

From 64da60229472cc62c9814edf2fe5bd44e0d642d5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 12 Jul 2025 05:38:24 +0300
Subject: [PATCH 675/753] add creative server

---
 config.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config.json b/config.json
index 57b1c207..940fb738 100644
--- a/config.json
+++ b/config.json
@@ -16,6 +16,10 @@
     {
       "ip": "wss://play2.mcraft.fun"
     },
+    {
+      "ip": "wss://play-creative.mcraft.fun",
+      "description": "Might be available soon, stay tuned!"
+    },
     {
       "ip": "kaboom.pw",
       "version": "1.20.3",

From 7a83a2a65702e1ec76f60d673f8753688fe05c06 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 14 Jul 2025 00:13:51 +0300
Subject: [PATCH 676/753] fix(important): fix all known issues wiht panorama
 crashing whole game in single file build (minecraft.html)

---
 renderer/viewer/baseGraphicsBackend.ts  |  5 ++--
 renderer/viewer/lib/worldDataEmitter.ts |  2 +-
 renderer/viewer/three/panorama.ts       |  3 +-
 renderer/viewer/three/panoramaShared.ts |  1 +
 src/appViewer.ts                        | 37 +++++++++++++++++--------
 src/shims/minecraftData.ts              | 13 +++++++--
 6 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 renderer/viewer/three/panoramaShared.ts

diff --git a/renderer/viewer/baseGraphicsBackend.ts b/renderer/viewer/baseGraphicsBackend.ts
index 3cd227de..486c930f 100644
--- a/renderer/viewer/baseGraphicsBackend.ts
+++ b/renderer/viewer/baseGraphicsBackend.ts
@@ -1,3 +1,4 @@
+import { proxy } from 'valtio'
 import { NonReactiveState, RendererReactiveState } from '../../src/appViewer'
 
 export const getDefaultRendererState = (): {
@@ -5,7 +6,7 @@ export const getDefaultRendererState = (): {
   nonReactive: NonReactiveState
 } => {
   return {
-    reactive: {
+    reactive: proxy({
       world: {
         chunksLoaded: new Set(),
         heightmaps: new Map(),
@@ -15,7 +16,7 @@ export const getDefaultRendererState = (): {
       },
       renderer: '',
       preventEscapeMenu: false
-    },
+    }),
     nonReactive: {
       world: {
         chunksLoaded: new Set(),
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index e1ac2f24..e9153af7 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -210,7 +210,7 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
     if (bot?.time?.timeOfDay) {
       this.emitter.emit('time', bot.time.timeOfDay)
     }
-    if (bot.entity) {
+    if (bot?.entity) {
       this.emitter.emit('playerEntity', bot.entity)
     }
     this.emitterGotConnected()
diff --git a/renderer/viewer/three/panorama.ts b/renderer/viewer/three/panorama.ts
index 76aa285b..254b980c 100644
--- a/renderer/viewer/three/panorama.ts
+++ b/renderer/viewer/three/panorama.ts
@@ -13,6 +13,7 @@ import { loadThreeJsTextureFromUrl, loadThreeJsTextureFromUrlSync } from './thre
 import { WorldRendererThree } from './worldrendererThree'
 import { EntityMesh } from './entity/EntityMesh'
 import { DocumentRenderer } from './documentRenderer'
+import { PANORAMA_VERSION } from './panoramaShared'
 
 const panoramaFiles = [
   'panorama_3.png', // right (+x)
@@ -156,7 +157,7 @@ export class PanoramaRenderer {
   }
 
   async worldBlocksPanorama () {
-    const version = '1.21.4'
+    const version = PANORAMA_VERSION
     const fullResourceManager = this.options.resourcesManager as ResourcesManager
     fullResourceManager.currentConfig = { version, noInventoryGui: true, }
     await fullResourceManager.updateAssetsData({ })
diff --git a/renderer/viewer/three/panoramaShared.ts b/renderer/viewer/three/panoramaShared.ts
new file mode 100644
index 00000000..ad80367f
--- /dev/null
+++ b/renderer/viewer/three/panoramaShared.ts
@@ -0,0 +1 @@
+export const PANORAMA_VERSION = '1.21.4'
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 05b1cf41..bf01b989 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -8,6 +8,7 @@ import { proxy, subscribe } from 'valtio'
 import { getDefaultRendererState } from 'renderer/viewer/baseGraphicsBackend'
 import { getSyncWorld } from 'renderer/playground/shared'
 import { MaybePromise } from 'contro-max/build/types/store'
+import { PANORAMA_VERSION } from 'renderer/viewer/three/panoramaShared'
 import { playerState } from './mineflayer/playerState'
 import { createNotificationProgressReporter, ProgressReporter } from './core/progressReporter'
 import { setLoadingScreenStatus } from './appStatus'
@@ -15,6 +16,7 @@ import { activeModalStack, miscUiState } from './globalState'
 import { options } from './optionsStorage'
 import { ResourcesManager, ResourcesManagerTransferred } from './resourcesManager'
 import { watchOptionsAfterWorldViewInit } from './watchOptions'
+import { loadMinecraftData } from './connect'
 
 export interface RendererReactiveState {
   world: {
@@ -112,7 +114,7 @@ export class AppViewer {
   inWorldRenderingConfig: WorldRendererConfig = proxy(defaultWorldRendererConfig)
   lastCamUpdate = 0
   playerState = playerState
-  rendererState = proxy(getDefaultRendererState().reactive)
+  rendererState = getDefaultRendererState().reactive
   nonReactiveState: NonReactiveState = getDefaultRendererState().nonReactive
   worldReady: Promise<void>
   private resolveWorldReady: () => void
@@ -162,11 +164,15 @@ export class AppViewer {
 
     // Execute queued action if exists
     if (this.currentState) {
-      const { method, args } = this.currentState
-      this.backend[method](...args)
-      if (method === 'startWorld') {
-        void this.worldView!.init(bot.entity.position)
-        // void this.worldView!.init(args[0].playerState.getPosition())
+      if (this.currentState.method === 'startPanorama') {
+        this.startPanorama()
+      } else {
+        const { method, args } = this.currentState
+        this.backend[method](...args)
+        if (method === 'startWorld') {
+          void this.worldView!.init(bot.entity.position)
+          // void this.worldView!.init(args[0].playerState.getPosition())
+        }
       }
     }
 
@@ -225,10 +231,16 @@ export class AppViewer {
 
   startPanorama () {
     if (this.currentDisplay === 'menu') return
-    this.currentDisplay = 'menu'
     if (options.disableAssets) return
-    if (this.backend) {
-      this.backend.startPanorama()
+    if (this.backend && !hasAppStatus()) {
+      this.currentDisplay = 'menu'
+      if (process.env.SINGLE_FILE_BUILD_MODE) {
+        void loadMinecraftData(PANORAMA_VERSION).then(() => {
+          this.backend?.startPanorama()
+        })
+      } else {
+        this.backend.startPanorama()
+      }
     }
     this.currentState = { method: 'startPanorama', args: [] }
   }
@@ -316,15 +328,16 @@ const initialMenuStart = async () => {
 }
 window.initialMenuStart = initialMenuStart
 
+const hasAppStatus = () => activeModalStack.some(m => m.reactType === 'app-status')
+
 const modalStackUpdateChecks = () => {
   // maybe start panorama
-  if (!miscUiState.gameLoaded) {
+  if (!miscUiState.gameLoaded && !hasAppStatus()) {
     void initialMenuStart()
   }
 
   if (appViewer.backend) {
-    const hasAppStatus = activeModalStack.some(m => m.reactType === 'app-status')
-    appViewer.backend.setRendering(!hasAppStatus)
+    appViewer.backend.setRendering(!hasAppStatus())
   }
 
   appViewer.inWorldRenderingConfig.foreground = activeModalStack.length === 0
diff --git a/src/shims/minecraftData.ts b/src/shims/minecraftData.ts
index 989aa698..33dff5fe 100644
--- a/src/shims/minecraftData.ts
+++ b/src/shims/minecraftData.ts
@@ -19,11 +19,20 @@ const customResolver = () => {
   }
 }
 
+let dataStatus = 'not-called'
+
 const optimizedDataResolver = customResolver()
 window._MC_DATA_RESOLVER = optimizedDataResolver
 window._LOAD_MC_DATA = async () => {
   if (optimizedDataResolver.resolvedData) return
-  optimizedDataResolver.resolve(await importLargeData('mcData'))
+  dataStatus = 'loading'
+  try {
+    optimizedDataResolver.resolve(await importLargeData('mcData'))
+    dataStatus = 'ready'
+  } catch (e) {
+    dataStatus = 'error'
+    throw e
+  }
 }
 
 // 30 seconds
@@ -39,7 +48,7 @@ const possiblyGetFromCache = (version: string) => {
   }
   const inner = () => {
     if (!optimizedDataResolver.resolvedData) {
-      throw new Error(`Data for ${version} is not ready yet`)
+      throw new Error(`Minecraft data are not ready yet. Ensure you await window._LOAD_MC_DATA() before using it. Status: ${dataStatus}`)
     }
     const dataTypes = Object.keys(optimizedDataResolver.resolvedData)
     const allRestored = {}

From b2f2d85e4f146fadd24a1697db293380389439b6 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 14 Jul 2025 00:18:42 +0300
Subject: [PATCH 677/753] feat(setting): add a way to specify default
 perspective view

---
 src/defaultOptions.ts         | 1 +
 src/mineflayer/playerState.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index d2d510ec..9650ffcd 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -19,6 +19,7 @@ export const defaultOptions = {
   enableMusic: false,
   // fov: 70,
   fov: 75,
+  defaultPerspective: 'first_person' as 'first_person' | 'third_person_back' | 'third_person_front',
   guiScale: 3,
   autoRequestCompletions: true,
   touchButtonsSize: 40,
diff --git a/src/mineflayer/playerState.ts b/src/mineflayer/playerState.ts
index b8919a14..33f7af77 100644
--- a/src/mineflayer/playerState.ts
+++ b/src/mineflayer/playerState.ts
@@ -3,6 +3,7 @@ import { getInitialPlayerState, getPlayerStateUtils, PlayerStateReactive, Player
 import { subscribe } from 'valtio'
 import { subscribeKey } from 'valtio/utils'
 import { gameAdditionalState } from '../globalState'
+import { options } from '../optionsStorage'
 
 /**
  * can be used only in main thread. Mainly for more convenient reactive state updates.
@@ -42,6 +43,7 @@ export class PlayerStateControllerMain {
   private botCreated () {
     console.log('bot created & plugins injected')
     this.reactive = getInitialPlayerState()
+    this.reactive.perspective = options.defaultPerspective
     this.utils = getPlayerStateUtils(this.reactive)
     this.onBotCreatedOrGameJoined()
 

From 52c0c75ccfc78da777a65da7f8c1ae22bc6b9f41 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Wed, 16 Jul 2025 12:09:34 +0300
Subject: [PATCH 678/753] docs: update readme

---
 README.MD | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.MD b/README.MD
index 61a5b733..e9127a73 100644
--- a/README.MD
+++ b/README.MD
@@ -14,7 +14,6 @@ For building the project yourself / contributing, see [Development, Debugging &
 
 > **Note**: You can deploy it on your own server in less than a minute using a one-liner script from [Minecraft Everywhere repo](https://github.com/zardoy/minecraft-everywhere)
 
-
 ### Big Features
 
 - Official Mineflayer [plugin integration](https://github.com/zardoy/mcraft-fun-mineflayer-plugin)! View / Control your bot remotely.
@@ -57,6 +56,7 @@ Howerver, it's known that these browsers have issues:
 
 Server versions 1.8 - 1.21.4 are supported.
 First class versions (most of the features are tested on these versions):
+
 - 1.19.4
 - 1.21.4
 
@@ -125,11 +125,11 @@ There is world renderer playground ([link](https://mcon.vercel.app/playground/))
 
 However, there are many things that can be done in online production version (like debugging actual source code). Also you can access some global variables in the console and there are a few useful examples:
 
-- `localStorage.debug = '*'` - Enables all debug messages! Warning: this will start all packets spam.
+- If you type `debugToggle`, press enter in console - It will enables all debug messages! Warning: this will start all packets spam.
 Instead I recommend setting `options.debugLogNotFrequentPackets`. Also you can use `debugTopPackets` (with JSON.stringify) to see what packets were received/sent by name
 
 - `bot` - Mineflayer bot instance. See Mineflayer documentation for more.
-- `viewer` - Three.js viewer instance, basically does all the rendering.
+- `world` - Three.js world instance, basically does all the rendering (part of renderer backend).
 - `world.sectionObjects` - Object with all active chunk sections (geometries) in the world. Each chunk section is a Three.js mesh or group.
 - `debugSceneChunks` - The same as above, but relative to current bot position (e.g. 0,0 is the current chunk).
 - `debugChangedOptions` - See what options are changed. Don't change options here.
@@ -139,7 +139,7 @@ Instead I recommend setting `options.debugLogNotFrequentPackets`. Also you can u
 
 - `nbt.simplify(someNbt)` - Simplifies nbt data, so it's easier to read.
 
-The most useful thing in devtools is the watch expression. You can add any expression there and it will be re-evaluated in real time. For example, you can add `camera.position` to see the camera position and so on.
+The most useful thing in devtools is the watch expression. You can add any expression there and it will be re-evaluated in real time. For example, you can add `world.getCameraPosition()` to see the camera position and so on.
 
 <img src="./docs-assets/watch-expr.png" alt="Watch expression" width="480"/>
 

From e9c7840dae6aad023dd3a9c0363f459503c82c30 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 16 Jul 2025 16:18:15 +0300
Subject: [PATCH 679/753] feat(mobile): fix annoying issues with box and foods
 usage on screen hold

---
 package.json                         |  2 +-
 pnpm-lock.yaml                       | 10 +++++-----
 src/react/GameInteractionOverlay.tsx | 19 +++++++++++++++----
 src/react/TouchAreasControls.tsx     | 11 +++++++----
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index fe4adb16..257fff7c 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "mc-assets": "^0.2.62",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
-    "mineflayer-mouse": "^0.1.11",
+    "mineflayer-mouse": "^0.1.14",
     "mineflayer-pathfinder": "^2.4.4",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c37e0510..1e6fddf3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -343,8 +343,8 @@ importers:
         specifier: github:zardoy/mineflayer#gen-the-master
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.11
-        version: 0.1.11
+        specifier: ^0.1.14
+        version: 0.1.14
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.5
@@ -6667,8 +6667,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.11:
-    resolution: {integrity: sha512-BL47pXZ1+92BA/7ym6KaJctEHKnL0up+tpuagVwSKJvAgibeqWQJJwDlNUWkOLvpnruRKDxMR5OB1hUXFoDNSg==}
+  mineflayer-mouse@0.1.14:
+    resolution: {integrity: sha512-DjytRMlRLxR44GqZ6udMgbMO4At7Ura5TQC80exRhzkfptyCGLTWzXaf0oeXSNYkNMnaaEv4XP/9YRwuvL+rsQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.5:
@@ -17337,7 +17337,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.11:
+  mineflayer-mouse@0.1.14:
     dependencies:
       change-case: 5.4.4
       debug: 4.4.1
diff --git a/src/react/GameInteractionOverlay.tsx b/src/react/GameInteractionOverlay.tsx
index 63cee586..268162ec 100644
--- a/src/react/GameInteractionOverlay.tsx
+++ b/src/react/GameInteractionOverlay.tsx
@@ -2,6 +2,7 @@ import { useRef, useEffect } from 'react'
 import { subscribe, useSnapshot } from 'valtio'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
+import { isItemActivatableMobile } from 'mineflayer-mouse/dist/activatableItemsMobile'
 import { options } from '../optionsStorage'
 import { activeModalStack, isGameActive, miscUiState } from '../globalState'
 import { onCameraMove, CameraMoveEvent } from '../cameraRotationControls'
@@ -77,7 +78,10 @@ function GameInteractionOverlayInner ({
       if (options.touchInteractionType === 'classic') {
         virtualClickTimeout ??= setTimeout(() => {
           virtualClickActive = true
-          document.dispatchEvent(new MouseEvent('mousedown', { button: 0 }))
+          // If held item is activatable, use right click instead of left
+          const heldItemName = bot?.heldItem?.name
+          const isOnlyActivatable = heldItemName && isItemActivatableMobile(heldItemName, loadedData)
+          document.dispatchEvent(new MouseEvent('mousedown', { button: isOnlyActivatable ? 2 : 0 }))
         }, touchStartBreakingBlockMs)
       }
     }
@@ -150,16 +154,23 @@ function GameInteractionOverlayInner ({
 
       if (virtualClickActive) {
         // button 0 is left click
-        document.dispatchEvent(new MouseEvent('mouseup', { button: 0 }))
+        // If held item is activatable, use right click instead of left
+        const heldItemName = bot?.heldItem?.name
+        const isOnlyActivatable = heldItemName && isItemActivatableMobile(heldItemName, loadedData)
+        document.dispatchEvent(new MouseEvent('mouseup', { button: isOnlyActivatable ? 2 : 0 }))
         virtualClickActive = false
       } else if (!capturedPointer.active.activateCameraMove && (Date.now() - capturedPointer.active.time < touchStartBreakingBlockMs)) {
         // single click action
         const MOUSE_BUTTON_RIGHT = 2
         const MOUSE_BUTTON_LEFT = 0
+        const heldItemName = bot?.heldItem?.name
+        const isOnlyActivatable = heldItemName && isItemActivatableMobile(heldItemName, loadedData)
         const gonnaAttack = !!bot.mouse.getCursorState().entity || !!videoCursorInteraction()
-        document.dispatchEvent(new MouseEvent('mousedown', { button: gonnaAttack ? MOUSE_BUTTON_LEFT : MOUSE_BUTTON_RIGHT }))
+        // If not attacking entity and item is activatable, use right click for breaking
+        const useButton = !gonnaAttack && isOnlyActivatable ? MOUSE_BUTTON_RIGHT : (gonnaAttack ? MOUSE_BUTTON_LEFT : MOUSE_BUTTON_RIGHT)
+        document.dispatchEvent(new MouseEvent('mousedown', { button: useButton }))
         bot.mouse.update()
-        document.dispatchEvent(new MouseEvent('mouseup', { button: gonnaAttack ? MOUSE_BUTTON_LEFT : MOUSE_BUTTON_RIGHT }))
+        document.dispatchEvent(new MouseEvent('mouseup', { button: useButton }))
       }
 
       if (screenTouches > 0) {
diff --git a/src/react/TouchAreasControls.tsx b/src/react/TouchAreasControls.tsx
index ec9d201b..469097bd 100644
--- a/src/react/TouchAreasControls.tsx
+++ b/src/react/TouchAreasControls.tsx
@@ -1,5 +1,6 @@
 import { CSSProperties, PointerEvent, useEffect, useRef, useState } from 'react'
 import { proxy, ref, useSnapshot } from 'valtio'
+import activatableItemsMobile from 'mineflayer-mouse/dist/activatableItemsMobile'
 import { contro } from '../controls'
 import { options } from '../optionsStorage'
 import PixelartIcon from './PixelartIcon'
@@ -72,10 +73,12 @@ export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props)
       break: false,
       jump: bot?.getControlState('jump'),
     }[name]
+    const RIGHT_MOUSE_BUTTON = 2
+    const LEFT_MOUSE_BUTTON = 0
     const holdDown = {
       action () {
         if (!bot) return
-        document.dispatchEvent(new MouseEvent('mousedown', { button: 2 }))
+        document.dispatchEvent(new MouseEvent('mousedown', { button: RIGHT_MOUSE_BUTTON }))
         bot.mouse.update()
       },
       sneak () {
@@ -87,7 +90,7 @@ export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props)
       },
       break () {
         if (!bot) return
-        document.dispatchEvent(new MouseEvent('mousedown', { button: 0 }))
+        document.dispatchEvent(new MouseEvent('mousedown', { button: LEFT_MOUSE_BUTTON }))
         bot.mouse.update()
         active = true
       },
@@ -101,7 +104,7 @@ export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props)
     }
     const holdUp = {
       action () {
-        document.dispatchEvent(new MouseEvent('mouseup', { button: 2 }))
+        document.dispatchEvent(new MouseEvent('mouseup', { button: RIGHT_MOUSE_BUTTON }))
       },
       sneak () {
         void contro.emit('release', {
@@ -112,7 +115,7 @@ export default ({ setupActive, closeButtonsSetup, foregroundGameActive }: Props)
       },
       break () {
         if (!bot) return
-        document.dispatchEvent(new MouseEvent('mouseup', { button: 0 }))
+        document.dispatchEvent(new MouseEvent('mouseup', { button: LEFT_MOUSE_BUTTON }))
         bot.mouse.update()
         active = false
       },

From 5bd33a546a25b54015ac4b88c40b406ebc9246e6 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 04:39:05 +0300
Subject: [PATCH 680/753] More build configs & optimise reconnect and immediate
 game enter (#398)

feat(custom-builds): Add a way to bundle only specific minecraft version data, this does not affect assets though
env:
MIN_MC_VERSION
MAX_MC_VERSION
new SKIP_MC_DATA_RECIPES - if recipes are not used in game
fix: refactor QS params handling to ensure panorama & main menu never loaded when immedieate game enter action is expected (eg ?autoConnect=1)
---
 rsbuild.config.ts                 |  11 +-
 scripts/genLargeDataAliases.ts    |   5 +-
 scripts/makeOptimizedMcData.mjs   |  80 +++++++---
 src/downloadAndOpenFile.ts        |   6 +
 src/env.d.ts                      |  20 ++-
 src/index.ts                      | 246 +++++++++++++++++-------------
 src/inventoryWindows.ts           |   6 +-
 src/react/AddServerOrConnect.tsx  |  14 +-
 src/react/ServersListProvider.tsx |  24 ++-
 9 files changed, 253 insertions(+), 159 deletions(-)

diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index e264f6b7..42d6867b 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -139,6 +139,13 @@ const appConfig = defineConfig({
         // 50kb limit for data uri
         dataUriLimit: SINGLE_FILE_BUILD ? 1 * 1024 * 1024 * 1024 : 50 * 1024
     },
+    performance: {
+        // prefetch: {
+        //     include(filename) {
+        //         return filename.includes('mc-data') || filename.includes('mc-assets')
+        //     },
+        // },
+    },
     source: {
         entry: {
             index: './src/index.ts',
@@ -154,7 +161,7 @@ const appConfig = defineConfig({
             'process.platform': '"browser"',
             'process.env.GITHUB_URL':
                 JSON.stringify(`https://github.com/${process.env.GITHUB_REPOSITORY || `${process.env.VERCEL_GIT_REPO_OWNER}/${process.env.VERCEL_GIT_REPO_SLUG}` || githubRepositoryFallback}`),
-            'process.env.DEPS_VERSIONS': JSON.stringify({}),
+            'process.env.ALWAYS_MINIMAL_SERVER_UI': JSON.stringify(process.env.ALWAYS_MINIMAL_SERVER_UI),
             'process.env.RELEASE_TAG': JSON.stringify(releaseTag),
             'process.env.RELEASE_LINK': JSON.stringify(releaseLink),
             'process.env.RELEASE_CHANGELOG': JSON.stringify(releaseChangelog),
@@ -190,7 +197,7 @@ const appConfig = defineConfig({
                         childProcess.execSync('tsx ./scripts/optimizeBlockCollisions.ts', { stdio: 'inherit' })
                     }
                     // childProcess.execSync(['tsx', './scripts/genLargeDataAliases.ts', ...(SINGLE_FILE_BUILD ? ['--compressed'] : [])].join(' '), { stdio: 'inherit' })
-                    genLargeDataAliases(SINGLE_FILE_BUILD)
+                    genLargeDataAliases(SINGLE_FILE_BUILD || process.env.ALWAYS_COMPRESS_LARGE_DATA === 'true')
                     fsExtra.copySync('./node_modules/mc-assets/dist/other-textures/latest/entity', './dist/textures/entity')
                     fsExtra.copySync('./assets/background', './dist/background')
                     fs.copyFileSync('./assets/favicon.png', './dist/favicon.png')
diff --git a/scripts/genLargeDataAliases.ts b/scripts/genLargeDataAliases.ts
index 0cf206df..2372dbfd 100644
--- a/scripts/genLargeDataAliases.ts
+++ b/scripts/genLargeDataAliases.ts
@@ -16,7 +16,8 @@ export const genLargeDataAliases = async (isCompressed: boolean) => {
 
     let str = `${decoderCode}\nexport const importLargeData = async (mod: ${Object.keys(modules).map(x => `'${x}'`).join(' | ')}) => {\n`
     for (const [module, { compressed, raw }] of Object.entries(modules)) {
-        let importCode = `(await import('${isCompressed ? compressed : raw}')).default`;
+        const chunkName = module === 'mcData' ? 'mc-data' : 'mc-assets';
+        let importCode = `(await import(/* webpackChunkName: "${chunkName}" */ '${isCompressed ? compressed : raw}')).default`;
         if (isCompressed) {
             importCode = `JSON.parse(decompressFromBase64(${importCode}))`
         }
@@ -30,6 +31,8 @@ export const genLargeDataAliases = async (isCompressed: boolean) => {
 const decoderCode = /* ts */ `
 import pako from 'pako';
 
+globalThis.pako = { inflate: pako.inflate.bind(pako) }
+
 function decompressFromBase64(input) {
     console.time('decompressFromBase64')
     // Decode the Base64 string
diff --git a/scripts/makeOptimizedMcData.mjs b/scripts/makeOptimizedMcData.mjs
index 05948cf2..0b5752d8 100644
--- a/scripts/makeOptimizedMcData.mjs
+++ b/scripts/makeOptimizedMcData.mjs
@@ -6,8 +6,8 @@ import { dirname } from 'node:path'
 import supportedVersions from '../src/supportedVersions.mjs'
 import { gzipSizeFromFileSync } from 'gzip-size'
 import fs from 'fs'
-import  {default as _JsonOptimizer}  from '../src/optimizeJson'
-import { gzipSync } from 'zlib';
+import { default as _JsonOptimizer } from '../src/optimizeJson'
+import { gzipSync } from 'zlib'
 import MinecraftData from 'minecraft-data'
 import MCProtocol from 'minecraft-protocol'
 
@@ -21,12 +21,12 @@ const require = Module.createRequire(import.meta.url)
 
 const dataPaths = require('minecraft-data/minecraft-data/data/dataPaths.json')
 
-function toMajor (version) {
+function toMajor(version) {
   const [a, b] = (version + '').split('.')
   return `${a}.${b}`
 }
 
-const versions = {}
+let versions = {}
 const dataTypes = new Set()
 
 for (const [version, dataSet] of Object.entries(dataPaths.pc)) {
@@ -42,6 +42,31 @@ const versionToNumber = (ver) => {
   return +`${x.padStart(2, '0')}${y.padStart(2, '0')}${z.padStart(2, '0')}`
 }
 
+// Version clipping support
+const minVersion = process.env.MIN_MC_VERSION
+const maxVersion = process.env.MAX_MC_VERSION
+
+// Filter versions based on MIN_VERSION and MAX_VERSION if provided
+if (minVersion || maxVersion) {
+  const filteredVersions = {}
+  const minVersionNum = minVersion ? versionToNumber(minVersion) : 0
+  const maxVersionNum = maxVersion ? versionToNumber(maxVersion) : Infinity
+
+  for (const [version, dataSet] of Object.entries(versions)) {
+    const versionNum = versionToNumber(version)
+    if (versionNum >= minVersionNum && versionNum <= maxVersionNum) {
+      filteredVersions[version] = dataSet
+    }
+  }
+
+  versions = filteredVersions
+
+  console.log(`Version clipping applied: ${minVersion || 'none'} to ${maxVersion || 'none'}`)
+  console.log(`Processing ${Object.keys(versions).length} versions:`, Object.keys(versions).sort((a, b) => versionToNumber(a) - versionToNumber(b)))
+}
+
+console.log('Bundling version range:', Object.keys(versions)[0], 'to', Object.keys(versions).at(-1))
+
 // if not included here (even as {}) will not be bundled & accessible!
 // const compressedOutput = !!process.env.SINGLE_FILE_BUILD
 const compressedOutput = true
@@ -57,18 +82,20 @@ const dataTypeBundling2 = {
   }
 }
 const dataTypeBundling = {
-  language: {
+  language: process.env.SKIP_MC_DATA_LANGUAGE === 'true' ? {
+    raw: {}
+  } : {
     ignoreRemoved: true,
     ignoreChanges: true
   },
   blocks: {
     arrKey: 'name',
-    processData (current, prev) {
+    processData(current, prev) {
       for (const block of current) {
         if (block.transparent) {
           const forceOpaque = block.name.includes('shulker_box') || block.name.match(/^double_.+_slab\d?$/) || ['melon_block', 'lit_pumpkin', 'lit_redstone_ore', 'lit_furnace'].includes(block.name)
 
-          const prevBlock = prev?.find(x => x.name === block.name);
+          const prevBlock = prev?.find(x => x.name === block.name)
           if (forceOpaque || (prevBlock && !prevBlock.transparent)) {
             block.transparent = false
           }
@@ -136,7 +163,9 @@ const dataTypeBundling = {
   blockLoot: {
     arrKey: 'block'
   },
-  recipes: {
+  recipes: process.env.SKIP_MC_DATA_RECIPES === 'true' ? {
+    raw: {}
+  } : {
     raw: true
     // processData: processRecipes
   },
@@ -150,7 +179,7 @@ const dataTypeBundling = {
   // }
 }
 
-function processRecipes (current, prev, getData, version) {
+function processRecipes(current, prev, getData, version) {
   // can require the same multiple times per different versions
   if (current._proccessed) return
   const items = getData('items')
@@ -242,30 +271,39 @@ for (const [i, [version, dataSet]] of versionsArr.reverse().entries()) {
   for (const [dataType, dataPath] of Object.entries(dataSet)) {
     const config = dataTypeBundling[dataType]
     if (!config) continue
-    if (dataType === 'blockCollisionShapes' && versionToNumber(version) >= versionToNumber('1.13')) {
-      // contents += `      get ${dataType} () { return window.globalGetCollisionShapes?.("${version}") },\n`
-      continue
-    }
+    const ignoreCollisionShapes = dataType === 'blockCollisionShapes' && versionToNumber(version) >= versionToNumber('1.13')
+
     let injectCode = ''
-    const getData = (type) => {
+    const getRealData = (type) => {
       const loc = `minecraft-data/data/${dataSet[type]}/`
       const dataPathAbsolute = require.resolve(`minecraft-data/${loc}${type}`)
       // const data = fs.readFileSync(dataPathAbsolute, 'utf8')
       const dataRaw = require(dataPathAbsolute)
       return dataRaw
     }
-    const dataRaw = getData(dataType)
+    const dataRaw = getRealData(dataType)
     let rawData = dataRaw
     if (config.raw) {
       rawDataVersions[dataType] ??= {}
       rawDataVersions[dataType][version] = rawData
-      rawData = dataRaw
+      if (config.raw === true) {
+        rawData = dataRaw
+      } else {
+        rawData = config.raw
+      }
+
+      if (ignoreCollisionShapes && dataType === 'blockCollisionShapes') {
+        rawData = {
+          blocks: {},
+          shapes: {}
+        }
+      }
     } else {
       if (!diffSources[dataType]) {
         diffSources[dataType] = new JsonOptimizer(config.arrKey, config.ignoreChanges, config.ignoreRemoved)
       }
       try {
-        config.processData?.(dataRaw, previousData[dataType], getData, version)
+        config.processData?.(dataRaw, previousData[dataType], getRealData, version)
         diffSources[dataType].recordDiff(version, dataRaw)
         injectCode = `restoreDiff(sources, ${JSON.stringify(dataType)}, ${JSON.stringify(version)})`
       } catch (err) {
@@ -297,16 +335,16 @@ console.log('total size (mb)', totalSize / 1024 / 1024)
 console.log(
   'size per data type (mb, %)',
   Object.fromEntries(Object.entries(sizePerDataType).map(([dataType, size]) => {
-    return [dataType, [size / 1024 / 1024, Math.round(size / totalSize * 100)]];
+    return [dataType, [size / 1024 / 1024, Math.round(size / totalSize * 100)]]
   }).sort((a, b) => {
     //@ts-ignore
-    return b[1][1] - a[1][1];
+    return b[1][1] - a[1][1]
   }))
 )
 
 function compressToBase64(input) {
-  const buffer = gzipSync(input);
-  return buffer.toString('base64');
+  const buffer = gzipSync(input)
+  return buffer.toString('base64')
 }
 
 const filePath = './generated/minecraft-data-optimized.json'
diff --git a/src/downloadAndOpenFile.ts b/src/downloadAndOpenFile.ts
index 1e703369..1ff318ff 100644
--- a/src/downloadAndOpenFile.ts
+++ b/src/downloadAndOpenFile.ts
@@ -11,6 +11,12 @@ export const getFixedFilesize = (bytes: number) => {
   return prettyBytes(bytes, { minimumFractionDigits: 2, maximumFractionDigits: 2 })
 }
 
+export const isInterestedInDownload = () => {
+  const { map, texturepack, replayFileUrl } = appQueryParams
+  const { mapDir } = appQueryParamsArray
+  return !!map || !!texturepack || !!replayFileUrl || !!mapDir
+}
+
 const inner = async () => {
   const { map, texturepack, replayFileUrl } = appQueryParams
   const { mapDir } = appQueryParamsArray
diff --git a/src/env.d.ts b/src/env.d.ts
index 9b3e9774..e565fcec 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -2,30 +2,36 @@ declare namespace NodeJS {
   interface ProcessEnv {
     // Build configuration
     NODE_ENV: 'development' | 'production'
-    SINGLE_FILE_BUILD?: string
+    MIN_MC_VERSION?: string
+    MAX_MC_VERSION?: string
+    ALWAYS_COMPRESS_LARGE_DATA?: 'true' | 'false'
+    SINGLE_FILE_BUILD?: 'true' | 'false'
     WS_PORT?: string
-    DISABLE_SERVICE_WORKER?: string
+    DISABLE_SERVICE_WORKER?: 'true' | 'false'
     CONFIG_JSON_SOURCE?: 'BUNDLED' | 'REMOTE'
     LOCAL_CONFIG_FILE?: string
     BUILD_VERSION?: string
 
-    // GitHub and Vercel related
+    // Build internals
     GITHUB_REPOSITORY?: string
     VERCEL_GIT_REPO_OWNER?: string
     VERCEL_GIT_REPO_SLUG?: string
 
-    // UI and Features
+    // UI
     MAIN_MENU_LINKS?: string
+    ALWAYS_MINIMAL_SERVER_UI?: 'true' | 'false'
+
+    // App features
     ENABLE_COOKIE_STORAGE?: string
     COOKIE_STORAGE_PREFIX?: string
 
-    // Release information
+    // Build info. Release information
     RELEASE_TAG?: string
     RELEASE_LINK?: string
     RELEASE_CHANGELOG?: string
 
-    // Other configurations
-    DEPS_VERSIONS?: string
+    // Build info
     INLINED_APP_CONFIG?: string
+    GITHUB_URL?: string
   }
 }
diff --git a/src/index.ts b/src/index.ts
index 185caab6..7a553ca7 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -29,7 +29,7 @@ import './reactUi'
 import { lockUrl, onBotCreate } from './controls'
 import './dragndrop'
 import { possiblyCleanHandle } from './browserfs'
-import downloadAndOpenFile from './downloadAndOpenFile'
+import downloadAndOpenFile, { isInterestedInDownload } from './downloadAndOpenFile'
 
 import fs from 'fs'
 import net, { Socket } from 'net'
@@ -97,6 +97,7 @@ import { registerOpenBenchmarkListener } from './benchmark'
 import { tryHandleBuiltinCommand } from './builtinCommands'
 import { loadingTimerState } from './react/LoadingTimer'
 import { loadPluginsIntoWorld } from './react/CreateWorldProvider'
+import { getCurrentProxy, getCurrentUsername } from './react/ServersList'
 
 window.debug = debug
 window.beforeRenderFrame = []
@@ -166,6 +167,7 @@ export async function connect (connectOptions: ConnectOptions) {
     })
   }
 
+  appStatusState.showReconnect = false
   loadingTimerState.loading = true
   loadingTimerState.start = Date.now()
   miscUiState.hasErrors = false
@@ -880,37 +882,7 @@ export async function connect (connectOptions: ConnectOptions) {
   }
 }
 
-const reconnectOptions = sessionStorage.getItem('reconnectOptions') ? JSON.parse(sessionStorage.getItem('reconnectOptions')!) : undefined
-
 listenGlobalEvents()
-const unsubscribe = subscribe(miscUiState, async () => {
-  if (miscUiState.fsReady && miscUiState.appConfig) {
-    unsubscribe()
-    if (reconnectOptions) {
-      sessionStorage.removeItem('reconnectOptions')
-      if (Date.now() - reconnectOptions.timestamp < 1000 * 60 * 2) {
-        void connect(reconnectOptions.value)
-      }
-    } else {
-      if (appQueryParams.singleplayer === '1' || appQueryParams.sp === '1') {
-        loadSingleplayer({}, {
-          worldFolder: undefined,
-          ...appQueryParams.version ? { version: appQueryParams.version } : {}
-        })
-      }
-      if (appQueryParams.loadSave) {
-        const savePath = `/data/worlds/${appQueryParams.loadSave}`
-        try {
-          await fs.promises.stat(savePath)
-        } catch (err) {
-          alert(`Save ${savePath} not found`)
-          return
-        }
-        await loadInMemorySave(savePath)
-      }
-    }
-  }
-})
 
 // #region fire click event on touch as we disable default behaviors
 let activeTouch: { touch: Touch, elem: HTMLElement, start: number } | undefined
@@ -946,90 +918,153 @@ document.body.addEventListener('touchstart', (e) => {
 }, { passive: false })
 // #endregion
 
-// qs open actions
-if (!reconnectOptions) {
-  downloadAndOpenFile().then((downloadAction) => {
-    if (downloadAction) return
-    if (appQueryParams.reconnect && process.env.NODE_ENV === 'development') {
-      const lastConnect = JSON.parse(localStorage.lastConnectOptions ?? {})
+// immediate game enter actions: reconnect or URL QS
+const maybeEnterGame = () => {
+  const waitForConfigFsLoad = (fn: () => void) => {
+    let unsubscribe: () => void | undefined
+    const checkDone = () => {
+      if (miscUiState.fsReady && miscUiState.appConfig) {
+        fn()
+        unsubscribe?.()
+        return true
+      }
+      return false
+    }
+
+    if (!checkDone()) {
+      const text = miscUiState.appConfig ? 'Loading' : 'Loading config'
+      setLoadingScreenStatus(text)
+      unsubscribe = subscribe(miscUiState, checkDone)
+    }
+  }
+
+  const reconnectOptions = sessionStorage.getItem('reconnectOptions') ? JSON.parse(sessionStorage.getItem('reconnectOptions')!) : undefined
+
+  if (reconnectOptions) {
+    sessionStorage.removeItem('reconnectOptions')
+    if (Date.now() - reconnectOptions.timestamp < 1000 * 60 * 2) {
+      return waitForConfigFsLoad(async () => {
+        void connect(reconnectOptions.value)
+      })
+    }
+  }
+
+  if (appQueryParams.reconnect && process.env.NODE_ENV === 'development') {
+    const lastConnect = JSON.parse(localStorage.lastConnectOptions ?? {})
+    return waitForConfigFsLoad(async () => {
       void connect({
         botVersion: appQueryParams.version ?? undefined,
         ...lastConnect,
         ip: appQueryParams.ip || undefined
       })
-      return
-    }
-    if (appQueryParams.ip || appQueryParams.proxy) {
-      const waitAppConfigLoad = !appQueryParams.proxy
-      const openServerEditor = () => {
-        hideModal()
-        if (appQueryParams.onlyConnect) {
-          showModal({ reactType: 'only-connect-server' })
-        } else {
-          showModal({ reactType: 'editServer' })
-        }
-      }
-      showModal({ reactType: 'empty' })
-      if (waitAppConfigLoad) {
-        const unsubscribe = subscribe(miscUiState, checkCanDisplay)
-        checkCanDisplay()
-        // eslint-disable-next-line no-inner-declarations
-        function checkCanDisplay () {
-          if (miscUiState.appConfig) {
-            unsubscribe()
-            openServerEditor()
-            return true
-          }
-        }
-      } else {
-        openServerEditor()
-      }
-    }
-
-    void Promise.resolve().then(() => {
-      // try to connect to peer
-      const peerId = appQueryParams.connectPeer
-      const peerOptions = {} as ConnectPeerOptions
-      if (appQueryParams.server) {
-        peerOptions.server = appQueryParams.server
-      }
-      const version = appQueryParams.peerVersion
-      if (peerId) {
-        let username: string | null = options.guestUsername
-        if (options.askGuestName) username = prompt('Enter your username', username)
-        if (!username) return
-        options.guestUsername = username
-        void connect({
-          username,
-          botVersion: version || undefined,
-          peerId,
-          peerOptions
-        })
-      }
     })
+  }
 
-    if (appQueryParams.serversList && !appQueryParams.ip) {
-      showModal({ reactType: 'serversList' })
-    }
-
-    const viewerWsConnect = appQueryParams.viewerConnect
-    if (viewerWsConnect) {
-      void connect({
-        username: `viewer-${Math.random().toString(36).slice(2, 10)}`,
-        viewerWsConnect,
+  if (appQueryParams.singleplayer === '1' || appQueryParams.sp === '1') {
+    return waitForConfigFsLoad(async () => {
+      loadSingleplayer({}, {
+        worldFolder: undefined,
+        ...appQueryParams.version ? { version: appQueryParams.version } : {}
       })
-    }
-
-    if (appQueryParams.modal) {
-      const modals = appQueryParams.modal.split(',')
-      for (const modal of modals) {
-        showModal({ reactType: modal })
+    })
+  }
+  if (appQueryParams.loadSave) {
+    const enterSave = async () => {
+      const savePath = `/data/worlds/${appQueryParams.loadSave}`
+      try {
+        await fs.promises.stat(savePath)
+        await loadInMemorySave(savePath)
+      } catch (err) {
+        alert(`Save ${savePath} not found`)
       }
     }
-  }, (err) => {
-    console.error(err)
-    alert(`Something went wrong: ${err}`)
-  })
+    return waitForConfigFsLoad(enterSave)
+  }
+
+  if (appQueryParams.ip || appQueryParams.proxy) {
+    const waitAppConfigLoad = !appQueryParams.proxy
+    const openServerAction = () => {
+      if (appQueryParams.autoConnect && miscUiState.appConfig?.allowAutoConnect) {
+        void connect({
+          server: appQueryParams.ip,
+          proxy: getCurrentProxy(),
+          botVersion: appQueryParams.version ?? undefined,
+          username: getCurrentUsername()!,
+        })
+        return
+      }
+
+      setLoadingScreenStatus(undefined)
+      if (appQueryParams.onlyConnect || process.env.ALWAYS_MINIMAL_SERVER_UI === 'true') {
+        showModal({ reactType: 'only-connect-server' })
+      } else {
+        showModal({ reactType: 'editServer' })
+      }
+    }
+
+    // showModal({ reactType: 'empty' })
+    if (waitAppConfigLoad) {
+      return waitForConfigFsLoad(openServerAction)
+    }
+    openServerAction()
+    return
+  }
+
+  if (appQueryParams.connectPeer) {
+    // try to connect to peer
+    const peerId = appQueryParams.connectPeer
+    const peerOptions = {} as ConnectPeerOptions
+    if (appQueryParams.server) {
+      peerOptions.server = appQueryParams.server
+    }
+    const version = appQueryParams.peerVersion
+    let username: string | null = options.guestUsername
+    if (options.askGuestName) username = prompt('Enter your username to connect to peer', username)
+    if (!username) return
+    options.guestUsername = username
+    void connect({
+      username,
+      botVersion: version || undefined,
+      peerId,
+      peerOptions
+    })
+    return
+
+  }
+
+  if (appQueryParams.viewerConnect) {
+    void connect({
+      username: `viewer-${Math.random().toString(36).slice(2, 10)}`,
+      viewerWsConnect: appQueryParams.viewerConnect,
+    })
+    return
+  }
+
+  if (appQueryParams.modal) {
+    const modals = appQueryParams.modal.split(',')
+    for (const modal of modals) {
+      showModal({ reactType: modal })
+    }
+    return
+  }
+
+  if (appQueryParams.serversList && !miscUiState.appConfig?.appParams?.serversList) {
+    // open UI only if it's in URL
+    showModal({ reactType: 'serversList' })
+  }
+
+  if (isInterestedInDownload()) {
+    void downloadAndOpenFile()
+  }
+
+  void possiblyHandleStateVariable()
+}
+
+try {
+  maybeEnterGame()
+} catch (err) {
+  console.error(err)
+  alert(`Something went wrong: ${err}`)
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
@@ -1040,6 +1075,5 @@ if (initialLoader) {
 }
 window.pageLoaded = true
 
-void possiblyHandleStateVariable()
 appViewer.waitBackendLoadPromises.push(appStartup())
 registerOpenBenchmarkListener()
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index c9f60d59..1e17db14 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -522,7 +522,7 @@ const getResultingRecipe = (slots: Array<Item | null>, gridRows: number) => {
   type Result = RecipeItem | undefined
   let shapelessResult: Result
   let shapeResult: Result
-  outer: for (const [id, recipeVariants] of Object.entries(loadedData.recipes)) {
+  outer: for (const [id, recipeVariants] of Object.entries(loadedData.recipes ?? {})) {
     for (const recipeVariant of recipeVariants) {
       if ('inShape' in recipeVariant && equals(currentShape, recipeVariant.inShape as number[][])) {
         shapeResult = recipeVariant.result!
@@ -550,7 +550,7 @@ const getAllItemRecipes = (itemName: string) => {
   const item = loadedData.itemsByName[itemName]
   if (!item) return
   const itemId = item.id
-  const recipes = loadedData.recipes[itemId]
+  const recipes = loadedData.recipes?.[itemId]
   if (!recipes) return
   const results = [] as Array<{
     result: Item,
@@ -595,7 +595,7 @@ const getAllItemUsages = (itemName: string) => {
   if (!item) return
   const foundRecipeIds = [] as string[]
 
-  for (const [id, recipes] of Object.entries(loadedData.recipes)) {
+  for (const [id, recipes] of Object.entries(loadedData.recipes ?? {})) {
     for (const recipe of recipes) {
       if ('inShape' in recipe) {
         if (recipe.inShape.some(row => row.includes(item.id))) {
diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index 08e4d69e..d478b3e7 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -29,10 +29,9 @@ interface Props {
   accounts?: string[]
   authenticatedAccounts?: number
   versions?: string[]
-  allowAutoConnect?: boolean
 }
 
-export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions, allowAutoConnect }: Props) => {
+export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQs, onQsConnect, placeholders, accounts, versions }: Props) => {
   const isSmallHeight = !usePassesScaledDimensions(null, 350)
   const qsParamName = parseQs ? appQueryParams.name : undefined
   const qsParamIp = parseQs ? appQueryParams.ip : undefined
@@ -40,7 +39,6 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   const qsParamProxy = parseQs ? appQueryParams.proxy : undefined
   const qsParamUsername = parseQs ? appQueryParams.username : undefined
   const qsParamLockConnect = parseQs ? appQueryParams.lockConnect : undefined
-  const qsParamAutoConnect = parseQs ? appQueryParams.autoConnect : undefined
 
   const parsedQsIp = parseServerAddress(qsParamIp)
   const parsedInitialIp = parseServerAddress(initialData?.ip)
@@ -118,12 +116,6 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
     }
   }
 
-  useEffect(() => {
-    if (qsParamAutoConnect && qsParamIp && qsParamVersion && allowAutoConnect) {
-      onQsConnect?.(commonUseOptions)
-    }
-  }, [])
-
   const displayConnectButton = qsParamIp
   const serverExamples = ['example.com:25565', 'play.hypixel.net', 'ws://play.pcm.gg']
   // pick random example
@@ -231,7 +223,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
             Cancel
           </ButtonWrapper>
           <ButtonWrapper type='submit'>
-            {displayConnectButton ? 'Save' : <strong>Save</strong>}
+            {displayConnectButton ? translate('Save') : <strong>{translate('Save')}</strong>}
           </ButtonWrapper>
         </>}
         {displayConnectButton && (
@@ -246,7 +238,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
                 onQsConnect?.(commonUseOptions)
               }}
             >
-              <strong>Connect</strong>
+              <strong>{translate('Connect')}</strong>
             </ButtonWrapper>
           </div>
         )}
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index d95d4e9e..2509db74 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -156,13 +156,22 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
               const isWebSocket = server.ip.startsWith('ws://') || server.ip.startsWith('wss://')
               let data
               if (isWebSocket) {
-                const pingResult = await getServerInfo(server.ip, undefined, undefined, true)
-                console.log('pingResult.fullInfo.description', pingResult.fullInfo.description)
-                data = {
-                  formattedText: pingResult.fullInfo.description,
-                  textNameRight: `ws ${pingResult.latency}ms`,
-                  textNameRightGrayed: `${pingResult.fullInfo.players?.online ?? '??'}/${pingResult.fullInfo.players?.max ?? '??'}`,
-                  offline: false
+                try {
+                  const pingResult = await getServerInfo(server.ip, undefined, undefined, true)
+                  console.log('pingResult.fullInfo.description', pingResult.fullInfo.description)
+                  data = {
+                    formattedText: pingResult.fullInfo.description,
+                    textNameRight: `ws ${pingResult.latency}ms`,
+                    textNameRightGrayed: `${pingResult.fullInfo.players?.online ?? '??'}/${pingResult.fullInfo.players?.max ?? '??'}`,
+                    offline: false
+                  }
+                } catch (err) {
+                  data = {
+                    formattedText: 'Failed to connect',
+                    textNameRight: '',
+                    textNameRightGrayed: '',
+                    offline: true
+                  }
                 }
               } else {
                 data = await fetchServerStatus(server.ip, /* signal */undefined, server.versionOverride) // DONT ADD SIGNAL IT WILL CRUSH JS RUNTIME
@@ -217,7 +226,6 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
   })
 
   const editModalJsx = isEditScreenModal ? <AddServerOrConnect
-    allowAutoConnect={miscUiState.appConfig?.allowAutoConnect}
     placeholders={{
       proxyOverride: getCurrentProxy(),
       usernameOverride: getCurrentUsername(),

From a8635e9e2fcd418acd13f78e4c87f65f2963148b Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Fri, 18 Jul 2025 02:55:29 +0000
Subject: [PATCH 681/753] fix: Effects and Game Indicators overlay toggles
 didn't work (#397)

---
 src/react/IndicatorEffectsProvider.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/react/IndicatorEffectsProvider.tsx b/src/react/IndicatorEffectsProvider.tsx
index c479d7e1..df52296a 100644
--- a/src/react/IndicatorEffectsProvider.tsx
+++ b/src/react/IndicatorEffectsProvider.tsx
@@ -5,7 +5,6 @@ import { Effect } from 'mineflayer'
 import { inGameError } from '../utils'
 import { fsState } from '../loadSave'
 import { gameAdditionalState, miscUiState } from '../globalState'
-import { options } from '../optionsStorage'
 import IndicatorEffects, { EffectType, defaultIndicatorsState } from './IndicatorEffects'
 import { images } from './effectsImages'
 
@@ -67,7 +66,6 @@ export default ({ displayEffects = true, displayIndicators = true }: { displayEf
   const { mesherWork } = useSnapshot(appViewer.rendererState).world
 
   const { hasErrors } = useSnapshot(miscUiState)
-  const { disabledUiParts } = useSnapshot(options)
   const { isReadonly, openReadOperations, openWriteOperations } = useSnapshot(fsState)
   const { noConnection, poorConnection } = useSnapshot(gameAdditionalState)
   const allIndicators: typeof defaultIndicatorsState = {
@@ -122,7 +120,7 @@ export default ({ displayEffects = true, displayIndicators = true }: { displayEf
   return <IndicatorEffects
     indicators={allIndicators}
     effects={effects}
-    displayIndicators
-    displayEffects
+    displayIndicators={displayIndicators}
+    displayEffects={displayEffects}
   />
 }

From c360115f6017e5e0a37a5ad787fb54b10d122d2b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 07:46:25 +0300
Subject: [PATCH 682/753] fix: fix rare ios safari bug where hotbar would not
 be visible due to unclear fixed&bottom:0 css using

---
 src/react/HotbarRenderApp.tsx | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index ed1f42e6..6b6e3207 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -200,17 +200,28 @@ const HotbarInner = () => {
     <ItemName itemKey={itemKey} />
     <Portal>
       <div
-        className='hotbar' ref={container} style={{
+        className='hotbar-fullscreen-container'
+        style={{
           position: 'fixed',
+          top: 0,
           left: 0,
-          right: 0,
+          width: '100dvw',
+          height: '100dvh',
+          zIndex: hasModals ? 1 : 8,
           display: 'flex',
           justifyContent: 'center',
-          zIndex: hasModals ? 1 : 8,
           pointerEvents: 'none',
-          bottom: 'var(--hud-bottom-raw)'
-        }}
-      />
+        }}>
+        <div
+          className='hotbar'
+          ref={container}
+          style={{
+            position: 'absolute',
+            pointerEvents: 'none',
+            bottom: 'var(--hud-bottom-raw)'
+          }}
+        />
+      </div>
     </Portal>
   </SharedHudVars>
 }

From 45408476a539302c098a0969012662b16430225c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 07:53:47 +0300
Subject: [PATCH 683/753] fix(appStorage): Fix that settings were not possible
 to save on vercel domains, use robust self-checking mechanism to ensure user
 data never lost when cookies storage enabled!

---
 src/react/appStorageProvider.ts | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/react/appStorageProvider.ts b/src/react/appStorageProvider.ts
index bce6feca..fd469186 100644
--- a/src/react/appStorageProvider.ts
+++ b/src/react/appStorageProvider.ts
@@ -91,6 +91,14 @@ const setCookieValue = (key: string, value: string): boolean => {
     }
 
     document.cookie = cookie
+
+    // Verify the cookie was actually saved by reading it back
+    const savedValue = getCookieValue(key)
+    if (savedValue !== value) {
+      console.warn(`Cookie verification failed for key '${key}'. Expected: ${value}, Got: ${savedValue}`)
+      return false
+    }
+
     return true
   } catch (error) {
     console.error(`Failed to set cookie for key '${key}':`, error)
@@ -229,12 +237,19 @@ export const getRandomUsername = (appConfig: AppConfig) => {
 
 export const appStorage = proxy({ ...defaultStorageData })
 
+// Track if cookies failed in this session
+let cookiesFailedThisSession = false
+
 // Check if cookie storage should be used (will be set by options)
 const shouldUseCookieStorage = () => {
-  const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent)
+  // If cookies failed this session, don't try again
+  if (cookiesFailedThisSession) {
+    return false
+  }
+
   const isSecureCookiesAvailable = () => {
     // either https or localhost
-    return window.location.protocol === 'https:' || (window.location.hostname === 'localhost' && !isSafari)
+    return window.location.protocol === 'https:' || (window.location.hostname === 'localhost')
   }
   if (!isSecureCookiesAvailable()) {
     return false
@@ -345,8 +360,10 @@ const saveKey = (key: keyof StorageData) => {
         // Remove from localStorage if cookie save was successful
         markLocalStorageAsMigrated(key)
       } else {
-        // Disabling for now so no confusing conflicts modal after page reload
-        // useLocalStorage = true
+        // Cookie save failed, disable cookies for this session and fallback to localStorage
+        console.warn(`Cookie save failed for key '${key}', disabling cookies for this session`)
+        cookiesFailedThisSession = true
+        useLocalStorage = true
       }
     }
   }

From de9bfba3a8924578a76c049c5e7e355735501f19 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 08:02:13 +0300
Subject: [PATCH 684/753] allow auto connect on mcraft for last integrations

---
 config.mcraft-only.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config.mcraft-only.json b/config.mcraft-only.json
index 7d9a7b59..52a3aa2c 100644
--- a/config.mcraft-only.json
+++ b/config.mcraft-only.json
@@ -1,4 +1,5 @@
 {
   "alwaysReconnectButton": true,
-  "reportBugButtonWithReconnect": true
+  "reportBugButtonWithReconnect": true,
+  "allowAutoConnect": true
 }

From 0dca8bbbe5848812697e959c796b0bc6367db6d5 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 08:32:32 +0300
Subject: [PATCH 685/753] fix(important): F3 actions didn't work on mobile at
 all like chunks reload

---
 src/controls.ts            | 18 ++++++---
 src/react/OptionsItems.tsx | 81 +++++++++++++++++++++++++++-----------
 2 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/src/controls.ts b/src/controls.ts
index 9430f9c1..db6a6fc6 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -818,6 +818,11 @@ export const f3Keybinds: Array<{
   }
 ]
 
+export const reloadChunksAction = () => {
+  const action = f3Keybinds.find(f3Keybind => f3Keybind.key === 'KeyA')
+  void action!.action()
+}
+
 document.addEventListener('keydown', (e) => {
   if (!isGameActive(false)) return
   if (contro.pressedKeys.has('F3')) {
@@ -987,14 +992,17 @@ export function updateBinds (commands: any) {
 }
 
 export const onF3LongPress = async () => {
-  const select = await showOptionsModal('', f3Keybinds.filter(f3Keybind => {
+  const actions = f3Keybinds.filter(f3Keybind => {
     return f3Keybind.mobileTitle && (f3Keybind.enabled?.() ?? true)
-  }).map(f3Keybind => {
+  })
+  const actionNames = actions.map(f3Keybind => {
     return `${f3Keybind.mobileTitle}${f3Keybind.key ? ` (F3+${f3Keybind.key})` : ''}`
-  }))
+  })
+  const select = await showOptionsModal('', actionNames)
   if (!select) return
-  const f3Keybind = f3Keybinds.find(f3Keybind => f3Keybind.mobileTitle === select)
-  if (f3Keybind) void f3Keybind.action()
+  const actionIndex = actionNames.indexOf(select)
+  const f3Keybind = actions[actionIndex]!
+  void f3Keybind.action()
 }
 
 export const handleMobileButtonCustomAction = (action: CustomAction) => {
diff --git a/src/react/OptionsItems.tsx b/src/react/OptionsItems.tsx
index 32f99b9e..ccc04bcb 100644
--- a/src/react/OptionsItems.tsx
+++ b/src/react/OptionsItems.tsx
@@ -4,11 +4,13 @@ import { titleCase } from 'title-case'
 import { useMemo } from 'react'
 import { disabledSettings, options, qsOptions } from '../optionsStorage'
 import { hideAllModals, miscUiState } from '../globalState'
+import { reloadChunksAction } from '../controls'
 import Button from './Button'
 import Slider from './Slider'
 import Screen from './Screen'
 import { showOptionsModal } from './SelectOption'
 import PixelartIcon, { pixelartIcons } from './PixelartIcon'
+import { reconnectReload } from './AppStatusProvider'
 
 type GeneralItem<T extends string | number | boolean> = {
   id?: string
@@ -18,7 +20,8 @@ type GeneralItem<T extends string | number | boolean> = {
   tooltip?: string
   // description?: string
   enableWarning?: string
-  willHaveNoEffect?: boolean
+  requiresRestart?: boolean
+  requiresChunksReload?: boolean
   values?: Array<T | [T, string]>
   disableIf?: [option: keyof typeof options, value: any]
 }
@@ -56,7 +59,14 @@ const useCommonComponentsProps = (item: OptionMeta) => {
   }
 }
 
-export const OptionButton = ({ item }: { item: Extract<OptionMeta, { type: 'toggle' }> }) => {
+const ignoreReloadWarningsCache = new Set<string>()
+
+export const OptionButton = ({ item, onClick, valueText, cacheKey }: {
+  item: Extract<OptionMeta, { type: 'toggle' }>,
+  onClick?: () => void,
+  valueText?: string,
+  cacheKey?: string,
+}) => {
   const { disabledBecauseOfSetting } = useCommonComponentsProps(item)
 
   const optionValue = useSnapshot(options)[item.id!]
@@ -84,40 +94,63 @@ export const OptionButton = ({ item }: { item: Extract<OptionMeta, { type: 'togg
 
   return <Button
     data-setting={item.id}
-    label={`${item.text}: ${valuesTitlesMap[optionValue]}`}
-    // label={`${item.text}:`}
-    // postLabel={valuesTitlesMap[optionValue]}
+    label={`${translate(item.text)}: ${translate(valueText ?? valuesTitlesMap[optionValue])}`}
     onClick={async (event) => {
       if (disabledReason) {
-        await showOptionsModal(`The option is unavailable. ${disabledReason}`, [])
+        await showOptionsModal(`${translate('The option is not available')}: ${disabledReason}`, [])
         return
       }
       if (item.enableWarning && !options[item.id!]) {
         const result = await showOptionsModal(item.enableWarning, ['Enable'])
         if (!result) return
       }
-      const { values } = item
-      if (values) {
-        const getOptionValue = (arrItem) => {
-          if (typeof arrItem === 'string') {
-            return arrItem
+      onClick?.()
+      if (item.id) {
+        const { values } = item
+        if (values) {
+          const getOptionValue = (arrItem) => {
+            if (typeof arrItem === 'string') {
+              return arrItem
+            } else {
+              return arrItem[0]
+            }
+          }
+          const currentIndex = values.findIndex((value) => {
+            return getOptionValue(value) === optionValue
+          })
+          if (currentIndex === -1) {
+            options[item.id] = getOptionValue(values[0])
           } else {
-            return arrItem[0]
+            const nextIndex = event.shiftKey
+              ? (currentIndex - 1 + values.length) % values.length
+              : (currentIndex + 1) % values.length
+            options[item.id] = getOptionValue(values[nextIndex])
+          }
+        } else {
+          options[item.id] = !options[item.id]
+        }
+      }
+
+      const toCacheKey = cacheKey ?? item.id ?? ''
+      if (toCacheKey && !ignoreReloadWarningsCache.has(toCacheKey)) {
+        ignoreReloadWarningsCache.add(toCacheKey)
+
+        if (item.requiresRestart) {
+          const result = await showOptionsModal(translate('The option requires a restart to take effect'), ['Restart', 'I will do it later'], {
+            cancel: false,
+          })
+          if (result) {
+            reconnectReload()
           }
         }
-        const currentIndex = values.findIndex((value) => {
-          return getOptionValue(value) === optionValue
-        })
-        if (currentIndex === -1) {
-          options[item.id!] = getOptionValue(values[0])
-        } else {
-          const nextIndex = event.shiftKey
-            ? (currentIndex - 1 + values.length) % values.length
-            : (currentIndex + 1) % values.length
-          options[item.id!] = getOptionValue(values[nextIndex])
+        if (item.requiresChunksReload) {
+          const result = await showOptionsModal(translate('The option requires a chunks reload to take effect'), ['Reload', 'I will do it later'], {
+            cancel: false,
+          })
+          if (result) {
+            reloadChunksAction()
+          }
         }
-      } else {
-        options[item.id!] = !options[item.id!]
       }
     }}
     title={disabledReason ? `${disabledReason} | ${item.tooltip}` : item.tooltip}

From b6d4728c447592d1a01303448d41adc83822b973 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 09:44:50 +0300
Subject: [PATCH 686/753] display disconnect always last

---
 renderer/viewer/three/documentRenderer.ts |  3 ++-
 src/devtools.ts                           |  1 -
 src/react/PauseScreen.tsx                 | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/renderer/viewer/three/documentRenderer.ts b/renderer/viewer/three/documentRenderer.ts
index 8ff31e69..a5dc060d 100644
--- a/renderer/viewer/three/documentRenderer.ts
+++ b/renderer/viewer/three/documentRenderer.ts
@@ -61,8 +61,9 @@ export class DocumentRenderer {
     this.previousCanvasWidth = this.canvas.width
     this.previousCanvasHeight = this.canvas.height
 
+    const supportsWebGL2 = 'WebGL2RenderingContext' in window
     // Only initialize stats and DOM-related features in main thread
-    if (!externalCanvas) {
+    if (!externalCanvas && supportsWebGL2) {
       this.stats = new TopRightStats(this.canvas as HTMLCanvasElement, this.config.statsVisible)
       this.setupFpsTracking()
     }
diff --git a/src/devtools.ts b/src/devtools.ts
index 8890fdea..6c47f73d 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -255,7 +255,6 @@ function connectWebSocket () {
 
   const wsUrl = getWebSocketUrl()
   if (!wsUrl) {
-    console.log('WebSocket server not configured')
     return
   }
 
diff --git a/src/react/PauseScreen.tsx b/src/react/PauseScreen.tsx
index 3036aa4b..856ac932 100644
--- a/src/react/PauseScreen.tsx
+++ b/src/react/PauseScreen.tsx
@@ -289,11 +289,6 @@ export default () => {
           />
         </div>
       ) : null}
-      {!lockConnect && <>
-        <Button className="button" style={{ width: '204px' }} onClick={disconnect}>
-          {fsState.inMemorySave && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
-        </Button>
-      </>}
       {(noConnection || appConfig?.alwaysReconnectButton) && (
         <div className={styles.row}>
           <Button className="button" style={{ width: appConfig?.reportBugButtonWithReconnect ? '98px' : '204px' }} onClick={reconnectReload}>
@@ -343,6 +338,11 @@ export default () => {
           )}
         </div>
       )}
+      {!lockConnect && <>
+        <Button className="button" style={{ width: '204px' }} onClick={disconnect}>
+          {fsState.inMemorySave && !fsState.syncFs && !fsState.isReadonly ? 'Save & Quit' : 'Disconnect & Reset'}
+        </Button>
+      </>}
     </div>
     <LoadingTimer />
   </Screen>

From a49877870325b010160c3e9e3dfca5719b8552f8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 18 Jul 2025 09:56:50 +0300
Subject: [PATCH 687/753] always wait for config load so autoConnect works on
 remote config

---
 src/index.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 7a553ca7..8de98894 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -982,7 +982,6 @@ const maybeEnterGame = () => {
   }
 
   if (appQueryParams.ip || appQueryParams.proxy) {
-    const waitAppConfigLoad = !appQueryParams.proxy
     const openServerAction = () => {
       if (appQueryParams.autoConnect && miscUiState.appConfig?.allowAutoConnect) {
         void connect({
@@ -1003,11 +1002,7 @@ const maybeEnterGame = () => {
     }
 
     // showModal({ reactType: 'empty' })
-    if (waitAppConfigLoad) {
-      return waitForConfigFsLoad(openServerAction)
-    }
-    openServerAction()
-    return
+    return waitForConfigFsLoad(openServerAction)
   }
 
   if (appQueryParams.connectPeer) {

From 4d7e3df8597fffea6a66f7a6df4810dae1d8cd96 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Fri, 18 Jul 2025 11:18:05 +0000
Subject: [PATCH 688/753] feat: Item projectiles support (#395)

---
 pnpm-lock.yaml                        | 14 +++---
 renderer/viewer/three/entities.ts     | 72 ++++++++++++++++-----------
 renderer/viewer/three/holdingBlock.ts |  2 +-
 3 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1e6fddf3..52c2ff30 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,7 +136,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.14
         version: 0.1.14
@@ -6678,8 +6678,8 @@ packages:
     resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767}
     version: 4.30.0
     engines: {node: '>=22'}
 
@@ -16956,12 +16956,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13)
       prismarine-item: 1.16.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17379,7 +17379,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/3daf1f4bdc6afad0dedd87b879875f3dbb7b0980(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 51292d2f..6c6f8900 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -717,7 +717,7 @@ export class Entities {
     return typeof component === 'string' ? component : component.text ?? ''
   }
 
-  getItemMesh (item, specificProps: ItemSpecificContextProperties, previousModel?: string) {
+  getItemMesh (item, specificProps: ItemSpecificContextProperties, faceCamera = false, previousModel?: string) {
     if (!item.nbt && item.nbtData) item.nbt = item.nbtData
     const textureUv = this.worldRenderer.getItemRenderData(item, specificProps)
     if (previousModel && previousModel === textureUv?.modelName) return undefined
@@ -757,26 +757,37 @@ export class Entities {
       itemsTexture.needsUpdate = true
       itemsTexture.magFilter = THREE.NearestFilter
       itemsTexture.minFilter = THREE.NearestFilter
-      const itemsTextureFlipped = itemsTexture.clone()
-      itemsTextureFlipped.repeat.x *= -1
-      itemsTextureFlipped.needsUpdate = true
-      itemsTextureFlipped.offset.set(u + (sizeX), 1 - v - sizeY)
-      const material = new THREE.MeshStandardMaterial({
-        map: itemsTexture,
-        transparent: true,
-        alphaTest: 0.1,
-      })
-      const materialFlipped = new THREE.MeshStandardMaterial({
-        map: itemsTextureFlipped,
-        transparent: true,
-        alphaTest: 0.1,
-      })
-      const mesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 0), [
-        // top left and right bottom are black box materials others are transparent
-        new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
-        new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
-        material, materialFlipped,
-      ])
+      let mesh: THREE.Object3D
+      let itemsTextureFlipped: THREE.Texture | undefined
+      if (faceCamera) {
+        const spriteMat = new THREE.SpriteMaterial({
+          map: itemsTexture,
+          transparent: true,
+          alphaTest: 0.1,
+        })
+        mesh = new THREE.Sprite(spriteMat)
+      } else {
+        itemsTextureFlipped = itemsTexture.clone()
+        itemsTextureFlipped.repeat.x *= -1
+        itemsTextureFlipped.needsUpdate = true
+        itemsTextureFlipped.offset.set(u + (sizeX), 1 - v - sizeY)
+        const material = new THREE.MeshStandardMaterial({
+          map: itemsTexture,
+          transparent: true,
+          alphaTest: 0.1,
+        })
+        const materialFlipped = new THREE.MeshStandardMaterial({
+          map: itemsTextureFlipped,
+          transparent: true,
+          alphaTest: 0.1,
+        })
+        mesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 0), [
+          // top left and right bottom are black box materials others are transparent
+          new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
+          new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
+          material, materialFlipped,
+        ])
+      }
       let SCALE = 1
       if (specificProps['minecraft:display_context'] === 'ground') {
         SCALE = 0.5
@@ -805,8 +816,6 @@ export class Entities {
   }
 
   update (entity: SceneEntity['originalEntity'], overrides) {
-    const justAdded = !this.entities[entity.id]
-
     const isPlayerModel = entity.name === 'player'
     if (entity.name === 'zombie_villager' || entity.name === 'husk') {
       overrides.texture = `textures/1.16.4/entity/${entity.name === 'zombie_villager' ? 'zombie_villager/zombie_villager.png' : `zombie/${entity.name}.png`}`
@@ -817,6 +826,7 @@ export class Entities {
     }
     // this can be undefined in case where packet entity_destroy was sent twice (so it was already deleted)
     let e = this.entities[entity.id]
+    const justAdded = !e
 
     if (entity.delete) {
       if (!e) return
@@ -836,21 +846,23 @@ export class Entities {
     if (e === undefined) {
       const group = new THREE.Group() as unknown as SceneEntity
       group.originalEntity = entity
-      if (entity.name === 'item' || entity.name === 'tnt' || entity.name === 'falling_block') {
-        const item = entity.name === 'tnt'
-          ? { name: 'tnt' }
+      if (entity.name === 'item' || entity.name === 'tnt' || entity.name === 'falling_block' || entity.name === 'snowball'
+        || entity.name === 'egg' || entity.name === 'ender_pearl' || entity.name === 'experience_bottle'
+        || entity.name === 'splash_potion' || entity.name === 'lingering_potion') {
+        const item = entity.name === 'tnt' || entity.type === 'projectile'
+          ? { name: entity.name }
           : entity.name === 'falling_block'
             ? { blockState: entity['objectData'] }
             : entity.metadata?.find((m: any) => typeof m === 'object' && m?.itemCount)
         if (item) {
           const object = this.getItemMesh(item, {
             'minecraft:display_context': 'ground',
-          })
+          }, entity.type === 'projectile')
           if (object) {
             mesh = object.mesh
-            if (entity.name === 'item') {
+            if (entity.name === 'item' || entity.type === 'projectile') {
               mesh.scale.set(0.5, 0.5, 0.5)
-              mesh.position.set(0, 0.2, 0)
+              mesh.position.set(0, entity.name === 'item' ? 0.2 : 0.1, 0)
             } else {
               mesh.scale.set(2, 2, 2)
               mesh.position.set(0, 0.5, 0)
@@ -858,8 +870,8 @@ export class Entities {
             // set faces
             // mesh.position.set(targetPos.x + 0.5 + 2, targetPos.y + 0.5, targetPos.z + 0.5)
             // viewer.scene.add(mesh)
-            const clock = new THREE.Clock()
             if (entity.name === 'item') {
+              const clock = new THREE.Clock()
               mesh.onBeforeRender = () => {
                 const delta = clock.getDelta()
                 mesh!.rotation.y += delta
diff --git a/renderer/viewer/three/holdingBlock.ts b/renderer/viewer/three/holdingBlock.ts
index c8a56386..f9d00f0e 100644
--- a/renderer/viewer/three/holdingBlock.ts
+++ b/renderer/viewer/three/holdingBlock.ts
@@ -357,7 +357,7 @@ export default class HoldingBlock {
         'minecraft:display_context': 'firstperson',
         'minecraft:use_duration': this.worldRenderer.playerStateReactive.itemUsageTicks,
         'minecraft:using_item': !!this.worldRenderer.playerStateReactive.itemUsageTicks,
-      }, this.lastItemModelName)
+      }, false, this.lastItemModelName)
       if (result) {
         const { mesh: itemMesh, isBlock, modelName } = result
         if (isBlock) {

From b9c8ade9bf05b3eea2842bcfe2e03bb7428cfafb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 20 Jul 2025 10:06:57 +0300
Subject: [PATCH 689/753] fix: fix chat was crashing sometimes

---
 src/index.ts       | 4 ++++
 src/react/Chat.tsx | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/index.ts b/src/index.ts
index 8de98894..d28261f4 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -278,6 +278,10 @@ export async function connect (connectOptions: ConnectOptions) {
         return
       }
     }
+    if (e.reason?.stack?.includes('chrome-extension://')) {
+      // ignore issues caused by chrome extension
+      return
+    }
     handleError(e.reason)
   }, {
     signal: errorAbortController.signal
diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index a45d7a69..20d77a10 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -45,7 +45,7 @@ const MessageLine = ({ message, currentPlayerName, chatOpened }: { message: Mess
   return <li className={Object.entries(classes).filter(([, val]) => val).map(([name]) => name).join(' ')} data-time={message.timestamp ? new Date(message.timestamp).toLocaleString('en-US', { hour12: false }) : undefined}>
     {message.parts.map((msg, i) => {
       // Check if this is a text part that might contain a mention
-      if (msg.text && currentPlayerName) {
+      if (typeof msg.text === 'string' && currentPlayerName) {
         const parts = msg.text.split(new RegExp(`(@${currentPlayerName})`, 'i'))
         if (parts.length > 1) {
           return parts.map((txtPart, j) => {

From 67855ae25a97d00a5206299963794bf223e2eebe Mon Sep 17 00:00:00 2001
From: Kesu <40177436+Kesuaheli@users.noreply.github.com>
Date: Sun, 27 Jul 2025 15:24:26 +0200
Subject: [PATCH 690/753] fix: fix some window titles (#401)

---
 src/inventoryWindows.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 1e17db14..bc7dcbaf 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -9,6 +9,7 @@ import PItem, { Item } from 'prismarine-item'
 import { versionToNumber } from 'renderer/viewer/common/utils'
 import { getRenamedData } from 'flying-squid/dist/blockRenames'
 import PrismarineChatLoader from 'prismarine-chat'
+import * as nbt from 'prismarine-nbt'
 import { BlockModel } from 'mc-assets'
 import { renderSlot } from 'renderer/viewer/three/renderSlot'
 import Generic95 from '../assets/generic_95.png'
@@ -59,9 +60,9 @@ export const onGameLoad = () => {
   bot.on('windowOpen', (win) => {
     const implementedWindow = implementedContainersGuiMap[mapWindowType(win.type as string, win.inventoryStart)]
     if (implementedWindow) {
-      openWindow(implementedWindow)
+      openWindow(implementedWindow, nbt.simplify(win.title as any))
     } else if (options.unimplementedContainers) {
-      openWindow('ChestWin')
+      openWindow('ChestWin', nbt.simplify(win.title as any))
     } else {
       // todo format
       displayClientChat(`[client error] cannot open unimplemented window ${win.id} (${win.type}). Slots: ${win.slots.map(item => getItemName(item)).filter(Boolean).join(', ')}`)
@@ -354,7 +355,7 @@ const upWindowItemsLocal = () => {
 }
 
 let skipClosePacketSending = false
-const openWindow = (type: string | undefined) => {
+const openWindow = (type: string | undefined, title: string | any = undefined) => {
   // if (activeModalStack.some(x => x.reactType?.includes?.('player_win:'))) {
   if (activeModalStack.length) { // game is not in foreground, don't close current modal
     if (type) {
@@ -384,7 +385,6 @@ const openWindow = (type: string | undefined) => {
   const inv = openItemsCanvas(type)
   inv.canvasManager.children[0].mobileHelpers = miscUiState.currentTouch
   window.inventory = inv
-  const title = bot.currentWindow?.title
   const PrismarineChat = PrismarineChatLoader(bot.version)
   try {
     inv.canvasManager.children[0].customTitleText = title ?

From c4b284b9b7b644fc0c7eee2a7231752df499b452 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 2 Aug 2025 21:34:33 +0300
Subject: [PATCH 691/753] fix: fix supported versions display in server menu

---
 src/react/ServersListProvider.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 2509db74..75f95d3f 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -1,9 +1,11 @@
 import { useEffect, useMemo, useState } from 'react'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { useSnapshot } from 'valtio'
+import { supportedVersions } from 'minecraft-protocol'
+import { versionToNumber } from 'mc-assets/dist/utils'
 import { ConnectOptions } from '../connect'
 import { activeModalStack, hideCurrentModal, miscUiState, notHideableModalsWithoutForce, showModal } from '../globalState'
-import supportedVersions from '../supportedVersions.mjs'
+import appSupportedVersions from '../supportedVersions.mjs'
 import { appQueryParams } from '../appParams'
 import { fetchServerStatus, isServerValid } from '../api/mcStatusApi'
 import { getServerInfo } from '../mineflayer/mc-protocol'
@@ -20,6 +22,10 @@ import Button from './Button'
 import { pixelartIcons } from './PixelartIcon'
 import { showNotification } from './NotificationProvider'
 
+const firstProtocolVersion = versionToNumber(supportedVersions[0])
+const lastProtocolVersion = versionToNumber(supportedVersions.at(-1)!)
+const protocolSupportedVersions = appSupportedVersions.filter(v => versionToNumber(v) >= firstProtocolVersion && versionToNumber(v) <= lastProtocolVersion)
+
 const EXPLICIT_SHARE_SERVER_MODE = false
 
 if (appQueryParams.lockConnect) {
@@ -262,7 +268,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
       }
       dispatchEvent(new CustomEvent('connect', { detail: connectOptions }))
     }}
-    versions={supportedVersions}
+    versions={protocolSupportedVersions}
   /> : null
 
   const serversListJsx = <ServersList

From 24ab260e8ed60be8a40777d4b1905e456633d755 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 3 Aug 2025 03:20:38 +0300
Subject: [PATCH 692/753] fix: up protocol to support 1.21.5

---
 patches/minecraft-protocol.patch | 110 +++++++++++++++++--------------
 pnpm-lock.yaml                   |  77 +++++++++++-----------
 2 files changed, 101 insertions(+), 86 deletions(-)

diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch
index 6a82d5cf..108085a1 100644
--- a/patches/minecraft-protocol.patch
+++ b/patches/minecraft-protocol.patch
@@ -1,8 +1,8 @@
 diff --git a/src/client/chat.js b/src/client/chat.js
-index 8d0869b150681574ad19292a026cce9f67a137ee..2efa2e6600f017b566155974cb9fb1856fa582f9 100644
+index a50f4b988ad9fb29d5eb9e1633b498615aa9cd28..b8b819eef0762a77d9db5c0fb06be648303628c7 100644
 --- a/src/client/chat.js
 +++ b/src/client/chat.js
-@@ -109,7 +109,7 @@ module.exports = function (client, options) {
+@@ -110,7 +110,7 @@ module.exports = function (client, options) {
      for (const player of packet.data) {
        if (player.chatSession) {
          client._players[player.uuid] = {
@@ -11,8 +11,8 @@ index 8d0869b150681574ad19292a026cce9f67a137ee..2efa2e6600f017b566155974cb9fb185
            publicKeyDER: player.chatSession.publicKey.keyBytes,
            sessionUuid: player.chatSession.uuid
          }
-@@ -119,7 +119,7 @@ module.exports = function (client, options) {
- 
+@@ -120,7 +120,7 @@ module.exports = function (client, options) {
+
        if (player.crypto) {
          client._players[player.uuid] = {
 -          publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
@@ -20,7 +20,7 @@ index 8d0869b150681574ad19292a026cce9f67a137ee..2efa2e6600f017b566155974cb9fb185
            publicKeyDER: player.crypto.publicKey,
            signature: player.crypto.signature,
            displayName: player.displayName || player.name
-@@ -189,7 +189,7 @@ module.exports = function (client, options) {
+@@ -190,7 +190,7 @@ module.exports = function (client, options) {
      if (mcData.supportFeature('useChatSessions')) {
        const tsDelta = BigInt(Date.now()) - packet.timestamp
        const expired = !packet.timestamp || tsDelta > messageExpireTime || tsDelta < 0
@@ -28,26 +28,26 @@ index 8d0869b150681574ad19292a026cce9f67a137ee..2efa2e6600f017b566155974cb9fb185
 +      const verified = false && !packet.unsignedChatContent && updateAndValidateSession(packet.senderUuid, packet.plainMessage, packet.signature, packet.index, packet.previousMessages, packet.salt, packet.timestamp) && !expired
        if (verified) client._signatureCache.push(packet.signature)
        client.emit('playerChat', {
-         plainMessage: packet.plainMessage,
-@@ -354,7 +354,7 @@ module.exports = function (client, options) {
+         globalIndex: packet.globalIndex,
+@@ -356,7 +356,7 @@ module.exports = function (client, options) {
      }
    }
- 
+
 -  client._signedChat = (message, options = {}) => {
 +  client._signedChat = async (message, options = {}) => {
      options.timestamp = options.timestamp || BigInt(Date.now())
      options.salt = options.salt || 1n
- 
-@@ -396,7 +396,7 @@ module.exports = function (client, options) {
+
+@@ -401,7 +401,7 @@ module.exports = function (client, options) {
          message,
          timestamp: options.timestamp,
          salt: options.salt,
 -        signature: (client.profileKeys && client._session) ? client.signMessage(message, options.timestamp, options.salt, undefined, acknowledgements) : undefined,
 +        signature: (client.profileKeys && client._session) ? await client.signMessage(message, options.timestamp, options.salt, undefined, acknowledgements) : undefined,
          offset: client._lastSeenMessages.pending,
+         checksum: computeChatChecksum(client._lastSeenMessages), // 1.21.5+
          acknowledged
-       })
-@@ -410,7 +410,7 @@ module.exports = function (client, options) {
+@@ -416,7 +416,7 @@ module.exports = function (client, options) {
          message,
          timestamp: options.timestamp,
          salt: options.salt,
@@ -57,7 +57,7 @@ index 8d0869b150681574ad19292a026cce9f67a137ee..2efa2e6600f017b566155974cb9fb185
          previousMessages: client._lastSeenMessages.map((e) => ({
            messageSender: e.sender,
 diff --git a/src/client/encrypt.js b/src/client/encrypt.js
-index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108f4c63536 100644
+index 63cc2bd9615100bd2fd63dfe14c094aa6b8cd1c9..36df57d1196af9761d920fa285ac48f85410eaef 100644
 --- a/src/client/encrypt.js
 +++ b/src/client/encrypt.js
 @@ -25,7 +25,11 @@ module.exports = function (client, options) {
@@ -71,7 +71,7 @@ index b9d21bab9faccd5dbf1975fc423fc55c73e906c5..99ffd76527b410e3a393181beb260108
 +        //   clearTimeout(loginTimeout)
 +        // })
        }
- 
+
        function onJoinServerResponse (err) {
 diff --git a/src/client/play.js b/src/client/play.js
 index 559607f34e9a5b2b7809423f8ca4cd6746b60225..4dc1c3139438cc2729b05c57e57bd00252728f8a 100644
@@ -87,27 +87,10 @@ index 559607f34e9a5b2b7809423f8ca4cd6746b60225..4dc1c3139438cc2729b05c57e57bd002
        })
        // Server should send finish_configuration on its own right after sending the client a dimension codec
 diff --git a/src/client.js b/src/client.js
-index 5c7a62b013daa69be91ec9e763b1f48ffe96ffa6..174d42a77740a937afcb106e1f39a9ee824a24b9 100644
+index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..11c6bff299f1186ab1ecb6744f53ff0c648ab192 100644
 --- a/src/client.js
 +++ b/src/client.js
-@@ -89,10 +89,12 @@ class Client extends EventEmitter {
-       parsed.metadata.name = parsed.data.name
-       parsed.data = parsed.data.params
-       parsed.metadata.state = state
--      debug('read packet ' + state + '.' + parsed.metadata.name)
--      if (debug.enabled) {
--        const s = JSON.stringify(parsed.data, null, 2)
--        debug(s && s.length > 10000 ? parsed.data : s)
-+      if (!globalThis.excludeCommunicationDebugEvents?.includes(parsed.metadata.name)) {
-+        debug('read packet ' + state + '.' + parsed.metadata.name)
-+        if (debug.enabled) {
-+          const s = JSON.stringify(parsed.data, null, 2)
-+          debug(s && s.length > 10000 ? parsed.data : s)
-+        }
-       }
-       if (this._hasBundlePacket && parsed.metadata.name === 'bundle_delimiter') {
-         if (this._mcBundle.length) { // End bundle
-@@ -110,7 +112,13 @@ class Client extends EventEmitter {
+@@ -111,7 +111,13 @@ class Client extends EventEmitter {
            this._hasBundlePacket = false
          }
        } else {
@@ -122,9 +105,9 @@ index 5c7a62b013daa69be91ec9e763b1f48ffe96ffa6..174d42a77740a937afcb106e1f39a9ee
        }
      })
    }
-@@ -168,7 +176,10 @@ class Client extends EventEmitter {
+@@ -169,7 +175,10 @@ class Client extends EventEmitter {
      }
- 
+
      const onFatalError = (err) => {
 -      this.emit('error', err)
 +      // todo find out what is trying to write after client disconnect
@@ -133,8 +116,8 @@ index 5c7a62b013daa69be91ec9e763b1f48ffe96ffa6..174d42a77740a937afcb106e1f39a9ee
 +      }
        endSocket()
      }
- 
-@@ -197,6 +208,8 @@ class Client extends EventEmitter {
+
+@@ -198,6 +207,8 @@ class Client extends EventEmitter {
      serializer -> framer -> socket -> splitter -> deserializer */
      if (this.serializer) {
        this.serializer.end()
@@ -143,17 +126,48 @@ index 5c7a62b013daa69be91ec9e763b1f48ffe96ffa6..174d42a77740a937afcb106e1f39a9ee
      } else {
        if (this.socket) this.socket.end()
      }
-@@ -238,8 +251,11 @@ class Client extends EventEmitter {
- 
-   write (name, params) {
-     if (!this.serializer.writable) { return }
--    debug('writing packet ' + this.state + '.' + name)
--    debug(params)
-+    if (!globalThis.excludeCommunicationDebugEvents?.includes(name)) {
-+      debug(`[${this.state}] from ${this.isServer ? 'server' : 'client'}: ` + name)
-+      debug(params)
-+    }
+@@ -243,6 +254,7 @@ class Client extends EventEmitter {
+       debug('writing packet ' + this.state + '.' + name)
+       debug(params)
+     }
 +    this.emit('writePacket', name, params)
      this.serializer.write({ name, params })
    }
- 
+
+diff --git a/src/client.js.rej b/src/client.js.rej
+new file mode 100644
+index 0000000000000000000000000000000000000000..1101e2477adfdc004381b78e7d70953dacb7b484
+--- /dev/null
++++ b/src/client.js.rej
+@@ -0,0 +1,31 @@
++@@ -89,10 +89,12 @@
++       parsed.metadata.name = parsed.data.name
++       parsed.data = parsed.data.params
++       parsed.metadata.state = state
++-      debug('read packet ' + state + '.' + parsed.metadata.name)
++-      if (debug.enabled) {
++-        const s = JSON.stringify(parsed.data, null, 2)
++-        debug(s && s.length > 10000 ? parsed.data : s)
+++      if (!globalThis.excludeCommunicationDebugEvents?.includes(parsed.metadata.name)) {
+++        debug('read packet ' + state + '.' + parsed.metadata.name)
+++        if (debug.enabled) {
+++          const s = JSON.stringify(parsed.data, null, 2)
+++          debug(s && s.length > 10000 ? parsed.data : s)
+++        }
++       }
++       if (this._hasBundlePacket && parsed.metadata.name === 'bundle_delimiter') {
++         if (this._mcBundle.length) { // End bundle
++@@ -239,8 +252,11 @@
++
++   write (name, params) {
++     if (!this.serializer.writable) { return }
++-    debug('writing packet ' + this.state + '.' + name)
++-    debug(params)
+++    if (!globalThis.excludeCommunicationDebugEvents?.includes(name)) {
+++      debug(`[${this.state}] from ${this.isServer ? 'server' : 'client'}: ` + name)
+++      debug(params)
+++    }
+++    this.emit('writePacket', name, params)
++     this.serializer.write({ name, params })
++   }
++
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 52c2ff30..aa67e479 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,7 +22,7 @@ overrides:
 
 patchedDependencies:
   minecraft-protocol:
-    hash: a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0
+    hash: 40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150
     path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
@@ -136,13 +136,13 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
@@ -341,7 +341,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.14
         version: 0.1.14
@@ -6651,9 +6651,9 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176}
-    version: 1.58.0
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453}
+    version: 1.60.0
     engines: {node: '>=22'}
 
   minecraft-wrap@1.6.0:
@@ -6678,9 +6678,9 @@ packages:
     resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
     engines: {node: '>=22'}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767}
-    version: 4.30.0
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448}
+    version: 4.31.0
     engines: {node: '>=22'}
 
   minimalistic-assert@1.0.1:
@@ -7392,8 +7392,8 @@ packages:
   prismarine-entity@2.5.0:
     resolution: {integrity: sha512-nRPCawUwf9r3iKqi4I7mZRlir1Ix+DffWYdWq6p/KNnmiXve+xHE5zv8XCdhZlUmOshugHv5ONl9o6ORAkCNIA==}
 
-  prismarine-item@1.16.0:
-    resolution: {integrity: sha512-88Tz+/6HquYIsDuseae5G3IbqLeMews2L+ba2gX+p6K6soU9nuFhCfbwN56QuB7d/jZFcWrCYAPE5+UhwWh67w==}
+  prismarine-item@1.17.0:
+    resolution: {integrity: sha512-wN1OjP+f+Uvtjo3KzeCkVSy96CqZ8yG7cvuvlGwcYupQ6ct7LtNkubHp0AHuLMJ0vbbfAC0oZ2bWOgI1DYp8WA==}
 
   prismarine-nbt@2.7.0:
     resolution: {integrity: sha512-Du9OLQAcCj3y29YtewOJbbV4ARaSUEJiTguw0PPQbPBy83f+eCyDRkyBpnXTi/KPyEpgYCzsjGzElevLpFoYGQ==}
@@ -8324,6 +8324,7 @@ packages:
   source-map@0.8.0-beta.0:
     resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}
     engines: {node: '>= 8'}
+    deprecated: The work that was done in this beta branch won't be included in future versions
 
   sourcemap-codec@1.4.8:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
@@ -9668,7 +9669,7 @@ snapshots:
       '@babel/core': 7.26.9
       '@babel/helper-compilation-targets': 7.26.5
       '@babel/helper-plugin-utils': 7.26.5
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       lodash.debounce: 4.0.8
       resolve: 1.22.10
     transitivePeerDependencies:
@@ -11318,7 +11319,7 @@ snapshots:
       minecraft-data: 3.92.0
       mineflayer: 4.30.0(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
     transitivePeerDependencies:
@@ -12881,7 +12882,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.1.0
       '@typescript-eslint/visitor-keys': 6.1.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.7.1
@@ -13077,13 +13078,13 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-entity: 2.5.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
       prismarine-windows: 2.9.0
@@ -13113,13 +13114,13 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-entity: 2.5.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
       prismarine-windows: 2.9.0
@@ -14502,7 +14503,7 @@ snapshots:
   detect-port@1.6.1:
     dependencies:
       address: 1.2.2
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
@@ -16109,7 +16110,7 @@ snapshots:
   https-proxy-agent@4.0.0:
     dependencies:
       agent-base: 5.1.1
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
@@ -16956,13 +16957,13 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13)
-      prismarine-item: 1.16.0
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
+      prismarine-item: 1.17.0
       ws: 8.18.1
     transitivePeerDependencies:
       - bufferutil
@@ -17191,7 +17192,7 @@ snapshots:
   micromark@4.0.2:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       decode-named-character-reference: 1.1.0
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.3
@@ -17279,7 +17280,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17341,7 +17342,7 @@ snapshots:
     dependencies:
       change-case: 5.4.4
       debug: 4.4.1
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
     transitivePeerDependencies:
       - supports-color
@@ -17351,7 +17352,7 @@ snapshots:
       minecraft-data: 3.92.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-entity: 2.5.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
@@ -17359,13 +17360,13 @@ snapshots:
   mineflayer@4.30.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-entity: 2.5.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
@@ -17379,17 +17380,17 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/26c04c26f8eed2499a7c56eb4664649f3f54b767(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/6c2204a813690ead420e2b8c7f0ef32ca357d176(patch_hash=a8726e6981ddc3486262d981d1e2030f379901c055ac9c4bf3036b4149e860e0)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-entity: 2.5.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
@@ -18181,7 +18182,7 @@ snapshots:
       minecraft-data: 3.92.0
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
 
@@ -18207,11 +18208,11 @@ snapshots:
   prismarine-entity@2.5.0:
     dependencies:
       prismarine-chat: 1.11.0
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-registry: 1.11.0
       vec3: 0.1.10
 
-  prismarine-item@1.16.0:
+  prismarine-item@1.17.0:
     dependencies:
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
@@ -18265,7 +18266,7 @@ snapshots:
 
   prismarine-windows@2.9.0:
     dependencies:
-      prismarine-item: 1.16.0
+      prismarine-item: 1.17.0
       prismarine-registry: 1.11.0
       typed-emitter: 2.1.0
 

From d41527edc8db54c26ce1edcdee3664e44e324726 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 3 Aug 2025 03:33:37 +0300
Subject: [PATCH 693/753] manually fix lockfile because of silly pnpm dep
 resolution

---
 pnpm-lock.yaml | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index aa67e479..b79d619e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6674,10 +6674,6 @@ packages:
   mineflayer-pathfinder@2.4.5:
     resolution: {integrity: sha512-Jh3JnUgRLwhMh2Dugo4SPza68C41y+NPP5sdsgxRu35ydndo70i1JJGxauVWbXrpNwIxYNztUw78aFyb7icw8g==}
 
-  mineflayer@4.30.0:
-    resolution: {integrity: sha512-GtW4hkijyZbSu5LKYYD89xZu+XY7OoP7IkrCnNEn6EdPm0+vr2THoJgFGKrlze9/81+T+P3E4qvJXNFiU/zeJg==}
-    engines: {node: '>=22'}
-
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448}
     version: 4.31.0
@@ -11317,7 +11313,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: 4.30.0(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@@ -17332,7 +17328,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: 4.30.0(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17357,29 +17353,6 @@ snapshots:
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
 
-  mineflayer@4.30.0(encoding@0.1.13):
-    dependencies:
-      minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
-      prismarine-entity: 2.5.0
-      prismarine-item: 1.17.0
-      prismarine-nbt: 2.7.0
-      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
-      prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
-      prismarine-registry: 1.11.0
-      prismarine-windows: 2.9.0
-      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
-      protodef: 1.18.0
-      typed-emitter: 1.4.0
-      vec3: 0.1.10
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10

From d7bd26b6b5f94e838d04c4cf19a8b9acc5966c5e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 6 Aug 2025 01:47:09 +0300
Subject: [PATCH 694/753] up protocol patch

---
 patches/minecraft-protocol.patch | 13 --------
 pnpm-lock.yaml                   | 51 ++++++++++++++++++++++++--------
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch
index 108085a1..e74f7e1d 100644
--- a/patches/minecraft-protocol.patch
+++ b/patches/minecraft-protocol.patch
@@ -73,19 +73,6 @@ index 63cc2bd9615100bd2fd63dfe14c094aa6b8cd1c9..36df57d1196af9761d920fa285ac48f8
        }
 
        function onJoinServerResponse (err) {
-diff --git a/src/client/play.js b/src/client/play.js
-index 559607f34e9a5b2b7809423f8ca4cd6746b60225..4dc1c3139438cc2729b05c57e57bd00252728f8a 100644
---- a/src/client/play.js
-+++ b/src/client/play.js
-@@ -53,7 +53,7 @@ module.exports = function (client, options) {
-         client.write('configuration_acknowledged', {})
-       }
-       client.state = states.CONFIGURATION
--      client.on('select_known_packs', () => {
-+      client.once('select_known_packs', () => {
-         client.write('select_known_packs', { packs: [] })
-       })
-       // Server should send finish_configuration on its own right after sending the client a dimension codec
 diff --git a/src/client.js b/src/client.js
 index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..11c6bff299f1186ab1ecb6744f53ff0c648ab192 100644
 --- a/src/client.js
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b79d619e..db095f5b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,7 +22,7 @@ overrides:
 
 patchedDependencies:
   minecraft-protocol:
-    hash: 40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150
+    hash: b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9
     path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
@@ -142,7 +142,7 @@ importers:
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
@@ -6651,9 +6651,9 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453}
-    version: 1.60.0
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb}
+    version: 1.60.1
     engines: {node: '>=22'}
 
   minecraft-wrap@1.6.0:
@@ -6674,6 +6674,10 @@ packages:
   mineflayer-pathfinder@2.4.5:
     resolution: {integrity: sha512-Jh3JnUgRLwhMh2Dugo4SPza68C41y+NPP5sdsgxRu35ydndo70i1JJGxauVWbXrpNwIxYNztUw78aFyb7icw8g==}
 
+  mineflayer@4.31.0:
+    resolution: {integrity: sha512-oqiNa5uP4kXiPlj4+Jn+9QozPMsMy0U8/YP5d6+KSAeWthtuJHeQqcYgWG5lkC3LHMqHqtEu4MNdXt6GZjFNTQ==}
+    engines: {node: '>=22'}
+
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448}
     version: 4.31.0
@@ -11313,7 +11317,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
+      mineflayer: 4.31.0(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@@ -13074,7 +13078,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13110,7 +13114,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -16957,7 +16961,7 @@ snapshots:
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
@@ -17276,7 +17280,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17328,7 +17332,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
+      mineflayer: 4.31.0(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17353,11 +17357,34 @@ snapshots:
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
 
+  mineflayer@4.31.0(encoding@0.1.13):
+    dependencies:
+      minecraft-data: 3.92.0
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-chat: 1.11.0
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
+      prismarine-entity: 2.5.0
+      prismarine-item: 1.17.0
+      prismarine-nbt: 2.7.0
+      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
+      prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
+      prismarine-registry: 1.11.0
+      prismarine-windows: 2.9.0
+      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
+      protodef: 1.18.0
+      typed-emitter: 1.4.0
+      vec3: 0.1.10
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/ca5af6307a817b655a76c82f56a4c6c78e272453(patch_hash=40871f9192322be5e5fc0018a0a506a43f33973816b1b544743817609b606150)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From 167b49da08bf66f2617188f6d905e5efee9da42f Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 8 Aug 2025 01:07:52 +0200
Subject: [PATCH 695/753] fix: fix cannot write after stream was destroyed
 message (#413)

---
 README.MD                        |  2 +-
 patches/minecraft-protocol.patch | 77 +++++++++-----------------------
 pnpm-lock.yaml                   | 16 +++----
 src/index.ts                     |  8 +++-
 4 files changed, 36 insertions(+), 67 deletions(-)

diff --git a/README.MD b/README.MD
index e9127a73..7978cee5 100644
--- a/README.MD
+++ b/README.MD
@@ -54,7 +54,7 @@ Howerver, it's known that these browsers have issues:
 
 ### Versions Support
 
-Server versions 1.8 - 1.21.4 are supported.
+Server versions 1.8 - 1.21.5 are supported.
 First class versions (most of the features are tested on these versions):
 
 - 1.19.4
diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch
index e74f7e1d..5dec44d7 100644
--- a/patches/minecraft-protocol.patch
+++ b/patches/minecraft-protocol.patch
@@ -1,8 +1,8 @@
 diff --git a/src/client/chat.js b/src/client/chat.js
-index a50f4b988ad9fb29d5eb9e1633b498615aa9cd28..b8b819eef0762a77d9db5c0fb06be648303628c7 100644
+index 0021870994fc59a82f0ac8aba0a65a8be43ef2f4..a53fceb843105ea2a1d88722b3fc7c3b43cb102a 100644
 --- a/src/client/chat.js
 +++ b/src/client/chat.js
-@@ -110,7 +110,7 @@ module.exports = function (client, options) {
+@@ -116,7 +116,7 @@ module.exports = function (client, options) {
      for (const player of packet.data) {
        if (player.chatSession) {
          client._players[player.uuid] = {
@@ -11,8 +11,8 @@ index a50f4b988ad9fb29d5eb9e1633b498615aa9cd28..b8b819eef0762a77d9db5c0fb06be648
            publicKeyDER: player.chatSession.publicKey.keyBytes,
            sessionUuid: player.chatSession.uuid
          }
-@@ -120,7 +120,7 @@ module.exports = function (client, options) {
-
+@@ -126,7 +126,7 @@ module.exports = function (client, options) {
+ 
        if (player.crypto) {
          client._players[player.uuid] = {
 -          publicKey: crypto.createPublicKey({ key: player.crypto.publicKey, format: 'der', type: 'spki' }),
@@ -20,7 +20,7 @@ index a50f4b988ad9fb29d5eb9e1633b498615aa9cd28..b8b819eef0762a77d9db5c0fb06be648
            publicKeyDER: player.crypto.publicKey,
            signature: player.crypto.signature,
            displayName: player.displayName || player.name
-@@ -190,7 +190,7 @@ module.exports = function (client, options) {
+@@ -196,7 +196,7 @@ module.exports = function (client, options) {
      if (mcData.supportFeature('useChatSessions')) {
        const tsDelta = BigInt(Date.now()) - packet.timestamp
        const expired = !packet.timestamp || tsDelta > messageExpireTime || tsDelta < 0
@@ -29,16 +29,16 @@ index a50f4b988ad9fb29d5eb9e1633b498615aa9cd28..b8b819eef0762a77d9db5c0fb06be648
        if (verified) client._signatureCache.push(packet.signature)
        client.emit('playerChat', {
          globalIndex: packet.globalIndex,
-@@ -356,7 +356,7 @@ module.exports = function (client, options) {
+@@ -362,7 +362,7 @@ module.exports = function (client, options) {
      }
    }
-
+ 
 -  client._signedChat = (message, options = {}) => {
 +  client._signedChat = async (message, options = {}) => {
      options.timestamp = options.timestamp || BigInt(Date.now())
      options.salt = options.salt || 1n
-
-@@ -401,7 +401,7 @@ module.exports = function (client, options) {
+ 
+@@ -407,7 +407,7 @@ module.exports = function (client, options) {
          message,
          timestamp: options.timestamp,
          salt: options.salt,
@@ -47,7 +47,7 @@ index a50f4b988ad9fb29d5eb9e1633b498615aa9cd28..b8b819eef0762a77d9db5c0fb06be648
          offset: client._lastSeenMessages.pending,
          checksum: computeChatChecksum(client._lastSeenMessages), // 1.21.5+
          acknowledged
-@@ -416,7 +416,7 @@ module.exports = function (client, options) {
+@@ -422,7 +422,7 @@ module.exports = function (client, options) {
          message,
          timestamp: options.timestamp,
          salt: options.salt,
@@ -71,10 +71,10 @@ index 63cc2bd9615100bd2fd63dfe14c094aa6b8cd1c9..36df57d1196af9761d920fa285ac48f8
 +        //   clearTimeout(loginTimeout)
 +        // })
        }
-
+ 
        function onJoinServerResponse (err) {
 diff --git a/src/client.js b/src/client.js
-index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..11c6bff299f1186ab1ecb6744f53ff0c648ab192 100644
+index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..54bb9e6644388e9b6bd42b3012951875989cdf0c 100644
 --- a/src/client.js
 +++ b/src/client.js
 @@ -111,7 +111,13 @@ class Client extends EventEmitter {
@@ -94,7 +94,7 @@ index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..11c6bff299f1186ab1ecb6744f53ff0c
    }
 @@ -169,7 +175,10 @@ class Client extends EventEmitter {
      }
-
+ 
      const onFatalError = (err) => {
 -      this.emit('error', err)
 +      // todo find out what is trying to write after client disconnect
@@ -103,58 +103,23 @@ index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..11c6bff299f1186ab1ecb6744f53ff0c
 +      }
        endSocket()
      }
-
-@@ -198,6 +207,8 @@ class Client extends EventEmitter {
+ 
+@@ -198,6 +207,10 @@ class Client extends EventEmitter {
      serializer -> framer -> socket -> splitter -> deserializer */
      if (this.serializer) {
        this.serializer.end()
-+      this.socket?.end()
-+      this.socket?.emit('end')
++      setTimeout(() => {
++        this.socket?.end()
++        this.socket?.emit('end')
++      }, 2000) // allow the serializer to finish writing
      } else {
        if (this.socket) this.socket.end()
      }
-@@ -243,6 +254,7 @@ class Client extends EventEmitter {
+@@ -243,6 +256,7 @@ class Client extends EventEmitter {
        debug('writing packet ' + this.state + '.' + name)
        debug(params)
      }
 +    this.emit('writePacket', name, params)
      this.serializer.write({ name, params })
    }
-
-diff --git a/src/client.js.rej b/src/client.js.rej
-new file mode 100644
-index 0000000000000000000000000000000000000000..1101e2477adfdc004381b78e7d70953dacb7b484
---- /dev/null
-+++ b/src/client.js.rej
-@@ -0,0 +1,31 @@
-+@@ -89,10 +89,12 @@
-+       parsed.metadata.name = parsed.data.name
-+       parsed.data = parsed.data.params
-+       parsed.metadata.state = state
-+-      debug('read packet ' + state + '.' + parsed.metadata.name)
-+-      if (debug.enabled) {
-+-        const s = JSON.stringify(parsed.data, null, 2)
-+-        debug(s && s.length > 10000 ? parsed.data : s)
-++      if (!globalThis.excludeCommunicationDebugEvents?.includes(parsed.metadata.name)) {
-++        debug('read packet ' + state + '.' + parsed.metadata.name)
-++        if (debug.enabled) {
-++          const s = JSON.stringify(parsed.data, null, 2)
-++          debug(s && s.length > 10000 ? parsed.data : s)
-++        }
-+       }
-+       if (this._hasBundlePacket && parsed.metadata.name === 'bundle_delimiter') {
-+         if (this._mcBundle.length) { // End bundle
-+@@ -239,8 +252,11 @@
-+
-+   write (name, params) {
-+     if (!this.serializer.writable) { return }
-+-    debug('writing packet ' + this.state + '.' + name)
-+-    debug(params)
-++    if (!globalThis.excludeCommunicationDebugEvents?.includes(name)) {
-++      debug(`[${this.state}] from ${this.isServer ? 'server' : 'client'}: ` + name)
-++      debug(params)
-++    }
-++    this.emit('writePacket', name, params)
-+     this.serializer.write({ name, params })
-+   }
-+
+ 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index db095f5b..132ef32c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,7 +22,7 @@ overrides:
 
 patchedDependencies:
   minecraft-protocol:
-    hash: b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9
+    hash: 2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea
     path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
@@ -142,7 +142,7 @@ importers:
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
@@ -13078,7 +13078,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13114,7 +13114,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -16961,7 +16961,7 @@ snapshots:
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
@@ -17280,7 +17280,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17360,7 +17360,7 @@ snapshots:
   mineflayer@4.31.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
@@ -17384,7 +17384,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=b417b3b7c5fd96e59abab5c1075b86b88bada2c980e4b54df13ca69b8f0091d9)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
diff --git a/src/index.ts b/src/index.ts
index d28261f4..c0213f56 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -231,8 +231,12 @@ export async function connect (connectOptions: ConnectOptions) {
       bot.emit('end', '')
       bot.removeAllListeners()
       bot._client.removeAllListeners()
-      //@ts-expect-error TODO?
-      bot._client = undefined
+      bot._client = {
+        //@ts-expect-error
+        write (packetName) {
+          console.warn('Tried to write packet', packetName, 'after bot was destroyed')
+        }
+      }
       //@ts-expect-error
       window.bot = bot = undefined
     }

From caf4695637f1e1b86a98db90f12021df00822ca7 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 8 Aug 2025 18:33:20 +0300
Subject: [PATCH 696/753] feat: silly player on fire renderer effect

---
 renderer/viewer/lib/basePlayerState.ts |   1 +
 src/entities.ts                        |  63 ++++++++++
 src/react/FireRenderer.tsx             | 152 +++++++++++++++++++++++++
 src/reactUi.tsx                        |   2 +
 4 files changed, 218 insertions(+)
 create mode 100644 src/react/FireRenderer.tsx

diff --git a/renderer/viewer/lib/basePlayerState.ts b/renderer/viewer/lib/basePlayerState.ts
index af5d9d06..9cf1350a 100644
--- a/renderer/viewer/lib/basePlayerState.ts
+++ b/renderer/viewer/lib/basePlayerState.ts
@@ -48,6 +48,7 @@ export const getInitialPlayerState = () => proxy({
   heldItemMain: undefined as HandItemBlock | undefined,
   heldItemOff: undefined as HandItemBlock | undefined,
   perspective: 'first_person' as CameraPerspective,
+  onFire: false,
 
   cameraSpectatingEntity: undefined as number | undefined,
 
diff --git a/src/entities.ts b/src/entities.ts
index 79602aa5..cf91ff2c 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -126,6 +126,28 @@ customEvents.on('gameLoaded', () => {
     if (entityStatus === EntityStatus.HURT) {
       getThreeJsRendererMethods()?.damageEntity(entityId, entityStatus)
     }
+
+    if (entityStatus === EntityStatus.BURNED) {
+      updateEntityStates(entityId, true, true)
+    }
+  })
+
+  // on fire events
+  bot._client.on('entity_metadata', (data) => {
+    if (data.entityId !== bot.entity.id) return
+    handleEntityMetadata(data)
+  })
+
+  bot.on('end', () => {
+    if (onFireTimeout) {
+      clearTimeout(onFireTimeout)
+    }
+  })
+
+  bot.on('respawn', () => {
+    if (onFireTimeout) {
+      clearTimeout(onFireTimeout)
+    }
   })
 
   const updateCamera = (entity: Entity) => {
@@ -296,3 +318,44 @@ customEvents.on('gameLoaded', () => {
   })
 
 })
+
+// Constants
+const SHARED_FLAGS_KEY = 0
+const ENTITY_FLAGS = {
+  ON_FIRE: 0x01, // Bit 0
+  SNEAKING: 0x02, // Bit 1
+  SPRINTING: 0x08, // Bit 3
+  SWIMMING: 0x10, // Bit 4
+  INVISIBLE: 0x20, // Bit 5
+  GLOWING: 0x40, // Bit 6
+  FALL_FLYING: 0x80 // Bit 7 (elytra flying)
+}
+
+let onFireTimeout: NodeJS.Timeout | undefined
+const updateEntityStates = (entityId: number, onFire: boolean, timeout?: boolean) => {
+  if (entityId !== bot.entity.id) return
+  appViewer.playerState.reactive.onFire = onFire
+  if (onFireTimeout) {
+    clearTimeout(onFireTimeout)
+  }
+  if (timeout) {
+    onFireTimeout = setTimeout(() => {
+      updateEntityStates(entityId, false, false)
+    }, 5000)
+  }
+}
+
+// Process entity metadata packet
+function handleEntityMetadata (packet: { entityId: number, metadata: Array<{ key: number, type: string, value: number }> }) {
+  const { entityId, metadata } = packet
+
+  // Find shared flags in metadata
+  const flagsData = metadata.find(meta => meta.key === SHARED_FLAGS_KEY &&
+    meta.type === 'byte')
+
+  // Update fire state if flags were found
+  if (flagsData) {
+    const wasOnFire = appViewer.playerState.reactive.onFire
+    appViewer.playerState.reactive.onFire = (flagsData.value & ENTITY_FLAGS.ON_FIRE) !== 0
+  }
+}
diff --git a/src/react/FireRenderer.tsx b/src/react/FireRenderer.tsx
new file mode 100644
index 00000000..3a188558
--- /dev/null
+++ b/src/react/FireRenderer.tsx
@@ -0,0 +1,152 @@
+/* eslint-disable no-await-in-loop */
+import { useSnapshot } from 'valtio'
+import { useEffect, useState } from 'react'
+import { getLoadedImage } from 'mc-assets/dist/utils'
+import { createCanvas } from 'renderer/viewer/lib/utils'
+
+const TEXTURE_UPDATE_INTERVAL = 100 // 5 times per second
+
+export default () => {
+  const { onFire, perspective } = useSnapshot(appViewer.playerState.reactive)
+  const [fireTextures, setFireTextures] = useState<string[]>([])
+  const [currentTextureIndex, setCurrentTextureIndex] = useState(0)
+
+  useEffect(() => {
+    let animationFrameId: number
+    let lastTextureUpdate = 0
+
+    const updateTexture = (timestamp: number) => {
+      if (onFire && fireTextures.length > 0) {
+        if (timestamp - lastTextureUpdate >= TEXTURE_UPDATE_INTERVAL) {
+          setCurrentTextureIndex(prev => (prev + 1) % fireTextures.length)
+          lastTextureUpdate = timestamp
+        }
+      }
+      animationFrameId = requestAnimationFrame(updateTexture)
+    }
+
+    animationFrameId = requestAnimationFrame(updateTexture)
+    return () => cancelAnimationFrame(animationFrameId)
+  }, [onFire, fireTextures])
+
+  useEffect(() => {
+    const loadTextures = async () => {
+      const fireImageUrls: string[] = []
+
+      const { resourcesManager } = appViewer
+      const { blocksAtlasParser } = resourcesManager
+      if (!blocksAtlasParser?.atlas?.latest) {
+        console.warn('FireRenderer: Blocks atlas parser not available')
+        return
+      }
+
+      const keys = Object.keys(blocksAtlasParser.atlas.latest.textures).filter(key => /^fire_\d+$/.exec(key))
+      for (const key of keys) {
+        const textureInfo = blocksAtlasParser.getTextureInfo(key) as { u: number, v: number, width?: number, height?: number }
+        if (textureInfo) {
+          const defaultSize = blocksAtlasParser.atlas.latest.tileSize
+          const imageWidth = blocksAtlasParser.atlas.latest.width
+          const imageHeight = blocksAtlasParser.atlas.latest.height
+          const textureWidth = textureInfo.width ?? defaultSize
+          const textureHeight = textureInfo.height ?? defaultSize
+
+          // Create a temporary canvas for the full texture
+          const tempCanvas = createCanvas(textureWidth, textureHeight)
+          const tempCtx = tempCanvas.getContext('2d')
+          if (tempCtx && blocksAtlasParser.latestImage) {
+            const image = await getLoadedImage(blocksAtlasParser.latestImage)
+            tempCtx.drawImage(
+              image,
+              textureInfo.u * imageWidth,
+              textureInfo.v * imageHeight,
+              textureWidth,
+              textureHeight,
+              0,
+              0,
+              textureWidth,
+              textureHeight
+            )
+
+            // Create final canvas with only top 20% of the texture
+            const finalHeight = Math.ceil(textureHeight * 0.4)
+            const canvas = createCanvas(textureWidth, finalHeight)
+            const ctx = canvas.getContext('2d')
+            if (ctx) {
+              // Draw only the top portion
+              ctx.drawImage(
+                tempCanvas,
+                0,
+                0, // Start from top
+                textureWidth,
+                finalHeight,
+                0,
+                0,
+                textureWidth,
+                finalHeight
+              )
+
+              const blob = await canvas.convertToBlob()
+              const url = URL.createObjectURL(blob)
+              fireImageUrls.push(url)
+            }
+          }
+        }
+      }
+
+      setFireTextures(fireImageUrls)
+    }
+
+    // Load textures initially
+    if (appViewer.resourcesManager.currentResources) {
+      void loadTextures()
+    }
+
+    // Set up listener for texture updates
+    const onAssetsUpdated = () => {
+      void loadTextures()
+    }
+    appViewer.resourcesManager.on('assetsTexturesUpdated', onAssetsUpdated)
+
+    // Cleanup
+    return () => {
+      appViewer.resourcesManager.off('assetsTexturesUpdated', onAssetsUpdated)
+      // Cleanup texture URLs
+      for (const url of fireTextures) URL.revokeObjectURL(url)
+    }
+  }, [])
+
+  if (!onFire || fireTextures.length === 0 || perspective !== 'first_person') return null
+
+  return (
+    <div
+      className='fire-renderer-container'
+      style={{
+        position: 'fixed',
+        left: 0,
+        right: 0,
+        bottom: 0,
+        height: '20dvh',
+        pointerEvents: 'none',
+        display: 'flex',
+        justifyContent: 'center',
+        alignItems: 'flex-end',
+        overflow: 'hidden'
+      }}
+    >
+      <div
+        style={{
+          position: 'absolute',
+          width: '100%',
+          height: '100%',
+          backgroundImage: `url(${fireTextures[currentTextureIndex]})`,
+          backgroundSize: '50% 100%',
+          backgroundPosition: 'center',
+          backgroundRepeat: 'repeat-x',
+          opacity: 0.7,
+          filter: 'brightness(1.2) contrast(1.2)',
+          mixBlendMode: 'screen'
+        }}
+      />
+    </div>
+  )
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index b15cb79d..4f8c4541 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -66,6 +66,7 @@ import CreditsAboutModal from './react/CreditsAboutModal'
 import GlobalOverlayHints from './react/GlobalOverlayHints'
 import FullscreenTime from './react/FullscreenTime'
 import StorageConflictModal from './react/StorageConflictModal'
+import FireRenderer from './react/FireRenderer'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -171,6 +172,7 @@ const InGameUi = () => {
           <VoiceMicrophone />
           <ChunksDebugScreen />
           <RendererDebugMenu />
+          {!disabledUiParts.includes('fire') && <FireRenderer />}
         </PerComponentErrorBoundary>
       </div>
 

From 53cbff7699d5255974a09e5f1e50b02759116a63 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 8 Aug 2025 18:37:10 +0300
Subject: [PATCH 697/753] dont conflict fire with chat

---
 src/react/FireRenderer.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/react/FireRenderer.tsx b/src/react/FireRenderer.tsx
index 3a188558..20ad4606 100644
--- a/src/react/FireRenderer.tsx
+++ b/src/react/FireRenderer.tsx
@@ -130,7 +130,8 @@ export default () => {
         display: 'flex',
         justifyContent: 'center',
         alignItems: 'flex-end',
-        overflow: 'hidden'
+        overflow: 'hidden',
+        zIndex: -1
       }}
     >
       <div

From 353ba2ecb33a60638f17fac8a8266dda690dd11a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 8 Aug 2025 21:52:55 +0300
Subject: [PATCH 698/753] fix: some blocks textures were not update in hotbar
 after texturepack change

---
 renderer/viewer/three/renderSlot.ts | 20 +++++++++++++-------
 src/inventoryWindows.ts             |  1 +
 src/react/HotbarRenderApp.tsx       |  3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/renderer/viewer/three/renderSlot.ts b/renderer/viewer/three/renderSlot.ts
index d82e58e3..321633eb 100644
--- a/renderer/viewer/three/renderSlot.ts
+++ b/renderer/viewer/three/renderSlot.ts
@@ -10,11 +10,11 @@ export type ResolvedItemModelRender = {
 
 export const renderSlot = (model: ResolvedItemModelRender, resourcesManager: ResourcesManagerCommon, debugIsQuickbar = false, fullBlockModelSupport = false): {
   texture: string,
-  blockData?: Record<string, { slice, path }> & { resolvedModel: BlockModel },
-  scale?: number,
-  slice?: number[],
-  modelName?: string,
-} | undefined => {
+  blockData: Record<string, { slice, path }> & { resolvedModel: BlockModel } | null,
+  scale: number | null,
+  slice: number[] | null,
+  modelName: string | null,
+} => {
   let itemModelName = model.modelName
   const isItem = loadedData.itemsByName[itemModelName]
 
@@ -37,6 +37,8 @@ export const renderSlot = (model: ResolvedItemModelRender, resourcesManager: Res
         texture: 'gui',
         slice: [x, y, atlas.tileSize, atlas.tileSize],
         scale: 0.25,
+        blockData: null,
+        modelName: null
       }
     }
   }
@@ -63,14 +65,18 @@ export const renderSlot = (model: ResolvedItemModelRender, resourcesManager: Res
     return {
       texture: itemTexture.type,
       slice: itemTexture.slice,
-      modelName: itemModelName
+      modelName: itemModelName,
+      blockData: null,
+      scale: null
     }
   } else {
     // is block
     return {
       texture: 'blocks',
       blockData: itemTexture,
-      modelName: itemModelName
+      modelName: itemModelName,
+      slice: null,
+      scale: null
     }
   }
 }
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index bc7dcbaf..a9f89d1b 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -259,6 +259,7 @@ export const upInventoryItems = (isInventory: boolean, invWindow = lastWindow) =
   // inv.pwindow.inv.slots[2].blockData = getBlockData('dirt')
   const customSlots = mapSlots((isInventory ? bot.inventory : bot.currentWindow)!.slots)
   invWindow.pwindow.setSlots(customSlots)
+  return customSlots
 }
 
 export const onModalClose = (callback: () => any) => {
diff --git a/src/react/HotbarRenderApp.tsx b/src/react/HotbarRenderApp.tsx
index 6b6e3207..c782e6ef 100644
--- a/src/react/HotbarRenderApp.tsx
+++ b/src/react/HotbarRenderApp.tsx
@@ -115,7 +115,7 @@ const HotbarInner = () => {
     container.current.appendChild(inv.canvas)
     const upHotbarItems = () => {
       if (!appViewer.resourcesManager?.itemsAtlasParser) return
-      upInventoryItems(true, inv)
+      globalThis.debugHotbarItems = upInventoryItems(true, inv)
     }
 
     canvasManager.canvas.onclick = (e) => {
@@ -127,6 +127,7 @@ const HotbarInner = () => {
       }
     }
 
+    globalThis.debugUpHotbarItems = upHotbarItems
     upHotbarItems()
     bot.inventory.on('updateSlot', upHotbarItems)
     appViewer.resourcesManager.on('assetsTexturesUpdated', upHotbarItems)

From fb395041b9e40449819e5a8d0361f06264bfa80b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 11 Aug 2025 01:39:08 +0300
Subject: [PATCH 699/753] fix: fix on 1.18.2 many blocks like mushrom blocks,
 fence gates, deepslate, basalt, copper stuff like ore, infested stone, cakes
 and tinted glass was resulting in instant breaking on the client dev: add
 debugTestPing

---
 scripts/makeOptimizedMcData.mjs |  7 +++--
 src/mineflayer/mc-protocol.ts   | 49 ++++++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/scripts/makeOptimizedMcData.mjs b/scripts/makeOptimizedMcData.mjs
index 0b5752d8..76e0f1c2 100644
--- a/scripts/makeOptimizedMcData.mjs
+++ b/scripts/makeOptimizedMcData.mjs
@@ -90,16 +90,19 @@ const dataTypeBundling = {
   },
   blocks: {
     arrKey: 'name',
-    processData(current, prev) {
+    processData(current, prev, _, version) {
       for (const block of current) {
+        const prevBlock = prev?.find(x => x.name === block.name)
         if (block.transparent) {
           const forceOpaque = block.name.includes('shulker_box') || block.name.match(/^double_.+_slab\d?$/) || ['melon_block', 'lit_pumpkin', 'lit_redstone_ore', 'lit_furnace'].includes(block.name)
 
-          const prevBlock = prev?.find(x => x.name === block.name)
           if (forceOpaque || (prevBlock && !prevBlock.transparent)) {
             block.transparent = false
           }
         }
+        if (block.hardness === 0 && prevBlock && prevBlock.hardness > 0) {
+          block.hardness = prevBlock.hardness
+        }
       }
     }
     // ignoreRemoved: true,
diff --git a/src/mineflayer/mc-protocol.ts b/src/mineflayer/mc-protocol.ts
index 2376cd03..a0348c5d 100644
--- a/src/mineflayer/mc-protocol.ts
+++ b/src/mineflayer/mc-protocol.ts
@@ -1,8 +1,11 @@
+import net from 'net'
 import { Client } from 'minecraft-protocol'
 import { appQueryParams } from '../appParams'
 import { downloadAllMinecraftData, getVersionAutoSelect } from '../connect'
 import { gameAdditionalState } from '../globalState'
 import { ProgressReporter } from '../core/progressReporter'
+import { parseServerAddress } from '../parseServerAddress'
+import { getCurrentProxy } from '../react/ServersList'
 import { pingServerVersion, validatePacket } from './minecraft-protocol-extra'
 import { getWebsocketStream } from './websocket-core'
 
@@ -35,7 +38,7 @@ setInterval(() => {
 }, 1000)
 
 
-export const getServerInfo = async (ip: string, port?: number, preferredVersion = getVersionAutoSelect(), ping = false, progressReporter?: ProgressReporter) => {
+export const getServerInfo = async (ip: string, port?: number, preferredVersion = getVersionAutoSelect(), ping = false, progressReporter?: ProgressReporter, setProxyParams?: ProxyParams) => {
   await downloadAllMinecraftData()
   const isWebSocket = ip.startsWith('ws://') || ip.startsWith('wss://')
   let stream
@@ -43,6 +46,8 @@ export const getServerInfo = async (ip: string, port?: number, preferredVersion
     progressReporter?.setMessage('Connecting to WebSocket server')
     stream = (await getWebsocketStream(ip)).mineflayerStream
     progressReporter?.setMessage('WebSocket connected. Ping packet sent, waiting for response')
+  } else if (setProxyParams) {
+    setProxy(setProxyParams)
   }
   window.setLoadingMessage = (message?: string) => {
     if (message === undefined) {
@@ -59,3 +64,45 @@ export const getServerInfo = async (ip: string, port?: number, preferredVersion
     window.setLoadingMessage = undefined
   })
 }
+
+globalThis.debugTestPing = async (ip: string) => {
+  const parsed = parseServerAddress(ip, false)
+  const result = await getServerInfo(parsed.host, parsed.port ? Number(parsed.port) : undefined, undefined, true, undefined, { address: getCurrentProxy(), })
+  console.log('result', result)
+  return result
+}
+
+export const getDefaultProxyParams = () => {
+  return {
+    headers: {
+      Authorization: `Bearer ${new URLSearchParams(location.search).get('token') ?? ''}`
+    }
+  }
+}
+
+export type ProxyParams = {
+  address?: string
+  headers?: Record<string, string>
+}
+
+export const setProxy = (proxyParams: ProxyParams) => {
+  if (proxyParams.address?.startsWith(':')) {
+    proxyParams.address = `${location.protocol}//${location.hostname}${proxyParams.address}`
+  }
+  if (proxyParams.address && location.port !== '80' && location.port !== '443' && !/:\d+$/.test(proxyParams.address)) {
+    const https = proxyParams.address.startsWith('https://') || location.protocol === 'https:'
+    proxyParams.address = `${proxyParams.address}:${https ? 443 : 80}`
+  }
+
+  const parsedProxy = parseServerAddress(proxyParams.address, false)
+  const proxy = { host: parsedProxy.host, port: parsedProxy.port }
+  proxyParams.headers ??= getDefaultProxyParams().headers
+  net['setProxy']({
+    hostname: proxy.host,
+    port: proxy.port,
+    headers: proxyParams.headers
+  })
+  return {
+    proxy
+  }
+}

From e7c358d3fc0497b66fa25c70a401d2aed4be3294 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 11 Aug 2025 03:12:05 +0300
Subject: [PATCH 700/753] feat: add
 `minecraft-web-client:block-interactions-customization`

---
 package.json          |  2 +-
 pnpm-lock.yaml        | 20 ++++++++++----------
 src/customChannels.ts | 31 +++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 257fff7c..b719b877 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "mc-assets": "^0.2.62",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
-    "mineflayer-mouse": "^0.1.14",
+    "mineflayer-mouse": "^0.1.17",
     "mineflayer-pathfinder": "^2.4.4",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 132ef32c..da2b3912 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -343,8 +343,8 @@ importers:
         specifier: github:zardoy/mineflayer#gen-the-master
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.14
-        version: 0.1.14
+        specifier: ^0.1.17
+        version: 0.1.17
       mineflayer-pathfinder:
         specifier: ^2.4.4
         version: 2.4.5
@@ -6667,8 +6667,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.14:
-    resolution: {integrity: sha512-DjytRMlRLxR44GqZ6udMgbMO4At7Ura5TQC80exRhzkfptyCGLTWzXaf0oeXSNYkNMnaaEv4XP/9YRwuvL+rsQ==}
+  mineflayer-mouse@0.1.17:
+    resolution: {integrity: sha512-0eCR8pnGb42Qd9QmAxOjl0PhA5Fa+9+6H1G/YsbsO5rg5mDf94Tusqp/8NAGLPQCPVDzbarLskXdjR3h0E0bEQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer-pathfinder@2.4.5:
@@ -10294,7 +10294,7 @@ snapshots:
       '@babel/parser': 7.26.9
       '@babel/template': 7.26.9
       '@babel/types': 7.26.9
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -12864,7 +12864,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 6.1.0(typescript@5.5.4)
       '@typescript-eslint/utils': 6.1.0(eslint@8.57.1)(typescript@5.5.4)
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       eslint: 8.57.1
       ts-api-utils: 1.4.3(typescript@5.5.4)
     optionalDependencies:
@@ -12896,7 +12896,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.21.0
       '@typescript-eslint/visitor-keys': 6.21.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -12911,7 +12911,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 8.26.0
       '@typescript-eslint/visitor-keys': 8.26.0
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -17338,7 +17338,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.14:
+  mineflayer-mouse@0.1.17:
     dependencies:
       change-case: 5.4.4
       debug: 4.4.1
@@ -18457,7 +18457,7 @@ snapshots:
   puppeteer-core@2.1.1:
     dependencies:
       '@types/mime-types': 2.1.4
-      debug: 4.4.0(supports-color@8.1.1)
+      debug: 4.4.1
       extract-zip: 1.7.0
       https-proxy-agent: 4.0.0
       mime: 2.6.0
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 57c057d5..3f6a8217 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -15,6 +15,7 @@ export default () => {
     registerMediaChannels()
     registerSectionAnimationChannels()
     registeredJeiChannel()
+    registerBlockInteractionsCustomizationChannel()
   })
 }
 
@@ -32,6 +33,36 @@ const registerChannel = (channelName: string, packetStructure: any[], handler: (
   console.debug(`registered custom channel ${channelName} channel`)
 }
 
+const registerBlockInteractionsCustomizationChannel = () => {
+  const CHANNEL_NAME = 'minecraft-web-client:block-interactions-customization'
+  const packetStructure = [
+    'container',
+    [
+      {
+        name: 'newConfiguration',
+        type: ['pstring', { countType: 'i16' }]
+      },
+    ]
+  ]
+
+  registerChannel(CHANNEL_NAME, packetStructure, (data) => {
+    const config = JSON.parse(data.newConfiguration)
+    if (config.customBreakTime !== undefined && Object.values(config.customBreakTime).every(x => typeof x === 'number')) {
+      bot.mouse.customBreakTime = config.customBreakTime
+    }
+    if (config.customBreakTimeToolAllowance !== undefined) {
+      bot.mouse.customBreakTimeToolAllowance = new Set(config.customBreakTimeToolAllowance)
+    }
+
+    if (config.blockPlacePrediction !== undefined) {
+      bot.mouse.settings.blockPlacePrediction = config.blockPlacePrediction
+    }
+    if (config.blockPlacePredictionDelay !== undefined) {
+      bot.mouse.settings.blockPlacePredictionDelay = config.blockPlacePredictionDelay
+    }
+  }, true)
+}
+
 const registerBlockModelsChannel = () => {
   const CHANNEL_NAME = 'minecraft-web-client:blockmodels'
 

From cdd8c31a0e9261ee57fb66ff8ca5af0e074bff78 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 11 Aug 2025 21:21:44 +0300
Subject: [PATCH 701/753] fix: fix player colored username rendering, fix
 sometimes skin was overriden

---
 renderer/viewer/three/entities.ts | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 6c6f8900..24f64803 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -141,7 +141,7 @@ const addNametag = (entity, options: { fontFamily: string }, mesh, version: stri
     const canvas = getUsernameTexture(entity, options, version)
     const tex = new THREE.Texture(canvas)
     tex.needsUpdate = true
-    let nameTag
+    let nameTag: THREE.Object3D
     if (entity.nameTagFixed) {
       const geometry = new THREE.PlaneGeometry()
       const material = new THREE.MeshBasicMaterial({ map: tex })
@@ -171,6 +171,7 @@ const addNametag = (entity, options: { fontFamily: string }, mesh, version: stri
     nameTag.name = 'nametag'
 
     mesh.add(nameTag)
+    return nameTag
   }
 }
 
@@ -494,6 +495,10 @@ export class Entities {
   // todo true/undefined doesnt reset the skin to the default one
   // eslint-disable-next-line max-params
   async updatePlayerSkin (entityId: string | number, username: string | undefined, uuidCache: string | undefined, skinUrl: string | true, capeUrl: string | true | undefined = undefined) {
+    const isCustomSkin = skinUrl !== stevePngUrl
+    if (isCustomSkin) {
+      this.loadedSkinEntityIds.add(String(entityId))
+    }
     if (uuidCache) {
       if (typeof skinUrl === 'string' || typeof capeUrl === 'string') this.uuidPerSkinUrlsCache[uuidCache] = {}
       if (typeof skinUrl === 'string') this.uuidPerSkinUrlsCache[uuidCache].skinUrl = skinUrl
@@ -912,20 +917,14 @@ export class Entities {
         mesh = wrapper
 
         if (entity.username) {
-          // todo proper colors
-          const nameTag = new NameTagObject(fromFormattedString(entity.username).text, {
-            font: `48px ${this.entitiesOptions.fontFamily}`,
-          })
-          nameTag.position.y = playerObject.position.y + playerObject.scale.y * 16 + 3
-          nameTag.renderOrder = 1000
-
-          nameTag.name = 'nametag'
-
-          //@ts-expect-error
-          wrapper.add(nameTag)
+          const nametag = addNametag(entity, { fontFamily: 'mojangles' }, wrapper, this.worldRenderer.version)
+          if (nametag) {
+            nametag.position.y = playerObject.position.y + playerObject.scale.y * 16 + 3
+            nametag.scale.multiplyScalar(12)
+          }
         }
       } else {
-        mesh = getEntityMesh(entity, this.worldRenderer, this.entitiesOptions, overrides)
+        mesh = getEntityMesh(entity, this.worldRenderer, this.entitiesOptions, { ...overrides, customModel: entity['customModel'] })
       }
       if (!mesh) return
       mesh.name = 'mesh'
@@ -1181,8 +1180,7 @@ export class Entities {
     const cameraPos = this.worldRenderer.cameraObject.position
     const distance = mesh.position.distanceTo(cameraPos)
     if (distance < MAX_DISTANCE_SKIN_LOAD && distance < (this.worldRenderer.viewDistance * 16)) {
-      if (this.loadedSkinEntityIds.has(entityId)) return
-      this.loadedSkinEntityIds.add(entityId)
+      if (this.loadedSkinEntityIds.has(String(entityId))) return
       void this.updatePlayerSkin(entityId, mesh.playerObject.realUsername, mesh.playerObject.realPlayerUuid, true, true)
     }
   }

From 0a474e67803827cdd657b135ba6a7380091cdab4 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 12 Aug 2025 06:27:06 +0300
Subject: [PATCH 702/753] feat: add custom experimental waypints impl

---
 experiments/three-labels.html               |   5 +
 experiments/three-labels.ts                 |  67 ++++
 renderer/viewer/three/graphicsBackend.ts    |   3 +
 renderer/viewer/three/waypointSprite.ts     | 394 ++++++++++++++++++++
 renderer/viewer/three/waypoints.ts          | 142 +++++++
 renderer/viewer/three/worldrendererThree.ts |  25 +-
 src/customChannels.ts                       |  57 +++
 7 files changed, 685 insertions(+), 8 deletions(-)
 create mode 100644 experiments/three-labels.html
 create mode 100644 experiments/three-labels.ts
 create mode 100644 renderer/viewer/three/waypointSprite.ts
 create mode 100644 renderer/viewer/three/waypoints.ts

diff --git a/experiments/three-labels.html b/experiments/three-labels.html
new file mode 100644
index 00000000..2b25bc23
--- /dev/null
+++ b/experiments/three-labels.html
@@ -0,0 +1,5 @@
+<script type="module" src="three-labels.ts"></script>
+<style>
+  body { margin: 0; }
+  canvas { display: block; }
+</style>
diff --git a/experiments/three-labels.ts b/experiments/three-labels.ts
new file mode 100644
index 00000000..b69dc95b
--- /dev/null
+++ b/experiments/three-labels.ts
@@ -0,0 +1,67 @@
+import * as THREE from 'three'
+import { FirstPersonControls } from 'three/addons/controls/FirstPersonControls.js'
+import { createWaypointSprite, WAYPOINT_CONFIG } from '../renderer/viewer/three/waypointSprite'
+
+// Create scene, camera and renderer
+const scene = new THREE.Scene()
+const camera = new THREE.PerspectiveCamera(75, window.innerWidth / window.innerHeight, 0.1, 1000)
+const renderer = new THREE.WebGLRenderer({ antialias: true })
+renderer.setSize(window.innerWidth, window.innerHeight)
+document.body.appendChild(renderer.domElement)
+
+// Add FirstPersonControls
+const controls = new FirstPersonControls(camera, renderer.domElement)
+controls.lookSpeed = 0.1
+controls.movementSpeed = 10
+controls.lookVertical = true
+controls.constrainVertical = true
+controls.verticalMin = 0.1
+controls.verticalMax = Math.PI - 0.1
+
+// Position camera
+camera.position.y = 1.6 // Typical eye height
+camera.lookAt(0, 1.6, -1)
+
+// Create a helper grid and axes
+const grid = new THREE.GridHelper(20, 20)
+scene.add(grid)
+const axes = new THREE.AxesHelper(5)
+scene.add(axes)
+
+// Create waypoint sprite via utility
+const waypoint = createWaypointSprite({
+  position: new THREE.Vector3(0, 0, -5),
+  color: 0xff0000,
+  label: 'Target',
+})
+scene.add(waypoint.group)
+
+// Use built-in offscreen arrow from utils
+waypoint.enableOffscreenArrow(true)
+waypoint.setArrowParent(scene)
+
+// Animation loop
+function animate() {
+  requestAnimationFrame(animate)
+
+  const delta = Math.min(clock.getDelta(), 0.1)
+  controls.update(delta)
+
+  // Unified camera update (size, distance text, arrow, visibility)
+  const sizeVec = renderer.getSize(new THREE.Vector2())
+  waypoint.updateForCamera(camera.position, camera, sizeVec.width, sizeVec.height)
+
+  renderer.render(scene, camera)
+}
+
+// Handle window resize
+window.addEventListener('resize', () => {
+  camera.aspect = window.innerWidth / window.innerHeight
+  camera.updateProjectionMatrix()
+  renderer.setSize(window.innerWidth, window.innerHeight)
+})
+
+// Add clock for controls
+const clock = new THREE.Clock()
+
+animate()
diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index 5ea89b34..92b6ec66 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -44,6 +44,9 @@ const getBackendMethods = (worldRenderer: WorldRendererThree) => {
     shakeFromDamage: worldRenderer.cameraShake.shakeFromDamage.bind(worldRenderer.cameraShake),
     onPageInteraction: worldRenderer.media.onPageInteraction.bind(worldRenderer.media),
     downloadMesherLog: worldRenderer.downloadMesherLog.bind(worldRenderer),
+
+    addWaypoint: worldRenderer.waypoints.addWaypoint.bind(worldRenderer.waypoints),
+    removeWaypoint: worldRenderer.waypoints.removeWaypoint.bind(worldRenderer.waypoints),
   }
 }
 
diff --git a/renderer/viewer/three/waypointSprite.ts b/renderer/viewer/three/waypointSprite.ts
new file mode 100644
index 00000000..7c8cf1f6
--- /dev/null
+++ b/renderer/viewer/three/waypointSprite.ts
@@ -0,0 +1,394 @@
+import * as THREE from 'three'
+
+// Centralized visual configuration (in screen pixels)
+export const WAYPOINT_CONFIG = {
+  // Target size in screen pixels (this controls the final sprite size)
+  TARGET_SCREEN_PX: 150,
+  // Canvas size for internal rendering (keep power of 2 for textures)
+  CANVAS_SIZE: 256,
+  // Relative positions in canvas (0-1)
+  LAYOUT: {
+    DOT_Y: 0.3,
+    NAME_Y: 0.45,
+    DISTANCE_Y: 0.55,
+  },
+  // Multiplier for canvas internal resolution to keep text crisp
+  CANVAS_SCALE: 2,
+  ARROW: {
+    enabledDefault: false,
+    pixelSize: 30,
+    paddingPx: 50,
+  },
+}
+
+export type WaypointSprite = {
+  group: THREE.Group
+  sprite: THREE.Sprite
+  // Offscreen arrow controls
+  enableOffscreenArrow: (enabled: boolean) => void
+  setArrowParent: (parent: THREE.Object3D | null) => void
+  // Convenience combined updater
+  updateForCamera: (
+    cameraPosition: THREE.Vector3,
+    camera: THREE.PerspectiveCamera,
+    viewportWidthPx: number,
+    viewportHeightPx: number
+  ) => boolean
+  // Utilities
+  setColor: (color: number) => void
+  setLabel: (label?: string) => void
+  updateDistanceText: (label: string, distanceText: string) => void
+  setVisible: (visible: boolean) => void
+  setPosition: (x: number, y: number, z: number) => void
+  dispose: () => void
+}
+
+export function createWaypointSprite (options: {
+  position: THREE.Vector3 | { x: number, y: number, z: number },
+  color?: number,
+  label?: string,
+  depthTest?: boolean,
+  // Y offset in world units used by updateScaleWorld only (screen-pixel API ignores this)
+  labelYOffset?: number,
+}): WaypointSprite {
+  const color = options.color ?? 0xFF_00_00
+  const depthTest = options.depthTest ?? false
+  const labelYOffset = options.labelYOffset ?? 1.5
+
+  // Build combined sprite
+  const sprite = createCombinedSprite(color, options.label ?? '', '0m', depthTest)
+  sprite.renderOrder = 10
+  let currentLabel = options.label ?? ''
+
+  // Offscreen arrow (detached by default)
+  let arrowSprite: THREE.Sprite | undefined
+  let arrowParent: THREE.Object3D | null = null
+  let arrowEnabled = WAYPOINT_CONFIG.ARROW.enabledDefault
+
+  // Group for easy add/remove
+  const group = new THREE.Group()
+  group.add(sprite)
+
+  // Initial position
+  const { x, y, z } = options.position
+  group.position.set(x, y, z)
+
+  function setColor (newColor: number) {
+    const canvas = drawCombinedCanvas(newColor, currentLabel, '0m')
+    const texture = new THREE.CanvasTexture(canvas)
+    const mat = sprite.material
+    mat.map?.dispose()
+    mat.map = texture
+    mat.needsUpdate = true
+  }
+
+  function setLabel (newLabel?: string) {
+    currentLabel = newLabel ?? ''
+    const canvas = drawCombinedCanvas(color, currentLabel, '0m')
+    const texture = new THREE.CanvasTexture(canvas)
+    const mat = sprite.material
+    mat.map?.dispose()
+    mat.map = texture
+    mat.needsUpdate = true
+  }
+
+  function updateDistanceText (label: string, distanceText: string) {
+    const canvas = drawCombinedCanvas(color, label, distanceText)
+    const texture = new THREE.CanvasTexture(canvas)
+    const mat = sprite.material
+    mat.map?.dispose()
+    mat.map = texture
+    mat.needsUpdate = true
+  }
+
+  function setVisible (visible: boolean) {
+    sprite.visible = visible
+  }
+
+  function setPosition (nx: number, ny: number, nz: number) {
+    group.position.set(nx, ny, nz)
+  }
+
+  // Keep constant pixel size on screen using global config
+  function updateScaleScreenPixels (
+    cameraPosition: THREE.Vector3,
+    cameraFov: number,
+    distance: number,
+    viewportHeightPx: number
+  ) {
+    const vFovRad = cameraFov * Math.PI / 180
+    const worldUnitsPerScreenHeightAtDist = Math.tan(vFovRad / 2) * 2 * distance
+    // Use configured target screen size
+    const scale = worldUnitsPerScreenHeightAtDist * (WAYPOINT_CONFIG.TARGET_SCREEN_PX / viewportHeightPx)
+    sprite.scale.set(scale, scale, 1)
+  }
+
+  function ensureArrow () {
+    if (arrowSprite) return
+    const size = 128
+    const canvas = document.createElement('canvas')
+    canvas.width = size
+    canvas.height = size
+    const ctx = canvas.getContext('2d')!
+    ctx.clearRect(0, 0, size, size)
+    ctx.beginPath()
+    ctx.moveTo(size * 0.2, size * 0.5)
+    ctx.lineTo(size * 0.8, size * 0.5)
+    ctx.lineTo(size * 0.5, size * 0.2)
+    ctx.closePath()
+    ctx.lineWidth = 4
+    ctx.strokeStyle = 'black'
+    ctx.stroke()
+    ctx.fillStyle = 'white'
+    ctx.fill()
+    const texture = new THREE.CanvasTexture(canvas)
+    const material = new THREE.SpriteMaterial({ map: texture, transparent: true, depthTest: false, depthWrite: false })
+    arrowSprite = new THREE.Sprite(material)
+    arrowSprite.renderOrder = 12
+    arrowSprite.visible = false
+    if (arrowParent) arrowParent.add(arrowSprite)
+  }
+
+  function enableOffscreenArrow (enabled: boolean) {
+    arrowEnabled = enabled
+    if (!enabled && arrowSprite) arrowSprite.visible = false
+  }
+
+  function setArrowParent (parent: THREE.Object3D | null) {
+    if (arrowSprite?.parent) arrowSprite.parent.remove(arrowSprite)
+    arrowParent = parent
+    if (arrowSprite && parent) parent.add(arrowSprite)
+  }
+
+  function updateOffscreenArrow (
+    camera: THREE.PerspectiveCamera,
+    viewportWidthPx: number,
+    viewportHeightPx: number
+  ): boolean {
+    if (!arrowEnabled) return true
+    ensureArrow()
+    if (!arrowSprite) return true
+
+    // Build camera basis using camera.up to respect custom orientations
+    const forward = new THREE.Vector3()
+    camera.getWorldDirection(forward) // camera look direction
+    const upWorld = camera.up.clone().normalize()
+    const right = new THREE.Vector3().copy(forward).cross(upWorld).normalize()
+    const upCam = new THREE.Vector3().copy(right).cross(forward).normalize()
+
+    // Vector from camera to waypoint
+    const camPos = new THREE.Vector3().setFromMatrixPosition(camera.matrixWorld)
+    const toWp = new THREE.Vector3(group.position.x, group.position.y, group.position.z).sub(camPos)
+
+    // Components in camera basis
+    const z = toWp.dot(forward)
+    const x = toWp.dot(right)
+    const y = toWp.dot(upCam)
+
+    const aspect = viewportWidthPx / viewportHeightPx
+    const vFovRad = camera.fov * Math.PI / 180
+    const hFovRad = 2 * Math.atan(Math.tan(vFovRad / 2) * aspect)
+
+    // Determine if waypoint is inside view frustum using angular checks
+    const thetaX = Math.atan2(x, z)
+    const thetaY = Math.atan2(y, z)
+    const visible = z > 0 && Math.abs(thetaX) <= hFovRad / 2 && Math.abs(thetaY) <= vFovRad / 2
+    if (visible) {
+      arrowSprite.visible = false
+      return true
+    }
+
+    // Direction on screen in normalized frustum units
+    let rx = thetaX / (hFovRad / 2)
+    let ry = thetaY / (vFovRad / 2)
+
+    // If behind the camera, snap to dominant axis to avoid confusing directions
+    if (z <= 0) {
+      if (Math.abs(rx) > Math.abs(ry)) {
+        rx = Math.sign(rx)
+        ry = 0
+      } else {
+        rx = 0
+        ry = Math.sign(ry)
+      }
+    }
+
+    // Place on the rectangle border [-1,1]x[-1,1]
+    const s = Math.max(Math.abs(rx), Math.abs(ry)) || 1
+    let ndcX = rx / s
+    let ndcY = ry / s
+
+    // Apply padding in pixel space by clamping
+    const padding = WAYPOINT_CONFIG.ARROW.paddingPx
+    const pxX = ((ndcX + 1) * 0.5) * viewportWidthPx
+    const pxY = ((1 - ndcY) * 0.5) * viewportHeightPx
+    const clampedPxX = Math.min(Math.max(pxX, padding), viewportWidthPx - padding)
+    const clampedPxY = Math.min(Math.max(pxY, padding), viewportHeightPx - padding)
+    ndcX = (clampedPxX / viewportWidthPx) * 2 - 1
+    ndcY = -(clampedPxY / viewportHeightPx) * 2 + 1
+
+    // Compute world position at a fixed distance in front of the camera using camera basis
+    const placeDist = Math.max(2, camera.near * 4)
+    const halfPlaneHeight = Math.tan(vFovRad / 2) * placeDist
+    const halfPlaneWidth = halfPlaneHeight * aspect
+    const pos = camPos.clone()
+      .add(forward.clone().multiplyScalar(placeDist))
+      .add(right.clone().multiplyScalar(ndcX * halfPlaneWidth))
+      .add(upCam.clone().multiplyScalar(ndcY * halfPlaneHeight))
+
+    // Update arrow sprite
+    arrowSprite.visible = true
+    arrowSprite.position.copy(pos)
+
+    // Angle for rotation relative to screen right/up (derived from camera up vector)
+    const angle = Math.atan2(ry, rx)
+    arrowSprite.material.rotation = angle - Math.PI / 2
+
+    // Constant pixel size for arrow (use fixed placement distance)
+    const worldUnitsPerScreenHeightAtDist = Math.tan(vFovRad / 2) * 2 * placeDist
+    const sPx = worldUnitsPerScreenHeightAtDist * (WAYPOINT_CONFIG.ARROW.pixelSize / viewportHeightPx)
+    arrowSprite.scale.set(sPx, sPx, 1)
+    return false
+  }
+
+  function computeDistance (cameraPosition: THREE.Vector3): number {
+    return cameraPosition.distanceTo(group.position)
+  }
+
+  function updateForCamera (
+    cameraPosition: THREE.Vector3,
+    camera: THREE.PerspectiveCamera,
+    viewportWidthPx: number,
+    viewportHeightPx: number
+  ): boolean {
+    const distance = computeDistance(cameraPosition)
+    // Keep constant pixel size
+    updateScaleScreenPixels(cameraPosition, camera.fov, distance, viewportHeightPx)
+    // Update text
+    updateDistanceText(currentLabel, `${Math.round(distance)}m`)
+    // Update arrow and visibility
+    const onScreen = updateOffscreenArrow(camera, viewportWidthPx, viewportHeightPx)
+    setVisible(onScreen)
+    return onScreen
+  }
+
+  function dispose () {
+    const mat = sprite.material
+    mat.map?.dispose()
+    mat.dispose()
+    if (arrowSprite) {
+      const am = arrowSprite.material
+      am.map?.dispose()
+      am.dispose()
+    }
+  }
+
+  return {
+    group,
+    sprite,
+    enableOffscreenArrow,
+    setArrowParent,
+    updateForCamera,
+    setColor,
+    setLabel,
+    updateDistanceText,
+    setVisible,
+    setPosition,
+    dispose,
+  }
+}
+
+// Internal helpers
+function drawCombinedCanvas (color: number, id: string, distance: string): HTMLCanvasElement {
+  const scale = WAYPOINT_CONFIG.CANVAS_SCALE * (globalThis.devicePixelRatio || 1)
+  const size = WAYPOINT_CONFIG.CANVAS_SIZE * scale
+  const canvas = document.createElement('canvas')
+  canvas.width = size
+  canvas.height = size
+  const ctx = canvas.getContext('2d')!
+
+  // Clear canvas
+  ctx.clearRect(0, 0, size, size)
+
+  // Draw dot
+  const centerX = size / 2
+  const dotY = Math.round(size * WAYPOINT_CONFIG.LAYOUT.DOT_Y)
+  const radius = Math.round(size * 0.05) // Dot takes up ~12% of canvas height
+  const borderWidth = Math.max(2, Math.round(4 * scale))
+
+  // Outer border (black)
+  ctx.beginPath()
+  ctx.arc(centerX, dotY, radius + borderWidth, 0, Math.PI * 2)
+  ctx.fillStyle = 'black'
+  ctx.fill()
+
+  // Inner circle (colored)
+  ctx.beginPath()
+  ctx.arc(centerX, dotY, radius, 0, Math.PI * 2)
+  ctx.fillStyle = `#${color.toString(16).padStart(6, '0')}`
+  ctx.fill()
+
+  // Text properties
+  ctx.textAlign = 'center'
+  ctx.textBaseline = 'middle'
+
+  // Title
+  const nameFontPx = Math.round(size * 0.08) // ~8% of canvas height
+  const distanceFontPx = Math.round(size * 0.06) // ~6% of canvas height
+  ctx.font = `bold ${nameFontPx}px mojangles`
+  ctx.lineWidth = Math.max(2, Math.round(3 * scale))
+  const nameY = Math.round(size * WAYPOINT_CONFIG.LAYOUT.NAME_Y)
+
+  ctx.strokeStyle = 'black'
+  ctx.strokeText(id, centerX, nameY)
+  ctx.fillStyle = 'white'
+  ctx.fillText(id, centerX, nameY)
+
+  // Distance
+  ctx.font = `bold ${distanceFontPx}px mojangles`
+  ctx.lineWidth = Math.max(2, Math.round(2 * scale))
+  const distanceY = Math.round(size * WAYPOINT_CONFIG.LAYOUT.DISTANCE_Y)
+
+  ctx.strokeStyle = 'black'
+  ctx.strokeText(distance, centerX, distanceY)
+  ctx.fillStyle = '#CCCCCC'
+  ctx.fillText(distance, centerX, distanceY)
+
+  return canvas
+}
+
+function createCombinedSprite (color: number, id: string, distance: string, depthTest: boolean): THREE.Sprite {
+  const canvas = drawCombinedCanvas(color, id, distance)
+  const texture = new THREE.CanvasTexture(canvas)
+  texture.anisotropy = 1
+  texture.magFilter = THREE.LinearFilter
+  texture.minFilter = THREE.LinearFilter
+  const material = new THREE.SpriteMaterial({
+    map: texture,
+    transparent: true,
+    opacity: 1,
+    depthTest,
+    depthWrite: false,
+  })
+  const sprite = new THREE.Sprite(material)
+  sprite.position.set(0, 0, 0)
+  return sprite
+}
+
+export const WaypointHelpers = {
+  // World-scale constant size helper
+  computeWorldScale (distance: number, fixedReference = 10) {
+    return Math.max(0.0001, distance / fixedReference)
+  },
+  // Screen-pixel constant size helper
+  computeScreenPixelScale (
+    camera: THREE.PerspectiveCamera,
+    distance: number,
+    pixelSize: number,
+    viewportHeightPx: number
+  ) {
+    const vFovRad = camera.fov * Math.PI / 180
+    const worldUnitsPerScreenHeightAtDist = Math.tan(vFovRad / 2) * 2 * distance
+    return worldUnitsPerScreenHeightAtDist * (pixelSize / viewportHeightPx)
+  }
+}
diff --git a/renderer/viewer/three/waypoints.ts b/renderer/viewer/three/waypoints.ts
new file mode 100644
index 00000000..c7ec9a93
--- /dev/null
+++ b/renderer/viewer/three/waypoints.ts
@@ -0,0 +1,142 @@
+import * as THREE from 'three'
+import { WorldRendererThree } from './worldrendererThree'
+import { createWaypointSprite, type WaypointSprite } from './waypointSprite'
+
+interface Waypoint {
+  id: string
+  x: number
+  y: number
+  z: number
+  minDistance: number
+  color: number
+  label?: string
+  sprite: WaypointSprite
+}
+
+interface WaypointOptions {
+  color?: number
+  label?: string
+  minDistance?: number
+}
+
+export class WaypointsRenderer {
+  private readonly waypoints = new Map<string, Waypoint>()
+  private readonly waypointScene = new THREE.Scene()
+  private readonly FIXED_REFERENCE = 10 // Fixed reference distance for scaling
+
+  constructor (
+    private readonly worldRenderer: WorldRendererThree
+  ) {
+    if (process.env.NODE_ENV !== 'production') {
+      this.addWaypoint('spawn', 0, 0, 0, { })
+    }
+  }
+
+  private updateWaypoints () {
+    const playerPos = this.worldRenderer.cameraObject.position
+    const sizeVec = this.worldRenderer.renderer.getSize(new THREE.Vector2())
+
+    for (const waypoint of this.waypoints.values()) {
+      const waypointPos = new THREE.Vector3(waypoint.x, waypoint.y, waypoint.z)
+      const distance = playerPos.distanceTo(waypointPos)
+      const visible = !waypoint.minDistance || distance >= waypoint.minDistance
+
+      waypoint.sprite.setVisible(visible)
+
+      if (visible) {
+        // Update position
+        waypoint.sprite.setPosition(waypoint.x, waypoint.y, waypoint.z)
+        // Ensure camera-based update each frame
+        waypoint.sprite.updateForCamera(this.worldRenderer.getCameraPosition(), this.worldRenderer.camera, sizeVec.width, sizeVec.height)
+      }
+    }
+  }
+
+  render () {
+    if (this.waypoints.size === 0) return
+
+    // Update waypoint scaling
+    this.updateWaypoints()
+
+    // Render waypoints scene with the world camera
+    this.worldRenderer.renderer.render(this.waypointScene, this.worldRenderer.camera)
+  }
+
+  // Removed sprite/label texture creation. Use utils/waypointSprite.ts
+
+  addWaypoint (
+    id: string,
+    x: number,
+    y: number,
+    z: number,
+    options: WaypointOptions = {}
+  ) {
+    // Remove existing waypoint if it exists
+    this.removeWaypoint(id)
+
+    const color = options.color ?? 0xFF_00_00
+    const { label } = options
+    const minDistance = options.minDistance ?? 0
+
+    const sprite = createWaypointSprite({
+      position: new THREE.Vector3(x, y, z),
+      color,
+      label: (label || id),
+    })
+    sprite.enableOffscreenArrow(true)
+    sprite.setArrowParent(this.waypointScene)
+
+    this.waypointScene.add(sprite.group)
+
+    this.waypoints.set(id, {
+      id, x, y, z, minDistance,
+      color, label,
+      sprite,
+    })
+  }
+
+  removeWaypoint (id: string) {
+    const waypoint = this.waypoints.get(id)
+    if (waypoint) {
+      this.waypointScene.remove(waypoint.sprite.group)
+      waypoint.sprite.dispose()
+      this.waypoints.delete(id)
+    }
+  }
+
+  clear () {
+    for (const id of this.waypoints.keys()) {
+      this.removeWaypoint(id)
+    }
+  }
+
+  testWaypoint () {
+    this.addWaypoint('Test Point', 0, 70, 0, { color: 0x00_FF_00, label: 'Test Point' })
+    this.addWaypoint('Spawn', 0, 64, 0, { color: 0xFF_FF_00, label: 'Spawn' })
+    this.addWaypoint('Far Point', 100, 70, 100, { color: 0x00_00_FF, label: 'Far Point' })
+  }
+
+  getWaypoint (id: string): Waypoint | undefined {
+    return this.waypoints.get(id)
+  }
+
+  getAllWaypoints (): Waypoint[] {
+    return [...this.waypoints.values()]
+  }
+
+  setWaypointColor (id: string, color: number) {
+    const waypoint = this.waypoints.get(id)
+    if (waypoint) {
+      waypoint.sprite.setColor(color)
+      waypoint.color = color
+    }
+  }
+
+  setWaypointLabel (id: string, label?: string) {
+    const waypoint = this.waypoints.get(id)
+    if (waypoint) {
+      waypoint.label = label
+      waypoint.sprite.setLabel(label)
+    }
+  }
+}
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index bc95f06b..82856cb9 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -23,6 +23,7 @@ import { ThreeJsSound } from './threeJsSound'
 import { CameraShake } from './cameraShake'
 import { ThreeJsMedia } from './threeJsMedia'
 import { Fountain } from './threeJsParticles'
+import { WaypointsRenderer } from './waypoints'
 
 type SectionKey = string
 
@@ -48,6 +49,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   cameraContainer: THREE.Object3D
   media: ThreeJsMedia
   waitingChunksToDisplay = {} as { [chunkKey: string]: SectionKey[] }
+  waypoints: WaypointsRenderer
   camera: THREE.PerspectiveCamera
   renderTimeAvg = 0
   sectionsOffsetsAnimations = {} as {
@@ -99,6 +101,8 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.soundSystem = new ThreeJsSound(this)
     this.cameraShake = new CameraShake(this, this.onRender)
     this.media = new ThreeJsMedia(this)
+    this.waypoints = new WaypointsRenderer(this)
+
     // this.fountain = new Fountain(this.scene, this.scene, {
     //   position: new THREE.Vector3(0, 10, 0),
     // })
@@ -119,6 +123,8 @@ export class WorldRendererThree extends WorldRendererCommon {
       this.protocolCustomBlocks.clear()
       // Reset section animations
       this.sectionsOffsetsAnimations = {}
+      // Clear waypoints
+      this.waypoints.clear()
     })
   }
 
@@ -453,7 +459,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     return worldPos
   }
 
-  getWorldCameraPosition () {
+  getSectionCameraPosition () {
     const pos = this.getCameraPosition()
     return new Vec3(
       Math.floor(pos.x / 16),
@@ -463,7 +469,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   updateCameraSectionPos () {
-    const newSectionPos = this.getWorldCameraPosition()
+    const newSectionPos = this.getSectionCameraPosition()
     if (!this.cameraSectionPos.equals(newSectionPos)) {
       this.cameraSectionPos = newSectionPos
       this.cameraSectionPositionUpdate()
@@ -737,6 +743,8 @@ export class WorldRendererThree extends WorldRendererCommon {
       fountain.render()
     }
 
+    this.waypoints.render()
+
     for (const onRender of this.onRender) {
       onRender()
     }
@@ -1022,6 +1030,13 @@ class StarField {
   constructor (
     private readonly worldRenderer: WorldRendererThree
   ) {
+    const clock = new THREE.Clock()
+    const speed = 0.2
+    this.worldRenderer.onRender.push(() => {
+      if (!this.points) return
+      this.points.position.copy(this.worldRenderer.getCameraPosition());
+      (this.points.material as StarfieldMaterial).uniforms.time.value = clock.getElapsedTime() * speed
+    })
   }
 
   addToScene () {
@@ -1032,7 +1047,6 @@ class StarField {
     const count = 7000
     const factor = 7
     const saturation = 10
-    const speed = 0.2
 
     const geometry = new THREE.BufferGeometry()
 
@@ -1065,11 +1079,6 @@ class StarField {
     this.points = new THREE.Points(geometry, material)
     this.worldRenderer.scene.add(this.points)
 
-    const clock = new THREE.Clock()
-    this.points.onBeforeRender = (renderer, scene, camera) => {
-      this.points?.position.copy?.(this.worldRenderer.getCameraPosition())
-      material.uniforms.time.value = clock.getElapsedTime() * speed
-    }
     this.points.renderOrder = -1
   }
 
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 3f6a8217..6d3aa7e9 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -16,6 +16,7 @@ export default () => {
     registerSectionAnimationChannels()
     registeredJeiChannel()
     registerBlockInteractionsCustomizationChannel()
+    registerWaypointChannels()
   })
 }
 
@@ -63,6 +64,62 @@ const registerBlockInteractionsCustomizationChannel = () => {
   }, true)
 }
 
+const registerWaypointChannels = () => {
+  const packetStructure = [
+    'container',
+    [
+      {
+        name: 'id',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'x',
+        type: 'f32'
+      },
+      {
+        name: 'y',
+        type: 'f32'
+      },
+      {
+        name: 'z',
+        type: 'f32'
+      },
+      {
+        name: 'minDistance',
+        type: 'i32'
+      },
+      {
+        name: 'label',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'color',
+        type: 'i32'
+      }
+    ]
+  ]
+
+  registerChannel('minecraft-web-client:waypoint-add', packetStructure, (data) => {
+    getThreeJsRendererMethods()?.addWaypoint(data.id, data.x, data.y, data.z, {
+      minDistance: data.minDistance,
+      label: data.label || undefined,
+      color: data.color || undefined
+    })
+  })
+
+  registerChannel('minecraft-web-client:waypoint-delete', [
+    'container',
+    [
+      {
+        name: 'id',
+        type: ['pstring', { countType: 'i16' }]
+      }
+    ]
+  ], (data) => {
+    getThreeJsRendererMethods()?.removeWaypoint(data.id)
+  })
+}
+
 const registerBlockModelsChannel = () => {
   const CHANNEL_NAME = 'minecraft-web-client:blockmodels'
 

From 8827aab981d27d95b4863156a35fd66ba7b810c2 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 12 Aug 2025 06:27:42 +0300
Subject: [PATCH 703/753] dont add test waypoints on dev

---
 renderer/viewer/three/waypoints.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/renderer/viewer/three/waypoints.ts b/renderer/viewer/three/waypoints.ts
index c7ec9a93..45937ee8 100644
--- a/renderer/viewer/three/waypoints.ts
+++ b/renderer/viewer/three/waypoints.ts
@@ -22,14 +22,10 @@ interface WaypointOptions {
 export class WaypointsRenderer {
   private readonly waypoints = new Map<string, Waypoint>()
   private readonly waypointScene = new THREE.Scene()
-  private readonly FIXED_REFERENCE = 10 // Fixed reference distance for scaling
 
   constructor (
     private readonly worldRenderer: WorldRendererThree
   ) {
-    if (process.env.NODE_ENV !== 'production') {
-      this.addWaypoint('spawn', 0, 0, 0, { })
-    }
   }
 
   private updateWaypoints () {

From 60fc5ef315ea8b73f58070e271dd8f3dc90fc8e4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 13 Aug 2025 19:19:46 +0300
Subject: [PATCH 704/753] feat: add skybox renderer: test it by dragging an
 image window into window, fix waypoint block pos

---
 renderer/viewer/three/graphicsBackend.ts    |  3 +
 renderer/viewer/three/skyboxRenderer.ts     | 77 +++++++++++++++++++++
 renderer/viewer/three/waypoints.ts          |  2 +-
 renderer/viewer/three/worldrendererThree.ts | 11 +++
 src/dragndrop.ts                            | 32 +++++++++
 5 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 renderer/viewer/three/skyboxRenderer.ts

diff --git a/renderer/viewer/three/graphicsBackend.ts b/renderer/viewer/three/graphicsBackend.ts
index 92b6ec66..04cb00ca 100644
--- a/renderer/viewer/three/graphicsBackend.ts
+++ b/renderer/viewer/three/graphicsBackend.ts
@@ -47,6 +47,9 @@ const getBackendMethods = (worldRenderer: WorldRendererThree) => {
 
     addWaypoint: worldRenderer.waypoints.addWaypoint.bind(worldRenderer.waypoints),
     removeWaypoint: worldRenderer.waypoints.removeWaypoint.bind(worldRenderer.waypoints),
+
+    // New method for updating skybox
+    setSkyboxImage: worldRenderer.skyboxRenderer.setSkyboxImage.bind(worldRenderer.skyboxRenderer)
   }
 }
 
diff --git a/renderer/viewer/three/skyboxRenderer.ts b/renderer/viewer/three/skyboxRenderer.ts
new file mode 100644
index 00000000..294c72aa
--- /dev/null
+++ b/renderer/viewer/three/skyboxRenderer.ts
@@ -0,0 +1,77 @@
+import * as THREE from 'three'
+
+export class SkyboxRenderer {
+  private texture: THREE.Texture | null = null
+  private mesh: THREE.Mesh<THREE.SphereGeometry, THREE.MeshBasicMaterial> | null = null
+
+  constructor (private readonly scene: THREE.Scene, public initialImage: string | null) {}
+
+  async init () {
+    if (this.initialImage) {
+      await this.setSkyboxImage(this.initialImage)
+    }
+  }
+
+  async setSkyboxImage (imageUrl: string) {
+    // Dispose old textures if they exist
+    if (this.texture) {
+      this.texture.dispose()
+    }
+
+    // Load the equirectangular texture
+    const textureLoader = new THREE.TextureLoader()
+    this.texture = await new Promise((resolve) => {
+      textureLoader.load(
+        imageUrl,
+        (texture) => {
+          texture.mapping = THREE.EquirectangularReflectionMapping
+          texture.encoding = THREE.sRGBEncoding
+          // Keep pixelated look
+          texture.minFilter = THREE.NearestFilter
+          texture.magFilter = THREE.NearestFilter
+          texture.needsUpdate = true
+          resolve(texture)
+        }
+      )
+    })
+
+    // Create or update the skybox
+    if (this.mesh) {
+      // Just update the texture on the existing material
+      this.mesh.material.map = this.texture
+      this.mesh.material.needsUpdate = true
+    } else {
+      // Create a large sphere geometry for the skybox
+      const geometry = new THREE.SphereGeometry(500, 60, 40)
+      // Flip the geometry inside out
+      geometry.scale(-1, 1, 1)
+
+      // Create material using the loaded texture
+      const material = new THREE.MeshBasicMaterial({
+        map: this.texture,
+        side: THREE.FrontSide // Changed to FrontSide since we're flipping the geometry
+      })
+
+      // Create and add the skybox mesh
+      this.mesh = new THREE.Mesh(geometry, material)
+      this.scene.add(this.mesh)
+    }
+  }
+
+  update (cameraPosition: THREE.Vector3) {
+    if (this.mesh) {
+      this.mesh.position.copy(cameraPosition)
+    }
+  }
+
+  dispose () {
+    if (this.texture) {
+      this.texture.dispose()
+    }
+    if (this.mesh) {
+      this.mesh.geometry.dispose()
+      ;(this.mesh.material as THREE.Material).dispose()
+      this.scene.remove(this.mesh)
+    }
+  }
+}
diff --git a/renderer/viewer/three/waypoints.ts b/renderer/viewer/three/waypoints.ts
index 45937ee8..cebd779a 100644
--- a/renderer/viewer/three/waypoints.ts
+++ b/renderer/viewer/three/waypoints.ts
@@ -85,7 +85,7 @@ export class WaypointsRenderer {
     this.waypointScene.add(sprite.group)
 
     this.waypoints.set(id, {
-      id, x, y, z, minDistance,
+      id, x: x + 0.5, y: y + 0.5, z: z + 0.5, minDistance,
       color, label,
       sprite,
     })
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 82856cb9..fb6c8e11 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -24,6 +24,7 @@ import { CameraShake } from './cameraShake'
 import { ThreeJsMedia } from './threeJsMedia'
 import { Fountain } from './threeJsParticles'
 import { WaypointsRenderer } from './waypoints'
+import { SkyboxRenderer } from './skyboxRenderer'
 
 type SectionKey = string
 
@@ -71,6 +72,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
   fountains: Fountain[] = []
   DEBUG_RAYCAST = false
+  skyboxRenderer: SkyboxRenderer
 
   private currentPosTween?: tweenJs.Tween<THREE.Vector3>
   private currentRotTween?: tweenJs.Tween<{ pitch: number, yaw: number }>
@@ -94,6 +96,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.holdingBlock = new HoldingBlock(this)
     this.holdingBlockLeft = new HoldingBlock(this, true)
 
+    // Initialize skybox renderer
+    this.skyboxRenderer = new SkyboxRenderer(this.scene, null)
+    void this.skyboxRenderer.init()
+
     this.addDebugOverlay()
     this.resetScene()
     void this.init()
@@ -708,6 +714,10 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.cursorBlock.render()
     this.updateSectionOffsets()
 
+    // Update skybox position to follow camera
+    const cameraPos = this.getCameraPosition()
+    this.skyboxRenderer.update(cameraPos)
+
     const sizeOrFovChanged = sizeChanged || this.displayOptions.inWorldRenderingConfig.fov !== this.camera.fov
     if (sizeOrFovChanged) {
       const size = this.renderer.getSize(new THREE.Vector2())
@@ -947,6 +957,7 @@ export class WorldRendererThree extends WorldRendererCommon {
 
   destroy (): void {
     super.destroy()
+    this.skyboxRenderer.dispose()
   }
 
   shouldObjectVisible (object: THREE.Object3D) {
diff --git a/src/dragndrop.ts b/src/dragndrop.ts
index 6be90551..5a16bc05 100644
--- a/src/dragndrop.ts
+++ b/src/dragndrop.ts
@@ -3,6 +3,7 @@ import fs from 'fs'
 import * as nbt from 'prismarine-nbt'
 import RegionFile from 'prismarine-provider-anvil/src/region'
 import { versions } from 'minecraft-data'
+import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import { openWorldDirectory, openWorldZip } from './browserfs'
 import { isGameActive } from './globalState'
 import { showNotification } from './react/NotificationProvider'
@@ -12,6 +13,9 @@ const parseNbt = promisify(nbt.parse)
 const simplifyNbt = nbt.simplify
 window.nbt = nbt
 
+// Supported image types for skybox
+const VALID_IMAGE_EXTENSIONS = ['.png', '.jpg', '.jpeg', '.webp']
+
 // todo display drop zone
 for (const event of ['drag', 'dragstart', 'dragend', 'dragover', 'dragenter', 'dragleave', 'drop']) {
   window.addEventListener(event, (e: any) => {
@@ -45,6 +49,34 @@ window.addEventListener('drop', async e => {
 })
 
 async function handleDroppedFile (file: File) {
+  // Check for image files first when game is active
+  if (isGameActive(false) && VALID_IMAGE_EXTENSIONS.some(ext => file.name.toLowerCase().endsWith(ext))) {
+    try {
+      // Convert image to base64
+      const reader = new FileReader()
+      const base64Promise = new Promise<string>((resolve, reject) => {
+        reader.onload = () => resolve(reader.result as string)
+        reader.onerror = reject
+      })
+      reader.readAsDataURL(file)
+      const base64Image = await base64Promise
+
+      // Get ThreeJS backend methods and update skybox
+      const setSkyboxImage = getThreeJsRendererMethods()?.setSkyboxImage
+      if (setSkyboxImage) {
+        await setSkyboxImage(base64Image)
+        showNotification('Skybox updated successfully')
+      } else {
+        showNotification('Cannot update skybox - renderer does not support it')
+      }
+      return
+    } catch (err) {
+      console.error('Failed to update skybox:', err)
+      showNotification('Failed to update skybox', 'error')
+      return
+    }
+  }
+
   if (file.name.endsWith('.zip')) {
     void openWorldZip(file)
     return

From 15e3325971ed85ee54d5a3022b789a8881a7f4e4 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 14 Aug 2025 01:25:24 +0300
Subject: [PATCH 705/753] add param for testing for immediate reconnect after
 kick or error (warning: will cause infinite reload loop)

---
 src/appParams.ts                |  1 +
 src/index.ts                    | 13 +++++++++----
 src/react/AppStatusProvider.tsx | 24 ++++++++++++++----------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/appParams.ts b/src/appParams.ts
index 59a24788..8d487f8d 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -12,6 +12,7 @@ export type AppQsParams = {
   username?: string
   lockConnect?: string
   autoConnect?: string
+  alwaysReconnect?: string
   // googledrive.ts params
   state?: string
   // ServersListProvider.tsx params
diff --git a/src/index.ts b/src/index.ts
index c0213f56..4a118cee 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -62,7 +62,7 @@ import { onAppLoad, resourcepackReload, resourcePackState } from './resourcePack
 import { ConnectPeerOptions, connectToPeer } from './localServerMultiplayer'
 import CustomChannelClient from './customClient'
 import { registerServiceWorker } from './serviceWorker'
-import { appStatusState, lastConnectOptions } from './react/AppStatusProvider'
+import { appStatusState, lastConnectOptions, quickDevReconnect } from './react/AppStatusProvider'
 
 import { fsState } from './loadSave'
 import { watchFov } from './rendererUtils'
@@ -215,8 +215,13 @@ export async function connect (connectOptions: ConnectOptions) {
   const destroyAll = (wasKicked = false) => {
     if (ended) return
     loadingTimerState.loading = false
-    if (!wasKicked && miscUiState.appConfig?.allowAutoConnect && appQueryParams.autoConnect && hadConnected) {
-      location.reload()
+    const { alwaysReconnect } = appQueryParams
+    if ((!wasKicked && miscUiState.appConfig?.allowAutoConnect && appQueryParams.autoConnect && hadConnected) || (alwaysReconnect)) {
+      if (alwaysReconnect === 'quick' || alwaysReconnect === 'fast') {
+        quickDevReconnect()
+      } else {
+        location.reload()
+      }
     }
     errorAbortController.abort()
     ended = true
@@ -957,7 +962,7 @@ const maybeEnterGame = () => {
     }
   }
 
-  if (appQueryParams.reconnect && process.env.NODE_ENV === 'development') {
+  if (appQueryParams.reconnect && localStorage.lastConnectOptions && process.env.NODE_ENV === 'development') {
     const lastConnect = JSON.parse(localStorage.lastConnectOptions ?? {})
     return waitForConfigFsLoad(async () => {
       void connect({
diff --git a/src/react/AppStatusProvider.tsx b/src/react/AppStatusProvider.tsx
index e7e36cb7..9c7b34ac 100644
--- a/src/react/AppStatusProvider.tsx
+++ b/src/react/AppStatusProvider.tsx
@@ -54,6 +54,17 @@ export const reconnectReload = () => {
   }
 }
 
+export const quickDevReconnect = () => {
+  if (!lastConnectOptions.value) {
+    return
+  }
+
+  resetAppStatusState()
+  window.dispatchEvent(new window.CustomEvent('connect', {
+    detail: lastConnectOptions.value
+  }))
+}
+
 export default () => {
   const lastState = useRef(JSON.parse(JSON.stringify(appStatusState)))
   const currentState = useSnapshot(appStatusState)
@@ -105,13 +116,6 @@ export default () => {
     }
   }, [isOpen])
 
-  const reconnect = () => {
-    resetAppStatusState()
-    window.dispatchEvent(new window.CustomEvent('connect', {
-      detail: lastConnectOptions.value
-    }))
-  }
-
   useEffect(() => {
     const controller = new AbortController()
     window.addEventListener('keyup', (e) => {
@@ -119,7 +123,7 @@ export default () => {
       if (activeModalStack.at(-1)?.reactType !== 'app-status') return
       // todo do only if reconnect is possible
       if (e.code !== 'KeyR' || !lastConnectOptions.value) return
-      reconnect()
+      quickDevReconnect()
     }, {
       signal: controller.signal
     })
@@ -140,7 +144,7 @@ export default () => {
     const account = await showOptionsModal('Choose account to connect with', [...accounts.map(account => account.username), 'Use other account'])
     if (!account) return
     lastConnectOptions.value!.authenticatedAccount = accounts.find(acc => acc.username === account) || true
-    reconnect()
+    quickDevReconnect()
   }
 
   const lastAutoCapturedPackets = getLastAutoCapturedPackets()
@@ -184,7 +188,7 @@ export default () => {
       actionsSlot={
         <>
           {displayAuthButton && <Button label='Authenticate' onClick={authReconnectAction} />}
-          {displayVpnButton && <PossiblyVpnBypassProxyButton reconnect={reconnect} />}
+          {displayVpnButton && <PossiblyVpnBypassProxyButton reconnect={quickDevReconnect} />}
           {replayActive && <Button label={`Download Packets Replay ${replayLogger?.contents.split('\n').length}L`} onClick={downloadPacketsReplay} />}
           {wasDisconnected && lastAutoCapturedPackets && <Button label={`Inspect Last ${lastAutoCapturedPackets} Packets`} onClick={() => downloadAutoCapturedPackets()} />}
         </>

From e2b141cca0dca279e22f8ef59bde41978675b5b8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 14 Aug 2025 04:51:37 +0300
Subject: [PATCH 706/753] fix a few packet specific errors

---
 src/entities.ts                 | 2 +-
 src/react/ChunksDebugScreen.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/entities.ts b/src/entities.ts
index cf91ff2c..dcec6143 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -310,7 +310,7 @@ customEvents.on('gameLoaded', () => {
   })
 
   bot.on('teamRemoved', (team: Team) => {
-    if (appViewer.playerState.reactive.team?.team === team.team) {
+    if (appViewer.playerState.reactive.team?.team === team?.team) {
       appViewer.playerState.reactive.team = undefined
       // Player's team was removed, need to update all entities that are in a team
       updateEntityNameTags(team)
diff --git a/src/react/ChunksDebugScreen.tsx b/src/react/ChunksDebugScreen.tsx
index 9f47d023..de33e454 100644
--- a/src/react/ChunksDebugScreen.tsx
+++ b/src/react/ChunksDebugScreen.tsx
@@ -30,7 +30,7 @@ const Inner = () => {
       state,
       lines: [String(chunk?.loads.length ?? 0)],
       sidebarLines: [
-        `loads: ${chunk.loads?.map(l => `${l.reason} ${l.dataLength} ${l.time}`).join('\n')}`,
+        `loads: ${chunk?.loads?.map(l => `${l.reason} ${l.dataLength} ${l.time}`).join('\n')}`,
         // `blockUpdates: ${chunk.blockUpdates}`,
       ],
     }

From 1ddaa79162d417c3e8855936eaf11bcfec7e4bb1 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 15 Aug 2025 01:12:24 +0300
Subject: [PATCH 707/753] rm not tested pathfinder (#415)

---
 package.json                    |  1 -
 pnpm-lock.yaml                  | 16 ----------------
 renderer/rsbuildSharedConfig.ts |  6 +++---
 src/connect.ts                  |  2 --
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index b719b877..ba58b3da 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,6 @@
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
     "mineflayer-mouse": "^0.1.17",
-    "mineflayer-pathfinder": "^2.4.4",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index da2b3912..ac6a0a7c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -345,9 +345,6 @@ importers:
       mineflayer-mouse:
         specifier: ^0.1.17
         version: 0.1.17
-      mineflayer-pathfinder:
-        specifier: ^2.4.4
-        version: 2.4.5
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -6671,9 +6668,6 @@ packages:
     resolution: {integrity: sha512-0eCR8pnGb42Qd9QmAxOjl0PhA5Fa+9+6H1G/YsbsO5rg5mDf94Tusqp/8NAGLPQCPVDzbarLskXdjR3h0E0bEQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  mineflayer-pathfinder@2.4.5:
-    resolution: {integrity: sha512-Jh3JnUgRLwhMh2Dugo4SPza68C41y+NPP5sdsgxRu35ydndo70i1JJGxauVWbXrpNwIxYNztUw78aFyb7icw8g==}
-
   mineflayer@4.31.0:
     resolution: {integrity: sha512-oqiNa5uP4kXiPlj4+Jn+9QozPMsMy0U8/YP5d6+KSAeWthtuJHeQqcYgWG5lkC3LHMqHqtEu4MNdXt6GZjFNTQ==}
     engines: {node: '>=22'}
@@ -17347,16 +17341,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mineflayer-pathfinder@2.4.5:
-    dependencies:
-      minecraft-data: 3.92.0
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-entity: 2.5.0
-      prismarine-item: 1.17.0
-      prismarine-nbt: 2.7.0
-      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
-      vec3: 0.1.10
-
   mineflayer@4.31.0(encoding@0.1.13):
     dependencies:
       minecraft-data: 3.92.0
diff --git a/renderer/rsbuildSharedConfig.ts b/renderer/rsbuildSharedConfig.ts
index 57091d99..45da30b1 100644
--- a/renderer/rsbuildSharedConfig.ts
+++ b/renderer/rsbuildSharedConfig.ts
@@ -73,12 +73,12 @@ export const appAndRendererSharedConfig = () => defineConfig({
 })
 
 export const rspackViewerConfig = (config, { appendPlugins, addRules, rspack }: ModifyRspackConfigUtils) => {
-    appendPlugins(new rspack.NormalModuleReplacementPlugin(/data/, (resource) => {
+    appendPlugins(new rspack.NormalModuleReplacementPlugin(/data|prismarine-physics/, (resource) => {
         let absolute: string
         const request = resource.request.replaceAll('\\', '/')
         absolute = path.join(resource.context, request).replaceAll('\\', '/')
-        if (request.includes('minecraft-data/data/pc/1.')) {
-            console.log('Error: incompatible resource', request, resource.contextInfo.issuer)
+        if (request.includes('minecraft-data/data/pc/1.') || request.includes('prismarine-physics')) {
+            console.log('Error: incompatible resource', request, 'from', resource.contextInfo.issuer)
             process.exit(1)
             // throw new Error(`${resource.request} was requested by ${resource.contextInfo.issuer}`)
         }
diff --git a/src/connect.ts b/src/connect.ts
index 914303c6..cb6b8f65 100644
--- a/src/connect.ts
+++ b/src/connect.ts
@@ -3,7 +3,6 @@
 import MinecraftData from 'minecraft-data'
 import PrismarineBlock from 'prismarine-block'
 import PrismarineItem from 'prismarine-item'
-import pathfinder from 'mineflayer-pathfinder'
 import { miscUiState } from './globalState'
 import supportedVersions from './supportedVersions.mjs'
 import { options } from './optionsStorage'
@@ -65,7 +64,6 @@ export const loadMinecraftData = async (version: string) => {
   window.PrismarineItem = PrismarineItem(mcData.version.minecraftVersion!)
   window.loadedData = mcData
   window.mcData = mcData
-  window.pathfinder = pathfinder
   miscUiState.loadedDataVersion = version
 }
 

From 65575e2665940ac8ed2160454bd3d5b4c45aebf8 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 15 Aug 2025 01:33:37 +0300
Subject: [PATCH 708/753] rm faulty mineflayer ver, fix kickin in singleplayer

---
 .eslintrc.json        |  1 +
 package.json          |  1 +
 pnpm-lock.yaml        | 48 ++++++++++---------------------------------
 src/customClient.js   | 19 ++++++++++++++---
 src/defaultOptions.ts |  2 +-
 5 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 3552f6a7..63f6749a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -23,6 +23,7 @@
         // ],
         "@stylistic/arrow-spacing": "error",
         "@stylistic/block-spacing": "error",
+        "@typescript-eslint/no-this-alias": "off",
         "@stylistic/brace-style": [
             "error",
             "1tbs",
diff --git a/package.json b/package.json
index ba58b3da..1d9dfc0c 100644
--- a/package.json
+++ b/package.json
@@ -196,6 +196,7 @@
   },
   "pnpm": {
     "overrides": {
+      "mineflayer": "github:zardoy/mineflayer#gen-the-master",
       "@nxg-org/mineflayer-physics-util": "1.8.10",
       "buffer": "^6.0.3",
       "vec3": "0.1.10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ac6a0a7c..f495c831 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,7 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
+  mineflayer: github:zardoy/mineflayer#gen-the-master
   '@nxg-org/mineflayer-physics-util': 1.8.10
   buffer: ^6.0.3
   vec3: 0.1.10
@@ -136,7 +137,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
@@ -341,7 +342,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.17
         version: 0.1.17
@@ -6668,13 +6669,9 @@ packages:
     resolution: {integrity: sha512-0eCR8pnGb42Qd9QmAxOjl0PhA5Fa+9+6H1G/YsbsO5rg5mDf94Tusqp/8NAGLPQCPVDzbarLskXdjR3h0E0bEQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  mineflayer@4.31.0:
-    resolution: {integrity: sha512-oqiNa5uP4kXiPlj4+Jn+9QozPMsMy0U8/YP5d6+KSAeWthtuJHeQqcYgWG5lkC3LHMqHqtEu4MNdXt6GZjFNTQ==}
-    engines: {node: '>=22'}
-
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448}
-    version: 4.31.0
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09}
+    version: 8.0.0
     engines: {node: '>=22'}
 
   minimalistic-assert@1.0.1:
@@ -11311,7 +11308,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: 4.31.0(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@@ -16951,12 +16948,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17326,7 +17323,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: 4.31.0(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17341,30 +17338,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mineflayer@4.31.0(encoding@0.1.13):
-    dependencies:
-      minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
-      prismarine-entity: 2.5.0
-      prismarine-item: 1.17.0
-      prismarine-nbt: 2.7.0
-      prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
-      prismarine-recipe: 1.3.1(prismarine-registry@1.11.0)
-      prismarine-registry: 1.11.0
-      prismarine-windows: 2.9.0
-      prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
-      protodef: 1.18.0
-      typed-emitter: 1.4.0
-      vec3: 0.1.10
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/c9c77d6511e37c452ebe48790724da165d6ad448(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
diff --git a/src/customClient.js b/src/customClient.js
index b6c85fcc..b1a99904 100644
--- a/src/customClient.js
+++ b/src/customClient.js
@@ -1,6 +1,7 @@
+//@ts-check
+import * as nbt from 'prismarine-nbt'
 import { options } from './optionsStorage'
 
-//@ts-check
 const { EventEmitter } = require('events')
 const debug = require('debug')('minecraft-protocol')
 const states = require('minecraft-protocol/src/states')
@@ -51,8 +52,20 @@ class CustomChannelClient extends EventEmitter {
     this.emit('state', newProperty, oldProperty)
   }
 
-  end(reason) {
-    this._endReason = reason
+  end(endReason, fullReason) {
+    // eslint-disable-next-line unicorn/no-this-assignment
+    const client = this
+    if (client.state === states.PLAY) {
+      fullReason ||= loadedData.supportFeature('chatPacketsUseNbtComponents')
+        ? nbt.comp({ text: nbt.string(endReason) })
+        : JSON.stringify({ text: endReason })
+      client.write('kick_disconnect', { reason: fullReason })
+    } else if (client.state === states.LOGIN) {
+      fullReason ||= JSON.stringify({ text: endReason })
+      client.write('disconnect', { reason: fullReason })
+    }
+
+    this._endReason = endReason
     this.emit('end', this._endReason) // still emits on server side only, doesn't send anything to our client
   }
 
diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 9650ffcd..945ad37a 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -77,7 +77,7 @@ export const defaultOptions = {
   frameLimit: false as number | false,
   alwaysBackupWorldBeforeLoading: undefined as boolean | undefined | null,
   alwaysShowMobileControls: false,
-  excludeCommunicationDebugEvents: [],
+  excludeCommunicationDebugEvents: [] as string[],
   preventDevReloadWhilePlaying: false,
   numWorkers: 4,
   localServerOptions: {

From 54c114a702cbbc7e08220d89f5dc8b3b2c96072e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 15 Aug 2025 05:26:11 +0300
Subject: [PATCH 709/753] feat(big): items are now rendered in 3d not in 2d and
 it makes insanely huge difference on the game visuals

---
 experiments/three-item.html       |  13 +
 experiments/three-item.ts         | 108 ++++++++
 renderer/viewer/three/entities.ts |  80 ++----
 renderer/viewer/three/itemMesh.ts | 427 ++++++++++++++++++++++++++++++
 4 files changed, 575 insertions(+), 53 deletions(-)
 create mode 100644 experiments/three-item.html
 create mode 100644 experiments/three-item.ts
 create mode 100644 renderer/viewer/three/itemMesh.ts

diff --git a/experiments/three-item.html b/experiments/three-item.html
new file mode 100644
index 00000000..70155c50
--- /dev/null
+++ b/experiments/three-item.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Minecraft Item Viewer</title>
+    <style>
+        body { margin: 0; overflow: hidden; }
+        canvas { display: block; }
+    </style>
+</head>
+<body>
+    <script type="module" src="./three-item.ts"></script>
+</body>
+</html>
diff --git a/experiments/three-item.ts b/experiments/three-item.ts
new file mode 100644
index 00000000..b9d492fe
--- /dev/null
+++ b/experiments/three-item.ts
@@ -0,0 +1,108 @@
+import * as THREE from 'three'
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
+import itemsAtlas from 'mc-assets/dist/itemsAtlasLegacy.png'
+import { createItemMeshFromCanvas, createItemMesh } from '../renderer/viewer/three/itemMesh'
+
+// Create scene, camera and renderer
+const scene = new THREE.Scene()
+const camera = new THREE.PerspectiveCamera(75, window.innerWidth / window.innerHeight, 0.1, 1000)
+const renderer = new THREE.WebGLRenderer({ antialias: true })
+renderer.setSize(window.innerWidth, window.innerHeight)
+document.body.appendChild(renderer.domElement)
+
+// Setup camera and controls
+camera.position.set(0, 0, 3)
+const controls = new OrbitControls(camera, renderer.domElement)
+controls.enableDamping = true
+
+// Background and lights
+scene.background = new THREE.Color(0x333333)
+const ambientLight = new THREE.AmbientLight(0xffffff, 0.7)
+scene.add(ambientLight)
+
+// Animation loop
+function animate () {
+  requestAnimationFrame(animate)
+  controls.update()
+  renderer.render(scene, camera)
+}
+
+async function setupItemMesh () {
+  try {
+    const loader = new THREE.TextureLoader()
+    const atlasTexture = await loader.loadAsync(itemsAtlas)
+
+    // Pixel-art configuration
+    atlasTexture.magFilter = THREE.NearestFilter
+    atlasTexture.minFilter = THREE.NearestFilter
+    atlasTexture.generateMipmaps = false
+    atlasTexture.wrapS = atlasTexture.wrapT = THREE.ClampToEdgeWrapping
+
+    // Extract the tile at x=2, y=0 (16x16)
+    const tileSize = 16
+    const tileX = 2
+    const tileY = 0
+
+    const canvas = document.createElement('canvas')
+    canvas.width = tileSize
+    canvas.height = tileSize
+    const ctx = canvas.getContext('2d')!
+
+    ctx.imageSmoothingEnabled = false
+    ctx.drawImage(
+      atlasTexture.image,
+      tileX * tileSize,
+      tileY * tileSize,
+      tileSize,
+      tileSize,
+      0,
+      0,
+      tileSize,
+      tileSize
+    )
+
+    // Test both approaches - working manual extraction:
+    const meshOld = createItemMeshFromCanvas(canvas, { depth: 0.1 })
+    meshOld.position.x = -1
+    meshOld.rotation.x = -Math.PI / 12
+    meshOld.rotation.y = Math.PI / 12
+    scene.add(meshOld)
+
+    // And new unified function:
+    const atlasWidth = atlasTexture.image.width
+    const atlasHeight = atlasTexture.image.height
+    const u = (tileX * tileSize) / atlasWidth
+    const v = (tileY * tileSize) / atlasHeight
+    const sizeX = tileSize / atlasWidth
+    const sizeY = tileSize / atlasHeight
+
+    console.log('Debug texture coords:', {u, v, sizeX, sizeY, atlasWidth, atlasHeight})
+
+    const resultNew = createItemMesh(atlasTexture, {
+      u, v, sizeX, sizeY
+    }, {
+      faceCamera: false,
+      use3D: true,
+      depth: 0.1
+    })
+
+    resultNew.mesh.position.x = 1
+    resultNew.mesh.rotation.x = -Math.PI / 12
+    resultNew.mesh.rotation.y = Math.PI / 12
+    scene.add(resultNew.mesh)
+
+    animate()
+  } catch (err) {
+    console.error('Failed to create item mesh:', err)
+  }
+}
+
+// Handle window resize
+window.addEventListener('resize', () => {
+  camera.aspect = window.innerWidth / window.innerHeight
+  camera.updateProjectionMatrix()
+  renderer.setSize(window.innerWidth, window.innerHeight)
+})
+
+// Start
+setupItemMesh()
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 24f64803..b1828d92 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -21,6 +21,7 @@ import { loadSkinFromUsername, loadSkinImage, stevePngUrl } from '../lib/utils/s
 import { renderComponent } from '../sign-renderer'
 import { createCanvas } from '../lib/utils'
 import { getBlockMeshFromModel } from './holdingBlock'
+import { createItemMesh } from './itemMesh'
 import * as Entity from './entity/EntityMesh'
 import { getMesh } from './entity/EntityMesh'
 import { WalkingGeneralSwing } from './entity/animations'
@@ -741,71 +742,42 @@ export class Entities {
       return {
         mesh: outerGroup,
         isBlock: true,
-        itemsTexture: null,
-        itemsTextureFlipped: null,
         modelName: textureUv.modelName,
       }
     }
 
-    // TODO: Render proper model (especially for blocks) instead of flat texture
+    // Render proper 3D model for items
     if (textureUv) {
       const textureThree = textureUv.renderInfo?.texture === 'blocks' ? this.worldRenderer.material.map! : this.worldRenderer.itemsTexture
-      // todo use geometry buffer uv instead!
       const { u, v, su, sv } = textureUv
-      const size = undefined
-      const itemsTexture = textureThree.clone()
-      itemsTexture.flipY = true
-      const sizeY = (sv ?? size)!
-      const sizeX = (su ?? size)!
-      itemsTexture.offset.set(u, 1 - v - sizeY)
-      itemsTexture.repeat.set(sizeX, sizeY)
-      itemsTexture.needsUpdate = true
-      itemsTexture.magFilter = THREE.NearestFilter
-      itemsTexture.minFilter = THREE.NearestFilter
-      let mesh: THREE.Object3D
-      let itemsTextureFlipped: THREE.Texture | undefined
-      if (faceCamera) {
-        const spriteMat = new THREE.SpriteMaterial({
-          map: itemsTexture,
-          transparent: true,
-          alphaTest: 0.1,
-        })
-        mesh = new THREE.Sprite(spriteMat)
-      } else {
-        itemsTextureFlipped = itemsTexture.clone()
-        itemsTextureFlipped.repeat.x *= -1
-        itemsTextureFlipped.needsUpdate = true
-        itemsTextureFlipped.offset.set(u + (sizeX), 1 - v - sizeY)
-        const material = new THREE.MeshStandardMaterial({
-          map: itemsTexture,
-          transparent: true,
-          alphaTest: 0.1,
-        })
-        const materialFlipped = new THREE.MeshStandardMaterial({
-          map: itemsTextureFlipped,
-          transparent: true,
-          alphaTest: 0.1,
-        })
-        mesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 0), [
-          // top left and right bottom are black box materials others are transparent
-          new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
-          new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
-          material, materialFlipped,
-        ])
-      }
+      const sizeX = su ?? 1 // su is actually width
+      const sizeY = sv ?? 1 // sv is actually height
+
+      // Use the new unified item mesh function
+      const result = createItemMesh(textureThree, {
+        u,
+        v,
+        sizeX,
+        sizeY
+      }, {
+        faceCamera,
+        use3D: !faceCamera, // Only use 3D for non-camera-facing items
+        depth: 0.03
+      })
+
       let SCALE = 1
       if (specificProps['minecraft:display_context'] === 'ground') {
         SCALE = 0.5
       } else if (specificProps['minecraft:display_context'] === 'thirdperson') {
         SCALE = 6
       }
-      mesh.scale.set(SCALE, SCALE, SCALE)
+      result.mesh.scale.set(SCALE, SCALE, SCALE)
+
       return {
-        mesh,
+        mesh: result.mesh,
         isBlock: false,
-        itemsTexture,
-        itemsTextureFlipped,
         modelName: textureUv.modelName,
+        cleanup: result.cleanup
       }
     }
   }
@@ -905,8 +877,9 @@ export class Entities {
 
             group.additionalCleanup = () => {
               // important: avoid texture memory leak and gpu slowdown
-              object.itemsTexture?.dispose()
-              object.itemsTextureFlipped?.dispose()
+              if (object.cleanup) {
+                object.cleanup()
+              }
             }
           }
         }
@@ -1295,8 +1268,9 @@ export class Entities {
           const group = new THREE.Object3D()
           group['additionalCleanup'] = () => {
             // important: avoid texture memory leak and gpu slowdown
-            itemObject.itemsTexture?.dispose()
-            itemObject.itemsTextureFlipped?.dispose()
+            if (itemObject.cleanup) {
+              itemObject.cleanup()
+            }
           }
           const itemMesh = itemObject.mesh
           group.rotation.z = -Math.PI / 16
diff --git a/renderer/viewer/three/itemMesh.ts b/renderer/viewer/three/itemMesh.ts
new file mode 100644
index 00000000..4a886675
--- /dev/null
+++ b/renderer/viewer/three/itemMesh.ts
@@ -0,0 +1,427 @@
+import * as THREE from 'three'
+
+export interface Create3DItemMeshOptions {
+  depth?: number
+  pixelSize?: number
+}
+
+export interface Create3DItemMeshResult {
+  geometry: THREE.BufferGeometry
+  totalVertices: number
+  totalTriangles: number
+}
+
+/**
+ * Creates a 3D item geometry with front/back faces and connecting edges
+ * from a canvas containing the item texture
+ */
+export function create3DItemMesh (
+  canvas: HTMLCanvasElement,
+  options: Create3DItemMeshOptions = {}
+): Create3DItemMeshResult {
+  const { depth = 0.03, pixelSize } = options
+
+  // Validate canvas dimensions
+  if (canvas.width <= 0 || canvas.height <= 0) {
+    throw new Error(`Invalid canvas dimensions: ${canvas.width}x${canvas.height}`)
+  }
+
+  const ctx = canvas.getContext('2d')!
+  const imageData = ctx.getImageData(0, 0, canvas.width, canvas.height)
+  const { data } = imageData
+
+  const w = canvas.width
+  const h = canvas.height
+  const halfDepth = depth / 2
+  const actualPixelSize = pixelSize ?? (1 / Math.max(w, h))
+
+  // Find opaque pixels
+  const isOpaque = (x: number, y: number) => {
+    if (x < 0 || y < 0 || x >= w || y >= h) return false
+    const i = (y * w + x) * 4
+    return data[i + 3] > 128 // alpha > 128
+  }
+
+  const vertices: number[] = []
+  const indices: number[] = []
+  const uvs: number[] = []
+  const normals: number[] = []
+
+  let vertexIndex = 0
+
+  // Helper to add a vertex
+  const addVertex = (x: number, y: number, z: number, u: number, v: number, nx: number, ny: number, nz: number) => {
+    vertices.push(x, y, z)
+    uvs.push(u, v)
+    normals.push(nx, ny, nz)
+    return vertexIndex++
+  }
+
+  // Helper to add a quad (two triangles)
+  const addQuad = (v0: number, v1: number, v2: number, v3: number) => {
+    indices.push(v0, v1, v2, v0, v2, v3)
+  }
+
+  // Convert pixel coordinates to world coordinates
+  const pixelToWorld = (px: number, py: number) => {
+    const x = (px / w - 0.5) * actualPixelSize * w
+    const y = -(py / h - 0.5) * actualPixelSize * h
+    return { x, y }
+  }
+
+  // Create a grid of vertices for front and back faces
+  const frontVertices: Array<Array<number | null>> = Array.from({ length: h + 1 }, () => Array.from({ length: w + 1 }, () => null))
+  const backVertices: Array<Array<number | null>> = Array.from({ length: h + 1 }, () => Array.from({ length: w + 1 }, () => null))
+
+  // Create vertices at pixel corners
+  for (let py = 0; py <= h; py++) {
+    for (let px = 0; px <= w; px++) {
+      const { x, y } = pixelToWorld(px - 0.5, py - 0.5)
+
+      // UV coordinates should map to the texture space of the extracted tile
+      const u = px / w
+      const v = py / h
+
+      // Check if this vertex is needed for any face or edge
+      let needVertex = false
+
+      // Check all 4 adjacent pixels to see if any are opaque
+      const adjacentPixels = [
+        [px - 1, py - 1], // top-left pixel
+        [px, py - 1], // top-right pixel
+        [px - 1, py], // bottom-left pixel
+        [px, py] // bottom-right pixel
+      ]
+
+      for (const [adjX, adjY] of adjacentPixels) {
+        if (isOpaque(adjX, adjY)) {
+          needVertex = true
+          break
+        }
+      }
+
+      if (needVertex) {
+        frontVertices[py][px] = addVertex(x, y, halfDepth, u, v, 0, 0, 1)
+        backVertices[py][px] = addVertex(x, y, -halfDepth, u, v, 0, 0, -1)
+      }
+    }
+  }
+
+  // Create front and back faces
+  for (let py = 0; py < h; py++) {
+    for (let px = 0; px < w; px++) {
+      if (!isOpaque(px, py)) continue
+
+      const v00 = frontVertices[py][px]
+      const v10 = frontVertices[py][px + 1]
+      const v11 = frontVertices[py + 1][px + 1]
+      const v01 = frontVertices[py + 1][px]
+
+      const b00 = backVertices[py][px]
+      const b10 = backVertices[py][px + 1]
+      const b11 = backVertices[py + 1][px + 1]
+      const b01 = backVertices[py + 1][px]
+
+      if (v00 !== null && v10 !== null && v11 !== null && v01 !== null) {
+        // Front face
+        addQuad(v00, v10, v11, v01)
+      }
+
+      if (b00 !== null && b10 !== null && b11 !== null && b01 !== null) {
+        // Back face (reversed winding)
+        addQuad(b10, b00, b01, b11)
+      }
+    }
+  }
+
+  // Create edge faces for each side of the pixel with proper UVs
+  for (let py = 0; py < h; py++) {
+    for (let px = 0; px < w; px++) {
+      if (!isOpaque(px, py)) continue
+
+      const pixelU = (px + 0.5) / w // Center of current pixel
+      const pixelV = (py + 0.5) / h
+
+      // Left edge (x = px)
+      if (!isOpaque(px - 1, py)) {
+        const f0 = frontVertices[py][px]
+        const f1 = frontVertices[py + 1][px]
+        const b0 = backVertices[py][px]
+        const b1 = backVertices[py + 1][px]
+
+        if (f0 !== null && f1 !== null && b0 !== null && b1 !== null) {
+          // Create new vertices for edge with current pixel's UV
+          const ef0 = addVertex(vertices[f0 * 3], vertices[f0 * 3 + 1], vertices[f0 * 3 + 2], pixelU, pixelV, -1, 0, 0)
+          const ef1 = addVertex(vertices[f1 * 3], vertices[f1 * 3 + 1], vertices[f1 * 3 + 2], pixelU, pixelV, -1, 0, 0)
+          const eb1 = addVertex(vertices[b1 * 3], vertices[b1 * 3 + 1], vertices[b1 * 3 + 2], pixelU, pixelV, -1, 0, 0)
+          const eb0 = addVertex(vertices[b0 * 3], vertices[b0 * 3 + 1], vertices[b0 * 3 + 2], pixelU, pixelV, -1, 0, 0)
+          addQuad(ef0, ef1, eb1, eb0)
+        }
+      }
+
+      // Right edge (x = px + 1)
+      if (!isOpaque(px + 1, py)) {
+        const f0 = frontVertices[py + 1][px + 1]
+        const f1 = frontVertices[py][px + 1]
+        const b0 = backVertices[py + 1][px + 1]
+        const b1 = backVertices[py][px + 1]
+
+        if (f0 !== null && f1 !== null && b0 !== null && b1 !== null) {
+          const ef0 = addVertex(vertices[f0 * 3], vertices[f0 * 3 + 1], vertices[f0 * 3 + 2], pixelU, pixelV, 1, 0, 0)
+          const ef1 = addVertex(vertices[f1 * 3], vertices[f1 * 3 + 1], vertices[f1 * 3 + 2], pixelU, pixelV, 1, 0, 0)
+          const eb1 = addVertex(vertices[b1 * 3], vertices[b1 * 3 + 1], vertices[b1 * 3 + 2], pixelU, pixelV, 1, 0, 0)
+          const eb0 = addVertex(vertices[b0 * 3], vertices[b0 * 3 + 1], vertices[b0 * 3 + 2], pixelU, pixelV, 1, 0, 0)
+          addQuad(ef0, ef1, eb1, eb0)
+        }
+      }
+
+      // Top edge (y = py)
+      if (!isOpaque(px, py - 1)) {
+        const f0 = frontVertices[py][px]
+        const f1 = frontVertices[py][px + 1]
+        const b0 = backVertices[py][px]
+        const b1 = backVertices[py][px + 1]
+
+        if (f0 !== null && f1 !== null && b0 !== null && b1 !== null) {
+          const ef0 = addVertex(vertices[f0 * 3], vertices[f0 * 3 + 1], vertices[f0 * 3 + 2], pixelU, pixelV, 0, -1, 0)
+          const ef1 = addVertex(vertices[f1 * 3], vertices[f1 * 3 + 1], vertices[f1 * 3 + 2], pixelU, pixelV, 0, -1, 0)
+          const eb1 = addVertex(vertices[b1 * 3], vertices[b1 * 3 + 1], vertices[b1 * 3 + 2], pixelU, pixelV, 0, -1, 0)
+          const eb0 = addVertex(vertices[b0 * 3], vertices[b0 * 3 + 1], vertices[b0 * 3 + 2], pixelU, pixelV, 0, -1, 0)
+          addQuad(ef0, ef1, eb1, eb0)
+        }
+      }
+
+      // Bottom edge (y = py + 1)
+      if (!isOpaque(px, py + 1)) {
+        const f0 = frontVertices[py + 1][px + 1]
+        const f1 = frontVertices[py + 1][px]
+        const b0 = backVertices[py + 1][px + 1]
+        const b1 = backVertices[py + 1][px]
+
+        if (f0 !== null && f1 !== null && b0 !== null && b1 !== null) {
+          const ef0 = addVertex(vertices[f0 * 3], vertices[f0 * 3 + 1], vertices[f0 * 3 + 2], pixelU, pixelV, 0, 1, 0)
+          const ef1 = addVertex(vertices[f1 * 3], vertices[f1 * 3 + 1], vertices[f1 * 3 + 2], pixelU, pixelV, 0, 1, 0)
+          const eb1 = addVertex(vertices[b1 * 3], vertices[b1 * 3 + 1], vertices[b1 * 3 + 2], pixelU, pixelV, 0, 1, 0)
+          const eb0 = addVertex(vertices[b0 * 3], vertices[b0 * 3 + 1], vertices[b0 * 3 + 2], pixelU, pixelV, 0, 1, 0)
+          addQuad(ef0, ef1, eb1, eb0)
+        }
+      }
+    }
+  }
+
+  const geometry = new THREE.BufferGeometry()
+  geometry.setAttribute('position', new THREE.Float32BufferAttribute(vertices, 3))
+  geometry.setAttribute('uv', new THREE.Float32BufferAttribute(uvs, 2))
+  geometry.setAttribute('normal', new THREE.Float32BufferAttribute(normals, 3))
+  geometry.setIndex(indices)
+
+  // Compute normals properly
+  geometry.computeVertexNormals()
+
+  return {
+    geometry,
+    totalVertices: vertexIndex,
+    totalTriangles: indices.length / 3
+  }
+}
+
+export interface ItemTextureInfo {
+  u: number
+  v: number
+  sizeX: number
+  sizeY: number
+}
+
+export interface ItemMeshResult {
+  mesh: THREE.Object3D
+  itemsTexture?: THREE.Texture
+  itemsTextureFlipped?: THREE.Texture
+  cleanup?: () => void
+}
+
+/**
+ * Extracts item texture region to a canvas
+ */
+export function extractItemTextureToCanvas (
+  sourceTexture: THREE.Texture,
+  textureInfo: ItemTextureInfo
+): HTMLCanvasElement {
+  const { u, v, sizeX, sizeY } = textureInfo
+
+  // Calculate canvas size - fix the calculation
+  const canvasWidth = Math.max(1, Math.floor(sizeX * sourceTexture.image.width))
+  const canvasHeight = Math.max(1, Math.floor(sizeY * sourceTexture.image.height))
+
+  const canvas = document.createElement('canvas')
+  canvas.width = canvasWidth
+  canvas.height = canvasHeight
+
+  const ctx = canvas.getContext('2d')!
+  ctx.imageSmoothingEnabled = false
+
+  // Draw the item texture region to canvas
+  ctx.drawImage(
+    sourceTexture.image,
+    u * sourceTexture.image.width,
+    v * sourceTexture.image.height,
+    sizeX * sourceTexture.image.width,
+    sizeY * sourceTexture.image.height,
+    0,
+    0,
+    canvas.width,
+    canvas.height
+  )
+
+  return canvas
+}
+
+/**
+ * Creates either a 2D or 3D item mesh based on parameters
+ */
+export function createItemMesh (
+  sourceTexture: THREE.Texture,
+  textureInfo: ItemTextureInfo,
+  options: {
+    faceCamera?: boolean
+    use3D?: boolean
+    depth?: number
+  } = {}
+): ItemMeshResult {
+  const { faceCamera = false, use3D = true, depth = 0.03 } = options
+  const { u, v, sizeX, sizeY } = textureInfo
+
+  if (faceCamera) {
+    // Create sprite for camera-facing items
+    const itemsTexture = sourceTexture.clone()
+    itemsTexture.flipY = true
+    itemsTexture.offset.set(u, 1 - v - sizeY)
+    itemsTexture.repeat.set(sizeX, sizeY)
+    itemsTexture.needsUpdate = true
+    itemsTexture.magFilter = THREE.NearestFilter
+    itemsTexture.minFilter = THREE.NearestFilter
+
+    const spriteMat = new THREE.SpriteMaterial({
+      map: itemsTexture,
+      transparent: true,
+      alphaTest: 0.1,
+    })
+    const mesh = new THREE.Sprite(spriteMat)
+
+    return {
+      mesh,
+      itemsTexture,
+      cleanup () {
+        itemsTexture.dispose()
+      }
+    }
+  }
+
+  if (use3D) {
+    // Try to create 3D mesh
+    try {
+      const canvas = extractItemTextureToCanvas(sourceTexture, textureInfo)
+      const { geometry } = create3DItemMesh(canvas, { depth })
+
+      // Create texture from canvas for the 3D mesh
+      const itemsTexture = new THREE.CanvasTexture(canvas)
+      itemsTexture.magFilter = THREE.NearestFilter
+      itemsTexture.minFilter = THREE.NearestFilter
+      itemsTexture.wrapS = itemsTexture.wrapT = THREE.ClampToEdgeWrapping
+      itemsTexture.flipY = false
+      itemsTexture.needsUpdate = true
+
+      const material = new THREE.MeshStandardMaterial({
+        map: itemsTexture,
+        side: THREE.DoubleSide,
+        transparent: true,
+        alphaTest: 0.1,
+      })
+
+      const mesh = new THREE.Mesh(geometry, material)
+
+      return {
+        mesh,
+        itemsTexture,
+        cleanup () {
+          itemsTexture.dispose()
+          geometry.dispose()
+          if (material.map) material.map.dispose()
+          material.dispose()
+        }
+      }
+    } catch (error) {
+      console.warn('Failed to create 3D item mesh, falling back to 2D:', error)
+      // Fall through to 2D rendering
+    }
+  }
+
+  // Fallback to 2D flat rendering
+  const itemsTexture = sourceTexture.clone()
+  itemsTexture.flipY = true
+  itemsTexture.offset.set(u, 1 - v - sizeY)
+  itemsTexture.repeat.set(sizeX, sizeY)
+  itemsTexture.needsUpdate = true
+  itemsTexture.magFilter = THREE.NearestFilter
+  itemsTexture.minFilter = THREE.NearestFilter
+
+  const itemsTextureFlipped = itemsTexture.clone()
+  itemsTextureFlipped.repeat.x *= -1
+  itemsTextureFlipped.needsUpdate = true
+  itemsTextureFlipped.offset.set(u + sizeX, 1 - v - sizeY)
+
+  const material = new THREE.MeshStandardMaterial({
+    map: itemsTexture,
+    transparent: true,
+    alphaTest: 0.1,
+  })
+  const materialFlipped = new THREE.MeshStandardMaterial({
+    map: itemsTextureFlipped,
+    transparent: true,
+    alphaTest: 0.1,
+  })
+  const mesh = new THREE.Mesh(new THREE.BoxGeometry(1, 1, 0), [
+    new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
+    new THREE.MeshBasicMaterial({ color: 0x00_00_00 }), new THREE.MeshBasicMaterial({ color: 0x00_00_00 }),
+    material, materialFlipped,
+  ])
+
+  return {
+    mesh,
+    itemsTexture,
+    itemsTextureFlipped,
+    cleanup () {
+      itemsTexture.dispose()
+      itemsTextureFlipped.dispose()
+      material.dispose()
+      materialFlipped.dispose()
+    }
+  }
+}
+
+/**
+ * Creates a complete 3D item mesh from a canvas texture
+ */
+export function createItemMeshFromCanvas (
+  canvas: HTMLCanvasElement,
+  options: Create3DItemMeshOptions = {}
+): THREE.Mesh {
+  const { geometry } = create3DItemMesh(canvas, options)
+
+  // Base color texture for the item
+  const colorTexture = new THREE.CanvasTexture(canvas)
+  colorTexture.magFilter = THREE.NearestFilter
+  colorTexture.minFilter = THREE.NearestFilter
+  colorTexture.wrapS = colorTexture.wrapT = THREE.ClampToEdgeWrapping
+  colorTexture.flipY = false // Important for canvas textures
+  colorTexture.needsUpdate = true
+
+  // Material - no transparency, no alpha test needed for edges
+  const material = new THREE.MeshBasicMaterial({
+    map: colorTexture,
+    side: THREE.DoubleSide,
+    transparent: true,
+    alphaTest: 0.1
+  })
+
+  return new THREE.Mesh(geometry, material)
+}

From cc4f705aea814c763238a19f96229a12958d7a4c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Fri, 15 Aug 2025 07:46:52 +0300
Subject: [PATCH 710/753] feat: new experimental chunk loading logic by forcing
 into spiral queue feat: add highly experimental logic to try to self-restore
 any issues with chunks loading by automating f3+a action. write debug info
 into chat for now. can be disabled feat: rework chunks debug screen showing
 actually useful information now

---
 renderer/playground/shared.ts           |  4 +-
 renderer/viewer/lib/worldDataEmitter.ts | 73 +++++++++++++++++++------
 renderer/viewer/three/entities.ts       |  1 -
 renderer/viewer/three/itemMesh.ts       | 10 ++--
 src/appViewer.ts                        |  7 +++
 src/defaultOptions.ts                   |  1 +
 src/react/ChunksDebug.tsx               |  5 +-
 src/react/ChunksDebugScreen.tsx         | 53 ++++++++++++++++--
 8 files changed, 125 insertions(+), 29 deletions(-)

diff --git a/renderer/playground/shared.ts b/renderer/playground/shared.ts
index ba58a57f..9d12fae9 100644
--- a/renderer/playground/shared.ts
+++ b/renderer/playground/shared.ts
@@ -65,7 +65,7 @@ function getAllMethods (obj) {
   return [...methods] as string[]
 }
 
-export const delayedIterator = async <T> (arr: T[], delay: number, exec: (item: T, index: number) => void, chunkSize = 1) => {
+export const delayedIterator = async <T> (arr: T[], delay: number, exec: (item: T, index: number) => Promise<void>, chunkSize = 1) => {
   // if delay is 0 then don't use setTimeout
   for (let i = 0; i < arr.length; i += chunkSize) {
     if (delay) {
@@ -74,6 +74,6 @@ export const delayedIterator = async <T> (arr: T[], delay: number, exec: (item:
         setTimeout(resolve, delay)
       })
     }
-    exec(arr[i], i)
+    await exec(arr[i], i)
   }
 }
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index e9153af7..3bc2acd3 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -35,7 +35,15 @@ export class WorldDataEmitterWorker extends (EventEmitter as new () => TypedEmit
 }
 
 export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<WorldDataEmitterEvents>) {
+  spiralNumber = 0
+  gotPanicLastTime = false
+  panicChunksReload = () => {}
   loadedChunks: Record<ChunkPosKey, boolean>
+  private inLoading = false
+  private chunkReceiveTimes: number[] = []
+  private lastChunkReceiveTime = 0
+  public lastChunkReceiveTimeAvg = 0
+  private panicTimeout?: NodeJS.Timeout
   readonly lastPos: Vec3
   private eventListeners: Record<string, any> = {}
   private readonly emitter: WorldDataEmitter
@@ -133,12 +141,19 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
         this.emitter.emit('entity', { id: e.id, delete: true })
       },
       chunkColumnLoad: (pos: Vec3) => {
+        const now = performance.now()
+        if (this.lastChunkReceiveTime) {
+          this.chunkReceiveTimes.push(now - this.lastChunkReceiveTime)
+        }
+        this.lastChunkReceiveTime = now
+
         if (this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`]) {
           this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`](true)
           delete this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`]
         } else if (this.loadedChunks[`${pos.x},${pos.z}`]) {
           void this.loadChunk(pos, false, 'Received another chunkColumnLoad event while already loaded')
         }
+        this.chunkProgress()
       },
       chunkColumnUnload: (pos: Vec3) => {
         this.unloadChunk(pos)
@@ -219,33 +234,59 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
     const positions = generateSpiralMatrix(this.viewDistance).map(([x, z]) => new Vec3((botX + x) * 16, 0, (botZ + z) * 16))
 
     this.lastPos.update(pos)
-    await this._loadChunks(positions)
+    await this._loadChunks(positions, pos)
   }
 
-  async _loadChunks (positions: Vec3[], sliceSize = 5) {
+  chunkProgress () {
+    if (this.panicTimeout) clearTimeout(this.panicTimeout)
+    if (this.chunkReceiveTimes.length >= 5) {
+      const avgReceiveTime = this.chunkReceiveTimes.reduce((a, b) => a + b, 0) / this.chunkReceiveTimes.length
+      this.lastChunkReceiveTimeAvg = avgReceiveTime
+      const timeoutDelay = avgReceiveTime * 2 + 1000 // 2x average + 1 second
+
+      // Clear any existing timeout
+      if (this.panicTimeout) clearTimeout(this.panicTimeout)
+
+      // Set new timeout for panic reload
+      this.panicTimeout = setTimeout(() => {
+        if (!this.gotPanicLastTime && this.inLoading) {
+          console.warn('Chunk loading seems stuck, triggering panic reload')
+          this.gotPanicLastTime = true
+          this.panicChunksReload()
+        }
+      }, timeoutDelay)
+    }
+  }
+
+  async _loadChunks (positions: Vec3[], centerPos: Vec3) {
+    this.spiralNumber++
+    const { spiralNumber } = this
     // stop loading previous chunks
     for (const pos of Object.keys(this.waitingSpiralChunksLoad)) {
       this.waitingSpiralChunksLoad[pos](false)
       delete this.waitingSpiralChunksLoad[pos]
     }
 
-    const promises = [] as Array<Promise<void>>
     let continueLoading = true
+    this.inLoading = true
     await delayedIterator(positions, this.addWaitTime, async (pos) => {
-      const promise = (async () => {
-        if (!continueLoading || this.loadedChunks[`${pos.x},${pos.z}`]) return
+      if (!continueLoading || this.loadedChunks[`${pos.x},${pos.z}`]) return
 
-        if (!this.world.getColumnAt(pos)) {
-          continueLoading = await new Promise<boolean>(resolve => {
-            this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`] = resolve
-          })
-        }
-        if (!continueLoading) return
-        await this.loadChunk(pos)
-      })()
-      promises.push(promise)
+      // Wait for chunk to be available from server
+      if (!this.world.getColumnAt(pos)) {
+        continueLoading = await new Promise<boolean>(resolve => {
+          this.waitingSpiralChunksLoad[`${pos.x},${pos.z}`] = resolve
+        })
+      }
+      if (!continueLoading) return
+      await this.loadChunk(pos, undefined, `spiral ${spiralNumber} from ${centerPos.x},${centerPos.z}`)
+      this.chunkProgress()
     })
-    await Promise.all(promises)
+    if (this.panicTimeout) clearTimeout(this.panicTimeout)
+    this.inLoading = false
+    this.gotPanicLastTime = false
+    this.chunkReceiveTimes = []
+    this.lastChunkReceiveTime = 0
   }
 
   readdDebug () {
@@ -350,7 +391,7 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
         return undefined!
       }).filter(a => !!a)
       this.lastPos.update(pos)
-      void this._loadChunks(positions)
+      void this._loadChunks(positions, pos)
     } else {
       this.emitter.emit('chunkPosUpdate', { pos }) // todo-low
       this.lastPos.update(pos)
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index b1828d92..7849686b 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -762,7 +762,6 @@ export class Entities {
       }, {
         faceCamera,
         use3D: !faceCamera, // Only use 3D for non-camera-facing items
-        depth: 0.03
       })
 
       let SCALE = 1
diff --git a/renderer/viewer/three/itemMesh.ts b/renderer/viewer/three/itemMesh.ts
index 4a886675..3fa069b9 100644
--- a/renderer/viewer/three/itemMesh.ts
+++ b/renderer/viewer/three/itemMesh.ts
@@ -1,7 +1,7 @@
 import * as THREE from 'three'
 
 export interface Create3DItemMeshOptions {
-  depth?: number
+  depth: number
   pixelSize?: number
 }
 
@@ -17,9 +17,9 @@ export interface Create3DItemMeshResult {
  */
 export function create3DItemMesh (
   canvas: HTMLCanvasElement,
-  options: Create3DItemMeshOptions = {}
+  options: Create3DItemMeshOptions
 ): Create3DItemMeshResult {
-  const { depth = 0.03, pixelSize } = options
+  const { depth, pixelSize } = options
 
   // Validate canvas dimensions
   if (canvas.width <= 0 || canvas.height <= 0) {
@@ -287,7 +287,7 @@ export function createItemMesh (
     depth?: number
   } = {}
 ): ItemMeshResult {
-  const { faceCamera = false, use3D = true, depth = 0.03 } = options
+  const { faceCamera = false, use3D = true, depth = 0.04 } = options
   const { u, v, sizeX, sizeY } = textureInfo
 
   if (faceCamera) {
@@ -403,7 +403,7 @@ export function createItemMesh (
  */
 export function createItemMeshFromCanvas (
   canvas: HTMLCanvasElement,
-  options: Create3DItemMeshOptions = {}
+  options: Create3DItemMeshOptions
 ): THREE.Mesh {
   const { geometry } = create3DItemMesh(canvas, options)
 
diff --git a/src/appViewer.ts b/src/appViewer.ts
index bf01b989..879fe938 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -17,6 +17,8 @@ import { options } from './optionsStorage'
 import { ResourcesManager, ResourcesManagerTransferred } from './resourcesManager'
 import { watchOptionsAfterWorldViewInit } from './watchOptions'
 import { loadMinecraftData } from './connect'
+import { reloadChunks } from './utils'
+import { displayClientChat } from './botUtils'
 
 export interface RendererReactiveState {
   world: {
@@ -197,6 +199,11 @@ export class AppViewer {
     this.currentDisplay = 'world'
     const startPosition = bot.entity?.position ?? new Vec3(0, 64, 0)
     this.worldView = new WorldDataEmitter(world, renderDistance, startPosition)
+    this.worldView.panicChunksReload = () => {
+      if (!options.experimentalClientSelfReload) return
+      displayClientChat(`[client] client panicked due to too long loading time. Soft reloading chunks...`)
+      void reloadChunks()
+    }
     window.worldView = this.worldView
     watchOptionsAfterWorldViewInit(this.worldView)
     this.appConfigUdpate()
diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 945ad37a..95dbfd63 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -84,6 +84,7 @@ export const defaultOptions = {
     gameMode: 1
   } as any,
   preferLoadReadonly: false,
+  experimentalClientSelfReload: true,
   disableLoadPrompts: false,
   guestUsername: 'guest',
   askGuestName: true,
diff --git a/src/react/ChunksDebug.tsx b/src/react/ChunksDebug.tsx
index 7b42cf4d..2e4fa139 100644
--- a/src/react/ChunksDebug.tsx
+++ b/src/react/ChunksDebug.tsx
@@ -98,13 +98,16 @@ export default ({
                 cursor: chunk ? 'pointer' : 'default',
                 position: 'relative',
                 width: `${tileSize}px`,
+                flexDirection: 'column',
                 height: `${tileSize}px`,
+                padding: 1,
                 // pre-wrap
                 whiteSpace: 'pre',
               }}
             >
               {relX}, {relZ}{'\n'}
-              {chunk?.lines.join('\n')}
+              {chunk?.lines[0]}{'\n'}
+              <span style={{ fontSize: `${fontSize * 0.8}px` }}>{chunk?.lines[1]}</span>
             </div>
           )
         })}
diff --git a/src/react/ChunksDebugScreen.tsx b/src/react/ChunksDebugScreen.tsx
index de33e454..28b0bbc4 100644
--- a/src/react/ChunksDebugScreen.tsx
+++ b/src/react/ChunksDebugScreen.tsx
@@ -2,6 +2,8 @@ import { useEffect, useState } from 'react'
 import { useUtilsEffect } from '@zardoy/react-util'
 import { WorldRendererCommon } from 'renderer/viewer/lib/worldrendererCommon'
 import { WorldRendererThree } from 'renderer/viewer/three/worldrendererThree'
+import { Vec3 } from 'vec3'
+import { generateSpiralMatrix } from 'flying-squid/dist/utils'
 import Screen from './Screen'
 import ChunksDebug, { ChunkDebug } from './ChunksDebug'
 import { useIsModalActive } from './utilsApp'
@@ -12,6 +14,10 @@ const Inner = () => {
   const [update, setUpdate] = useState(0)
 
   useUtilsEffect(({ interval }) => {
+    const up = () => {
+      // setUpdate(u => u + 1)
+    }
+    bot.on('chunkColumnLoad', up)
     interval(
       500,
       () => {
@@ -20,15 +26,46 @@ const Inner = () => {
         setUpdate(u => u + 1)
       }
     )
+    return () => {
+      bot.removeListener('chunkColumnLoad', up)
+    }
   }, [])
 
+  // Track first load time for all chunks
+  const allLoadTimes = Object.values(worldView!.debugChunksInfo)
+    .map(chunk => chunk?.loads[0]?.time ?? Infinity)
+    .filter(time => time !== Infinity)
+    .sort((a, b) => a - b)
+
+  const allSpiralChunks = Object.fromEntries(generateSpiralMatrix(worldView!.viewDistance).map(pos => [`${pos[0]},${pos[1]}`, pos]))
+
   const mapChunk = (key: string, state: ChunkDebug['state']): ChunkDebug => {
+    const x = Number(key.split(',')[0])
+    const z = Number(key.split(',')[1])
+    const chunkX = Math.floor(x / 16)
+    const chunkZ = Math.floor(z / 16)
+
+    delete allSpiralChunks[`${chunkX},${chunkZ}`]
     const chunk = worldView!.debugChunksInfo[key]
+    const firstLoadTime = chunk?.loads[0]?.time
+    const loadIndex = firstLoadTime ? allLoadTimes.indexOf(firstLoadTime) + 1 : 0
+    // const timeSinceFirstLoad = firstLoadTime ? firstLoadTime - allLoadTimes[0] : 0
+    const timeSinceFirstLoad = firstLoadTime ? firstLoadTime - allLoadTimes[0] : 0
+    let line = ''
+    let line2 = ''
+    if (loadIndex) {
+      line = `${loadIndex}`
+      line2 = `${timeSinceFirstLoad}ms`
+    }
+    if (chunk?.loads.length > 1) {
+      line += ` - ${chunk.loads.length}`
+    }
+
     return {
-      x: Number(key.split(',')[0]),
-      z: Number(key.split(',')[1]),
+      x,
+      z,
       state,
-      lines: [String(chunk?.loads.length ?? 0)],
+      lines: [line, line2],
       sidebarLines: [
         `loads: ${chunk?.loads?.map(l => `${l.reason} ${l.dataLength} ${l.time}`).join('\n')}`,
         // `blockUpdates: ${chunk.blockUpdates}`,
@@ -55,14 +92,22 @@ const Inner = () => {
 
   const chunksDone = Object.keys(world.finishedChunks).map(key => mapChunk(key, 'done'))
 
+
+  const chunksWaitingOrder = Object.values(allSpiralChunks).map(([x, z]) => {
+    const pos = new Vec3(x * 16, 0, z * 16)
+    if (bot.world.getColumnAt(pos) === null) return null
+    return mapChunk(`${pos.x},${pos.z}`, 'order-queued')
+  }).filter(a => !!a)
+
   const allChunks = [
     ...chunksWaitingServer,
     ...chunksWaitingClient,
     ...clientProcessingChunks,
     ...chunksDone,
     ...chunksDoneEmpty,
+    ...chunksWaitingOrder,
   ]
-  return <Screen title="Chunks Debug">
+  return <Screen title={`Chunks Debug (avg: ${worldView!.lastChunkReceiveTimeAvg.toFixed(1)}ms)`}>
     <ChunksDebug
       chunks={allChunks}
       playerChunk={{

From e1293b6cb3ee73889a75c957c8c0d14cf7661b10 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 16 Aug 2025 09:15:37 +0300
Subject: [PATCH 711/753] - Introduced a patchAssets script to apply custom
 textures to the blocks and items atlases. - Enhanced the ThreeJsSound class
 to support sound playback timeout and volume adjustments. - Added a custom
 sound system to handle named sound effects with metadata.

---
 assets/customTextures/readme.md       |   2 +
 renderer/viewer/three/threeJsSound.ts |  40 ++++++--
 rsbuild.config.ts                     |   4 +
 scripts/patchAssets.ts                | 137 ++++++++++++++++++++++++++
 src/basicSounds.ts                    |  30 +++++-
 src/defaultOptions.ts                 |   1 +
 src/react/Slider.tsx                  |  58 ++++++++++-
 src/sounds/botSoundSystem.ts          |  11 ++-
 src/sounds/customSoundSystem.ts       |  44 +++++++++
 src/sounds/soundsMap.ts               |  10 +-
 src/watchOptions.ts                   |   4 +
 11 files changed, 323 insertions(+), 18 deletions(-)
 create mode 100644 assets/customTextures/readme.md
 create mode 100644 scripts/patchAssets.ts
 create mode 100644 src/sounds/customSoundSystem.ts

diff --git a/assets/customTextures/readme.md b/assets/customTextures/readme.md
new file mode 100644
index 00000000..e2a78c20
--- /dev/null
+++ b/assets/customTextures/readme.md
@@ -0,0 +1,2 @@
+here you can place custom textures for bundled files (blocks/items) e.g. blocks/stone.png
+get file names from here (blocks/items) https://zardoy.github.io/mc-assets/
diff --git a/renderer/viewer/three/threeJsSound.ts b/renderer/viewer/three/threeJsSound.ts
index 46aefda9..699bb2cc 100644
--- a/renderer/viewer/three/threeJsSound.ts
+++ b/renderer/viewer/three/threeJsSound.ts
@@ -2,7 +2,7 @@ import * as THREE from 'three'
 import { WorldRendererThree } from './worldrendererThree'
 
 export interface SoundSystem {
-  playSound: (position: { x: number, y: number, z: number }, path: string, volume?: number, pitch?: number) => void
+  playSound: (position: { x: number, y: number, z: number }, path: string, volume?: number, pitch?: number, timeout?: number) => void
   destroy: () => void
 }
 
@@ -10,7 +10,17 @@ export class ThreeJsSound implements SoundSystem {
   audioListener: THREE.AudioListener | undefined
   private readonly activeSounds = new Set<THREE.PositionalAudio>()
   private readonly audioContext: AudioContext | undefined
+  private readonly soundVolumes = new Map<THREE.PositionalAudio, number>()
+  baseVolume = 1
+
   constructor (public worldRenderer: WorldRendererThree) {
+    worldRenderer.onWorldSwitched.push(() => {
+      this.stopAll()
+    })
+
+    worldRenderer.onReactiveConfigUpdated('volume', (volume) => {
+      this.changeVolume(volume)
+    })
   }
 
   initAudioListener () {
@@ -19,20 +29,24 @@ export class ThreeJsSound implements SoundSystem {
     this.worldRenderer.camera.add(this.audioListener)
   }
 
-  playSound (position: { x: number, y: number, z: number }, path: string, volume = 1, pitch = 1) {
+  playSound (position: { x: number, y: number, z: number }, path: string, volume = 1, pitch = 1, timeout = 500) {
     this.initAudioListener()
 
     const sound = new THREE.PositionalAudio(this.audioListener!)
     this.activeSounds.add(sound)
+    this.soundVolumes.set(sound, volume)
 
     const audioLoader = new THREE.AudioLoader()
     const start = Date.now()
     void audioLoader.loadAsync(path).then((buffer) => {
-      if (Date.now() - start > 500) return
+      if (Date.now() - start > timeout) {
+        console.warn('Ignored playing sound', path, 'due to timeout:', timeout, 'ms <', Date.now() - start, 'ms')
+        return
+      }
       // play
       sound.setBuffer(buffer)
       sound.setRefDistance(20)
-      sound.setVolume(volume)
+      sound.setVolume(volume * this.baseVolume)
       sound.setPlaybackRate(pitch) // set the pitch
       this.worldRenderer.scene.add(sound)
       // set sound position
@@ -43,21 +57,35 @@ export class ThreeJsSound implements SoundSystem {
           sound.disconnect()
         }
         this.activeSounds.delete(sound)
+        this.soundVolumes.delete(sound)
         audioLoader.manager.itemEnd(path)
       }
       sound.play()
     })
   }
 
-  destroy () {
-    // Stop and clean up all active sounds
+  stopAll () {
     for (const sound of this.activeSounds) {
+      if (!sound) continue
       sound.stop()
       if (sound.source) {
         sound.disconnect()
       }
+      this.worldRenderer.scene.remove(sound)
     }
+    this.activeSounds.clear()
+    this.soundVolumes.clear()
+  }
 
+  changeVolume (volume: number) {
+    this.baseVolume = volume
+    for (const [sound, individualVolume] of this.soundVolumes) {
+      sound.setVolume(individualVolume * this.baseVolume)
+    }
+  }
+
+  destroy () {
+    this.stopAll()
     // Remove and cleanup audio listener
     if (this.audioListener) {
       this.audioListener.removeFromParent()
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
index 42d6867b..6cd6b2ed 100644
--- a/rsbuild.config.ts
+++ b/rsbuild.config.ts
@@ -240,6 +240,10 @@ const appConfig = defineConfig({
                         prep()
                     })
                     build.onAfterBuild(async () => {
+                        if (fs.readdirSync('./assets/customTextures').length > 0) {
+                            childProcess.execSync('tsx ./scripts/patchAssets.ts', { stdio: 'inherit' })
+                        }
+
                         if (SINGLE_FILE_BUILD) {
                             // check that only index.html is in the dist/single folder
                             const singleBuildFiles = fs.readdirSync('./dist/single')
diff --git a/scripts/patchAssets.ts b/scripts/patchAssets.ts
new file mode 100644
index 00000000..99994f5f
--- /dev/null
+++ b/scripts/patchAssets.ts
@@ -0,0 +1,137 @@
+import blocksAtlas from 'mc-assets/dist/blocksAtlases.json'
+import itemsAtlas from 'mc-assets/dist/itemsAtlases.json'
+import * as fs from 'fs'
+import * as path from 'path'
+import sharp from 'sharp'
+
+interface AtlasFile {
+  latest: {
+    suSv: number
+    tileSize: number
+    width: number
+    height: number
+    textures: {
+      [key: string]: {
+        u: number
+        v: number
+        su: number
+        sv: number
+        tileIndex: number
+      }
+    }
+  }
+}
+
+async function patchTextureAtlas(
+  atlasType: 'blocks' | 'items',
+  atlasData: AtlasFile,
+  customTexturesDir: string,
+  distDir: string
+) {
+  // Check if custom textures directory exists and has files
+  if (!fs.existsSync(customTexturesDir) || fs.readdirSync(customTexturesDir).length === 0) {
+    return
+  }
+
+  // Find the latest atlas file
+  const atlasFiles = fs.readdirSync(distDir)
+    .filter(file => file.startsWith(`${atlasType}AtlasLatest`) && file.endsWith('.png'))
+    .sort()
+
+  if (atlasFiles.length === 0) {
+    console.log(`No ${atlasType}AtlasLatest.png found in ${distDir}`)
+    return
+  }
+
+  const latestAtlasFile = atlasFiles[atlasFiles.length - 1]
+  const atlasPath = path.join(distDir, latestAtlasFile)
+  console.log(`Patching ${atlasPath}`)
+
+  // Get atlas dimensions
+  const atlasMetadata = await sharp(atlasPath).metadata()
+  if (!atlasMetadata.width || !atlasMetadata.height) {
+    throw new Error(`Failed to get atlas dimensions for ${atlasPath}`)
+  }
+
+  // Process each custom texture
+  const customTextureFiles = fs.readdirSync(customTexturesDir)
+    .filter(file => file.endsWith('.png'))
+
+  if (customTextureFiles.length === 0) return
+
+  // Prepare composite operations
+  const composites: sharp.OverlayOptions[] = []
+
+  for (const textureFile of customTextureFiles) {
+    const textureName = path.basename(textureFile, '.png')
+
+    if (atlasData.latest.textures[textureName]) {
+      const textureData = atlasData.latest.textures[textureName]
+      const customTexturePath = path.join(customTexturesDir, textureFile)
+
+      try {
+        // Convert UV coordinates to pixel coordinates
+        const x = Math.round(textureData.u * atlasMetadata.width)
+        const y = Math.round(textureData.v * atlasMetadata.height)
+        const width = Math.round((textureData.su ?? atlasData.latest.suSv) * atlasMetadata.width)
+        const height = Math.round((textureData.sv ?? atlasData.latest.suSv) * atlasMetadata.height)
+
+        // Resize custom texture to match atlas dimensions and add to composite operations
+        const resizedTextureBuffer = await sharp(customTexturePath)
+          .resize(width, height, {
+            fit: 'fill',
+            kernel: 'nearest' // Preserve pixel art quality
+          })
+          .png()
+          .toBuffer()
+
+        composites.push({
+          input: resizedTextureBuffer,
+          left: x,
+          top: y,
+          blend: 'over'
+        })
+
+        console.log(`Prepared ${textureName} at (${x}, ${y}) with size (${width}, ${height})`)
+      } catch (error) {
+        console.error(`Failed to prepare ${textureName}:`, error)
+      }
+    } else {
+      console.warn(`Texture ${textureName} not found in ${atlasType} atlas`)
+    }
+  }
+
+  if (composites.length > 0) {
+    // Apply all patches at once using Sharp's composite
+    await sharp(atlasPath)
+      .composite(composites)
+      .png()
+      .toFile(atlasPath + '.tmp')
+
+    // Replace original with patched version
+    fs.renameSync(atlasPath + '.tmp', atlasPath)
+    console.log(`Saved patched ${atlasType} atlas to ${atlasPath}`)
+  }
+}
+
+async function main() {
+  const customBlocksDir = './assets/customTextures/blocks'
+  const customItemsDir = './assets/customTextures/items'
+  const distDir = './dist/static/image'
+
+  try {
+    // Patch blocks atlas
+    await patchTextureAtlas('blocks', blocksAtlas as unknown as AtlasFile, customBlocksDir, distDir)
+
+    // Patch items atlas
+    await patchTextureAtlas('items', itemsAtlas as unknown as AtlasFile, customItemsDir, distDir)
+
+    console.log('Texture atlas patching completed!')
+  } catch (error) {
+    console.error('Failed to patch texture atlases:', error)
+    process.exit(1)
+  }
+}
+
+// Run the script
+main()
diff --git a/src/basicSounds.ts b/src/basicSounds.ts
index 40428c6b..37f8dccd 100644
--- a/src/basicSounds.ts
+++ b/src/basicSounds.ts
@@ -43,7 +43,7 @@ export async function loadSound (path: string, contents = path) {
   }
 }
 
-export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = 500) => {
+export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = options.remoteSoundsLoadTimeout, loop = false) => {
   const soundBuffer = sounds[url]
   if (!soundBuffer) {
     const start = Date.now()
@@ -51,10 +51,10 @@ export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = 500) =
     if (cancelled || Date.now() - start > loadTimeout) return
   }
 
-  return playSound(url, soundVolume)
+  return playSound(url, soundVolume, loop)
 }
 
-export async function playSound (url, soundVolume = 1) {
+export async function playSound (url, soundVolume = 1, loop = false) {
   const volume = soundVolume * (options.volume / 100)
 
   if (!volume) return
@@ -75,6 +75,7 @@ export async function playSound (url, soundVolume = 1) {
   const gainNode = audioContext.createGain()
   const source = audioContext.createBufferSource()
   source.buffer = soundBuffer
+  source.loop = loop
   source.connect(gainNode)
   gainNode.connect(audioContext.destination)
   gainNode.gain.value = volume
@@ -99,6 +100,16 @@ export async function playSound (url, soundVolume = 1) {
     onEnded (callback: () => void) {
       callbacks.push(callback)
     },
+    stop () {
+      try {
+        source.stop()
+        // Remove from active sounds
+        const index = activeSounds.findIndex(s => s.source === source)
+        if (index !== -1) activeSounds.splice(index, 1)
+      } catch (err) {
+        console.warn('Failed to stop sound:', err)
+      }
+    },
   }
 }
 
@@ -113,6 +124,19 @@ export function stopAllSounds () {
   activeSounds.length = 0
 }
 
+export function stopSound (url: string) {
+  const soundIndex = activeSounds.findIndex(s => s.source.buffer === sounds[url])
+  if (soundIndex !== -1) {
+    const { source } = activeSounds[soundIndex]
+    try {
+      source.stop()
+    } catch (err) {
+      console.warn('Failed to stop sound:', err)
+    }
+    activeSounds.splice(soundIndex, 1)
+  }
+}
+
 export function changeVolumeOfCurrentlyPlayingSounds (newVolume: number) {
   const normalizedVolume = newVolume / 100
   for (const { gainNode, volumeMultiplier } of activeSounds) {
diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 95dbfd63..378cd14a 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -85,6 +85,7 @@ export const defaultOptions = {
   } as any,
   preferLoadReadonly: false,
   experimentalClientSelfReload: true,
+  remoteSoundsLoadTimeout: 500,
   disableLoadPrompts: false,
   guestUsername: 'guest',
   askGuestName: true,
diff --git a/src/react/Slider.tsx b/src/react/Slider.tsx
index e177578c..2a068264 100644
--- a/src/react/Slider.tsx
+++ b/src/react/Slider.tsx
@@ -1,5 +1,5 @@
 // Slider.tsx
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useRef, useCallback } from 'react'
 import styles from './slider.module.css'
 import SharedHudVars from './SharedHudVars'
 
@@ -12,6 +12,7 @@ interface Props extends React.ComponentProps<'div'> {
   min?: number;
   max?: number;
   disabledReason?: string;
+  throttle?: number | false; // milliseconds, default 100, false to disable
 
   updateValue?: (value: number) => void;
   updateOnDragEnd?: boolean;
@@ -26,15 +27,24 @@ const Slider: React.FC<Props> = ({
   min = 0,
   max = 100,
   disabledReason,
+  throttle = 0,
 
   updateOnDragEnd = false,
   updateValue,
   ...divProps
 }) => {
+  label = translate(label)
+  disabledReason = translate(disabledReason)
+  valueDisplay = typeof valueDisplay === 'string' ? translate(valueDisplay) : valueDisplay
+
   const [value, setValue] = useState(valueProp)
   const getRatio = (v = value) => Math.max(Math.min((v - min) / (max - min), 1), 0)
   const [ratio, setRatio] = useState(getRatio())
 
+  // Throttling refs
+  const timeoutRef = useRef<NodeJS.Timeout | null>(null)
+  const lastValueRef = useRef<number>(valueProp)
+
   useEffect(() => {
     setValue(valueProp)
   }, [valueProp])
@@ -42,14 +52,52 @@ const Slider: React.FC<Props> = ({
     setRatio(getRatio())
   }, [value, min, max])
 
-  const fireValueUpdate = (dragEnd: boolean, v = value) => {
+  const throttledUpdateValue = useCallback((newValue: number, dragEnd: boolean) => {
     if (updateOnDragEnd !== dragEnd) return
-    updateValue?.(v)
+    if (!updateValue) return
+
+    lastValueRef.current = newValue
+
+    if (!throttle) {
+      // No throttling
+      updateValue(newValue)
+      return
+    }
+
+    // Clear existing timeout
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current)
+    }
+
+    // Set new timeout
+    timeoutRef.current = setTimeout(() => {
+      updateValue(lastValueRef.current)
+      timeoutRef.current = null
+    }, throttle)
+  }, [updateValue, updateOnDragEnd, throttle])
+
+  // Cleanup timeout on unmount
+  useEffect(() => {
+    return () => {
+      if (timeoutRef.current) {
+        clearTimeout(timeoutRef.current)
+        // Fire the last value immediately on cleanup
+        if (updateValue && lastValueRef.current !== undefined) {
+          updateValue(lastValueRef.current)
+        }
+      }
+    }
+  }, [updateValue])
+
+  const fireValueUpdate = (dragEnd: boolean, v = value) => {
+    throttledUpdateValue(v, dragEnd)
   }
 
+  const labelText = `${label}: ${valueDisplay ?? value} ${unit}`
+
   return (
     <SharedHudVars>
-      <div className={styles['slider-container']} style={{ width }} {...divProps}>
+      <div className={`${styles['slider-container']} settings-text-container ${labelText.length > 17 ? 'settings-text-container-long' : ''}`} style={{ width }} {...divProps}>
         <input
           type="range"
           className={styles.slider}
@@ -76,7 +124,7 @@ const Slider: React.FC<Props> = ({
         <div className={styles.disabled} title={disabledReason} />
         <div className={styles['slider-thumb']} style={{ left: `calc((100% * ${ratio}) - (8px * ${ratio}))` }} />
         <label className={styles.label}>
-          {label}: {valueDisplay ?? value} {unit}
+          {labelText}
         </label>
       </div>
     </SharedHudVars>
diff --git a/src/sounds/botSoundSystem.ts b/src/sounds/botSoundSystem.ts
index 72aa3da8..cb237072 100644
--- a/src/sounds/botSoundSystem.ts
+++ b/src/sounds/botSoundSystem.ts
@@ -11,6 +11,7 @@ import { showNotification } from '../react/NotificationProvider'
 import { pixelartIcons } from '../react/PixelartIcon'
 import { createSoundMap, SoundMap } from './soundsMap'
 import { musicSystem } from './musicSystem'
+import './customSoundSystem'
 
 let soundMap: SoundMap | undefined
 
@@ -50,8 +51,9 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
         appViewer.backend?.soundSystem?.playSound(
           position,
           soundData.url,
-          soundData.volume * (options.volume / 100),
-          Math.max(Math.min(pitch ?? 1, 2), 0.5)
+          soundData.volume,
+          Math.max(Math.min(pitch ?? 1, 2), 0.5),
+          soundData.timeout ?? options.remoteSoundsLoadTimeout
         )
       }
       if (getDistance(bot.entity.position, position) < 4 * 16) {
@@ -81,7 +83,7 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
     }
     const randomMusicKey = musicKeys[Math.floor(Math.random() * musicKeys.length)]
     const soundData = await soundMap.getSoundUrl(randomMusicKey)
-    if (!soundData) return
+    if (!soundData || !soundMap) return
     await musicSystem.playMusic(soundData.url, soundData.volume)
   }
 
@@ -109,6 +111,9 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
   }
 
   bot.on('soundEffectHeard', async (soundId, position, volume, pitch) => {
+    if (/^https?:/.test(soundId.replace('minecraft:', ''))) {
+      return
+    }
     await playHardcodedSound(soundId, position, volume, pitch)
   })
 
diff --git a/src/sounds/customSoundSystem.ts b/src/sounds/customSoundSystem.ts
new file mode 100644
index 00000000..5dfa89f7
--- /dev/null
+++ b/src/sounds/customSoundSystem.ts
@@ -0,0 +1,44 @@
+import { loadOrPlaySound, stopAllSounds, stopSound } from '../basicSounds'
+
+const customSoundSystem = () => {
+  bot._client.on('named_sound_effect', packet => {
+    let { soundName } = packet
+    let metadata = {} as { loadTimeout?: number, loop?: boolean }
+
+    // Extract JSON metadata from parentheses at the end
+    const jsonMatch = /\(({.*})\)$/.exec(soundName)
+    if (jsonMatch) {
+      try {
+        metadata = JSON.parse(jsonMatch[1])
+        soundName = soundName.slice(0, -jsonMatch[0].length)
+      } catch (e) {
+        console.warn('Failed to parse sound metadata:', jsonMatch[1])
+      }
+    }
+
+    if (/^https?:/.test(soundName.replace('minecraft:', ''))) {
+      const { loadTimeout, loop } = metadata
+      void loadOrPlaySound(soundName, packet.volume, loadTimeout, loop)
+    }
+  })
+
+  bot._client.on('stop_sound', packet => {
+    const { flags, source, sound } = packet
+
+    if (flags === 0) {
+      // Stop all sounds
+      stopAllSounds()
+    } else if (sound) {
+      // Stop specific sound by name
+      stopSound(sound)
+    }
+  })
+
+  bot.on('end', () => {
+    stopAllSounds()
+  })
+}
+
+customEvents.on('mineflayerBotCreated', () => {
+  customSoundSystem()
+})
diff --git a/src/sounds/soundsMap.ts b/src/sounds/soundsMap.ts
index 1b0a0178..47028971 100644
--- a/src/sounds/soundsMap.ts
+++ b/src/sounds/soundsMap.ts
@@ -35,6 +35,7 @@ interface ResourcePackSoundEntry {
   name: string
   stream?: boolean
   volume?: number
+  timeout?: number
 }
 
 interface ResourcePackSound {
@@ -140,7 +141,7 @@ export class SoundMap {
     await scan(soundsBasePath)
   }
 
-  async getSoundUrl (soundKey: string, volume = 1): Promise<{ url: string; volume: number } | undefined> {
+  async getSoundUrl (soundKey: string, volume = 1): Promise<{ url: string; volume: number, timeout?: number } | undefined> {
     // First check resource pack sounds.json
     if (this.activeResourcePackSoundsJson && soundKey in this.activeResourcePackSoundsJson) {
       const rpSound = this.activeResourcePackSoundsJson[soundKey]
@@ -151,6 +152,13 @@ export class SoundMap {
       if (this.activeResourcePackBasePath) {
         const tryFormat = async (format: string) => {
           try {
+            if (sound.name.startsWith('http://') || sound.name.startsWith('https://')) {
+              return {
+                url: sound.name,
+                volume: soundVolume * Math.max(Math.min(volume, 1), 0),
+                timeout: sound.timeout
+              }
+            }
             const resourcePackPath = path.join(this.activeResourcePackBasePath!, `/assets/minecraft/sounds/${sound.name}.${format}`)
             const fileData = await fs.promises.readFile(resourcePackPath)
             return {
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 478da4fb..2f5199c0 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -80,6 +80,10 @@ export const watchOptionsAfterViewerInit = () => {
     updateFpsLimit(o)
   })
 
+  watchValue(options, o => {
+    appViewer.inWorldRenderingConfig.volume = Math.max(o.volume / 100, 0)
+  })
+
   watchValue(options, o => {
     appViewer.inWorldRenderingConfig.vrSupport = o.vrSupport
     appViewer.inWorldRenderingConfig.vrPageGameRendering = o.vrPageGameRendering

From d6eb1601e918b179b11ed2898df2befbd7d93d2d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 16 Aug 2025 09:16:29 +0300
Subject: [PATCH 712/753] disable remote sounds by default

---
 src/defaultOptions.ts           | 1 +
 src/sounds/customSoundSystem.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 378cd14a..28b64059 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -85,6 +85,7 @@ export const defaultOptions = {
   } as any,
   preferLoadReadonly: false,
   experimentalClientSelfReload: true,
+  remoteSoundsSupport: false,
   remoteSoundsLoadTimeout: 500,
   disableLoadPrompts: false,
   guestUsername: 'guest',
diff --git a/src/sounds/customSoundSystem.ts b/src/sounds/customSoundSystem.ts
index 5dfa89f7..1880aa70 100644
--- a/src/sounds/customSoundSystem.ts
+++ b/src/sounds/customSoundSystem.ts
@@ -1,7 +1,9 @@
 import { loadOrPlaySound, stopAllSounds, stopSound } from '../basicSounds'
+import { options } from '../optionsStorage'
 
 const customSoundSystem = () => {
   bot._client.on('named_sound_effect', packet => {
+    if (!options.remoteSoundsSupport) return
     let { soundName } = packet
     let metadata = {} as { loadTimeout?: number, loop?: boolean }
 

From 9a84a7acfba4a9a7c56fdb4612fa2e35818ae085 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 18 Aug 2025 11:37:20 +0300
Subject: [PATCH 713/753] do less annoying logging

---
 renderer/viewer/lib/worldDataEmitter.ts | 1 -
 src/appViewer.ts                        | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 3bc2acd3..86a85f77 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -379,7 +379,6 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
           chunksToUnload.push(p)
         }
       }
-      console.log('unloading', chunksToUnload.length, 'total now', Object.keys(this.loadedChunks).length)
       for (const p of chunksToUnload) {
         this.unloadChunk(p)
       }
diff --git a/src/appViewer.ts b/src/appViewer.ts
index 879fe938..628d11b4 100644
--- a/src/appViewer.ts
+++ b/src/appViewer.ts
@@ -201,7 +201,9 @@ export class AppViewer {
     this.worldView = new WorldDataEmitter(world, renderDistance, startPosition)
     this.worldView.panicChunksReload = () => {
       if (!options.experimentalClientSelfReload) return
-      displayClientChat(`[client] client panicked due to too long loading time. Soft reloading chunks...`)
+      if (process.env.NODE_ENV === 'development') {
+        displayClientChat(`[client] client panicked due to too long loading time. Soft reloading chunks...`)
+      }
       void reloadChunks()
     }
     window.worldView = this.worldView

From a8fa3d47d1e43d95313cd19ea1838678e423ba21 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Tue, 19 Aug 2025 12:49:33 +0300
Subject: [PATCH 714/753] up protocol & mineflayer for 1.21.6

---
 pnpm-lock.yaml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f495c831..e7cb1872 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -137,13 +137,13 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
@@ -342,7 +342,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.17
         version: 0.1.17
@@ -6649,8 +6649,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb}
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074}
     version: 1.60.1
     engines: {node: '>=22'}
 
@@ -6669,8 +6669,8 @@ packages:
     resolution: {integrity: sha512-0eCR8pnGb42Qd9QmAxOjl0PhA5Fa+9+6H1G/YsbsO5rg5mDf94Tusqp/8NAGLPQCPVDzbarLskXdjR3h0E0bEQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8}
     version: 8.0.0
     engines: {node: '>=22'}
 
@@ -11308,7 +11308,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@@ -13069,7 +13069,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13105,7 +13105,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -16948,12 +16948,12 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17271,7 +17271,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17323,7 +17323,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17338,11 +17338,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/8aaec9f31657ebb5195cc13db09e5fc6760d4a09(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/b404bcaed4c039c5558e889c8617aa866cd7bddb(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From 4a5f2e799ca1778cd45dce9fa3132d66881bec37 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 20 Aug 2025 20:02:57 +0300
Subject: [PATCH 715/753] disable experimentalClientSelfReload by default until
 it's reworked with more fine-tuned checks against server connection

---
 src/defaultOptions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 28b64059..6045e70b 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -84,7 +84,7 @@ export const defaultOptions = {
     gameMode: 1
   } as any,
   preferLoadReadonly: false,
-  experimentalClientSelfReload: true,
+  experimentalClientSelfReload: false,
   remoteSoundsSupport: false,
   remoteSoundsLoadTimeout: 500,
   disableLoadPrompts: false,

From 72e9e656cca70d66372ddfa722abdf01fb4981e3 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 20 Aug 2025 20:42:40 +0300
Subject: [PATCH 716/753] new! helpful errors on custom channels payloads!

---
 patches/minecraft-protocol.patch | 13 +++++++++++++
 src/mineflayer/mc-protocol.ts    | 30 ++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/patches/minecraft-protocol.patch b/patches/minecraft-protocol.patch
index 5dec44d7..e29f87d9 100644
--- a/patches/minecraft-protocol.patch
+++ b/patches/minecraft-protocol.patch
@@ -73,6 +73,19 @@ index 63cc2bd9615100bd2fd63dfe14c094aa6b8cd1c9..36df57d1196af9761d920fa285ac48f8
        }
  
        function onJoinServerResponse (err) {
+diff --git a/src/client/pluginChannels.js b/src/client/pluginChannels.js
+index 671eb452f31e6b5fcd57d715f1009d010160c65f..7f69f511c8fb97d431ec5125c851b49be8e2ab76 100644
+--- a/src/client/pluginChannels.js
++++ b/src/client/pluginChannels.js
+@@ -57,7 +57,7 @@ module.exports = function (client, options) {
+         try {
+           packet.data = proto.parsePacketBuffer(channel, packet.data).data
+         } catch (error) {
+-          client.emit('error', error)
++          client.emit('error', error, { customPayload: packet })
+           return
+         }
+       }
 diff --git a/src/client.js b/src/client.js
 index e369e77d055ba919e8f9da7b8e8b5dc879c74cf4..54bb9e6644388e9b6bd42b3012951875989cdf0c 100644
 --- a/src/client.js
diff --git a/src/mineflayer/mc-protocol.ts b/src/mineflayer/mc-protocol.ts
index a0348c5d..0171387a 100644
--- a/src/mineflayer/mc-protocol.ts
+++ b/src/mineflayer/mc-protocol.ts
@@ -11,6 +11,36 @@ import { getWebsocketStream } from './websocket-core'
 
 let lastPacketTime = 0
 customEvents.on('mineflayerBotCreated', () => {
+  // const oldParsePacketBuffer = bot._client.deserializer.parsePacketBuffer
+  //   try {
+  //     const parsed = oldParsePacketBuffer(buffer)
+  //   } catch (err) {
+  //     debugger
+  //     reportError(new Error(`Error parsing packet ${buffer.subarray(0, 30).toString('hex')}`, { cause: err }))
+  //     throw err
+  //   }
+  // }
+  class MinecraftProtocolError extends Error {
+    constructor (message: string, cause?: Error, public data?: any) {
+      if (data?.customPayload) {
+        message += ` (Custom payload: ${data.customPayload.channel})`
+      }
+      super(message, { cause })
+      this.name = 'MinecraftProtocolError'
+    }
+  }
+
+  const onClientError = (err, data) => {
+    const error = new MinecraftProtocolError(`Minecraft protocol client error: ${err.message}`, err, data)
+    reportError(error)
+  }
+  if (typeof bot._client['_events'].error === 'function') {
+    // dont report to bot for more explicit error
+    bot._client['_events'].error = onClientError
+  } else {
+    bot._client.on('error' as any, onClientError)
+  }
+
   // todo move more code here
   if (!appQueryParams.noPacketsValidation) {
     (bot._client as unknown as Client).on('packet', (data, packetMeta, buffer, fullBuffer) => {

From 6e0d54ea17178a091d8c103a48f82a4723f5b23d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 20 Aug 2025 20:45:02 +0300
Subject: [PATCH 717/753] up mc-protocol patch

---
 pnpm-lock.yaml | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e7cb1872..c7e1d1b9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -23,7 +23,7 @@ overrides:
 
 patchedDependencies:
   minecraft-protocol:
-    hash: 2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea
+    hash: 4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b
     path: patches/minecraft-protocol.patch
   mineflayer-item-map-downloader@1.2.0:
     hash: a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad
@@ -143,7 +143,7 @@ importers:
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
@@ -430,13 +430,13 @@ importers:
         version: 1.3.9
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
         version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-schematic:
         specifier: ^1.2.0
-        version: 1.2.3
+        version: 1.2.3(prismarine-registry@1.11.0)
       process:
         specifier: ^0.11.10
         version: 0.11.10
@@ -6651,7 +6651,7 @@ packages:
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074:
     resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074}
-    version: 1.60.1
+    version: 1.61.0
     engines: {node: '>=22'}
 
   minecraft-wrap@1.6.0:
@@ -11309,7 +11309,7 @@ snapshots:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
@@ -13069,7 +13069,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13105,7 +13105,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -16952,7 +16952,7 @@ snapshots:
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
@@ -17271,7 +17271,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17342,9 +17342,9 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=2a88e61fea1825d9fa5f1584fde810421d553d23e45e6dc829c3697ee3358bea)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-entity: 2.5.0
@@ -18135,7 +18135,7 @@ snapshots:
       minecraft-data: 3.92.0
       prismarine-registry: 1.11.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.92.0
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
@@ -18143,6 +18143,8 @@ snapshots:
       prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
+    transitivePeerDependencies:
+      - prismarine-registry
 
   prismarine-chat@1.11.0:
     dependencies:
@@ -18153,7 +18155,7 @@ snapshots:
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
@@ -18187,7 +18189,7 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -18211,16 +18213,18 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.92.0
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.7.0
 
-  prismarine-schematic@1.2.3:
+  prismarine-schematic@1.2.3(prismarine-registry@1.11.0):
     dependencies:
       minecraft-data: 3.92.0
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.10
+    transitivePeerDependencies:
+      - prismarine-registry
 
   prismarine-windows@2.9.0:
     dependencies:

From a12c61bc6c8f3ede1910dba4567d71d7f907feeb Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 21 Aug 2025 13:21:02 +0300
Subject: [PATCH 718/753] add simple monaco (#418)

---
 package.json               |   1 +
 pnpm-lock.yaml             |  58 +++++++++++++++-----
 src/core/ideChannels.ts    | 106 +++++++++++++++++++++++++++++++++++++
 src/customChannels.ts      |   2 +
 src/react/MonacoEditor.css |  58 ++++++++++++++++++++
 src/react/MonacoEditor.tsx |  73 +++++++++++++++++++++++++
 src/reactUi.tsx            |   3 +-
 7 files changed, 286 insertions(+), 15 deletions(-)
 create mode 100644 src/core/ideChannels.ts
 create mode 100644 src/react/MonacoEditor.css
 create mode 100644 src/react/MonacoEditor.tsx

diff --git a/package.json b/package.json
index 1d9dfc0c..a8c2c4e7 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
   "dependencies": {
     "@dimaka/interface": "0.0.3-alpha.0",
     "@floating-ui/react": "^0.26.1",
+    "@monaco-editor/react": "^4.7.0",
     "@nxg-org/mineflayer-auto-jump": "^0.7.18",
     "@nxg-org/mineflayer-tracker": "1.3.0",
     "@react-oauth/google": "^0.12.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c7e1d1b9..8acb9681 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,6 +42,9 @@ importers:
       '@floating-ui/react':
         specifier: ^0.26.1
         version: 0.26.28(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@monaco-editor/react':
+        specifier: ^4.7.0
+        version: 4.7.0(monaco-editor@0.52.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@nxg-org/mineflayer-auto-jump':
         specifier: ^0.7.18
         version: 0.7.18
@@ -430,13 +433,13 @@ importers:
         version: 1.3.9
       prismarine-block:
         specifier: github:zardoy/prismarine-block#next-era
-        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+        version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
         version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-schematic:
         specifier: ^1.2.0
-        version: 1.2.3(prismarine-registry@1.11.0)
+        version: 1.2.3
       process:
         specifier: ^0.11.10
         version: 0.11.10
@@ -1989,6 +1992,16 @@ packages:
   '@module-federation/webpack-bundler-runtime@0.11.2':
     resolution: {integrity: sha512-WdwIE6QF+MKs/PdVu0cKPETF743JB9PZ62/qf7Uo3gU4fjsUMc37RnbJZ/qB60EaHHfjwp1v6NnhZw1r4eVsnw==}
 
+  '@monaco-editor/loader@1.5.0':
+    resolution: {integrity: sha512-hKoGSM+7aAc7eRTRjpqAZucPmoNOC4UUbknb/VNoTkEIkCPhqV8LfbsgM1webRM7S/z21eHEx9Fkwx8Z/C/+Xw==}
+
+  '@monaco-editor/react@4.7.0':
+    resolution: {integrity: sha512-cyzXQCtO47ydzxpQtCGSQGOC8Gk3ZUeBXFAxD+CWXYFo5OqZyZUonFl0DwUlTyAfRHntBfw2p3w4s9R6oe1eCA==}
+    peerDependencies:
+      monaco-editor: '>= 0.25.0 < 1'
+      react: ^18.2.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
   '@msgpack/msgpack@2.8.0':
     resolution: {integrity: sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==}
     engines: {node: '>= 10'}
@@ -6769,6 +6782,9 @@ packages:
   mojangson@2.0.4:
     resolution: {integrity: sha512-HYmhgDjr1gzF7trGgvcC/huIg2L8FsVbi/KacRe6r1AswbboGVZDS47SOZlomPuMWvZLas8m9vuHHucdZMwTmQ==}
 
+  monaco-editor@0.52.2:
+    resolution: {integrity: sha512-GEQWEZmfkOGLdd3XK8ryrfWz3AIP8YymVXiPHEdewrUq7mh0qrKrfHLNCXcbB6sTnMLnOZ3ztSiKcciFUkIJwQ==}
+
   moo@0.5.2:
     resolution: {integrity: sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==}
 
@@ -8373,6 +8389,9 @@ packages:
   stacktrace-js@2.0.2:
     resolution: {integrity: sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==}
 
+  state-local@1.0.7:
+    resolution: {integrity: sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w==}
+
   static-extend@0.1.2:
     resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
     engines: {node: '>=0.10.0'}
@@ -11254,6 +11273,17 @@ snapshots:
       '@module-federation/runtime': 0.11.2
       '@module-federation/sdk': 0.11.2
 
+  '@monaco-editor/loader@1.5.0':
+    dependencies:
+      state-local: 1.0.7
+
+  '@monaco-editor/react@4.7.0(monaco-editor@0.52.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@monaco-editor/loader': 1.5.0
+      monaco-editor: 0.52.2
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+
   '@msgpack/msgpack@2.8.0': {}
 
   '@ndelangen/get-tarball@3.0.9':
@@ -11309,7 +11339,7 @@ snapshots:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
       vec3: 0.1.10
@@ -17344,7 +17374,7 @@ snapshots:
       minecraft-data: 3.92.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-entity: 2.5.0
@@ -17461,6 +17491,8 @@ snapshots:
     dependencies:
       nearley: 2.20.1
 
+  monaco-editor@0.52.2: {}
+
   moo@0.5.2: {}
 
   morgan@1.10.0:
@@ -18135,7 +18167,7 @@ snapshots:
       minecraft-data: 3.92.0
       prismarine-registry: 1.11.0
 
-  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0):
+  prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
     dependencies:
       minecraft-data: 3.92.0
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
@@ -18143,8 +18175,6 @@ snapshots:
       prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
-    transitivePeerDependencies:
-      - prismarine-registry
 
   prismarine-chat@1.11.0:
     dependencies:
@@ -18155,7 +18185,7 @@ snapshots:
   prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0):
     dependencies:
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
       smart-buffer: 4.2.0
@@ -18189,7 +18219,7 @@ snapshots:
 
   prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0):
     dependencies:
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
@@ -18213,18 +18243,16 @@ snapshots:
   prismarine-registry@1.11.0:
     dependencies:
       minecraft-data: 3.92.0
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
 
-  prismarine-schematic@1.2.3(prismarine-registry@1.11.0):
+  prismarine-schematic@1.2.3:
     dependencies:
       minecraft-data: 3.92.0
-      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9(prismarine-registry@1.11.0)
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       vec3: 0.1.10
-    transitivePeerDependencies:
-      - prismarine-registry
 
   prismarine-windows@2.9.0:
     dependencies:
@@ -19521,6 +19549,8 @@ snapshots:
       stack-generator: 2.0.10
       stacktrace-gps: 3.1.2
 
+  state-local@1.0.7: {}
+
   static-extend@0.1.2:
     dependencies:
       define-property: 0.2.5
diff --git a/src/core/ideChannels.ts b/src/core/ideChannels.ts
new file mode 100644
index 00000000..a9c517f7
--- /dev/null
+++ b/src/core/ideChannels.ts
@@ -0,0 +1,106 @@
+import { proxy } from 'valtio'
+
+export const ideState = proxy({
+  id: '',
+  contents: '',
+  line: 0,
+  column: 0,
+  language: 'typescript',
+  title: '',
+})
+globalThis.ideState = ideState
+
+export const registerIdeChannels = () => {
+  registerIdeOpenChannel()
+  registerIdeSaveChannel()
+}
+
+const registerIdeOpenChannel = () => {
+  const CHANNEL_NAME = 'minecraft-web-client:ide-open'
+
+  const packetStructure = [
+    'container',
+    [
+      {
+        name: 'id',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'language',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'contents',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'line',
+        type: 'i32'
+      },
+      {
+        name: 'column',
+        type: 'i32'
+      },
+      {
+        name: 'title',
+        type: ['pstring', { countType: 'i16' }]
+      }
+    ]
+  ]
+
+  bot._client.registerChannel(CHANNEL_NAME, packetStructure, true)
+
+  bot._client.on(CHANNEL_NAME as any, (data) => {
+    const { id, language, contents, line, column, title } = data
+
+    ideState.contents = contents
+    ideState.line = line
+    ideState.column = column
+    ideState.id = id
+    ideState.language = language || 'typescript'
+    ideState.title = title
+  })
+
+  console.debug(`registered custom channel ${CHANNEL_NAME} channel`)
+}
+const IDE_SAVE_CHANNEL_NAME = 'minecraft-web-client:ide-save'
+const registerIdeSaveChannel = () => {
+
+  const packetStructure = [
+    'container',
+    [
+      {
+        name: 'id',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'contents',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'language',
+        type: ['pstring', { countType: 'i16' }]
+      },
+      {
+        name: 'line',
+        type: 'i32'
+      },
+      {
+        name: 'column',
+        type: 'i32'
+      },
+    ]
+  ]
+  bot._client.registerChannel(IDE_SAVE_CHANNEL_NAME, packetStructure, true)
+}
+
+export const saveIde = () => {
+  bot._client.writeChannel(IDE_SAVE_CHANNEL_NAME, {
+    id: ideState.id,
+    contents: ideState.contents,
+    language: ideState.language,
+    // todo: reflect updated
+    line: ideState.line,
+    column: ideState.column,
+  })
+}
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 6d3aa7e9..717c7c93 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -2,6 +2,7 @@ import PItem from 'prismarine-item'
 import { getThreeJsRendererMethods } from 'renderer/viewer/three/threeJsMethods'
 import { options } from './optionsStorage'
 import { jeiCustomCategories } from './inventoryWindows'
+import { registerIdeChannels } from './core/ideChannels'
 
 export default () => {
   customEvents.on('mineflayerBotCreated', async () => {
@@ -17,6 +18,7 @@ export default () => {
     registeredJeiChannel()
     registerBlockInteractionsCustomizationChannel()
     registerWaypointChannels()
+    registerIdeChannels()
   })
 }
 
diff --git a/src/react/MonacoEditor.css b/src/react/MonacoEditor.css
new file mode 100644
index 00000000..86d2ad0a
--- /dev/null
+++ b/src/react/MonacoEditor.css
@@ -0,0 +1,58 @@
+.monaco-editor-container {
+  position: fixed;
+  inset: 0;
+  z-index: 1000;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 16px;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.monaco-editor-title {
+  font-size: 20px;
+  font-weight: bold;
+  color: #fff;
+  margin-bottom: 8px;
+}
+
+.monaco-editor-wrapper {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  max-width: 80vw;
+  max-height: 80vh;
+  border: 3px solid #000;
+  background-color: #000;
+  padding: 3px;
+  box-shadow: inset 0 0 0 1px #fff, inset 0 0 0 2px #000;
+}
+
+.monaco-editor-close {
+  position: fixed;
+  top: 16px;
+  left: 16px;
+  z-index: 1001;
+  cursor: pointer;
+  padding: 8px;
+}
+
+@media (max-width: 768px) {
+  .monaco-editor-container {
+    padding: 0;
+  }
+  .monaco-editor-wrapper {
+    max-width: 100%;
+    max-height: 100%;
+    border-radius: 0;
+  }
+  .monaco-editor-close {
+    top: 8px;
+    left: 8px;
+  }
+  .monaco-editor-title {
+    /* todo: make it work on mobile */
+    display: none;
+  }
+}
diff --git a/src/react/MonacoEditor.tsx b/src/react/MonacoEditor.tsx
new file mode 100644
index 00000000..32162b21
--- /dev/null
+++ b/src/react/MonacoEditor.tsx
@@ -0,0 +1,73 @@
+import { proxy, useSnapshot } from 'valtio'
+import { useEffect } from 'react'
+import { Editor } from '@monaco-editor/react'
+import PixelartIcon, { pixelartIcons } from '../react/PixelartIcon'
+import { useIsModalActive } from '../react/utilsApp'
+import { showNotification } from '../react/NotificationProvider'
+import { hideModal, showModal } from '../globalState'
+import { ideState, saveIde } from '../core/ideChannels'
+import './MonacoEditor.css'
+
+export default () => {
+  const { contents, line, column, id, language, title } = useSnapshot(ideState)
+  const isModalActive = useIsModalActive('monaco-editor')
+  const bodyFont = getComputedStyle(document.body).fontFamily
+
+  useEffect(() => {
+    if (id && !isModalActive) {
+      showModal({ reactType: 'monaco-editor' })
+    }
+    if (!id && isModalActive) {
+      hideModal()
+    }
+  }, [id])
+
+  useEffect(() => {
+    if (!isModalActive && id) {
+      try {
+        saveIde()
+      } catch (err) {
+        reportError(err)
+        showNotification('Failed to save the editor', 'Please try again', true)
+      }
+      ideState.id = ''
+      ideState.contents = ''
+    }
+  }, [isModalActive])
+
+  if (!isModalActive) return null
+
+  return <div className="monaco-editor-container">
+    <div className="monaco-editor-close">
+      <PixelartIcon
+        iconName={pixelartIcons.close}
+        width={26}
+        onClick={() => {
+          hideModal()
+        }}
+      />
+    </div>
+    <div className="monaco-editor-title">
+      {title}
+    </div>
+    <div className="monaco-editor-wrapper">
+      <Editor
+        height="100%"
+        width="100%"
+        language={language}
+        theme='vs-dark'
+        line={line}
+        onChange={(value) => {
+          ideState.contents = value ?? ''
+        }}
+        value={contents}
+        options={{
+          fontFamily: bodyFont,
+          minimap: {
+            enabled: true,
+          },
+        }}
+      />
+    </div>
+  </div>
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 4f8c4541..1e6f13eb 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -67,6 +67,7 @@ import GlobalOverlayHints from './react/GlobalOverlayHints'
 import FullscreenTime from './react/FullscreenTime'
 import StorageConflictModal from './react/StorageConflictModal'
 import FireRenderer from './react/FireRenderer'
+import MonacoEditor from './react/MonacoEditor'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -248,7 +249,6 @@ const App = () => {
             <PacketsReplayProvider />
             <NotificationProvider />
             <ModsPage />
-
             <SelectOption />
             <CreditsAboutModal />
             <NoModalFoundProvider />
@@ -259,6 +259,7 @@ const App = () => {
             </div>
             <div />
             <DebugEdges />
+            <MonacoEditor />
             <DebugResponseTimeIndicator />
           </RobustPortal>
         </ButtonAppProvider>

From bc2972fe99692510643cb482128ab978970a9c2f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 24 Aug 2025 19:53:44 +0300
Subject: [PATCH 719/753] fix registering custom channels too late (a few ms
 diff)

---
 src/customChannels.ts | 19 ++++++++-----------
 src/resourcePack.ts   | 11 -----------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/customChannels.ts b/src/customChannels.ts
index 717c7c93..8e70078f 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -7,18 +7,15 @@ import { registerIdeChannels } from './core/ideChannels'
 export default () => {
   customEvents.on('mineflayerBotCreated', async () => {
     if (!options.customChannels) return
-    await new Promise(resolve => {
-      bot.once('login', () => {
-        resolve(true)
-      })
+    bot.once('login', () => {
+      registerBlockModelsChannel()
+      registerMediaChannels()
+      registerSectionAnimationChannels()
+      registeredJeiChannel()
+      registerBlockInteractionsCustomizationChannel()
+      registerWaypointChannels()
+      registerIdeChannels()
     })
-    registerBlockModelsChannel()
-    registerMediaChannels()
-    registerSectionAnimationChannels()
-    registeredJeiChannel()
-    registerBlockInteractionsCustomizationChannel()
-    registerWaypointChannels()
-    registerIdeChannels()
   })
 }
 
diff --git a/src/resourcePack.ts b/src/resourcePack.ts
index e0f0fca4..ea6c73fd 100644
--- a/src/resourcePack.ts
+++ b/src/resourcePack.ts
@@ -486,17 +486,6 @@ const downloadAndUseResourcePack = async (url: string, progressReporter: Progres
   }
 }
 
-const waitForGameEvent = async () => {
-  if (miscUiState.gameLoaded) return
-  await new Promise<void>(resolve => {
-    const listener = () => resolve()
-    customEvents.once('gameLoaded', listener)
-    watchUnloadForCleanup(() => {
-      customEvents.removeListener('gameLoaded', listener)
-    })
-  })
-}
-
 export const onAppLoad = () => {
   customEvents.on('mineflayerBotCreated', () => {
     // todo also handle resourcePack

From 8f62fbd4daddbdccf61191949889925bed2b4632 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 26 Aug 2025 13:50:36 +0300
Subject: [PATCH 720/753] fix: window title sometimes was not showing up on old
 versions

---
 src/chatUtils.ts        |  8 ++++++++
 src/inventoryWindows.ts | 15 +++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/chatUtils.ts b/src/chatUtils.ts
index 88437bc3..849d5847 100644
--- a/src/chatUtils.ts
+++ b/src/chatUtils.ts
@@ -118,6 +118,14 @@ export const formatMessage = (message: MessageInput, mcData: IndexedData = globa
   return msglist
 }
 
+export const messageToString = (message: MessageInput | string) => {
+  if (typeof message === 'string') {
+    return message
+  }
+  const msglist = formatMessage(message)
+  return msglist.map(msg => msg.text).join('')
+}
+
 const blockToItemRemaps = {
   water: 'water_bucket',
   lava: 'lava_bucket',
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index a9f89d1b..166e42a7 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -57,12 +57,23 @@ export const onGameLoad = () => {
     return type
   }
 
+  const maybeParseNbtJson = (data: any) => {
+    if (typeof data === 'string') {
+      try {
+        data = JSON.parse(data)
+      } catch (err) {
+        // ignore
+      }
+    }
+    return nbt.simplify(data) ?? data
+  }
+
   bot.on('windowOpen', (win) => {
     const implementedWindow = implementedContainersGuiMap[mapWindowType(win.type as string, win.inventoryStart)]
     if (implementedWindow) {
-      openWindow(implementedWindow, nbt.simplify(win.title as any))
+      openWindow(implementedWindow, maybeParseNbtJson(win.title))
     } else if (options.unimplementedContainers) {
-      openWindow('ChestWin', nbt.simplify(win.title as any))
+      openWindow('ChestWin', maybeParseNbtJson(win.title))
     } else {
       // todo format
       displayClientChat(`[client error] cannot open unimplemented window ${win.id} (${win.type}). Slots: ${win.slots.map(item => getItemName(item)).filter(Boolean).join(', ')}`)

From 9718610131a44b1d0aa46fdf97d696d0af4dc663 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 27 Aug 2025 12:08:20 +0300
Subject: [PATCH 721/753] ci: add deployment step for mcw-mcraft-page
 repository in GitHub Actions

---
 .github/workflows/release.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cbf52251..68ead92f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,6 +49,18 @@ jobs:
           publish_dir: .vercel/output/static
           force_orphan: true
 
+      # Deploy to mcw-mcraft-page repository (github.mcraft.fun)
+      - name: Deploy to mcw-mcraft-page repository
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          personal_token: ${{ secrets.MCW_MCRAFT_PAGE_DEPLOY_TOKEN }}
+          external_repository: ${{ github.repository_owner }}/mcw-mcraft-pages
+          publish_dir: .vercel/output/static
+          publish_branch: main
+          destination_dir: docs
+          cname: github.mcraft.fun
+          force_orphan: true
+
       - name: Change index.html title
         run: |
           # change <title>Minecraft Web Client</title> to <title>Minecraft Web Client — Free Online Browser Version</title>

From 2a1746eb7a6bd96f40de9cffbb13d78e422388f2 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 27 Aug 2025 13:33:39 +0300
Subject: [PATCH 722/753] [skip ci] fix repository name

---
 .github/workflows/release.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 68ead92f..3710eebd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,12 +49,11 @@ jobs:
           publish_dir: .vercel/output/static
           force_orphan: true
 
-      # Deploy to mcw-mcraft-page repository (github.mcraft.fun)
-      - name: Deploy to mcw-mcraft-page repository
+      - name: Deploy to mwc-mcraft-pages repository
         uses: peaceiris/actions-gh-pages@v3
         with:
           personal_token: ${{ secrets.MCW_MCRAFT_PAGE_DEPLOY_TOKEN }}
-          external_repository: ${{ github.repository_owner }}/mcw-mcraft-pages
+          external_repository: ${{ github.repository_owner }}/mwc-mcraft-pages
           publish_dir: .vercel/output/static
           publish_branch: main
           destination_dir: docs

From 1f240d8c2047de469965076dc23ae72fe534a83a Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 27 Aug 2025 19:50:53 +0300
Subject: [PATCH 723/753] up mouse allowing to disable positive break block

---
 package.json          |  2 +-
 pnpm-lock.yaml        | 10 +++++-----
 src/customChannels.ts | 14 +-------------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index a8c2c4e7..5dcd9547 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
     "mc-assets": "^0.2.62",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
-    "mineflayer-mouse": "^0.1.17",
+    "mineflayer-mouse": "^0.1.21",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8acb9681..6c393ac7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -347,8 +347,8 @@ importers:
         specifier: github:zardoy/mineflayer#gen-the-master
         version: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
       mineflayer-mouse:
-        specifier: ^0.1.17
-        version: 0.1.17
+        specifier: ^0.1.21
+        version: 0.1.21
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -6678,8 +6678,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824}
     version: 1.2.0
 
-  mineflayer-mouse@0.1.17:
-    resolution: {integrity: sha512-0eCR8pnGb42Qd9QmAxOjl0PhA5Fa+9+6H1G/YsbsO5rg5mDf94Tusqp/8NAGLPQCPVDzbarLskXdjR3h0E0bEQ==}
+  mineflayer-mouse@0.1.21:
+    resolution: {integrity: sha512-1XTVuw3twIrEcqQ1QRSB8NcStIUEZ+tbxiAG6rOrN/9M4thhtlS5PTJzFdmdrcYgWEBLvuOdJszaKE5zFfiXhg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8:
@@ -17359,7 +17359,7 @@ snapshots:
       - encoding
       - supports-color
 
-  mineflayer-mouse@0.1.17:
+  mineflayer-mouse@0.1.21:
     dependencies:
       change-case: 5.4.4
       debug: 4.4.1
diff --git a/src/customChannels.ts b/src/customChannels.ts
index 8e70078f..b566f9dd 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -47,19 +47,7 @@ const registerBlockInteractionsCustomizationChannel = () => {
 
   registerChannel(CHANNEL_NAME, packetStructure, (data) => {
     const config = JSON.parse(data.newConfiguration)
-    if (config.customBreakTime !== undefined && Object.values(config.customBreakTime).every(x => typeof x === 'number')) {
-      bot.mouse.customBreakTime = config.customBreakTime
-    }
-    if (config.customBreakTimeToolAllowance !== undefined) {
-      bot.mouse.customBreakTimeToolAllowance = new Set(config.customBreakTimeToolAllowance)
-    }
-
-    if (config.blockPlacePrediction !== undefined) {
-      bot.mouse.settings.blockPlacePrediction = config.blockPlacePrediction
-    }
-    if (config.blockPlacePredictionDelay !== undefined) {
-      bot.mouse.settings.blockPlacePredictionDelay = config.blockPlacePredictionDelay
-    }
+    bot.mouse.setConfigFromPacket(config)
   }, true)
 }
 

From e81d608554d8d0e98982df7f3570b70793a0927c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Wed, 27 Aug 2025 19:52:09 +0300
Subject: [PATCH 724/753] fix cname

---
 .github/workflows/release.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3710eebd..3e8c4136 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,6 +49,10 @@ jobs:
           publish_dir: .vercel/output/static
           force_orphan: true
 
+      # Create CNAME file for custom domain
+      - name: Create CNAME file
+        run: echo "github.mcraft.fun" > .vercel/output/static/CNAME
+
       - name: Deploy to mwc-mcraft-pages repository
         uses: peaceiris/actions-gh-pages@v3
         with:
@@ -57,7 +61,6 @@ jobs:
           publish_dir: .vercel/output/static
           publish_branch: main
           destination_dir: docs
-          cname: github.mcraft.fun
           force_orphan: true
 
       - name: Change index.html title

From d0d5234ba43c33d11325696a763163196c3206ad Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 31 Aug 2025 18:31:49 +0300
Subject: [PATCH 725/753] fix: stop right click emulation once window got
 opened eg chest

---
 src/mineflayer/plugins/mouse.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mineflayer/plugins/mouse.ts b/src/mineflayer/plugins/mouse.ts
index fc1ce0fd..14e19345 100644
--- a/src/mineflayer/plugins/mouse.ts
+++ b/src/mineflayer/plugins/mouse.ts
@@ -110,7 +110,7 @@ const domListeners = (bot: Bot) => {
   }, { signal: abortController.signal })
 
   bot.mouse.beforeUpdateChecks = () => {
-    if (!document.hasFocus()) {
+    if (!document.hasFocus() || !isGameActive(true)) {
       // deactive all buttons
       bot.mouse.buttons.fill(false)
     }

From cb82188272ef5bec257efdf0150460136cf267bd Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 31 Aug 2025 19:31:26 +0300
Subject: [PATCH 726/753] add addPing query param for testing

---
 README.MD                     | 1 +
 src/appParams.ts              | 1 +
 src/index.ts                  | 2 +-
 src/mineflayer/mc-protocol.ts | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.MD b/README.MD
index 7978cee5..82aac011 100644
--- a/README.MD
+++ b/README.MD
@@ -176,6 +176,7 @@ Server specific:
 - `?lockConnect=true` - Only works then `ip` parameter is set. Disables cancel/save buttons and all inputs in the connect screen already set as parameters. Useful for integrates iframes.
 - `?autoConnect=true` - Only works then `ip` and `version` parameters are set and `allowAutoConnect` is `true` in config.json! Directly connects to the specified server. Useful for integrates iframes.
 - `?serversList=<list_or_url>` - `<list_or_url>` can be a list of servers in the format `ip:version,ip` or a url to a json file with the same format (array) or a txt file with line-delimited list of server IPs.
+- `?addPing=<ping>` - Add a latency to both sides of the connection. Useful for testing ping issues. For example `?addPing=100` will add 200ms to your ping.
 
 Single player specific:
 
diff --git a/src/appParams.ts b/src/appParams.ts
index 8d487f8d..4c8ca186 100644
--- a/src/appParams.ts
+++ b/src/appParams.ts
@@ -47,6 +47,7 @@ export type AppQsParams = {
   connectText?: string
   freezeSettings?: string
   testIosCrash?: string
+  addPing?: string
 
   // Replay params
   replayFilter?: string
diff --git a/src/index.ts b/src/index.ts
index 4a118cee..54731a16 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -305,7 +305,7 @@ export async function connect (connectOptions: ConnectOptions) {
 
   if (connectOptions.server && !connectOptions.viewerWsConnect && !parsedServer.isWebSocket) {
     console.log(`using proxy ${proxy.host}:${proxy.port || location.port}`)
-    net['setProxy']({ hostname: proxy.host, port: proxy.port, headers: { Authorization: `Bearer ${new URLSearchParams(location.search).get('token') ?? ''}` } })
+    net['setProxy']({ hostname: proxy.host, port: proxy.port, headers: { Authorization: `Bearer ${new URLSearchParams(location.search).get('token') ?? ''}` }, artificialDelay: appQueryParams.addPing ? Number(appQueryParams.addPing) : undefined })
   }
 
   const renderDistance = singleplayer ? renderDistanceSingleplayer : multiplayerRenderDistance
diff --git a/src/mineflayer/mc-protocol.ts b/src/mineflayer/mc-protocol.ts
index 0171387a..cd21d01f 100644
--- a/src/mineflayer/mc-protocol.ts
+++ b/src/mineflayer/mc-protocol.ts
@@ -130,7 +130,8 @@ export const setProxy = (proxyParams: ProxyParams) => {
   net['setProxy']({
     hostname: proxy.host,
     port: proxy.port,
-    headers: proxyParams.headers
+    headers: proxyParams.headers,
+    artificialDelay: appQueryParams.addPing ? Number(appQueryParams.addPing) : undefined
   })
   return {
     proxy

From 513201be87401c53231103da9264693a3ccadb92 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Mon, 1 Sep 2025 08:56:08 +0300
Subject: [PATCH 727/753] up browserify

---
 pnpm-lock.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6c393ac7..6a4773d2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -155,7 +155,7 @@ importers:
         version: 2.0.4
       net-browserify:
         specifier: github:zardoy/prismarinejs-net-browserify
-        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/17fb901e8ea480a52c8fd46373695be172be8aa5
+        version: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/e754999ffdea67853bc9b10553b5e9908b40f618
       node-gzip:
         specifier: ^1.1.2
         version: 1.1.2
@@ -6849,8 +6849,8 @@ packages:
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/17fb901e8ea480a52c8fd46373695be172be8aa5:
-    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/17fb901e8ea480a52c8fd46373695be172be8aa5}
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/e754999ffdea67853bc9b10553b5e9908b40f618:
+    resolution: {tarball: https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/e754999ffdea67853bc9b10553b5e9908b40f618}
     version: 0.2.4
 
   nice-try@1.0.5:
@@ -17574,7 +17574,7 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/17fb901e8ea480a52c8fd46373695be172be8aa5:
+  net-browserify@https://codeload.github.com/zardoy/prismarinejs-net-browserify/tar.gz/e754999ffdea67853bc9b10553b5e9908b40f618:
     dependencies:
       body-parser: 1.20.3
       express: 4.21.2

From 7e3ba8bece2e4c85bcc8ef7f2caa22627f88d50d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 2 Sep 2025 19:02:30 +0300
Subject: [PATCH 728/753] up integrated server for the latest fixes and better
 stability

---
 package.json   |  2 +-
 pnpm-lock.yaml | 28 ++++++++++++++++++++--------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 5dcd9547..b5f66bfb 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "esbuild-plugin-polyfill-node": "^0.3.0",
     "express": "^4.18.2",
     "filesize": "^10.0.12",
-    "flying-squid": "npm:@zardoy/flying-squid@^0.0.62",
+    "flying-squid": "npm:@zardoy/flying-squid@^0.0.104",
     "framer-motion": "^12.9.2",
     "fs-extra": "^11.1.1",
     "google-drive-browserfs": "github:zardoy/browserfs#google-drive",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6a4773d2..f6188b6d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -121,8 +121,8 @@ importers:
         specifier: ^10.0.12
         version: 10.1.6
       flying-squid:
-        specifier: npm:@zardoy/flying-squid@^0.0.62
-        version: '@zardoy/flying-squid@0.0.62(encoding@0.1.13)'
+        specifier: npm:@zardoy/flying-squid@^0.0.104
+        version: '@zardoy/flying-squid@0.0.104(encoding@0.1.13)'
       framer-motion:
         specifier: ^12.9.2
         version: 12.9.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -3387,13 +3387,13 @@ packages:
     resolution: {integrity: sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==}
     engines: {node: '>=12 <14 || 14.2 - 14.9 || >14.10.0'}
 
-  '@zardoy/flying-squid@0.0.49':
-    resolution: {integrity: sha512-Kt4wr5/R+44tcLU9gjuNG2an9weWeKEpIoKXfsgJN2GGQqdnbd5nBpxfGDdgZ9aMdFugsVW8BsyPZNhj9vbMXA==}
+  '@zardoy/flying-squid@0.0.104':
+    resolution: {integrity: sha512-jGhQ7fn7o8UN+mUwZbt9674D37YLuBi+Au4TwKcopCA6huIQdHTFNl2e+0ZSTI5mnhN+NpyVoR3vmtH6L58vHQ==}
     engines: {node: '>=8'}
     hasBin: true
 
-  '@zardoy/flying-squid@0.0.62':
-    resolution: {integrity: sha512-M6icydO/yrmwevBhmgKcqEPC63AhWfU/Es9N/uadVrmKaxGm2FQMMLcybbutRYm1xZ6qsdxDUOUZnN56PsVwfQ==}
+  '@zardoy/flying-squid@0.0.49':
+    resolution: {integrity: sha512-Kt4wr5/R+44tcLU9gjuNG2an9weWeKEpIoKXfsgJN2GGQqdnbd5nBpxfGDdgZ9aMdFugsVW8BsyPZNhj9vbMXA==}
     engines: {node: '>=8'}
     hasBin: true
 
@@ -6444,6 +6444,12 @@ packages:
     resolution: {integrity: sha512-RYZeD1+joNlPuUpi+tIWkbP0ieVJr+R6IFkI6/8juhSxx9zE4osoSmteybrfspGm8A6u+YbbY1epqRKEMwVR6Q==}
     engines: {node: '>=18.0.0'}
 
+  mc-bridge@0.1.3:
+    resolution: {integrity: sha512-H9jPt2xEU77itC27dSz3qazHYqN9qVsv4HgMPozg7RqQ1uwgXmEa+ojKIlDtXf/TLJsG6Kv4EbzGa8a1Wh72uA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    peerDependencies:
+      minecraft-data: 3.92.0
+
   mcraft-fun-mineflayer@0.1.23:
     resolution: {integrity: sha512-qmI1rQQ0Ro5zJdi99rClWLF+mS9JZffgNX2vyWWesS3Hsk3Xblp/8swYTJKHSaFpNgzkVfXV92fEIrBqeH6iKA==}
     version: 0.1.23
@@ -13088,7 +13094,7 @@ snapshots:
       '@types/emscripten': 1.40.0
       tslib: 1.14.1
 
-  '@zardoy/flying-squid@0.0.49(encoding@0.1.13)':
+  '@zardoy/flying-squid@0.0.104(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
       chalk: 5.4.1
@@ -13098,11 +13104,13 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
+      mc-bridge: 0.1.3(minecraft-data@3.92.0)
       minecraft-data: 3.92.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
+      prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.17.0
@@ -13124,7 +13132,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@zardoy/flying-squid@0.0.62(encoding@0.1.13)':
+  '@zardoy/flying-squid@0.0.49(encoding@0.1.13)':
     dependencies:
       '@tootallnate/once': 2.0.0
       chalk: 5.4.1
@@ -16978,6 +16986,10 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
+  mc-bridge@0.1.3(minecraft-data@3.92.0):
+    dependencies:
+      minecraft-data: 3.92.0
+
   mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)

From 9d54c70fb724884cd98782cdca093aef622095ba Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 2 Sep 2025 19:05:18 +0300
Subject: [PATCH 729/753] use node 22

---
 .github/workflows/benchmark.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index f913b9b6..e80b7100 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -26,7 +26,7 @@ jobs:
         uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: "pnpm"
       - name: Move Cypress to dependencies
         run: |

From 70534d8b5a64ed9df64229b8933c6adc2ac61ea4 Mon Sep 17 00:00:00 2001
From: Kesuaheli <kesuaheligame@gmail.com>
Date: Thu, 4 Sep 2025 12:51:56 +0200
Subject: [PATCH 730/753] fix: adding support for newer skin profile data
 structure in player heads

---
 renderer/viewer/three/worldrendererThree.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index fb6c8e11..39b8e1de 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -767,12 +767,17 @@ export class WorldRendererThree extends WorldRendererCommon {
   }
 
   renderHead (position: Vec3, rotation: number, isWall: boolean, blockEntity) {
-    const textures = blockEntity.SkullOwner?.Properties?.textures[0]
-    if (!textures) return
+    let textureData: string
+    if (blockEntity.SkullOwner) {
+      textureData = blockEntity.SkullOwner.Properties?.textures[0]?.Value
+    } else {
+      textureData = blockEntity.profile?.properties?.find(p => p.name === 'textures')?.value
+    }
+    if (!textureData) return
 
     try {
-      const textureData = JSON.parse(Buffer.from(textures.Value, 'base64').toString())
-      let skinUrl = textureData.textures?.SKIN?.url
+      const decodedData = JSON.parse(Buffer.from(textureData, 'base64').toString())
+      let skinUrl = decodedData.textures?.SKIN?.url
       const { skinTexturesProxy } = this.worldRendererConfig
       if (skinTexturesProxy) {
         skinUrl = skinUrl?.replace('http://textures.minecraft.net/', skinTexturesProxy)

From 528d8f516b1d8f86552fbf64d8130b138e1aba23 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Thu, 4 Sep 2025 21:55:02 +0300
Subject: [PATCH 731/753] Update worldrendererThree.ts

---
 renderer/viewer/three/worldrendererThree.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 39b8e1de..440061ad 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -769,7 +769,7 @@ export class WorldRendererThree extends WorldRendererCommon {
   renderHead (position: Vec3, rotation: number, isWall: boolean, blockEntity) {
     let textureData: string
     if (blockEntity.SkullOwner) {
-      textureData = blockEntity.SkullOwner.Properties?.textures[0]?.Value
+      textureData = blockEntity.SkullOwner.Properties?.textures?.[0]?.Value
     } else {
       textureData = blockEntity.profile?.properties?.find(p => p.name === 'textures')?.value
     }

From b2e36840b9d3531ed352e08e09fc54734026cc51 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 5 Sep 2025 05:02:54 +0300
Subject: [PATCH 732/753] feat: brand new default skybox with fog, better
 daycycle and colors (#425)

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 README.MD                                   |   1 +
 renderer/viewer/lib/worldDataEmitter.ts     |  32 +++
 renderer/viewer/lib/worldrendererCommon.ts  |  66 +++--
 renderer/viewer/three/skyboxRenderer.ts     | 281 +++++++++++++++++++-
 renderer/viewer/three/worldrendererThree.ts |  23 +-
 src/dayCycle.ts                             |  46 ----
 src/index.ts                                |   2 -
 src/watchOptions.ts                         |   1 +
 8 files changed, 375 insertions(+), 77 deletions(-)
 delete mode 100644 src/dayCycle.ts

diff --git a/README.MD b/README.MD
index 82aac011..74d4eb41 100644
--- a/README.MD
+++ b/README.MD
@@ -233,3 +233,4 @@ Only during development:
 
 - [https://github.com/ClassiCube/ClassiCube](ClassiCube - Better C# Rewrite) [DEMO](https://www.classicube.net/server/play/?warned=true)
 - [https://m.eaglercraft.com/](EaglerCraft) - Eaglercraft runnable on mobile (real Minecraft in the browser)
+- [js-minecraft](https://github.com/LabyStudio/js-minecraft) - An insanely well done clone from the graphical side that inspired many features here
diff --git a/renderer/viewer/lib/worldDataEmitter.ts b/renderer/viewer/lib/worldDataEmitter.ts
index 86a85f77..dfbdb35c 100644
--- a/renderer/viewer/lib/worldDataEmitter.ts
+++ b/renderer/viewer/lib/worldDataEmitter.ts
@@ -7,6 +7,7 @@ import { Vec3 } from 'vec3'
 import { BotEvents } from 'mineflayer'
 import { proxy } from 'valtio'
 import TypedEmitter from 'typed-emitter'
+import { Biome } from 'minecraft-data'
 import { delayedIterator } from '../../playground/shared'
 import { chunkPos } from './simpleUtils'
 
@@ -28,6 +29,8 @@ export type WorldDataEmitterEvents = {
   updateLight: (data: { pos: Vec3 }) => void
   onWorldSwitch: () => void
   end: () => void
+  biomeUpdate: (data: { biome: Biome }) => void
+  biomeReset: () => void
 }
 
 export class WorldDataEmitterWorker extends (EventEmitter as new () => TypedEmitter<WorldDataEmitterEvents>) {
@@ -360,8 +363,37 @@ export class WorldDataEmitter extends (EventEmitter as new () => TypedEmitter<Wo
     delete this.debugChunksInfo[`${pos.x},${pos.z}`]
   }
 
+  lastBiomeId: number | null = null
+
+  udpateBiome (pos: Vec3) {
+    try {
+      const biomeId = this.world.getBiome(pos)
+      if (biomeId !== this.lastBiomeId) {
+        this.lastBiomeId = biomeId
+        const biomeData = loadedData.biomes[biomeId]
+        if (biomeData) {
+          this.emitter.emit('biomeUpdate', {
+            biome: biomeData
+          })
+        } else {
+          // unknown biome
+          this.emitter.emit('biomeReset')
+        }
+      }
+    } catch (e) {
+      console.error('error updating biome', e)
+    }
+  }
+
+  lastPosCheck: Vec3 | null = null
   async updatePosition (pos: Vec3, force = false) {
     if (!this.allowPositionUpdate) return
+    const posFloored = pos.floored()
+    if (!force && this.lastPosCheck && this.lastPosCheck.equals(posFloored)) return
+    this.lastPosCheck = posFloored
+
+    this.udpateBiome(pos)
+
     const [lastX, lastZ] = chunkPos(this.lastPos)
     const [botX, botZ] = chunkPos(pos)
     if (lastX !== botX || lastZ !== botZ || force) {
diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index 5c4fd6b5..e2455915 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -32,31 +32,44 @@ const toMajorVersion = version => {
 export const worldCleanup = buildCleanupDecorator('resetWorld')
 
 export const defaultWorldRendererConfig = {
+  // Debug settings
   showChunkBorders: false,
+  enableDebugOverlay: false,
+
+  // Performance settings
   mesherWorkers: 4,
-  isPlayground: false,
-  renderEars: true,
-  skinTexturesProxy: undefined as string | undefined,
-  // game renderer setting actually
-  showHand: false,
-  viewBobbing: false,
-  extraBlockRenderers: true,
-  clipWorldBelowY: undefined as number | undefined,
+  addChunksBatchWaitTime: 200,
+  _experimentalSmoothChunkLoading: true,
+  _renderByChunks: false,
+
+  // Rendering engine settings
+  dayCycle: true,
   smoothLighting: true,
   enableLighting: true,
   starfield: true,
-  addChunksBatchWaitTime: 200,
+  renderEntities: true,
+  extraBlockRenderers: true,
+  foreground: true,
+  fov: 75,
+  volume: 1,
+
+  // Camera visual related settings
+  showHand: false,
+  viewBobbing: false,
+  renderEars: true,
+  highlightBlockColor: 'blue',
+
+  // Player models
+  fetchPlayerSkins: true,
+  skinTexturesProxy: undefined as string | undefined,
+
+  // VR settings
   vrSupport: true,
   vrPageGameRendering: true,
-  renderEntities: true,
-  fov: 75,
-  fetchPlayerSkins: true,
-  highlightBlockColor: 'blue',
-  foreground: true,
-  enableDebugOverlay: false,
-  _experimentalSmoothChunkLoading: true,
-  _renderByChunks: false,
-  volume: 1
+
+  // World settings
+  clipWorldBelowY: undefined as number | undefined,
+  isPlayground: false
 }
 
 export type WorldRendererConfig = typeof defaultWorldRendererConfig
@@ -496,6 +509,10 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
 
   timeUpdated? (newTime: number): void
 
+  biomeUpdated? (biome: any): void
+
+  biomeReset? (): void
+
   updateViewerPosition (pos: Vec3) {
     this.viewerChunkPosition = pos
     for (const [key, value] of Object.entries(this.loadedChunks)) {
@@ -817,12 +834,9 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
     })
 
     worldEmitter.on('time', (timeOfDay) => {
+      if (!this.worldRendererConfig.dayCycle) return
       this.timeUpdated?.(timeOfDay)
 
-      if (timeOfDay < 0 || timeOfDay > 24_000) {
-        throw new Error('Invalid time of day. It should be between 0 and 24000.')
-      }
-
       this.timeOfTheDay = timeOfDay
 
       // if (this.worldRendererConfig.skyLight === skyLight) return
@@ -831,6 +845,14 @@ export abstract class WorldRendererCommon<WorkerSend = any, WorkerReceive = any>
       //   (this).rerenderAllChunks?.()
       // }
     })
+
+    worldEmitter.on('biomeUpdate', ({ biome }) => {
+      this.biomeUpdated?.(biome)
+    })
+
+    worldEmitter.on('biomeReset', () => {
+      this.biomeReset?.()
+    })
   }
 
   setBlockStateIdInner (pos: Vec3, stateId: number | undefined, needAoRecalculation = true) {
diff --git a/renderer/viewer/three/skyboxRenderer.ts b/renderer/viewer/three/skyboxRenderer.ts
index 294c72aa..aa8c3bb6 100644
--- a/renderer/viewer/three/skyboxRenderer.ts
+++ b/renderer/viewer/three/skyboxRenderer.ts
@@ -1,10 +1,28 @@
 import * as THREE from 'three'
 
+export const DEFAULT_TEMPERATURE = 0.75
+
 export class SkyboxRenderer {
   private texture: THREE.Texture | null = null
   private mesh: THREE.Mesh<THREE.SphereGeometry, THREE.MeshBasicMaterial> | null = null
+  private skyMesh: THREE.Mesh | null = null
+  private voidMesh: THREE.Mesh | null = null
 
-  constructor (private readonly scene: THREE.Scene, public initialImage: string | null) {}
+  // World state
+  private worldTime = 0
+  private partialTicks = 0
+  private viewDistance = 4
+  private temperature = DEFAULT_TEMPERATURE
+  private inWater = false
+  private waterBreathing = false
+  private fogBrightness = 0
+  private prevFogBrightness = 0
+
+  constructor (private readonly scene: THREE.Scene, public initialImage: string | null) {
+    if (!initialImage) {
+      this.createGradientSky()
+    }
+  }
 
   async init () {
     if (this.initialImage) {
@@ -58,10 +76,255 @@ export class SkyboxRenderer {
     }
   }
 
-  update (cameraPosition: THREE.Vector3) {
-    if (this.mesh) {
-      this.mesh.position.copy(cameraPosition)
+  update (cameraPosition: THREE.Vector3, newViewDistance: number) {
+    if (newViewDistance !== this.viewDistance) {
+      this.viewDistance = newViewDistance
+      this.updateSkyColors()
     }
+
+    if (this.mesh) {
+      // Update skybox position
+      this.mesh.position.copy(cameraPosition)
+    } else if (this.skyMesh) {
+      // Update gradient sky position
+      this.skyMesh.position.copy(cameraPosition)
+      this.voidMesh?.position.copy(cameraPosition)
+      this.updateSkyColors() // Update colors based on time of day
+    }
+  }
+
+  // Update world time
+  updateTime (timeOfDay: number, partialTicks = 0) {
+    this.worldTime = timeOfDay
+    this.partialTicks = partialTicks
+    this.updateSkyColors()
+  }
+
+  // Update view distance
+  updateViewDistance (viewDistance: number) {
+    this.viewDistance = viewDistance
+    this.updateSkyColors()
+  }
+
+  // Update temperature (for biome support)
+  updateTemperature (temperature: number) {
+    this.temperature = temperature
+    this.updateSkyColors()
+  }
+
+  // Update water state
+  updateWaterState (inWater: boolean, waterBreathing: boolean) {
+    this.inWater = inWater
+    this.waterBreathing = waterBreathing
+    this.updateSkyColors()
+  }
+
+  private createGradientSky () {
+    const size = 64
+    const scale = 256 / size + 2
+
+    {
+      const geometry = new THREE.PlaneGeometry(size * scale * 2, size * scale * 2)
+      geometry.rotateX(-Math.PI / 2)
+      geometry.translate(0, 16, 0)
+
+      const material = new THREE.MeshBasicMaterial({
+        color: 0xff_ff_ff,
+        side: THREE.DoubleSide,
+        depthTest: false
+      })
+
+      this.skyMesh = new THREE.Mesh(geometry, material)
+      this.scene.add(this.skyMesh)
+    }
+
+    {
+      const geometry = new THREE.PlaneGeometry(size * scale * 2, size * scale * 2)
+      geometry.rotateX(-Math.PI / 2)
+      geometry.translate(0, -16, 0)
+
+      const material = new THREE.MeshBasicMaterial({
+        color: 0xff_ff_ff,
+        side: THREE.DoubleSide,
+        depthTest: false
+      })
+
+      this.voidMesh = new THREE.Mesh(geometry, material)
+      this.scene.add(this.voidMesh)
+    }
+
+    this.updateSkyColors()
+  }
+
+  private getFogColor (partialTicks = 0): THREE.Vector3 {
+    const angle = this.getCelestialAngle(partialTicks)
+    let rotation = Math.cos(angle * Math.PI * 2) * 2 + 0.5
+    rotation = Math.max(0, Math.min(1, rotation))
+
+    let x = 0.752_941_2
+    let y = 0.847_058_83
+    let z = 1
+
+    x *= (rotation * 0.94 + 0.06)
+    y *= (rotation * 0.94 + 0.06)
+    z *= (rotation * 0.91 + 0.09)
+
+    return new THREE.Vector3(x, y, z)
+  }
+
+  private getSkyColor (x = 0, z = 0, partialTicks = 0): THREE.Vector3 {
+    const angle = this.getCelestialAngle(partialTicks)
+    let brightness = Math.cos(angle * 3.141_593 * 2) * 2 + 0.5
+
+    if (brightness < 0) brightness = 0
+    if (brightness > 1) brightness = 1
+
+    const temperature = this.getTemperature(x, z)
+    const rgb = this.getSkyColorByTemp(temperature)
+
+    const red = ((rgb >> 16) & 0xff) / 255
+    const green = ((rgb >> 8) & 0xff) / 255
+    const blue = (rgb & 0xff) / 255
+
+    return new THREE.Vector3(
+      red * brightness,
+      green * brightness,
+      blue * brightness
+    )
+  }
+
+  private calculateCelestialAngle (time: number, partialTicks: number): number {
+    const modTime = (time % 24_000)
+    let angle = (modTime + partialTicks) / 24_000 - 0.25
+
+    if (angle < 0) {
+      angle++
+    }
+    if (angle > 1) {
+      angle--
+    }
+
+    angle = 1 - ((Math.cos(angle * Math.PI) + 1) / 2)
+    angle += (angle - angle) / 3
+
+    return angle
+  }
+
+  private getCelestialAngle (partialTicks: number): number {
+    return this.calculateCelestialAngle(this.worldTime, partialTicks)
+  }
+
+  private getTemperature (x: number, z: number): number {
+    return this.temperature
+  }
+
+  private getSkyColorByTemp (temperature: number): number {
+    temperature /= 3
+    if (temperature < -1) temperature = -1
+    if (temperature > 1) temperature = 1
+
+    const hue = 0.622_222_2 - temperature * 0.05
+    const saturation = 0.5 + temperature * 0.1
+    const brightness = 1
+
+    return this.hsbToRgb(hue, saturation, brightness)
+  }
+
+  private hsbToRgb (hue: number, saturation: number, brightness: number): number {
+    let r = 0; let g = 0; let b = 0
+    if (saturation === 0) {
+      r = g = b = Math.floor(brightness * 255 + 0.5)
+    } else {
+      const h = (hue - Math.floor(hue)) * 6
+      const f = h - Math.floor(h)
+      const p = brightness * (1 - saturation)
+      const q = brightness * (1 - saturation * f)
+      const t = brightness * (1 - (saturation * (1 - f)))
+      switch (Math.floor(h)) {
+        case 0:
+          r = Math.floor(brightness * 255 + 0.5)
+          g = Math.floor(t * 255 + 0.5)
+          b = Math.floor(p * 255 + 0.5)
+          break
+        case 1:
+          r = Math.floor(q * 255 + 0.5)
+          g = Math.floor(brightness * 255 + 0.5)
+          b = Math.floor(p * 255 + 0.5)
+          break
+        case 2:
+          r = Math.floor(p * 255 + 0.5)
+          g = Math.floor(brightness * 255 + 0.5)
+          b = Math.floor(t * 255 + 0.5)
+          break
+        case 3:
+          r = Math.floor(p * 255 + 0.5)
+          g = Math.floor(q * 255 + 0.5)
+          b = Math.floor(brightness * 255 + 0.5)
+          break
+        case 4:
+          r = Math.floor(t * 255 + 0.5)
+          g = Math.floor(p * 255 + 0.5)
+          b = Math.floor(brightness * 255 + 0.5)
+          break
+        case 5:
+          r = Math.floor(brightness * 255 + 0.5)
+          g = Math.floor(p * 255 + 0.5)
+          b = Math.floor(q * 255 + 0.5)
+          break
+      }
+    }
+    return 0xff_00_00_00 | (r << 16) | (g << 8) | (Math.trunc(b))
+  }
+
+  private updateSkyColors () {
+    if (!this.skyMesh || !this.voidMesh) return
+
+    // Update fog brightness with smooth transition
+    this.prevFogBrightness = this.fogBrightness
+    const renderDistance = this.viewDistance / 32
+    const brightnessAtPosition = 1 // Could be affected by light level in future
+    const targetBrightness = brightnessAtPosition * (1 - renderDistance) + renderDistance
+    this.fogBrightness += (targetBrightness - this.fogBrightness) * 0.1
+
+    // Handle water fog
+    if (this.inWater) {
+      const waterViewDistance = this.waterBreathing ? 100 : 5
+      this.scene.fog = new THREE.Fog(new THREE.Color(0, 0, 1), 0.0025, waterViewDistance)
+      this.scene.background = new THREE.Color(0, 0, 1)
+
+      // Update sky and void colors for underwater effect
+      ;(this.skyMesh.material as THREE.MeshBasicMaterial).color.set(new THREE.Color(0, 0, 1))
+      ;(this.voidMesh.material as THREE.MeshBasicMaterial).color.set(new THREE.Color(0, 0, 0.6))
+      return
+    }
+
+    // Normal sky colors
+    const viewDistance = this.viewDistance * 16
+    const viewFactor = 1 - (0.25 + 0.75 * this.viewDistance / 32) ** 0.25
+
+    const angle = this.getCelestialAngle(this.partialTicks)
+    const skyColor = this.getSkyColor(0, 0, this.partialTicks)
+    const fogColor = this.getFogColor(this.partialTicks)
+
+    const brightness = Math.cos(angle * Math.PI * 2) * 2 + 0.5
+    const clampedBrightness = Math.max(0, Math.min(1, brightness))
+
+    // Interpolate fog brightness
+    const interpolatedBrightness = this.prevFogBrightness + (this.fogBrightness - this.prevFogBrightness) * this.partialTicks
+
+    const red = (fogColor.x + (skyColor.x - fogColor.x) * viewFactor) * clampedBrightness * interpolatedBrightness
+    const green = (fogColor.y + (skyColor.y - fogColor.y) * viewFactor) * clampedBrightness * interpolatedBrightness
+    const blue = (fogColor.z + (skyColor.z - fogColor.z) * viewFactor) * clampedBrightness * interpolatedBrightness
+
+    this.scene.background = new THREE.Color(red, green, blue)
+    this.scene.fog = new THREE.Fog(new THREE.Color(red, green, blue), 0.0025, viewDistance * 2)
+
+    ;(this.skyMesh.material as THREE.MeshBasicMaterial).color.set(new THREE.Color(skyColor.x, skyColor.y, skyColor.z))
+    ;(this.voidMesh.material as THREE.MeshBasicMaterial).color.set(new THREE.Color(
+      skyColor.x * 0.2 + 0.04,
+      skyColor.y * 0.2 + 0.04,
+      skyColor.z * 0.6 + 0.1
+    ))
   }
 
   dispose () {
@@ -73,5 +336,15 @@ export class SkyboxRenderer {
       ;(this.mesh.material as THREE.Material).dispose()
       this.scene.remove(this.mesh)
     }
+    if (this.skyMesh) {
+      this.skyMesh.geometry.dispose()
+      ;(this.skyMesh.material as THREE.Material).dispose()
+      this.scene.remove(this.skyMesh)
+    }
+    if (this.voidMesh) {
+      this.voidMesh.geometry.dispose()
+      ;(this.voidMesh.material as THREE.Material).dispose()
+      this.scene.remove(this.voidMesh)
+    }
   }
 }
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 440061ad..29e9223c 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -3,6 +3,7 @@ import { Vec3 } from 'vec3'
 import nbt from 'prismarine-nbt'
 import PrismarineChatLoader from 'prismarine-chat'
 import * as tweenJs from '@tweenjs/tween.js'
+import { Biome } from 'minecraft-data'
 import { renderSign } from '../sign-renderer'
 import { DisplayWorldOptions, GraphicsInitOptions } from '../../../src/appViewer'
 import { chunkPos, sectionPos } from '../lib/simpleUtils'
@@ -24,7 +25,7 @@ import { CameraShake } from './cameraShake'
 import { ThreeJsMedia } from './threeJsMedia'
 import { Fountain } from './threeJsParticles'
 import { WaypointsRenderer } from './waypoints'
-import { SkyboxRenderer } from './skyboxRenderer'
+import { DEFAULT_TEMPERATURE, SkyboxRenderer } from './skyboxRenderer'
 
 type SectionKey = string
 
@@ -173,7 +174,10 @@ export class WorldRendererThree extends WorldRendererCommon {
   override watchReactivePlayerState () {
     super.watchReactivePlayerState()
     this.onReactivePlayerStateUpdated('inWater', (value) => {
-      this.scene.fog = value ? new THREE.Fog(0x00_00_ff, 0.1, this.playerStateReactive.waterBreathing ? 100 : 20) : null
+      this.skyboxRenderer.updateWaterState(value, this.playerStateReactive.waterBreathing)
+    })
+    this.onReactivePlayerStateUpdated('waterBreathing', (value) => {
+      this.skyboxRenderer.updateWaterState(this.playerStateReactive.inWater, value)
     })
     this.onReactivePlayerStateUpdated('ambientLight', (value) => {
       if (!value) return
@@ -264,6 +268,19 @@ export class WorldRendererThree extends WorldRendererCommon {
     } else {
       this.starField.remove()
     }
+
+    this.skyboxRenderer.updateTime(newTime)
+  }
+
+  biomeUpdated (biome: Biome): void {
+    if (biome?.temperature !== undefined) {
+      this.skyboxRenderer.updateTemperature(biome.temperature)
+    }
+  }
+
+  biomeReset (): void {
+    // Reset to default temperature when biome is unknown
+    this.skyboxRenderer.updateTemperature(DEFAULT_TEMPERATURE)
   }
 
   getItemRenderData (item: Record<string, any>, specificProps: ItemSpecificContextProperties) {
@@ -716,7 +733,7 @@ export class WorldRendererThree extends WorldRendererCommon {
 
     // Update skybox position to follow camera
     const cameraPos = this.getCameraPosition()
-    this.skyboxRenderer.update(cameraPos)
+    this.skyboxRenderer.update(cameraPos, this.viewDistance)
 
     const sizeOrFovChanged = sizeChanged || this.displayOptions.inWorldRenderingConfig.fov !== this.camera.fov
     if (sizeOrFovChanged) {
diff --git a/src/dayCycle.ts b/src/dayCycle.ts
deleted file mode 100644
index 50e63a21..00000000
--- a/src/dayCycle.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { options } from './optionsStorage'
-import { assertDefined } from './utils'
-import { updateBackground } from './water'
-
-export default () => {
-  const timeUpdated = () => {
-    // 0 morning
-    const dayTotal = 24_000
-    const evening = 11_500
-    const night = 13_500
-    const morningStart = 23_000
-    const morningEnd = 23_961
-    const timeProgress = options.dayCycleAndLighting ? bot.time.timeOfDay : 0
-
-    // todo check actual colors
-    const dayColorRainy = { r: 111 / 255, g: 156 / 255, b: 236 / 255 }
-    // todo yes, we should make animations (and rain)
-    // eslint-disable-next-line unicorn/numeric-separators-style
-    const dayColor = bot.isRaining ? dayColorRainy : { r: 0.6784313725490196, g: 0.8470588235294118, b: 0.9019607843137255 } // lightblue
-    // let newColor = dayColor
-    let int = 1
-    if (timeProgress < evening) {
-      // stay dayily
-    } else if (timeProgress < night) {
-      const progressNorm = timeProgress - evening
-      const progressMax = night - evening
-      int = 1 - progressNorm / progressMax
-    } else if (timeProgress < morningStart) {
-      int = 0
-    } else if (timeProgress < morningEnd) {
-      const progressNorm = timeProgress - morningStart
-      const progressMax = night - morningEnd
-      int = progressNorm / progressMax
-    }
-    // todo need to think wisely how to set these values & also move directional light around!
-    const colorInt = Math.max(int, 0.1)
-    updateBackground({ r: dayColor.r * colorInt, g: dayColor.g * colorInt, b: dayColor.b * colorInt })
-    if (!options.newVersionsLighting && bot.supportFeature('blockStateId')) {
-      appViewer.playerState.reactive.ambientLight = Math.max(int, 0.25)
-      appViewer.playerState.reactive.directionalLight = Math.min(int, 0.5)
-    }
-  }
-
-  bot.on('time', timeUpdated)
-  timeUpdated()
-}
diff --git a/src/index.ts b/src/index.ts
index 54731a16..7764188f 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -56,7 +56,6 @@ import { isCypress } from './standaloneUtils'
 
 import { startLocalServer, unsupportedLocalServerFeatures } from './createLocalServer'
 import defaultServerOptions from './defaultLocalServerOptions'
-import dayCycle from './dayCycle'
 
 import { onAppLoad, resourcepackReload, resourcePackState } from './resourcePack'
 import { ConnectPeerOptions, connectToPeer } from './localServerMultiplayer'
@@ -794,7 +793,6 @@ export async function connect (connectOptions: ConnectOptions) {
       }
 
       initMotionTracking()
-      dayCycle()
 
       // Bot position callback
       const botPosition = () => {
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 2f5199c0..da75cc74 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -128,5 +128,6 @@ export const watchOptionsAfterWorldViewInit = (worldView: WorldDataEmitter) => {
     appViewer.inWorldRenderingConfig.renderEars = o.renderEars
     appViewer.inWorldRenderingConfig.showHand = o.showHand
     appViewer.inWorldRenderingConfig.viewBobbing = o.viewBobbing
+    appViewer.inWorldRenderingConfig.dayCycle = o.dayCycleAndLighting
   })
 }

From 265d02d18d46fbde79437857eb58254fb68b1cf0 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sun, 7 Sep 2025 18:23:13 +0000
Subject: [PATCH 733/753] up protocol for 1.21.8

---
 pnpm-lock.yaml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f6188b6d..fd8be62b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -140,13 +140,13 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
-        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
+        version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mineflayer-item-map-downloader:
         specifier: github:zardoy/mineflayer-item-map-downloader
         version: https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13)
@@ -345,7 +345,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.21
         version: 0.1.21
@@ -6668,8 +6668,8 @@ packages:
     resolution: {tarball: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41}
     version: 1.0.1
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074:
-    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074}
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9:
+    resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9}
     version: 1.61.0
     engines: {node: '>=22'}
 
@@ -6688,8 +6688,8 @@ packages:
     resolution: {integrity: sha512-1XTVuw3twIrEcqQ1QRSB8NcStIUEZ+tbxiAG6rOrN/9M4thhtlS5PTJzFdmdrcYgWEBLvuOdJszaKE5zFfiXhg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e}
     version: 8.0.0
     engines: {node: '>=22'}
 
@@ -11344,7 +11344,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@@ -13106,7 +13106,7 @@ snapshots:
       long: 5.3.1
       mc-bridge: 0.1.3(minecraft-data@3.92.0)
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -13143,7 +13143,7 @@ snapshots:
       flatmap: 0.0.3
       long: 5.3.1
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
@@ -16990,12 +16990,12 @@ snapshots:
     dependencies:
       minecraft-data: 3.92.0
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17313,7 +17313,7 @@ snapshots:
       - '@types/react'
       - react
 
-  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13):
+  minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13):
     dependencies:
       '@types/node-rsa': 1.1.4
       '@types/readable-stream': 4.0.18
@@ -17365,7 +17365,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17380,11 +17380,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/86e65631e79c490021afc63c80091a7bb6019fa8(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0
-      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/c561917bf7e7966911321512c2a6895a3f9da074(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
+      minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0

From 7f7a14ac65105649621ed825245ca23c2f2c5f85 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 04:19:38 +0300
Subject: [PATCH 734/753] feat: Add overlay model viewer. Already integrated
 into inventory to display player!

---
 renderer/viewer/lib/createPlayerObject.ts |  55 +++
 renderer/viewer/three/entities.ts         |   7 +-
 src/inventoryWindows.ts                   |  35 ++
 src/react/OverlayModelViewer.tsx          | 505 ++++++++++++++++++++++
 src/reactUi.tsx                           |   2 +
 5 files changed, 598 insertions(+), 6 deletions(-)
 create mode 100644 renderer/viewer/lib/createPlayerObject.ts
 create mode 100644 src/react/OverlayModelViewer.tsx

diff --git a/renderer/viewer/lib/createPlayerObject.ts b/renderer/viewer/lib/createPlayerObject.ts
new file mode 100644
index 00000000..836c8062
--- /dev/null
+++ b/renderer/viewer/lib/createPlayerObject.ts
@@ -0,0 +1,55 @@
+import { PlayerObject, PlayerAnimation } from 'skinview3d'
+import * as THREE from 'three'
+import { WalkingGeneralSwing } from '../three/entity/animations'
+import { loadSkinImage, stevePngUrl } from './utils/skins'
+
+export type PlayerObjectType = PlayerObject & {
+  animation?: PlayerAnimation
+  realPlayerUuid: string
+  realUsername: string
+}
+
+export function createPlayerObject (options: {
+  username?: string
+  uuid?: string
+  scale?: number
+}): {
+    playerObject: PlayerObjectType
+    wrapper: THREE.Group
+  } {
+  const wrapper = new THREE.Group()
+  const playerObject = new PlayerObject() as PlayerObjectType
+
+  playerObject.realPlayerUuid = options.uuid ?? ''
+  playerObject.realUsername = options.username ?? ''
+  playerObject.position.set(0, 16, 0)
+
+  // fix issues with starfield
+  playerObject.traverse((obj) => {
+    if (obj instanceof THREE.Mesh && obj.material instanceof THREE.MeshStandardMaterial) {
+      obj.material.transparent = true
+    }
+  })
+
+  wrapper.add(playerObject as any)
+  const scale = options.scale ?? (1 / 16)
+  wrapper.scale.set(scale, scale, scale)
+  wrapper.rotation.set(0, Math.PI, 0)
+
+  // Set up animation
+  playerObject.animation = new WalkingGeneralSwing()
+  ;(playerObject.animation as WalkingGeneralSwing).isMoving = false
+  playerObject.animation.update(playerObject, 0)
+
+  return { playerObject, wrapper }
+}
+
+export const applySkinToPlayerObject = async (playerObject: PlayerObjectType, skinUrl: string) => {
+  return loadSkinImage(skinUrl || stevePngUrl).then(({ canvas }) => {
+    const skinTexture = new THREE.CanvasTexture(canvas)
+    skinTexture.magFilter = THREE.NearestFilter
+    skinTexture.minFilter = THREE.NearestFilter
+    skinTexture.needsUpdate = true
+    playerObject.skin.map = skinTexture as any
+  }).catch(console.error)
+}
diff --git a/renderer/viewer/three/entities.ts b/renderer/viewer/three/entities.ts
index 7849686b..fad30182 100644
--- a/renderer/viewer/three/entities.ts
+++ b/renderer/viewer/three/entities.ts
@@ -20,6 +20,7 @@ import { ItemSpecificContextProperties } from '../lib/basePlayerState'
 import { loadSkinFromUsername, loadSkinImage, stevePngUrl } from '../lib/utils/skins'
 import { renderComponent } from '../sign-renderer'
 import { createCanvas } from '../lib/utils'
+import { PlayerObjectType } from '../lib/createPlayerObject'
 import { getBlockMeshFromModel } from './holdingBlock'
 import { createItemMesh } from './itemMesh'
 import * as Entity from './entity/EntityMesh'
@@ -33,12 +34,6 @@ export const steveTexture = loadThreeJsTextureFromUrl(stevePngUrl)
 
 export const TWEEN_DURATION = 120
 
-type PlayerObjectType = PlayerObject & {
-  animation?: PlayerAnimation
-  realPlayerUuid: string
-  realUsername: string
-}
-
 function convert2sComplementToHex (complement: number) {
   if (complement < 0) {
     complement = (0xFF_FF_FF_FF + complement + 1) >>> 0
diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index 166e42a7..d16fee20 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -12,6 +12,7 @@ import PrismarineChatLoader from 'prismarine-chat'
 import * as nbt from 'prismarine-nbt'
 import { BlockModel } from 'mc-assets'
 import { renderSlot } from 'renderer/viewer/three/renderSlot'
+import { loadSkinFromUsername } from 'renderer/viewer/lib/utils/skins'
 import Generic95 from '../assets/generic_95.png'
 import { appReplacableResources } from './generated/resources'
 import { activeModalStack, hideCurrentModal, hideModal, miscUiState, showModal } from './globalState'
@@ -23,6 +24,7 @@ import { getItemDescription } from './itemsDescriptions'
 import { MessageFormatPart } from './chatUtils'
 import { GeneralInputItem, getItemMetadata, getItemModelName, getItemNameRaw, RenderItem } from './mineflayer/items'
 import { playerState } from './mineflayer/playerState'
+import { modelViewerState } from './react/OverlayModelViewer'
 
 const loadedImagesCache = new Map<string, HTMLImageElement | ImageBitmap>()
 const cleanLoadedImagesCache = () => {
@@ -40,6 +42,34 @@ export const jeiCustomCategories = proxy({
   value: [] as Array<{ id: string, categoryTitle: string, items: any[] }>
 })
 
+let remotePlayerSkin: string | undefined | Promise<string>
+
+export const showInventoryPlayer = () => {
+  modelViewerState.model = {
+    positioning: {
+      windowWidth: 176,
+      windowHeight: 166,
+      x: 25,
+      y: 8,
+      width: 50,
+      height: 70,
+      scaled: true,
+      onlyInitialScale: true,
+      followCursor: true,
+    },
+    // models: ['https://bucket.mcraft.fun/sitarbuckss.glb'],
+    // debug: true,
+    steveModelSkin: appViewer.playerState.reactive.playerSkin ?? (typeof remotePlayerSkin === 'string' ? remotePlayerSkin : ''),
+  }
+  if (remotePlayerSkin === undefined && !appViewer.playerState.reactive.playerSkin) {
+    remotePlayerSkin = loadSkinFromUsername(bot.username, 'skin').then(a => {
+      setTimeout(() => { showInventoryPlayer() }, 0) // todo patch instead and make reactive
+      remotePlayerSkin = a ?? ''
+      return remotePlayerSkin
+    })
+  }
+}
+
 export const onGameLoad = () => {
   version = bot.version
 
@@ -392,7 +422,12 @@ const openWindow = (type: string | undefined, title: string | any = undefined) =
     miscUiState.displaySearchInput = false
     destroyFn()
     skipClosePacketSending = false
+
+    modelViewerState.model = undefined
   })
+  if (type === undefined) {
+    showInventoryPlayer()
+  }
   cleanLoadedImagesCache()
   const inv = openItemsCanvas(type)
   inv.canvasManager.children[0].mobileHelpers = miscUiState.currentTouch
diff --git a/src/react/OverlayModelViewer.tsx b/src/react/OverlayModelViewer.tsx
new file mode 100644
index 00000000..24dc836d
--- /dev/null
+++ b/src/react/OverlayModelViewer.tsx
@@ -0,0 +1,505 @@
+import { proxy, useSnapshot, subscribe } from 'valtio'
+import { useEffect, useMemo, useRef } from 'react'
+import * as THREE from 'three'
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
+import { OBJLoader } from 'three/examples/jsm/loaders/OBJLoader'
+import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader'
+import { applySkinToPlayerObject, createPlayerObject, PlayerObjectType } from '../../renderer/viewer/lib/createPlayerObject'
+import { currentScaling } from '../scaleInterface'
+
+THREE.ColorManagement.enabled = false
+
+export const modelViewerState = proxy({
+  model: undefined as undefined | {
+    models?: string[] // Array of model URLs (URL itself is the cache key)
+    steveModelSkin?: string
+    debug?: boolean
+    // absolute positioning
+    positioning: {
+      windowWidth: number
+      windowHeight: number
+      x: number
+      y: number
+      width: number
+      height: number
+      scaled?: boolean
+      onlyInitialScale?: boolean
+      followCursor?: boolean
+    }
+    modelCustomization?: { [modelUrl: string]: { color?: string, opacity?: number, metalness?: number, roughness?: number } }
+    resetRotationOnReleae?: boolean
+    continiousRender?: boolean
+  }
+})
+globalThis.modelViewerState = modelViewerState
+
+// Global debug function to get camera and model values
+globalThis.getModelViewerValues = () => {
+  const scene = globalThis.sceneRef?.current
+  if (!scene) return null
+
+  const { camera, playerObject } = scene
+  if (!playerObject) return null
+
+  const wrapper = playerObject.parent
+  if (!wrapper) return null
+
+  const box = new THREE.Box3().setFromObject(wrapper)
+  const size = box.getSize(new THREE.Vector3())
+  const center = box.getCenter(new THREE.Vector3())
+
+  return {
+    camera: {
+      position: camera.position.clone(),
+      fov: camera.fov,
+      aspect: camera.aspect
+    },
+    model: {
+      position: wrapper.position.clone(),
+      rotation: wrapper.rotation.clone(),
+      scale: wrapper.scale.clone(),
+      size,
+      center
+    },
+    cursor: {
+      position: globalThis.cursorPosition || { x: 0, y: 0 },
+      normalized: globalThis.cursorPosition ? {
+        x: globalThis.cursorPosition.x * 2 - 1,
+        y: globalThis.cursorPosition.y * 2 - 1
+      } : { x: 0, y: 0 }
+    },
+    visibleArea: {
+      height: 2 * Math.tan(camera.fov * Math.PI / 180 / 2) * camera.position.z,
+      width: 2 * Math.tan(camera.fov * Math.PI / 180 / 2) * camera.position.z * camera.aspect
+    }
+  }
+}
+
+export default () => {
+  const { model } = useSnapshot(modelViewerState)
+  const containerRef = useRef<HTMLDivElement>(null)
+  const sceneRef = useRef<{
+    scene: THREE.Scene
+    camera: THREE.PerspectiveCamera
+    renderer: THREE.WebGLRenderer
+    controls: OrbitControls
+    playerObject?: PlayerObjectType
+    dispose: () => void
+  }>()
+  const initialScale = useMemo(() => {
+    return currentScaling.scale
+  }, [])
+  globalThis.sceneRef = sceneRef
+
+  // Cursor following state
+  const cursorPosition = useRef({ x: 0, y: 0 })
+  const isFollowingCursor = useRef(false)
+
+  // Model management state
+  const loadedModels = useRef<Map<string, THREE.Object3D>>(new Map())
+  const modelLoaders = useRef<Map<string, GLTFLoader | OBJLoader>>(new Map())
+
+  // Model management functions
+  const loadModel = (modelUrl: string) => {
+    if (loadedModels.current.has(modelUrl)) return // Already loaded
+
+    const isGLTF = modelUrl.toLowerCase().endsWith('.gltf') || modelUrl.toLowerCase().endsWith('.glb')
+    const loader = isGLTF ? new GLTFLoader() : new OBJLoader()
+    modelLoaders.current.set(modelUrl, loader)
+
+    const onLoad = (object: THREE.Object3D) => {
+      // Apply customization if available
+      const customization = model?.modelCustomization?.[modelUrl]
+      if (customization) {
+        object.traverse((child) => {
+          if (child instanceof THREE.Mesh && child.material) {
+            const material = child.material as THREE.MeshStandardMaterial
+            if (customization.color) {
+              material.color.setHex(parseInt(customization.color.replace('#', ''), 16))
+            }
+            if (customization.opacity !== undefined) {
+              material.opacity = customization.opacity
+              material.transparent = customization.opacity < 1
+            }
+            if (customization.metalness !== undefined) {
+              material.metalness = customization.metalness
+            }
+            if (customization.roughness !== undefined) {
+              material.roughness = customization.roughness
+            }
+          }
+        })
+      }
+
+      // Center and scale model
+      const box = new THREE.Box3().setFromObject(object)
+      const center = box.getCenter(new THREE.Vector3())
+      const size = box.getSize(new THREE.Vector3())
+      const maxDim = Math.max(size.x, size.y, size.z)
+      const scale = 2 / maxDim
+      object.scale.setScalar(scale)
+      object.position.sub(center.multiplyScalar(scale))
+
+      // Store the model using URL as key
+      loadedModels.current.set(modelUrl, object)
+      sceneRef.current?.scene.add(object)
+
+      // Trigger render
+      if (sceneRef.current) {
+        setTimeout(() => {
+          const render = () => sceneRef.current?.renderer.render(sceneRef.current.scene, sceneRef.current.camera)
+          render()
+        }, 0)
+      }
+    }
+
+    if (isGLTF) {
+      (loader as GLTFLoader).load(modelUrl, (gltf) => {
+        onLoad(gltf.scene)
+      })
+    } else {
+      (loader as OBJLoader).load(modelUrl, onLoad)
+    }
+  }
+
+  const removeModel = (modelUrl: string) => {
+    const model = loadedModels.current.get(modelUrl)
+    if (model) {
+      sceneRef.current?.scene.remove(model)
+      model.traverse((child) => {
+        if (child instanceof THREE.Mesh) {
+          if (child.material) {
+            if (Array.isArray(child.material)) {
+              for (const mat of child.material) {
+                mat.dispose()
+              }
+            } else {
+              child.material.dispose()
+            }
+          }
+          if (child.geometry) {
+            child.geometry.dispose()
+          }
+        }
+      })
+      loadedModels.current.delete(modelUrl)
+    }
+    modelLoaders.current.delete(modelUrl)
+  }
+
+  // Subscribe to model changes
+  useEffect(() => {
+    if (!modelViewerState.model?.models) return
+
+    const modelsChanged = () => {
+      const currentModels = modelViewerState.model?.models || []
+      const currentModelUrls = new Set(currentModels)
+      const loadedModelUrls = new Set(loadedModels.current.keys())
+
+      // Remove models that are no longer in the state
+      for (const modelUrl of loadedModelUrls) {
+        if (!currentModelUrls.has(modelUrl)) {
+          removeModel(modelUrl)
+        }
+      }
+
+      // Add new models
+      for (const modelUrl of currentModels) {
+        if (!loadedModelUrls.has(modelUrl)) {
+          loadModel(modelUrl)
+        }
+      }
+    }
+    const unsubscribe = subscribe(modelViewerState.model.models, modelsChanged)
+
+    let unmounted = false
+    setTimeout(() => {
+      if (unmounted) return
+      modelsChanged()
+    })
+
+    return () => {
+      unmounted = true
+      unsubscribe?.()
+    }
+  }, [model?.models])
+
+  useEffect(() => {
+    if (!model || !containerRef.current) return
+
+    // Setup scene
+    const scene = new THREE.Scene()
+    scene.background = null // Transparent background
+
+    // Setup camera with optimal settings for player model viewing
+    const camera = new THREE.PerspectiveCamera(
+      50, // Reduced FOV for better model viewing
+      model.positioning.width / model.positioning.height,
+      0.1,
+      1000
+    )
+    camera.position.set(0, 0, 3) // Position camera to view player model optimally
+
+    // Setup renderer with pixel density awareness
+    const renderer = new THREE.WebGLRenderer({ alpha: true })
+    let scale = window.devicePixelRatio || 1
+    if (modelViewerState.model?.positioning.scaled) {
+      scale *= currentScaling.scale
+    }
+    renderer.setPixelRatio(scale)
+    renderer.setSize(model.positioning.width, model.positioning.height)
+    containerRef.current.appendChild(renderer.domElement)
+
+    // Setup controls
+    const controls = new OrbitControls(camera, renderer.domElement)
+    // controls.enableZoom = false
+    // controls.enablePan = false
+    controls.minPolarAngle = Math.PI / 2 // Lock vertical rotation
+    controls.maxPolarAngle = Math.PI / 2
+    controls.enableDamping = true
+    controls.dampingFactor = 0.05
+
+    // Add ambient light
+    const ambientLight = new THREE.AmbientLight(0xff_ff_ff, 1)
+    scene.add(ambientLight)
+
+    // Cursor following function
+    const updatePlayerLookAt = () => {
+      if (!isFollowingCursor.current || !sceneRef.current?.playerObject) return
+
+      const { playerObject } = sceneRef.current
+      const { x, y } = cursorPosition.current
+
+      // Convert 0-1 cursor position to normalized coordinates (-1 to 1)
+      const normalizedX = x * 2 - 1
+      const normalizedY = y * 2 - 1 // Inverted: top of screen = negative pitch, bottom = positive pitch
+
+      // Calculate head rotation based on cursor position
+      // Limit head movement to realistic angles
+      const maxHeadYaw = Math.PI / 3 // 60 degrees
+      const maxHeadPitch = Math.PI / 4 // 45 degrees
+
+      const headYaw = normalizedX * maxHeadYaw
+      const headPitch = normalizedY * maxHeadPitch
+
+      // Apply head rotation with smooth interpolation
+      const lerpFactor = 0.1 // Smooth interpolation factor
+      playerObject.skin.head.rotation.y = THREE.MathUtils.lerp(
+        playerObject.skin.head.rotation.y,
+        headYaw,
+        lerpFactor
+      )
+      playerObject.skin.head.rotation.x = THREE.MathUtils.lerp(
+        playerObject.skin.head.rotation.x,
+        headPitch,
+        lerpFactor
+      )
+
+      // Apply slight body rotation for more natural movement
+      const bodyYaw = headYaw * 0.3 // Body follows head but with less rotation
+      playerObject.rotation.y = THREE.MathUtils.lerp(
+        playerObject.rotation.y,
+        bodyYaw,
+        lerpFactor * 0.5 // Slower body movement
+      )
+
+      render()
+    }
+
+    // Render function
+    const render = () => {
+      renderer.render(scene, camera)
+    }
+
+    // Setup animation/render strategy
+    if (model.continiousRender) {
+      // Continuous animation loop
+      const animate = () => {
+        requestAnimationFrame(animate)
+        render()
+      }
+      animate()
+    } else {
+      // Render only on camera movement
+      controls.addEventListener('change', render)
+      // Initial render
+      render()
+      // Render after model loads
+      if (model.steveModelSkin !== undefined) {
+        // Create player model
+        const { playerObject, wrapper } = createPlayerObject({
+          scale: 1 // Start with base scale, will adjust below
+        })
+
+        // Calculate proper scale and positioning for camera view
+        const box = new THREE.Box3().setFromObject(wrapper)
+        const size = box.getSize(new THREE.Vector3())
+        const center = box.getCenter(new THREE.Vector3())
+
+        // Calculate scale to fit within camera view (considering FOV and distance)
+        const cameraDistance = camera.position.z
+        const fov = camera.fov * Math.PI / 180 // Convert to radians
+        const visibleHeight = 2 * Math.tan(fov / 2) * cameraDistance
+        const visibleWidth = visibleHeight * (model.positioning.width / model.positioning.height)
+
+        const scaleFactor = Math.min(
+          (visibleHeight) / size.y,
+          (visibleWidth) / size.x
+        )
+
+        wrapper.scale.multiplyScalar(scaleFactor)
+
+        // Center the player object
+        wrapper.position.sub(center.multiplyScalar(scaleFactor))
+
+        // Rotate to face camera (remove the default 180° rotation)
+        wrapper.rotation.set(0, 0, 0)
+
+        scene.add(wrapper)
+        sceneRef.current = {
+          ...sceneRef.current!,
+          playerObject
+        }
+
+        void applySkinToPlayerObject(playerObject, model.steveModelSkin).then(() => {
+          setTimeout(render, 0)
+        })
+
+        // Set up cursor following if enabled
+        if (model.positioning.followCursor) {
+          isFollowingCursor.current = true
+        }
+      }
+    }
+
+    // Window cursor tracking for followCursor
+    let lastCursorUpdate = 0
+    let waitingRender = false
+    const handleWindowPointerMove = (event: PointerEvent) => {
+      if (!model.positioning.followCursor) return
+
+      // Track cursor position as 0-1 across the entire window
+      const newPosition = {
+        x: event.clientX / window.innerWidth,
+        y: event.clientY / window.innerHeight
+      }
+      cursorPosition.current = newPosition
+      globalThis.cursorPosition = newPosition // Expose for debug
+      lastCursorUpdate = Date.now()
+      updatePlayerLookAt()
+      if (!waitingRender) {
+        requestAnimationFrame(() => {
+          render()
+          waitingRender = false
+        })
+        waitingRender = true
+      }
+    }
+
+    // Add window event listeners
+    if (model.positioning.followCursor) {
+      window.addEventListener('pointermove', handleWindowPointerMove)
+      isFollowingCursor.current = true
+    }
+
+    // Store refs for cleanup
+    sceneRef.current = {
+      ...sceneRef.current!,
+      scene,
+      camera,
+      renderer,
+      controls,
+      dispose () {
+        if (!model.continiousRender) {
+          controls.removeEventListener('change', render)
+        }
+        if (model.positioning.followCursor) {
+          window.removeEventListener('pointermove', handleWindowPointerMove)
+        }
+
+        // Clean up loaded models
+        for (const [modelUrl, model] of loadedModels.current) {
+          scene.remove(model)
+          model.traverse((child) => {
+            if (child instanceof THREE.Mesh) {
+              if (child.material) {
+                if (Array.isArray(child.material)) {
+                  for (const mat of child.material) {
+                    mat.dispose()
+                  }
+                } else {
+                  child.material.dispose()
+                }
+              }
+              if (child.geometry) {
+                child.geometry.dispose()
+              }
+            }
+          })
+        }
+        loadedModels.current.clear()
+        modelLoaders.current.clear()
+
+        const playerObject = sceneRef.current?.playerObject
+        if (playerObject?.skin.map) {
+          (playerObject.skin.map as unknown as THREE.Texture).dispose()
+        }
+        renderer.dispose()
+        renderer.domElement?.remove()
+      }
+    }
+
+    return () => {
+      sceneRef.current?.dispose()
+    }
+  }, [model])
+
+  if (!model) return null
+
+  const { x, y, width, height, scaled, onlyInitialScale } = model.positioning
+  const { windowWidth } = model.positioning
+  const { windowHeight } = model.positioning
+  const scaleValue = onlyInitialScale ? initialScale : 'var(--guiScale)'
+
+  return (
+    <div
+      className='overlay-model-viewer-container'
+      style={{
+        zIndex: 100,
+        position: 'fixed',
+        inset: 0,
+        width: '100dvw',
+        height: '100dvh',
+        display: 'flex',
+        justifyContent: 'center',
+        alignItems: 'center',
+        transform: scaled ? `scale(${scaleValue})` : 'none',
+        pointerEvents: 'none',
+      }}
+    >
+      <div
+        className='overlay-model-viewer-window'
+        style={{
+          width: windowWidth,
+          height: windowHeight,
+          position: 'relative',
+          pointerEvents: 'none',
+        }}
+      >
+        <div
+          ref={containerRef}
+          className='overlay-model-viewer'
+          style={{
+            position: 'absolute',
+            left: x,
+            top: y,
+            width,
+            height,
+            pointerEvents: 'auto',
+            backgroundColor: model.debug ? 'red' : undefined,
+          }}
+        />
+      </div>
+    </div>
+  )
+}
diff --git a/src/reactUi.tsx b/src/reactUi.tsx
index 1e6f13eb..6339686e 100644
--- a/src/reactUi.tsx
+++ b/src/reactUi.tsx
@@ -68,6 +68,7 @@ import FullscreenTime from './react/FullscreenTime'
 import StorageConflictModal from './react/StorageConflictModal'
 import FireRenderer from './react/FireRenderer'
 import MonacoEditor from './react/MonacoEditor'
+import OverlayModelViewer from './react/OverlayModelViewer'
 
 const isFirefox = ua.getBrowser().name === 'Firefox'
 if (isFirefox) {
@@ -259,6 +260,7 @@ const App = () => {
             </div>
             <div />
             <DebugEdges />
+            <OverlayModelViewer />
             <MonacoEditor />
             <DebugResponseTimeIndicator />
           </RobustPortal>

From 739a6fad24478c5b13b03f96babd853c569dcbbc Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 04:34:17 +0300
Subject: [PATCH 735/753] fix lockfile

---
 pnpm-lock.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fd8be62b..516370ce 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -140,7 +140,7 @@ importers:
         version: 4.17.21
       mcraft-fun-mineflayer:
         specifier: ^0.1.23
-        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13))
+        version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13))
       minecraft-data:
         specifier: 3.92.0
         version: 3.92.0
@@ -345,7 +345,7 @@ importers:
         version: https://codeload.github.com/zardoy/minecraft-inventory-gui/tar.gz/89c33d396f3fde4804c71f4be3c203ade1833b41(@types/react@18.3.18)(react@18.3.1)
       mineflayer:
         specifier: github:zardoy/mineflayer#gen-the-master
-        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
+        version: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13)
       mineflayer-mouse:
         specifier: ^0.1.21
         version: 0.1.21
@@ -6670,7 +6670,7 @@ packages:
 
   minecraft-protocol@https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9:
     resolution: {tarball: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9}
-    version: 1.61.0
+    version: 1.62.0
     engines: {node: '>=22'}
 
   minecraft-wrap@1.6.0:
@@ -6688,8 +6688,8 @@ packages:
     resolution: {integrity: sha512-1XTVuw3twIrEcqQ1QRSB8NcStIUEZ+tbxiAG6rOrN/9M4thhtlS5PTJzFdmdrcYgWEBLvuOdJszaKE5zFfiXhg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e:
-    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e}
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659:
+    resolution: {tarball: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659}
     version: 8.0.0
     engines: {node: '>=22'}
 
@@ -11344,7 +11344,7 @@ snapshots:
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
       minecraft-data: 3.92.0
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
       prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b
@@ -16990,12 +16990,12 @@ snapshots:
     dependencies:
       minecraft-data: 3.92.0
 
-  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)):
+  mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13)):
     dependencies:
       '@zardoy/flying-squid': 0.0.49(encoding@0.1.13)
       exit-hook: 2.2.1
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13)
       prismarine-item: 1.17.0
       ws: 8.18.1
     transitivePeerDependencies:
@@ -17365,7 +17365,7 @@ snapshots:
 
   mineflayer-item-map-downloader@https://codeload.github.com/zardoy/mineflayer-item-map-downloader/tar.gz/a8d210ecdcf78dd082fa149a96e1612cc9747824(patch_hash=a731ebbace2d8790c973ab3a5ba33494a6e9658533a9710dd8ba36f86db061ad)(encoding@0.1.13):
     dependencies:
-      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13)
+      mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13)
       sharp: 0.30.7
     transitivePeerDependencies:
       - encoding
@@ -17380,7 +17380,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/4493c8ccbd6f7e775d76149d838f4386ae959f0e(encoding@0.1.13):
+  mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
       minecraft-data: 3.92.0

From 0b1183f541bb76a47ed15cfd63ef59340f91be9f Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 04:36:09 +0300
Subject: [PATCH 736/753] up minecraft-data

---
 package.json                    | 4 ++--
 scripts/makeOptimizedMcData.mjs | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b5f66bfb..ff673726 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
     "mcraft-fun-mineflayer": "^0.1.23",
-    "minecraft-data": "3.92.0",
+    "minecraft-data": "3.98.0",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
@@ -205,7 +205,7 @@
       "diamond-square": "github:zardoy/diamond-square",
       "prismarine-block": "github:zardoy/prismarine-block#next-era",
       "prismarine-world": "github:zardoy/prismarine-world#next-era",
-      "minecraft-data": "3.92.0",
+      "minecraft-data": "3.98.0",
       "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything",
       "prismarine-physics": "github:zardoy/prismarine-physics",
       "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
diff --git a/scripts/makeOptimizedMcData.mjs b/scripts/makeOptimizedMcData.mjs
index 76e0f1c2..a572d067 100644
--- a/scripts/makeOptimizedMcData.mjs
+++ b/scripts/makeOptimizedMcData.mjs
@@ -371,6 +371,7 @@ console.log('size', fs.lstatSync(filePath).size / 1000 / 1000, gzipSizeFromFileS
 
 const { defaultVersion } = MCProtocol
 const data = MinecraftData(defaultVersion)
+console.log('defaultVersion', defaultVersion, !!data)
 const initialMcData = {
   [defaultVersion]: {
     version: data.version,

From f24cb49a8728a63cab19b8cc76fdbfb1888566eb Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 04:55:43 +0300
Subject: [PATCH 737/753] up lockfile

---
 pnpm-lock.yaml | 74 +++++++++++++++++++++++++-------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 516370ce..5bcd74a0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,7 +13,7 @@ overrides:
   diamond-square: github:zardoy/diamond-square
   prismarine-block: github:zardoy/prismarine-block#next-era
   prismarine-world: github:zardoy/prismarine-world#next-era
-  minecraft-data: 3.92.0
+  minecraft-data: 3.98.0
   prismarine-provider-anvil: github:zardoy/prismarine-provider-anvil#everything
   prismarine-physics: github:zardoy/prismarine-physics
   minecraft-protocol: github:PrismarineJS/node-minecraft-protocol#master
@@ -142,8 +142,8 @@ importers:
         specifier: ^0.1.23
         version: 0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13))
       minecraft-data:
-        specifier: 3.92.0
-        version: 3.92.0
+        specifier: 3.98.0
+        version: 3.98.0
       minecraft-protocol:
         specifier: github:PrismarineJS/node-minecraft-protocol#master
         version: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
@@ -170,7 +170,7 @@ importers:
         version: 6.1.1
       prismarine-provider-anvil:
         specifier: github:zardoy/prismarine-provider-anvil#everything
-        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
+        version: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.98.0)
       prosemirror-example-setup:
         specifier: ^1.2.2
         version: 1.2.3
@@ -436,7 +436,7 @@ importers:
         version: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chunk:
         specifier: github:zardoy/prismarine-chunk#master
-        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
+        version: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0)
       prismarine-schematic:
         specifier: ^1.2.0
         version: 1.2.3
@@ -6448,7 +6448,7 @@ packages:
     resolution: {integrity: sha512-H9jPt2xEU77itC27dSz3qazHYqN9qVsv4HgMPozg7RqQ1uwgXmEa+ojKIlDtXf/TLJsG6Kv4EbzGa8a1Wh72uA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
 
   mcraft-fun-mineflayer@0.1.23:
     resolution: {integrity: sha512-qmI1rQQ0Ro5zJdi99rClWLF+mS9JZffgNX2vyWWesS3Hsk3Xblp/8swYTJKHSaFpNgzkVfXV92fEIrBqeH6iKA==}
@@ -6658,8 +6658,8 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  minecraft-data@3.92.0:
-    resolution: {integrity: sha512-CGfO50svzm+pSRa4Mbq4owsmRKbPCNkSZ3MCOyH+epC7yNjh+PUhPQFHWq72O51qsY7pAB5qM/bJn1ncwG1J5g==}
+  minecraft-data@3.98.0:
+    resolution: {integrity: sha512-JAPqJ/TZoxMUlAPPdWUh1v5wdqvYGFSZ4rW9bUtmaKBkGpomDSjw4V02ocBqbxKJvcTtmc5nM/LfN9/0DDqHrQ==}
 
   minecraft-folder-path@1.2.0:
     resolution: {integrity: sha512-qaUSbKWoOsH9brn0JQuBhxNAzTDMwrOXorwuRxdJKKKDYvZhtml+6GVCUrY5HRiEsieBEjCUnhVpDuQiKsiFaw==}
@@ -7387,7 +7387,7 @@ packages:
   prismarine-biome@1.3.0:
     resolution: {integrity: sha512-GY6nZxq93mTErT7jD7jt8YS1aPrOakbJHh39seYsJFXvueIOdHAmW16kYQVrTVMW5MlWLQVxV/EquRwOgr4MnQ==}
     peerDependencies:
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       prismarine-registry: ^1.1.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
@@ -11343,7 +11343,7 @@ snapshots:
   '@nxg-org/mineflayer-trajectories@1.2.0(encoding@0.1.13)':
     dependencies:
       '@nxg-org/mineflayer-util-plugin': 1.8.4
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       mineflayer: https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-item: 1.17.0
@@ -13104,18 +13104,18 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
-      mc-bridge: 0.1.3(minecraft-data@3.92.0)
-      minecraft-data: 3.92.0
+      mc-bridge: 0.1.3(minecraft-data@3.98.0)
+      minecraft-data: 3.98.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.98.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.4.2
@@ -13142,16 +13142,16 @@ snapshots:
       exit-hook: 2.2.1
       flatmap: 0.0.3
       long: 5.3.1
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
       mkdirp: 2.1.6
       node-gzip: 1.1.2
       node-rsa: 1.1.1
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
-      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0)
+      prismarine-provider-anvil: https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.98.0)
       prismarine-windows: 2.9.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       rambda: 9.4.2
@@ -14542,8 +14542,8 @@ snapshots:
 
   diamond-square@https://codeload.github.com/zardoy/diamond-square/tar.gz/cfaad2d1d5909fdfa63c8cc7bc05fb5e87782d71:
     dependencies:
-      minecraft-data: 3.92.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
+      minecraft-data: 3.98.0
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0)
       prismarine-registry: 1.11.0
       random-seed: 0.3.0
       vec3: 0.1.10
@@ -16986,9 +16986,9 @@ snapshots:
       maxrects-packer: '@zardoy/maxrects-packer@2.7.4'
       zod: 3.24.2
 
-  mc-bridge@0.1.3(minecraft-data@3.92.0):
+  mc-bridge@0.1.3(minecraft-data@3.98.0):
     dependencies:
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
 
   mcraft-fun-mineflayer@0.1.23(encoding@0.1.13)(mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13)):
     dependencies:
@@ -17302,7 +17302,7 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  minecraft-data@3.92.0: {}
+  minecraft-data@3.98.0: {}
 
   minecraft-folder-path@1.2.0: {}
 
@@ -17322,7 +17322,7 @@ snapshots:
       debug: 4.4.0(supports-color@8.1.1)
       endian-toggle: 0.0.0
       lodash.merge: 4.6.2
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       minecraft-folder-path: 1.2.0
       node-fetch: 2.7.0(encoding@0.1.13)
       node-rsa: 0.4.2
@@ -17383,12 +17383,12 @@ snapshots:
   mineflayer@https://codeload.github.com/zardoy/mineflayer/tar.gz/dd3b1ff38506d6f72d90e8444186e4e75fe82659(encoding@0.1.13):
     dependencies:
       '@nxg-org/mineflayer-physics-util': 1.8.10
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       minecraft-protocol: https://codeload.github.com/PrismarineJS/node-minecraft-protocol/tar.gz/bf89f7e86526c54d8c43f555d8f6dfa4948fd2d9(patch_hash=4ebdae314c68d01ce7879445c0b8bde5f90373abba8b66ed00d42e7a5f542f8b)(encoding@0.1.13)
-      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.98.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-chat: 1.11.0
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0)
       prismarine-entity: 2.5.0
       prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
@@ -18174,15 +18174,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  prismarine-biome@1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0):
+  prismarine-biome@1.3.0(minecraft-data@3.98.0)(prismarine-registry@1.11.0):
     dependencies:
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       prismarine-registry: 1.11.0
 
   prismarine-block@https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9:
     dependencies:
-      minecraft-data: 3.92.0
-      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
+      minecraft-data: 3.98.0
+      prismarine-biome: 1.3.0(minecraft-data@3.98.0)(prismarine-registry@1.11.0)
       prismarine-chat: 1.11.0
       prismarine-item: 1.17.0
       prismarine-nbt: 2.7.0
@@ -18194,9 +18194,9 @@ snapshots:
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
 
-  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0):
+  prismarine-chunk@https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0):
     dependencies:
-      prismarine-biome: 1.3.0(minecraft-data@3.92.0)(prismarine-registry@1.11.0)
+      prismarine-biome: 1.3.0(minecraft-data@3.98.0)(prismarine-registry@1.11.0)
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-registry: 1.11.0
@@ -18225,14 +18225,14 @@ snapshots:
 
   prismarine-physics@https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b:
     dependencies:
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       prismarine-nbt: 2.7.0
       vec3: 0.1.10
 
-  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.92.0):
+  prismarine-provider-anvil@https://codeload.github.com/zardoy/prismarine-provider-anvil/tar.gz/1d548fac63fe977c8281f0a9a522b37e4d92d0b7(minecraft-data@3.98.0):
     dependencies:
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
-      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.92.0)
+      prismarine-chunk: https://codeload.github.com/zardoy/prismarine-chunk/tar.gz/c5feac83b61d95feb4d4f22c063dacfb8c192a9f(minecraft-data@3.98.0)
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c
       uint4: 0.1.2
@@ -18254,13 +18254,13 @@ snapshots:
 
   prismarine-registry@1.11.0:
     dependencies:
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
 
   prismarine-schematic@1.2.3:
     dependencies:
-      minecraft-data: 3.92.0
+      minecraft-data: 3.98.0
       prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9
       prismarine-nbt: 2.7.0
       prismarine-world: https://codeload.github.com/zardoy/prismarine-world/tar.gz/ab2146c9933eef3247c3f64446de4ccc2c484c7c

From 1525fac2a192f1fe7e2f858480c444948bbe9651 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 05:22:24 +0300
Subject: [PATCH 738/753] fix: some visual camera world view issues (visible
 lines between blocks)

---
 renderer/viewer/three/cameraShake.ts       | 25 ++++++++++++++++++++--
 renderer/viewer/three/world/cursorBlock.ts | 18 ++++++++++++----
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/renderer/viewer/three/cameraShake.ts b/renderer/viewer/three/cameraShake.ts
index 593b4628..7b159509 100644
--- a/renderer/viewer/three/cameraShake.ts
+++ b/renderer/viewer/three/cameraShake.ts
@@ -80,8 +80,12 @@ export class CameraShake {
       camera.setRotationFromQuaternion(yawQuat)
     } else {
       // For regular camera, apply all rotations
-      const pitchQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), this.basePitch)
-      const yawQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), this.baseYaw)
+      // Add tiny offsets to prevent z-fighting at ideal angles (90, 180, 270 degrees)
+      const pitchOffset = this.addAntiZfightingOffset(this.basePitch)
+      const yawOffset = this.addAntiZfightingOffset(this.baseYaw)
+
+      const pitchQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1, 0, 0), pitchOffset)
+      const yawQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 1, 0), yawOffset)
       const rollQuat = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0, 0, 1), THREE.MathUtils.degToRad(this.rollAngle))
       // Combine rotations in the correct order: pitch -> yaw -> roll
       const finalQuat = yawQuat.multiply(pitchQuat).multiply(rollQuat)
@@ -96,4 +100,21 @@ export class CameraShake {
   private easeInOut (t: number): number {
     return t < 0.5 ? 2 * t * t : 1 - (-2 * t + 2) ** 2 / 2
   }
+
+  private addAntiZfightingOffset (angle: number): number {
+    const offset = 0.001 // Very small offset in radians (about 0.057 degrees)
+
+    // Check if the angle is close to ideal angles (0, π/2, π, 3π/2)
+    const normalizedAngle = ((angle % (Math.PI * 2)) + Math.PI * 2) % (Math.PI * 2)
+    const tolerance = 0.01 // Tolerance for considering an angle "ideal"
+
+    if (Math.abs(normalizedAngle) < tolerance ||
+      Math.abs(normalizedAngle - Math.PI / 2) < tolerance ||
+      Math.abs(normalizedAngle - Math.PI) < tolerance ||
+      Math.abs(normalizedAngle - 3 * Math.PI / 2) < tolerance) {
+      return angle + offset
+    }
+
+    return angle
+  }
 }
diff --git a/renderer/viewer/three/world/cursorBlock.ts b/renderer/viewer/three/world/cursorBlock.ts
index b71c1b8d..a03a6999 100644
--- a/renderer/viewer/three/world/cursorBlock.ts
+++ b/renderer/viewer/three/world/cursorBlock.ts
@@ -28,7 +28,7 @@ export class CursorBlock {
   }
 
   cursorLineMaterial: LineMaterial
-  interactionLines: null | { blockPos: Vec3, mesh: THREE.Group } = null
+  interactionLines: null | { blockPos: Vec3, mesh: THREE.Group, shapePositions: BlocksShapes | undefined } = null
   prevColor: string | undefined
   blockBreakMesh: THREE.Mesh
   breakTextures: THREE.Texture[] = []
@@ -62,6 +62,13 @@ export class CursorBlock {
     this.worldRenderer.onReactivePlayerStateUpdated('gameMode', () => {
       this.updateLineMaterial()
     })
+    // todo figure out why otherwise fog from skybox breaks it
+    setTimeout(() => {
+      this.updateLineMaterial()
+      if (this.interactionLines) {
+        this.setHighlightCursorBlock(this.interactionLines.blockPos, this.interactionLines.shapePositions, true)
+      }
+    })
   }
 
   // Update functions
@@ -69,6 +76,9 @@ export class CursorBlock {
     const inCreative = this.worldRenderer.playerStateReactive.gameMode === 'creative'
     const pixelRatio = this.worldRenderer.renderer.getPixelRatio()
 
+    if (this.cursorLineMaterial) {
+      this.cursorLineMaterial.dispose()
+    }
     this.cursorLineMaterial = new LineMaterial({
       color: (() => {
         switch (this.worldRenderer.worldRendererConfig.highlightBlockColor) {
@@ -115,8 +125,8 @@ export class CursorBlock {
     }
   }
 
-  setHighlightCursorBlock (blockPos: Vec3 | null, shapePositions?: BlocksShapes): void {
-    if (blockPos && this.interactionLines && blockPos.equals(this.interactionLines.blockPos)) {
+  setHighlightCursorBlock (blockPos: Vec3 | null, shapePositions?: BlocksShapes, force = false): void {
+    if (blockPos && this.interactionLines && blockPos.equals(this.interactionLines.blockPos) && !force) {
       return
     }
     if (this.interactionLines !== null) {
@@ -140,7 +150,7 @@ export class CursorBlock {
     }
     this.worldRenderer.scene.add(group)
     group.visible = !this.cursorLinesHidden
-    this.interactionLines = { blockPos, mesh: group }
+    this.interactionLines = { blockPos, mesh: group, shapePositions }
   }
 
   render () {

From c4097975bf8ea14764bf7f2b70aa00e45dc5b399 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 05:29:34 +0300
Subject: [PATCH 739/753] add a way to disable sky box for old behavior (not
 tested)

---
 renderer/viewer/lib/worldrendererCommon.ts  |  1 +
 renderer/viewer/three/skyboxRenderer.ts     | 25 ++++++++++++++++++++-
 renderer/viewer/three/worldrendererThree.ts |  5 ++++-
 src/defaultOptions.ts                       |  1 +
 src/watchOptions.ts                         |  4 ++++
 5 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/renderer/viewer/lib/worldrendererCommon.ts b/renderer/viewer/lib/worldrendererCommon.ts
index e2455915..4140e3fa 100644
--- a/renderer/viewer/lib/worldrendererCommon.ts
+++ b/renderer/viewer/lib/worldrendererCommon.ts
@@ -47,6 +47,7 @@ export const defaultWorldRendererConfig = {
   smoothLighting: true,
   enableLighting: true,
   starfield: true,
+  defaultSkybox: true,
   renderEntities: true,
   extraBlockRenderers: true,
   foreground: true,
diff --git a/renderer/viewer/three/skyboxRenderer.ts b/renderer/viewer/three/skyboxRenderer.ts
index aa8c3bb6..cd7bd879 100644
--- a/renderer/viewer/three/skyboxRenderer.ts
+++ b/renderer/viewer/three/skyboxRenderer.ts
@@ -18,7 +18,7 @@ export class SkyboxRenderer {
   private fogBrightness = 0
   private prevFogBrightness = 0
 
-  constructor (private readonly scene: THREE.Scene, public initialImage: string | null) {
+  constructor (private readonly scene: THREE.Scene, public defaultSkybox: boolean, public initialImage: string | null) {
     if (!initialImage) {
       this.createGradientSky()
     }
@@ -119,6 +119,12 @@ export class SkyboxRenderer {
     this.updateSkyColors()
   }
 
+  // Update default skybox setting
+  updateDefaultSkybox (defaultSkybox: boolean) {
+    this.defaultSkybox = defaultSkybox
+    this.updateSkyColors()
+  }
+
   private createGradientSky () {
     const size = 64
     const scale = 256 / size + 2
@@ -279,6 +285,23 @@ export class SkyboxRenderer {
   private updateSkyColors () {
     if (!this.skyMesh || !this.voidMesh) return
 
+    // If default skybox is disabled, hide the skybox meshes
+    if (!this.defaultSkybox) {
+      this.skyMesh.visible = false
+      this.voidMesh.visible = false
+      if (this.mesh) {
+        this.mesh.visible = false
+      }
+      return
+    }
+
+    // Show skybox meshes when default skybox is enabled
+    this.skyMesh.visible = true
+    this.voidMesh.visible = true
+    if (this.mesh) {
+      this.mesh.visible = true
+    }
+
     // Update fog brightness with smooth transition
     this.prevFogBrightness = this.fogBrightness
     const renderDistance = this.viewDistance / 32
diff --git a/renderer/viewer/three/worldrendererThree.ts b/renderer/viewer/three/worldrendererThree.ts
index 29e9223c..1b4e6152 100644
--- a/renderer/viewer/three/worldrendererThree.ts
+++ b/renderer/viewer/three/worldrendererThree.ts
@@ -98,7 +98,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.holdingBlockLeft = new HoldingBlock(this, true)
 
     // Initialize skybox renderer
-    this.skyboxRenderer = new SkyboxRenderer(this.scene, null)
+    this.skyboxRenderer = new SkyboxRenderer(this.scene, this.worldRendererConfig.defaultSkybox, null)
     void this.skyboxRenderer.init()
 
     this.addDebugOverlay()
@@ -206,6 +206,9 @@ export class WorldRendererThree extends WorldRendererCommon {
     this.onReactiveConfigUpdated('showChunkBorders', (value) => {
       this.updateShowChunksBorder(value)
     })
+    this.onReactiveConfigUpdated('defaultSkybox', (value) => {
+      this.skyboxRenderer.updateDefaultSkybox(value)
+    })
   }
 
   changeHandSwingingState (isAnimationPlaying: boolean, isLeft = false) {
diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 6045e70b..361879be 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -41,6 +41,7 @@ export const defaultOptions = {
   renderEars: true,
   lowMemoryMode: false,
   starfieldRendering: true,
+  defaultSkybox: true,
   enabledResourcepack: null as string | null,
   useVersionsTextures: 'latest',
   serverResourcePacks: 'prompt' as 'prompt' | 'always' | 'never',
diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index da75cc74..779aa29f 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -116,6 +116,10 @@ export const watchOptionsAfterViewerInit = () => {
     appViewer.inWorldRenderingConfig.starfield = o.starfieldRendering
   })
 
+  watchValue(options, o => {
+    appViewer.inWorldRenderingConfig.defaultSkybox = o.defaultSkybox
+  })
+
   watchValue(options, o => {
     // appViewer.inWorldRenderingConfig.neighborChunkUpdates = o.neighborChunkUpdates
   })

From 06dc3cb033129f925dd492b01a809e9e5f3cd19c Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 8 Sep 2025 05:38:16 +0300
Subject: [PATCH 740/753] feat: Add saveLoginPassword option to control
 password saving behavior in browser for offline auth on servers

---
 src/defaultOptions.ts      |  1 +
 src/optionsGuiScheme.tsx   | 10 ++++++++++
 src/react/ChatProvider.tsx | 20 ++++++++++++++++----
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 361879be..85ebae17 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -84,6 +84,7 @@ export const defaultOptions = {
   localServerOptions: {
     gameMode: 1
   } as any,
+  saveLoginPassword: 'prompt' as 'prompt' | 'never' | 'always',
   preferLoadReadonly: false,
   experimentalClientSelfReload: false,
   remoteSoundsSupport: false,
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index b03db37d..a47c06eb 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -550,6 +550,16 @@ export const guiOptionsScheme: {
         return <Category>Server Connection</Category>
       },
     },
+    {
+      saveLoginPassword: {
+        tooltip: 'Controls whether to save login passwords for servers in this browser memory.',
+        values: [
+          'prompt',
+          'always',
+          'never'
+        ]
+      },
+    },
     {
       custom () {
         const { serversAutoVersionSelect } = useSnapshot(options)
diff --git a/src/react/ChatProvider.tsx b/src/react/ChatProvider.tsx
index 0bb13285..066bc48a 100644
--- a/src/react/ChatProvider.tsx
+++ b/src/react/ChatProvider.tsx
@@ -73,16 +73,28 @@ export default () => {
       }
 
       const builtinHandled = tryHandleBuiltinCommand(message)
-      if (getServerIndex() !== undefined && (message.startsWith('/login') || message.startsWith('/register'))) {
-        showNotification('Click here to save your password in browser for auto-login', undefined, false, undefined, () => {
+      if (getServerIndex() !== undefined && (message.startsWith('/login') || message.startsWith('/register')) && options.saveLoginPassword !== 'never') {
+        const savePassword = () => {
+          let hadPassword = false
           updateLoadedServerData((server) => {
             server.autoLogin ??= {}
             const password = message.split(' ')[1]
+            hadPassword = !!server.autoLogin[bot.username]
             server.autoLogin[bot.username] = password
             return { ...server }
           })
-          hideNotification()
-        })
+          if (options.saveLoginPassword === 'always') {
+            const message = hadPassword ? 'Password updated in browser for auto-login' : 'Password saved in browser for auto-login'
+            showNotification(message, undefined, false, undefined)
+          } else {
+            hideNotification()
+          }
+        }
+        if (options.saveLoginPassword === 'prompt') {
+          showNotification('Click here to save your password in browser for auto-login', undefined, false, undefined, savePassword)
+        } else {
+          savePassword()
+        }
         notificationProxy.id = 'auto-login'
         const listener = () => {
           hideNotification()

From 852dd737aefc045a1d4193d17803d10a0cce1b48 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 11 Sep 2025 22:24:04 +0300
Subject: [PATCH 741/753] fix: fix some UI like error screen was not visible
 fully (buttons were clipped behind the screen) on larger scale on large
 screens

---
 src/screens.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/screens.css b/src/screens.css
index f0040e2d..e503c305 100644
--- a/src/screens.css
+++ b/src/screens.css
@@ -26,6 +26,10 @@
     display: flex;
     justify-content: center;
     z-index: 12;
+    /* Account for GUI scaling */
+    width: calc(100dvw / var(--guiScale, 1));
+    height: calc(100dvh / var(--guiScale, 1));
+    overflow: hidden;
 }
 
 .screen-content {

From c930365e329aef0c44845ab06aa42266f5a6a16e Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Thu, 18 Sep 2025 07:49:44 +0300
Subject: [PATCH 742/753] fix sometimes inventory player should not be rendered

---
 src/inventoryWindows.ts          |  2 ++
 src/react/OverlayModelViewer.tsx | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/inventoryWindows.ts b/src/inventoryWindows.ts
index d16fee20..d40260df 100644
--- a/src/inventoryWindows.ts
+++ b/src/inventoryWindows.ts
@@ -470,6 +470,7 @@ const openWindow = (type: string | undefined, title: string | any = undefined) =
       const isRightClick = type === 'rightclick'
       const isLeftClick = type === 'leftclick'
       if (isLeftClick || isRightClick) {
+        modelViewerState.model = undefined
         inv.canvasManager.children[0].showRecipesOrUsages(isLeftClick, item)
       }
     } else {
@@ -501,6 +502,7 @@ const openWindow = (type: string | undefined, title: string | any = undefined) =
       if (freeSlot === null) return
       void bot.creative.setInventorySlot(freeSlot, item)
     } else {
+      modelViewerState.model = undefined
       inv.canvasManager.children[0].showRecipesOrUsages(!isRightclick, mapSlots([item], true)[0])
     }
   }
diff --git a/src/react/OverlayModelViewer.tsx b/src/react/OverlayModelViewer.tsx
index 24dc836d..0fdeae75 100644
--- a/src/react/OverlayModelViewer.tsx
+++ b/src/react/OverlayModelViewer.tsx
@@ -6,6 +6,7 @@ import { OBJLoader } from 'three/examples/jsm/loaders/OBJLoader'
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader'
 import { applySkinToPlayerObject, createPlayerObject, PlayerObjectType } from '../../renderer/viewer/lib/createPlayerObject'
 import { currentScaling } from '../scaleInterface'
+import { activeModalStack } from '../globalState'
 
 THREE.ColorManagement.enabled = false
 
@@ -29,6 +30,7 @@ export const modelViewerState = proxy({
     modelCustomization?: { [modelUrl: string]: { color?: string, opacity?: number, metalness?: number, roughness?: number } }
     resetRotationOnReleae?: boolean
     continiousRender?: boolean
+    alwaysRender?: boolean
   }
 })
 globalThis.modelViewerState = modelViewerState
@@ -75,6 +77,15 @@ globalThis.getModelViewerValues = () => {
   }
 }
 
+subscribe(activeModalStack, () => {
+  if (!modelViewerState.model || !modelViewerState.model?.alwaysRender) {
+    return
+  }
+  if (activeModalStack.length === 0) {
+    modelViewerState.model = undefined
+  }
+})
+
 export default () => {
   const { model } = useSnapshot(modelViewerState)
   const containerRef = useRef<HTMLDivElement>(null)

From 636a7fdb54a2fec622b5b31da4691a632049b5f0 Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Fri, 19 Sep 2025 04:42:22 +0200
Subject: [PATCH 743/753] feat: improve fog a little (#427)

---
 renderer/viewer/three/skyboxRenderer.ts | 43 ++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/renderer/viewer/three/skyboxRenderer.ts b/renderer/viewer/three/skyboxRenderer.ts
index cd7bd879..fb9edae6 100644
--- a/renderer/viewer/three/skyboxRenderer.ts
+++ b/renderer/viewer/three/skyboxRenderer.ts
@@ -1,4 +1,5 @@
 import * as THREE from 'three'
+import { DebugGui } from '../lib/DebugGui'
 
 export const DEFAULT_TEMPERATURE = 0.75
 
@@ -17,11 +18,33 @@ export class SkyboxRenderer {
   private waterBreathing = false
   private fogBrightness = 0
   private prevFogBrightness = 0
+  private readonly fogOrangeness = 0 // Debug property to control sky color orangeness
+  private readonly distanceFactor = 2.7
+
+  private readonly brightnessAtPosition = 1
+  debugGui: DebugGui
 
   constructor (private readonly scene: THREE.Scene, public defaultSkybox: boolean, public initialImage: string | null) {
+    this.debugGui = new DebugGui('skybox_renderer', this, [
+      'temperature',
+      'worldTime',
+      'inWater',
+      'waterBreathing',
+      'fogOrangeness',
+      'brightnessAtPosition',
+      'distanceFactor'
+    ], {
+      brightnessAtPosition: { min: 0, max: 1, step: 0.01 },
+      temperature: { min: 0, max: 1, step: 0.01 },
+      worldTime: { min: 0, max: 24_000, step: 1 },
+      fogOrangeness: { min: -1, max: 1, step: 0.01 },
+      distanceFactor: { min: 0, max: 5, step: 0.01 },
+    })
+
     if (!initialImage) {
       this.createGradientSky()
     }
+    // this.debugGui.activate()
   }
 
   async init () {
@@ -95,6 +118,7 @@ export class SkyboxRenderer {
 
   // Update world time
   updateTime (timeOfDay: number, partialTicks = 0) {
+    if (this.debugGui.visible) return
     this.worldTime = timeOfDay
     this.partialTicks = partialTicks
     this.updateSkyColors()
@@ -108,12 +132,14 @@ export class SkyboxRenderer {
 
   // Update temperature (for biome support)
   updateTemperature (temperature: number) {
+    if (this.debugGui.visible) return
     this.temperature = temperature
     this.updateSkyColors()
   }
 
   // Update water state
   updateWaterState (inWater: boolean, waterBreathing: boolean) {
+    if (this.debugGui.visible) return
     this.inWater = inWater
     this.waterBreathing = waterBreathing
     this.updateSkyColors()
@@ -121,6 +147,7 @@ export class SkyboxRenderer {
 
   // Update default skybox setting
   updateDefaultSkybox (defaultSkybox: boolean) {
+    if (this.debugGui.visible) return
     this.defaultSkybox = defaultSkybox
     this.updateSkyColors()
   }
@@ -229,8 +256,15 @@ export class SkyboxRenderer {
     if (temperature < -1) temperature = -1
     if (temperature > 1) temperature = 1
 
-    const hue = 0.622_222_2 - temperature * 0.05
-    const saturation = 0.5 + temperature * 0.1
+    // Apply debug fog orangeness to hue - positive values make it more orange, negative make it less orange
+    const baseHue = 0.622_222_2 - temperature * 0.05
+    // Orange is around hue 0.08-0.15, so we need to shift from blue-purple (0.62) toward orange
+    // Use a more dramatic shift and also increase saturation for more noticeable effect
+    const orangeHue = 0.12 // Orange hue value
+    const hue = this.fogOrangeness > 0
+      ? baseHue + (orangeHue - baseHue) * this.fogOrangeness * 0.8 // Blend toward orange
+      : baseHue + this.fogOrangeness * 0.1 // Subtle shift for negative values
+    const saturation = 0.5 + temperature * 0.1 + Math.abs(this.fogOrangeness) * 0.3 // Increase saturation with orangeness
     const brightness = 1
 
     return this.hsbToRgb(hue, saturation, brightness)
@@ -305,8 +339,7 @@ export class SkyboxRenderer {
     // Update fog brightness with smooth transition
     this.prevFogBrightness = this.fogBrightness
     const renderDistance = this.viewDistance / 32
-    const brightnessAtPosition = 1 // Could be affected by light level in future
-    const targetBrightness = brightnessAtPosition * (1 - renderDistance) + renderDistance
+    const targetBrightness = this.brightnessAtPosition * (1 - renderDistance) + renderDistance
     this.fogBrightness += (targetBrightness - this.fogBrightness) * 0.1
 
     // Handle water fog
@@ -340,7 +373,7 @@ export class SkyboxRenderer {
     const blue = (fogColor.z + (skyColor.z - fogColor.z) * viewFactor) * clampedBrightness * interpolatedBrightness
 
     this.scene.background = new THREE.Color(red, green, blue)
-    this.scene.fog = new THREE.Fog(new THREE.Color(red, green, blue), 0.0025, viewDistance * 2)
+    this.scene.fog = new THREE.Fog(new THREE.Color(red, green, blue), 0.0025, viewDistance * this.distanceFactor)
 
     ;(this.skyMesh.material as THREE.MeshBasicMaterial).color.set(new THREE.Color(skyColor.x, skyColor.y, skyColor.z))
     ;(this.voidMesh.material as THREE.MeshBasicMaterial).color.set(new THREE.Color(

From 3b94889bed40e9c687be52c5ca9a87172c6c6a9d Mon Sep 17 00:00:00 2001
From: Vitaly <vital2580@icloud.com>
Date: Sat, 20 Sep 2025 01:57:59 +0200
Subject: [PATCH 744/753] feat: make arrows colorful and metadata (#430)

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
---
 renderer/viewer/three/waypointSprite.ts | 36 ++++++++++++++++++++-----
 renderer/viewer/three/waypoints.ts      |  4 ++-
 src/customChannels.ts                   | 17 +++++++++++-
 3 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/renderer/viewer/three/waypointSprite.ts b/renderer/viewer/three/waypointSprite.ts
index 7c8cf1f6..6a30e6db 100644
--- a/renderer/viewer/three/waypointSprite.ts
+++ b/renderer/viewer/three/waypointSprite.ts
@@ -16,7 +16,7 @@ export const WAYPOINT_CONFIG = {
   CANVAS_SCALE: 2,
   ARROW: {
     enabledDefault: false,
-    pixelSize: 30,
+    pixelSize: 50,
     paddingPx: 50,
   },
 }
@@ -50,6 +50,7 @@ export function createWaypointSprite (options: {
   depthTest?: boolean,
   // Y offset in world units used by updateScaleWorld only (screen-pixel API ignores this)
   labelYOffset?: number,
+  metadata?: any,
 }): WaypointSprite {
   const color = options.color ?? 0xFF_00_00
   const depthTest = options.depthTest ?? false
@@ -131,16 +132,22 @@ export function createWaypointSprite (options: {
     canvas.height = size
     const ctx = canvas.getContext('2d')!
     ctx.clearRect(0, 0, size, size)
+
+    // Draw arrow shape
     ctx.beginPath()
-    ctx.moveTo(size * 0.2, size * 0.5)
-    ctx.lineTo(size * 0.8, size * 0.5)
-    ctx.lineTo(size * 0.5, size * 0.2)
+    ctx.moveTo(size * 0.15, size * 0.5)
+    ctx.lineTo(size * 0.85, size * 0.5)
+    ctx.lineTo(size * 0.5, size * 0.15)
     ctx.closePath()
-    ctx.lineWidth = 4
+
+    // Use waypoint color for arrow
+    const colorHex = `#${color.toString(16).padStart(6, '0')}`
+    ctx.lineWidth = 6
     ctx.strokeStyle = 'black'
     ctx.stroke()
-    ctx.fillStyle = 'white'
+    ctx.fillStyle = colorHex
     ctx.fill()
+
     const texture = new THREE.CanvasTexture(canvas)
     const material = new THREE.SpriteMaterial({ map: texture, transparent: true, depthTest: false, depthWrite: false })
     arrowSprite = new THREE.Sprite(material)
@@ -169,6 +176,9 @@ export function createWaypointSprite (options: {
     ensureArrow()
     if (!arrowSprite) return true
 
+    // Check if onlyLeftRight is enabled in metadata
+    const onlyLeftRight = options.metadata?.onlyLeftRight === true
+
     // Build camera basis using camera.up to respect custom orientations
     const forward = new THREE.Vector3()
     camera.getWorldDirection(forward) // camera look direction
@@ -213,6 +223,20 @@ export function createWaypointSprite (options: {
       }
     }
 
+    // Apply onlyLeftRight logic - restrict arrows to left/right edges only
+    if (onlyLeftRight) {
+      // Force the arrow to appear only on left or right edges
+      if (Math.abs(rx) > Math.abs(ry)) {
+        // Horizontal direction is dominant, keep it
+        ry = 0
+      } else {
+        // Vertical direction is dominant, but we want only left/right
+        // So choose left or right based on the sign of rx
+        rx = rx >= 0 ? 1 : -1
+        ry = 0
+      }
+    }
+
     // Place on the rectangle border [-1,1]x[-1,1]
     const s = Math.max(Math.abs(rx), Math.abs(ry)) || 1
     let ndcX = rx / s
diff --git a/renderer/viewer/three/waypoints.ts b/renderer/viewer/three/waypoints.ts
index cebd779a..256ca6df 100644
--- a/renderer/viewer/three/waypoints.ts
+++ b/renderer/viewer/three/waypoints.ts
@@ -17,6 +17,7 @@ interface WaypointOptions {
   color?: number
   label?: string
   minDistance?: number
+  metadata?: any
 }
 
 export class WaypointsRenderer {
@@ -71,13 +72,14 @@ export class WaypointsRenderer {
     this.removeWaypoint(id)
 
     const color = options.color ?? 0xFF_00_00
-    const { label } = options
+    const { label, metadata } = options
     const minDistance = options.minDistance ?? 0
 
     const sprite = createWaypointSprite({
       position: new THREE.Vector3(x, y, z),
       color,
       label: (label || id),
+      metadata,
     })
     sprite.enableOffscreenArrow(true)
     sprite.setArrowParent(this.waypointScene)
diff --git a/src/customChannels.ts b/src/customChannels.ts
index b566f9dd..506ea776 100644
--- a/src/customChannels.ts
+++ b/src/customChannels.ts
@@ -82,15 +82,30 @@ const registerWaypointChannels = () => {
       {
         name: 'color',
         type: 'i32'
+      },
+      {
+        name: 'metadataJson',
+        type: ['pstring', { countType: 'i16' }]
       }
     ]
   ]
 
   registerChannel('minecraft-web-client:waypoint-add', packetStructure, (data) => {
+    // Parse metadata if provided
+    let metadata: any = {}
+    if (data.metadataJson && data.metadataJson.trim() !== '') {
+      try {
+        metadata = JSON.parse(data.metadataJson)
+      } catch (error) {
+        console.warn('Failed to parse waypoint metadataJson:', error)
+      }
+    }
+
     getThreeJsRendererMethods()?.addWaypoint(data.id, data.x, data.y, data.z, {
       minDistance: data.minDistance,
       label: data.label || undefined,
-      color: data.color || undefined
+      color: data.color || undefined,
+      metadata
     })
   })
 

From 4f421ae45fda892cc364cc60de47e4fc79799eee Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 28 Sep 2025 21:59:00 +0300
Subject: [PATCH 745/753] respect loadPlayerSkins option for inventory skin

---
 src/watchOptions.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/watchOptions.ts b/src/watchOptions.ts
index 779aa29f..de7d30d3 100644
--- a/src/watchOptions.ts
+++ b/src/watchOptions.ts
@@ -3,6 +3,7 @@
 import { subscribeKey } from 'valtio/utils'
 import { isMobile } from 'renderer/viewer/lib/simpleUtils'
 import { WorldDataEmitter } from 'renderer/viewer/lib/worldDataEmitter'
+import { setSkinsConfig } from 'renderer/viewer/lib/utils/skins'
 import { options, watchValue } from './optionsStorage'
 import { reloadChunks } from './utils'
 import { miscUiState } from './globalState'
@@ -97,6 +98,8 @@ export const watchOptionsAfterViewerInit = () => {
     appViewer.inWorldRenderingConfig.highlightBlockColor = o.highlightBlockColor
     appViewer.inWorldRenderingConfig._experimentalSmoothChunkLoading = o.rendererSharedOptions._experimentalSmoothChunkLoading
     appViewer.inWorldRenderingConfig._renderByChunks = o.rendererSharedOptions._renderByChunks
+
+    setSkinsConfig({ apiEnabled: o.loadPlayerSkins })
   })
 
   appViewer.inWorldRenderingConfig.smoothLighting = options.smoothLighting

From b239636356c9bb828181cf069c3756c722cebd33 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sun, 28 Sep 2025 22:04:17 +0300
Subject: [PATCH 746/753] feat: add debugServerPacketNames and
 debugClientPacketNames for quick access of names with intellisense of packets
 for current protocol. Should be used with `window.inspectPacket` in console

---
 src/devtools.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/devtools.ts b/src/devtools.ts
index 6c47f73d..1f8ef8e8 100644
--- a/src/devtools.ts
+++ b/src/devtools.ts
@@ -5,6 +5,17 @@ import { WorldRendererThree } from 'renderer/viewer/three/worldrendererThree'
 import { enable, disable, enabled } from 'debug'
 import { Vec3 } from 'vec3'
 
+customEvents.on('mineflayerBotCreated', () => {
+  window.debugServerPacketNames = Object.fromEntries(Object.keys(loadedData.protocol.play.toClient.types).map(name => {
+    name = name.replace('packet_', '')
+    return [name, name]
+  }))
+  window.debugClientPacketNames = Object.fromEntries(Object.keys(loadedData.protocol.play.toServer.types).map(name => {
+    name = name.replace('packet_', '')
+    return [name, name]
+  }))
+})
+
 window.Vec3 = Vec3
 window.cursorBlockRel = (x = 0, y = 0, z = 0) => {
   const newPos = bot.blockAtCursor(5)?.position.offset(x, y, z)

From 05cd560d6b67e287acd6684ffeacc0db4b0b2386 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 29 Sep 2025 02:01:04 +0300
Subject: [PATCH 747/753] add shadow and directional light for player in
 inventory (model viewer)

---
 src/react/OverlayModelViewer.tsx | 54 +++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 8 deletions(-)

diff --git a/src/react/OverlayModelViewer.tsx b/src/react/OverlayModelViewer.tsx
index 0fdeae75..e48a2f0b 100644
--- a/src/react/OverlayModelViewer.tsx
+++ b/src/react/OverlayModelViewer.tsx
@@ -119,11 +119,15 @@ export default () => {
     modelLoaders.current.set(modelUrl, loader)
 
     const onLoad = (object: THREE.Object3D) => {
-      // Apply customization if available
+      // Apply customization if available and enable shadows
       const customization = model?.modelCustomization?.[modelUrl]
-      if (customization) {
-        object.traverse((child) => {
-          if (child instanceof THREE.Mesh && child.material) {
+      object.traverse((child) => {
+        if (child instanceof THREE.Mesh) {
+          // Enable shadow casting and receiving for all meshes
+          child.castShadow = true
+          child.receiveShadow = true
+
+          if (child.material && customization) {
             const material = child.material as THREE.MeshStandardMaterial
             if (customization.color) {
               material.color.setHex(parseInt(customization.color.replace('#', ''), 16))
@@ -139,8 +143,8 @@ export default () => {
               material.roughness = customization.roughness
             }
           }
-        })
-      }
+        }
+      })
 
       // Center and scale model
       const box = new THREE.Box3().setFromObject(object)
@@ -259,6 +263,12 @@ export default () => {
     }
     renderer.setPixelRatio(scale)
     renderer.setSize(model.positioning.width, model.positioning.height)
+
+    // Enable shadow rendering for depth and realism
+    renderer.shadowMap.enabled = true
+    renderer.shadowMap.type = THREE.PCFSoftShadowMap // Soft shadows for better quality
+    renderer.shadowMap.autoUpdate = true
+
     containerRef.current.appendChild(renderer.domElement)
 
     // Setup controls
@@ -270,10 +280,30 @@ export default () => {
     controls.enableDamping = true
     controls.dampingFactor = 0.05
 
-    // Add ambient light
-    const ambientLight = new THREE.AmbientLight(0xff_ff_ff, 1)
+    // Add ambient light for overall illumination
+    const ambientLight = new THREE.AmbientLight(0xff_ff_ff, 0.4) // Reduced intensity to allow shadows
     scene.add(ambientLight)
 
+    // Add directional light for shadows and depth (similar to Minecraft inventory lighting)
+    const directionalLight = new THREE.DirectionalLight(0xff_ff_ff, 0.6)
+    directionalLight.position.set(2, 2, 2) // Position light from top-right-front
+    directionalLight.target.position.set(0, 0, 0) // Point towards center of scene
+
+    // Configure shadow properties for optimal quality
+    directionalLight.castShadow = true
+    directionalLight.shadow.mapSize.width = 2048 // High resolution shadow map
+    directionalLight.shadow.mapSize.height = 2048
+    directionalLight.shadow.camera.near = 0.1
+    directionalLight.shadow.camera.far = 10
+    directionalLight.shadow.camera.left = -3
+    directionalLight.shadow.camera.right = 3
+    directionalLight.shadow.camera.top = 3
+    directionalLight.shadow.camera.bottom = -3
+    directionalLight.shadow.bias = -0.0001 // Reduce shadow acne
+
+    scene.add(directionalLight)
+    scene.add(directionalLight.target)
+
     // Cursor following function
     const updatePlayerLookAt = () => {
       if (!isFollowingCursor.current || !sceneRef.current?.playerObject) return
@@ -342,6 +372,14 @@ export default () => {
           scale: 1 // Start with base scale, will adjust below
         })
 
+        // Enable shadows for player object
+        wrapper.traverse((child) => {
+          if (child instanceof THREE.Mesh) {
+            child.castShadow = true
+            child.receiveShadow = true
+          }
+        })
+
         // Calculate proper scale and positioning for camera view
         const box = new THREE.Box3().setFromObject(wrapper)
         const size = box.getSize(new THREE.Vector3())

From f51254d97a9a04be3eb5750d214c59e0c41ffe76 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 30 Sep 2025 07:20:30 +0300
Subject: [PATCH 748/753] fix: dont stop local replay server with keep alive
 connection error

---
 src/packetsReplay/replayPackets.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/packetsReplay/replayPackets.ts b/src/packetsReplay/replayPackets.ts
index d0d95da8..54b3d652 100644
--- a/src/packetsReplay/replayPackets.ts
+++ b/src/packetsReplay/replayPackets.ts
@@ -59,6 +59,7 @@ export const startLocalReplayServer = (contents: string) => {
   const server = createServer({
     Server: LocalServer as any,
     version: header.minecraftVersion,
+    keepAlive: false,
     'online-mode': false
   })
 

From a88c8b547044c1dab9c759e56794d614cc41ffa4 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Tue, 30 Sep 2025 09:38:37 +0300
Subject: [PATCH 749/753] possible fix for rare edgecase where skins from
 server were not applied. Cause: renderer due to rare circumnstances could be
 loaded AFTER gameLoaded which is fired only when starting rendering 3d world.
 classic no existing data handling issue

why not mineflayerBotCreated? because getThreeJsRendererMethods not available at that time so would make things only much complex
---
 src/entities.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/entities.ts b/src/entities.ts
index dcec6143..674f91ef 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -246,22 +246,29 @@ customEvents.on('gameLoaded', () => {
         }
       }
       // even if not found, still record to cache
-      void getThreeJsRendererMethods()?.updatePlayerSkin(entityId, player.username, player.uuid, skinUrl ?? true, capeUrl)
+      void getThreeJsRendererMethods()!.updatePlayerSkin(entityId, player.username, player.uuid, skinUrl ?? true, capeUrl)
     } catch (err) {
-      console.error('Error decoding player texture:', err)
+      reportError(new Error('Error applying skin texture:', { cause: err }))
     }
   }
 
   bot.on('playerJoined', updateSkin)
   bot.on('playerUpdated', updateSkin)
+  for (const entity of Object.values(bot.players)) {
+    updateSkin(entity)
+  }
 
-  bot.on('teamUpdated', (team: Team) => {
+  const teamUpdated = (team: Team) => {
     for (const entity of Object.values(bot.entities)) {
       if (entity.type === 'player' && entity.username && team.members.includes(entity.username) || entity.uuid && team.members.includes(entity.uuid)) {
         bot.emit('entityUpdate', entity)
       }
     }
-  })
+  }
+  bot.on('teamUpdated', teamUpdated)
+  for (const team of Object.values(bot.teams)) {
+    teamUpdated(team)
+  }
 
   const updateEntityNameTags = (team: Team) => {
     for (const entity of Object.values(bot.entities)) {

From 634df8d03dfd90aa978433e39c23376a4116a15d Mon Sep 17 00:00:00 2001
From: Colbster937 <colbychittenden@gmail.com>
Date: Fri, 10 Oct 2025 17:52:06 -0500
Subject: [PATCH 750/753] Add WebMC & WS changes (#431)

Co-authored-by: Colbster937 <96893162+colbychittenden@users.noreply.github.com>
---
 config.json                       | 4 ++++
 src/appConfig.ts                  | 2 +-
 src/mineflayer/websocket-core.ts  | 7 +++++--
 src/react/AddServerOrConnect.tsx  | 2 +-
 src/react/ServersListProvider.tsx | 2 ++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/config.json b/config.json
index 940fb738..2bfa9cfe 100644
--- a/config.json
+++ b/config.json
@@ -10,6 +10,10 @@
     {
       "ip": "wss://play.mcraft.fun"
     },
+    {
+      "ip": "wss://play.webmc.fun",
+      "name": "WebMC"
+    },
     {
       "ip": "wss://ws.fuchsmc.net"
     },
diff --git a/src/appConfig.ts b/src/appConfig.ts
index 92fde21a..c29d74e8 100644
--- a/src/appConfig.ts
+++ b/src/appConfig.ts
@@ -35,7 +35,7 @@ export type AppConfig = {
   // defaultVersion?: string
   peerJsServer?: string
   peerJsServerFallback?: string
-  promoteServers?: Array<{ ip, description, version? }>
+  promoteServers?: Array<{ ip, description, name?, version?, }>
   mapsProvider?: string
 
   appParams?: Record<string, any> // query string params
diff --git a/src/mineflayer/websocket-core.ts b/src/mineflayer/websocket-core.ts
index 0edd2497..f8163102 100644
--- a/src/mineflayer/websocket-core.ts
+++ b/src/mineflayer/websocket-core.ts
@@ -15,9 +15,12 @@ class CustomDuplex extends Duplex {
 }
 
 export const getWebsocketStream = async (host: string) => {
-  const baseProtocol = location.protocol === 'https:' ? 'wss' : host.startsWith('ws://') ? 'ws' : 'wss'
+  const baseProtocol = host.startsWith('ws://') ? 'ws' : 'wss'
   const hostClean = host.replace('ws://', '').replace('wss://', '')
-  const ws = new WebSocket(`${baseProtocol}://${hostClean}`)
+  const hostURL = new URL(`${baseProtocol}://${hostClean}`)
+  const hostParams = hostURL.searchParams
+  hostParams.append('client_mcraft', '')
+  const ws = new WebSocket(`${baseProtocol}://${hostURL.host}${hostURL.pathname}?${hostParams.toString()}`)
   const clientDuplex = new CustomDuplex(undefined, data => {
     ws.send(data)
   })
diff --git a/src/react/AddServerOrConnect.tsx b/src/react/AddServerOrConnect.tsx
index d478b3e7..36fd5264 100644
--- a/src/react/AddServerOrConnect.tsx
+++ b/src/react/AddServerOrConnect.tsx
@@ -117,7 +117,7 @@ export default ({ onBack, onConfirm, title = 'Add a Server', initialData, parseQ
   }
 
   const displayConnectButton = qsParamIp
-  const serverExamples = ['example.com:25565', 'play.hypixel.net', 'ws://play.pcm.gg']
+  const serverExamples = ['example.com:25565', 'play.hypixel.net', 'ws://play.pcm.gg', 'wss://play.webmc.fun']
   // pick random example
   const example = serverExamples[Math.floor(Math.random() * serverExamples.length)]
 
diff --git a/src/react/ServersListProvider.tsx b/src/react/ServersListProvider.tsx
index 75f95d3f..42ef2aaa 100644
--- a/src/react/ServersListProvider.tsx
+++ b/src/react/ServersListProvider.tsx
@@ -119,6 +119,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
     ...serversListProvided,
     ...(customServersList ? [] : (miscUiState.appConfig?.promoteServers ?? [])).map((server): StoreServerItem => ({
       ip: server.ip,
+      name: server.name,
       versionOverride: server.version,
       description: server.description,
       isRecommended: true
@@ -167,6 +168,7 @@ const Inner = ({ hidden, customServersList }: { hidden?: boolean, customServersL
                   console.log('pingResult.fullInfo.description', pingResult.fullInfo.description)
                   data = {
                     formattedText: pingResult.fullInfo.description,
+                    icon: pingResult.fullInfo.favicon,
                     textNameRight: `ws ${pingResult.latency}ms`,
                     textNameRightGrayed: `${pingResult.fullInfo.players?.online ?? '??'}/${pingResult.fullInfo.players?.max ?? '??'}`,
                     offline: false

From e9f91f8ecda1488c636f35f58cc522f459a29f82 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 11 Oct 2025 02:24:51 +0300
Subject: [PATCH 751/753] feat: enable music by default, add slider for
 controlling its volume

---
 src/basicSounds.ts         | 30 ++++++++++++++++++++----------
 src/defaultOptions.ts      |  3 ++-
 src/optionsGuiScheme.tsx   | 18 ++++++++++++++++++
 src/react/OptionsItems.tsx | 13 +++++++++++--
 src/sounds/musicSystem.ts  |  4 ++--
 5 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/src/basicSounds.ts b/src/basicSounds.ts
index 37f8dccd..54af0d35 100644
--- a/src/basicSounds.ts
+++ b/src/basicSounds.ts
@@ -7,7 +7,12 @@ let audioContext: AudioContext
 const sounds: Record<string, any> = {}
 
 // Track currently playing sounds and their gain nodes
-const activeSounds: Array<{ source: AudioBufferSourceNode; gainNode: GainNode; volumeMultiplier: number }> = []
+const activeSounds: Array<{
+  source: AudioBufferSourceNode;
+  gainNode: GainNode;
+  volumeMultiplier: number;
+  isMusic: boolean;
+}> = []
 window.activeSounds = activeSounds
 
 // load as many resources on page load as possible instead on demand as user can disable internet connection after he thinks the page is loaded
@@ -43,7 +48,7 @@ export async function loadSound (path: string, contents = path) {
   }
 }
 
-export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = options.remoteSoundsLoadTimeout, loop = false) => {
+export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = options.remoteSoundsLoadTimeout, loop = false, isMusic = false) => {
   const soundBuffer = sounds[url]
   if (!soundBuffer) {
     const start = Date.now()
@@ -51,11 +56,11 @@ export const loadOrPlaySound = async (url, soundVolume = 1, loadTimeout = option
     if (cancelled || Date.now() - start > loadTimeout) return
   }
 
-  return playSound(url, soundVolume, loop)
+  return playSound(url, soundVolume, loop, isMusic)
 }
 
-export async function playSound (url, soundVolume = 1, loop = false) {
-  const volume = soundVolume * (options.volume / 100)
+export async function playSound (url, soundVolume = 1, loop = false, isMusic = false) {
+  const volume = soundVolume * (options.volume / 100) * (isMusic ? options.musicVolume / 100 : 1)
 
   if (!volume) return
 
@@ -82,7 +87,7 @@ export async function playSound (url, soundVolume = 1, loop = false) {
   source.start(0)
 
   // Add to active sounds
-  activeSounds.push({ source, gainNode, volumeMultiplier: soundVolume })
+  activeSounds.push({ source, gainNode, volumeMultiplier: soundVolume, isMusic })
 
   const callbacks = [] as Array<() => void>
   source.onended = () => {
@@ -110,6 +115,7 @@ export async function playSound (url, soundVolume = 1, loop = false) {
         console.warn('Failed to stop sound:', err)
       }
     },
+    gainNode,
   }
 }
 
@@ -137,11 +143,11 @@ export function stopSound (url: string) {
   }
 }
 
-export function changeVolumeOfCurrentlyPlayingSounds (newVolume: number) {
+export function changeVolumeOfCurrentlyPlayingSounds (newVolume: number, newMusicVolume: number) {
   const normalizedVolume = newVolume / 100
-  for (const { gainNode, volumeMultiplier } of activeSounds) {
+  for (const { gainNode, volumeMultiplier, isMusic } of activeSounds) {
     try {
-      gainNode.gain.value = normalizedVolume * volumeMultiplier
+      gainNode.gain.value = normalizedVolume * volumeMultiplier * (isMusic ? newMusicVolume / 100 : 1)
     } catch (err) {
       console.warn('Failed to change sound volume:', err)
     }
@@ -149,5 +155,9 @@ export function changeVolumeOfCurrentlyPlayingSounds (newVolume: number) {
 }
 
 subscribeKey(options, 'volume', () => {
-  changeVolumeOfCurrentlyPlayingSounds(options.volume)
+  changeVolumeOfCurrentlyPlayingSounds(options.volume, options.musicVolume)
+})
+
+subscribeKey(options, 'musicVolume', () => {
+  changeVolumeOfCurrentlyPlayingSounds(options.volume, options.musicVolume)
 })
diff --git a/src/defaultOptions.ts b/src/defaultOptions.ts
index 85ebae17..48c1cfad 100644
--- a/src/defaultOptions.ts
+++ b/src/defaultOptions.ts
@@ -16,7 +16,8 @@ export const defaultOptions = {
   chatOpacityOpened: 100,
   messagesLimit: 200,
   volume: 50,
-  enableMusic: false,
+  enableMusic: true,
+  musicVolume: 50,
   // fov: 70,
   fov: 75,
   defaultPerspective: 'first_person' as 'first_person' | 'third_person_back' | 'third_person_front',
diff --git a/src/optionsGuiScheme.tsx b/src/optionsGuiScheme.tsx
index a47c06eb..0cb0fe1e 100644
--- a/src/optionsGuiScheme.tsx
+++ b/src/optionsGuiScheme.tsx
@@ -480,6 +480,24 @@ export const guiOptionsScheme: {
   ],
   sound: [
     { volume: {} },
+    {
+      custom () {
+        return <OptionSlider
+          valueOverride={options.enableMusic ? undefined : 0}
+          onChange={(value) => {
+            options.musicVolume = value
+          }}
+          item={{
+            type: 'slider',
+            id: 'musicVolume',
+            text: 'Music Volume',
+            min: 0,
+            max: 100,
+            unit: '%',
+          }}
+        />
+      },
+    },
     {
       custom () {
         return <Button label='Sound Muffler' onClick={() => showModal({ reactType: 'sound-muffler' })} inScreen />
diff --git a/src/react/OptionsItems.tsx b/src/react/OptionsItems.tsx
index ccc04bcb..97e88d34 100644
--- a/src/react/OptionsItems.tsx
+++ b/src/react/OptionsItems.tsx
@@ -161,7 +161,15 @@ export const OptionButton = ({ item, onClick, valueText, cacheKey }: {
   />
 }
 
-export const OptionSlider = ({ item }: { item: Extract<OptionMeta, { type: 'slider' }> }) => {
+export const OptionSlider = ({
+  item,
+  onChange,
+  valueOverride
+}: {
+  item: Extract<OptionMeta, { type: 'slider' }>
+  onChange?: (value: number) => void
+  valueOverride?: number
+}) => {
   const { disabledBecauseOfSetting } = useCommonComponentsProps(item)
 
   const optionValue = useSnapshot(options)[item.id!]
@@ -174,7 +182,7 @@ export const OptionSlider = ({ item }: { item: Extract<OptionMeta, { type: 'slid
   return (
     <Slider
       label={item.text!}
-      value={options[item.id!]}
+      value={valueOverride ?? options[item.id!]}
       data-setting={item.id}
       disabledReason={isLocked(item) ? 'qs' : disabledBecauseOfSetting ? `Disabled because ${item.disableIf![0]} is ${item.disableIf![1]}` : item.disabledReason}
       min={item.min}
@@ -184,6 +192,7 @@ export const OptionSlider = ({ item }: { item: Extract<OptionMeta, { type: 'slid
       updateOnDragEnd={item.delayApply}
       updateValue={(value) => {
         options[item.id!] = value
+        onChange?.(value)
       }}
     />
   )
diff --git a/src/sounds/musicSystem.ts b/src/sounds/musicSystem.ts
index ecabf43e..8fad4c74 100644
--- a/src/sounds/musicSystem.ts
+++ b/src/sounds/musicSystem.ts
@@ -5,10 +5,10 @@ class MusicSystem {
   private currentMusic: string | null = null
 
   async playMusic (url: string, musicVolume = 1) {
-    if (!options.enableMusic || this.currentMusic) return
+    if (!options.enableMusic || this.currentMusic || options.musicVolume === 0) return
 
     try {
-      const { onEnded } = await loadOrPlaySound(url, 0.5 * musicVolume, 5000) ?? {}
+      const { onEnded } = await loadOrPlaySound(url, musicVolume, 5000, undefined, true) ?? {}
 
       if (!onEnded) return
 

From fef94f03fb21131cb68a1b665901fb7687afcd13 Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 11 Oct 2025 02:25:06 +0300
Subject: [PATCH 752/753] feat: add support for alt+arrows navigation to
 navigate between commands only

---
 src/react/Chat.tsx | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/react/Chat.tsx b/src/react/Chat.tsx
index 20d77a10..d927a558 100644
--- a/src/react/Chat.tsx
+++ b/src/react/Chat.tsx
@@ -125,7 +125,9 @@ export default ({
   const chatInput = useRef<HTMLInputElement>(null!)
   const chatMessages = useRef<HTMLDivElement>(null)
   const chatHistoryPos = useRef(sendHistoryRef.current.length)
+  const commandHistoryPos = useRef(0)
   const inputCurrentlyEnteredValue = useRef('')
+  const commandHistoryRef = useRef(sendHistoryRef.current.filter((msg: string) => msg.startsWith('/')))
 
   const { scrollToBottom, isAtBottom, wasAtBottom, currentlyAtBottom } = useScrollBehavior(chatMessages, { messages, opened })
   const [rightNowAtBottom, setRightNowAtBottom] = useState(false)
@@ -142,6 +144,9 @@ export default ({
     sendHistoryRef.current = newHistory
     window.sessionStorage.chatHistory = JSON.stringify(newHistory)
     chatHistoryPos.current = newHistory.length
+    // Update command history (only messages starting with /)
+    commandHistoryRef.current = newHistory.filter((msg: string) => msg.startsWith('/'))
+    commandHistoryPos.current = commandHistoryRef.current.length
   }
 
   const acceptComplete = (item: string) => {
@@ -180,6 +185,21 @@ export default ({
     updateInputValue(sendHistoryRef.current[chatHistoryPos.current] || inputCurrentlyEnteredValue.current || '')
   }
 
+  const handleCommandArrowUp = () => {
+    if (commandHistoryPos.current === 0 || commandHistoryRef.current.length === 0) return
+    if (commandHistoryPos.current === commandHistoryRef.current.length) { // started navigating command history
+      inputCurrentlyEnteredValue.current = chatInput.current.value
+    }
+    commandHistoryPos.current--
+    updateInputValue(commandHistoryRef.current[commandHistoryPos.current] || '')
+  }
+
+  const handleCommandArrowDown = () => {
+    if (commandHistoryPos.current === commandHistoryRef.current.length) return
+    commandHistoryPos.current++
+    updateInputValue(commandHistoryRef.current[commandHistoryPos.current] || inputCurrentlyEnteredValue.current || '')
+  }
+
   const auxInputFocus = (direction: 'up' | 'down') => {
     chatInput.current.focus()
     if (direction === 'up') {
@@ -203,6 +223,7 @@ export default ({
       updateInputValue(chatInputValueGlobal.value)
       chatInputValueGlobal.value = ''
       chatHistoryPos.current = sendHistoryRef.current.length
+      commandHistoryPos.current = commandHistoryRef.current.length
       if (!usingTouch) {
         chatInput.current.focus()
       }
@@ -524,9 +545,19 @@ export default ({
               onBlur={() => setIsInputFocused(false)}
               onKeyDown={(e) => {
                 if (e.code === 'ArrowUp') {
-                  handleArrowUp()
+                  if (e.altKey) {
+                    handleCommandArrowUp()
+                    e.preventDefault()
+                  } else {
+                    handleArrowUp()
+                  }
                 } else if (e.code === 'ArrowDown') {
-                  handleArrowDown()
+                  if (e.altKey) {
+                    handleCommandArrowDown()
+                    e.preventDefault()
+                  } else {
+                    handleArrowDown()
+                  }
                 }
                 if (e.code === 'Tab') {
                   if (completionItemsSource.length) {

From 253e094c745cf7b5e2e7a974866c8d098082fc3d Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Sat, 11 Oct 2025 02:25:14 +0300
Subject: [PATCH 753/753] add zardoy/mwc-proxy repo ref

---
 README.MD | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.MD b/README.MD
index 74d4eb41..018784e3 100644
--- a/README.MD
+++ b/README.MD
@@ -78,6 +78,8 @@ There is a builtin proxy, but you can also host your one! Just clone the repo, r
 
 [![Deploy to Koyeb](https://www.koyeb.com/static/images/deploy/button.svg)](https://app.koyeb.com/deploy?name=minecraft-web-client&type=git&repository=zardoy%2Fminecraft-web-client&branch=next&builder=dockerfile&env%5B%5D=&ports=8080%3Bhttp%3B%2F)
 
+> **Note**: If you want to make **your own** Minecraft server accessible to web clients (without our proxies), you can use [mwc-proxy](https://github.com/zardoy/mwc-proxy) - a lightweight JS WebSocket proxy that runs on the same server as your Minecraft server, allowing players to connect directly via `wss://play.example.com`. `?client_mcraft` is added to the URL, so the proxy will know that it's this client.
+
 Proxy servers are used to connect to Minecraft servers which use TCP protocol. When you connect connect to a server with a proxy, websocket connection is created between you (browser client) and the proxy server located in Europe, then the proxy connects to the Minecraft server and sends the data to the client (you) without any packet deserialization to avoid any additional delays. That said all the Minecraft protocol packets are processed by the client, right in your browser.
 
 ```mermaid